diff --git a/fk101/wb_new_ui/.objs/fonts.json b/fk101/wb_new_ui/.objs/fonts.json index e484e366..9f6d8931 100644 --- a/fk101/wb_new_ui/.objs/fonts.json +++ b/fk101/wb_new_ui/.objs/fonts.json @@ -80,5 +80,7 @@ ui://4skil1l6vmtu1kv ui://4skil1l6vmtu1l8 ui://4skil1l6piv91ln ui://4skil1l6jsw9117 +ui://5cdldr01qaqf72 +ui://5cdldr01qaqf9d ui://35sf1c1fr05e8v ui://m7iejg46gjxx7iab diff --git a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info index d5857d84..56d2e4c5 100644 --- a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info +++ b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info @@ -1,7 +1,75 @@ { "objectStatus": { - "n45_n1ry": { - "locked": true, + "n16_pt1r": { + "hidden": true + }, + "n33_n1ry": { + "hidden": true + }, + "n63_fnpw": { + "hidden": true + }, + "n62_fnpw": { + "hidden": true + }, + "n46_n1ry": { + "hidden": true + }, + "n35_n1ry": { + "hidden": true + }, + "n54_rx2e": { + "hidden": true + }, + "n14_pt1r": { + "hidden": true + }, + "n52_rx2e": { + "hidden": true + }, + "n73_p9qe": { + "hidden": true + }, + "n61_fnpw": { + "hidden": true + }, + "n37_n1ry": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + }, + "n51_fmkv": { + "collapsed": true + }, + "n77_p9qe": { + "hidden": true + }, + "n15_pt1r": { + "hidden": true + }, + "n58_fnpw": { + "hidden": true + }, + "n4_fux2": { + "hidden": true + }, + "n32_n1ry": { + "hidden": true + }, + "n56_fnpw": { + "hidden": true + }, + "n31_n1ry": { + "hidden": true + }, + "n43_n1ry": { + "hidden": true + }, + "n12_nrno": { + "hidden": true + }, + "n59_fnpw": { "hidden": true } } diff --git a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info index 55e072ab..f00d12a3 100644 --- a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info +++ b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info @@ -1,13 +1,77 @@ { "objectStatus": { - "n4_fux2": { + "n16_pt1r": { "hidden": true }, - "n76_p9qe": { + "n33_n1ry": { + "hidden": true + }, + "n63_fnpw": { + "hidden": true + }, + "n19_pt1r": { + "hidden": true + }, + "n46_n1ry": { + "hidden": true + }, + "n35_n1ry": { + "hidden": true + }, + "n62_fnpw": { + "hidden": true + }, + "n54_rx2e": { + "hidden": true + }, + "n14_pt1r": { + "hidden": true + }, + "n52_rx2e": { + "hidden": true + }, + "n73_p9qe": { + "hidden": true + }, + "n61_fnpw": { + "hidden": true + }, + "n37_n1ry": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + }, + "n77_p9qe": { + "hidden": true + }, + "n15_pt1r": { "hidden": true }, "n58_fnpw": { + "hidden": true, "collapsed": true + }, + "n4_fux2": { + "hidden": true + }, + "n32_n1ry": { + "hidden": true + }, + "n56_fnpw": { + "hidden": true + }, + "n31_n1ry": { + "hidden": true + }, + "n43_n1ry": { + "hidden": true + }, + "n12_nrno": { + "hidden": true + }, + "n59_fnpw": { + "hidden": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info index f3b771c7..9e26dfee 100644 --- a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info +++ b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n13_n1ry": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 0e85ddd0..1e0e119c 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,65 +1,88 @@ { -<<<<<<< HEAD "libview.firstColumnWidth": 356, -======= -<<<<<<< HEAD - "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://5cdldr01qaqf9c", - "ui://5cdldr01qaqf61", + "ui://egnzysm7ffp36a", + "ui://egnzysm7ffp35h", + "ui://egnzysm7ffp36i", + "ui://egnzysm7ffp36o", + "ui://egnzysm7ffp370", "ui://442j0uepygxga", - "ui://5cdldr01qaqfo", - "ui://c7j2rnvqtpf01p", - "ui://c7j2rnvqtpf06k", - "ui://c7j2rnvqtpf08q", - "ui://c7j2rnvqtpf06t", - "ui://z3z0ysurygxgd", - "ui://442j0uepygxgd", - "ui://c7j2rnvqtpf06p", - "ui://v6yvqp7waen81b0", - "ui://5cdldr01qaqfe0", - "ui://5cdldr01qaqfcn", - "ui://5cdldr01qaqf4n", - "ui://35sf1c1fr05e9k", - "ui://5cdldr01qaqfa2", - "ui://5cdldr01qaqf46", - "ui://5cdldr01qaqf4w", - "ui://5cdldr01qaqf4t", - "ui://5cdldr01qaqf3y", - "ui://5cdldr01qaqf4e" + "ui://5cdldr01qaqf2c", + "ui://niy3ldiwl9mn14", + "ui://niy3ldiwl9mn18", + "ui://27vd145baen8chp", + "ui://niy3ldiwl9mny", + "ui://niy3ldiwl9mnz", + "ui://niy3ldiwl9mn17" ], "auxline1": true, "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://442j0uepygxgd", + "doc.activeDoc": "ui://442j0uepygxga", "libview.twoColumn": false, "libview.expandedNodes": [ + "egnzysm7", + "/", + "egnzysm7", + "/component/", + "egnzysm7", + "/component/EPCDWHZMui/", + "egnzysm7", + "/component/clearing/", + "egnzysm7", + "/component/clearing/image/", "442j0uep", "/", "442j0uep", "/component/", "442j0uep", - "/component/create_room/", - "z3z0ysur", + "/component/EPRHZMui/", + "442j0uep", + "/component/clearing/", + "niy3ldiw", "/", - "z3z0ysur", + "niy3ldiw", "/component/", - "z3z0ysur", - "/component/create_room/", - "z3z0ysur", - "/component/create_room/images/", - "z3z0ysur", - "/font/", - "z3z0ysur", + "niy3ldiw", + "/component/EPYYWHZMui/", + "niy3ldiw", + "/component/clearing/", + "3z9lj55v", + "/", + "3z9lj55v", + "/Main_style_2/", + "3z9lj55v", + "/Main_style_2/turn/", + "3z9lj55v", + "/component/", + "3z9lj55v", + "/component/setting/", + "3z9lj55v", + "/component/setting/changeBG/", + "3z9lj55v", + "/image/", + "3z9lj55v", "/images/", - "z3z0ysur", - "/mgr/", - "z3z0ysur", - "/mgr/imgs/", - "z3z0ysur", - "/mgr/imgs/game/", + "3z9lj55v", + "/images/bg/", "5cdldr01", + "/", + "5cdldr01", + "/component/", + "5cdldr01", + "/component/clearing/", + "5cdldr01", + "/component/clearing/image/", + "5cdldr01", + "/images/", + "v6yvqp7w", + "/", + "v6yvqp7w", + "/component/", + "v6yvqp7w", + "/component/clearing/", + "m7iejg46", "/" ], "snapToGrid": true, @@ -67,61 +90,4 @@ "libview.currentGroup": "", "gridSize": 30, "gridColor": 80 -======= - "doc.openedDocs": [], ->>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed - "libview.iconScale": 0, - "doc.openedDocs": [ - "ui://c7j2rnvqtpf06k", - "ui://c7j2rnvqtpf06t", - "ui://m7iejg46mpllhv2", - "ui://m7iejg46kwi0hkl", - "ui://m7iejg46mpllhv5", - "ui://27vd145blwcl28", - "ui://m7iejg46mkdvhdu", - "ui://c7j2rnvqtpf06q", - "ui://c7j2rnvqtpf02w", - "ui://c7j2rnvqtpf06p", - "ui://c7j2rnvqtpf06l" - ], - "auxline1": true, - "canvasColor": 10066329, - "auxline2": true, - "doc.activeDoc": "ui://c7j2rnvqtpf06k", - "libview.twoColumn": false, - "libview.expandedNodes": [ - "c7j2rnvq", - "/", - "c7j2rnvq", - "/component/", - "c7j2rnvq", - "/component/ENJCSMui/", - "c7j2rnvq", - "/component/qishou_hu/", - "c7j2rnvq", - "/component/qishou_hu/images/", - "c7j2rnvq", - "/component/result/", - "c7j2rnvq", - "/component/result/component/", - "m7iejg46", - "/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/component/", - "m7iejg46", - "/mgr/component/play_set/" - ], -<<<<<<< HEAD - "snapToGrid": true, - "backgroundColor": 6710886, - "libview.currentGroup": "", - "gridSize": 30, - "gridColor": 80 -======= - "libview.firstColumnWidth": 356, - "libview.twoColumn": false ->>>>>>> 0b0313d1f7fe0999ceff3986fd87f1d7c882b902 ->>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed } \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml index cbed2bc6..4fe94ba7 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_newYellow_comfirm.xml @@ -1,9 +1,9 @@ - + - - - + + + -