diff --git a/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua b/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua index df9499f9..060da680 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua @@ -51,6 +51,19 @@ function M:init(url) local slider_music = view:GetChild('slider_music') -- local btn_music = view:GetChild('btn_music') -- local btn_sound = view:GetChild('btn_sound') + + local _btn_dismiss_room = view:GetChild('btn_dismiss_room') + self._btn_dismiss_room = _btn_dismiss_room + if _btn_dismiss_room then + _btn_dismiss_room.onClick:Add( + function() + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:AskDismissRoom() + self:Destroy() + end + ) + end + self._view:GetChild("btn_close22").onClick:Set(function( ... ) local bg_id = self._view:GetController("bg").selectedIndex + 1 if self._bg ~= bg_id then diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info index 54121d2e..74948d59 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info @@ -16,9 +16,6 @@ "n154_r1mo": { "collapsed": true }, - "n206_ib2w": { - "hidden": true - }, "n179_kxwj": { "hidden": true }, @@ -29,7 +26,6 @@ "hidden": true }, "n183_yfzf": { - "locked": true, "collapsed": true }, "n35_k3io": { diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqap.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqap.info new file mode 100644 index 00000000..a1659963 --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuqap.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_93q2": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info index 953f9b02..e753ef2c 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info @@ -3,6 +3,9 @@ "n98_voqg": { "hidden": true }, + "n143_szpg": { + "collapsed": true + }, "n93_voqg": { "hidden": true }, @@ -15,9 +18,6 @@ "n0_mk2u": { "hidden": true }, - "n90_voqg": { - "hidden": true - }, "n102_voqg": { "hidden": true, "collapsed": true diff --git a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info index e26d37f4..aeee2ee7 100644 --- a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info +++ b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info @@ -9,18 +9,27 @@ "n19_pt1r": { "collapsed": true }, - "n46_n1ry": { + "n48_j5c2": { "hidden": true }, "n35_n1ry": { "hidden": true }, + "n40_n1ry": { + "hidden": true + }, "n14_pt1r": { "hidden": true }, + "n69_w06x": { + "hidden": true + }, "n73_p9qe": { "hidden": true }, + "n67_w06x": { + "hidden": true + }, "n37_n1ry": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 6a04585f..9535f7d9 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,44 +3,65 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://v0j9abjygq7mgo", + "ui://hrxsdiixla4e2c", + "ui://8wph7p8nyffnhr", + "ui://mzvoz9udm1i335", + "ui://mzvoz9udm1i33c", + "ui://1utjt0r2ufu92i", + "ui://1utjt0r2ufu92t", + "ui://mzvoz9udm1i32j", + "ui://442j0uepygxga", + "ui://4skil1l6piv91ny", "ui://v0j9abjygq7mgp", "ui://lkq9ne9speuqc6", + "ui://lkq9ne9speuq8b", + "ui://lkq9ne9speuq8r", + "ui://lkq9ne9speuq8w", + "ui://lkq9ne9ssyh3rj", + "ui://lkq9ne9so0c1ru", "ui://lkq9ne9speuqao", "ui://lkq9ne9sszpgtz", "ui://lkq9ne9speuqap", - "ui://lkq9ne9speuqaa" + "ui://lkq9ne9speuqaa", + "ui://8wph7p8nyffnmr", + "ui://2d9xdj6zl0lzb", + "ui://lkq9ne9speuqbv", + "ui://yzaioi79wyal8n", + "ui://v6yvqp7wwyal8n", + "ui://9n9stu2eprgzgj", + "ui://lx6k641gajzhoe" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v0j9abjygq7mgo", + "doc.activeDoc": "ui://mzvoz9udm1i335", "libview.twoColumn": false, "libview.expandedNodes": [ - "27vd145b", + "1utjt0r2", "/", - "27vd145b", - "/buttons/", - "hrxsdiix", - "/", - "hrxsdiix", + "1utjt0r2", "/component/", - "hrxsdiix", + "1utjt0r2", "/component/clearing/", - "8wph7p8n", + "1utjt0r2", + "/component/clearing/image/", + "mzvoz9ud", "/", - "v0j9abjy", - "/", - "v0j9abjy", - "/buttons/", - "v0j9abjy", + "mzvoz9ud", "/component/", - "v0j9abjy", - "/component/setting_new/", + "mzvoz9ud", + "/component/clearing/", + "mzvoz9ud", + "/component/clearing/image/", "lkq9ne9s", "/", "lkq9ne9s", "/buttons/", "lkq9ne9s", + "/component/", + "lkq9ne9s", + "/component/Main/", + "lkq9ne9s", "/image/", "lkq9ne9s", "/image/MRBMui/", diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/FullName.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/FullName.xml index 5c010172..78a675f1 100644 --- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/FullName.xml +++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/FullName.xml @@ -1,9 +1,9 @@ - + - - + + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml index 490f49f0..69608ab8 100644 --- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml @@ -49,9 +49,12 @@ - - - + + + + + + @@ -62,7 +65,7 @@ - + @@ -76,9 +79,9 @@ - + - + @@ -116,7 +119,7 @@ - + diff --git a/wb_new_ui/assets/Main_RunBeard/buttons/Btn_Yellow_New.xml b/wb_new_ui/assets/Main_RunBeard/buttons/Btn_Yellow_New.xml index 15bf45b0..62ff8f05 100644 --- a/wb_new_ui/assets/Main_RunBeard/buttons/Btn_Yellow_New.xml +++ b/wb_new_ui/assets/Main_RunBeard/buttons/Btn_Yellow_New.xml @@ -1,13 +1,13 @@ - + - + -