安卓手机号码登陆

lua_probject/base_project/Game/Controller/LoginController.lua

@@ -49,7 +49,7 @@ local function __Login(cmd, _data, callBack)
             user.bind_pwd   = data["havePassword"]
             user.retri_pwd  = data["havegroup"]
             user.isBangding = tonumber(data.isBangding)
-            user.is_lock = tonumber(data.is_lock) or 0
+            user.is_lock    = tonumber(data.is_lock) or 0
 
             user.real_info  = account.real_info
             user.phone      = account.phone
@@ -218,7 +218,7 @@ function M:QuickLogin2(session_id, callback)
 end
 
 --设置是否绑定设备
-function M:LockDevice(flag,callback)
+function M:LockDevice(flag, callback)
     local data = {}
     data.lockType = flag and 1 or 0
     local _client = ControllerManager.WebClient
@@ -227,6 +227,16 @@ function M:LockDevice(flag,callback)
     end)
 end
 
+--快速登入加密
+function M:QuickPhoneLogin2(token, callback)
+    local _data = {}
+    _data.data = RSAHelper.Encrypt(json.encode({
+        deviceCode = UnityEngine.SystemInfo.deviceModel .. UnityEngine.SystemInfo.operatingSystem
+    }))
+    _data.loginToken = token,
+    __Login(Protocol.WEB_PHONE_LOGIN2, _data, callback)
+end
+
 function M.OnEnter(self)
     --print("login controller enter")
 end

lua_probject/base_project/Game/Protocol.lua

@@ -69,6 +69,9 @@ Protocol = {
     --设置是否绑定设备
     WEB_LOCK_DEVICE            = "acc/lock_device",
 
+    -- 用户手机号直接登录
+    WEB_PHONE_LOGIN2           = "acc/phone_login_2",
+
     ----rank----
 
     WEB_GET_MILITARY           = "military/get_military",

lua_probject/base_project/Game/View/LoginView.lua

@@ -60,10 +60,16 @@ function M:init()
 
     local btn_phone = view:GetChild("btn_phone")
     btn_phone.onClick:Set(function()
-        self:PhoneLogin()
+        -- self:PhoneLogin()
+        self:OnClickJVerifyLogin()
     end)
 
     self:InitClip()
+
+    local mgr = JVerifyManager.Instance
+    if mgr then
+        mgr:Init()
+    end
 end
 
 function M:Destroy()
@@ -375,3 +381,113 @@ function M:CallWxLogin(index)
         self:LoginCallBack(0)
     end
 end
+
+local cjson = require "cjson"
+
+local function ParseJVerifyResult(jsonStr)
+    if not jsonStr or jsonStr == "" then
+        return nil
+    end
+
+    local ok, data = pcall(cjson.decode, jsonStr)
+    if not ok then
+        print("[JVerify] json decode failed:", jsonStr)
+        return nil
+    end
+
+    return data
+end
+
+function M:OnClickJVerifyLogin()
+    local mgr = JVerifyManager.Instance
+    print("mgr = ", mgr)
+
+    if mgr == nil then
+        print("[JVerify] manager is nil")
+        return
+    end
+
+    local enable = mgr:CheckEnable()
+    print("[JVerify] CheckEnable = ", tostring(enable))
+
+    if not enable then
+        print("[JVerify] 当前环境不支持一键登录")
+        return
+    end
+
+    mgr:ClearPreLoginResult()
+    mgr:ClearLoginAuthResult()
+
+    mgr:PreLogin(5000)
+
+    coroutine.start(function()
+        local t = 0
+        while t < 8 do
+            coroutine.wait(0.2)
+            t = t + 0.2
+
+            local preLoginJson = mgr:GetPreLoginResult()
+            if preLoginJson ~= nil and preLoginJson ~= "" then
+                print("[JVerify] preLogin raw = ", preLoginJson)
+                mgr:ClearPreLoginResult()
+
+                local preData = ParseJVerifyResult(preLoginJson)
+                if preData and tonumber(preData.code) == 7000 then
+                    print("[JVerify] preLogin success, start loginAuth")
+                    mgr:LoginAuth()
+                    self:PollJVerifyLoginResult()
+                else
+                    print("[JVerify] preLogin failed")
+                end
+                return
+            end
+        end
+
+        print("[JVerify] preLogin timeout")
+    end)
+end
+
+function M:PollJVerifyLoginResult()
+    local mgr = JVerifyManager.Instance
+    if mgr == nil then
+        print("[JVerify] manager is nil")
+        return
+    end
+
+    coroutine.start(function()
+        local t = 0
+        while t < 15 do
+            coroutine.wait(0.2)
+            t = t + 0.2
+
+            local loginJson = mgr:GetLoginAuthResult()
+            if loginJson ~= nil and loginJson ~= "" then
+                print("[JVerify] loginAuth raw = ", loginJson)
+                mgr:ClearLoginAuthResult()
+
+                local data = ParseJVerifyResult(loginJson)
+                if data and tonumber(data.code) == 6000 then
+                    local token = data.content or ""
+                    print("[JVerify] loginToken = ", token)
+
+                    self:OnGetJVerifyToken(token)
+                else
+                    print("[JVerify] loginAuth failed, code = ", data and data.code)
+                end
+                return
+            end
+        end
+
+        print("[JVerify] loginAuth timeout")
+    end)
+end
+
+function M:OnGetJVerifyToken(token)
+    print("[JVerify] final token = ", token)
+
+    -- 下一步这里发给你的服务端
+    local loginCtr = ControllerManager.GetController(LoginController)
+    loginCtr:QuickPhoneLogin2(token,function(response)
+        __login_response(self, response)
+    end)
+end

lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua

@@ -28,7 +28,7 @@ function M:InitView(url)
     MJMainView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2")
     self._hu_tip = HuTipView.new(self)
 
-    self._view:GetChild('wanfa_text').text =room.room_config.people_num .. '人红中 ' .. room.score_times .. '倍'
+    self._view:GetChild('wanfa_text').text ='红中麻将 ' .. room.score_times
 	local text_playName = self._view:GetChild('text_playName')
     if text_playName then
         text_playName.text = "红中麻将"

lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua

@@ -28,7 +28,7 @@ function M:InitView(url)
     MJMainView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2")
     self._hu_tip = HuTipView.new(self)
 
-    self._view:GetChild('wanfa_text').text =room.room_config.people_num .. '人转转麻将 ' .. room.score_times .. '倍'
+    self._view:GetChild('wanfa_text').text ='转转麻将 ' .. room.score_times
 		local text_playName = self._view:GetChild('text_playName')
     if text_playName then
         text_playName.text = "转转麻将"

lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua

@@ -190,15 +190,15 @@ function M:InitView(url)
     self._view:GetChild('info_text'):GetChild('text').text = room.room_config:GetDes()
     if room.room_config.Leaf == 1 then
         if room.room_config.people_num == 2 then
-            self._view:GetChild('wanfa_text').text = '十五张' .. '二人跑得快' .. room.score_times .. '倍'
+            self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times
         else
-            self._view:GetChild('wanfa_text').text = '十五张' .. '三人跑得快' .. room.score_times .. '倍'
+            self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times
         end
     else
         if room.room_config.people_num == 2 then
-            self._view:GetChild('wanfa_text').text = '十六张' .. '二人跑得快' .. room.score_times .. '倍'
+            self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times
         else
-            self._view:GetChild('wanfa_text').text = '十六张' .. '三人跑得快' .. room.score_times .. '倍'
+            self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times
         end
     end
     local text_playName = self._view:GetChild('text_playName')

lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua

@@ -218,7 +218,12 @@ function M:InitPoker(pokerList, isPlayAni, open)
     self._ctr_canSendCard.selectedIndex = 1
     self._flag_ruleCard = false
     self._view_handCard:RemoveChildren(0, -1, true)
-    -- table.sort(pokerList)
+    local cs = 0.95
+    if DataManager.CurrenRoom.cardsize == 0 then
+        cs = 1
+    elseif DataManager.CurrenRoom.cardsize == 1 then
+        cs = 0.95
+    end
     if isPlayAni == true then
         self.cor_init_poker =
             coroutine.start(
@@ -299,7 +304,8 @@ function M:InitPoker(pokerList, isPlayAni, open)
             local card_view = NewCardView(btn_card, card_number_code, card_flower_code)
             self.card_list[#self.card_list + 1] = card_view
             btn_card.data = card_view
-            btn_card.width = (GRoot.inst.width * 0.95 - self._view_handCard.columnGap * 15) / 16
+            btn_card.width = (GRoot.inst.width - self._view_handCard.columnGap * 14) / 15*cs
+            btn_card.height = btn_card.width*1.18*cs
         end
         table.sort(self.card_list, tableSortNumber)
         self:AddTouchMoveEvent(self._view_handCard)
@@ -316,7 +322,7 @@ end
 function M:updatePoker()
     local templist = {}
 
-    for i = #self.card_list,1,-1  do
+    for i = #self.card_list, 1, -1 do
         templist[#templist + 1] = self.card_list[i].card_code_flower
     end
     self:InitPoker(templist, false, 0)

lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua

@@ -1,10 +1,10 @@
 local PlayerSelfCardInfoView = require("main.zipai.ZPPlayerSelfCardInfoView")
 local CardCheck = require("main.zipai.CardCheck")
 local M = {}
--- 
-function M.new(view,mainView)
-    setmetatable(M, {__index = PlayerSelfCardInfoView})
-    local self = setmetatable({},{__index = M})
+--
+function M.new(view, mainView)
+    setmetatable(M, { __index = PlayerSelfCardInfoView })
+    local self = setmetatable({}, { __index = M })
     self.class = "PlayerSelfCardInfoView"
     self._view = view
     self._mainView = mainView
@@ -13,35 +13,33 @@ function M.new(view,mainView)
     return self
 end
 
-
 function M:onTouchBegin(context)
-    if DataManager.CurrenRoom ==nil or DataManager.CurrenRoom.self_player ==nil then
+    if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
     end
     local button = context.sender
     local card = button.data
-    if  DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then
+    if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then
         self:ShowHuTip(card.card_item)
     end
-    card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_",card.card_item)
+    card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card.card_item)
     card.btn_card.sortingOrder = 100
-    local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x,context.inputEvent.y))
-    card.btn_card.xy = Vector2.New(card.btn_card.x+20 ,card.btn_card.y-50)
+    local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
+    card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50)
     card.touch_pos = xy - button.xy
-
 end
 
 function M:__OnDragEnd(context)
-    if DataManager.CurrenRoom ==nil or DataManager.CurrenRoom.self_player ==nil then
+    if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
     end
     if self.outcard_button then
         self.outcard_button = nil
     end
     local button = context.sender
-    
+
     local card = button.data
-  
+
     local _room = DataManager.CurrenRoom
     card.btn_card.sortingOrder = 0
     -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat)
@@ -53,7 +51,7 @@ function M:__OnDragEnd(context)
     else
         local isChangeCard = false
         self.outcard_button = nil
-        card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/201_",card.card_item)
+        card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/201_", card.card_item)
         self._area_handcard_list:AddChild(button)
         if #self.card_list == 1 then
             isChangeCard = false
@@ -61,188 +59,184 @@ function M:__OnDragEnd(context)
             return
         end
         local CountCards = {}
-        for i=1,#self.card_list do
+        for i = 1, #self.card_list do
             local lists = {}
             if CountCards[self.card_list[i].index_X] == nil then
