同步前提交

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -152,19 +152,21 @@ function ViewUtil.HandCardSort3(a, b)
     return sort_a < sort_b
 end
 
-function ViewUtil.CardPos(obj, area, oder, index, offset, isAdd)
+function ViewUtil.CardPos(obj, area, oder, index, data)
-    offset = offset or 0
+    local data = data or {}
+    local offset = data.offset or 0
+    local gup = data.gup or 0
     if oder == AreaOderType.left_right then
         obj.x = index * obj.width + offset
     elseif oder == AreaOderType.up_down then
-        obj.y = index * obj.height + offset
+        obj.y = index * obj.height + offset - index * gup
     elseif oder == AreaOderType.right_left then
         obj.x = (area.width - obj.width) - index * obj.width - offset
     elseif oder == AreaOderType.down_up then
-        if isAdd then
+        if data.isAdd then
             obj.y = area.height - obj.height - index * obj.height * 1.5 - offset
         else
-            obj.y = area.height - obj.height - index * obj.height - offset
+            obj.y = area.height - obj.height - index * obj.height - offset + index * gup
         end
         --obj.y = area.height - obj.height - index * obj.height - offset
     end

lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua

@@ -73,7 +73,7 @@ function M:UpdateHandCard(getcard, mp, opcard)
             if opnum ~= -1 then
                 loc = CardPos(obj, self._area_handcard_list, oder, loc, offset)
             else
-                ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
+                ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset})
             end
              --改变左右两边的手牌的x值
              if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
@@ -99,7 +99,7 @@ function M:UpdateHandCard(getcard, mp, opcard)
             local obj = UIPackage.CreateObject("Main_Majiang", comp)            
             self:fillCard(obj,card,_player.card_list[i+1])
             local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0)
-            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
+            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset})
             --改变左右两边的手牌的x值
             if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
                 obj.x = i * -7

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

@@ -387,7 +387,6 @@ function M:EventInit()
                 head_info._view:GetChild("shengyu").text = card_number
             end
         end
-        head_info:SetBaoDan(card_number == 1)
         local card_info = self._player_card_info[index]
         card_info:SetOutCardInfo(p.out_card_list, false, true)
         card_info._ctr_time_clock.selectedIndex = 0
@@ -584,11 +583,8 @@ function M:EventInit()
                 local player = info[i]
                 local p = self._room:GetPlayerBySeat(player.seat)
                 local head_info = self._player_info[self:GetPos(player.seat)]
-                head_info:SetBaoDan(false)
 
                 head_info._view:GetChild('text_jifen').text = player.score
-                -- head_info:PlayScore(player.winscore, win_seat == player.seat)
-                head_info:PlayScore(player.card_score, win_seat == player.seat)
             end
 
             for i = 1, #info do
@@ -737,7 +733,6 @@ function M:EventInit()
             local score = scoreList[i].pomSore
             local player = self._room:GetPlayerBySeat(scoreList[i].seat)
             local head_info = self._player_info[self:GetPos(scoreList[i].seat)]
-            head_info:PlayScore(score, true)
             head_info:UpdateScore(player.total_score)
         end
     end)

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

@@ -935,11 +935,6 @@ function M:EventInit()
 
         self.destory_win = nil
         self.destory_win = coroutine.start(function()
-            if win_seat == self._room.self_player.seat then
-                ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3")
-            else
-                ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/lose_music.mp3")
-            end
             coroutine.stop(self._leftClock_continue)
             for i = 1, #self._player_card_info do
                 local card_info = self._player_card_info[i]
@@ -983,32 +978,6 @@ function M:EventInit()
                 local p = self._room:GetPlayerBySeat(player.seat)
                 local head_info = self._player_info[self:GetPos(player.seat)]
             end
-
-            for i = 1, #info do
-                local player = info[i]
-                local p = self._room:GetPlayerBySeat(player.seat)
-                local head_info = self._player_info[self:GetPos(player.seat)]
-                local card_info = self._player_card_info[self:GetPos(player.seat)]
-
-                if player.seat ~= win_seat then
-                    card_info.ctr_outpoker.selectedIndex = 0
-                end
-                if player.seat ~= self._room.self_player.seat then
-                    local oneTime = 7 / 60
-
-                    -- card_info:UpdateHandPoker(player.cards, false, true)
-
-                    card_info._view_resultOut:RemoveChildrenToPool()
-                    card_info._ctr_resultOut.selectedIndex = 1
-                    for i = 1, #player.handCards do
-                        local child_card = card_info._view_resultOut:AddItemFromPool()
-                        card_info:FillPoker(child_card, "", nil, player.handCards[i])
-                        ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/fanCard.mp3")
-                        printlog("lingmeng oneTime", oneTime)
-                        coroutine.wait(oneTime)
-                    end
-                end
-            end
             self:ChangeBgmMusic(1)
             -- if over == 0 then
             -- if #self:GetSpringSeats(info) > 0 then

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

@@ -447,9 +447,10 @@ function M:FillPoker(poker, prefix, num, code)
     if num ~= nil then
         code = self:ChangeCodeByTo(num)
     end
-    local suffix = code == 310 and
+    local suffix = ""
-        (DataManager.CurrenRoom.pai == 0 and (DataManager.CurrenRoom.room_config.Heart10 == 2 and "_1" or "") or "_2") or
+    -- local suffix = code == 310 and
-        ""
+    --     (DataManager.CurrenRoom.pai == 0 and (DataManager.CurrenRoom.room_config.Heart10 == 2 and "_1" or "") or "_2") or
+    --     ""
     code = code == 1 and "00" or code
     if not poker.icon then
         poker:GetChild('icon').url = string.format("ui://Extend_Poker_RunFastNew/%s%s%s", prefix, code, suffix)

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

@@ -38,42 +38,38 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
         ViewManager.ChangeView(ViewManager.View_Lobby)
     end
 
-    self._view:GetChild('btn_over1Close').onClick:Set(function()
+    local btn_confirm = self._view:GetChild('btn_confirm')
-        if over == 0 then
+    btn_confirm.onClick:Add(
-            self:Close()
+        function()
-        else
-            self._view:GetController('over').selectedIndex = 1
-        end
-    end)
-
-    self._view:GetChild('btn_nextRound').onClick:Set(function()
-        if over == 0 then
             local _gamectr = ControllerManager.GetController(GameController)
             _gamectr:ConformToNextGame()
-            self._root_runFast._ctr_inClear.selectedIndex = 0
             self:Destroy()
-        else
-            self._view:GetController('over').selectedIndex = 1
         end
-    end)
+    )
 
-    self.ClearReady = function()
+    local btn_Show1 = self._view:GetChild('btn_Show1')
-        if over == 0 then
+    btn_Show1.onClick:Set(function()
-            local _gamectr = ControllerManager.GetController(GameController)
+        self._view:GetController('over').selectedIndex = 1
-            _gamectr:ConformToNextGame()
+    end)
-            self._root_runFast:ClearOk()
-            self:Destroy()
-        else
-            self._view:GetController('over').selectedIndex = 1
-        end
-    end
 
     self._view:GetChild('btn_closeRound').onClick:Set(function()
         ViewManager.ChangeView(ViewManager.View_Lobby)
     end)
 
-    self._view:GetController('win').selectedIndex = win_seat == room.self_player.seat and 1 or 0
+    local bgWindow = self._view:GetChild('bgWindow')
+    if win_seat == room.self_player.seat then
+        bgWindow.text = "胜利"
+        bgWindow:GetController('bianhui').selectedIndex = 0
+    else
+        bgWindow.text = "失败"
+        bgWindow:GetController('bianhui').selectedIndex = 1
+    end
 
+    -- self._view:GetController('win').selectedIndex = win_seat == room.self_player.seat and 1 or 0
+    local rt = 1
+    if room.hpOnOff == 1 then
+        rt = room.score_times
+    end
     local over0List = self._view:GetChild('list_over0')
     over0List:SetVirtual()
     over0List.itemRenderer = function(index, obj)
@@ -82,37 +78,64 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
         obj:GetChild('name').text = playerInfo.self_user.nick_name
         obj:GetChild('residue').text = #info.handCards
         obj:GetChild('bomb').text = info.thisboomnum
-        obj:GetChild('score').text = info.winscore > 0 and string.format("+%d", info.winscore) or info.winscore
+        obj:GetChild('piao').text = info.piao < 0 and 0 or info.piao
-        obj:GetController('chuntian').selectedIndex = info.chuntian and 1 or 0
+        local roundScore = info.winCardScore
+        local jifen = ""
+        if roundScore >= 0 then
+            jifen = "+" .. roundScore
+        else
+            jifen = "" .. roundScore
+        end
+        jifen = jifen .. " "
+
+        local tili = ""
+        if room.hpOnOff > 0 then
+            local need = roundScore * rt
+            tili = "("
+            if roundScore > 0 then
+                tili = tili .. "+" .. tostring(need)
+            else
+                tili = tili .. tostring(need)
+            end
+
+            tili = tili .. ")"
+        end
+        obj:GetChild('score').text = jifen .. tili
+
+        local list_residue = obj:GetChild('list_residue')
+        list_residue:RemoveChildrenToPool()
+        for i, v in ipairs(info.handCards) do
+            local rc = list_residue:AddItemFromPool()
+            rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
+            rc:GetController('choose').selectedIndex = 0
+        end
+        for i, v in ipairs(info.outCards) do
+            local rc = list_residue:AddItemFromPool()
+            rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
+            rc:GetController('choose').selectedIndex = 1
+        end
     end
     over0List.numItems = #data
-    self._root_runFast._ctr_inClear.selectedIndex = 1
 
     if over == 1 or (over == 2 and room.curren_round > 0) then
-        local bigSeat = 0
+        self._view:GetController('lastRound').selectedIndex = 1
-        local bigScore = 0
+        self._view:GetChild('txt_room_id').text = '房号:' .. roomid
-        for i = 1, #data do
+        self._view:GetChild('txt_game_name').text = room.room_config:GetGameName()
-            if data[i].total_score > bigScore then
+        self._view:GetChild('txt_game_data').text = os.date('%Y-%m-%d    %H:%M', os.time())
-                bigSeat = i
+        local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '')
-                bigScore = data[i].total_score
+        self._view:GetChild('txt_play').text = str_roominfo
-            end
-        end
-        self._view:GetChild('text_roomID').text = room.room_id
-        self._view:GetChild('text_time').text = os.date('%m-%d  %H:%M', os.time())
-        self._view:GetChild('text_groupID').text = room.group_id or 0
-        self._view:GetController('num').selectedIndex = #data == 2 and 0 or 1
-        self._view:GetController('isgroup').selectedIndex = room.group_id ~= 0 and 1 or 0
         for i = 1, #data do
             local info = data[i]
             local playerInfo = room:GetPlayerBySeat(info.seat)
-            printlog("lingmeng clear", playerInfo.nick_name, info.total_score, i == bigSeat)
+            self:FillPlayerInfoEnd(self._view:GetChild(string.format("comp_playerInfo%d_over1", i)), info, playerInfo, rt,
-            self:FillPlayerInfoEnd(self._view:GetChild(string.format("comp_playerInfo%d_over1", i)), info, playerInfo,
+                bgWindow)
-                i == bigSeat)
+        end
+        local list_residue = self._view:GetChild('list_residue')
+        list_residue:RemoveChildrenToPool()
+        for i, v in ipairs(remaincards) do
+            local rc = list_residue:AddItemFromPool()
+            rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
         end
-        coroutine.start(function()
-            coroutine.wait(2)
-            self._view:GetController('over').selectedIndex = 1
-        end)
     end
 
 
@@ -145,31 +168,52 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
             GameApplication.Instance:CopyToClipboard(resultStr)
         end)
     end
+
+    local btn_continue_game = self._view:GetChild('btn_continue_game')
+    if btn_continue_game then
+        local gid = room.group_id
+        if gid ~= 0 then
+            btn_continue_game.visible = true
+            local pid = room.room_config.pid
+            local game_id = room.game_id
+            btn_continue_game.onClick:Set(
+                function()
+                    self:ContinueGame(gid, pid, game_id)
+                end
+            )
+        end
+    end
 end
 
-function M:FillPlayerInfoEnd(view, info, playerInfo, bigWin)
+function M:FillPlayerInfoEnd(view, info, playerInfo, rt,bgWindow)
     local room = DataManager.CurrenRoom
 
-    self:FillPlayerHead(view:GetChild('comp_playerInfo'), playerInfo, bigWin)
-
-    local detailList = view:GetChild('list_detail')
-
-    self:FillDetailChild(detailList:AddItemFromPool(), 0, info.settle_log.maxscore)
-    self:FillDetailChild(detailList:AddItemFromPool(), 1, info.settle_log.boomnum)
-    self:FillDetailChild(detailList:AddItemFromPool(), 2,
-        string.format("%d赢%d输", info.settle_log.winnum, room.room_config.Times - info.settle_log.winnum))
-    self:FillDetailChild(detailList:AddItemFromPool(), 3, info.total_score)
-end
-
-function M:FillPlayerHead(view, playerInfo, bigWin)
     ImageLoad.Load(playerInfo.self_user.head_url, view:GetChild('btn_head')._iconObject)
     view:GetChild('text_name').text = ViewUtil.stringEllipsis(playerInfo.self_user.nick_name)
