From 1c182f160d3583e54294d635f33d0da174e35af7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com>
Date: Fri, 18 Jul 2025 16:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E8=B7=B330=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua_probject/base_project/Game/View/FamilyView.lua       | 5 +++--
 .../extend/majiang/100zhang/EXMainView.lua               | 1 +
 .../extend/majiang/chaoshan/EXMainView.lua               | 1 +
 .../extend/majiang/chaozhou/EXMainView.lua               | 1 +
 .../extend/majiang/chaozhougui/EXMainView.lua            | 1 +
 .../extend_project/extend/majiang/fuzhou/EXMainView.lua  | 1 +
 .../extend/majiang/fuzhou/EXWitnessView.lua              | 1 +
 .../extend_project/extend/majiang/gejiu/EXMainView.lua   | 1 +
 .../extend/majiang/hongzhong/EXMainView.lua              | 1 +
 .../extend_project/extend/majiang/jinxi/EXMainView.lua   | 1 +
 .../extend/majiang/jinxi/EXWitnessView.lua               | 1 +
 .../extend_project/extend/majiang/lichuan/EXMainView.lua | 1 +
 .../extend/majiang/lichuan/EXWitnessView.lua             | 1 +
 .../extend/majiang/nancheng/EXMainView.lua               | 1 +
 .../extend/majiang/nancheng/EXWitnessView.lua            | 1 +
 .../extend_project/extend/majiang/qizhiba/EXMainView.lua | 1 +
 .../extend/majiang/tuidaohu/EXMainView.lua               | 1 +
 .../extend/majiang/zhuanzhuan/EXMainView.lua             | 1 +
 lua_probject/main_project/main/majiang/MJMainView.lua    | 8 ++++++++
 .../main_project/main/majiang/MJPlayerCardInfoView.lua   | 9 +++++++++
 20 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 482eae86..83dea5ee 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -54,6 +54,7 @@ function M:init(url)
     BaseView.InitView(self, url)
     self._full_offset = false
     local view = self._view
+    self.lastTime = 0
 
     self.com_FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self)
 
@@ -670,8 +671,8 @@ function M:OnUpdate()
         self:UpdateFamilyRoom(fgCtr, self._group.id)
     end
 
-    local HeartbeatTime = 3
-    if not self.lastTime or newTime - self.lastTime > HeartbeatTime then
+    local HeartbeatTime = 30
+    if newTime - self.lastTime > HeartbeatTime then
         fgCtr:FG_SetFamilyHeartbeat(self._group.id, DataManager.SelfUser.account_id, function(res)
             self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false,
                 1)
diff --git a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
index dec4cf77..99bdb2ac 100644
--- a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
@@ -329,6 +329,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
index cd837727..67368cb9 100644
--- a/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
@@ -329,6 +329,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
index ab0848ea..0ca8febb 100644
--- a/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
@@ -339,6 +339,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
index d9d84379..05f61fe8 100644
--- a/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
@@ -339,6 +339,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
index 5204cdee..b7c6eb17 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
@@ -458,6 +458,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
index 7a5ae173..bedbc9db 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
@@ -249,6 +249,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
index 47d36b7b..16986612 100644
--- a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
@@ -330,6 +330,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
index 7744fc8b..11e9063a 100644
--- a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
@@ -248,6 +248,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = {...}
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
index 9698bb92..2bd93ee6 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
@@ -450,6 +450,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua
index 99d4716c..194ca7bb 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua
@@ -249,6 +249,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index b24d62fb..e85e7753 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -454,6 +454,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
index 000b123d..0b55b989 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
@@ -277,6 +277,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
index 534d5903..4b845a1f 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
@@ -455,6 +455,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua
index 592e6d69..7591cc12 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua
@@ -249,6 +249,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua b/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua
index 40fc3186..d24fb1e9 100644
--- a/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua
@@ -331,6 +331,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua b/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
index a59e8420..1c4cba27 100644
--- a/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
@@ -329,6 +329,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
index 92f49275..f838faff 100644
--- a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
@@ -243,6 +243,7 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = {...}
+        self:ShowHand(arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua
index 67b39ee7..97944aca 100644
--- a/lua_probject/main_project/main/majiang/MJMainView.lua
+++ b/lua_probject/main_project/main/majiang/MJMainView.lua
@@ -573,4 +573,12 @@ function M:GetPrefix()
     return get_majiang_prefix(DataManager.CurrenRoom.game_id)
 end
 
+-- 所有对家显示手牌
+function M:ShowHand(msg)
+
+    for _, infoView in pairs(self._player_card_info) do
+        infoView:ShowHand()
+    end
+end
+
 return M
diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
index 6716face..f108c107 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
@@ -459,4 +459,13 @@ function M:ResetCardType()
     -- end
 end
 
+function M:ShowHand(cards)
+    --self._view_handCardList
+    self._view_handCardList:RemoveChildren()
+    for _,card in pairs(cards) do
+        local obj = self._view_handCardList:AddItemFromPool()
+        obj:GetChild("icon").url = 'ui://Main_Majiang/' .. "b202_" .. card
+    end
+end
+
 return M