diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 829a8e9d..e6e8e495 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -261,7 +261,7 @@ function M:OnEvtUpdateRoom(evt_data) player.playing = "stopPlaying" end - for _, room in pairs(cmds) do + for _, room in pairs(group.rooms) do for _, palyingUser in pairs(room.plist or {}) do local _player = group.memberMap[palyingUser.aid] if _player then diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 1ca0c742..baaa1e60 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -663,7 +663,14 @@ function M:UpdateFamilyRoom(fgCtr, id) roomName = string.format("(%s)%s", playList[newIndex].game_name, roomName) obj:GetChild('game_type').text = roomName obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0 + obj:GetController('type').selectedIndex = 0 obj:GetController('num').selectedIndex = playList[newIndex].maxPlayers - 2 + obj:GetChild('Label_joinPlayers').text = "" + for i = 1, 4 do + local btn = obj:GetChild(string.format("player%d", i)) + btn:GetChild("icon").url = "ui://Family/btn_mainGameNumberHead" + --ImageLoad.Load("ui://Family/btn_mainGameNumberHead", obj:GetChild(string.format("player%d", i))._iconObject) + end obj:GetChild('btn_joinGame').onClick:Set(function() roomCtr:PublicJoinRoom( Protocol.WEB_FG_MATCH_ROOM, diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 3571cd5f..a9908990 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -128,7 +128,7 @@ - + diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index 5ef41ee2..70229489 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -107,7 +107,7 @@ - + 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 140b03c7..3fce523b 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