diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 1f28f830..039cb3f6 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -1022,6 +1022,7 @@ function M:PlaySound(sex, path) end function M:OnUpdate() + local deltaTime = Time.deltaTime if (self._popEvent) then local func = self._gamectr:PopEvent() @@ -1030,8 +1031,6 @@ function M:OnUpdate() if result then else - printlog("game_error", resultInfo) - printlog("game_error_tra", debug.traceback()) self._gamectr = ControllerManager.GetController(GameController) if self._gamectr then self._gamectr:ResetConnect() diff --git a/wb_new_ui/.objs/metas/27vd145b/aen8chp.info b/wb_new_ui/.objs/metas/27vd145b/aen8chp.info new file mode 100644 index 00000000..87d5d252 --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/aen8chp.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n1": { + "hidden": true + }, + "n4_iukg": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/27vd145b/pgy941.info b/wb_new_ui/.objs/metas/27vd145b/pgy941.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/pgy941.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf2c.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf2c.info new file mode 100644 index 00000000..f52cfb4a --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf2c.info @@ -0,0 +1,28 @@ +{ + "objectStatus": { + "n37_aen8": { + "hidden": true + }, + "n28_tjnv": { + "hidden": true + }, + "n5_tjnv": { + "hidden": true + }, + "n34_aen8": { + "hidden": true + }, + "n38_aen8": { + "hidden": true + }, + "n11_tjnv": { + "hidden": true + }, + "n6_tjnv": { + "hidden": true + }, + "n45_mj9f": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf2n.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf2n.info new file mode 100644 index 00000000..a8009088 --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf2n.info @@ -0,0 +1,17 @@ +{ + "objectStatus": { + "n4_tjnv": { + "hidden": true + }, + "n34_hufm": { + "hidden": true, + "collapsed": true + }, + "n23_jvdt": { + "hidden": true + }, + "n27_rbpg": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf8m.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf8m.info new file mode 100644 index 00000000..7cc9f3dc --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf8m.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n8_e5js": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqfcn.info b/wb_new_ui/.objs/metas/5cdldr01/qaqfcn.info new file mode 100644 index 00000000..df1d11dc --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqfcn.info @@ -0,0 +1,40 @@ +{ + "objectStatus": { + "n88_voqg": { + "hidden": true + }, + "n46_mk2u": { + "hidden": true + }, + "n35_mk2u": { + "hidden": true + }, + "n30_mk2u": { + "hidden": true + }, + "n29_mk2u": { + "hidden": true + }, + "n28_mk2u": { + "hidden": true + }, + "n33_mk2u": { + "hidden": true + }, + "n34_mk2u": { + "hidden": true + }, + "n85_fgao": { + "hidden": true + }, + "n61_mk2u": { + "hidden": true + }, + "n81_fgao": { + "hidden": true + }, + "n36_mk2u": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info b/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info index b060ba87..af53ae47 100644 --- a/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info @@ -1,7 +1,14 @@ { "objectStatus": { + "n135_voqg": { + "hidden": true, + "collapsed": true + }, "n0_mk2u": { "hidden": true + }, + "n82_fgao": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp37k.info b/wb_new_ui/.objs/metas/egnzysm7/ffp37k.info index 0c833717..176ceb68 100644 --- a/wb_new_ui/.objs/metas/egnzysm7/ffp37k.info +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp37k.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n4_tjnv": { + "hidden": true + }, "n23_jvdt": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info b/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info index 210da700..237a66a1 100644 --- a/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info +++ b/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info @@ -1,93 +1,69 @@ { "objectStatus": { - "n45_n1ry": { - "collapsed": true - }, - "n19_pt1r": { - "hidden": true, - "collapsed": true - }, - "n46_n1ry": { - "hidden": true - }, - "n73_p9qe": { - "hidden": true - }, - "n58_fnpw": { - "hidden": true, - "collapsed": true - }, - "n64_pwj4": { - "collapsed": true - }, - "n12_nrno": { - "hidden": true - }, - "n77_p9qe": { - "hidden": true - }, - "n15_pt1r": { - "hidden": true - }, - "n17_pt1r": { - "hidden": true - }, - "n33_n1ry": { - "hidden": true - }, - "n4_fux2": { - "hidden": true - }, - "n37_n1ry": { + "n16_pt1r": { "hidden": true }, "n63_fnpw": { "hidden": true }, - "n55_rx2e": { - "collapsed": true + "n46_n1ry": { + "hidden": true }, "n52_rx2e": { "hidden": true }, - "n51_fmkv": { - "collapsed": true - }, - "n44_n1ry": { - "collapsed": true - }, - "n43_n1ry": { - "hidden": true - }, - "n62_fnpw": { - "hidden": true - }, - "n59_fnpw": { - "hidden": true - }, - "n31_n1ry": { + "n54_rx2e": { "hidden": true }, "n14_pt1r": { "hidden": true }, - "n32_n1ry": { + "n69_w06x": { "hidden": true }, - "n16_pt1r": { + "n73_p9qe": { "hidden": true }, "n61_fnpw": { "hidden": true, "collapsed": true }, + "n37_n1ry": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + }, + "n51_fmkv": { + "collapsed": true + }, + "n15_pt1r": { + "hidden": true + }, + "n58_fnpw": { + "hidden": true, + "collapsed": true + }, + "n62_fnpw": { + "hidden": true + }, "n56_fnpw": { "hidden": true }, - "n54_rx2e": { + "n19_pt1r": { + "hidden": true, + "collapsed": true + }, + "n4_fux2": { "hidden": true }, - "n35_n1ry": { + "n68_w06x": { + "hidden": true + }, + "n12_nrno": { + "hidden": true + }, + "n59_fnpw": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/niy3ldiw/l9mny.info b/wb_new_ui/.objs/metas/niy3ldiw/l9mny.info new file mode 100644 index 00000000..6868bab1 --- /dev/null +++ b/wb_new_ui/.objs/metas/niy3ldiw/l9mny.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n26_w06x": { + "hidden": true + }, + "n6_fux2": { + "hidden": true + }, + "n22_ey1o": { + "hidden": true + }, + "n25_w06x": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info b/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info index 69ee2b10..9a1f955b 100644 --- a/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info +++ b/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info @@ -1,98 +1,63 @@ { "objectStatus": { - "n84_loe7": { - "locked": true - }, - "n49_g8y2": { - "locked": true, + "n16_pt1r": { "hidden": true }, - "n19_pt1r": { - "locked": true, + "n49_g8y2": { "hidden": true }, "n46_n1ry": { - "locked": true, - "hidden": true - }, - "n73_p9qe": { - "hidden": true - }, - "n58_fnpw": { - "locked": true, - "hidden": true - }, - "n12_nrno": { - "locked": true, - "hidden": true - }, - "n77_p9qe": { - "locked": true, - "hidden": true - }, - "n15_pt1r": { - "hidden": true - }, - "n17_pt1r": { - "hidden": true - }, - "n33_n1ry": { - "locked": true, - "hidden": true - }, - "n4_fux2": { - "hidden": true - }, - "n37_n1ry": { - "locked": true, "hidden": true }, "n52_rx2e": { "hidden": true }, - "n68_w06x": { - "hidden": true - }, - "n85_loe7": { - "locked": true - }, - "n43_n1ry": { - "locked": true, - "hidden": true - }, - "n62_fnpw": { - "locked": true, - "hidden": true - }, - "n39_n1ry": { - "hidden": true - }, - "n31_n1ry": { - "locked": true, + "n54_rx2e": { "hidden": true }, "n14_pt1r": { "hidden": true }, - "n32_n1ry": { - "locked": true, + "n69_w06x": { "hidden": true }, - "n16_pt1r": { + "n73_p9qe": { + "hidden": true + }, + "n37_n1ry": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + }, + "n15_pt1r": { + "hidden": true + }, + "n58_fnpw": { + "hidden": true + }, + "n62_fnpw": { "hidden": true }, "n56_fnpw": { - "locked": true, "hidden": true }, - "n54_rx2e": { + "n82_hxjc": { "hidden": true }, - "n67_w06x": { + "n19_pt1r": { "hidden": true }, - "n35_n1ry": { - "locked": true, + "n4_fux2": { + "hidden": true + }, + "n68_w06x": { + "hidden": true + }, + "n12_nrno": { + "hidden": true + }, + "n39_n1ry": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/ypulwxjh/l9mny.info b/wb_new_ui/.objs/metas/ypulwxjh/l9mny.info new file mode 100644 index 00000000..6868bab1 --- /dev/null +++ b/wb_new_ui/.objs/metas/ypulwxjh/l9mny.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n26_w06x": { + "hidden": true + }, + "n6_fux2": { + "hidden": true + }, + "n22_ey1o": { + "hidden": true + }, + "n25_w06x": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info b/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info index 45089b2f..8d491574 100644 --- a/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info +++ b/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info @@ -13,29 +13,27 @@ "hidden": true }, "n6_tjnv": { - "locked": true, "hidden": true }, - "n3_tjnv": { - "locked": true, + "n45_mj9f": { + "hidden": true + }, + "n37_aen8": { "hidden": true }, "n10_tjnv": { "hidden": true }, + "n38_aen8": { + "hidden": true + }, "n36_aen8": { "hidden": true }, "n5_tjnv": { - "locked": true, "hidden": true }, "n28_tjnv": { - "locked": true, - "hidden": true - }, - "n2_tjnv": { - "locked": true, "hidden": true }, "n27_tjnv": { diff --git a/wb_new_ui/.objs/metas/yzaioi79/aen81bf.info b/wb_new_ui/.objs/metas/yzaioi79/aen81bf.info new file mode 100644 index 00000000..76f04bc9 --- /dev/null +++ b/wb_new_ui/.objs/metas/yzaioi79/aen81bf.info @@ -0,0 +1,14 @@ +{ + "objectStatus": { + "n4_tjnv": { + "hidden": true + }, + "n23_jvdt": { + "hidden": true + }, + "n25_hufm": { + "hidden": true, + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/yzaioi79/fgao1dn.info b/wb_new_ui/.objs/metas/yzaioi79/fgao1dn.info index 6c4fdd7d..a36778fb 100644 --- a/wb_new_ui/.objs/metas/yzaioi79/fgao1dn.info +++ b/wb_new_ui/.objs/metas/yzaioi79/fgao1dn.info @@ -1,14 +1,11 @@ { "objectStatus": { - "n118_voqg": { + "n127_voqg": { "collapsed": true }, "n111_voqg": { "collapsed": true }, - "n127_voqg": { - "collapsed": true - }, "n115_voqg": { "collapsed": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index cdefce5f..c1657200 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,17 +2,15 @@ "libview.firstColumnWidth": 398, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://3z9lj55vjokmft", - "ui://3z9lj55vjokmet", - "ui://3z9lj55vjokmey", - "ui://egnzysm7ffp36a", - "ui://egnzysm7ffp370", - "ui://egnzysm7ffp37k" + "ui://442j0uepygxga", + "ui://27vd145bpgy941", + "ui://27vd145bbt6w96", + "ui://27vd145bep9w7ik3" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://egnzysm7ffp370", + "doc.activeDoc": "ui://27vd145bpgy941", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -26,6 +24,8 @@ "27vd145b", "/component/create_room/COMMui/", "27vd145b", + "/component/create_room/image/", + "27vd145b", "/component/head/", "27vd145b", "/component/rule/", @@ -47,6 +47,24 @@ "/images/", "egnzysm7", "/images/EPCDXTMui/", + "ypulwxjh", + "/", + "ypulwxjh", + "/component/", + "ypulwxjh", + "/component/EPFLSMui/", + "ypulwxjh", + "/component/clearing/", + "ypulwxjh", + "/images/", + "ypulwxjh", + "/images/EPFLSXTMui/", + "442j0uep", + "/", + "442j0uep", + "/component/", + "442j0uep", + "/component/EPRHZMui/", "3n2top74", "/", "3n2top74", @@ -58,23 +76,15 @@ "3n2top74", "/images/", "3n2top74", - "/images/EPRXTMui/", - "3n2top74", "/setting/", - "3n2top74", - "/setting/component/", - "3n2top74", - "/setting/images/", - "3z9lj55v", + "niy3ldiw", "/", "3z9lj55v", - "/images/", - "3z9lj55v", - "/images/MMXTMui/", - "yzaioi79", + "/", + "5cdldr01", "/", "yzaioi79", - "/images/" + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml b/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml index 4bbbe62c..2216d258 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml @@ -1,7 +1,7 @@ - + diff --git a/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml b/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml index 4fe94ba7..5340ceed 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml @@ -3,7 +3,9 @@ - + + +