diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index a7ba8b90..0f5c70d5 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -172,7 +172,7 @@ 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)) + --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 diff --git a/wb_new_ui/.objs/metas/8wph7p8n/o7fmcld.info b/wb_new_ui/.objs/metas/8wph7p8n/o7fmcld.info new file mode 100644 index 00000000..74534a65 --- /dev/null +++ b/wb_new_ui/.objs/metas/8wph7p8n/o7fmcld.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n6_rfcn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info index aedab268..d723929d 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info @@ -1,10 +1,13 @@ { "objectStatus": { + "n54_k5q7": { + "hidden": true + }, "n44_kx91": { "hidden": true }, - "n33_e7qn": { - "collapsed": true + "n53_hez8": { + "locked": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info index c088f9e6..4ddcf713 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n60_hez8": { + "hidden": true + }, "n57_qcrm": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index cd8f6eb8..9f494693 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,23 +2,37 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46kwi0hkb", - "ui://2d9xdj6z75efcz", - "ui://h30s8vmela4eb", - "ui://7ij0e6i2sv5gk", - "ui://7ij0e6i2sv5gh" + "ui://v0j9abjygq7m8f", + "ui://v0j9abjygq7m8u", + "ui://v0j9abjyp0aism", + "ui://v0j9abjygq7m8l", + "ui://v0j9abjyrdg6t9", + "ui://8wph7p8nyffnmy", + "ui://8wph7p8nyffnnx", + "ui://l0ds4ys6h1uu24", + "ui://8wph7p8nyffncb" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://7ij0e6i2sv5gk", + "doc.activeDoc": "ui://8wph7p8nyffnnx", "libview.twoColumn": false, "libview.expandedNodes": [ - "7ij0e6i2", + "27vd145b", "/", - "lkq9ne9s", + "27vd145b", + "/buttons/", + "27vd145b", + "/images/", + "27vd145b", + "/images/COMMui/", + "8wph7p8n", "/", - "lkq9ne9s", + "8wph7p8n", + "/component/", + "8wph7p8n", + "/component/head/", + "8wph7p8n", "/images/", "lkq9ne9s", "/images/cards/" diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml index 7649cc4d..1fd44344 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml @@ -1,101 +1,101 @@ - + - - - - - + + + + + - - + + - + - + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + -