diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 5b9601fa..a7ba8b90 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -172,11 +172,11 @@ local function __fillRoomItem(self, index, item, room) local str = nil local room_item = self.roomItems[item] local play = self.curGroup:getPlay(room.pid) + printlog("s-----------s------------s",pt(room)) if not room_item then room_item = RoomItem.new(item, room.maxPlayers, self.isShowRoomItem) self.roomItems[item] = room_item end - room_item:SetPlay(play) -- local str="(人数:".. room.maxPlayers -- if room.limitInRoom then @@ -274,7 +274,8 @@ local function __fillRoomItem(self, index, item, room) for i = 1, room.maxPlayers do local p_head = room_item.heads[i] local p_item = p_head.p_item - p_item.visible = false + p_item.visible = false + end end -- desk.touchable = false diff --git a/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua b/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua index 4085a931..aa2104a6 100644 --- a/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua +++ b/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua @@ -34,7 +34,6 @@ function M:init(max) self.heads = {} for i=1,max do - --printlog("==================================",i) local p_item = item:GetChild("head"..i) local btn_head = p_item:GetChild("btn_head") self.def_icon = btn_head._iconObject.texture diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua index 915b34e1..861d7d85 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua @@ -56,7 +56,10 @@ function M:FillRoomData(data) local roominfo_panel = self._view:GetChild("roominfo_panel1") roominfo_panel:GetChild("tex_roomid").text = room.room_id - roominfo_panel:GetChild("tex_gametype").text = room.room_config:GetGameName() + if roominfo_panel:GetChild("tex_gametype") then + roominfo_panel:GetChild("tex_gametype").text = room.room_config:GetGameName() + end + for i = 1, #room.player_list do local p = room.player_list[i] @@ -295,7 +298,9 @@ function M:UpdateRound(round) end function M:UpdateStep(step) - self._record:GetChild("tex_step").text = "第 " .. step .. " / " .. #self._step .. "步" + if self._record:GetChild("tex_step") then + self._record:GetChild("tex_step").text = "第 " .. step .. " / " .. #self._step .. "步" + end end return M \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffn2.info b/wb_new_ui/.objs/metas/8wph7p8n/yffn2.info new file mode 100644 index 00000000..c8531608 --- /dev/null +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffn2.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n13_yffn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info index 53688bcf..60c3689e 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info @@ -1,10 +1,16 @@ { "objectStatus": { - "n25_ckvb": { - "collapsed": true + "n70_yffn": { + "hidden": true }, - "n4_ckvb": { - "collapsed": true + "n71_yffn": { + "hidden": true + }, + "n57_yffn": { + "locked": true + }, + "n72_yffn": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index ce18e0a8..795f67f3 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -7,27 +7,49 @@ "ui://27vd145bvg2c4", "ui://27vd145b93q2c0", "ui://8wph7p8nyffnmy", - "ui://27vd145bcvc87i5t", + "ui://hrxsdiixla4e2c", + "ui://v0j9abjygq7med", + "ui://4skil1l6piv91ny", + "ui://x3mp2cn6xvhr3r", + "ui://fnuxqeflnrnod", + "ui://egnzysm7ffp36a", + "ui://v0j9abjygq7mct", + "ui://1utjt0r2ufu92i", + "ui://ppu1wv76j4mf9j", + "ui://ypulwxjhl9mn14", + "ui://442j0uepygxga", + "ui://8wph7p8nyffnhr", + "ui://9n9stu2eprgzee", + "ui://niy3ldiwl9mn14", "ui://m7iejg4610snh5j", - "ui://m7iejg46e5q7hu2", - "ui://27vd145bpgy941", - "ui://27vd145boviihyy", - "ui://27vd145bbt6w96", - "ui://27vd145beeqmcgp", - "ui://m7iejg46a81d7ii7", - "ui://m7iejg46e5q7hu9", - "ui://27vd145bdo2f1z", + "ui://m7iejg46h46p7ish", + "ui://m7iejg46hwww2f", + "ui://8wph7p8nyffnnp", + "ui://8wph7p8nyffnc", + "ui://8wph7p8nyffnj", + "ui://8wph7p8nyffn2", "ui://27vd145bst2l7ijp", - "ui://27vd145bmljn7ijt", - "ui://8wph7p8nyffn8s", - "ui://8wph7p8nyffn2h" + "ui://v0j9abjygq7m8f" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://8wph7p8nyffnmy", + "doc.activeDoc": "ui://8wph7p8nyffnnp", "libview.twoColumn": false, - "libview.expandedNodes": [], + "libview.expandedNodes": [ + "8wph7p8n", + "/", + "8wph7p8n", + "/images/", + "8wph7p8n", + "/images/EPRFNMui/", + "8wph7p8n", + "/images/head/", + "v0j9abjy", + "/", + "v0j9abjy", + "/Main_style_2/" + ], "auxline1": true, "snapToGrid": true, "test.orientation": "landscape", diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml index 89a1105b..5f471205 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml @@ -1,40 +1,42 @@ - - - + + + - - - - + + + + + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver1Info.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver1Info.xml index fb62716a..e233b5ef 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver1Info.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver1Info.xml @@ -1,38 +1,57 @@ - - - + + + - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + - - - - + + - - + + - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/comp_playerInfoChild.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/comp_playerInfoChild.xml index b8812cfe..ec88c013 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/comp_playerInfoChild.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/comp_playerInfoChild.xml @@ -1,17 +1,17 @@ - + - - - - + + + + - - + + - - + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/clearing_new.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/clearing_new.xml index 43532b87..e23681bd 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/clearing_new.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/clearing_new.xml @@ -1,24 +1,25 @@ - + - - - - - - - - + + + + + + + + + - - + + @@ -35,53 +36,54 @@ - -