修复听牌ui，放大字牌ui，修复其他反馈

lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua

@@ -146,7 +146,7 @@ function M:BtnsSafe()
     end
     local text_playName = self._view:GetChild('text_playName')
     if text_playName then
-        text_playName.text = "放炮罚"
+        text_playName.text = "河池字牌"
     end
 end
 

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

@@ -22,7 +22,7 @@ function M:GetHandCardPos(cards_view, cards)
     y = 0 - (75 * cards_view.index_Y)
     return Vector2.New(x, y)
 end
-
+--对方
 function M:UpdateFzList( fz_list ,ispaly,seat)
     self._area_fz_list:RemoveChildren(0,-1,true)
     for i = 1,#fz_list do
@@ -89,7 +89,7 @@ function M:UpdateFzList( fz_list ,ispaly,seat)
             else
                 for j=1,4 do
                     if j==4 then
-                        fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+                        fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
                     else
                        fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
                     end

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

@@ -22,7 +22,8 @@ function M:onTouchBegin(context)
     if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then
         self:ShowHuTip(card.card_item)
     end
-    card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card.card_item)
+    card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_",card.card_item)
+    card.btn_card.height = card.btn_card.width/97*287
     card.btn_card.sortingOrder = 100
     local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
     card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50)
@@ -317,7 +318,7 @@ function M:PlayingOutCardAnima(card)
         self:ClearOutCard()
     end)
 end
-
+--自己
 function M:UpdateFzList(fz_list, ispaly)
     self._area_fz_list:RemoveChildren(0, -1, true)
     for i = 1, #fz_list do
@@ -332,6 +333,7 @@ function M:UpdateFzList(fz_list, ispaly)
             local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
             fzcards:GetChild("card_" .. 1).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].active_card)
             fzcards:GetController("c2").selectedIndex = 1
+            fzcards:GetController("c3").selectedIndex = 1
             fzcards:GetChild("card_" .. 2).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[1])
             fzcards:GetChild("card_" .. 3).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[2])
             fzcards.x, fzcards.y = 0, 0
@@ -345,9 +347,14 @@ function M:UpdateFzList(fz_list, ispaly)
             self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
         elseif fz_list[i].type == RB_FZType.Wei then
             local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
-            fzcards:GetController("c1").selectedIndex = 1
+            --fzcards:GetController("c1").selectedIndex = 1
             for j = 1, 3 do
-                fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
+                if j == 3 then
+                    fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
+                else
+                    fzcards:GetChild("card_" .. j).icon = "ui://Main_RunBeard/202_1_300"
+                end
+               
             end
             fzcards.x, fzcards.y = 0, 0
             self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)

lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua

@@ -276,7 +276,16 @@ function M:FillItemData(room, data, item)
             win_data = info_list[i]
         end
     end
-
+    local terminationCtr = self._view:GetController('isNormalTerminationM')
+    if terminationCtr then
+        if Yes_win then
+            -- 如果有赢家 (is_win == true)，设置为 0 (正常结束/有胡牌)
+            terminationCtr.selectedIndex = 0
+        else
+            -- 如果没有赢家 (is_win == false，如流局或解散无胡牌)，设置为 1
+            terminationCtr.selectedIndex = 1
+        end
+    end
     if win_data.seat == room.self_player.seat then
         self._view:GetChild('show_win').visible = true
         self._view:GetChild('show_low').visible = false
@@ -346,11 +355,23 @@ function M:FillItemData(room, data, item)
                 local dipais = UIPackage.CreateObjectFromURL('ui://Extend_Poker_HeChi/FullName')
                 dipais:GetChild('n0').icon = 'ui://Extend_Poker_HeChi/hu_' .. win_data.mingtang[i].mingtang
                 if win_data.mingtang[i].type == 1 and win_data.mingtang[i].score ~= 0 then
-                    dipais:GetChild('n2').text = ' x2'
+                    if win_data.mingtang[i].mingtang == 21 then
+                         dipais:GetChild('n2').text = ' +1'
+                    else
+                         dipais:GetChild('n2').text = ' x2'
+                    end
                 elseif win_data.mingtang[i].type == 2 and win_data.mingtang[i].score ~= 0 then
-                    dipais:GetChild('n2').text = ' x2'
+                    if win_data.mingtang[i].mingtang == 21 then
+                         dipais:GetChild('n2').text = ' +1'
+                    else
+                         dipais:GetChild('n2').text = ' x2'
+                    end
                 elseif win_data.mingtang[i].type == 3 and win_data.mingtang[i].score ~= 0 then
-                    dipais:GetChild('n2').text = ' x2'
+                    if win_data.mingtang[i].mingtang == 21 then
+                         dipais:GetChild('n2').text = ' +1'
+                    else
+                         dipais:GetChild('n2').text = ' x2'
+                    end
                 end
                 fullname_list:AddChild(dipais)
             end

lua_probject/extend_project/extend/zipai/hechi/main/HuTipView.lua

@@ -58,12 +58,14 @@ function M:FillData(cards)
 		end
 		for i = 1, num do
 			local item = lst_card:AddItemFromPool()
+			printlog("tingpaishliang",cards[i])
 			item:GetChild("icon").icon = "ui://Main_RunBeard/202_1_" .. cards[i]
 		end
 		SetObjEnabled(self._view, true)
 	else
 		SetObjEnabled(self._view, false)
 	end
+	
 end
 
 return M

lua_probject/extend_project/extend/zipai/hechi/main/ZPMainView.lua

@@ -226,7 +226,7 @@ function M:BtnsSafe()
     end
     local text_playName = self._view:GetChild('text_playName')
     if text_playName then
-        text_playName.text = "放炮罚"
+        text_playName.text = "河池字牌"
     end
 end
 

lua_probject/main_project/main/zipai/CardCheck.lua

@@ -192,12 +192,10 @@ function M:tryWin(player)
                 return true
             end
             return false
-        else
+      else
-            if (self.pair_count > 0) then
+        if (self.pair_count > 0) then return false end
-                return false
+        return true -- 【这里允许了无将胡牌！】
-            end
+    end
-            return true
-        end
     end
     local activeCard = 0
     for i = 1, #self.cardList do
@@ -332,12 +330,15 @@ end
 function M.tingPai(player, room)
     local self = setmetatable({}, {__index = M})
     local tingList = {}
