diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua index 7561d507..b09b8e84 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua @@ -79,14 +79,14 @@ function M:fill_user_info() pw_view:Show() end) - self:fill_item("iuo_retrieve", password, function() - local _data_info = {} - _data_info.only_retrieve = true - local pw_view = IDPasswordAlone.new(_data_info, function() - self:fill_user_info() - end) - pw_view:Show() - end) + -- self:fill_item("iuo_retrieve", password, function() + -- local _data_info = {} + -- _data_info.only_retrieve = true + -- local pw_view = IDPasswordAlone.new(_data_info, function() + -- self:fill_user_info() + -- end) + -- pw_view:Show() + -- end) local invitation = self._user.invitation local item_invte = self.user_info:GetChild("item_invte") diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index 2455e9f8..5445bed3 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -8,36 +8,17 @@ ui://27vd145boviihyz ui://27vd145bqz637ij2 ui://27vd145bz5om44 ui://3qr8nmi47q1m2h -ui://visk5g30gq7mp -ui://visk5g30gq7m3n -ui://visk5g30gq7m38 -ui://visk5g30gq7m4h -ui://visk5g30gq7m1c ui://fnuxqeflkllg1u ui://fnuxqeflkllg1v ui://egnzysm7ffp38o ui://egnzysm7ffp35q -ui://v2hilfzbgq7mbt -ui://v2hilfzbgq7mbs -ui://v2hilfzbgq7m2k -ui://v2hilfzbgq7ml ui://1utjt0r2ufu98l ui://1utjt0r2ufu98k ui://ppu1wv7699we4s ui://ppu1wv7699we2l -ui://oubpz2r2ofil78 -ui://oubpz2r2ofil77 ui://9n9stu2enaueci9 ui://9n9stu2enauecht -ui://awernf6xbazq7b -ui://awernf6xbazq7a -ui://qpsoxvainaueci9 -ui://qpsoxvainauecht -ui://b8jloj2qnaueci9 -ui://b8jloj2qnauecht -ui://v09du5djgq7m6 ui://eyxz924gffp34g -ui://v2emygzogq7m8 ui://4wmd3o8gvlhjde ui://z3z0ysurvlhj7t ui://96mvx2mlvlhjcsv @@ -56,4 +37,4 @@ ui://4skil1l6vmtu1l8 ui://4skil1l6piv91ln ui://4skil1l6jsw9117 ui://m7iejg46eany7iev -ui://m7iejg46hz877im7 +ui://m7iejg46hz877ioj diff --git a/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info b/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info new file mode 100644 index 00000000..d6938b5d --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n4_hz87": { + "hidden": 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 50f90b8e..46e69696 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -3,6 +3,9 @@ "n154_cioe": { "hidden": true }, + "n152_cioe": { + "hidden": true + }, "n214_ovii": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info index e0787291..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n120_l7wn": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info index 06937148..e9ce61ad 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n133_et16": { + "hidden": true + }, "n107_sbng": { "hidden": true }, @@ -12,10 +15,16 @@ "n101_sbng": { "hidden": true }, + "n147_iaes": { + "hidden": true + }, "n78_nk4v": { "hidden": true }, - "n133_et16": { + "n138_iaes": { + "hidden": true + }, + "n141_iaes": { "hidden": true }, "n98_yetw": { diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info index ee959abf..0c6f5467 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info @@ -19,8 +19,7 @@ "hidden": true }, "n7_kwi0": { - "hidden": true, - "collapsed": true + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info index e1565a76..23ec9e08 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info @@ -3,9 +3,6 @@ "n35_rpaz": { "collapsed": true }, - "n45_tqi8": { - "collapsed": true - }, "n33_rpaz": { "collapsed": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info index 19cdda91..e1485f0f 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info @@ -6,9 +6,6 @@ "n51_t1hq": { "collapsed": true }, - "n46_rpaz": { - "collapsed": true - }, "n44_rpaz": { "collapsed": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info index 26667d5b..f64d3345 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info @@ -3,12 +3,6 @@ "n86_kwi0": { "hidden": true }, - "n134_lcv1": { - "collapsed": true - }, - "n197_imp5": { - "collapsed": true - }, "n157_sbng": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info index 72174507..5308e708 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info @@ -1,7 +1,7 @@ { "objectStatus": { - "n121_l679": { - "collapsed": true + "n123_omkm": { + "hidden": true }, "n142_m16m": { "hidden": true @@ -12,9 +12,6 @@ "n122_j120": { "hidden": true }, - "n123_omkm": { - "hidden": true - }, "n86_kwi0": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info b/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info index 3530ca0d..a8a0bfde 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info +++ b/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info @@ -1,9 +1,12 @@ { "objectStatus": { - "n134_lcv1": { + "n139_qjw9": { "collapsed": true }, - "n104_kwi0": { + "n140_qjw9": { + "collapsed": true + }, + "n134_lcv1": { "collapsed": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info index ecec8f54..0c262103 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info +++ b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n104_vyn3": { + "hidden": true + }, "n94_jj65": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 13670246..59e22c68 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,54 +1,112 @@ { - "libview.firstColumnWidth": 522, + "libview.firstColumnWidth": 338, + "test.device": "720p Phone", "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg46ilon7ias", + "ui://m7iejg46i5987i75", "ui://m7iejg4610snh5j", - "ui://m7iejg46ilon7i9l", - "ui://m7iejg46ilon7i9m", - "ui://m7iejg46iaes7idc", - "ui://m7iejg46iaes7idk", - "ui://m7iejg46hwww2f", - "ui://m7iejg46iaes7idb", - "ui://m7iejg46iaes7idj", - "ui://m7iejg46yvb27ik0", - "ui://m7iejg46mpllhuq", - "ui://2zlli80mw9te0", - "ui://0khx14aryvb27i4z", - "ui://0khx14aryvb27i51", - "ui://0khx14are0py2", - "ui://27vd145bl0lz9", + "ui://m7iejg46cvc87i5y", + "ui://m7iejg46nk4vhwh", + "ui://m7iejg46r0qx7i6u", + "ui://m7iejg46ruljhmp", + "ui://m7iejg46r96th8e", + "ui://m7iejg4610xl7i1w", + "ui://m7iejg46qlxihsl", + "ui://m7iejg46kwi0hld", + "ui://m7iejg46kwi0hmb", + "ui://m7iejg46kwi0hk0", + "ui://m7iejg46qlxihsm", + "ui://m7iejg46kwi0hk1", + "ui://m7iejg46kwi0hkb", + "ui://m7iejg46ilon7i9k", + "ui://m7iejg46ilon7ia2", + "ui://m7iejg46tt6k7ika", + "ui://l0ds4ys6h1uu26", + "ui://z1qthxavlrfi0", + "ui://m7iejg46l7wn7i80", + "ui://m7iejg46lf2qhju", + "ui://m7iejg46l7wn7i81", + "ui://m7iejg46l7wn7i82", + "ui://m7iejg46kwdo7i97", + "ui://m7iejg468h207i99", + "ui://m7iejg46nwgkhx0", + "ui://m7iejg46nwgkhx2", + "ui://m7iejg46kk3uhro", + "ui://m7iejg46l7wn7i83", + "ui://m7iejg46kwi0hm5", + "ui://m7iejg46l679hwn", + "ui://9n9stu2eprgzee", + "ui://9n9stu2em9jahb", + "ui://m7iejg46k5m97i76", + "ui://m7iejg46tqi8hwa", + "ui://m7iejg46f6brhwx", "ui://m7iejg46hsbhhjn", - "ui://m7iejg46t1hqhy5", - "ui://m7iejg46gojuhh5", - "ui://m7iejg46jgh8hwv", - "ui://m7iejg46avqi7ijp", - "ui://m7iejg46r0qx7i6v", "ui://m7iejg46imp57ih3", - "ui://m7iejg46imp57igy", - "ui://m7iejg46ilon7ibl", - "ui://m7iejg46imp57ihp", "ui://m7iejg46kwi0hma", - "ui://m7iejg46ilon7ia2" + "ui://2zlli80mw9te0", + "ui://0khx14are0py2", + "ui://2d9xdj6zfn7fao", + "ui://2d9xdj6zlumrgj", + "ui://m7iejg46jqcwc", + "ui://x3mp2cn6r5wqh", + "ui://27vd145bl0lz9", + "ui://m7iejg46jgh8hwv", + "ui://3qr8nmi4v38kq", + "ui://3qr8nmi4xtwh1n", + "ui://3qr8nmi4v38kr", + "ui://s63l0suw6cpqv", + "ui://s63l0suw6cpqr", + "ui://s63l0suw6cpqt", + "ui://s63l0suw6cpqs", + "ui://fnuxqeflnrnod", + "ui://fnuxqefl8kzvy", + "ui://fnuxqeflxtwhv", + "ui://fnuxqefl8kzv10", + "ui://egnzysm7ffp36a", + "ui://27vd145bpgy941", + "ui://2d9xdj6zxbqujn", + "ui://2d9xdj6znaupko", + "ui://2d9xdj6zsvin7e2f", + "ui://egnzysm7ffp35o", + "ui://4skil1l6uwvl1qp", + "ui://4skil1l6piv91o7", + "ui://4skil1l6piv91o5", + "ui://4skil1l6piv91mg", + "ui://4skil1l6piv91nt", + "ui://4skil1l6piv91ny", + "ui://v0j9abjygq7mdl", + "ui://m7iejg46e5q7hu2", + "ui://1utjt0r2ufu923", + "ui://1utjt0r2ufu945", + "ui://3qr8nmi4v38ku", + "ui://m7iejg46avqi7ijp", + "ui://m7iejg46kk3uhrs", + "ui://m7iejg465ff3hud", + "ui://m7iejg46hsbhhj4", + "ui://m7iejg46irlqhyt", + "ui://m7iejg46ilon7ibl", + "ui://m7iejg46jr1l7i3c", + "ui://m7iejg46lcv1hwt", + "ui://m7iejg46cioeho9", + "ui://m7iejg46z3847i6r", + "ui://m7iejg46imp57ihp", + "ui://m7iejg46z3847i6m", + "ui://m7iejg46kwi0hkr" ], "auxline1": true, "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46hwww2f", + "doc.activeDoc": "ui://2d9xdj6zsvin7e2f", "libview.twoColumn": false, "libview.expandedNodes": [ "m7iejg46", "/", "m7iejg46", - "/component/", - "m7iejg46", - "/component/Lst_room/", - "m7iejg46", - "/images/", - "m7iejg46", - "/images/room/" + "/mgr/" ], "snapToGrid": true, + "test.orientation": "landscape", "backgroundColor": 6710886, "libview.currentGroup": "", "gridSize": 30, diff --git a/wb_new_ui/assets/Common/MessageBox.xml b/wb_new_ui/assets/Common/MessageBox.xml index b992cda0..3651d6e0 100644 --- a/wb_new_ui/assets/Common/MessageBox.xml +++ b/wb_new_ui/assets/Common/MessageBox.xml @@ -5,13 +5,13 @@