-                lists[#lists+1] = self.card_list[i]
-                CountCards[self.card_list[i].index_X]= lists
+                lists[#lists + 1] = self.card_list[i]
+                CountCards[self.card_list[i].index_X] = lists
             else
-                CountCards[self.card_list[i].index_X][#CountCards[self.card_list[i].index_X]+1] =self.card_list[i] 
+                CountCards[self.card_list[i].index_X][#CountCards[self.card_list[i].index_X] + 1] = self.card_list[i]
             end
         end
         local minmark = 1
         local maxmark = #self.card_list
-        if card == self.card_list[1] or  card == self.card_list[#self.card_list] then
+        if card == self.card_list[1] or card == self.card_list[#self.card_list] then
             if self.card_list[1].index_X == self.card_list[2].index_X then
-                minmark =2
+                minmark = 2
             end
-            if self.card_list[#self.card_list].index_X == self.card_list[#self.card_list-1].index_X then
-                maxmark =#self.card_list-1
+            if self.card_list[#self.card_list].index_X == self.card_list[#self.card_list - 1].index_X then
+                maxmark = #self.card_list - 1
             end
         end
-        if button.x+button.width/2 < self.card_list[minmark].btn_card.x and #CountCards<10 then
-            list_remove(self.card_list,card) 
+        if button.x + button.width / 2 < self.card_list[minmark].btn_card.x and #CountCards < 10 then
+            list_remove(self.card_list, card)
             local num = 0
-            for i=1,#self.card_list do
+            for i = 1, #self.card_list do
                 if card.index_X == self.card_list[i].index_X and card.index_Y < self.card_list[i].index_Y then
-                     self.card_list[i].index_Y =  self.card_list[i].index_Y - 1
+                    self.card_list[i].index_Y = self.card_list[i].index_Y - 1
                 end
                 if card.index_X == self.card_list[i].index_X then
-                    num = num+1
+                    num = num + 1
                 end
             end
-            if num ==0 then 
-                for i=1,#self.card_list do
-                  if  self.card_list[i].index_X < card.index_X then
-                     self.card_list[i].index_X =  self.card_list[i].index_X + 1 
-                  end
+            if num == 0 then
+                for i = 1, #self.card_list do
+                    if self.card_list[i].index_X < card.index_X then
+                        self.card_list[i].index_X = self.card_list[i].index_X + 1
+                    end
                 end
             else
-                 for i=1,#self.card_list do
-                    self.card_list[i].index_X = self.card_list[i].index_X + 1 
+                for i = 1, #self.card_list do
+                    self.card_list[i].index_X = self.card_list[i].index_X + 1
                 end
             end
-            card.index_X =1 
-            card.index_Y =1
-            table.insert(self.card_list,1,card) 
+            card.index_X = 1
+            card.index_Y = 1
+            table.insert(self.card_list, 1, card)
             isChangeCard = true
-        elseif button.x+button.width/2 > (self.card_list[maxmark].btn_card.x +button.width) and #CountCards<10 then
-            list_remove(self.card_list,card) 
+        elseif button.x + button.width / 2 > (self.card_list[maxmark].btn_card.x + button.width) and #CountCards < 10 then
+            list_remove(self.card_list, card)
             local num = 0
-            for i=1,#self.card_list do
+            for i = 1, #self.card_list do
                 if card.index_X == self.card_list[i].index_X then
-                    num = num+1
+                    num = num + 1
                 end
                 if card.index_X == self.card_list[i].index_X and card.index_Y < self.card_list[i].index_Y then
-                     self.card_list[i].index_Y =  self.card_list[i].index_Y - 1
+                    self.card_list[i].index_Y = self.card_list[i].index_Y - 1
                 end
             end
-            if num ==0 then 
-                for i=1,#self.card_list do
-                  if  self.card_list[i].index_X > card.index_X then
-                     self.card_list[i].index_X =  self.card_list[i].index_X - 1 
-                  end
+            if num == 0 then
+                for i = 1, #self.card_list do
+                    if self.card_list[i].index_X > card.index_X then
+                        self.card_list[i].index_X = self.card_list[i].index_X - 1
+                    end
                 end
             end
-            card.index_X =self.card_list[#self.card_list].index_X+1
-            card.index_Y =1
-            self.card_list[#self.card_list+1] =card
+            card.index_X = self.card_list[#self.card_list].index_X + 1
+            card.index_Y = 1
+            self.card_list[#self.card_list + 1] = card
             isChangeCard = true
-     else 
+        else
             local MoveCard = false
             local MoveCardPos = 0
             local MoveCardY = 0
-            for i=1,#CountCards do
+            for i = 1, #CountCards do
                 local card_view = CountCards[i][1]
-                if card_view~=nil then
-                    if button.x+button.width/2 > card_view.old_postion.x and button.x+button.width/2 < (card_view.old_postion.x+button.width) then
-                        if  card ~= card_view and #CountCards[i] <4 and card.index_X ~= card_view.index_X then
-                             
+                if card_view ~= nil then
+                    if button.x + button.width / 2 > card_view.old_postion.x and button.x + button.width / 2 < (card_view.old_postion.x + button.width) then
+                        if card ~= card_view and #CountCards[i] < 4 and card.index_X ~= card_view.index_X then
                             MoveCardPos = i
-                            MoveCardY = #CountCards[i]+1
+                            MoveCardY = #CountCards[i] + 1
                             MoveCard = true
-                            list_remove(self.card_list,card) 
+                            list_remove(self.card_list, card)
                         end
                     end
                 end
             end
             local MoveCardindex = 0
-           -- local MoveCardY = 0
-            if button.x+button.width/2 > card.old_postion.x and button.x+button.width/2 < (card.old_postion.x+button.width) then           
-                if #CountCards[card.index_X]>1 then
-                    for i=1,#CountCards[card.index_X] do
+            -- local MoveCardY = 0
+            if button.x + button.width / 2 > card.old_postion.x and button.x + button.width / 2 < (card.old_postion.x + button.width) then
+                if #CountCards[card.index_X] > 1 then
+                    for i = 1, #CountCards[card.index_X] do
                         local _cv = CountCards[card.index_X][i]
                         if _cv ~= card then
-                            if button.y+button.height/2 > _cv.btn_card.y and button.y+button.height/2 < (_cv.btn_card.y+button.height) then
+                            if button.y + button.height / 2 > _cv.btn_card.y and button.y + button.height / 2 < (_cv.btn_card.y + button.height) then
                                 --向下移動
-                                if ((button.y+button.height/2) +20) > (card.old_postion.y+button.height)  then
-                                    MoveCardindex  = -1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)  
-                                --向上移動
-                                elseif  ((button.y+button.height/2) -20) < card.old_postion.y  then
-                                    MoveCardindex  = 1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)     
-                                end 
-                            elseif i == #CountCards[card.index_X] and  button.y+button.height/2 < _cv.btn_card.y then
-                                    MoveCardindex  = 1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)  
-                            elseif i == 1 and button.y+button.height/2  > (_cv.btn_card.y+button.width) then
-                                    MoveCardindex  = -1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)  
+                                if ((button.y + button.height / 2) + 20) > (card.old_postion.y + button.height) then
+                                    MoveCardindex = -1
+                                    MoveCardPos   = card.index_X
+                                    MoveCardY     = _cv.index_Y
+                                    MoveCard      = true
+                                    list_remove(self.card_list, card)
+                                    --向上移動
+                                elseif ((button.y + button.height / 2) - 20) < card.old_postion.y then
+                                    MoveCardindex = 1
+                                    MoveCardPos   = card.index_X
+                                    MoveCardY     = _cv.index_Y
+                                    MoveCard      = true
+                                    list_remove(self.card_list, card)
+                                end
+                            elseif i == #CountCards[card.index_X] and button.y + button.height / 2 < _cv.btn_card.y then
+                                MoveCardindex = 1
+                                MoveCardPos   = card.index_X
+                                MoveCardY     = _cv.index_Y
+                                MoveCard      = true
+                                list_remove(self.card_list, card)
+                            elseif i == 1 and button.y + button.height / 2 > (_cv.btn_card.y + button.width) then
+                                MoveCardindex = -1
+                                MoveCardPos   = card.index_X
+                                MoveCardY     = _cv.index_Y
+                                MoveCard      = true
+                                list_remove(self.card_list, card)
                             end
                         end
                     end
                 end
-          
             end
-            if MoveCard ==true and MoveCardindex ==0 then
+            if MoveCard == true and MoveCardindex == 0 then
                 local num = 0
-                for i=1,#self.card_list do
+                for i = 1, #self.card_list do
                     if card.index_X == self.card_list[i].index_X and card.index_Y < self.card_list[i].index_Y then
-                         self.card_list[i].index_Y =  self.card_list[i].index_Y - 1
+                        self.card_list[i].index_Y = self.card_list[i].index_Y - 1
                     end
                     if card.index_X == self.card_list[i].index_X then
-                        num = num+1
+                        num = num + 1
                     end
                 end
-                if num ==0 then 
-                    for i=1,#self.card_list do
-                      if  self.card_list[i].index_X > card.index_X then
-                         self.card_list[i].index_X =  self.card_list[i].index_X - 1 
-                      end
+                if num == 0 then
+                    for i = 1, #self.card_list do
+                        if self.card_list[i].index_X > card.index_X then
+                            self.card_list[i].index_X = self.card_list[i].index_X - 1
+                        end
                     end
                     if MoveCardPos > card.index_X then
-                        MoveCardPos = MoveCardPos-1 
+                        MoveCardPos = MoveCardPos - 1
                     end
                 end
-                card.index_X =MoveCardPos 
-                card.index_Y =MoveCardY
-                for i=#self.card_list,1,-1 do
+                card.index_X = MoveCardPos
+                card.index_Y = MoveCardY
+                for i = #self.card_list, 1, -1 do
                     if MoveCardPos == self.card_list[i].index_X then
-                        table.insert(self.card_list,(i+1),card) 
+                        table.insert(self.card_list, (i + 1), card)
                         break
                     end
                 end
                 isChangeCard = true
-            --上下移动
-            elseif MoveCard ==true and MoveCardindex ~= 0 then
-                for i=1,#self.card_list do
-                    if card.index_X == self.card_list[i].index_X  then
+                --上下移动
+            elseif MoveCard == true and MoveCardindex ~= 0 then
+                for i = 1, #self.card_list do
+                    if card.index_X == self.card_list[i].index_X then
                         --向下移动
                         if MoveCardindex == -1 then
-                            if  self.card_list[i].index_Y < card.index_Y and self.card_list[i].index_Y >= MoveCardY then
+                            if self.card_list[i].index_Y < card.index_Y and self.card_list[i].index_Y >= MoveCardY then
                                 self.card_list[i].index_Y = self.card_list[i].index_Y + 1
-                            
                             end
-                        --向上移动
+                            --向上移动
                         else
-                            if  self.card_list[i].index_Y > card.index_Y and self.card_list[i].index_Y <= MoveCardY then
-                                self.card_list[i].index_Y = self.card_list[i].index_Y - 1 
-                               
+                            if self.card_list[i].index_Y > card.index_Y and self.card_list[i].index_Y <= MoveCardY then
+                                self.card_list[i].index_Y = self.card_list[i].index_Y - 1
                             end
                         end
                     end
                 end
-                card.index_X =MoveCardPos
-                card.index_Y =MoveCardY
-                for i=#self.card_list,1,-1 do
-                    if MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY-1) then
-                        table.insert(self.card_list,(i+1),card) 
+                card.index_X = MoveCardPos
+                card.index_Y = MoveCardY
+                for i = #self.card_list, 1, -1 do
+                    if MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY - 1) then
+                        table.insert(self.card_list, (i + 1), card)
                         break
-                    elseif MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY+1) then
-                        table.insert(self.card_list,i,card) 
+                    elseif MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY + 1) then
+                        table.insert(self.card_list, i, card)
                         break
                     end
                 end
@@ -251,176 +245,162 @@ function M:__OnDragEnd(context)
                 isChangeCard = false
                 self._area_handcard_list:AddChild(button)
             end
-
-        end 
+        end
         self:UpdateHandCardsPos()
-        if  isChangeCard ==true then
+        if isChangeCard == true then
             self:SendChangeCard()
         end
     end
 end
 
-function M:UpdateOutCardList(outcard,isShow,isMopai,seat)
-    if(isShow == nil) then
-         isShow = false
+function M:UpdateOutCardList(outcard, isShow, isMopai, seat)
+    if (isShow == nil) then
+        isShow = false
     end
-    if(isMopai == nil) then
-         isMopai = false
+    if (isMopai == nil) then
+        isMopai = false
     end
-    self._area_outcard_list:RemoveChildren(0,-1,true)
-    local outcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard")
-  
-     if outcard==0 then
-          outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300"
+    self._area_outcard_list:RemoveChildren(0, -1, true)
+    local outcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard")
+
+    if outcard == 0 then
+        outcards:GetChild("icon").icon = "ui://Main_RunBeard/202_1_300"
     else
-        outcards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/203_",outcard)
+        outcards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", outcard)
     end
-    outcards.x,outcards.y = 0,0
-   local show_di_bg = outcards:GetChild("show_di_bg")
+    outcards.x, outcards.y = 0, 0
+    local show_di_bg = outcards:GetChild("show_di_bg")
     --show_di_bg.visible = true
-    if(isShow)then
-            if outcard == 0 then
-               show_di_bg.visible = false
-            end
-    if(seat ~= nil and outcards~=nil)then
-         if(isMopai)then
-                  if outcard ~= 0 then
-                   outcards:GetTransition("mopai"..seat):Play(function( )
-                 --  show_di_bg.visible = true
-                 
-                end)
-                     end
+    if (isShow) then
+        if outcard == 0 then
+            show_di_bg.visible = false
+        end
+        if (seat ~= nil and outcards ~= nil) then
+            if (isMopai) then
+                if outcard ~= 0 then
+                    outcards:GetTransition("mopai" .. seat):Play(function()
+                        --  show_di_bg.visible = true
+                    end)
+                end
             else
-                   show_di_bg.visible = false
-                 outcards:GetTransition("cpai"..seat):Play()
+                show_di_bg.visible = false
+                outcards:GetTransition("cpai" .. seat):Play()
             end
-     else
-         --show_di_bg.visible = true
-    end
+        else
+            --show_di_bg.visible = true
+        end
     else
-      show_di_bg.visible = false
+        show_di_bg.visible = false
     end
     self._area_outcard_list:AddChild(outcards)
 end
 
 --弃牌
-function M:UpdateQiPai( qi_list,isplay)
-     self._area_qipai_list:RemoveChildren(0,-1,true)
-     for i=1,#qi_list do
-          local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai")
-          qicards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/202_",qi_list[i])
-          if(isplay)then
-             if(i == #qi_list) then
-             qicards:GetTransition("t0"):Play()
+function M:UpdateQiPai(qi_list, isplay)
+    self._area_qipai_list:RemoveChildren(0, -1, true)
+    for i = 1, #qi_list do
+        local qicards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai")
+        qicards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/202_", qi_list[i])
+        if (isplay) then
+            if (i == #qi_list) then
+                qicards:GetTransition("t0"):Play()
             end
-          end
-           self._area_qipai_list:AddChild(qicards)
-     end
+        end
+        self._area_qipai_list:AddChild(qicards)
+    end
 end
 
 --摸牌动画
-function M:PlayingOutCardAnima( card)
+function M:PlayingOutCardAnima(card)
     coroutine.start(function()
-        coroutine.wait(0.1) 
+        coroutine.wait(0.1)
         self:ClearOutCard()
     end)
 end
 
-function M:UpdateFzList( fz_list ,ispaly)
-    self._area_fz_list:RemoveChildren(0,-1,true)
-    for i = 1,#fz_list do
-        local fzitem=nil
+function M:UpdateFzList(fz_list, ispaly)
+    self._area_fz_list:RemoveChildren(0, -1, true)
+    for i = 1, #fz_list do
+        local fzitem = nil
         if fz_list[i].type ~= RB_FZType.Kan then
-            fzitem =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/ComponentNew")
-            if(ispaly == false)then
-            fzitem:RemoveChildren(0,-1,true)
+            fzitem = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/ComponentNew")
+            if (ispaly == false) then
+                fzitem:RemoveChildren(0, -1, true)
             end
         end
         if fz_list[i].type == RB_FZType.Chi or fz_list[i].type == RB_FZType.Bi then
-
-            local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
-            fzcards:GetChild("card_"..1).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].active_card)
+            local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
+            fzcards:GetChild("card_" .. 1).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].active_card)
             fzcards:GetController("c2").selectedIndex = 1
-            fzcards:GetChild("card_"..2).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].opcard[1])
-            fzcards:GetChild("card_"..3).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].opcard[2])
-            fzcards.x,fzcards.y = 0,0
-            self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
-
+            fzcards:GetChild("card_" .. 2).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[1])
+            fzcards:GetChild("card_" .. 3).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[2])
+            fzcards.x, fzcards.y = 0, 0
+            self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
         elseif fz_list[i].type == RB_FZType.Peng then
