游戏按钮位置调整，添加玩法修复

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

@@ -1,6 +1,16 @@
 local PlayEditView = {}
 local GroupGameSettingView = import("..NewGroup.MngView.GroupGameSettingView_jaingxi")
 
+local function UpdateFamilyRoom(self)
+    local view = ViewManager.GetCurrenView()
+
+    if view.class ~= "FamilyMainView" then
+        return
+    end
+
+    view:UpdateFamilyRoom(self.groupId)
+end
+
 function PlayEditView.New()
     setmetatable(PlayEditView, { __index = BaseWindow })
     local inst = setmetatable({}, { __index = PlayEditView })
@@ -50,7 +60,7 @@ function PlayEditView:Init()
                     local group = DataManager.groups:get(self.groupId)
                     group:addPlay(play)
                     -- self:FillView()
-                    --self:UpdateFamilyRoom(fgCtr, self.groupId)
+                    UpdateFamilyRoom(self) --self:UpdateFamilyRoom(fgCtr, self.groupId)
                     self:Refalsh(self.groupId)
                     printlog("刷新玩法===>>>>")
                     group.update_play = true
@@ -62,7 +72,9 @@ function PlayEditView:Init()
         obj:GetChild('text_title').text = playList[index].game_name
         local mode = ExtendManager.GetExtendConfig(playList[index].gameId):GetGameInfo()
         local pId = playList[index].id
-        obj:GetChild('Label_details'):GetChild('title').text = mode:LoadConfigToDetail(playList[index].config)
+        -- times倍数
+        local times = json.decode(playList[index].hpData).times
+        obj:GetChild('Label_details'):GetChild('title').text = times / 1000 .. "倍," .. mode:LoadConfigToDetail(playList[index].config)
         obj:GetChild('text_playName').text = playList[index].name
         obj:GetController('type').selectedIndex = 1
         obj:GetChild('btn_del').onClick:Set(function()
@@ -76,7 +88,7 @@ function PlayEditView:Init()
                         return
                     end
 
-                    --self:UpdateFamilyRoom(fgCtr, self.groupId)
+                    UpdateFamilyRoom(self) --self:UpdateFamilyRoom(fgCtr, self.groupId)
                     self:Refalsh(self.groupId)
                 end)
             end)
@@ -87,7 +99,7 @@ function PlayEditView:Init()
                     local group = DataManager.groups:get(self.groupId)
                     group:addPlay(play)
                     -- self:FillView()
-                    --self:UpdateFamilyRoom(fgCtr, self.groupId)
+                    UpdateFamilyRoom(self) --self:UpdateFamilyRoom(fgCtr, self.groupId)
                     self:Refalsh(self.groupId)
                     printlog("刷新玩法===>>>>")
                     group.update_play = true

lua_probject/base_project/Game/View/FamilyView.lua

@@ -465,7 +465,10 @@ function M:UpdateFamilyRoom(fgCtr, id)
             local newIndex = index - #roomList + 1
             local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId)
             local mode = config:GetGameInfo()
-            local gamePlay = mode:LoadConfigToDetail(playList[newIndex].config)
+            -- times倍数
+            local times = json.decode(playList[newIndex].hpData).times 
+            local gamePlay = times / 1000 .. "倍,"
+            gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config)
             obj:GetChild('Label_gameRule').title = gamePlay
             obj:GetChild('game_type').text = string.format("（%s）%s", playList[newIndex].game_name, playList[newIndex]
                 .name)
@@ -670,7 +673,7 @@ function M:OnUpdate()
         self:UpdateFamilyRoom(fgCtr, self._group.id)
     end
 