-    local cardInhand = player.handcard_list
+    -- 克隆手牌，保护原始数据
+    local cardInhand = membe_clone(player.handcard_list)
     if not cardInhand or #cardInhand == 0 then
         return tingList
     end
+
     local kan_huxi = 0
     local kan_cards = {}
+    -- 计算坎牌胡息并移除
     for j = 1, #player.fz_list do
         for i = 1, #cardInhand do
             if cardInhand[i] == player.fz_list[j].active_card and player.fz_list[j].type == 3 then
@@ -356,41 +357,64 @@ function M.tingPai(player, room)
             removeCard(cardInhand, kan_cards[i], 3)
         end
     end
-    player.tiCount = 0
+
-    player.paoCount = 0
+    -- 【重要】不要修改原始 player 对象，创建一个临时表用于 init 调用
+    local tempPlayer = {
+        tiCount = 0,
+        paoCount = 0,
+        hu_xi = player.hu_xi, -- 确保 hu_xi 被正确引用
+        fz_list = player.fz_list
+    }
+    
     if #player.fz_list > 0 then
         for i = 1, #player.fz_list do
             if player.fz_list[i].type == 6 then
-                player.paoCount = player.paoCount + 1
+                tempPlayer.paoCount = tempPlayer.paoCount + 1
             elseif player.fz_list[i].type == 7 then
-                player.tiCount = player.tiCount + 1
+                tempPlayer.tiCount = tempPlayer.tiCount + 1
             end
         end
     end
+
+    local minHuXi = self:getHuxi(room)
+
     for k = 100, 200, 100 do
         for i = 1, 10 do
             local tem = k + i
-            local result = init(self, player, cardInhand, tem)
+            -- 使用 tempPlayer 进行判断，避免污染全局 player
+            local result = init(self, tempPlayer, cardInhand, tem)
+            
             local num = 0
             for k = 1, #self.stackHuxi do
                 num = num + self.stackHuxi[k]
             end
-            if result == false or (player.hu_xi + num + kan_huxi) < (self:getHuxi(room)) then
+            
+            local totalHuXi = (tempPlayer.hu_xi + num + kan_huxi)
+            local isZeroHuXiSpecial = (totalHuXi == 0)
+
+            -- 【核心修复】：必须首先保证牌型结构正确 (result == true)
+            if result then
+                -- 牌型正确的前提下，检查胡息
+                if (totalHuXi >= minHuXi) or isZeroHuXiSpecial then
+                    tingList[#tingList + 1] = tem
+                end
+            else
+                -- 牌型结构不正确，尝试跑胡/补救逻辑
                 if #player.fz_list > 0 then
                     for k = 1, #player.fz_list do
                         if tem == player.fz_list[k].active_card then
                             local ctype = player.fz_list[k].type
                             if ctype == 2 or ctype == 3 or ctype == 4 or ctype == 5 then
-                                local paohu = init(self, player, cardInhand)
+                                -- 跑胡检测：不带 tem，看剩余牌是否能胡（靠张）
+                                local paohu = init(self, tempPlayer, cardInhand) 
                                 if paohu then
                                     local num2 = 0
                                     for j = 1, #self.stackHuxi do
                                         num2 = num2 + self.stackHuxi[j]
                                     end
-                                    if
+                                    -- 跑胡胡息计算
-                                        (num2 + player.hu_xi + kan_huxi + self:GetFzData(tem, ctype)) >=
+                                    local runHuTotal = num2 + tempPlayer.hu_xi + kan_huxi + self:GetFzData(tem, ctype)
-                                            (self:getHuxi(room))
+                                    if runHuTotal >= minHuXi then
-                                     then
                                         tingList[#tingList + 1] = tem
                                     end
                                 end
@@ -398,20 +422,11 @@ function M.tingPai(player, room)
                         end
                     end
                 end
-            else
-                local num1 = 0
-                for k = 1, #self.stackHuxi do
-                    num1 = num1 + self.stackHuxi[k]
-                end
-                if (player.hu_xi + num1 + kan_huxi) >= (self:getHuxi(room)) then
-                    tingList[#tingList + 1] = tem
-                end
             end
         end
     end
     return tingList
 end
-
 function M:getHuxi(room)
 	if room.game_id == 301 then
 		return 8
@@ -419,6 +434,9 @@ function M:getHuxi(room)
     if room.game_id == 15 then
         return 15
     end
+    if room.game_id == 16 then
+        return 10
+    end
     if room.game_id == 17 then
         return 15
     end

lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua

@@ -54,8 +54,8 @@ function M:init()
     self._isDrg = false
     self.card_list = {}  -- 牌的btn  code type pos 等等
     self.cards_count = 0 -- 牌的总列数
-    self.card_width = 87
+    self.card_width = 198
-    self.card_hight = 110
+    self.card_hight = 250
     self.outcard_button = nil
     self._room = DataManager.CurrenRoom
     self._area_handcard_list = view:GetChild('area_handcard_list')
@@ -197,9 +197,9 @@ function M:InitHandCard(isPlayAni, index)
                             btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code)
                             btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
                             btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
-                            self.card_width = 87 * self:getCardSize()
+                            self.card_width = btn_card.width * self:getCardSize()
-                            self.card_hight = 110 * self:getCardSize()
+                            self.card_hight = btn_card.height * self:getCardSize()
-                            local x, y = 500, (j * 75) - 500
+                            local x, y = 500, (j * 85) - 500
                             btn_card:SetXY(x, y)
                             self._area_handcard_list:AddChild(btn_card)
                             self._area_handcard_list:SetChildIndex(btn_card, 5 - j)
@@ -245,8 +245,8 @@ function M:InitHandCard(isPlayAni, index)
                 btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code)
                 btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
                 btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
-                self.card_width = 87 * self:getCardSize()
+                self.card_width = btn_card.width * self:getCardSize()
-                self.card_hight = 110 * self:getCardSize()
+                self.card_hight = btn_card.height * self:getCardSize()
                 self._area_handcard_list:AddChild(btn_card)
                 self._area_handcard_list:SetChildIndex(btn_card, 5 - j)
                 local card_view = NewCardView(btn_card, card_code, i, j)
@@ -284,8 +284,6 @@ function M:UpdateHandCards(list)
     self.outcard_button = nil
 
     local CountCards = {}
-    -- print("lingmengUpdateHandCards")
-    -- pt(list)
     for i = 1, #list do
         CountCards[list[i].index_X] = CountCards[list[i].index_X] == nil and 1 or CountCards[list[i].index_X] + 1
     end
@@ -295,8 +293,8 @@ function M:UpdateHandCards(list)
         btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code)
         btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
         btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