-
-            local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
-            for j=1,3 do
-               fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+            local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
+            for j = 1, 3 do
+                fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
             end
-            fzcards.x,fzcards.y = 0,0
-            self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
-
+            fzcards.x, fzcards.y = 0, 0
+            self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
         elseif fz_list[i].type == RB_FZType.Wei then
-
-            local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
-            fzcards:GetController("c1").selectedIndex=1
-            for j=1,3 do
-               fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+            local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
+            fzcards:GetController("c1").selectedIndex = 1
+            for j = 1, 3 do
+                fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
             end
-            fzcards.x,fzcards.y = 0,0
-            self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
+            fzcards.x, fzcards.y = 0, 0
+            self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
         elseif fz_list[i].type == RB_FZType.ChouWei then
-            local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
-             for j=1,2 do
-               fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
+            local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
+            for j = 1, 2 do
+                fzcards:GetChild("card_" .. j).icon = "ui://Main_RunBeard/202_1_300"
             end
-            fzcards:GetChild("card_"..3).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
-            fzcards.x,fzcards.y = 0,0
-            self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
-
+            fzcards:GetChild("card_" .. 3).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
+            fzcards.x, fzcards.y = 0, 0
+            self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
         elseif fz_list[i].type == RB_FZType.Pao then
-
-            local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4")
-            for j=1,4 do
-               fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+            local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4")
+            for j = 1, 4 do
+                fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
             end
-            fzcards.x,fzcards.y = 0,0
-            self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
-
+            fzcards.x, fzcards.y = 0, 0
+            self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
         elseif fz_list[i].type == RB_FZType.Ti then
-
-            local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4")
-            for j=1,4 do
-                if j==4 then
-                    fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+            local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4")
+            for j = 1, 4 do
+                if j == 4 then
+                    fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
                 else
-                   fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
+                    fzcards:GetChild("card_" .. j).icon = "ui://Main_RunBeard/202_1_300"
                 end
             end
-            fzcards.x,fzcards.y = 0,0
-            self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
-        
+            fzcards.x, fzcards.y = 0, 0
+            self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
         end
     end
 end
 
-
-function M:playAnim( fzitem,fzcards, size,i,ispaly )
-         if(ispaly == nil)then
-             ispaly =false
-         end
-         if(ispaly and i == size)then
-            local faArray= fzitem:GetChild("chiwei")
-              if(faArray~=nil)then
-                   faArray:AddChild(fzcards)
-              else
-                   fzitem:AddChild(fzcards)
-              end
-         else
-              fzitem:AddChild(fzcards)
-         end
-            self._area_fz_list:AddChild(fzitem)
+function M:playAnim(fzitem, fzcards, size, i, ispaly)
+    if (ispaly == nil) then
+        ispaly = false
+    end
+    if (ispaly and i == size) then
+        local faArray = fzitem:GetChild("chiwei")
+        if (faArray ~= nil) then
+            faArray:AddChild(fzcards)
+        else
+            fzitem:AddChild(fzcards)
+        end
+    else
+        fzitem:AddChild(fzcards)
+    end
+    self._area_fz_list:AddChild(fzitem)
 end
 
-
- --出牌提示动画
- function M:ChuPaiTiShi()
-    if DataManager.CurrenRoom ==nil or DataManager.CurrenRoom.self_player ==nil then
+--出牌提示动画
+function M:ChuPaiTiShi()
+    if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
     end
     local chu_player = DataManager.CurrenRoom.self_player
@@ -431,32 +411,31 @@ end
     selfplayeTable.paoCount = chu_player.paoCount
     selfplayeTable.hu_xi = chu_player.hu_xi
     local player = membe_deep_clone(selfplayeTable)
-    local mark_ting= {}
-    for i=1,#DataManager.CurrenRoom.self_player.handcard_list do
-       local card = DataManager.CurrenRoom.self_player.handcard_list[i]
+    local mark_ting = {}
+    for i = 1, #DataManager.CurrenRoom.self_player.handcard_list do
+        local card = DataManager.CurrenRoom.self_player.handcard_list[i]
         list_remove(player.handcard_list, card)
         local _player = membe_deep_clone(player)
-        local tingList = CardCheck.tingPai(_player,DataManager.CurrenRoom)
+        local tingList = CardCheck.tingPai(_player, DataManager.CurrenRoom)
         local isKan = false
-        for j=1,#player.fz_list do
+        for j = 1, #player.fz_list do
             if card == player.fz_list[j].card and player.fz_list[j].type == RB_FZType.Kan then
-                isKan  =true
+                isKan = true
             end
         end
         if #tingList > 0 and isKan == false then
-          
-           mark_ting[#mark_ting+1] = card
+            mark_ting[#mark_ting + 1] = card
         end
         table.insert(player.handcard_list, card)
-        table.sort( player.handcard_list, ViewUtil.HandCardSort)
+        table.sort(player.handcard_list, ViewUtil.HandCardSort)
     end
     -- print("ChuPaiTiShi",#mark_ting,vardump(player))
-    if DataManager.CurrenRoom.curren_outcard_seat ==  DataManager.CurrenRoom.self_player.seat then
-        self._view :GetController("chupai").selectedIndex =1
-        if #mark_ting>0 then
-            for i=1,#mark_ting do
-                for k=1,#self.card_list do
-                    local card_view= self.card_list[k]
+    if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then
+        self._view:GetController("chupai").selectedIndex = 1
+        if #mark_ting > 0 then
+            for i = 1, #mark_ting do
+                for k = 1, #self.card_list do
+                    local card_view = self.card_list[k]
                     if card_view.card_item == mark_ting[i] then
                         card_view.btn_card:GetController("mark_ting").selectedIndex = 1
                     end
@@ -464,13 +443,12 @@ end
             end
         end
     else
-        self._view :GetController("chupai").selectedIndex =0
-        for k=1,#self.card_list do
-            local card_view= self.card_list[k]
+        self._view:GetController("chupai").selectedIndex = 0
+        for k = 1, #self.card_list do
+            local card_view = self.card_list[k]
             card_view.btn_card:GetController("mark_ting").selectedIndex = 0
-                   
         end
     end
 end
 
-return M
+return M

lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua

@@ -905,7 +905,9 @@ function M:_ChiView(tip_list, tip_hu, callback)
     end
     list_choose:ResizeToFit(#tip_list)
     _pop_tip_choice:GetChild('di1').width = list_choose.width + 110
-    _pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width) / 2, -100)
+    -- _pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width) / 2, -100)
+    _pop_tip_choice.width = self._view.width
+    _pop_tip_choice.xy = Vector2(0, -100)
     self._view:AddChild(_pop_tip_choice)
     self._pop_tip_choice = _pop_tip_choice
 end

lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua

@@ -173,7 +173,9 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat)
 
     self._area_outcard_list:RemoveChildren(0, -1, true)
     local outcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard")
-
+    outcards.onClick:Set(function()
+        outcards.alpha = 1.1 - outcards.alpha
+    end)
     if outcard == 0 then
         --     outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300"
     else
@@ -198,12 +200,14 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat)
                 seat = 3
             end
             if (isMopai) then
+                print("摸牌动作1====="..seat)
                 if outcard ~= 0 then
                     outcards:GetTransition("mopai" .. seat):Play(function()
                         -- show_di_bg.visible = true
                     end)
                 end
             else
+                print("出牌动作1----"..seat)
                 show_di_bg.visible = false
                 outcards:GetTransition("cpai" .. seat):Play()
             end

lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua

@@ -266,7 +266,9 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat)
     end
     self._area_outcard_list:RemoveChildren(0, -1, true)
     local outcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard")
-
+    outcards.onClick:Set(function()
+        outcards.alpha = 1.3 - outcards.alpha
+    end)
     if outcard == 0 then
         --outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300"
     else
@@ -280,6 +282,7 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat)
             show_di_bg.visible = false
         end
         if (seat ~= nil and outcards ~= nil) then
+            print("摸牌动作2=====" .. seat)
             if (isMopai) then
                 if outcard ~= 0 then
                     outcards:GetTransition("mopai" .. seat):Play(function()

lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua

@@ -244,6 +244,7 @@ function M:PlayingOutCardAnima(card, seat)
         self._area_outcard_list:AddChild(outcards)
     end
     outcards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card)
+    print("弃牌动作0000==" .. seat)
     outcards:GetTransition("qipai" .. seat):Play()
 end
 

lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua

@@ -530,11 +530,11 @@ function M:UpdateOutLine()
     elseif self:getCardSize() == 1.6 then
         self._data_outLinePos = 90 - (152 * 3)
     elseif self:getCardSize() == 1.8 then
-        self._data_outLinePos = 90 - (170 * 3)
+        self._data_outLinePos = 135 - (170 * 3)
     elseif self:getCardSize() == 2 then
-        self._data_outLinePos = 110 - (195 * 3)
+        self._data_outLinePos = 160 - (195 * 3)
     end
-    self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 60
+    self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 80
 end
 
 function M:UpdateIsOnClick(isOut)
@@ -795,7 +795,7 @@ end
 --计算手牌位置
 function M:GetHandCardPos(cards_view, cards)
     local x, y = 0, 0
-    local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) -- 牌的宽度
+    local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) + 4 -- 牌的宽度
 
     local middle_x = self._area_handcard_list.width / 2
     local start_x = middle_x - (cards / 2 * (card_width))
