胡牌的哪个牌倒牌、结算按钮

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -260,7 +260,9 @@ function M:OnEvtUpdateRoom(evt_data)
     for _, room in pairs(cmds) do
         for _, palyingUser in pairs(room.plist or {}) do
             local _player = group.memberMap[palyingUser.aid]
-            _player.playing = "startPlaying"
+            if _player then
+                _player.playing = "startPlaying"
+            end
         end
     end
 
@@ -545,7 +547,10 @@ function M:OnMemberOnline(evt_data)
 
     for _, uid in pairs(evt_data.onlineUserId) do
         local player = group.memberMap[uid]
-        player.online = 1
+
+        if player then
+            player.online = 1
+        end
     end
 
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)

lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua

@@ -184,6 +184,9 @@ function FamilyChatRoom:Show()
     local getData = self.group.records == nil
 
     mgr_ctr:FG_ENTER_CHATROOM(self.root._group.id, getData, function(res)
+        if res.returnCode == 0 then
+            ViewUtil.ShowModalWait(self._root_view, "正在加载聊天室......")
+        end
     end)
 
     local cChatRoom = self.root._view:GetController("cIsChatRoom")

lua_probject/base_project/Game/View/Family/FamilyEventView.lua

@@ -218,6 +218,7 @@ function M:_evtChatRoomData(...)
         return
     end
     view.com_FamilyChatRoom:Refalsh()
+    ViewUtil.CloseModalWait()
 end
 
 function M:_evtOnNewRecord(...)

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

@@ -313,8 +313,8 @@ function M:EventInit()
         local info = self._player_card_info[index]
         self:RemoveCursor()
         --info:UpdateHandCard(false, false)
-
         info:ShowHuCard(win_card)
+        
         local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
         obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
         obj_win_card:GetController("bg").selectedIndex = 1

lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua

@@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
 
     if result then
         result.cardList = json.decode(result.cardList)
-        table.sort(result.cardList)
+        --table.sort(result.cardList)
     end
     self.list_lastCard = self._view:GetChild('list_lastCard')
 

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

@@ -309,7 +309,8 @@ function M:EventInit()
         local index = self:GetPos(win_seat)
         local info = self._player_card_info[index]
         self:RemoveCursor()
-        info:UpdateHandCard(true, false)
+        --info:UpdateHandCard(true, false)
+        info:ShowHuCard(win_card)
 
         local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
         obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card

lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua

@@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
 
     if result then
         result.cardList = json.decode(result.cardList)
-        table.sort(result.cardList)
+        --table.sort(result.cardList)
     end
     self.list_lastCard = self._view:GetChild('list_lastCard')
 

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

@@ -310,7 +310,8 @@ function M:EventInit()
         local index = self:GetPos(win_seat)
         local info = self._player_card_info[index]
         self:RemoveCursor()
-        info:UpdateHandCard(false, false)
+        --info:UpdateHandCard(false, false)
+        info:ShowHuCard(win_card)
 
         local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
         obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card

lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua

@@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
 
     if result then
         result.cardList = json.decode(result.cardList)
-        table.sort(result.cardList)
+        --table.sort(result.cardList)
     end
     self.list_lastCard = self._view:GetChild('list_lastCard')
 

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

@@ -311,7 +311,8 @@ function M:EventInit()
         local index = self:GetPos(win_seat)
         local info = self._player_card_info[index]
         self:RemoveCursor()
-        info:UpdateHandCard(false, false)
+        --info:UpdateHandCard(false, false)
+        info:ShowHuCard(win_card)
 
         local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
         obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_nextRound.xml

@@ -2,7 +2,7 @@
 <component size="404,112" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_qt01" name="n3" src="qt01yq" fileName="Main_new_2/StartAndReady/Image/Group 193.png" xy="-4,-6"/>
+    <image id="n3_qt01" name="n3" src="l4fo1bp" fileName="Main_new/Main/Image/btn_continu_game.png" xy="0,0" size="404,112"/>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_showClearMain.xml

@@ -2,7 +2,7 @@
 <component size="404,112" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_qt01" name="n3" src="qt01yr" fileName="Main_new_2/StartAndReady/Image/Group 239.png" xy="0,0"/>
+    <image id="n3_qt01" name="n3" src="l4fo1bo" fileName="Main_new/Main/Image/btn_show_result.png" xy="0,0" size="404,112"/>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1458,6 +1458,8 @@
     <image id="fj6f1bl" name="离线.png" path="/images/"/>
     <image id="fj6f1bm" name="xzmj_result_35 1.png" path="/images/"/>
     <image id="fj6f1bn" name="微信图片_20250726215551_78.png" path="/images/"/>
+    <image id="l4fo1bo" name="btn_show_result.png" path="/Main_new/Main/Image/"/>
+    <image id="l4fo1bp" name="btn_continu_game.png" path="/Main_new/Main/Image/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>