心跳30秒

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
+    local HeartbeatTime = 30
-    if not self.lastTime or newTime - self.lastTime > HeartbeatTime then
+    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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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