diff --git a/lua_probject/base_project/Game/View/Family/PlayEditView.lua b/lua_probject/base_project/Game/View/Family/PlayEditView.lua
index 4e8bf78a..15582a9b 100644
--- a/lua_probject/base_project/Game/View/Family/PlayEditView.lua
+++ b/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
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 99f6d9fb..1cfc913a 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/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)
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
index 51c39173..74af3625 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
@@ -108,9 +108,8 @@ function M:FillGameData()
if self.play then
local tex_name = self._view:GetChild("tex_name")
tex_name.text = self.play.name
+ self._view:GetChild("tex_times").text = self.play.hp_times / 1000
end
-
- self._view:GetChild("tex_times").text = self.play.hp_times / 1000
end
local tuoguanTimeList = { 10, 30, 60, 120, 180, 240, 300 }
diff --git a/wb_new_ui/assets/Family/com_roomCard.xml b/wb_new_ui/assets/Family/com_roomCard.xml
index 10b68fc4..5ac58f7f 100644
--- a/wb_new_ui/assets/Family/com_roomCard.xml
+++ b/wb_new_ui/assets/Family/com_roomCard.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index 420605b2..ee395578 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -385,6 +385,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
index 75968b19..14ec418f 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@@ -76,12 +76,12 @@
-
+
-
-
-
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
index 627756ae..15a3d93f 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
@@ -130,12 +130,12 @@
-
+
-
-
-
+
+
+
@@ -235,7 +235,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
index bc63a8df..9fc951bb 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
@@ -120,12 +120,12 @@
-
+
-
-
-
+
+
+
@@ -274,7 +274,7 @@
-
+
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
index 7dec15e9..641ed216 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index 5e18a817..a3f45026 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ
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 76fe75be..92916a2b 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