@@ -804,19 +804,19 @@ function M:GetHandCardPos(cards_view, cards)
     -- local card_height = self.card_hight
     -- y = 90 - card_height * 0.66 * cards_view.index_Y
     if self:getCardSize() == 1.3 then
-        y = 90 - (119 * cards_view.index_Y)
+        y = 100 - (119 * cards_view.index_Y)
     elseif self:getCardSize() == 1.2 then
-        y = 90 - (110 * cards_view.index_Y)
+        y = 100 - (110 * cards_view.index_Y)
     elseif self:getCardSize() == 0.8 then
         y = 100 - (85 * cards_view.index_Y)
     elseif self:getCardSize() == 1.5 then
-        y = 90 - (137 * cards_view.index_Y)
+        y = 100 - (137 * cards_view.index_Y)
     elseif self:getCardSize() == 1.6 then
-        y = 90 - (147 * cards_view.index_Y)
+        y = 100 - (147 * cards_view.index_Y)
     elseif self:getCardSize() == 1.8 then
-        y = 90 - (164 * cards_view.index_Y)
+        y = 105 - (162 * cards_view.index_Y)
     elseif self:getCardSize() == 2 then
-        y = 90 - (182 * cards_view.index_Y)
+        y = 105 - (180 * cards_view.index_Y)
     end
     return Vector2.New(x, y)
 end
@@ -939,6 +939,7 @@ function M:PlayingOutCardAnima(card, seat)
         self._area_outcard_list:AddChild(outcards)
     end
     outcards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card)
+    print("弃牌动作000.。==" .. seat)
     outcards:GetTransition("qipai" .. seat):Play()
 end
 

wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info

@@ -18,9 +18,6 @@
     "n43_n1ry": {
       "hidden": true
     },
-    "n45_n1ry": {
-      "collapsed": true
-    },
     "n51_fmkv": {
       "collapsed": true
     },

wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info