-        self.card_width = 87 * self:getCardSize()
+        self.card_width = btn_card.width * self:getCardSize()
-        self.card_hight = 110 * self:getCardSize()
+        self.card_hight = btn_card.height * self:getCardSize()
         local card_view = NewCardView(btn_card, card_code, list[i].index_X, list[i].index_Y)
         --存牌堆
         self.card_list[#self.card_list + 1] = card_view
@@ -440,9 +438,13 @@ function M:UpdateCardDisplay()
         local card_view = self.card_list[i]
         card_view.btn_card:RemoveFromParent()
         card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item)
+        self.card_width = card_view.btn_card.width * self:getCardSize()
+        self.card_hight = card_view.btn_card.height * self:getCardSize()
         self._area_handcard_list:AddChild(card_view.btn_card)
         card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
     end
+    self:UpdateOutLine()
+    self:UpdateHandCardsPos()
 end
 
 --更新手牌大小
@@ -458,11 +460,22 @@ function M:UpdateCardSize()
         card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item)
         card_view.btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
         card_view.btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
-        self.card_width = 87 * self:getCardSize()
+        self.card_width = card_view.btn_card.width * self:getCardSize()
-        self.card_hight = 110 * self:getCardSize()
+        self.card_hight = card_view.btn_card.height * self:getCardSize()
         self._area_handcard_list:AddChild(card_view.btn_card)
         card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
     end
+    self:UpdateOutLine()
+    self:UpdateHandCardsPos()
+end
+
+function M:UpdateOutLine()
+    if self:getCardSize() == 1.03 then
+        self._data_outLinePos = 90 - (125 * 3)
+    elseif self:getCardSize() == 1 then
+        self._data_outLinePos = 147 - (197 * 3)
+    end
+    self._view_outLine.y = self._data_outLinePos - 80
 end
 
 function M:UpdateIsOnClick(isOut)
@@ -722,17 +735,42 @@ end
 --计算手牌位置
 function M:GetHandCardPos(cards_view, cards)
     local x, y = 0, 0
-    local card_width = self.card_width -- 牌的宽度
+    local card_width = self.card_width - (self._room.change_card_display == "1_" and 8 or 1) -- 牌的宽度
+    local card_clounm =  self._room.change_card_display == "1_" and 0 or 30
     local middle_x = self._area_handcard_list.width / 2
     local start_x = middle_x - (cards / 2 * (card_width))
     x = start_x + (card_width) * (cards_view.index_X - 1)
 
-    if self:getCardSize() == 1 then
+    -- local card_height = self.card_hight
-        y = 90 - (85 * cards_view.index_Y)
+    -- y = 90 - card_height * 0.66 * cards_view.index_Y
-    elseif self:getCardSize() == 1.2 then
+    if self:getCardSize() == 1.2 then
-        y = 70 - (100 * cards_view.index_Y)
+        local icon = cards_view.btn_card:GetChild('icon')
-    elseif self:getCardSize() == 0.8 then
+        local n7 = cards_view.btn_card:GetChild('n7')
-        y = 100 - (65 * cards_view.index_Y)
+        local scaleX = icon.scaleX
+        local scaleY = icon.scaleY
+        -- 设置缩放
+        n7:SetScale(scaleX, scaleY)
+        local iconRight = icon.x + icon.width * scaleX -- 缩放后的右边缘
+        local iconTop = icon.y                          -- 缩放不影响 y 起始点，但影响高度显示
+        -- 计算 n7 缩放后的尺寸
+        local n7Width = n7.width * scaleX
+        n7:SetXY(iconRight - n7Width, iconTop)
+
+        y = 147 - ((203-card_clounm) * cards_view.index_Y)
+    elseif self:getCardSize() == 1 then
+        local icon = cards_view.btn_card:GetChild('icon')
+        local n7 = cards_view.btn_card:GetChild('n7')
+        local scaleX = icon.scaleX
+        local scaleY = icon.scaleY
+        -- 设置缩放
+        n7:SetScale(scaleX, scaleY)
+        local iconRight = icon.x + icon.width * scaleX -- 缩放后的右边缘
+        local iconTop = icon.y                          -- 缩放不影响 y 起始点，但影响高度显示
+        -- 计算 n7 缩放后的尺寸
+        local n7Width = n7.width * scaleX
+        n7:SetXY(iconRight - n7Width, iconTop)
+        
+        y = 147 - ((197-card_clounm) * cards_view.index_Y)
     end
     return Vector2.New(x, y)
 end
@@ -860,6 +898,9 @@ end
 --得到设置的牌大小
 function M:getCardSize()
     if self._room.change_card_size ~= nil then
+        if self._room.change_card_size ~= 1.2 and self._room.change_card_size ~= 1 then
+            self._room.change_card_size = 1
+        end
         return self._room.change_card_size
     else
         return 1

wb_new_ui/.objs/metas/h30s8vme/la4eb.info

@@ -17,9 +17,6 @@
     },
     "n121_xevg": {
       "hidden": true
-    },
-    "n116_xevg": {
-      "collapsed": true
     }
   }
 }

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

@@ -16,6 +16,10 @@
     "n154_r1mo": {
       "collapsed": true
     },
+    "n206_ib2w": {
+      "locked": true,
+      "hidden": true
+    },
     "n179_kxwj": {
       "hidden": true
     },
@@ -25,6 +29,9 @@
     "n170_o49p": {
       "hidden": true
     },
+    "n183_yfzf": {
+      "locked": true
+    },
     "n35_k3io": {
       "hidden": true
     }

wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info

@@ -3,18 +3,6 @@
     "n16_pt1r": {
       "hidden": true
     },
-    "n33_n1ry": {
-      "hidden": true
-    },
-    "n19_pt1r": {
-      "collapsed": true
-    },
-    "n48_j5c2": {
-      "hidden": true
-    },
-    "n35_n1ry": {
-      "hidden": true
-    },
     "n40_n1ry": {
       "hidden": true
     },
@@ -36,20 +24,23 @@
     "n17_pt1r": {
       "hidden": true
     },
