From 96f5a054607c874aa2870b2efc96ad987c96cd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Tue, 1 Apr 2025 16:56:04 +0800
Subject: [PATCH] 25.4.1.3

---
 .../base_project/Game/View/FamilyView.lua     |  23 +++++++++---------
 .../main/majiang/MJPlayerCardInfoView.lua     |   1 +
 .../main_majiang/ui/main_majiang_fui.bytes    | Bin 232902 -> 232902 bytes
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index ad2f506d..ce80c5e3 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -511,17 +511,18 @@ function M:OnUpdate()
         if self._roomNum == self._group.room_num then
             for i = 1, self._group.room_num do
                 if self._group.rooms[i] and #self._group.rooms[i].plist == 0 then
-                    fgCtr:FG_RemoveRoom(
-                        self._group.id,
-                        self._group.rooms[i].id,
-                        function(res)
-                            if res.ReturnCode ~= 0 then
-                                ViewUtil.ErrorTip(res.ReturnCode, string.format('删除房间-%s失败！', self._group.rooms[i].id))
-                            else
-                                self._roomNum = #self._group.rooms
-                            end
-                        end
-                    )
+                    self._group.update_room = false
+                    -- fgCtr:FG_RemoveRoom(
+                    --     self._group.id,
+                    --     self._group.rooms[i].id,
+                    --     function(res)
+                    --         if res.ReturnCode ~= 0 then
+                    --             ViewUtil.ErrorTip(res.ReturnCode, string.format('删除房间-%s失败！', self._group.rooms[i].id))
+                    --         else
+                    --             self._roomNum = #self._group.rooms
+                    --         end
+                    --     end
+                    -- )
                 end
             end
         else
diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
index cf6039f4..868c0038 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
@@ -121,6 +121,7 @@ function M:fillCard(obj, pos_str, card, use3d)
         obj.icon = 'ui://MajiangCard3d/' .. 'b' .. pos_str .. card
     else
         obj.icon = 'ui://Main_Majiang/' .. self:GetPrefix() .. pos_str .. card
+        print("====================================obj", obj.icon)
     end
 end
 
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes
index df65805c5644d9697ae013a612fc057a0e2a012b..776e2097fc891a5632446398b2b7617a7fda5d30 100644
GIT binary patch
delta 125
zcmX>$oA20czJ?aY7N#xCmX+y-3~cFz=DAq~4D3b*hVdo_Mo@u5n1C@<pa>>l0u?BR
Y37A3!N?-zJP=QjIfcf?XmCR})08fJ;7ytkO

delta 125
zcmX>$oA20czJ?aY7N#xCmX+xS3~cFz=DAq~4D3b*hVdo_#!!Jmn1C5npa>>l2^A=Y
Z3K$we1xjE7rci-Wn1IFh1(nQdA^=e|ARqt$