-    view:GetChild('text|_ID').text = playerInfo.self_user.account_id
+    view:GetChild('text_ID').text = playerInfo.self_user.account_id
-    view:GetController('bigWin').selectedIndex = bigWin and 1 or 0
+
+    local detailList = view:GetChild('list_detail')
+    self:FillDetailChild(detailList:AddItemFromPool(), "赢局数:", info.settle_log.winnum)
+    self:FillDetailChild(detailList:AddItemFromPool(), "打出炸弹数:", info.settle_log.boomnum)
+    self:FillDetailChild(detailList:AddItemFromPool(), "春天次数:", info.settle_log.springnum)
+    self:FillDetailChild(detailList:AddItemFromPool(), "当局最高分:", info.settle_log.maxscore * rt)
+
+    view:GetChild('text_daniao').text = info.daniao
+    view:GetChild('text_toltalScore').text = info.total_score
+    view:GetChild('text_score').text = info.total_score - info.daniao
+    view:GetController('win').selectedIndex = info.total_score >= 0 and 1 or 0
+
+    if info.seat == room.self_player.seat and info.total_score >= 0 then
+        bgWindow.text = "胜利"
+        bgWindow:GetController('bianhui').selectedIndex = 0
+    else
+        bgWindow.text = "失败"
+        bgWindow:GetController('bianhui').selectedIndex = 1
+    end
 end
 
 function M:FillDetailChild(view, index, value)
-    view:GetController('ShowTitle').selectedIndex = index
+    view:GetChild('text_title').text = index
     view:GetChild('text_value').text = value
 end
 

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -158,10 +158,10 @@ function M:UpdateHandCard(getcard, mp)
             local _room = DataManager.CurrenRoom
             local people_num = _room.room_config.people_num
             local pos = ViewUtil.GetPos(_room.self_player.seat, _player.seat, people_num)
-            local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 15 or 45
+            local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 38 or 45
             local offset = getcard and (i == _player.hand_left_count - 1 and gap or 0)
             -- local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0)
-            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
+            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset})
 
             --改变左右两边的手牌的x值
             if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
@@ -193,7 +193,7 @@ function M:UpdateHandCard(getcard, mp)
 			
             local offset = getcard and (i == _player.hand_left_count - 1 and 0 or 0)
 			
-            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
+            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, {offset=offset})
 
             --改变左右两边的手牌的x值
             if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
@@ -294,7 +294,7 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
 
     local obj = nil
     self._area_outcard_list:RemoveChildren(0, -1, true)
-    for i = 0, #outlist - 1 do
+    for i = 0,#outlist - 1  do
         obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp)
         local row = math.floor(i / num)
         local col = math.floor(i % num)
@@ -307,7 +307,7 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
         end
 
         ViewUtil.CardPos(obj, self._area_outcard_list, oder, col)
-        ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row)
+        ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row,{gup=15})
 
         if self._current_card_type == 2 then
             self:adjust3dOutPut(obj, self._area_outcard_list, oder, num, i)

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua

@@ -55,7 +55,7 @@ function M:init()
 end
 
 function M:setHandCardPos(btn_card, i, getcard)
-	btn_card.x = 71 + i * btn_card.width * 1.05 + (getcard and 20 or 0)
+	btn_card.x = 71 + i * btn_card.width + (getcard and 38 or 0)
 end
 
 function M:UpdateHandCard(getcard, mp)
@@ -95,7 +95,7 @@ function M:UpdateHandCard(getcard, mp)
 
 
 			local btn_card = UIPackage.CreateObject(self:GetCardObjPack(), "Btn_Card" .. b3d)