@@ -1,11 +1,18 @@
 {
   "objectStatus": {
+    "n131_ckvb": {
+      "hidden": true,
+      "collapsed": true
+    },
+    "n122_ckvb": {
+      "locked": true
+    },
+    "n121_ckvb": {
+      "locked": true
+    },
     "n166_ukp7": {
       "hidden": true
     },
-    "n185_yffn": {
-      "collapsed": true
-    },
     "n115_rnez": {
       "hidden": true
     },
@@ -21,10 +28,8 @@
     "n179_yffn": {
       "collapsed": true
     },
-    "n131_ckvb": {
-      "collapsed": true,
-      "locked": true,
-      "hidden": true
+    "n185_yffn": {
+      "collapsed": true
     },
     "n87_q50p": {
       "hidden": true

wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n45_j34t": {
+      "collapsed": true
+    }
+  }
+}

wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info

@@ -0,0 +1,16 @@
+{
+  "objectStatus": {
+    "n75_o49p": {
+      "hidden": true
+    },
+    "n50_m25s": {
+      "hidden": true
+    },
+    "n94_o0c1": {
+      "hidden": true
+    },
+    "n74_o49p": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info

@@ -0,0 +1,16 @@
+{
+  "objectStatus": {
+    "n71_o49p": {
+      "hidden": true
+    },
+    "n73_o49p": {
+      "hidden": true
+    },
+    "n95_o0c1": {
+      "hidden": true
+    },
+    "n53_m25s": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info

@@ -1,7 +1,20 @@
 {
   "objectStatus": {
     "n183_yfzf": {
-      "locked": true
+      "locked": true,
+      "collapsed": true
+    },
+    "n154_r1mo": {
+      "collapsed": true
+    },
+    "n150_8th3": {
+      "collapsed": true
+    },
+    "n36_k3io": {
+      "collapsed": true
+    },
+    "n163_o49p": {
+      "collapsed": true
     }
   }
 }

wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info

@@ -2,9 +2,6 @@
   "objectStatus": {
     "n76_oqog": {
       "collapsed": true
-    },
-    "n77_oqog": {
-      "collapsed": true
     }
   }
 }

wb_new_ui/.objs/workspace.json

@@ -2,25 +2,27 @@
   "libview.firstColumnWidth": 413,
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://v0j9abjygq7ms2",
-    "ui://v0j9abjygq7m8f",
-    "ui://8wph7p8nyffnmr",
-    "ui://2d9xdj6zl0lzb",
-    "ui://v0j9abjygq7mgo",
-    "ui://lx6k641gajzhoe",
-    "ui://d1qrzqprc4r116",
-    "ui://8wph7p8nyffn1q",
-    "ui://8wph7p8nyffnmy",
-    "ui://27vd145byffnjo"
+    "ui://lkq9ne9speuq8b",
+    "ui://lkq9ne9speuq6p",
+    "ui://lkq9ne9speuq6e",
+    "ui://lkq9ne9speuq6r",
+    "ui://lkq9ne9speuq6g",
+    "ui://lkq9ne9speuq5a"
   ],
   "test.device": "Huawei Mate20",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://d1qrzqprc4r116",
+  "doc.activeDoc": "ui://lkq9ne9speuq5a",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "d1qrzqpr",
-    "/"
+    "lkq9ne9s",
+    "/",
+    "lkq9ne9s",
+    "/component/",
+    "lkq9ne9s",
+    "/component/Main/",
+    "lkq9ne9s",
+    "/component/Main/component/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Common/component/Component/btn_emoji.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" pivot="0.5,0.5" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="325,180" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <loader id="n4_qmc1" name="icon" xy="0,0" size="100,20" align="center" vAlign="middle" fill="scaleFree">
+    <graph id="n5_a1zf" name="n5" xy="0,0" size="325,180" type="rect" lineSize="3" lineColor="#ffffff00" fillColor="#fff5ffc0" corner="20">
+      <gearColor controller="button" pages="1" values="#f5ffc0" default="#f9ffd9"/>
+    </graph>
+    <loader id="n4_qmc1" name="icon" xy="0,0" size="325,180" url="ui://27vd145bhez87j28" align="center" vAlign="middle" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

wb_new_ui/assets/Common/component/playerDetail.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="937,580">
+<component size="1500,930">
   <controller name="cMissile" pages="0,,1," selected="1">
     <remark page="1" value="开启互动栏"/>
   </controller>
   <displayList>
-    <component id="n14_10i2p" name="n14" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="937,580">
+    <component id="n14_10i2p" name="n14" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="1500,930">
       <Button title="个人信息"/>
     </component>
-    <component id="n15_10i2p" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" xy="844,-14" size="107,107"/>
-    <graph id="n5_qmc1" name="n5" xy="89,141" size="154,151" scale="1.3,1.3" type="rect" corner="8"/>
-    <loader id="n4_qmc1" name="loader_icon" xy="89,141" size="154,151" scale="1.3,1.3" align="center" vAlign="middle" fill="scaleFree"/>
-    <text id="n6_qmc1" name="tex_name" xy="323,142" size="563,66" font="Microsoft YaHei" fontSize="49" color="#43633d" autoSize="none" text="#43633D"/>
-    <text id="n7_qmc1" name="tex_ip" xy="323,281" size="561,66" font="Microsoft YaHei" fontSize="50" color="#43633d" autoSize="none" text="9A5F34"/>
-    <text id="n8_qmc1" name="tex_id" xy="323,210" size="561,66" font="Microsoft YaHei" fontSize="50" color="#43633d" autoSize="none" text="9A5F34"/>
-    <graph id="n16_10i2p" name="n16" xy="22,450" pivot="0.5,0.5" size="890,110" group="n13_fj6f" type="rect" lineSize="0" fillColor="#4c000000" corner="30"/>
-    <component id="n9_qmc1" name="btn_boom" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="73,448" size="114,112" group="n13_fj6f">
+    <component id="n15_10i2p" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" xy="1407,-14" size="107,107"/>
+    <graph id="n5_qmc1" name="n5" xy="197,225" size="306,306" scale="1.3,1.3" type="rect" lineSize="3" lineColor="#ffffffff" fillColor="#4cffffff" corner="20"/>
+    <loader id="n4_qmc1" name="loader_icon" xy="209,237" size="283,283" scale="1.3,1.3" align="center" vAlign="middle" fill="scaleFree"/>
+    <text id="n6_qmc1" name="tex_name" xy="617,364" size="829,104" font="Microsoft YaHei" fontSize="80" color="#444444" autoSize="none" text="#43633D"/>
+    <text id="n7_qmc1" name="tex_ip" xy="617,488" size="827,104" font="Microsoft YaHei" fontSize="80" color="#444444" autoSize="none" text="9A5F34"/>
+    <text id="n8_qmc1" name="tex_id" xy="617,240" size="832,104" font="Microsoft YaHei" fontSize="80" color="#444444" autoSize="none" text="9A5F34"/>
+    <graph id="n16_10i2p" name="n16" xy="43,682" pivot="0.5,0.5" size="1413,211" group="n13_fj6f" type="rect" lineSize="0" lineColor="#ffb8c7a5" fillColor="#ffb8c7a5" corner="30"/>
+    <component id="n9_qmc1" name="btn_boom" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="62,697" group="n13_fj6f">
       <Button icon="ui://27vd145bhez87j28"/>
     </component>
-    <component id="n10_qmc1" name="btn_egg" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="303,465" size="114,112" group="n13_fj6f">
+    <component id="n10_qmc1" name="btn_egg" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="412,697" group="n13_fj6f">
       <Button icon="ui://27vd145bhez87j29"/>
     </component>
-    <component id="n11_qmc1" name="btn_ring" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="513,448" size="114,112" group="n13_fj6f">
+    <component id="n11_qmc1" name="btn_ring" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="762,697" group="n13_fj6f">
       <Button icon="ui://27vd145bhez87j2a"/>
     </component>
-    <component id="n12_qmc1" name="btn_flower" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="752,448" size="114,112" group="n13_fj6f">
+    <component id="n12_qmc1" name="btn_flower" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="1112,697" group="n13_fj6f">
       <Button icon="ui://27vd145bhez87j2b"/>
     </component>
-    <group id="n13_fj6f" name="n13" xy="22,448" size="890,129" advanced="true">
+    <group id="n13_fj6f" name="n13" xy="43,682" size="1413,211" advanced="true">
       <gearDisplay controller="cMissile" pages="1"/>
     </group>
   </displayList>

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="92,322">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
-  <controller name="hu" pages="0,,1,,2,,3,,4," selected="4"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <controller name="hu" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
-    <loader id="n18_of6w" name="card_4" xy="5,-5" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true">
+    <loader id="n18_of6w" name="card_4" xy="5,-5" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree">
       <gearDisplay controller="c1" pages="2"/>
     </loader>
-    <loader id="n17_of6w" name="card_3" xy="4,78" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true">
+    <loader id="n17_of6w" name="card_3" xy="4,78" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree">
       <gearDisplay controller="c1" pages="1,2"/>
     </loader>
-    <loader id="n16_of6w" name="card_2" xy="4,159" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true"/>
-    <loader id="n15_of6w" name="card_1" xy="4,241" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true"/>
+    <loader id="n16_of6w" name="card_2" xy="4,159" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree"/>
+    <loader id="n15_of6w" name="card_1" xy="4,241" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree"/>
     <group id="n19_of6w" name="n19" xy="4,-5" size="82,327" group="n22_of6w" advanced="true"/>
     <text id="n20_of6w" name="card_type" xy="0,325" pivot="0.5,0.5" size="91,86" group="n22_of6w" font="Microsoft YaHei" fontSize="48" color="#43633d" align="center" vAlign="middle" leading="0" autoSize="shrink" text=""/>
     <text id="n21_of6w" name="card_huxi" xy="-17,-96" pivot="0.5,0.5" size="130,101" group="n22_of6w" font="Microsoft YaHei" fontSize="48" color="#43633d" align="center" vAlign="middle" leading="0" autoSize="shrink" text=""/>
     <group id="n22_of6w" name="n22" xy="-17,-96" size="130,507" advanced="true"/>
-    <image id="n23_of6w" name="n23" src="ufu9u" fileName="component/clearing/image/hu_icon.png" xy="5,55" pivot="0.5,0.5" size="18,18" aspect="true">
+    <image id="n23_of6w" name="n23" src="ufu9u" fileName="component/clearing/image/hu_icon.png" xy="5,38" pivot="0.5,0.5" size="18,18" aspect="true">
       <gearDisplay controller="hu" pages="1,2,3,4"/>
       <gearXY controller="hu" pages="0,1,2,3,4" values="5,38|5,304|4,220|4,136|5,55"/>
     </image>

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/otherCard_item.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="92,322">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
-  <controller name="hu" pages="0,,1,,2,,3,,4," selected="4"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <controller name="hu" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
-    <loader id="n18_of6w" name="card_4" xy="5,-5" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true">
+    <loader id="n18_of6w" name="card_4" xy="5,-5" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree">
       <gearDisplay controller="c1" pages="2"/>
     </loader>
-    <loader id="n17_of6w" name="card_3" xy="4,78" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true">
+    <loader id="n17_of6w" name="card_3" xy="4,78" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree">
       <gearDisplay controller="c1" pages="1,2"/>
     </loader>
-    <loader id="n16_of6w" name="card_2" xy="4,159" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true"/>
-    <loader id="n15_of6w" name="card_1" xy="4,241" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scale" autoSize="true"/>
+    <loader id="n16_of6w" name="card_2" xy="4,159" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree"/>
+    <loader id="n15_of6w" name="card_1" xy="4,241" pivot="0.5,0.5" size="81,81" group="n19_of6w" fill="scaleFree"/>
     <group id="n19_of6w" name="n19" xy="4,-5" size="82,327" group="n22_of6w" advanced="true"/>
     <text id="n20_of6w" name="card_type" xy="0,325" pivot="0.5,0.5" size="91,86" group="n22_of6w" font="Microsoft YaHei" fontSize="48" color="#43633d" align="center" vAlign="middle" leading="0" autoSize="shrink" text=""/>
     <text id="n21_of6w" name="card_huxi" xy="-17,-96" pivot="0.5,0.5" size="130,101" group="n22_of6w" font="Microsoft YaHei" fontSize="48" color="#43633d" align="center" vAlign="middle" leading="0" autoSize="shrink" text=""/>
     <group id="n22_of6w" name="n22" xy="-17,-96" size="130,507" advanced="true"/>
-    <image id="n23_of6w" name="n23" src="ufu9u" fileName="component/clearing/image/hu_icon.png" xy="5,55" pivot="0.5,0.5" size="18,18" aspect="true">
+    <image id="n23_of6w" name="n23" src="ufu9u" fileName="component/clearing/image/hu_icon.png" xy="5,38" pivot="0.5,0.5" size="18,18" aspect="true">
       <gearDisplay controller="hu" pages="1,2,3,4"/>
       <gearXY controller="hu" pages="0,1,2,3,4" values="5,38|5,304|4,220|4,136|5,55"/>
     </image>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml

@@ -1,142 +1,142 @@
-<?xml version='1.0' encoding='utf-8'?>
-<component size="2280,328" opaque="false" initName="player_card_info">
-  <controller name="output" pages="0,,1,,2," selected="0" />
-  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="1" />
-  <controller name="put_error" pages="0,,1," selected="0" />
-  <controller name="piao" pages="0,,1,,2,,3," selected="0" />
-  <controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0" />
-  <controller name="time_clock" pages="0,,1," selected="0" />
-  <controller name="out_card_option2" pages="0,,1," selected="0" />
-  <controller name="canSendCard" pages="0,,1," selected="1" />
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,328" opaque="false" initName="player_card_info">
+  <controller name="output" pages="0,,1,,2," selected="0"/>
+  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
+  <controller name="put_error" pages="0,,1," selected="0"/>
+  <controller name="piao" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
+  <controller name="time_clock" pages="0,,1," selected="0"/>
+  <controller name="out_card_option2" pages="0,,1," selected="0"/>
+  <controller name="canSendCard" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n47_g618" name="hand_poker_c" src="yffn8t" fileName="component/poker/hand_poker_con.xml" xy="-218,-1283" size="2565,190" visible="false">
-      <relation target="" sidePair="bottom-bottom,width-width" />
+    <component id="n47_g618" name="hand_poker_c" src="yffn8t" fileName="component/poker/hand_poker_con.xml" xy="-218,-1283" size="2817,190" visible="false">
+      <relation target="" sidePair="bottom-bottom,width-width"/>
     </component>
     <list id="n46_sdax" name="out_card_list" xy="190,-748" size="874,256" visible="false" layout="row" colGap="-50" autoItemSize="false" align="center" vAlign="middle">
-      <gearDisplay controller="output" pages="1" />
+      <gearDisplay controller="output" pages="1"/>
     </list>
-    <component id="n49_g618" name="btn_put" src="yffn8u" fileName="component/Btn_Yellow.xml" xy="-324,398" group="n51_g618" scale="1.1,1.1">
-      <Button icon="ui://8wph7p8nyffn8w" />
+    <component id="n49_g618" name="btn_put" src="yffn8u" fileName="component/Btn_Yellow.xml" xy="-72,398" group="n51_g618" scale="1.1,1.1">
+      <Button icon="ui://8wph7p8nyffn8w"/>
     </component>
-    <component id="n48_g618" name="btn_not_put" src="yffn8u" fileName="component/Btn_Yellow.xml" xy="-1173,395" group="n51_g618" scale="1.1,1.1">
-      <gearDisplay controller="out_card_option" pages="1" />
-      <Button icon="ui://8wph7p8nyffn8x" />
+    <component id="n48_g618" name="btn_not_put" src="yffn8u" fileName="component/Btn_Yellow.xml" xy="-921,395" group="n51_g618" scale="1.1,1.1">
+      <gearDisplay controller="out_card_option" pages="1"/>
+      <Button icon="ui://8wph7p8nyffn8x"/>
     </component>
-    <component id="n50_g618" name="btn_tips" src="yffn8u" fileName="component/Btn_Yellow.xml" xy="-733,398" group="n51_g618" scale="1.1,1.1">
-      <Button icon="ui://8wph7p8nyffn8y" />
+    <component id="n50_g618" name="btn_tips" src="yffn8u" fileName="component/Btn_Yellow.xml" xy="-481,398" group="n51_g618" scale="1.1,1.1">
+      <Button icon="ui://8wph7p8nyffn8y"/>
     </component>
-    <group id="n51_g618" name="btn_old" xy="-1173,395" size="1125,131" visible="false" advanced="true">
-      <gearDisplay controller="out_card_option" pages="1,2" />
-      <relation target="" sidePair="bottom-top,left-right" />
+    <group id="n51_g618" name="btn_old" xy="-921,395" size="1125,131" visible="false" advanced="true">
+      <gearDisplay controller="out_card_option" pages="1,2"/>
+      <relation target="" sidePair="bottom-top,left-right"/>
     </group>
     <image id="n53_g618" name="n53" src="yffn3t" fileName="Main_New/Image/要不起.png" xy="1031,-171" size="213,62">
-      <gearDisplay controller="output" pages="2" />
+      <gearDisplay controller="output" pages="2"/>
     </image>
-    <text id="n57_pgkj" name="Score" xy="-146,0" size="144,51" alpha="0" font="ui://8wph7p8nyffn8z" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="" bold="true" />
-    <text id="n60_8yp0" name="area_mask" xy="-442,-389" size="358,389" visible="false" fontSize="30" autoSize="none" text="{&#10;&quot;outcard_list&quot;:{&#10;    &quot;parent&quot;:&quot;hand_poker_c&quot;,&#10;    &quot;obj&quot;:&quot;poker7&quot;,&#10;    &quot;maxcount_x&quot;:16,&#10;    &quot;start_x&quot;:-42,&#10;    &quot;start_y&quot;:100&#10;    }&#10;}" bold="true" />
-    <component id="n61_agiz" name="mask_liangpai" src="yffn9d" fileName="component/Component1.xml" xy="320,-220" size="5,5" />
+    <text id="n57_pgkj" name="Score" xy="-146,0" size="144,51" alpha="0" font="ui://8wph7p8nyffn8z" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text=""/>
+    <text id="n60_8yp0" name="area_mask" xy="-442,-389" size="358,389" visible="false" fontSize="30" autoSize="none" bold="true" text="{&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;parent&quot;:&quot;hand_poker_c&quot;,&#xA;    &quot;obj&quot;:&quot;poker7&quot;,&#xA;    &quot;maxcount_x&quot;:16,&#xA;    &quot;start_x&quot;:-42,&#xA;    &quot;start_y&quot;:100&#xA;    }&#xA;}"/>
+    <component id="n61_agiz" name="mask_liangpai" src="yffn9d" fileName="component/Component1.xml" xy="320,-220" size="5,5"/>
     <component id="n68_i3h6" name="piao0" src="yffn9e" fileName="component/piao/btn_nopiao.xml" xy="66,-185" size="218,103" group="n63_i3h6" scale="1.5,1.5">
-      <gearDisplay controller="piao" pages="1,2,3" />
-      <Button controller="piao_value" page="0" />
+      <gearDisplay controller="piao" pages="1,2,3"/>
+      <Button controller="piao_value" page="0"/>
     </component>
     <component id="n62_i3h6" name="piao1" src="yffn9h" fileName="component/piao/btn_piao.xml" xy="410,-185" size="218,103" group="n63_i3h6" scale="1.5,1.5">
-      <gearDisplay controller="piao" pages="1" />
-      <Button icon="ui://8wph7p8nyffn9l" selectedIcon="ui://8wph7p8nyffn9l" controller="piao_value" page="1" />
+      <gearDisplay controller="piao" pages="1"/>
+      <Button icon="ui://8wph7p8nyffn9l" selectedIcon="ui://8wph7p8nyffn9l" controller="piao_value" page="1"/>
     </component>
     <component id="n64_i3h6" name="piao2" src="yffn9h" fileName="component/piao/btn_piao.xml" xy="492,-185" size="218,103" group="n63_i3h6" scale="1.5,1.5">
-      <gearDisplay controller="piao" pages="1,2,3" />
-      <gearXY controller="piao" pages="0,1,2,3" values="492,-185|754,-185|410,-185|410,-185" />
-      <Button icon="ui://8wph7p8nyffn9m" selectedIcon="ui://8wph7p8nyffn9m" controller="piao_value" page="2" />
+      <gearDisplay controller="piao" pages="1,2,3"/>
+      <gearXY controller="piao" pages="0,1,2,3" values="492,-185|754,-185|410,-185|410,-185"/>
+      <Button icon="ui://8wph7p8nyffn9m" selectedIcon="ui://8wph7p8nyffn9m" controller="piao_value" page="2"/>
     </component>
     <component id="n65_i3h6" name="piao3" src="yffn9h" fileName="component/piao/btn_piao.xml" xy="725,-185" size="218,103" group="n63_i3h6" scale="1.5,1.5">
-      <gearDisplay controller="piao" pages="1,2" />
-      <gearXY controller="piao" pages="0,1,2" values="725,-185|1098,-185|754,-185" default="725,-185" />
-      <Button icon="ui://8wph7p8nyffn9n" selectedIcon="ui://8wph7p8nyffn9n" controller="piao_value" page="3" />
+      <gearDisplay controller="piao" pages="1,2"/>
+      <gearXY controller="piao" pages="0,1,2" values="725,-185|1098,-185|754,-185" default="725,-185"/>
+      <Button icon="ui://8wph7p8nyffn9n" selectedIcon="ui://8wph7p8nyffn9n" controller="piao_value" page="3"/>
     </component>
     <component id="n66_i3h6" name="piao5" src="yffn9h" fileName="component/piao/btn_piao.xml" xy="492,-185" size="218,103" group="n63_i3h6" scale="1.5,1.5">
-      <gearDisplay controller="piao" pages="2,3" />
-      <gearXY controller="piao" pages="0,1,2,3" values="492,-185|532,-185|1098,-185|754,-185" />
-      <Button icon="ui://8wph7p8nyffn9o" selectedIcon="ui://8wph7p8nyffn9o" controller="piao_value" page="4" />
+      <gearDisplay controller="piao" pages="2,3"/>
+      <gearXY controller="piao" pages="0,1,2,3" values="492,-185|532,-185|1098,-185|754,-185"/>
+      <Button icon="ui://8wph7p8nyffn9o" selectedIcon="ui://8wph7p8nyffn9o" controller="piao_value" page="4"/>
     </component>
     <component id="n67_i3h6" name="piao8" src="yffn9h" fileName="component/piao/btn_piao.xml" xy="1098,-185" size="218,103" group="n63_i3h6" scale="1.5,1.5">
-      <gearDisplay controller="piao" pages="3" />
-      <Button icon="ui://8wph7p8nyffn9j" selectedIcon="ui://8wph7p8nyffn9j" controller="piao_value" page="5" />
+      <gearDisplay controller="piao" pages="3"/>
+      <Button icon="ui://8wph7p8nyffn9j" selectedIcon="ui://8wph7p8nyffn9j" controller="piao_value" page="5"/>
     </component>
-    <group id="n63_i3h6" name="piao" xy="66,-185" size="1250,103" />
-    <list id="n69_ckvb" name="List_HandCard" xy="-72,-1" size="2426,328" layout="row" selectionMode="none" colGap="-135" defaultItem="ui://8wph7p8nyffn2h" align="center" vAlign="middle" autoClearItems="true">
-      <relation target="" sidePair="width-width,height-height" />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
+    <group id="n63_i3h6" name="piao" xy="66,-185" size="1250,103"/>
+    <list id="n69_ckvb" name="List_HandCard" xy="-73,-551" size="2678,878" layout="row" selectionMode="none" colGap="-135" defaultItem="ui://8wph7p8nyffn2h" autoItemSize="false" align="center" vAlign="bottom" autoClearItems="true">
+      <relation target="" sidePair="width-width,height-height"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
     <list id="n70_ckvb" name="List_Out" xy="260,-311" pivot="0.5,0.5" size="1760,210" layout="row" selectionMode="none" colGap="-101" defaultItem="ui://8wph7p8nyffn2g" align="center" vAlign="middle">
-      <gearDisplay controller="output" pages="1" />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
-      <item />
+      <gearDisplay controller="output" pages="1"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
-    <component id="n74_ckvb" name="Btn_SendCard" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1192,-223" size="400,169" group="n73_ckvb">
-      <gearLook controller="canSendCard" pages="0" values="1,0,1,0" default="1,0,0,1" />
-      <Button icon="ui://27vd145byffn7ipa" sound="" />
+    <component id="n74_ckvb" name="Btn_SendCard" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1192,-223" size="400,169" group="n73_ckvb" touchable="false" grayed="true">
+      <gearLook controller="canSendCard" pages="0" values="1,0,1,0" default="1,0,0,1"/>
+      <Button icon="ui://27vd145byffn7ipa" sound=""/>
     </component>
     <component id="n75_ckvb" name="Btn_Tip" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="722,-223" size="400,169" group="n73_ckvb">
-      <Button icon="ui://27vd145byffn7ipg" sound="" />
+      <Button icon="ui://27vd145byffn7ipg" sound=""/>
     </component>
     <group id="n73_ckvb" name="btn" xy="722,-223" size="870,169" advanced="true">
-      <gearDisplay controller="out_card_option" pages="1,2" />
+      <gearDisplay controller="out_card_option" pages="1,2"/>
     </group>
     <text id="n56_dg1i" name="put_error" xy="717,-276" size="781,83" fontSize="50" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" shadowColor="#000000" shadowOffset="1,1" text="出牌不符合规定牌型">
-      <gearDisplay controller="put_error" pages="1" />
+      <gearDisplay controller="put_error" pages="1"/>
     </text>
     <component id="n77_n9qr" name="Comp_Clock" src="yffn1j" fileName="Main_New/Component/Comp_Clock.xml" xy="536,-205" size="174,143" visible="false">
-      <gearDisplay controller="time_clock" pages="1" />
+      <gearDisplay controller="time_clock" pages="1"/>
     </component>
     <component id="n78_g6m8" name="Btn_SendCard_back" src="yffn1l" fileName="Main_New/Component/Btn_SendCard.xml" xy="1170,-197" size="384,125" group="n80_g6m8">
-      <Button sound="" />
+      <Button sound=""/>
     </component>
     <component id="n79_g6m8" name="Btn_Tip_back" src="yffn1o" fileName="Main_New/Component/Btn_Tip.xml" xy="740,-201" size="384,125" group="n80_g6m8">
-      <Button sound="" />
+      <Button sound=""/>
     </component>
     <group id="n80_g6m8" name="btn_back" xy="740,-201" size="814,129" advanced="true">
-      <gearDisplay controller="out_card_option2" pages="1" />
+      <gearDisplay controller="out_card_option2" pages="1"/>
     </group>
   </displayList>
   <transition name="score">
-    <item time="0" type="Alpha" target="n57_pgkj" tween="true" startValue="0" endValue="1" duration="18" />
-    <item time="0" type="XY" target="n57_pgkj" tween="true" startValue="-146,-150" endValue="-146,-230" duration="18" />
-    <item time="18" type="Alpha" target="n57_pgkj" tween="true" startValue="1" endValue="1" duration="12" />
-    <item time="30" type="Alpha" target="n57_pgkj" tween="true" startValue="1" endValue="0" duration="6" />
+    <item time="0" type="Alpha" target="n57_pgkj" tween="true" startValue="0" endValue="1" duration="18"/>
+    <item time="0" type="XY" target="n57_pgkj" tween="true" startValue="-146,-150" endValue="-146,-230" duration="18"/>
+    <item time="18" type="Alpha" target="n57_pgkj" tween="true" startValue="1" endValue="1" duration="12"/>
+    <item time="30" type="Alpha" target="n57_pgkj" tween="true" startValue="1" endValue="0" duration="6"/>
   </transition>
   <transition name="score_1">
-    <item time="0" type="Alpha" target="n57_pgkj" tween="true" startValue="0" endValue="1" duration="18" />
-    <item time="0" type="XY" target="n57_pgkj" tween="true" startValue="-146,-150" endValue="-146,-230" duration="18" />
+    <item time="0" type="Alpha" target="n57_pgkj" tween="true" startValue="0" endValue="1" duration="18"/>
+    <item time="0" type="XY" target="n57_pgkj" tween="true" startValue="-146,-150" endValue="-146,-230" duration="18"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/shengyu.xml

@@ -4,7 +4,7 @@
     <image id="n0_qz7i" name="n0" src="yffn2l" fileName="newcard/00.png" xy="-2,-1" size="102,117">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_qz7i" name="title" xy="12,31" pivot="0.5,0.5" size="71,66" scale="1.6,1.2" font="ui://8wph7p8nyffn2m" fontSize="62" color="#ffffff" leading="0" letterSpacing="-15" text="15">
+    <text id="n1_qz7i" name="title" xy="19,23" pivot="0.5,0.5" size="58,69" scale="1.6,1.2" font="ui://8wph7p8nyffn2m" fontSize="54" color="#ffffff" leading="0" text="15">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@@ -79,7 +79,7 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </text>
-    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2368,293"/>
+    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2388,313"/>
     <component id="n79_roef" name="btn_distance" src="yffnj3" fileName="component/gps/btn_distance_new.xml" xy="1729,1848" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
@@ -149,7 +149,7 @@
       <relation target="" sidePair="left-left,bottom-bottom%"/>
     </component>
     <group id="n121_ckvb" name="playiinfo" xy="130,86" size="2329,641"/>
-    <component id="n69_sdax" name="player_card_info_1" src="yffn8s" fileName="Main_New/Player_card_info_1.xml" xy="126,838" group="n122_ckvb">
+    <component id="n69_sdax" name="player_card_info_1" src="yffn8s" fileName="Main_New/Player_card_info_1.xml" xy="0,838" size="2532,328" group="n122_ckvb">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width%,height-height%,center-center,bottom-bottom"/>
@@ -158,7 +158,7 @@
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
-    <group id="n122_ckvb" name="playCardInfo" xy="126,243" size="2280,923"/>
+    <group id="n122_ckvb" name="playCardInfo" xy="0,243" size="2532,923"/>
     <component id="n153_n9qr" name="btn_ready_inClear" src="yffn1u" fileName="Main_New/Component/Btn_Ready.xml" xy="1078,712" size="378,127">
       <gearDisplay controller="Inclear" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,center-center,top-middle%"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/bmtFont_shengyuNum/RunFastShengYu.fnt

@@ -1,11 +1,11 @@
-info size=36 resizable=true colored=true
-char id=48 img=yffn2n xoffset=0 yoffset=0 xadvance=0
-char id=49 img=yffn2o xoffset=0 yoffset=0 xadvance=0
-char id=50 img=yffn2p xoffset=0 yoffset=0 xadvance=0
-char id=51 img=yffn2q xoffset=0 yoffset=0 xadvance=0
-char id=52 img=yffn2r xoffset=0 yoffset=0 xadvance=0
-char id=53 img=yffn2s xoffset=0 yoffset=0 xadvance=0
-char id=54 img=yffn2t xoffset=0 yoffset=0 xadvance=0
-char id=55 img=yffn2u xoffset=0 yoffset=0 xadvance=0
-char id=56 img=yffn2v xoffset=0 yoffset=0 xadvance=0
-char id=57 img=yffn2w xoffset=0 yoffset=0 xadvance=0
+info size=80 resizable=true colored=true
+char id=48 img=a1zfckd xoffset=0 yoffset=0 xadvance=0
+char id=49 img=a1zfcke xoffset=0 yoffset=0 xadvance=0
+char id=50 img=a1zfckf xoffset=0 yoffset=0 xadvance=0
+char id=51 img=a1zfckg xoffset=0 yoffset=0 xadvance=0
+char id=52 img=a1zfckh xoffset=0 yoffset=0 xadvance=0
+char id=53 img=a1zfcki xoffset=0 yoffset=0 xadvance=0
+char id=54 img=a1zfckj xoffset=0 yoffset=0 xadvance=0
+char id=55 img=a1zfckk xoffset=0 yoffset=0 xadvance=0
+char id=56 img=a1zfckl xoffset=0 yoffset=0 xadvance=0
+char id=57 img=a1zfckm xoffset=0 yoffset=0 xadvance=0

wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml

@@ -11,7 +11,7 @@
   <controller name="text_color" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1," selected="0"/>
   <controller name="time" pages="0,,1," selected="0"/>
-  <controller name="shengyu" pages="0,,1," selected="0"/>
+  <controller name="shengyu" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n5" name="btn_head" src="ik9v7ijw" fileName="buttons/Btn_HeadRound5x.xml" pkg="27vd145b" xy="0,0" size="125,125" group="n33_e7qn" aspect="true"/>
     <graph id="n32_kba2" name="offLine" xy="0,0" size="125,125" group="n33_e7qn" aspect="true" touchable="false" type="rect" lineSize="0" fillColor="#b3000000">
@@ -64,7 +64,7 @@
     </text>
     <group id="n59_qcrm" name="zhanji" xy="-27,213" size="185,42" visible="false" advanced="true"/>
     <component id="n60_hez8" name="comp_hudon" src="e54q2v" fileName="component/Face3.xml" pkg="l0ds4ys6" xy="-20,-6" size="174,174" aspect="true" touchable="false"/>
-    <component id="n61_10i2p" name="shengyu" src="yffn8o" fileName="Main_New/shengyu.xml" xy="13,264">
+    <component id="n61_10i2p" name="shengyu" src="yffn8o" fileName="Main_New/shengyu.xml" xy="13,257">
       <gearDisplay controller="shengyu" pages="1"/>
     </component>
   </displayList>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -96,16 +96,6 @@
     <component id="yffn2k" name="btn_shengyu.xml" path="/Main_New/Component/"/>
     <image id="yffn2l" name="00.png" path="/newcard/" exported="true"/>
     <font id="yffn2m" name="RunFastShengYu.fnt" path="/bmtFont_shengyuNum/" exported="true"/>
-    <image id="yffn2n" name="0.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2o" name="1.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2p" name="2.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2q" name="3.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2r" name="4.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2s" name="5.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2t" name="6.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2u" name="7.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2v" name="8.png" path="/bmtFont_shengyuNum/"/>
-    <image id="yffn2w" name="9.png" path="/bmtFont_shengyuNum/"/>
     <image id="yffn2x" name="exit_room.png" path="/Main_New/Component/"/>
     <image id="yffn2y" name="dismiss_room.png" path="/Main_New/Component/"/>
     <component id="yffn2z" name="btn_gameDismissRoom.xml" path="/Main_New/Component/"/>
@@ -868,6 +858,16 @@
     <component id="qcrmck0" name="Btn_record_return.xml" path="/Main_style_2/record/"/>
     <image id="qcrmck1" name="button03.png" path="/Main_style_2/images/record/"/>
     <image id="qcrmck2" name="jfk(1).png" path="/component/head/" scale="9grid" scale9grid="77,9,22,19"/>
+    <image id="a1zfckd" name="0 - 0.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfcke" name="1 - 1.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfckf" name="2 - 2.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfckg" name="3 - 3.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfckh" name="4 - 4.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfcki" name="5 - 5.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfckj" name="6 - 6.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfckk" name="7 - 7.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfckl" name="8 - 8.png" path="/bmtFont_shengyuNum/"/>
+    <image id="a1zfckm" name="9 - 9.png" path="/bmtFont_shengyuNum/"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml

@@ -2,13 +2,13 @@
 <component size="2532,1172" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
   <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
-  <controller name="jushu" pages="0,,1," selected="1"/>
-  <controller name="bg_state" pages="0,,1,,2," selected="0"/>
+  <controller name="action" pages="2,空,0,准备,1,开始" selected="1"/>
+  <controller name="jushu" pages="0,,1," selected="0"/>
+  <controller name="bg_state" pages="0,,1,,2," selected="2"/>
   <displayList>
     <image id="n196_h5b1" name="n196" src="h5b1rn" fileName="component/Main/images/floorTop.png" xy="801,1" size="927,113"/>
     <text id="n205_e5js" name="text_playName" xy="1268,504" pivot="0.5,0" size="0,124" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="fffffffffdddd"/>
-    <text id="n176_fgao" name="di_text" xy="0,0" size="313,56" group="n150_8th3" font="Microsoft YaHei" fontSize="36" color="#ffffff" vAlign="middle" autoSize="none" text="玩法名称">
+    <text id="n176_fgao" name="di_text" xy="0,0" size="313,56" group="n150_8th3" font="Microsoft YaHei" fontSize="36" color="#367c7d" vAlign="middle" autoSize="none" text="玩法名称">
       <gearDisplay controller="state" pages="0,1,2"/>
       <gearColor controller="bg_state" pages="0,1" values="#ffffff,#296137|#655c6a,#322e34" default="#367c7d,#235557"/>
       <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
@@ -31,6 +31,10 @@
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </image>
+    <text id="n27" name="remaining_card" xy="1183,114" size="165,49" font="Microsoft YaHei" fontSize="34" align="center" autoSize="none" text="剩余20张">
+      <gearDisplay controller="state" pages="1,3"/>
+      <relation target="" sidePair="center-center"/>
+    </text>
     <loader id="n156_mk2u" name="jiang" xy="450,91" size="65,75" fill="scaleFree"/>
     <component id="n61_jali" name="player_card_info1" src="peuq5a" fileName="component/Main/component/Player_card_info_1.xml" xy="0,943" size="2532,228">
       <gearDisplay controller="state" pages="1,3"/>
@@ -94,10 +98,6 @@
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <text id="n27" name="remaining_card" xy="1183,114" size="165,49" font="Microsoft YaHei" fontSize="34" align="center" autoSize="none" text="剩余20张">
-      <gearDisplay controller="state" pages="1,3"/>
-      <relation target="" sidePair="center-center"/>
-    </text>
     <component id="n162_o49p" name="btn_getRoomNum" src="peuq91" fileName="component/room/btn_invite.xml" xy="1096,468" group="n163_o49p" visible="false" touchable="false">
       <Button icon="ui://lkq9ne9speuq93"/>
     </component>
@@ -113,7 +113,7 @@
     </component>
     <component id="n198_h5b1" name="safe_bg" src="o0c1ru" fileName="component/Main/main_2_safe_bg.xml" xy="2335,0" size="200,1170"/>
     <component id="n193_syh3" name="btn_safe" src="syh3rj" fileName="component/Main/btn_safe.xml" xy="2383,19" size="109,109"/>
-    <component id="n201_o0c1" name="btn_rule" src="o0c1rv" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="636,14" group="n183_yfzf"/>
+    <component id="n201_o0c1" name="btn_rule" src="o0c1rv" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="1896,27" group="n183_yfzf"/>
     <component id="n166_o49p" name="btn_back_lobby" src="peuq3r" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="2381,201" size="109,109" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
@@ -126,7 +126,7 @@
     <component id="n168_o49p" name="btn_setting" src="peuq3c" fileName="component/Main/component/Folder/component/phone_info/Btn_setting.xml" xy="2383,380" size="109,109" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <group id="n183_yfzf" name="n183" xy="636,14" size="1856,637" advanced="true">
+    <group id="n183_yfzf" name="n183" xy="1896,27" size="596,624" advanced="true">
       <relation target="" sidePair=""/>
     </group>
   </displayList>

wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml

@@ -7,13 +7,13 @@
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="dismiss_room" pages="0,,1," selected="0"/>
   <controller name="time" pages="0,,1," selected="0"/>
-  <controller name="huxi" pages="0,,1," selected="0"/>
+  <controller name="huxi" pages="0,,1," selected="1"/>
   <controller name="tuo" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1," selected="0"/>
   <controller name="jushou" pages="0,,1," selected="0"/>
   <controller name="chui" pages="0,,1,,2," selected="0"/>
   <controller name="sishou" pages="0,,1," selected="0"/>
-  <controller name="zhanji" pages="0,,1," selected="0"/>
+  <controller name="zhanji" pages="0,,1," selected="1"/>
   <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n77_o49p" name="n77" src="peuq4x" fileName="component/Main/component/new_ui/touxiang_img.png" xy="49,65" size="93,92"/>
@@ -62,10 +62,10 @@
     <component id="n41_jali" name="n41" pkg="lkq9ne9s" src="peuq66" fileName="component/VoiceMask(1).xml" xy="34,63" size="133,125">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
-    <image id="n94_o0c1" name="n94" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-32,299" size="276,61" group="n51_m25s"/>
-    <text id="n49_m25s" name="huxi" xy="67,299" size="163,49" group="n51_m25s" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="11111"/>
-    <text id="n50_m25s" name="n50" xy="-35,304" size="94,49" group="n51_m25s" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="胡息&#xA;"/>
-    <group id="n51_m25s" name="n51" xy="-35,299" size="279,61" advanced="true">
+    <image id="n94_o0c1" name="n94" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-32,299" size="276,61" group="n51_m25s" visible="false"/>
+    <text id="n49_m25s" name="huxi" xy="28,298" size="163,49" group="n51_m25s" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="11111"/>
+    <text id="n50_m25s" name="n50" xy="-35,304" size="94,49" group="n51_m25s" visible="false" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="胡息&#xA;"/>
+    <group id="n51_m25s" name="n51" xy="-35,298" size="279,62" advanced="true">
       <gearDisplay controller="huxi" pages="1"/>
     </group>
     <component id="n78_fgao" name="info" src="peuq6g" fileName="component/Main/component/HeadNameBG.xml" xy="40,211" size="124,56"/>
@@ -94,10 +94,10 @@
     <image id="n71_o49p" name="n71" src="peuq6k" fileName="font/images/game/game_new_fonts_01.png" xy="171,155">
       <gearDisplay controller="read" pages="1"/>
     </image>
-    <image id="n74_o49p" name="n74" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-29,362" size="276,61" group="n76_o49p"/>
-    <text id="n60_seby" name="tex_jifen" xy="69,361" size="165,56" group="n76_o49p" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="22222"/>
-    <text id="n75_o49p" name="tex_jifen_text" xy="-35,368" size="102,49" group="n76_o49p" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="战绩"/>
-    <group id="n76_o49p" name="n76" xy="-35,361" size="282,62" advanced="true">
+    <image id="n74_o49p" name="n74" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-29,362" size="276,61" group="n76_o49p" visible="false"/>
+    <text id="n60_seby" name="tex_jifen" xy="26,351" size="165,56" group="n76_o49p" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="22222"/>
+    <text id="n75_o49p" name="tex_jifen_text" xy="-35,368" size="102,49" group="n76_o49p" visible="false" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="战绩"/>
+    <group id="n76_o49p" name="n76" xy="-35,351" size="282,72" advanced="true">
       <gearDisplay controller="zhanji" pages="1"/>
     </group>
     <text id="n84_nkur" name="tuoguanTips" xy="183,23" size="302,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间"/>

wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml

@@ -6,13 +6,13 @@
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="time" pages="0,,1," selected="0"/>
-  <controller name="huxi" pages="0,,1," selected="0"/>
+  <controller name="huxi" pages="0,,1," selected="1"/>
   <controller name="tuo" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1," selected="0"/>
   <controller name="jushou" pages="0,,1," selected="0"/>
   <controller name="chui" pages="0,,1,,2," selected="0"/>
   <controller name="sishou" pages="0,,1," selected="0"/>
-  <controller name="zhanji" pages="0,,1," selected="0"/>
+  <controller name="zhanji" pages="0,,1," selected="1"/>
   <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n76_o49p" name="n76" src="peuq4x" fileName="component/Main/component/new_ui/touxiang_img.png" xy="52,62" size="92,96"/>
@@ -69,9 +69,9 @@
     <component id="n45_jali" name="n45" pkg="lkq9ne9s" src="peuq66" fileName="component/VoiceMask(1).xml" xy="53,-11">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
-    <image id="n95_o0c1" name="n95" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-15,303" size="276,61" group="n49_lr5d"/>
-    <text id="n48_lr5d" name="huxi" xy="85,308" size="171,49" group="n49_lr5d" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" singleLine="true" text="11111"/>
-    <text id="n53_m25s" name="n53" xy="-15,309" size="88,49" group="n49_lr5d" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="胡息&#xA;"/>
+    <image id="n95_o0c1" name="n95" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-15,303" size="276,61" group="n49_lr5d" visible="false"/>
+    <text id="n48_lr5d" name="huxi" xy="29,303" size="171,49" group="n49_lr5d" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" singleLine="true" text="11111"/>
+    <text id="n53_m25s" name="n53" xy="-15,309" size="88,49" group="n49_lr5d" visible="false" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="胡息&#xA;"/>
     <group id="n49_lr5d" name="n49" xy="-15,303" size="276,61" advanced="true">
       <gearDisplay controller="huxi" pages="1"/>
     </group>
@@ -93,10 +93,10 @@
     <image id="n60_enxu" name="n60" src="peuq6j" fileName="images/jiachui.png" xy="156,79">
       <gearDisplay controller="chui" pages="1,2"/>
     </image>
-    <image id="n71_o49p" name="n71" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-15,367" size="276,61" group="n74_o49p"/>
-    <text id="n72_o49p" name="tex_jifen" xy="88,370" size="160,53" group="n74_o49p" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="22222"/>
-    <text id="n73_o49p" name="tex_jifen_text" xy="-11,375" size="84,49" group="n74_o49p" fontSize="36" color="#8c3312" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="战绩"/>
-    <group id="n74_o49p" name="n74" xy="-15,367" size="276,61" advanced="true">
+    <image id="n71_o49p" name="n71" src="peuq6i" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-15,357" size="276,61" group="n74_o49p" visible="false"/>
+    <text id="n72_o49p" name="tex_jifen" xy="32,360" size="160,53" group="n74_o49p" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="22222"/>
+    <text id="n73_o49p" name="tex_jifen_text" xy="-11,365" size="84,49" group="n74_o49p" visible="false" fontSize="36" color="#8c3312" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="战绩"/>
+    <group id="n74_o49p" name="n74" xy="-15,357" size="276,61" advanced="true">
       <gearDisplay controller="zhanji" pages="1"/>
     </group>
     <text id="n82_nkur" name="tuoguanTips" xy="202,75" size="533,49" visible="false" fontSize="36" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml

@@ -3,12 +3,12 @@
   <controller name="chupai" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1,,3,,4," selected="0"/>
   <controller name="piaovalue" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
-  <controller name="niao" pages="0,,1," selected="0"/>
+  <controller name="niao" pages="0,,1," selected="1"/>
   <displayList>
     <list id="n36_lr5d" name="windcard_list" xy="2494,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://lkq9ne9speuq2">
       <relation target="" sidePair="right-right"/>
     </list>
-    <list id="n35_lr5d" name="area_fz_list" xy="1068,201" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="18" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
+    <list id="n35_lr5d" name="area_fz_list" xy="1068,201" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="20" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="rightext-left,topext-bottom,bottomext-bottom,leftext-left"/>
       <item/>
       <item/>
@@ -16,11 +16,11 @@
     <component id="n25" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="447,1021" size="1698,148">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n37_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="868,-91" size="5,5"/>
+    <component id="n37_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="1480,-501" size="5,5"/>
     <component id="n38_ey1o" name="n38" src="peuq5b" fileName="component/Main/component/PromptOutCard.xml" xy="16,-177" size="1577,5">
       <gearDisplay controller="chupai" pages="1"/>
     </component>
-    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1178,-751" size="100,100" touchable="false"/>
+    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1178,-899" size="100,100"/>
     <component id="n39_j34t" name="piao0" src="peuq5f" fileName="component/piao/btn_nopiao.xml" xy="668,-20" group="n45_j34t">
       <gearDisplay controller="piao" pages="1,3,4"/>
       <Button controller="piaovalue" page="0"/>
@@ -49,13 +49,13 @@
       <Button icon="ui://lkq9ne9speuq5k" selectedIcon="ui://lkq9ne9speuq5k" controller="piaovalue" page="5"/>
     </component>
     <group id="n45_j34t" name="piao" xy="668,-53" size="949,136"/>
-    <component id="n46_cphv" name="daniao" src="peuq5q" fileName="component/niao/btn_niao.xml" xy="802,-272" size="400,169" group="n48_cphv">
+    <component id="n46_cphv" name="daniao" src="peuq5q" fileName="component/niao/btn_niao.xml" xy="1376,-342" size="400,169" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <component id="n47_cphv" name="budaniao" src="peuq5s" fileName="component/niao/btn_noniao.xml" xy="1416,-272" size="400,169" group="n48_cphv">
+    <component id="n47_cphv" name="budaniao" src="peuq5s" fileName="component/niao/btn_noniao.xml" xy="746,-342" size="400,169" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <group id="n48_cphv" name="niao" xy="802,-272" size="1014,169" advanced="true">
+    <group id="n48_cphv" name="niao" xy="746,-342" size="1030,169" advanced="true">
       <relation target="" sidePair=""/>
     </group>
   </displayList>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" opaque="false" initName="player_card_info">
   <displayList>
-    <list id="n47_lr5d" name="area_fz_list" xy="84,31" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="18" align="right" vAlign="bottom"/>
-    <list id="n48_lr5d" name="windcard_list" xy="84,350" size="535,530" touchable="false" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw"/>
+    <list id="n47_lr5d" name="area_fz_list" xy="0,31" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="20" align="right" vAlign="bottom"/>
+    <list id="n48_lr5d" name="windcard_list" xy="0,350" size="535,530" touchable="false" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw"/>
     <component id="n50_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="200,83" size="5,5"/>
-    <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="869,140" size="100,100" touchable="false"/>
+    <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="289,-26" size="100,100"/>
     <component id="n51_n7o4" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="226,230" size="717,533" touchable="false"/>
   </displayList>
   <transition name="t0">

wb_new_ui/assets/Main_RunBeard/component/cards/Gcm_OutCard.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="147,437">
+<component size="132,393">
   <displayList>
-    <image id="n2_ddb9" name="show_di_bg" src="peuqa" fileName="component/cards/zipai_di_bg.png" xy="-51,-50" size="243,559">
+    <image id="n2_ddb9" name="show_di_bg" src="peuqa" fileName="component/cards/zipai_di_bg.png" xy="-45,-44" size="215,495" visible="false">
       <relation target="n1_wyal" sidePair="width-width%,height-height%,center-center%,middle-middle%"/>
     </image>
-    <loader id="n1_wyal" name="icon" xy="0,0" size="147,437" url="ui://lkq9ne9speuqb" fill="scale" clearOnPublish="true"/>
+    <loader id="n1_wyal" name="icon" xy="0,0" size="130,387" url="ui://lkq9ne9speuqb" fill="scale" clearOnPublish="true"/>
   </displayList>
   <transition name="mopai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="148.076,438.809" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="133.508,395.639" duration="7"/>
     <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
-    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-365,-40" endValue="0,-1" duration="7"/>
+    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="40,-60" endValue="0,-1" duration="7"/>
     <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
     <item time="7" type="Size" target="n2_ddb9" value="-,-"/>
     <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
   </transition>
   <transition name="mopai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="146.63,434.524" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="130.737,387.426" duration="7"/>
     <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="300,50" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
@@ -23,45 +23,45 @@
     <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
   </transition>
   <transition name="mopai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="145.626,431.55" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="131.573,389.905" duration="7"/>
     <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
-    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="300,0" endValue="0,0" duration="7"/>
+    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="722,167" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
     <item time="7" type="Size" target="n2_ddb9" value="-,-"/>
     <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
   </transition>
   <transition name="cpai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="146.441,433.963" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.57,389.895" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="240,100" endValue="0,0" duration="7"/>
   </transition>
   <transition name="cpai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="148.163,439.069" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.471,389.603" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-180,280" endValue="0,0" duration="7"/>
   </transition>
   <transition name="cpai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="145.577,431.406" duration="7"/>
-    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-189,149" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.6,389.987" duration="7"/>
+    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-536,162" endValue="0,0" duration="7"/>
   </transition>
   <transition name="mopai4">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="145.112,430.025" duration="5"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.559,389.862" duration="5"/>
     <item time="0" type="Size" target="n2_ddb9" tween="true" startValue="31.2,56.19" endValue="240.996,552.874" duration="5"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-250,0" endValue="0,0" duration="5"/>
     <item time="0" type="XY" target="n2_ddb9" tween="true" startValue="-258,-5" endValue="-56.266,-51.14" duration="5"/>
   </transition>
   <transition name="cpai4">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="147.204,436.228" duration="4"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="132.943,393.966" duration="4"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="295,252" endValue="0,0" duration="4"/>
   </transition>
   <transition name="qipai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="162.954,482.9" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="130.278,386.067" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="216,677" duration="7"/>
   </transition>
   <transition name="qipai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="162.246,480.802" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="132.001,391.173" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="-254,259" duration="7"/>
   </transition>
   <transition name="qipai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="163.242,483.754" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="130.956,388.077" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="466,248" duration="7"/>
   </transition>
 </component>

wb_new_ui/assets/Main_RunBeard/component/option/Pop_tip_choice.xml

@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,690">
-  <controller name="bipai" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="bipai" pages="0,,1,,2,,3," selected="2"/>
   <displayList>
     <component id="n62_j5c2" name="dibtn" src="peuq9o" fileName="component/option/dibutton.xml" xy="0,2" size="2538,694"/>
-    <image id="n78_h5b1" name="di1" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="1462,103" size="369,373" group="n66_j4og">
+    <image id="n78_h5b1" name="di1" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="1838,103" size="369,373" group="n66_j4og">
       <relation target="" sidePair=""/>
     </image>
-    <graph id="n64_j4og" name="di1__" xy="1524,123" pivot="1,0" size="276,273" group="n66_j4og" visible="false" alpha="0.8" type="rect" fillColor="#ff000000" corner="20"/>
-    <text id="n65_j4og" name="n65" xy="1478,134" size="54,253" group="n66_j4og" fontSize="50" color="#ffffff" autoSize="none" strokeColor="#000000" text="吃牌"/>
-    <list id="n27_m25s" name="Lst_choose" xy="1527,123" size="282,214" group="n66_j4og" layout="row" lineGap="7" colGap="30" defaultItem="ui://lkq9ne9speuq9g" align="right" vAlign="middle">
+    <graph id="n64_j4og" name="di1__" xy="1900,123" pivot="1,0" size="276,273" group="n66_j4og" visible="false" alpha="0.8" type="rect" fillColor="#ff000000" corner="20"/>
+    <text id="n65_j4og" name="n65" xy="1854,134" size="54,253" group="n66_j4og" fontSize="50" color="#ffffff" autoSize="none" strokeColor="#000000" text="吃牌"/>
+    <list id="n27_m25s" name="Lst_choose" xy="1903,123" size="282,214" group="n66_j4og" layout="row" lineGap="7" colGap="30" defaultItem="ui://lkq9ne9speuq9g" align="right" vAlign="middle">
       <item url="ui://gsufj3fakg838c"/>
       <item url="ui://gsufj3fakg838c"/>
     </list>
-    <group id="n66_j4og" name="1223" xy="1462,103" size="369,373"/>
-    <image id="n79_o0c1" name="di2" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="1070,107" pivot="1,0" size="358,331" group="n76_oqog">
+    <group id="n66_j4og" name="1223" xy="1838,103" size="369,373" advanced="true">
+      <relation target="" sidePair="right-right"/>
+    </group>
+    <image id="n79_o0c1" name="di2" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="1466,103" pivot="1,0" size="277,373" group="n76_oqog">
       <relation target="" sidePair=""/>
       <relation target="n78_h5b1" sidePair="left-left"/>
     </image>
-    <graph id="n67_j4og" name="di2__" xy="1449,108" pivot="1,0" anchor="true" size="343,281" group="n76_oqog" visible="false" alpha="0.8" type="rect" fillColor="#ff000000" corner="20"/>
-    <text id="n68_j4og" name="n68" xy="1081,127" size="46,252" group="n76_oqog" fontSize="40" color="#ffffff" autoSize="none" strokeColor="#000000" text="比牌">
+    <graph id="n67_j4og" name="di2__" xy="1734,104" pivot="1,0" anchor="true" size="247,323" group="n76_oqog" visible="false" alpha="0.8" type="rect" fillColor="#ff000000" corner="20"/>
+    <text id="n68_j4og" name="n68" xy="1477,123" size="0,294" group="n76_oqog" fontSize="40" color="#ffffff" autoSize="none" strokeColor="#000000" text="比牌">
       <relation target="n79_o0c1" sidePair="left-left"/>
     </text>
-    <list id="n40_ey1o" name="Bi_Lst_choose1" xy="1158,125" pivot="1,0" size="242,195" group="n76_oqog" layout="row" lineGap="7" colGap="30" defaultItem="ui://gsufj3fakg838c" align="right" vAlign="middle">
+    <list id="n40_ey1o" name="Bi_Lst_choose1" xy="1479,121" pivot="1,0" size="250,237" group="n76_oqog" layout="row" lineGap="7" colGap="30" defaultItem="ui://gsufj3fakg838c" align="right" vAlign="middle">
       <relation target="n78_h5b1" sidePair="left-left"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n76_oqog" name="n76" xy="1070,107" size="379,331" advanced="true">
+    <group id="n76_oqog" name="n76" xy="1466,103" size="277,373" advanced="true">
       <gearDisplay controller="bipai" pages="1,2"/>
+      <relation target="" sidePair="right-right"/>
     </group>
-    <image id="n81_o0c1" name="di3" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="1064,490" group="n77_oqog">
+    <image id="n81_o0c1" name="di3" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="943,103" size="369,373" group="n77_oqog">
       <relation target="n79_o0c1" sidePair="right-left"/>
     </image>
-    <graph id="n71_oqog" name="di3__" xy="1443,494" pivot="1,0" anchor="true" size="384,259" group="n77_oqog" visible="false" alpha="0.8" type="rect" fillColor="#ff000000" corner="20">
+    <graph id="n71_oqog" name="di3__" xy="1322,107" pivot="1,0" anchor="true" size="384,297" group="n77_oqog" visible="false" alpha="0.8" type="rect" fillColor="#ff000000" corner="20">
       <relation target="n79_o0c1" sidePair="right-left"/>
     </graph>
-    <text id="n72_oqog" name="n72" xy="1082,518" size="55,156" group="n77_oqog" fontSize="40" color="#ffffff" autoSize="none" text="比牌">
+    <text id="n72_oqog" name="n72" xy="961,131" size="55,194" group="n77_oqog" fontSize="40" color="#ffffff" autoSize="none" text="比牌">
       <relation target="n81_o0c1" sidePair="left-left"/>
     </text>
-    <list id="n48_ey1o" name="Bi_Lst_choose2" xy="1421,514" pivot="1,0" anchor="true" size="272,171" group="n77_oqog" layout="row" lineGap="7" colGap="30" defaultItem="ui://gsufj3fakg838c" align="right" vAlign="middle">
+    <list id="n48_ey1o" name="Bi_Lst_choose2" xy="1300,127" pivot="1,0" anchor="true" size="272,209" group="n77_oqog" layout="row" lineGap="7" colGap="30" defaultItem="ui://gsufj3fakg838c" align="right" vAlign="middle">
       <relation target="n81_o0c1" sidePair="right-right"/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n77_oqog" name="n77" xy="1059,490" size="384,335" advanced="true">
+    <group id="n77_oqog" name="n77" xy="938,103" size="384,373" advanced="true">
       <gearDisplay controller="bipai" pages="2"/>
+      <relation target="" sidePair="right-right"/>
     </group>
   </displayList>
 </component>

wb_new_ui/assets/Main_RunBeard/component/option/component/card/Btn_Card.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="83,106" extention="Button">
+<component size="83,90" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="Kan" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="-3,2" size="86,104" url="ui://v6yvqp7wlr5dg" autoSize="true">
-      <gearXY controller="button" pages="1" values="-3,-22" default="-3,2" tween="true"/>
+    <loader id="n3_hp0b" name="icon" xy="0,1" size="83,90" url="ui://v6yvqp7wlr5dg" fill="scale">
+      <gearXY controller="button" pages="0,1" values="0,1|-3,-22" tween="true"/>
     </loader>
     <graph id="n4_m25s" name="n4" xy="-3,1" size="87,104" type="rect" lineColor="#ff333333" fillColor="#c2333333" corner="5">
       <gearDisplay controller="Kan" pages="1"/>