-    local HeartbeatTime = 30
+    local HeartbeatTime = 5
     if newTime - self.lastTime > HeartbeatTime then
         fgCtr:FG_SetFamilyHeartbeat(self._group.id, DataManager.SelfUser.account_id, function(res)
             print(res)

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -108,10 +108,9 @@ function M:FillGameData()
     if self.play then
         local tex_name = self._view:GetChild("tex_name")
         tex_name.text = self.play.name
-    end
-
         self._view:GetChild("tex_times").text = self.play.hp_times / 1000
     end
+end
 
 local tuoguanTimeList = { 10, 30, 60, 120, 180, 240, 300 }
 -- 显示玩法体力值配置

wb_new_ui/assets/Family/com_roomCard.xml

@@ -4,7 +4,7 @@
     <image id="n0_c8pn" name="n0" src="c8pn7czt" fileName="RoomCrad/Image/Rectangle 42.png" xy="0,0" size="1272,801"/>
     <image id="n1_c8pn" name="n1" src="c8pn7czv" fileName="RoomCrad/Image/Rectangle 41.png" xy="18,36"/>
     <image id="n2_c8pn" name="n2" src="c8pn7czw" fileName="RoomCrad/Image/title_top.png" xy="0,-9"/>
-    <text id="n3_c8pn" name="n3" xy="371,6" size="530,116" font="Alibaba PuHuiTi 3.0" fontSize="90" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="充值房卡"/>
+    <text id="n3_c8pn" name="n3" xy="371,6" size="530,116" font="Alibaba PuHuiTi 3.0" fontSize="90" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" shadowColor="#00166d" shadowOffset="0,2" text="充值房卡"/>
     <text id="n4_c8pn" name="tex_curCard" xy="139,174" size="456,56" font="Alibaba PuHuiTi 3.0" fontSize="42" color="#666666" vAlign="middle" autoSize="none" bold="true" text="当前帐号房卡：999999"/>
     <text id="n6_c8pn" name="tex_famliyCard" xy="688,174" size="401,56" font="Alibaba PuHuiTi 3.0" fontSize="42" color="#666666" vAlign="middle" autoSize="none" bold="true" text="亲友圈房卡：999999"/>
     <list id="n8_c8pn" name="list_bayCrad" xy="90,260" size="1092,493" layout="row" overflow="hidden" colGap="33" defaultItem="ui://htcn7v3rc8pn7czy" align="center" autoClearItems="true">

wb_new_ui/assets/Family/package.xml

@@ -385,6 +385,12 @@
     <image id="g71b7d5t" name="queren_btn1.png" path="/Tips/image/"/>
     <component id="g71b7d5u" name="btn_comfirm.xml" path="/Tips/component/"/>
     <component id="g71b7d5v" name="btn_cancel.xml" path="/Tips/component/"/>
+    <component id="oehx7d5w" name="InviteRoom.xml" path="/InviteRoom/" exported="true"/>
+    <image id="oehx7d5x" name="Rectangle 258.png" path="/InviteRoom/Image/" scale="9grid" scale9grid="54,61,108,122"/>
+    <image id="oehx7d5y" name="Group 361.png" path="/InviteRoom/Image/"/>
+    <image id="oehx7d5z" name="Group 360.png" path="/InviteRoom/Image/"/>
+    <component id="oehx7d60" name="btn_cancel.xml" path="/InviteRoom/Component/"/>
+    <component id="oehx7d62" name="btn_enter.xml" path="/InviteRoom/Component/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -76,12 +76,12 @@
     <group id="n100_dnw9" name="n100" xy="-534,-673" size="1282,510" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1032,657" size="408,114" group="n125_pkx5">
+    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,657" size="408,114" group="n125_pkx5">
       <gearDisplay controller="action" pages="0"/>
     </component>
-    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1281,522" size="408,114" group="n125_pkx5"/>
+    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,522" size="408,114" group="n125_pkx5"/>
-    <component id="n124_pkx5" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="777,522" size="408,114" group="n125_pkx5"/>
+    <component id="n124_pkx5" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,522" size="408,114" group="n125_pkx5"/>
-    <group id="n125_pkx5" name="readyBtn" xy="777,522" size="912,249" advanced="true">
+    <group id="n125_pkx5" name="readyBtn" xy="810,522" size="912,249" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -130,12 +130,12 @@
     <group id="n100_dnw9" name="n100" xy="-534,-673" size="1282,510" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1086,675" group="n125_pkx5">
+    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,681" size="408,114" group="n125_pkx5">
       <gearDisplay controller="action" pages="0"/>
     </component>
-    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1317,507" group="n125_pkx5"/>
+    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,546" size="408,114" group="n125_pkx5"/>
-    <component id="n124_pkx5" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="855,507" group="n125_pkx5"/>
+    <component id="n124_pkx5" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,546" size="408,114" group="n125_pkx5"/>
-    <group id="n125_pkx5" name="readyBtn" xy="855,507" size="822,297" advanced="true">
+    <group id="n125_pkx5" name="readyBtn" xy="810,546" size="912,249" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
@@ -235,7 +235,7 @@
     </component>
     <component id="n175_ncpl" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2542,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2542,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
+      <gearXY controller="witness" pages="0" values="2542,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
     <component id="n176_ncpl" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2327,519" size="144,123"/>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -120,12 +120,12 @@
     <group id="n100_dnw9" name="n100" xy="-534,-673" size="1282,510" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1086,675" group="n125_pkx5">
+    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,705" size="408,114" group="n125_pkx5">
       <gearDisplay controller="action" pages="0"/>
     </component>
-    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1317,507" group="n125_pkx5"/>
+    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,570" size="408,114" group="n125_pkx5"/>
-    <component id="n124_pkx5" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="855,507" group="n125_pkx5"/>
+    <component id="n124_pkx5" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,570" size="408,114" group="n125_pkx5"/>
-    <group id="n125_pkx5" name="readyBtn" xy="855,507" size="822,297" advanced="true">
+    <group id="n125_pkx5" name="readyBtn" xy="810,570" size="912,249" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
@@ -274,7 +274,7 @@
     </component>
     <component id="n183_ncpl" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2533,27">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2533,27" default="2097,30" tween="true" ease="Linear" duration=".5"/>
+      <gearXY controller="witness" pages="0" values="2533,27" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
     <component id="n184_ncpl" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2318,516" size="144,123"/>
   </displayList>