-    "n77_p9qe": {
+    "n48_j5c2": {
       "hidden": true
     },
     "n15_pt1r": {
       "hidden": true
     },
+    "n58_fnpw": {
+      "collapsed": true
+    },
+    "n44_n1ry": {
+      "collapsed": true
+    },
     "n32_n1ry": {
       "hidden": true
     },
-    "n31_n1ry": {
+    "n19_pt1r": {
-      "hidden": true
+      "collapsed": true
-    },
-    "n43_n1ry": {
-      "hidden": true
     },
     "n68_w06x": {
       "hidden": true

wb_new_ui/.objs/workspace.json

@@ -4,8 +4,30 @@
   "doc.openedDocs": [
     "ui://v0j9abjygq7mgo",
     "ui://hrxsdiixla4e2c",
+    "ui://s63l0suw6cpqv",
+    "ui://fnuxqeflnrnod",
+    "ui://egnzysm7ffp36a",
     "ui://8wph7p8nyffnhr",
     "ui://mzvoz9udm1i335",
+    "ui://lkq9ne9speuqc",
+    "ui://m7iejg46l679hws",
+    "ui://m7iejg46kwi0hmc",
+    "ui://m7iejg46kwi0hme",
+    "ui://mzvoz9udm1i382",
+    "ui://mzvoz9udm1i32b",
+    "ui://mzvoz9udm1i33m",
+    "ui://m7iejg4610snh5j",
+    "ui://m7iejg46h46p7ish",
+    "ui://mzvoz9udm1i32i",
+    "ui://h30s8vmela4eb",
+    "ui://mzvoz9udm1i34z",
+    "ui://mzvoz9udm1i35m",
+    "ui://mzvoz9udm1i35j",
+    "ui://mzvoz9udm1i358",
+    "ui://mzvoz9udm1i35f",
+    "ui://mzvoz9udm1i35b",
+    "ui://mtk9dj10m1i32v",
+    "ui://z3z0ysurygxgd",
     "ui://8wph7p8nyffnmy",
     "ui://8wph7p8nyffn8s",
     "ui://v0j9abjygq7med",
@@ -14,14 +36,26 @@
     "ui://lkq9ne9ssyh3rk",
     "ui://mzvoz9udm1i33c",
     "ui://1utjt0r2ufu92i",
+    "ui://ppu1wv76j4mf9j",
+    "ui://ypulwxjhl9mn14",
     "ui://1utjt0r2ufu92t",
     "ui://mzvoz9udm1i32j",
     "ui://442j0uepygxga",
     "ui://4skil1l6piv91ny",
+    "ui://niy3ldiwl9mn14",
+    "ui://9n9stu2eprgzee",
     "ui://v0j9abjygq7mgp",
     "ui://lkq9ne9speuqc6",
     "ui://lkq9ne9speuq8b",
     "ui://lkq9ne9speuq5a",
+    "ui://lkq9ne9speuq6e",
+    "ui://hrxsdiixla4e69",
+    "ui://lkq9ne9speuq2q",
+    "ui://lkq9ne9speuq3",
+    "ui://lkq9ne9speuq2",
+    "ui://v6yvqp7wcyprwq",
+    "ui://v0j9abjygq7mej",
+    "ui://lkq9ne9speuq9d",
     "ui://lkq9ne9speuq6p",
     "ui://lkq9ne9speuq8r",
     "ui://lkq9ne9speuq8w",
@@ -42,12 +76,16 @@
   "test.device": "1080p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://mzvoz9udm1i335",
+  "doc.activeDoc": "ui://lkq9ne9speuq3",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
     "/",
     "27vd145b",
+    "/font/",
+    "27vd145b",
+    "/font/font_gameTableName/",
+    "27vd145b",
     "/images/",
     "egnzysm7",
     "/",
@@ -81,6 +119,12 @@
     "/",
     "8wph7p8n",
     "/image/",
+    "2d9xdj6z",
+    "/",
+    "2d9xdj6z",
+    "/images/",
+    "2d9xdj6z",
+    "/images/LobbyMui/",
     "lkq9ne9s",
     "/",
     "lkq9ne9s",
@@ -88,17 +132,21 @@
     "lkq9ne9s",
     "/component/",
     "lkq9ne9s",
+    "/component/HuTip/",
+    "lkq9ne9s",
     "/component/Main/",
     "lkq9ne9s",
+    "/component/Main/component/",
+    "lkq9ne9s",
     "/component/cards/",
     "lkq9ne9s",
+    "/component/chi_peng_effect/",
+    "lkq9ne9s",
     "/image/",
     "lkq9ne9s",
-    "/image/MRBMui/",
+    "/images/",
-    "lkq9ne9s",
+    "m7iejg46",
-    "/image/main_2/",
+    "/"
-    "lkq9ne9s",
-    "/images/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt

@@ -1,25 +1,31 @@
 info size=200 resizable=true colored=false
-char id=48 img=u50h7j1b xoffset=0 yoffset=0 xadvance=0
+char id=48 img=kra57j7d xoffset=0 yoffset=0 xadvance=0
-char id=49 img=u50h7j1v xoffset=0 yoffset=0 xadvance=0
+char id=49 img=kra57j84 xoffset=0 yoffset=0 xadvance=0
-char id=32418 img=u50h7j1u xoffset=0 yoffset=0 xadvance=0
+char id=32418 img=kra57j7v xoffset=0 yoffset=0 xadvance=0
-char id=20013 img=u50h7j1t xoffset=0 yoffset=0 xadvance=0
+char id=20013 img=kra57j7u xoffset=0 yoffset=0 xadvance=0
-char id=40635 img=u50h7j1s xoffset=0 yoffset=0 xadvance=0
+char id=40635 img=kra57j7t xoffset=0 yoffset=0 xadvance=0
-char id=23558 img=u50h7j1r xoffset=0 yoffset=0 xadvance=0
+char id=23558 img=kra57j7s xoffset=0 yoffset=0 xadvance=0
-char id=36716 img=u50h7j1q xoffset=0 yoffset=0 xadvance=0
+char id=36716 img=kra57j7r xoffset=0 yoffset=0 xadvance=0
-char id=36305 img=u50h7j1p xoffset=0 yoffset=0 xadvance=0
+char id=36305 img=kra57j7q xoffset=0 yoffset=0 xadvance=0
-char id=24471 img=u50h7j1o xoffset=0 yoffset=0 xadvance=0
+char id=24471 img=kra57j7p xoffset=0 yoffset=0 xadvance=0
-char id=24555 img=u50h7j1n xoffset=0 yoffset=0 xadvance=0
+char id=24555 img=kra57j7o xoffset=0 yoffset=0 xadvance=0
-char id=25918 img=u50h7j1w xoffset=0 yoffset=0 xadvance=0
+char id=25918 img=kra57j7n xoffset=0 yoffset=0 xadvance=0
-char id=28846 img=u50h7j1m xoffset=0 yoffset=0 xadvance=0
+char id=28846 img=kra57j7m xoffset=0 yoffset=0 xadvance=0
-char id=50 img=u50h7j1k xoffset=0 yoffset=0 xadvance=0
+char id=50 img=kra57j83 xoffset=0 yoffset=0 xadvance=0
-char id=32602 img=u50h7j1j xoffset=0 yoffset=0 xadvance=0
+char id=32602 img=kra57j7l xoffset=0 yoffset=0 xadvance=0
-char id=25226 img=u50h7j1i xoffset=0 yoffset=0 xadvance=0
+char id=25226 img=kra57j7k xoffset=0 yoffset=0 xadvance=0
-char id=32467 img=u50h7j1h xoffset=0 yoffset=0 xadvance=0
+char id=32467 img=kra57j7j xoffset=0 yoffset=0 xadvance=0
-char id=46 img=u50h7j1y xoffset=0 yoffset=0 xadvance=0
+char id=46 img=kra57j7i xoffset=0 yoffset=0 xadvance=0
-char id=51 img=u50h7j1g xoffset=0 yoffset=0 xadvance=0
+char id=27827 img=kra57j7h xoffset=0 yoffset=0 xadvance=0
-char id=52 img=u50h7j1f xoffset=0 yoffset=0 xadvance=0
+char id=27744 img=kra57j7g xoffset=0 yoffset=0 xadvance=0
-char id=53 img=u50h7j1e xoffset=0 yoffset=0 xadvance=0
+char id=32993 img=kra57j7f xoffset=0 yoffset=0 xadvance=0
-char id=54 img=u50h7j1d xoffset=0 yoffset=0 xadvance=0
+char id=23376 img=kra57j7e xoffset=0 yoffset=0 xadvance=0
-char id=55 img=u50h7j1c xoffset=0 yoffset=0 xadvance=0
+char id=23383 img=kra57j85 xoffset=0 yoffset=0 xadvance=0
-char id=56 img=u50h7j1l xoffset=0 yoffset=0 xadvance=0
+char id=29260 img=kra57j86 xoffset=0 yoffset=0 xadvance=0
-char id=57 img=u50h7j1x xoffset=0 yoffset=0 xadvance=0
+char id=51 img=kra57j82 xoffset=0 yoffset=0 xadvance=0
+char id=52 img=kra57j81 xoffset=0 yoffset=0 xadvance=0
+char id=53 img=kra57j80 xoffset=0 yoffset=0 xadvance=0
+char id=54 img=kra57j7z xoffset=0 yoffset=0 xadvance=0
+char id=55 img=kra57j7y xoffset=0 yoffset=0 xadvance=0
+char id=56 img=kra57j7x xoffset=0 yoffset=0 xadvance=0
+char id=57 img=kra57j7w xoffset=0 yoffset=0 xadvance=0

wb_new_ui/assets/Common/package.xml

@@ -1433,31 +1433,6 @@
     <image id="h46p7j0v" name="bg_text8.png" path="/images/" exported="true" scale="9grid" scale9grid="46,34,92,68"/>
     <image id="h46p7j0w" name="bg_numBigPoint.png" path="/images/" exported="true"/>
     <font id="u50h7j1a" name="font_gameTableName.fnt" path="/font/font_gameTableName/" exported="true"/>
-    <image id="u50h7j1b" name="0 - 0.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1c" name="7 - 7.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1d" name="6 - 6.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1e" name="5 - 5.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1f" name="4 - 4.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1g" name="3 - 3.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1h" name="22 - 结.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1i" name="21 - 把.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1j" name="20 - 罚.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1k" name="2 - 2.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1l" name="8 - 8.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1m" name="19 - 炮.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1n" name="17 - 快.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1o" name="16 - 得.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1p" name="15 - 跑.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1q" name="14 - 转.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1r" name="13 - 将.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1s" name="12 - 麻.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1t" name="11 - 中.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1u" name="10 - 红.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1v" name="1 - 1.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1w" name="18 - 放.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1x" name="9 - 9.png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1y" name="23 - ..png" path="/font/font_gameTableName/"/>
-    <image id="u50h7j1z" name="24 -.png" path="/font/font_gameTableName/"/>
     <component id="hez87j20" name="playerDetail.xml" path="/component/" exported="true"/>
     <image id="hez87j21" name="Rectangle 297.png" path="/component/" scale="9grid" scale9grid="50,48,60,42"/>
     <image id="hez87j22" name="Rectangle 298.png" path="/component/" scale="9grid" scale9grid="38,38,103,66"/>
@@ -1644,6 +1619,36 @@
     <component id="mrlr7j7a" name="RoomInfoPanel1(1).xml" path="/component/" exported="true"/>
     <image id="dq8f7j7b" name="Frame 1347.png" path="/images/" exported="true"/>
     <image id="dq8f7j7c" name="Frame 1348.png" path="/images/" exported="true"/>
+    <image id="kra57j7d" name="0 - 0.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7e" name="27 - 子.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7f" name="26 - 胡.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7g" name="25 - 池.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7h" name="24 - 河.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7i" name="23 - ..png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7j" name="22 - 结.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7k" name="21 - 把.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7l" name="20 - 罚.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7m" name="19 - 炮.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7n" name="18 - 放.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7o" name="17 - 快.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7p" name="16 - 得.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7q" name="15 - 跑.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7r" name="14 - 转.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7s" name="13 - 将.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7t" name="12 - 麻.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7u" name="11 - 中.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7v" name="10 - 红.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7w" name="9 - 9.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7x" name="8 - 8.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7y" name="7 - 7.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j7z" name="6 - 6.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j80" name="5 - 5.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j81" name="4 - 4.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j82" name="3 - 3.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j83" name="2 - 2.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j84" name="1 - 1.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j85" name="28 - 字.png" path="/font/font_gameTableName/"/>
+    <image id="kra57j86" name="29 - 牌.png" path="/font/font_gameTableName/"/>
   </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_HeChi/component/clearing/clearing.xml

@@ -7,6 +7,7 @@
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="qipai" pages="0,,1," selected="0"/>
   <controller name="xipai" pages="0,,1," selected="0"/>
+  <controller name="isNormalTerminationM" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n20_pt1r" name="win_base" pkg="27vd145b" src="e6awcd0" fileName="Win_Frame_Old.xml" xy="670,2741" size="1334,750" group="n70_dunj"/>
     <image id="n72_p9qe" name="n72" src="mrlr9j" fileName="component/EPCDWHZMui/Frame 1255.png" xy="-2,158" size="2159,973" group="n70_dunj">
@@ -29,33 +30,26 @@
     <text id="n16_pt1r" name="tex_game" xy="267,87" size="70,32" group="n19_pt1r" visible="false" fontSize="22" color="#ffffff" vAlign="middle" text="跑胡子"/>
     <text id="n17_pt1r" name="tex_data" xy="109,123" size="150,39" group="n19_pt1r" visible="false" fontSize="28" color="#b25116" align="center" vAlign="middle" text="2017-02-12"/>
     <group id="n19_pt1r" name="room_info" xy="85,87" size="252,75" group="n70_dunj"/>
-    <image id="n85_pgl7" name="n85" src="mrlr9p" fileName="component/EPCDWHZMui/Rectangle 2782.png" xy="82,628" size="1990,7" group="n45_n1ry"/>
+    <image id="n86_pgl7" name="n86" src="mrlr9l" fileName="component/EPCDWHZMui/Frame 1148.png" xy="1694,183" size="336,329" group="n92_kra5"/>
-    <image id="n86_pgl7" name="n86" src="mrlr9l" fileName="component/EPCDWHZMui/Frame 1148.png" xy="1694,183" size="336,329" group="n45_n1ry"/>
-    <image id="n33_n1ry" name="n33" src="m1i33b" fileName="component/clearing/di.png" xy="57,631" size="1173,289" group="n45_n1ry" visible="false"/>
-    <image id="n43_n1ry" name="n43" src="m1i32c" fileName="font/images/head/index_bg_01.png" xy="112,610" size="90,88" group="n44_n1ry" aspect="true" visible="false"/>
-    <image id="n77_p9qe" name="n77" src="m1i32d" fileName="component/head/image/touxiang_di_img.png" xy="187,277" size="78,78" group="n44_n1ry" visible="false"/>
     <component id="n78_p9qe" name="btn_head" src="m1i32e" fileName="component/head/Head2.xml" xy="105,264" size="137,137" group="n44_n1ry"/>
-    <image id="n35_n1ry" name="n35" pkg="27vd145b" src="e54q3w" fileName="images/head/bank.png" xy="85,582" size="100,100" group="n44_n1ry" scale="0.8,0.8" visible="false">
-      <gearDisplay controller="bank" pages="1"/>
-    </image>
     <text id="n38_n1ry" name="WinerName" xy="107,408" size="409,64" group="n44_n1ry" font="ui://27vd145bik9v7imf" fontSize="48" color="#317038" vAlign="middle" autoSize="shrink" singleLine="true" text="玩家的名字則麽長~~"/>
     <image id="n37_n1ry" name="n37" src="m1i32h" fileName="font/images/head/owner.png" xy="102,652" size="25,25" group="n44_n1ry" visible="false">
       <gearDisplay controller="owner" pages="1"/>
     </image>
-    <group id="n44_n1ry" name="n44" xy="85,264" size="431,434" group="n45_n1ry"/>
+    <group id="n44_n1ry" name="n44" xy="102,264" size="414,413" group="n92_kra5"/>
-    <text id="n31_n1ry" name="111" xy="105,876" size="121,53" group="n45_n1ry" visible="false" fontSize="32" color="#893119" vAlign="middle" autoSize="none" text="底牌："/>
+    <list id="n32_n1ry" name="dipai_list" xy="213,872" size="1005,64" group="n92_kra5" visible="false" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://mzvoz9udm1i3m" vAlign="middle"/>
-    <list id="n30_n1ry" name="player_list" xy="56,669" size="1074,392" group="n45_n1ry" layout="row" selectionMode="none" scroll="horizontal" colGap="221" defaultItem="ui://mzvoz9udm1i32b" autoClearItems="true">
+    <text id="n39_n1ry" name="huxi" xy="1693,494" size="401,54" group="n92_kra5" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="胡息：+133&#xA;"/>
+    <text id="n40_n1ry" name="tunshu" xy="1167,278" size="439,54" group="n92_kra5" visible="false" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="基础囤数:+133"/>
+    <text id="n47_lsou" name="zongtunshu" xy="1167,394" size="445,54" group="n92_kra5" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="总囤数:+133"/>
+    <list id="n46_n1ry" name="fullname_list" xy="1167,244" size="531,146" group="n92_kra5" layout="flow_hz" selectionMode="none" overflow="scroll" colGap="-182" lineItemCount="2" defaultItem="ui://mzvoz9udm1i33c" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
       <item/>
-    </list>
-    <list id="n32_n1ry" name="dipai_list" xy="213,872" size="1005,64" group="n45_n1ry" visible="false" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://mzvoz9udm1i3m" vAlign="middle"/>
-    <text id="n39_n1ry" name="huxi" xy="1693,494" size="401,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="胡息：+133&#xA;"/>
-    <text id="n40_n1ry" name="tunshu" xy="1167,278" size="439,54" group="n45_n1ry" visible="false" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="基础囤数:+133"/>
-    <text id="n47_lsou" name="zongtunshu" xy="1167,394" size="445,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="总囤数:+133"/>
-    <list id="n46_n1ry" name="fullname_list" xy="1167,244" size="446,145" group="n45_n1ry" layout="flow_hz" selectionMode="none" overflow="scroll" lineGap="5" colGap="-10" lineItemCount="1" defaultItem="ui://mzvoz9udm1i33c" autoClearItems="true">
       <item/>
       <item/>
     </list>
-    <list id="n41_n1ry" name="card_list" xy="530,186" size="597,438" group="n45_n1ry" layout="row" selectionMode="none" colGap="6" defaultItem="ui://mzvoz9udm1i33d" vAlign="middle" autoClearItems="true">
+    <list id="n41_n1ry" name="card_list" xy="530,186" size="597,438" group="n92_kra5" layout="row" selectionMode="none" colGap="6" defaultItem="ui://mzvoz9udm1i33d" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -64,8 +58,8 @@
       <item/>
       <item/>
     </list>
-    <text id="n42_n1ry" name="score" xy="1693,558" size="395,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="游戏分：+2333&#xA;"/>
+    <text id="n42_n1ry" name="score" xy="1693,558" size="395,54" group="n92_kra5" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="游戏分：+2333&#xA;"/>
-    <text id="n48_j5c2" name="chongtunshu" xy="1167,223" size="349,54" group="n45_n1ry" visible="false" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="充囤:4囤"/>
+    <text id="n48_j5c2" name="chongtunshu" xy="1167,223" size="349,54" group="n92_kra5" visible="false" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="充囤:4囤"/>
     <text id="n56_fnpw" name="222" xy="713,950" size="82,36" group="n58_fnpw" visible="false" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
     <list id="n62_fnpw" name="qipai_list" xy="791,946" size="298,157" group="n58_fnpw" visible="false" layout="row" colGap="1" defaultItem="ui://mzvoz9udm1i32i" vAlign="middle">
       <item/>
@@ -76,15 +70,15 @@
       <item/>
       <item/>
     </list>
-    <group id="n58_fnpw" name="n58" xy="713,946" size="376,157" group="n45_n1ry" visible="false" advanced="true">
+    <group id="n58_fnpw" name="n58" xy="713,946" size="376,157" group="n92_kra5" visible="false" advanced="true">
       <gearDisplay controller="qipai" pages="1"/>
     </group>
-    <text id="n67_w06x" name="tili_score" xy="1167,389" size="460,59" group="n45_n1ry" visible="false" alpha="0" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="积分+2333&#xA;"/>
+    <text id="n67_w06x" name="tili_score" xy="1167,389" size="460,59" group="n92_kra5" visible="false" alpha="0" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="积分+2333&#xA;"/>
-    <text id="n68_w06x" name="tili_title" xy="1630,208" size="287,49" group="n45_n1ry" visible="false" alpha="0" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" text=""/>
+    <text id="n68_w06x" name="tili_title" xy="1630,208" size="287,49" group="n92_kra5" visible="false" alpha="0" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" text=""/>
-    <text id="n69_w06x" name="yidashangxian" xy="1167,389" size="428,54" group="n45_n1ry" visible="false" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" text=""/>
+    <text id="n69_w06x" name="yidashangxian" xy="1167,389" size="428,54" group="n92_kra5" visible="false" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" text=""/>
-    <image id="n73_p9qe" name="n73" src="m1i32a" fileName="component/clearing/images/fengexian_js.png" xy="191,934" size="1050,5" group="n45_n1ry" visible="false"/>
+    <image id="n73_p9qe" name="n73" src="m1i32a" fileName="component/clearing/images/fengexian_js.png" xy="191,934" size="1050,5" group="n92_kra5" visible="false"/>
-    <text id="n88_fhzq" name="text_fangxing" xy="1167,451" size="461,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" text="翻醒:"/>
+    <text id="n88_fhzq" name="text_fangxing" xy="1167,451" size="461,54" group="n92_kra5" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" text="翻醒:"/>
-    <list id="n91_fhzq" name="list_fangxing" xy="1167,509" size="502,106" group="n45_n1ry" layout="flow_hz" overflow="scroll" colGap="7" defaultItem="ui://mzvoz9udfhzqa0" autoClearItems="true">
+    <list id="n91_fhzq" name="list_fangxing" xy="1167,509" size="502,106" group="n92_kra5" layout="flow_hz" overflow="scroll" colGap="7" defaultItem="ui://mzvoz9udfhzqa0" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -119,12 +113,21 @@
       <item/>
       <item/>
     </list>
-    <group id="n45_n1ry" name="n45" xy="56,183" size="2038,920" group="n70_dunj" advanced="true">
+    <group id="n92_kra5" name="n92" xy="102,183" size="1992,920" group="n45_n1ry" advanced="true">
+      <gearDisplay controller="isNormalTerminationM" pages="0"/>
+    </group>
+    <image id="n85_pgl7" name="n85" src="mrlr9p" fileName="component/EPCDWHZMui/Rectangle 2782.png" xy="82,628" size="1990,7" group="n45_n1ry"/>
+    <group id="n45_n1ry" name="n45" xy="82,183" size="2012,920" group="n70_dunj" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
     <text id="n49_g8y2" name="n49" xy="485,72" size="457,74" group="n70_dunj" fontSize="18" color="#999999" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
       <gearDisplay controller="over" pages="1"/>
     </text>
+    <list id="n30_n1ry" name="player_list" xy="56,669" size="1074,392" group="n70_dunj" selectionMode="none" scroll="horizontal" lineGap="57" colGap="221" defaultItem="ui://mzvoz9udm1i32b" autoClearItems="true">
+      <gearXY controller="isNormalTerminationM" pages="1" values="56,216" default="56,669"/>
+      <item/>
+      <item/>
+    </list>
     <component id="n6_jt1k" name="btn_share_str" src="m1i30" fileName="buttons/Btn_Blue.xml" xy="587,622" size="233,90" group="n51_fmkv">
       <gearDisplay controller="sdk" pages="0"/>
       <gearXY controller="button" pages="0,1" values="587,622|442,617"/>

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

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1172" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="jushu" pages="0,,1," selected="0"/>
   <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n196_h5b1" name="n196" src="mrlrt1" fileName="image/MRBMui/image 656.png" xy="875,0" size="782,101"/>
-    <text id="n205_e5js" name="text_playName" xy="1268,504" pivot="0.5,0" size="0,124" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="fffffffffdddd"/>
+    <text id="n205_e5js" name="text_playName" xy="1263,504" pivot="0.5,0" size="10,124" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="fffffffffdddd"/>
     <component id="n31_h1uu" name="roominfo_panel" src="mrlr7j7a" fileName="component/RoomInfoPanel1(1).xml" pkg="27vd145b" xy="1157,21" size="253,45" touchable="false">
       <relation target="" sidePair="center-center,top-top%"/>
     </component>
@@ -48,7 +48,7 @@
       <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
     </component>
     <component id="n194_syh3" name="gcm_chat" src="syh3rk" fileName="component/Main/Main_2_chat.xml" xy="2359,334" visible="false"/>
-    <component id="n7" name="player_info1" src="peuq6e" fileName="component/Main/component/PlayerHead_1.xml" xy="49,759" size="161,161">
+    <component id="n7" name="player_info1" src="peuq6e" fileName="component/Main/component/PlayerHead_1.xml" xy="69,759" size="161,161">
       <gearXY controller="state" pages="0,1,2,3" values="69,759|49,759|54,675|49,759"/>
       <relation target="" sidePair="rightext-left,topext-bottom%,bottomext-bottom,leftext-left"/>
     </component>

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

@@ -5,8 +5,16 @@
   <controller name="piaovalue" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
   <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
-    <list id="n36_lr5d" name="windcard_list" xy="1976,-290" pivot="0.5,0.5" size="526,81" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://lkq9ne9speuq2">
+    <list id="n36_lr5d" name="windcard_list" xy="2184,-290" pivot="0.5,0.5" size="340,81" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://lkq9ne9speuq2" align="right">
-      <relation target="" sidePair="right-right"/>
+      <relation target="" sidePair="right-right,top-top"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
     <list id="n35_lr5d" name="area_fz_list" xy="1068,201" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="20" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="rightext-left,topext-bottom,bottomext-bottom,leftext-left"/>
@@ -17,7 +25,7 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
     <component id="n37_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="1480,-501" size="5,5"/>
-    <component id="n38_ey1o" name="n38" src="peuq5b" fileName="component/Main/component/PromptOutCard.xml" xy="16,-177" size="1577,5">
+    <component id="n38_ey1o" name="n38" src="peuq5b" fileName="component/Main/component/PromptOutCard.xml" xy="16,-498" size="1577,5">
       <gearDisplay controller="chupai" pages="1"/>
     </component>
     <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1178,-899" size="100,100"/>

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

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="97,287" extention="Button">
+<component size="147,223" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="Kan" pages="0,,1," selected="1"/>
+  <controller name="Kan" pages="0,,1," selected="0"/>
   <controller name="mark_ting" pages="0,,1," selected="1"/>
-  <controller name="touch" pages="0,,1," selected="0"/>
+  <controller name="touch" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_lsou" name="icon" xy="0,0" size="97,287" url="ui://lkq9ne9speuq4" fill="scaleFree" autoSize="true" clearOnPublish="true"/>
+    <loader id="n4_lsou" name="icon" xy="0,0" size="147,223" url="ui://lkq9ne9speuqlr" fill="scale" clearOnPublish="true">
-    <image id="n6_g098" name="n6" src="peuq0" fileName="component/cards/images/00(1).png" xy="0,0" size="97,287">
+      <gearSize controller="c1" pages="0,1" values="147,223,1,1|147,223,1.2,1.2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <image id="n6_g098" name="n6" src="peuq0" fileName="component/cards/images/00(1).png" xy="0,0" size="147,223">
       <gearDisplay controller="Kan" pages="1"/>
       <relation target="n4_lsou" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_cypr" name="n7" src="peuq1" fileName="component/cards/images/tips.png" xy="59,0" size="37,79">
+    <image id="n7_cypr" name="n7" src="peuq1" fileName="component/cards/images/tips.png" xy="89,0" size="58,58">
       <gearDisplay controller="mark_ting" pages="1"/>
-      <relation target="" sidePair="width-width%,height-height%,right-right,top-top"/>
+      <relation target="n4_lsou" sidePair="right-right,top-top"/>
     </image>
   </displayList>
   <Button/>
-  <relation target="n4_lsou" sidePair="rightext-right,bottomext-bottom"/>
 </component>

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

@@ -2,11 +2,12 @@
 <component size="58,176">
   <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="c2" pages="0,,1," selected="0"/>
+  <controller name="c3" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n3_lr5d" name="card_3" xy="0,0" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" fill="scale" clearOnPublish="true"/>
     <loader id="n2_lr5d" name="card_2" xy="0,58" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" fill="scale"/>
     <loader id="n1_lr5d" name="card_1" xy="0,117" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" fill="scale"/>
-    <group id="n4_lr5d" name="n4" xy="0,0" size="58,175"/>
+    <group id="n4_lr5d" name="n4" xy="0,0" size="58,175" advanced="true"/>
     <graph id="n5_m25s" name="n5" xy="0,0" size="58,175" visible="false" type="rect" lineColor="#00000000" fillColor="#4d000000">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="n4_lr5d" sidePair="width-width,height-height"/>
@@ -14,5 +15,9 @@
     <graph id="n6_jl3i" name="n6" xy="0,84" size="42,42" visible="false" type="rect" lineColor="#00000000" fillColor="#4d000000" corner="3">
       <gearDisplay controller="c2" pages="1"/>
     </graph>
+    <graph id="n7_fptx" name="n7" xy="0,117" size="58,58" type="rect" lineColor="#00000000" fillColor="#4d000000">
+      <gearDisplay controller="c3" pages="1"/>
+      <relation target="n1_lr5d" sidePair="width-width,height-height"/>
+    </graph>
   </displayList>
 </component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="82,82">
   <displayList>
-    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="100,82" fill="scale"/>
+    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="100,82" url="ui://lkq9ne9speuqlj" fill="scale" clearOnPublish="true"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Scale" target="n0_lr5d" tween="true" startValue="1.5,1.5" endValue="1,1" duration="6"/>

wb_new_ui/assets/Main_RunBeard/package.xml

@@ -18,7 +18,7 @@
     <component id="peuqe" name="Gcm_moveCard.xml" path="/component/cards/" exported="true"/>
     <image id="peuqf" name="光晕.png" path="/component/chi_peng_effect/"/>
     <component id="peuqg" name="自己胡牌.xml" path="/component/chi_peng_effect/" exported="true"/>
-    <image id="peuqh" name="胡.png" path="/component/chi_peng_effect/" exported="true"/>
+    <image id="peuqh" name="胡11.png" path="/component/chi_peng_effect/"/>
     <image id="peuqi" name="牌.png" path="/component/chi_peng_effect/"/>
     <image id="peuqj" name="光束2.png" path="/component/chi_peng_effect/"/>
     <image id="peuqk" name="胡牌边界光.png" path="/component/chi_peng_effect/"/>
@@ -1077,6 +1077,7 @@
     <image id="szpgtx" name="Rectangle 3004.png" path="/image/MRBMui/"/>
     <image id="szpgty" name="Rectangle 3000.png" path="/image/MRBMui/"/>
     <component id="szpgtz" name="Btn_szFG_M.xml" path="/buttons/" exported="true"/>
+    <image id="kra5u0" name="胡.png" path="/component/chi_peng_effect/" exported="true"/>
   </resources>
   <publish name="Main_RunBeard" path="..\wb_unity_pro\Assets\ART\base\main_zipai\ui" packageCount="2"/>
 </packageDescription>