-			btn_card:SetScale(1.05, 1.05)
+			-- btn_card:SetScale(1.05, 1.05)
 			-- btn_card.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. tem_card)
 			self:fillCard(btn_card, "201_", tem_card)
 			self:setHandCardPos(btn_card, i, i == #cards - 1 and getcard)
@@ -132,7 +132,7 @@ function M:UpdateHandCard(getcard, mp)
 			local mp_card = UIPackage.CreateObject("Main_Majiang", "Mp_self_card" .. b3d)
 			-- mp_card.icon = UIPackage.GetItemURL("Main_Majiang", "202_" .. cards[i+1])
 			self:fillCard(mp_card, "202_", cards[i + 1])
-			mp_card:SetScale(1.05, 1.05)
+			-- mp_card:SetScale(1.05, 1.05)
 			-- mp_card.x = i * mp_card.width + (i == #cards - 1 and getcard and 20 or 0)
 			self:setHandCardPos(mp_card, i, i == #cards - 1 and getcard)
 			_lit:AddChild(mp_card)

lua_probject/main_project/main/majiang/MJSettingViewNew.lua

@@ -21,6 +21,7 @@ function MJSettingViewNew.new(blur_view, show_dialect)
     self.cd_time = 0
     self._btn_dismiss_room_enable = true
     self._full = true
+    self._full_offset = false
     self._anim_pop = 2
     self._close_zone = true
     self._show_dialect = show_dialect

wb_new_ui/.objs/fonts.json

@@ -13,6 +13,7 @@ ui://27vd145bz5om44
 ui://27vd145bik9v7ing
 ui://27vd145bcv577ioj
 ui://27vd145bik9v7imb
+ui://27vd145byffn7iqf
 ui://3qr8nmi47q1m2h
 ui://fnuxqeflkllg1u
 ui://fnuxqeflkllg1v

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

@@ -9,15 +9,11 @@
     "n87_q50p": {
       "hidden": true
     },
-    "n86_q50p": {
-      "collapsed": true
-    },
     "n179_yffn": {
       "collapsed": true
     },
     "n131_ckvb": {
-      "hidden": true,
+      "hidden": true
-      "collapsed": true
     },
     "n164_ukp7": {
       "locked": true,

wb_new_ui/.objs/metas/v0j9abjy/gq7m9y.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n4_snta": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/v0j9abjy/gq7mgp.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n5_n6cm": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/assets/Common/UIPanel.xml

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" opaque="false">
+<component size="2532,1170" opaque="false">
   <displayList>
-    <component id="n1_hznk" name="PopPanel" src="hznkce2" fileName="PopPanel.xml" xy="0,0" size="1334,750" visible="false"/>
+    <component id="n1_hznk" name="PopPanel" src="hznkce2" fileName="PopPanel.xml" xy="0,0" size="2532,1170" visible="false"/>
   </displayList>
   <transition name="left_pop">
     <item time="0" type="Visible" target="n1_hznk" value="true"/>
     <item time="0" type="XY" target="n1_hznk" tween="true" startValue="-1400,0" endValue="0,0" duration="6"/>
-    <item time="6" type="XY" target="n1_hznk" tween="true" startValue="0,0"/>
   </transition>
   <transition name="right_pop">
     <item time="0" type="Visible" target="n1_hznk" value="true"/>
     <item time="0" type="XY" target="n1_hznk" tween="true" startValue="1400,0" endValue="0,0" duration="6"/>
-    <item time="6" type="XY" target="n1_hznk" tween="true" startValue="0,0"/>
   </transition>
   <transition name="left_pop_back">
     <item time="0" type="Visible" target="n1_hznk" value="true"/>

wb_new_ui/assets/Common/component/Component3(1).xml

@@ -2,13 +2,13 @@
 <component size="92,26">
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <image id="n4_h1uu" name="n4" src="yffncq" fileName="component/image/images/phone_info/4g01.png" xy="17,0">
+    <image id="n4_h1uu" name="n4" src="yffncq" fileName="component/image/images/phone_info/4g01.png" xy="17,0" pkg="8wph7p8n">
       <gearColor controller="c1" pages="0,1,2" values="#ffffff|#666666|#666666"/>
     </image>
-    <image id="n5_h1uu" name="n5" src="yffncr" fileName="component/image/images/phone_info/4g02.png" xy="0,0">
+    <image id="n5_h1uu" name="n5" src="yffncr" fileName="component/image/images/phone_info/4g02.png" xy="0,0" pkg="8wph7p8n">
       <gearColor controller="c1" pages="0,1" values="#ffffff|#ffff00" default="#666666"/>
     </image>
-    <image id="n6_h1uu" name="n6" src="yffncs" fileName="component/image/images/phone_info/4g03.png" xy="-17,0">
+    <image id="n6_h1uu" name="n6" src="yffncs" fileName="component/image/images/phone_info/4g03.png" xy="-17,0" pkg="8wph7p8n">
       <gearColor controller="c1" pages="0,1,2" values="#ffffff|#ffff00|#ff0000"/>
     </image>
     <text id="n7_7paf" name="n7" xy="30,-3" size="70,29" fontSize="20" color="#00ff00" text="100 ms">

wb_new_ui/assets/Common/component/Gcm_chat.xml

@@ -3,10 +3,10 @@
   <controller name="voice" pages="0,,1," selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n1_h1uu" name="n1" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="8,109" size="109,109">
+    <component id="n1_h1uu" name="n1" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" xy="8,109" size="109,109">
       <Button icon="ui://27vd145byffn7ip7"/>
     </component>
-    <component id="n2_h1uu" name="n2" src="yffnce" fileName="component/VoiceMask(1).xml" xy="7,-47">
+    <component id="n2_h1uu" name="n2" src="yffnce" fileName="component/VoiceMask(1).xml" pkg="8wph7p8n" xy="7,-47">
       <gearDisplay controller="voice" pages="1"/>
     </component>
     <component id="n3_h1uu" name="btn_record" src="yffnjp" fileName="Btn_chat.xml" xy="8,0" size="109,109" controller="ban,0">

wb_new_ui/assets/Common/component/ProgressBar2.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="34,16" extention="ProgressBar">
   <displayList>
-    <image id="n5_h1uu" name="n5" src="yffnco" xy="0,0"/>
+    <image id="n5_h1uu" name="n5" src="yffnco" xy="0,0" pkg="8wph7p8n"/>
-    <image id="n4" name="bar" src="yffncp" xy="0,0" fillMethod="hz"/>
+    <image id="n4" name="bar" src="yffncp" xy="0,0" fillMethod="hz" pkg="8wph7p8n"/>
   </displayList>
   <ProgressBar/>
 </component>

wb_new_ui/assets/Common/component/RightPanel.xml

@@ -3,9 +3,9 @@
   <controller name="xinhao" pages="0,,1," selected="0"/>
   <controller name="log" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n21_n6fs" name="n21" src="yffn7ip8" fileName="images/bg_game_top.png" pkg="27vd145b" xy="908,0" pivot="0.5,0.5" size="715,77"/>
+    <image id="n21_n6fs" name="n21" src="yffn7ip8" fileName="images/bg_game_top.png" xy="908,0" pivot="0.5,0.5" size="715,77"/>
-    <component id="n20_qpk6" name="btn_log" src="yffnfz" fileName="component/phone_info/Btn_log.xml" xy="556,14" visible="false" touchable="false"/>
+    <component id="n20_qpk6" name="btn_log" src="yffnfz" fileName="component/phone_info/Btn_log.xml" xy="556,14" visible="false" touchable="false" pkg="8wph7p8n"/>
-    <component id="n1" name="btn_setting" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="268,15" size="64,106">
+    <component id="n1" name="btn_setting" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" xy="268,15" size="64,106">
       <Button icon="ui://27vd145byffn7ip4"/>
     </component>
     <component id="n5" name="pb_batteryLevel" src="yffng3" fileName="component/phone_info/ProgressBar2.xml" xy="926,20" scale="1.8,1.8" touchable="false">
@@ -14,7 +14,7 @@
     <component id="n6" name="gcm_xinhao" src="yffng4" fileName="component/phone_info/Component3(1).xml" xy="1408,12" size="82,22" scale="1.8,1.8" touchable="false">
       <gearDisplay controller="xinhao" pages="0"/>
     </component>
-    <component id="n9" name="gcm_wifi" src="yffng5" fileName="component/phone_info/Component3.xml" xy="473,5" aspect="true" touchable="false">
+    <component id="n9" name="gcm_wifi" src="yffng5" fileName="component/phone_info/Component3.xml" xy="473,5" aspect="true" touchable="false" pkg="8wph7p8n">
       <gearDisplay controller="xinhao" pages="1"/>
     </component>
     <text id="n7" name="tex_data" xy="320,30" size="205,49" visible="false" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="center" vAlign="middle" text="2017-07-09"/>

wb_new_ui/assets/Common/font/font_result/fontResult.fnt

@@ -0,0 +1,14 @@
+info size=80 resizable=true colored=false
+char id=48 img=yffn7iqg xoffset=0 yoffset=0 xadvance=0
+char id=49 img=yffn7iq4 xoffset=0 yoffset=0 xadvance=0
+char id=46 img=yffn7iq5 xoffset=0 yoffset=0 xadvance=0
+char id=43 img=yffn7iqh xoffset=0 yoffset=0 xadvance=0
+char id=45 img=yffn7iqi xoffset=0 yoffset=0 xadvance=0
+char id=50 img=yffn7iq6 xoffset=0 yoffset=0 xadvance=0
+char id=51 img=yffn7iq7 xoffset=0 yoffset=0 xadvance=0
+char id=52 img=yffn7iq8 xoffset=0 yoffset=0 xadvance=0
+char id=53 img=yffn7iq9 xoffset=0 yoffset=0 xadvance=0
+char id=54 img=yffn7iqa xoffset=0 yoffset=0 xadvance=0
+char id=55 img=yffn7iqb xoffset=0 yoffset=0 xadvance=0
+char id=56 img=yffn7iqc xoffset=0 yoffset=0 xadvance=0
+char id=57 img=yffn7iqd xoffset=0 yoffset=0 xadvance=0

wb_new_ui/assets/Common/package.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="27vd145b" hasFavorites="true">
   <resources>
+    <folder id="/font/fontLimit/" name="fontLimit" path="/font/" atlas="7"/>
+    <folder id="/font/fontManger/" name="fontManger" path="/font/" atlas="7"/>
+    <folder id="/font/fontTitle/" name="fontTitle" path="/font/" atlas="7"/>
+    <folder id="/font/font_result/" name="font_result" path="/font/" atlas="7"/>
     <image id="vg2c2" name="Button_Close.png" path="/font/images/game/"/>
     <component id="vg2c4" name="Btn_Close.xml" path="/buttons/" exported="true" favorite="true"/>
     <component id="cjli6" name="UIPanel.xml" path="/" exported="true"/>
@@ -1305,6 +1309,36 @@
     <image id="yffn7iq1" name="btn_game_startNext.png" path="/images/" exported="true"/>
     <image id="yffn7iq2" name="btn_game_xipaiReady.png" path="/images/" exported="true"/>
     <image id="yffn7iq3" name="bg_game_clearDetail.png" path="/images/" exported="true"/>
+    <image id="yffn7iq4" name="1 - 1.png" path="/font/font_result/"/>
+    <image id="yffn7iq5" name="10 - ..png" path="/font/font_result/"/>
+    <image id="yffn7iq6" name="2 - 2.png" path="/font/font_result/"/>
+    <image id="yffn7iq7" name="3 - 3.png" path="/font/font_result/"/>
+    <image id="yffn7iq8" name="4 - 4.png" path="/font/font_result/"/>
+    <image id="yffn7iq9" name="5 - 5.png" path="/font/font_result/"/>
+    <image id="yffn7iqa" name="6 - 6.png" path="/font/font_result/"/>
+    <image id="yffn7iqb" name="7 - 7.png" path="/font/font_result/"/>
+    <image id="yffn7iqc" name="8 - 8.png" path="/font/font_result/"/>
+    <image id="yffn7iqd" name="9 - 9.png" path="/font/font_result/"/>
+    <font id="yffn7iqf" name="fontResult.fnt" path="/font/font_result/" exported="true"/>
+    <image id="yffn7iqg" name="0 - 0.png" path="/font/font_result/"/>
+    <image id="yffn7iqh" name="11 - +.png" path="/font/font_result/"/>
+    <image id="yffn7iqi" name="12 - -.png" path="/font/font_result/"/>
+    <image id="yffn7iqj" name="icon_game_bigWin.png" path="/images/" exported="true"/>
+    <component id="yffnj6" name="RightPanel.xml" path="/component/" exported="true"/>
+    <component id="yffnj9" name="RoomInfoPanel1.xml" path="/component/" exported="true"/>
+    <component id="yffnjo" name="Gcm_chat.xml" path="/component/" exported="true"/>
+    <component id="yffng4" name="Component3(1).xml" path="/component/" exported="true"/>
+    <component id="yffng3" name="ProgressBar2.xml" path="/component/" exported="true"/>
+    <component id="yffnjp" name="Btn_chat.xml" path="/component/" exported="true"/>
+    <image id="itp87iqk" name="bg_game_bar.png" path="/images/" exported="true" scale="9grid" scale9grid="27,12,54,24"/>
+    <image id="itp87iql" name="bg_game_barBg.png" path="/images/" exported="true" scale="9grid" scale9grid="27,12,54,24"/>
+    <image id="itp87iqm" name="bg_game_setting.png" path="/images/" exported="true"/>
+    <image id="itp87iqn" name="bg_game_settingLab.png" path="/images/" exported="true" scale="9grid" scale9grid="61,43,122,86"/>
+    <image id="itp87iqo" name="btn_game_checkbox_down.png" path="/images/" exported="true"/>
+    <image id="itp87iqp" name="btn_game_checkboxUp.png" path="/images/" exported="true"/>
+    <image id="itp87iqq" name="icon_game_music.png" path="/images/" exported="true"/>
+    <image id="itp87iqr" name="icon_game_sound.png" path="/images/" exported="true"/>
+    <image id="itp87iqs" name="icon_setting_chooseBG.png" path="/images/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml

@@ -7,18 +7,34 @@
     <text id="n7_n9qr" name="name" xy="77,71" size="289,66" font="Microsoft YaHei" fontSize="46" color="#43633d" vAlign="middle" autoSize="none" text="用户名称">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n8_n9qr" name="residue" xy="394,74" pivot="0.5,0.5" size="57,62" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" singleLine="true" text="99">
+    <text id="n8_n9qr" name="residue" xy="394,74" pivot="0.5,0.5" size="57,61" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" singleLine="true" text="99">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n9_n9qr" name="bomb" xy="572,73" pivot="0.5,0.5" size="31,62" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" text="2">
+    <text id="n9_n9qr" name="bomb" xy="572,73" pivot="0.5,0.5" size="31,61" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" text="2">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n10_n9qr" name="piao" xy="751,73" pivot="0.5,0.5" size="31,62" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" text="2">
+    <text id="n10_n9qr" name="piao" xy="751,73" pivot="0.5,0.5" size="31,61" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" text="2">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <text id="n15_yffn" name="score" xy="899,73" pivot="0.5,0.5" size="91,62" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" text="+44">
+    <text id="n15_yffn" name="score" xy="899,73" pivot="0.5,0.5" size="91,61" font="Microsoft YaHei" fontSize="46" color="#43633d" align="center" text="+44">
       <relation target="" sidePair="center-center%"/>
     </text>
-    <list id="n16_yffn" name="list_residue" xy="1266,32" size="676,145" overflow="scroll"/>
+    <list id="n16_yffn" name="list_residue" xy="1266,32" size="676,145" layout="row" colGap="-62" defaultItem="ui://8wph7p8nyffno2">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver1Info.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="478,714">
+  <controller name="win" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n4_n9qr" name="n4" src="yffnru" fileName="image/bg_game_poker_over1player.png" pkg="lx6k641g" xy="2,1"/>
     <graph id="n11_yffn" name="n11" xy="73,23" size="108,108" type="rect" lineColor="#ffffffff" fillColor="#4cffffff" corner="10"/>
@@ -15,11 +16,23 @@
     <text id="n8_yffn" name="text_ID_Title" xy="210,88" size="78,49" font="Microsoft YaHei" fontSize="36" color="#43633d" leading="0" singleLine="true" text="ID：">
       <relation target="" sidePair="left-right,bottom-bottom"/>
     </text>
-    <list id="n2_ckvb" name="list_detail" xy="44,154" size="416,403" overflow="scroll" lineGap="32" defaultItem="ui://8wph7p8nyffnj" autoClearItems="true">
+    <list id="n2_ckvb" name="list_detail" xy="45,223" size="374,332" overflow="scroll" lineGap="12" defaultItem="ui://8wph7p8nyffnj" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <text id="n12_yffn" name="textTitle_daniao" xy="151,514" size="76,49" font="Microsoft YaHei" fontSize="36" color="#80622c" text="打鸟"/>
+    <text id="n13_yffn" name="text_daniao" xy="282,514" size="25,49" font="Microsoft YaHei" fontSize="36" color="#80622c" text="0"/>
+    <text id="n15_yffn" name="textTitle_score" xy="114,573" size="124,54" font="Microsoft YaHei" fontSize="40" color="#0084ff" text="总战绩">
+      <gearColor controller="win" pages="0" values="#0084ff,#000000" default="#ff3300,#000000"/>
+    </text>
+    <text id="n16_yffn" name="text_score" xy="282,573" size="25,49" font="Microsoft YaHei" fontSize="36" color="#0084ff" text="0">
+      <gearColor controller="win" pages="0" values="#0084ff,#000000" default="#ff3300,#000000"/>
+    </text>
+    <text id="n14_yffn" name="text_toltalScore" xy="287,637" size="76,59" font="ui://27vd145byffn7iqf" fontSize="46" color="#ffffff" text="6.0"/>
+    <image id="n17_yffn" name="n17" src="yffn7iqj" fileName="images/icon_game_bigWin.png" pkg="27vd145b" xy="39,-197">
+      <gearDisplay controller="win" pages="1"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/comp_playerInfoChild.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="523,70">
+<component size="374,54">
   <controller name="ShowTitle" pages="0,,1,,5,,6,,7,,8," selected="0">
     <remark page="0" value="单局最高分"/>
     <remark page="1" value="打出炸弹数"/>
@@ -7,6 +7,11 @@
     <remark page="3" value="总积分"/>
   </controller>
   <displayList>
-    <text id="n9_yffn" name="text_title" xy="49,-233" size="40,42" fontSize="30" color="#80622c" text=""/>
+    <text id="n9_yffn" name="text_title" xy="0,0" size="10,54" font="Microsoft YaHei" fontSize="40" color="#80622c" text="">
+      <relation target="" sidePair="left-left"/>
+    </text>
+    <text id="n10_yffn" name="text_value" xy="364,0" size="10,54" font="Microsoft YaHei" fontSize="40" color="#80622c" text="">
+      <relation target="" sidePair="right-right"/>
+    </text>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_ResultCard.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="103,145" extention="Button">
+  <controller name="choose" pages="0,,1," selected="1"/>
+  <displayList>
+    <loader id="n4_ckvb" name="icon" xy="0,0" size="103,145" group="n6_ckvb" url="ui://Extend_Poker_RunFastNew/310" align="center" vAlign="bottom" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <image id="n7_diqo" name="n7" src="yffn1h" fileName="Main_New/Component/Image/bg_mask.png" xy="-3,-2" size="108,150" group="n6_ckvb">
+      <gearDisplay controller="choose" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </image>
+    <group id="n6_ckvb" name="body" xy="-3,-2" size="108,150" advanced="true"/>
+  </displayList>
+  <Button mode="Check"/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="278,328" extention="Button">
+  <controller name="choose" pages="0,,1," selected="0"/>
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="choose" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n4_ckvb" name="icon" xy="0,0" size="278,328" group="n6_ckvb" url="ui://Extend_Poker_RunFastNew/310" align="center" vAlign="bottom" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -75,13 +75,13 @@
       <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="Gcm_chat.xml" xy="2368,533" visible="false"/>
+    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="2368,533" visible="false" pkg="27vd145b"/>
     <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"/>
     </component>
-    <component id="n181_yffn" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="0,0" group="n86_q50p"/>
+    <component id="n181_yffn" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="0,0" group="n86_q50p" pkg="27vd145b"/>
-    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="1059,10" group="n86_q50p" touchable="false"/>
+    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="1059,10" group="n86_q50p" touchable="false" pkg="27vd145b"/>
     <component id="n84_q50p" name="btn_back_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="626,15" size="64,106" group="n86_q50p">
       <gearDisplay controller="state" pages="0,3"/>
       <Button icon="ui://27vd145byffn7ip2"/>
@@ -89,7 +89,7 @@
     <component id="n85_q50p" name="btn_rule" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="415,15" size="129,106" group="n86_q50p">
       <Button icon="ui://27vd145byffn7ip5"/>
     </component>
-    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="784,131" size="995,0" group="n86_q50p" scale="1.5,1.5" visible="false" touchable="false"/>
+    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="784,131" size="995,0" group="n86_q50p" scale="1.5,1.5" visible="false" touchable="false" pkg="27vd145b"/>
     <component id="n120_r1z9" name="btn_leave_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="784,15" size="71,106" group="n86_q50p">
       <gearDisplay controller="state" pages="0,3"/>
       <Button icon="ui://27vd145byffn7ip3"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_3.xml

@@ -65,20 +65,20 @@
     <text id="n61_agtp" name="tex_version" xy="1225,2164" size="130,38" scale="1.5,1.5" fontSize="30" color="#ffffff" align="center" autoSize="none" text="V2.0.2">
       <gearDisplay controller="state" pages="0,1,2"/>
     </text>
-    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="2294,1604" visible="false"/>
+    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="2294,1604" visible="false" pkg="27vd145b"/>
     <component id="n79_roef" name="btn_distance" src="yffnj3" fileName="component/gps/btn_distance_new.xml" xy="655,1848" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
     </component>
-    <component id="n82_q50p" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="124,2441" size="1334,108" group="n86_q50p" scale="1.5,1.5">
+    <component id="n82_q50p" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="124,2441" size="1334,108" group="n86_q50p" scale="1.5,1.5" pkg="27vd145b">
       <gearDisplay controller="state" pages="0,1,2,3"/>
     </component>
-    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="974,1930" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
+    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="974,1930" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false" pkg="27vd145b"/>
     <component id="n84_q50p" name="btn_back_lobby__" src="yffngb" fileName="component/poker/Btn_back_lobby.xml" xy="510,1878" size="58,75" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
     <component id="n85_q50p" name="btn_rule--" src="yffnge" fileName="component/poker/Btn_log.xml" xy="332,1878" group="n86_q50p" scale="1.5,1.5"/>
-    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="732,1734" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
+    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="732,1734" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false" pkg="27vd145b"/>
     <component id="n120_r1z9" name="btn_leave_lobby" src="yffngk" fileName="component/poker/Btn_leave_lobby.xml" xy="631,1878" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,3"/>
     </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/clearing_new.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
   <controller name="over" pages="0,,1,,9," selected="1"/>
-  <controller name="win" pages="0,,1," selected="0"/>
   <controller name="num" pages="1,,2," selected="0"/>
   <controller name="isgroup" pages="0,,1," selected="0"/>
+  <controller name="lastRound" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n57_yffn" name="bgWindow" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="177,24" size="2178,1120"/>
     <text id="n58_yffn" name="n58" xy="335,166" size="188,62" group="n4_ckvb" font="Microsoft YaHei" fontSize="46" color="#43633d" text="玩家昵称"/>
@@ -16,28 +16,53 @@
       <item/>
       <item/>
     </list>
-    <component id="n10_ckvb" name="btn_confirm" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1395,974" size="400,169" group="n4_ckvb">
+    <text id="n64_yffn" name="n64" xy="222,920" size="234,62" group="n4_ckvb" font="Microsoft YaHei" fontSize="46" color="#43633d" text="剩余的牌："/>
+    <list id="n65_yffn" name="list_residue" xy="220,978" size="676,145" group="n4_ckvb" scale="0.836,0.836" layout="row" colGap="-52" defaultItem="ui://8wph7p8nyffno2">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n10_ckvb" name="btn_confirm" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1395,974" size="400,169" group="n74_yffn">
       <Button icon="ui://27vd145byffn7ipc"/>
     </component>
-    <component id="n63_yffn" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1895,974" size="400,169" group="n4_ckvb">
+    <component id="n63_yffn" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1895,974" size="400,169" group="n74_yffn">
       <Button icon="ui://27vd145byffn7ipd"/>
     </component>
-    <text id="n64_yffn" name="n64" xy="222,920" size="234,62" group="n4_ckvb" font="Microsoft YaHei" fontSize="46" color="#43633d" text="剩余的牌："/>
+    <group id="n74_yffn" name="over0Btncontinue" xy="1395,974" size="900,169" group="n4_ckvb" advanced="true">
-    <list id="n65_yffn" name="list_residue" xy="224,979" size="836,121" group="n4_ckvb" overflow="scroll"/>
+      <gearDisplay controller="lastRound" pages="0"/>
-    <group id="n4_ckvb" name="over0" xy="222,166" size="2073,977" advanced="true">
+    </group>
+    <component id="n76_yffn" name="btn_Show1" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1842,974" size="400,169" group="n77_yffn">
+      <Button icon="ui://27vd145byffn7iq0"/>
+    </component>
+    <group id="n77_yffn" name="over0Btnlast" xy="1842,974" size="400,169" group="n4_ckvb" advanced="true">
+      <gearDisplay controller="lastRound" pages="1"/>
+    </group>
+    <group id="n4_ckvb" name="over0" xy="220,166" size="2075,977" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
     <component id="n18_ckvb" name="btn_result_share" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="233,971" size="400,169" group="n25_ckvb">
       <Button icon="ui://27vd145byffn7ipz"/>
     </component>
-    <component id="n66_yffn" name="btn_result_confirm" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1909,971" size="400,169" group="n25_ckvb">
+    <component id="n66_yffn" name="btn_continue_game" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1909,971" size="400,169" group="n25_ckvb">
       <Button icon="ui://27vd145byffn7iq1"/>
     </component>
-    <component id="n21_ckvb" name="comp_playerInfo1_over1" src="yffnc" fileName="Clearing/Component/Comp_playerOver1Info.xml" xy="489,249" group="n25_ckvb">
+    <component id="n21_ckvb" name="comp_playerInfo1_over1" src="yffnc" fileName="Clearing/Component/Comp_playerOver1Info.xml" xy="607,197" group="n25_ckvb">
-      <gearXY controller="num" pages="1,2" values="489,249|248,250"/>
+      <gearXY controller="num" pages="1,2" values="607,197|248,250"/>
     </component>
-    <component id="n22_ckvb" name="comp_playerInfo2_over1" src="yffnc" fileName="Clearing/Component/Comp_playerOver1Info.xml" xy="1454,247" group="n25_ckvb">
+    <component id="n22_ckvb" name="comp_playerInfo2_over1" src="yffnc" fileName="Clearing/Component/Comp_playerOver1Info.xml" xy="1456,197" group="n25_ckvb">
-      <gearXY controller="num" pages="1,2" values="1454,247|978,249"/>
+      <gearXY controller="num" pages="1,2" values="1456,197|978,249"/>
     </component>
     <image id="n67_yffn" name="n67" src="yffn7iq3" fileName="images/bg_game_clearDetail.png" pkg="27vd145b" xy="748,958" group="n69_yffn"/>
     <text id="n68_yffn" name="txt_play" xy="838,962" size="856,137" group="n69_yffn" font="Microsoft YaHei" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明"/>
@@ -45,10 +70,13 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
     <text id="n70_yffn" name="txt_game_name" xy="490,59" size="148,49" group="n25_ckvb" font="Microsoft YaHei" fontSize="36" color="#ffffff" vAlign="middle" text="游戏名字"/>
-    <text id="n71_yffn" name="txt_game_data" xy="2007,56" size="310,49" group="n25_ckvb" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="right" vAlign="middle" text="2019-12-12 18:28"/>
+    <text id="n71_yffn" name="txt_game_data" xy="1817,56" size="310,49" group="n25_ckvb" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="right" vAlign="middle" text="2019-12-12 18:28"/>
     <text id="n72_yffn" name="txt_room_id" xy="231,59" size="240,49" group="n25_ckvb" font="Microsoft YaHei" fontSize="36" color="#ffffff" vAlign="middle" text="房号：888888"/>
-    <group id="n25_ckvb" name="over1" xy="231,56" size="2086,1084" advanced="true">
+    <group id="n25_ckvb" name="over1" xy="231,56" size="2078,1084" advanced="true">
       <gearDisplay controller="over" pages="1"/>
     </group>
+    <component id="n73_yffn" name="btn_closeRound" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="2236,10">
+      <gearDisplay controller="over" pages="1"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml

@@ -78,20 +78,20 @@
     <text id="n61_agtp" name="tex_version" xy="1168,326" size="130,38" scale="1.5,1.5" fontSize="30" color="#ffffff" align="center" autoSize="none" text="V2.0.2">
       <gearDisplay controller="state" pages="0,1,2"/>
     </text>
-    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="2400,907" visible="false"/>
+    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="2400,907" visible="false" pkg="27vd145b"/>
     <component id="n79_roef" name="btn_distance" src="yffnj3" fileName="component/gps/btn_distance_new.xml" xy="851,10" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
     </component>
-    <component id="n82_q50p" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="320,2" size="1334,108" group="n86_q50p" scale="1.5,1.5">
+    <component id="n82_q50p" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="320,2" size="1334,108" group="n86_q50p" scale="1.5,1.5" pkg="27vd145b">
       <gearDisplay controller="state" pages="0,1,2,3"/>
     </component>
-    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="1081,72" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
+    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="1081,72" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false" pkg="27vd145b"/>
     <component id="n84_q50p" name="btn_back_lobby" src="yffngb" fileName="component/poker/Btn_back_lobby.xml" xy="617,20" size="58,75" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
     <component id="n85_q50p" name="btn_rule" src="yffnge" fileName="component/poker/Btn_log.xml" xy="439,20" group="n86_q50p" scale="1.5,1.5"/>
-    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="839,-124" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
+    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="839,-124" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false" pkg="27vd145b"/>
     <component id="n120_r1z9" name="btn_leave_lobby" src="yffngk" fileName="component/poker/Btn_leave_lobby.xml" xy="738,20" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,3"/>
     </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_3.xml

@@ -47,15 +47,15 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
     </component>
-    <component id="n82_q50p" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="599,0" group="n86_q50p">
+    <component id="n82_q50p" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="599,0" group="n86_q50p" pkg="27vd145b">
       <gearDisplay controller="state" pages="0,1,2,3"/>
     </component>
-    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="828,52" size="288,55" group="n86_q50p" touchable="false"/>
+    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="828,52" size="288,55" group="n86_q50p" touchable="false" pkg="27vd145b"/>
     <component id="n84_q50p" name="btn_back_lobby" src="yffngb" fileName="component/poker/Btn_back_lobby.xml" xy="897,12" size="64,75" group="n86_q50p">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
     <component id="n85_q50p" name="btn_rule" src="yffnge" fileName="component/poker/Btn_log.xml" xy="740,12" group="n86_q50p"/>
-    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="871,-122" size="150,77" group="n86_q50p" touchable="false"/>
+    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="871,-122" size="150,77" group="n86_q50p" touchable="false" pkg="27vd145b"/>
     <component id="n100_r1z9" name="btn_leave_lobby" src="yffngk" fileName="component/poker/Btn_leave_lobby.xml" xy="1013,6" group="n86_q50p">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
@@ -97,7 +97,7 @@
     <text id="n61_agtp" name="tex_version" xy="1204,708" size="130,38" fontSize="30" color="#ffffff" align="center" autoSize="none" text="V2.0.2">
       <gearDisplay controller="state" pages="0,1,2"/>
     </text>
-    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="1220,350" visible="false"/>
+    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="1220,350" visible="false" pkg="27vd145b"/>
     <component id="n75_jmab" name="poker_eff" src="yffnbi" fileName="component/effect/poker/poker_eff.xml" xy="618,10" touchable="false">
       <gearDisplay controller="card_eff" pages="1"/>
       <gearXY controller="card_eff" pages="0" values="618,10" default="618,10"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -576,8 +576,6 @@
     <image id="yffng0" name="sm.png" path="/images/"/>
     <component id="yffng1" name="Btn_setting.xml" path="/component/phone_info/"/>
     <image id="yffng2" name="sz.png" path="/images/"/>
-    <component id="yffng3" name="ProgressBar2.xml" path="/component/phone_info/"/>
-    <component id="yffng4" name="Component3(1).xml" path="/component/phone_info/"/>
     <component id="yffng5" name="Component3.xml" path="/component/phone_info/"/>
     <component id="yffng6" name="poker6.xml" path="/component/poker/" exported="true"/>
     <component id="yffng7" name="poker8.xml" path="/component/poker/" exported="true"/>
@@ -687,10 +685,8 @@
     <component id="yffnj3" name="btn_distance_new.xml" path="/component/gps/" exported="true"/>
     <image id="yffnj4" name="lsgps.png" path="/component/gps/"/>
     <image id="yffnj5" name="hsgps.png" path="/component/gps/"/>
-    <component id="yffnj6" name="RightPanel.xml" path="/component/" exported="true"/>
     <image id="yffnj7" name="sd.png" path="/images/" scale="9grid" scale9grid="31,16,62,12"/>
     <image id="yffnj8" name="dks02.png" path="/images/" scale="9grid" scale9grid="36,9,72,16"/>
-    <component id="yffnj9" name="RoomInfoPanel1.xml" path="/component/"/>
     <component id="yffnja" name="Clock.xml" path="/component/"/>
     <image id="yffnjb" name="clock.png" path="/images/"/>
     <component id="yffnjc" name="Btn_Yellow.xml" path="/buttons/" exported="true"/>
@@ -705,8 +701,6 @@
     <image id="yffnjl" name="02.png" path="/font/images/record/" exported="true"/>
     <component id="yffnjm" name="Btn_record_return.xml" path="/component/record/"/>
     <image id="yffnjn" name="button03.png" path="/font/images/record/" exported="true"/>
-    <component id="yffnjo" name="Gcm_chat.xml" path="/" exported="true"/>
-    <component id="yffnjp" name="Btn_chat.xml" path="/"/>
     <image id="yffnjq" name="lt.png" path="/images/"/>
     <image id="yffnjr" name="gbyy.png" path="/images/"/>
     <image id="yffnjs" name="img_6.png" path="/images/"/>
@@ -864,6 +858,7 @@
     <component id="yffnnz" name="btn_share_method.xml" path="/component/Result/component/"/>
     <image id="yffno0" name="bqd.png" path="/component/Result/images/"/>
     <image id="yffno1" name="hd(1).png" path="/component/Result/"/>
+    <component id="yffno2" name="Btn_ResultCard.xml" path="/Main_New/Component/"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -1,143 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" designImage="ui://v0j9abjygq7m95">
+<component size="2532,1170" designImage="ui://v0j9abjygq7m95">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
+  <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="3d" pages="0,,1," selected="0"/>
   <displayList>
-    <text id="n93_nkur" name="wanfa_text" xy="334,238" pivot="0.5,0" size="644,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="玩法介绍">
+    <text id="n93_nkur" name="wanfa_text" xy="869,485" pivot="0.5,0" size="772,56" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="玩法介绍">
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n72_l2u4" name="n21" xy="658,284" size="22,27" group="n80_l2u4" fontSize="18" color="#c2ffe0" vAlign="middle" text="第">
+    <text id="n72_l2u4" name="n21" xy="1270,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="第">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n76_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n73_l2u4" name="n22" xy="705,284" size="9,27" group="n80_l2u4" fontSize="18" color="#c2ffe0" vAlign="middle" text="/">
+    <text id="n73_l2u4" name="n22" xy="1345,543" size="14,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="/">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n78_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n74_l2u4" name="n23" xy="743,284" size="22,27" group="n80_l2u4" fontSize="18" color="#c2ffe0" vAlign="middle" text="局">
+    <text id="n74_l2u4" name="n23" xy="1398,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="局">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n79_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n75_l2u4" name="n11" xy="540,284" size="40,27" group="n80_l2u4" fontSize="18" color="#c2ffe0" vAlign="middle" text="剩余">
+    <text id="n75_l2u4" name="n11" xy="1080,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="剩余">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n77_l2u4" sidePair="right-left"/>
     </text>
-    <text id="n76_l2u4" name="n12" xy="609,284" size="40,27" group="n80_l2u4" fontSize="18" color="#c2ffe0" vAlign="middle" text="张牌">
+    <text id="n76_l2u4" name="n12" xy="1185,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="张牌">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
-    <text id="n77_l2u4" name="remaining_card" xy="579,284" size="27,27" group="n80_l2u4" font="Microsoft YaHei" fontSize="18" color="#990099" align="center" vAlign="middle" autoSize="none" text="7">
+    <text id="n77_l2u4" name="remaining_card" xy="1155,543" size="27,54" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990099" align="center" vAlign="middle" autoSize="none" text="7">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n76_l2u4" sidePair="right-left"/>
     </text>
-    <text id="n78_l2u4" name="tex_round1" xy="684,284" size="15,27" group="n80_l2u4" font="Microsoft YaHei" fontSize="18" color="#990066" align="center" vAlign="middle" autoClearText="true" text="2">
+    <text id="n78_l2u4" name="tex_round1" xy="1314,543" size="25,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" autoClearText="true" text="2">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n72_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n79_l2u4" name="tex_round2" xy="720,284" size="15,27" group="n80_l2u4" font="Microsoft YaHei" fontSize="18" color="#990066" align="center" vAlign="middle" autoClearText="true" text="8">
+    <text id="n79_l2u4" name="tex_round2" xy="1365,543" size="25,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" autoClearText="true" text="8">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n73_l2u4" sidePair="left-right"/>
     </text>
-    <group id="n80_l2u4" name="n80" xy="540,284" size="225,27" group="n82_l2u4" advanced="true">
+    <group id="n80_l2u4" name="n80" xy="1080,543" size="358,54" group="n82_l2u4" advanced="true">
       <relation target="n81_l2u4" sidePair="left-left,top-top"/>
     </group>
-    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="587,312" pivot="0.5,0.5" group="n82_l2u4">
+    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1202,611" pivot="0.5,0.5" group="n82_l2u4" aspect="true" scale="1.3,1.3">
       <gearDisplay controller="state" pages="1,3"/>
-      <gearXY controller="3d" pages="0,1" values="587,312|603,254"/>
+      <gearXY controller="3d" pages="0,1" values="1202,611|603,254"/>
     </component>
-    <group id="n82_l2u4" name="n60" xy="540,284" size="225,154" advanced="true">
+    <group id="n82_l2u4" name="n60" xy="1080,543" size="358,194" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n86_8sat" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="466,38" size="274,41" group="n90_8sat" touchable="false"/>
+    <component id="n86_8sat" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1059,10" group="n90_8sat" touchable="false"/>
-    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="21,2" size="1329,102" group="n90_8sat"/>
+    <component id="n71_l2u4" name="com_roominfo" src="yffnj6" fileName="component/RightPanel.xml" pkg="27vd145b" xy="0,0" group="n90_8sat"/>
-    <component id="n88_8sat" name="btn_rule" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="142,12" group="n90_8sat"/>
+    <component id="n88_8sat" name="btn_rule" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="415,10" size="129,106" group="n90_8sat">
-    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="295,12" size="110,75" group="n90_8sat">
+      <Button icon="ui://27vd145byffn7ip5"/>
+    </component>
+    <component id="n89_8sat" name="btn_back_jiesan" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="595,15" size="128,106" group="n90_8sat">
       <gearDisplay controller="state" pages="1,2"/>
+      <Button icon="ui://27vd145byffn7ip6"/>
     </component>
-    <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="295,12" size="58,75" group="n90_8sat">
+    <component id="n87_8sat" name="btn_back_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="626,15" size="64,106" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
+      <Button icon="ui://27vd145byffn7ip2"/>
     </component>
-    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="404,10" group="n90_8sat">
+    <component id="n105_r1z9" name="btn_leave_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="784,15" size="71,106" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
+      <Button icon="ui://27vd145byffn7ip3"/>
     </component>
-    <group id="n90_8sat" name="n90" xy="21,2" size="1329,102" advanced="true">
+    <group id="n90_8sat" name="n90" xy="0,0" size="2532,121" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n84_l2u4" name="btn_wxyqhy" src="gq7m1q" fileName="Main_style_2/component/room/btn_invite(1).xml" xy="521,295" group="n85_l2u4">
+    <component id="n84_l2u4" name="btn_wxyqhy" src="gq7m1q" fileName="Main_style_2/component/room/btn_invite(1).xml" xy="1120,505" group="n85_l2u4">
       <gearDisplay controller="sdk" pages="0"/>
       <Button icon="ui://v0j9abjygq7m1s"/>
     </component>
-    <group id="n85_l2u4" name="n85" xy="521,295" size="292,87" advanced="true">
+    <group id="n85_l2u4" name="n85" xy="1120,505" size="292,87" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="905,-4" visible="false" touchable="false">
+    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="2087,-4" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n90_8sat" sidePair="right-right"/>
     </component>
-    <component id="n41_ppzk" name="player_card_info2" src="gq7m8h" fileName="Main_style_2/Player_card_info_3.xml" xy="0,86" size="1334,99">
+    <component id="n41_ppzk" name="player_card_info2" src="gq7m8h" fileName="Main_style_2/Player_card_info_3.xml" xy="599,86" size="1334,99">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n39_ppzk" name="player_card_info1" src="gq7m8k" fileName="Main_style_2/Player_card_info_1.xml" xy="-1,535">
+    <component id="n39_ppzk" name="player_card_info1" src="gq7m8k" fileName="Main_style_2/Player_card_info_1.xml" xy="-1,916" size="2532,256">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </component>
-    <component id="n17" name="player_info2" src="gq7m8l" fileName="Main_style_2/PlayerHead_3_s2(1).xml" xy="1080,6">
+    <component id="n17" name="player_info2" src="gq7m8l" fileName="Main_style_2/PlayerHead_3_s2(1).xml" xy="2278,106" scale="1.5,1.5">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n7" name="player_info1" src="gq7m8u" fileName="Main_style_2/PlayerHead_1_s2(1).xml" xy="17,365" size="100,172">
+    <component id="n7" name="player_info1" src="gq7m8u" fileName="Main_style_2/PlayerHead_1_s2(1).xml" xy="39,496" size="100,172" scale="1.5,1.5">
       <relation target="" sidePair="left-left,bottom-bottom,left-left,bottom-bottom"/>
     </component>
-    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="281,548" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="880,968" group="n36_k3io" visible="false">
       <Button icon="ui://v0j9abjygq7m49"/>
     </component>
-    <component id="n110_a81d" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="811,452" size="240,90" group="n36_k3io">
+    <component id="n110_a81d" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="1410,872" size="240,90" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
     </component>
-    <component id="n111_nlef" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="328,452" group="n36_k3io">
+    <component id="n111_nlef" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="927,872" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="281,452" size="770,181" advanced="true">
+    <group id="n36_k3io" name="n36" xy="880,872" size="770,181" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
-    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="229,434" size="757,165" group="n59_v38k" alpha="0.5">
+    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="828,434" size="757,165" group="n59_v38k" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="512,479" size="190,8" group="n59_v38k">
+    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1111,479" size="190,8" group="n59_v38k">
       <relation target="" sidePair="center-center"/>
     </component>
-    <group id="n59_v38k" name="n59" xy="320,434" size="757,165"/>
+    <group id="n59_v38k" name="n59" xy="828,434" size="757,165"/>
-    <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1239,417">
+    <component id="n69_l2u4" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2368,533">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <text id="n92_lkov" name="tex_version" xy="1201,8" size="130,38" fontSize="30" color="#ffffff" align="center" autoSize="none" text="V2.0.2">
+    <text id="n92_lkov" name="tex_version" xy="2387,8" size="130,54" fontSize="40" color="#ffffff" align="center" autoSize="none" text="V2.0.2">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,top-top"/>
     </text>
-    <component id="n96_dnw9" name="selectlaizi" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="601,295" size="87,136" group="n100_dnw9" scale="1.5,1.5" touchable="false">
+    <component id="n96_dnw9" name="selectlaizi" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="1200,304" size="87,136" group="n100_dnw9" scale="1.5,1.5" touchable="false">
       <relation target="" sidePair="center-center"/>
     </component>
-    <text id="n103_dnw9" name="n103" xy="11,107" size="43,67" group="n100_dnw9" fontSize="25" color="#ff0000" autoSize="none" text=""/>
+    <text id="n103_dnw9" name="n103" xy="11,116" size="43,67" group="n100_dnw9" fontSize="25" color="#ff0000" autoSize="none" text=""/>
-    <component id="n101_dnw9" name="selectlaizi1" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="45,100" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
+    <component id="n101_dnw9" name="selectlaizi1" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="45,109" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
       <relation target="" sidePair=""/>
     </component>
-    <component id="n102_dnw9" name="selectlaizi2" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="92,100" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
+    <component id="n102_dnw9" name="selectlaizi2" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="92,109" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
       <relation target="" sidePair=""/>
     </component>
-    <component id="n106_go7q" name="selectgang1" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="5,100" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
+    <component id="n106_go7q" name="selectgang1" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="5,109" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
       <relation target="" sidePair=""/>
     </component>
-    <text id="n107_go7q" name="n108" xy="5,158" size="76,34" group="n100_dnw9" visible="false" fontSize="24" color="#ffcc66" text="补杠牌"/>
+    <text id="n107_go7q" name="n108" xy="5,167" size="76,34" group="n100_dnw9" visible="false" fontSize="24" color="#ffcc66" text="补杠牌"/>
-    <text id="n108_go7q" name="bugangnum" xy="22,188" size="37,34" group="n100_dnw9" visible="false" fontSize="24" color="#ffffcc" autoSize="none" text=""/>
+    <text id="n108_go7q" name="bugangnum" xy="22,197" size="37,34" group="n100_dnw9" visible="false" fontSize="24" color="#ffffcc" autoSize="none" text=""/>
-    <component id="n109_go7q" name="selectgang2" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="55,100" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
+    <component id="n109_go7q" name="selectgang2" src="gq7m3" fileName="Main_style_2/card/Btn_Card.xml" xy="55,109" size="87,136" group="n100_dnw9" scale="0.5,0.5" touchable="false">
       <relation target="" sidePair=""/>
     </component>
-    <group id="n100_dnw9" name="n100" xy="5,100" size="683,331" advanced="true">
+    <group id="n100_dnw9" name="n100" xy="5,109" size="1282,331" advanced="true">
       <relation target="" sidePair=""/>
     </group>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_style_2/Player_card_info_1.xml

@@ -1,22 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,217" opaque="false" initName="player_card_info">
+<component size="2532,256" opaque="false" initName="player_card_info">
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="235,-106" size="715,117">
+    <component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="277,-156" size="715,117">
-      <gearXY controller="3d" pages="0,1" values="235,-106|517,-145"/>
+      <gearXY controller="3d" pages="0,1" values="277,-156|517,-145"/>
       <gearSize controller="3d" pages="0,1" values="715,117,1,1|300,117,1,1"/>
     </component>
-    <component id="n25" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="5,69" pivot="0.5,0.5" size="1249,124" aspect="true">
+    <component id="n25" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="14,0" pivot="0.5,0.5" size="2518,294" aspect="true">
       <relation target="n26" sidePair="leftext-right"/>
     </component>
-    <component id="n26" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="0,81" size="11,125"/>
+    <component id="n26" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="0,0" size="25,294" aspect="true"/>
-    <text id="n29" name="area_mask" xy="71,-997" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;fz_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;oder3d&quot;:&quot;left_right&quot;,&#xA;    &quot;adjust3d&quot;:0,&#xA;    &quot;comp&quot;:&quot;Fz_0_&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;202_&quot;&#xA;    },&#xA;&quot;handcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;comp_back&quot;:&quot;Back_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;comp&quot;:&quot;Mp_self_card&quot;&#xA;},&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_self&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;202_&quot;,&#xA;    &quot;multi_oder&quot;:&quot;down_up&quot;,&#xA;    &quot;num&quot;:12,&#xA;    &quot;multi_draw_oder&quot;:1,&#xA;    &quot;num3d&quot;:8,&#xA;    &quot;multi_oder3d&quot;:&quot;up_down&quot;,&#xA;    &quot;sorting_order3d&quot;:1&#xA;    }&#xA;}"/>
+    <text id="n29" name="area_mask" xy="76,-1003" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;fz_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;oder3d&quot;:&quot;left_right&quot;,&#xA;    &quot;adjust3d&quot;:0,&#xA;    &quot;comp&quot;:&quot;Fz_0_&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;202_&quot;&#xA;    },&#xA;&quot;handcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;comp_back&quot;:&quot;Back_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;comp&quot;:&quot;Mp_self_card&quot;&#xA;},&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_self&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;202_&quot;,&#xA;    &quot;multi_oder&quot;:&quot;down_up&quot;,&#xA;    &quot;num&quot;:22,&#xA;    &quot;multi_draw_oder&quot;:1,&#xA;    &quot;num3d&quot;:8,&#xA;    &quot;multi_oder3d&quot;:&quot;up_down&quot;,&#xA;    &quot;sorting_order3d&quot;:-1&#xA;    }&#xA;}"/>
-    <component id="n24" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="666,29" size="1,1"/>
+    <component id="n24" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1216,-111" size="1,1"/>
     <component id="n30" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1050,47" size="1,1"/>
     <image id="n31_n6cm" name="n31" src="gq7m8j" fileName="Main_style_2/hand_ting.png" xy="616,89">
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0" values="616,89" default="616,100"/>
     </image>
+    <list id="n34_itp8" name="n34" xy="277,-156" size="1904,300" visible="false" layout="flow_hz" overflow="scroll" lineGap="-10" defaultItem="ui://v0j9abjyitp8ss">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_style_2/Player_card_info_3.xml

@@ -3,22 +3,66 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n20" name="area_handcard_list" src="gq7m8i" fileName="component/Component1.xml" xy="30,-2" size="959,55" touchable="false">
+    <component id="n20" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-221,66" size="1816,300" touchable="false">
-      <gearXY controller="3d" pages="0,1" values="30,-2|24,-75"/>
+      <gearXY controller="3d" pages="0,1" values="-221,66|24,-75"/>
       <relation target="n21" sidePair="rightext-left"/>
     </component>
-    <component id="n21" name="area_fz_list" src="gq7m8i" fileName="component/Component1.xml" xy="1046,-2" size="1,55" touchable="false">
+    <component id="n21" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1046,-2" size="1,55" touchable="false">
       <gearXY controller="3d" pages="0,1" values="1046,-2|986,-75"/>
     </component>
-    <text id="n24" name="area_mask" xy="-414,-260" size="605,840" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;fz_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;oder3d&quot;:&quot;right_left&quot;,&#xA;    &quot;adjust3d&quot;:0,&#xA;    &quot;comp&quot;:&quot;Fz_2_&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;2022_&quot;&#xA;    },&#xA;&quot;handcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;comp_back&quot;:&quot;Back_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_top(1)&quot;&#xA;},&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;2022_&quot;,&#xA;    &quot;multi_oder&quot;:&quot;up_down&quot;,&#xA;    &quot;num&quot;:12,&#xA;    &quot;num3d&quot;:8,&#xA;    &quot;multi_oder3d&quot;:&quot;down_up&quot;,&#xA;    &quot;sorting_order3d&quot;:-1&#xA;    }&#xA;}"/>
+    <text id="n24" name="area_mask" xy="-654,-344" size="605,840" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;fz_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;oder3d&quot;:&quot;right_left&quot;,&#xA;    &quot;adjust3d&quot;:0,&#xA;    &quot;comp&quot;:&quot;Fz_2_&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;2022_&quot;&#xA;    },&#xA;&quot;handcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;comp_back&quot;:&quot;Back_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_top(1)&quot;&#xA;},&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;2022_&quot;,&#xA;    &quot;multi_oder&quot;:&quot;up_down&quot;,&#xA;    &quot;num&quot;:22,&#xA;    &quot;num3d&quot;:8,&#xA;    &quot;multi_oder3d&quot;:&quot;down_up&quot;,&#xA;    &quot;sorting_order3d&quot;:-1&#xA;    }&#xA;}"/>
-    <component id="n22" name="area_outcard_list" src="gq7m8i" fileName="component/Component1.xml" xy="392,59" size="548,117" touchable="false">
+    <component id="n22" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-314,299" size="1904,300" touchable="false">
-      <gearXY controller="3d" pages="1" values="517,4" default="392,59"/>
+      <gearXY controller="3d" pages="0,1" values="-314,299|517,4"/>
-      <gearSize controller="3d" pages="1" values="300,117,1,1" default="548,117,1,1"/>
+      <gearSize controller="3d" pages="0,1" values="1904,300,1,1|300,117,1,1"/>
     </component>
-    <component id="n19" name="mask_liangpai" src="gq7m8i" fileName="component/Component1.xml" xy="666,151" size="1,1"/>
+    <component id="n19" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="666,351" size="1,1"/>
-    <image id="n25_n6cm" name="n25" src="gq7m8j" fileName="images/hand_ting.png" xy="690,-2" scale="0.5,0.5">
+    <image id="n25_n6cm" name="n25" src="gq7m8j" fileName="Main_style_2/hand_ting.png" xy="690,-2" scale="0.5,0.5">
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0,1" values="690,-2|473,-74"/>
     </image>
+    <list id="n30_itp8" name="n30" xy="-314,299" size="1904,300" visible="false" layout="flow_hz" overflow="scroll" defaultItem="ui://v0j9abjyitp8ss">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n31_itp8" name="n31" xy="-171,66" size="1904,300" visible="false" layout="flow_hz" overflow="scroll" defaultItem="ui://v0j9abjygq7ma5">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_style_2/card/Btn_Card.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="87,136" extention="Button">
+<component size="188,294" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="caishen" pages="0,,1," selected="0"/>
   <controller name="quese" pages="0,,1," selected="0"/>
@@ -7,32 +7,32 @@
   <controller name="bg" pages="0,,1," selected="0"/>
   <controller name="mark_ting" pages="0,,1,,2," selected="0"/>
   <controller name="color" pages="0,,1," selected="0"/>
-  <controller name="laizi" pages="0,,1," selected="1"/>
+  <controller name="laizi" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n6_nip5" name="n6" src="gq7m4" fileName="images/fangkuang.png" xy="-90,-58" size="270,256">
+    <image id="n6_nip5" name="n6" src="gq7m4" fileName="Main_style_2/fangkuang.png" xy="-168,-107" size="526,519">
       <gearDisplay controller="bg" pages="1"/>
     </image>
-    <loader id="n3_hp0b" name="icon" xy="-3,2" size="95,134" url="ui://lxhyy2sd6cpqu1" autoSize="true">
+    <loader id="n3_hp0b" name="icon" xy="0,2" size="188,294" url="ui://lxhyy2sd6cpqu1" fill="scaleFree" autoSize="true">
-      <gearXY controller="button" pages="1" values="-3,-22" default="-3,2" tween="true"/>
+      <gearXY controller="button" pages="0,1" values="0,2|-3,-22" tween="true"/>
       <gearColor controller="quese" pages="1" values="#666666" default="#ffffff"/>
     </loader>
-    <image id="n4_i5l6" name="n4" src="gq7m5" fileName="santan.png" xy="122,-13" size="171,157" rotation="90">
+    <image id="n4_i5l6" name="n4" src="gq7m5" fileName="Main_style_2/santan.png" xy="-53,-131" size="294,557">
       <gearDisplay controller="caishen" pages="1"/>
-      <gearXY controller="button" pages="1" values="122,-36" default="122,-13" tween="true"/>
+      <gearXY controller="button" pages="0,1" values="-53,-131|122,-36" tween="true"/>
     </image>
     <loader id="n5_hxpw" name="flag" xy="40,14" size="47,41" url="ui://d493x2q7hxpw10" fill="scale">
       <gearDisplay controller="hun" pages="1"/>
       <gearXY controller="button" pages="1" values="40,-13" default="40,14"/>
     </loader>
-    <graph id="n8_e8zl" name="n8" xy="2,1" size="85,134" alpha="0.3" touchable="false" type="rect" lineColor="#fffcfc12" fillColor="#fffcfc12">
+    <graph id="n8_e8zl" name="n8" xy="0,0" size="188,294" alpha="0.3" touchable="false" type="rect" lineColor="#fffcfc12" fillColor="#fffcfc12">
       <gearDisplay controller="color" pages="1"/>
     </graph>
-    <component id="n9_piv9" name="n9" src="gq7m2" fileName="component/card/card_mark/btn_mark.xml" xy="43,-27" pivot="0.5,0.5" anchor="true">
+    <component id="n9_piv9" name="n9" src="gq7m2" fileName="Main_style_2/card/card_mark/btn_mark.xml" xy="93,-27" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="mark_ting" pages="1,2"/>
-      <gearXY controller="button" pages="0,1" values="43,-27|43,-50"/>
+      <gearXY controller="button" pages="0,1" values="93,-27|43,-50"/>
       <gearIcon controller="mark_ting" pages="1,2" values="ui://v0j9abjygq7m1|ui://v0j9abjygq7m0" default=""/>
     </component>
-    <image id="n10_xiha" name="n10" src="gq7m6" fileName="laizi.png" xy="3,4">
+    <image id="n10_xiha" name="n10" src="gq7m6" fileName="Main_style_2/laizi.png" xy="3,4">
       <gearDisplay controller="laizi" pages="1"/>
       <gearXY controller="button" pages="1" values="3,-22" default="3,4" tween="true"/>
     </image>

wb_new_ui/assets/Main_Majiang/component/card/Back_top.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="36,56">
+<component size="129,201">
   <displayList>
-    <image id="n0" name="n0" src="gq7ma6" xy="0,0" size="36,59" aspect="true"/>
+    <loader id="n2_itp8" name="n2" xy="-6,0" size="141,206" url="ui://v0j9abjygq7ma6" fill="scaleFree"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/card/Btn_Card.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="87,136" extention="Button">
+<component size="165,256" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="caishen" pages="0,,1," selected="0"/>
   <controller name="quese" pages="0,,1," selected="0"/>
@@ -9,30 +9,30 @@
   <controller name="color" pages="0,,1," selected="0"/>
   <controller name="laizi" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n6_nip5" name="n6" src="gq7m86" fileName="images/fangkuang.png" xy="-90,-58" size="270,256">
+    <image id="n6_nip5" name="n6" src="gq7m4" fileName="Main_style_2/fangkuang.png" xy="-168,-107" size="526,519">
       <gearDisplay controller="bg" pages="1"/>
     </image>
-    <loader id="n3_hp0b" name="icon" xy="-3,2" size="95,134" url="ui://lxhyy2sd6cpqu1" autoSize="true">
+    <loader id="n3_hp0b" name="icon" xy="-10,0" size="184,256" url="ui://v0j9abjygq7mj4" fill="scaleFree" clearOnPublish="true">
-      <gearXY controller="button" pages="1" values="-3,-22" default="-3,2" tween="true"/>
+      <gearXY controller="button" pages="0,1" values="-10,0|-11,-42" tween="true"/>
       <gearColor controller="quese" pages="1" values="#666666" default="#ffffff"/>
     </loader>
-    <image id="n4_i5l6" name="n4" src="gq7m87" fileName="santan.png" xy="122,-13" size="171,157" rotation="90">
+    <image id="n4_i5l6" name="n4" src="gq7m5" fileName="Main_style_2/santan.png" xy="-53,-131" size="294,557">
       <gearDisplay controller="caishen" pages="1"/>
-      <gearXY controller="button" pages="1" values="122,-36" default="122,-13" tween="true"/>
+      <gearXY controller="button" pages="0,1" values="-53,-131|122,-36" tween="true"/>
     </image>
-    <loader id="n5_hxpw" name="flag" xy="40,14" size="47,41" url="ui://d493x2q7hxpw10" fill="scale">
+    <loader id="n5_hxpw" name="flag" xy="59,-16" pivot="0.5,0.5" size="47,41" scale="1.5,1.5" url="ui://d493x2q7hxpw10" fill="scale">
       <gearDisplay controller="hun" pages="1"/>
-      <gearXY controller="button" pages="1" values="40,-13" default="40,14"/>
+      <gearXY controller="button" pages="0,1" values="59,-16|40,-13"/>
     </loader>
-    <graph id="n8_e8zl" name="n8" xy="2,1" size="85,134" alpha="0.3" touchable="false" type="rect" lineColor="#fffcfc12" fillColor="#fffcfc12">
+    <graph id="n8_e8zl" name="n8" xy="0,0" size="165,256" alpha="0.3" touchable="false" type="rect" lineColor="#fffcfc12" fillColor="#fffcfc12">
       <gearDisplay controller="color" pages="1"/>
     </graph>
-    <component id="n9_piv9" name="n9" src="gq7m88" fileName="component/card/card_mark/btn_mark.xml" xy="43,-27" pivot="0.5,0.5" anchor="true">
+    <component id="n9_piv9" name="n9" src="gq7m2" fileName="Main_style_2/card/card_mark/btn_mark.xml" xy="82,-27" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="mark_ting" pages="1,2"/>
-      <gearXY controller="button" pages="0,1" values="43,-27|43,-50"/>
+      <gearXY controller="button" pages="0,1" values="82,-27|43,-50"/>
-      <gearIcon controller="mark_ting" pages="1,2" values="ui://v0j9abjygq7m8a|ui://v0j9abjygq7m89" default=""/>
+      <gearIcon controller="mark_ting" pages="1,2" values="ui://v0j9abjygq7m1|ui://v0j9abjygq7m0" default=""/>
     </component>
-    <image id="n10_xiha" name="n10" src="gq7m8b" fileName="laizi.png" xy="3,4">
+    <image id="n10_xiha" name="n10" src="gq7m6" fileName="Main_style_2/laizi.png" xy="3,4">
       <gearDisplay controller="laizi" pages="1"/>
       <gearXY controller="button" pages="1" values="3,-22" default="3,4" tween="true"/>
     </image>

wb_new_ui/assets/Main_Majiang/component/card/Fz_0_3.xml

@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="270,136">
+<component size="512,258">
   <displayList>
-    <loader id="n0" name="card_1" xy="-2,0" size="91,137" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n0" name="card_1" xy="-9,0" size="187,259" url="ui://v0j9abjygq7mj4" fill="scaleFree" clearOnPublish="true">
-    <loader id="n1" name="card_2" xy="84,0" size="91,137" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+      <relation target="" sidePair="width-width%,height-height%"/>
-    <loader id="n2" name="card_3" xy="170,0" size="91,137" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    </loader>
-    <image id="n4_snta" name="santan" src="gq7m9x" xy="-71,-57" size="403,246" aspect="true" visible="false"/>
+    <loader id="n1" name="card_2" xy="158,0" size="187,259" url="ui://v0j9abjygq7mj4" fill="scaleFree" clearOnPublish="true">
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </loader>
+    <loader id="n2" name="card_3" xy="325,0" size="187,259" url="ui://v0j9abjygq7mj4" fill="scaleFree" clearOnPublish="true">
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </loader>
+    <image id="n4_snta" name="santan" src="gq7m9x" fileName="images/santan.png" xy="-138,-114" size="788,481" aspect="true" visible="false">
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/card/Fz_0_4.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="270,136">
+<component size="512,258">
   <displayList>
-    <loader id="n0" name="card_1" xy="-2,0" size="91,137" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n0" name="card_1" xy="0,0" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
-    <loader id="n1" name="card_2" xy="84,0" size="91,137" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n1" name="card_2" xy="158,0" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
-    <loader id="n2" name="card_3" xy="170,0" size="91,137" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n2" name="card_3" xy="325,0" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
-    <loader id="n3" name="card_4" xy="85,-29" size="91,137" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n3" name="card_4" xy="158,-55" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
-    <image id="n5_snta" name="santan" src="gq7m9x" xy="-66,-56" size="393,239" aspect="true" visible="false"/>
+    <image id="n5_snta" name="santan" src="gq7m9x" fileName="images/santan.png" xy="-66,-56" size="393,239" aspect="true" visible="false"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/card/OutCard_self.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="45,54" extention="Button">
+<component size="86,103" extention="Button">
   <controller name="caishen" pages="0,,1," selected="0"/>
   <controller name="quese" pages="0,,1," selected="0"/>
-  <controller name="hun" pages="0,,1," selected="1"/>
+  <controller name="hun" pages="0,,1," selected="0"/>
   <controller name="gray" pages="0,,1," selected="0"/>
-  <controller name="color" pages="0,,1," selected="0"/>
+  <controller name="color" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n1" name="icon" xy="-1,-1" size="95,134" scale="0.5,0.5" url="ui://lxhyy2sd6cpqty" autoSize="true"/>
+    <loader id="n1" name="icon" xy="-5,0" size="96,103" url="ui://v0j9abjygq7mk3" fill="scaleFree" useResize="true" clearOnPublish="true"/>
     <image id="n2_i5l6" name="n2" src="gq7m87" fileName="santan.png" xy="64,-14" size="83,82" rotation="90">
       <gearDisplay controller="caishen" pages="1"/>
     </image>
-    <loader id="n3_hxpw" name="flag" xy="27,0" size="28,24" scale="0.6,0.6" url="ui://d493x2q7hxpw10" fill="scale">
+    <loader id="n3_hxpw" name="flag" xy="29,-18" pivot="0.5,0.5" size="28,24" url="ui://d493x2q7hxpw10" fill="scale">
       <gearDisplay controller="hun" pages="1"/>
     </loader>
-    <graph id="n4_6cpq" name="n4" xy="0,-3" size="46,69" alpha="0.5" type="rect" lineColor="#00000000" fillColor="#ff000000">
+    <graph id="n4_6cpq" name="n4" xy="-1,-1" size="88,105" alpha="0.5" type="rect" lineColor="#00000000" fillColor="#ff000000" corner="4">
       <gearDisplay controller="gray" pages="1"/>
     </graph>
-    <graph id="n5_f7q5" name="n5" xy="-1,-1" size="47,65" alpha="0.3" touchable="false" blend="add" type="rect" lineSize="0" fillColor="#ffffefc7">
+    <graph id="n5_f7q5" name="n5" xy="-1,-1" size="88,105" alpha="0.3" touchable="false" blend="add" type="rect" lineSize="0" fillColor="#ffffefc7" corner="4">
       <gearDisplay controller="color" pages="1"/>
     </graph>
   </displayList>

wb_new_ui/assets/Main_Majiang/component/card/OutCard_top.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="45,54" extention="Button">
+<component size="86,103" extention="Button">
   <controller name="caishen" pages="0,,1," selected="0"/>
   <controller name="quese" pages="0,,1," selected="0"/>
-  <controller name="hun" pages="0,,1," selected="1"/>
+  <controller name="hun" pages="0,,1," selected="0"/>
   <controller name="gray" pages="0,,1," selected="0"/>
   <controller name="color" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n1" name="icon" xy="-1,-1" size="95,134" scale="0.5,0.5" url="ui://lxhyy2sd6cpqty" autoSize="true"/>
+    <loader id="n1" name="icon" xy="-5,0" size="96,103" url="ui://v0j9abjygq7mk3" fill="scaleFree" useResize="true" clearOnPublish="true"/>
     <image id="n2_i5l6" name="n2" src="gq7m87" fileName="santan.png" xy="64,-14" size="83,82" rotation="90">
       <gearDisplay controller="caishen" pages="1"/>
     </image>
-    <loader id="n3_hxpw" name="flag" xy="20,0" size="28,24" url="ui://d493x2q7hxpw10" fill="scale">
+    <loader id="n3_hxpw" name="flag" xy="29,-18" pivot="0.5,0.5" size="28,24" url="ui://d493x2q7hxpw10" fill="scale">
       <gearDisplay controller="hun" pages="1"/>
     </loader>
-    <graph id="n4_6cpq" name="n4" xy="0,-3" size="46,69" alpha="0.5" type="rect" lineColor="#00000000" fillColor="#ff000000">
+    <graph id="n4_6cpq" name="n4" xy="-1,-1" size="88,105" alpha="0.5" type="rect" lineColor="#00000000" fillColor="#ff000000" corner="4">
       <gearDisplay controller="gray" pages="1"/>
     </graph>
-    <graph id="n5_f7q5" name="n5" xy="-1,-1" size="47,65" alpha="0.3" touchable="false" blend="add" type="rect" lineSize="0" fillColor="#ffffefc7">
+    <graph id="n5_f7q5" name="n5" xy="-1,-1" size="88,105" alpha="0.3" touchable="false" blend="add" type="rect" lineSize="0" fillColor="#ffffefc7" corner="4">
       <gearDisplay controller="color" pages="1"/>
     </graph>
   </displayList>

wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750">
+<component size="2532,1170">
   <controller name="state" pages="0,,4,,1," selected="0"/>
   <controller name="bg" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <controller name="card" pages="0,,1,,2," selected="0"/>
@@ -8,19 +8,18 @@
   <controller name="size" pages="0,,1,,2," selected="0"/>
   <displayList>
     <graph id="n78_zuwf" name="btn_close" xy="0,0" size="729,750" type="rect" lineSize="0" lineColor="#4f000000" fillColor="#00000000"/>
-    <image id="n101_ni5n" name="n101" src="gq7mgj" fileName="component/setting_new/images/setting/9bg_03.png" xy="736,3" size="592,763" group="n70_n6fs"/>
+    <image id="n101_ni5n" name="n101" src="itp87iqm" fileName="images/bg_game_setting.png" pkg="27vd145b" xy="1488,-3" group="n70_n6fs"/>
-    <image id="n108_ni5n" name="n108" src="gq7mgl" fileName="component/setting_new/images/setting/9bg_04.png" xy="756,149" size="553,139" group="n70_n6fs"/>
+    <image id="n108_ni5n" name="n108" src="itp87iqn" fileName="images/bg_game_settingLab.png" pkg="27vd145b" xy="1517,221" size="987,172" group="n70_n6fs"/>
-    <image id="n109_ni5n" name="n109" src="gq7mgl" fileName="component/setting_new/images/setting/9bg_04.png" xy="756,354" size="553,139" group="n70_n6fs"/>
+    <image id="n109_ni5n" name="n109" src="itp87iqn" fileName="images/bg_game_settingLab.png" pkg="27vd145b" xy="1517,482" size="987,172" group="n70_n6fs"/>
-    <image id="n110_ni5n" name="n110" src="gq7mgl" fileName="component/setting_new/images/setting/9bg_04.png" xy="756,550" size="553,57" group="n70_n6fs"/>
+    <image id="n110_ni5n" name="n110" src="itp87iqn" fileName="images/bg_game_settingLab.png" pkg="27vd145b" xy="756,550" size="553,57" group="n70_n6fs" visible="false"/>
-    <image id="n102_ni5n" name="n102" src="gq7mgk" fileName="component/setting_new/images/setting/tx_shezhi.png" xy="1011,28" group="n70_n6fs"/>
+    <text id="n103_ni5n" name="n103" xy="1899,152" size="222,64" group="n70_n6fs" font="Microsoft YaHei" fontSize="48" color="#43633d" align="center" vAlign="middle" autoSize="none" text="声效"/>
-    <text id="n103_ni5n" name="n103" xy="927,97" size="222,42" group="n70_n6fs" font="Microsoft YaHei" fontSize="30" color="#4297f9" align="center" vAlign="middle" autoSize="none" bold="true" text="声效"/>
+    <text id="n104_ni5n" name="n104" xy="1899,414" size="222,64" group="n70_n6fs" font="Microsoft YaHei" fontSize="48" color="#43633d" align="center" vAlign="middle" autoSize="none" text="背景"/>
-    <text id="n104_ni5n" name="n104" xy="927,297" size="222,42" group="n70_n6fs" font="Microsoft YaHei" fontSize="30" color="#4297f9" align="center" vAlign="middle" autoSize="none" bold="true" text="背景"/>
+    <text id="n105_ni5n" name="n105" xy="927,503" size="222,42" group="n70_n6fs" visible="false" font="Microsoft YaHei" fontSize="30" color="#4297f9" align="center" vAlign="middle" autoSize="none" bold="true" text="牌面"/>
-    <text id="n105_ni5n" name="n105" xy="927,503" size="222,42" group="n70_n6fs" font="Microsoft YaHei" fontSize="30" color="#4297f9" align="center" vAlign="middle" autoSize="none" bold="true" text="牌面"/>
+    <image id="n115_ttbr" name="n115" src="itp87iqn" fileName="images/bg_game_settingLab.png" pkg="27vd145b" xy="1517,831" size="987,125" group="n70_n6fs"/>
-    <image id="n115_ttbr" name="n115" src="gq7mgl" fileName="component/setting_new/images/setting/9bg_04.png" xy="757,648" size="553,57" group="n70_n6fs"/>
+    <text id="n116_ttbr" name="n116" xy="1899,754" size="222,64" group="n70_n6fs" font="Microsoft YaHei" fontSize="48" color="#43633d" align="center" vAlign="middle" autoSize="none" text="手牌"/>
-    <text id="n116_ttbr" name="n116" xy="929,605" size="222,42" group="n70_n6fs" font="Microsoft YaHei" fontSize="30" color="#4297f9" align="center" vAlign="middle" autoSize="none" bold="true" text="手牌"/>
+    <group id="n70_n6fs" name="n70" xy="756,-3" size="1776,1170"/>
-    <group id="n70_n6fs" name="n70" xy="736,3" size="592,763"/>
+    <list id="n49_pue4" name="lst_bg" xy="1584,510" size="853,113" group="n47_pue4" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="60" colGap="60" lineItemCount="3" defaultItem="ui://v0j9abjygq7mfu" align="center" vAlign="middle" selectionController="bg"/>
-    <list id="n49_pue4" name="lst_bg" xy="753,358" size="556,132" group="n47_pue4" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="40" lineItemCount="3" defaultItem="ui://v0j9abjygq7mfu" align="center" vAlign="middle" selectionController="bg"/>
+    <group id="n47_pue4" name="panel_bg" xy="1584,510" size="853,113" advanced="true">
-    <group id="n47_pue4" name="panel_bg" xy="753,358" size="556,132" advanced="true">
       <gearDisplay controller="card" pages="0,1"/>
     </group>
     <component id="n34_hp0b" name="btn_dismiss_room" src="gq7m98" fileName="buttons/Btn_Yellow_New.xml" xy="1051,846" size="270,0" group="n37_pue4">
@@ -39,29 +38,29 @@
       <Button icon="ui://v0j9abjygq7mg7"/>
     </component>
     <group id="n37_pue4" name="panel_set" xy="631,846" size="773,261"/>
-    <component id="n30_lwcl" name="btn_sound" src="gq7mfs" fileName="component/setting/Button4.xml" xy="757,164" size="112,0" group="n55_n6fs" visible="false">
+    <component id="n30_lwcl" name="btn_sound" src="gq7mfs" fileName="component/setting/Button4.xml" xy="1572,258" size="112,0" group="n55_n6fs" visible="false">
       <Button icon="ui://v0j9abjygq7mg5"/>
     </component>
-    <component id="n26" name="btn_music" src="gq7mfs" fileName="component/setting/Button4.xml" xy="761,166" size="112,0" group="n55_n6fs" visible="false"/>
+    <component id="n26" name="btn_music" src="gq7mfs" fileName="component/setting/Button4.xml" xy="1576,260" size="112,0" group="n55_n6fs" visible="false"/>
-    <component id="n24" name="slider_music" src="gq7mg3" fileName="component/setting_new/component/Slider2.xml" xy="941,159" group="n83_hxz4">
+    <component id="n24" name="slider_music" src="gq7mg3" fileName="component/setting_new/component/Slider2.xml" xy="1747,234" group="n83_hxz4">
       <Slider value="50" max="100"/>
     </component>
-    <component id="n23" name="slider_sound" src="gq7mg3" fileName="component/setting_new/component/Slider2.xml" xy="941,233" group="n83_hxz4">
+    <component id="n23" name="slider_sound" src="gq7mg3" fileName="component/setting_new/component/Slider2.xml" xy="1747,330" group="n83_hxz4">
       <Slider max="100"/>
     </component>
-    <text id="n62_n6fs" name="n62" xy="819,160" size="52,34" group="n83_hxz4" font="Microsoft YaHei" fontSize="24" color="#71cdf3" align="center" vAlign="middle" text="音乐"/>
+    <text id="n62_n6fs" name="n62" xy="1600,232" size="92,59" group="n83_hxz4" font="Microsoft YaHei" fontSize="44" color="#43633d" align="center" vAlign="middle" text="音乐"/>
-    <text id="n63_n6fs" name="n63" xy="819,232" size="52,34" group="n83_hxz4" font="Microsoft YaHei" fontSize="24" color="#71cdf3" text="音效"/>
+    <text id="n63_n6fs" name="n63" xy="1600,329" size="92,59" group="n83_hxz4" font="Microsoft YaHei" fontSize="44" color="#43633d" text="音效"/>
-    <image id="n106_ni5n" name="n106" src="gq7mgn" fileName="component/setting_new/images/setting/icon_yinyue.png" xy="1252,155" group="n83_hxz4"/>
+    <image id="n106_ni5n" name="n106" src="itp87iqr" fileName="images/icon_game_sound.png" pkg="27vd145b" xy="2394,234" group="n83_hxz4"/>
-    <image id="n107_ni5n" name="n107" src="gq7mgm" fileName="component/setting_new/images/setting/icon_yinxiao.png" xy="1249,231" group="n83_hxz4"/>
+    <image id="n107_ni5n" name="n107" src="itp87iqq" fileName="images/icon_game_music.png" pkg="27vd145b" xy="2394,329" group="n83_hxz4"/>
-    <group id="n83_hxz4" name="n83" xy="819,155" size="480,118" group="n55_n6fs"/>
+    <group id="n83_hxz4" name="n83" xy="1600,232" size="849,156" group="n55_n6fs"/>
-    <group id="n55_n6fs" name="set_sound" xy="757,155" size="542,118"/>
+    <group id="n55_n6fs" name="set_sound" xy="1572,232" size="877,156"/>
     <component id="n75_n6fs" name="btn_card_1" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="818,558" size="186,47" group="n84_hxz4">
       <Button checked="true" title="经典2D" controller="card" page="0"/>
     </component>
     <component id="n86_by4o" name="btn_card_2" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="1071,558" size="186,47" group="n84_hxz4">
       <Button title="复古2D" icon="ui://v0j9abjygq7mgg" controller="card" page="1"/>
     </component>
-    <group id="n84_hxz4" name="set_card" xy="818,558" size="439,47" advanced="true">
+    <group id="n84_hxz4" name="set_card" xy="818,558" size="439,47" visible="false" advanced="true">
       <gearXY controller="show_dialect" pages="0,1" values="818,558|746,618"/>
     </group>
     <component id="n90_n6cm" name="n90" src="gq7mg4" fileName="component/setting_new/component/Btn_cr_checkbox.xml" xy="727,574" size="165,47" group="n93_n6cm">
@@ -75,15 +74,15 @@
       <gearXY controller="show_dialect" pages="0,1" values="727,572|739,679"/>
     </group>
     <graph id="n100_piv9" name="btn_close22" xy="1423,-48" size="1,10" visible="false" type="rect"/>
-    <component id="n117_ttbr" name="size1" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="818,663" size="87,47" group="n114_ttbr">
+    <component id="n117_ttbr" name="size1" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="1581,868" group="n114_ttbr">
-      <Button title="大" controller="size" page="0"/>
+      <Button checked="true" title="大" controller="size" page="0"/>
     </component>
-    <component id="n118_ttbr" name="size2" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="999,663" size="87,47" group="n114_ttbr">
+    <component id="n118_ttbr" name="size2" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="1945,868" group="n114_ttbr">
-      <Button checked="true" title="中" controller="size" page="1"/>
+      <Button title="中" controller="size" page="1"/>
     </component>
-    <component id="n119_ttbr" name="size3" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="1153,661" size="87,47" group="n114_ttbr">
+    <component id="n119_ttbr" name="size3" src="gq7mgp" fileName="component/setting_new/btn_select_card.xml" xy="2325,868" group="n114_ttbr">
       <Button title="小" controller="size" page="2"/>
     </component>
-    <group id="n114_ttbr" name="size" xy="818,661" size="422,49"/>
+    <group id="n114_ttbr" name="size" xy="1581,868" size="891,59"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/setting_new/btn_select_card.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="111,35" extention="Button">
+<component size="147,59" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n3_n6cm" name="n3" src="gq7mgq" fileName="component/setting_new/ydk.png" xy="2,7">
+    <image id="n3_n6cm" name="n3" src="itp87iqp" fileName="images/btn_game_checkboxUp.png" pkg="27vd145b" xy="2,5" size="48,48">
       <gearDisplay controller="button" pages="0,1,2,3"/>
     </image>
-    <image id="n6_n6cm" name="n6" src="gq7mgr" fileName="component/setting_new/hd.png" xy="2,7">
+    <image id="n6_n6cm" name="n6" src="itp87iqo" fileName="images/btn_game_checkbox_down.png" pkg="27vd145b" xy="6,10">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <text id="n4_n6cm" name="title" xy="35,0" size="52,34" font="Microsoft YaHei" fontSize="24" color="#71cdf3" vAlign="middle" text="复古">
+    <text id="n4_n6cm" name="title" xy="55,0" size="92,59" font="Microsoft YaHei" fontSize="44" color="#dc420f" vAlign="middle" text="复古">
-      <gearColor controller="button" pages="0,1" values="#71cdf3,#000000|#dc420f,#000000"/>
+      <gearColor controller="button" pages="0,1" values="#43633d,#000000|#dc420f,#000000"/>
     </text>
-    <loader id="n5_n6cm" name="icon" xy="89,-16" size="48,67" visible="false" url="ui://v0j9abjygq7mgf" autoSize="true" clearOnPublish="true">
+    <loader id="n5_n6cm" name="icon" xy="69,3" size="9,18" visible="false" url="ui://v0j9abjygq7mgf" clearOnPublish="true">
       <relation target="n4_n6cm" sidePair="left-right"/>
     </loader>
   </displayList>

wb_new_ui/assets/Main_Majiang/component/setting_new/component/Slider2.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="287,41" extention="Slider">
+<component size="617,50" extention="Slider">
   <displayList>
-    <image id="n1" name="n1" src="gq7mfx" fileName="component/setting_new/images/setting/hdtd.png" xy="0,0" size="289,41"/>
+    <image id="n1" name="n1" src="itp87iql" fileName="images/bg_game_barBg.png" pkg="27vd145b" xy="0,0" size="617,50"/>
-    <image id="n2" name="bar" src="gq7mfy" fileName="component/setting_new/images/setting/jdt.png" xy="0,0" size="288,40"/>
+    <image id="n2" name="bar" src="itp87iqk" fileName="images/bg_game_bar.png" pkg="27vd145b" xy="0,0" size="617,50"/>
-    <component id="n3" name="grip" src="gq7mg1" fileName="component/setting_new/component/Slider1_grip2.xml" xy="262,-8">
+    <component id="n3" name="grip" src="gq7mg1" fileName="component/setting_new/component/Slider1_grip2.xml" xy="591,-8">
       <relation target="n2" sidePair="right-right"/>
     </component>
   </displayList>

wb_new_ui/assets/Main_Majiang/component/setting_new/component/setting/btn_bg.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="155,68" overflow="hidden" extention="Button">
+<component size="224,113" overflow="hidden" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <graph id="n5_pue4" name="n5" xy="1,0" size="153,68" type="rect" lineColor="#4d000000" fillColor="#4d000000"/>
+    <graph id="n5_pue4" name="n5" xy="0,0" size="224,113" type="rect" lineColor="#4d000000" fillColor="#4d000000"/>
-    <image id="n1" name="n1" src="gq7mfr" fileName="component/setting/changeBG/b01.png" xy="4,3" size="147,62">
+    <image id="n1" name="n1" src="gq7mfr" fileName="component/setting/changeBG/b01.png" xy="4,3" size="215,104">
       <relation target="" sidePair=""/>
     </image>
-    <loader id="n2" name="icon" xy="4,3" size="50,30">
+    <loader id="n2" name="icon" xy="4,3" size="215,103">
       <relation target="" sidePair=""/>
     </loader>
-    <image id="n4_pue4" name="n4" src="gq7mfv" fileName="setting/images/setting/xzk.png" xy="0,-2">
+    <image id="n4_pue4" name="n4" src="itp87iqs" fileName="images/icon_setting_chooseBG.png" pkg="27vd145b" xy="0,-2" size="224,113">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -372,7 +372,6 @@
     <image id="gq7ma8" name="back_left.png" path="/images/cards/" exported="true"/>
     <component id="gq7ma9" name="Back_right.xml" path="/component/card/" exported="true"/>
     <image id="gq7maa" name="back_right.png" path="/images/cards/" exported="true"/>
-    <component id="gq7mab" name="OutCard_top.xml" path="/component/card/" exported="true"/>
     <component id="gq7mac" name="OutCard_left.xml" path="/component/card/" exported="true"/>
     <component id="gq7mad" name="Btn_fztip_card_4.xml" path="/component/card/" exported="true"/>
     <component id="gq7mae" name="Btn_fztip_card_3.xml" path="/component/card/" exported="true"/>
@@ -1035,6 +1034,7 @@
     <component id="a81dsp" name="btn_xipai.xml" path="/buttons/" exported="true"/>
     <image id="a81dsq" name="Group 646.png" path="/buttons/"/>
     <component id="nlefsr" name="btn_xp.xml" path="/buttons/" exported="true"/>
+    <component id="itp8ss" name="OutCard_top.xml" path="/component/card/" exported="true"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_19.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2d33fe9ab2c3b9a4d96ef56b42f7661d
+guid: ef99c594dd1b6c64c8faa572ae3a0d1d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}