diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index e7a943be..806def0b 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -91,7 +91,7 @@ function M:InitView(url) local headView = HeadView.new(DataManager.SelfUser,true) headView:Show() end)--]] - btn_agent.displayObject.gameObject:SetActive(false) + --btn_agent.displayObject.gameObject:SetActive(false) local btn_record = self._view:GetChild("btn_record") -- btn_record.onClick:Add(handler(self, function () diff --git a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info index 92f8ad93..c5f252b3 100644 --- a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info +++ b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n27_csp4": { + "hidden": true + }, "n24_xn94": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/0khx14ar/pcy012.info b/wb_new_ui/.objs/metas/0khx14ar/pcy012.info new file mode 100644 index 00000000..e5bfea59 --- /dev/null +++ b/wb_new_ui/.objs/metas/0khx14ar/pcy012.info @@ -0,0 +1,3 @@ +{ + "adaptiveTest": true +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index e970272b..667e9f69 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -1,40 +1,43 @@ { "objectStatus": { - "n54_lwcl": { - "hidden": true - }, - "n113_ker3": { - "hidden": true - }, - "n142_syg7": { - "hidden": true - }, - "n138_csp4": { - "hidden": true - }, - "n125_g8kk": { - "hidden": true - }, - "n51_lwcl": { - "hidden": true - }, "n122_g8kk": { "hidden": true }, - "n130_naup": { - "locked": true - }, - "n139_csp4": { - "hidden": true - }, "n120_g8kk": { "hidden": true }, + "n89_goju": { + "hidden": true + }, + "n130_naup": { + "locked": true + }, + "n142_syg7": { + "hidden": true + }, + "n111_ker3": { + "locked": true + }, + "n50_lwcl": { + "hidden": true + }, + "n138_csp4": { + "hidden": true + }, + "n113_ker3": { + "hidden": true + }, "n100_lumr": { "hidden": true }, + "n139_csp4": { + "hidden": true + }, "n119_g8kk": { "hidden": true + }, + "n51_lwcl": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info b/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info new file mode 100644 index 00000000..bf7836f5 --- /dev/null +++ b/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n10_nw0i": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info b/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info index 8a1c5c15..92572797 100644 --- a/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info +++ b/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info @@ -6,5 +6,6 @@ "n22_ab5p": { "hidden": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 6f7f5555..1991555a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -43,6 +43,5 @@ "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ep9w7iaj.info b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iaj.info new file mode 100644 index 00000000..a8b21149 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iaj.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n12_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ep9w7iak.info b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iak.info new file mode 100644 index 00000000..a8b21149 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iak.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n12_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info index f73f3991..0c3ed6ac 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info +++ b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info @@ -1,7 +1,10 @@ { "objectStatus": { - "n7_nyna": { - "collapsed": true + "n11_rfcn": { + "hidden": true + }, + "n8_m1dc": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info b/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info index 9e26dfee..e5bfea59 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info +++ b/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "adaptiveTest": true +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ul317i9z.info b/wb_new_ui/.objs/metas/m7iejg46/ul317i9z.info new file mode 100644 index 00000000..a8b21149 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/ul317i9z.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n12_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ul317ia0.info b/wb_new_ui/.objs/metas/m7iejg46/ul317ia0.info new file mode 100644 index 00000000..a8b21149 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/ul317ia0.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n12_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ul317ia1.info b/wb_new_ui/.objs/metas/m7iejg46/ul317ia1.info new file mode 100644 index 00000000..a8b21149 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/ul317ia1.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n12_n96g": { + "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 4ebb9809..ccbb44fe 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,52 +1,69 @@ { - "libview.firstColumnWidth": 413, + "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ + "ui://2d9xdj6zfn7fao", + "ui://2zlli80mw9te0", "ui://m7iejg4610snh5j", - "ui://m7iejg46jgh8hwv", - "ui://m7iejg46kwi0hk0", - "ui://m7iejg46qlxihsl", - "ui://m7iejg46qlxihsm", - "ui://m7iejg46kwi0hld", - "ui://m7iejg46kwi0hmb", - "ui://m7iejg46f6brhww", - "ui://m7iejg46nwgkhx0", - "ui://m7iejg46l7wn7i83", - "ui://27vd145bc6bub0", - "ui://m7iejg46nwgkhx1" + "ui://m7iejg46jvvohyf", + "ui://m7iejg46ep9w7iah", + "ui://m7iejg46ep9w7iai", + "ui://m7iejg46ul317ia3", + "ui://m7iejg46ul317ia4", + "ui://m7iejg46ul317ia5" ], "test.device": "Xiaomi 9", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46l7wn7i83", + "doc.activeDoc": "ui://m7iejg4610snh5j", "libview.twoColumn": false, "libview.expandedNodes": [ - "egnzysm7", + "27vd145b", "/", "27vd145b", "/buttons/", "27vd145b", - "/component/", - "27vd145b", - "/component/dismiss_room/", - "27vd145b", - "/component/dismiss_room/btn_keyboard/", - "27vd145b", "/font/", "27vd145b", "/font/images/", "27vd145b", - "/font/images/btn_keyboard/", + "/font/images/win/", + "egnzysm7", + "/", + "0khx14ar", + "/", + "0khx14ar", + "/images/", + "2d9xdj6z", + "/", + "2d9xdj6z", + "/component/", + "2d9xdj6z", + "/component/index/", + "2d9xdj6z", + "/images/", + "2d9xdj6z", + "/images/LobbyMui/", + "2zlli80m", + "/", + "2zlli80m", + "/images/", + "2zlli80m", + "/images/LoginMui/", "m7iejg46", "/", "m7iejg46", - "/mgr/", + "/component/", "m7iejg46", - "/mgr/component/", + "/component/Lst_info/", "m7iejg46", - "/mgr/component/member/", + "/component/Lst_room/", "m7iejg46", - "/mgr/component/member/partner/" + "/images/", + "m7iejg46", + "/images/NGXiangTangMui/", + "m7iejg46", + "/images/room/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/buttons/Btn_close.xml b/wb_new_ui/assets/Common/buttons/Btn_close.xml index 65b104dc..ae7f4e32 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_close.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_close.xml @@ -3,7 +3,9 @@ - + + +