diff --git a/fk101/lua_probject/base_project/Game/View/Lobby/GameListView.lua b/fk101/lua_probject/base_project/Game/View/Lobby/GameListView.lua index f1891692..445b9b2d 100644 --- a/fk101/lua_probject/base_project/Game/View/Lobby/GameListView.lua +++ b/fk101/lua_probject/base_project/Game/View/Lobby/GameListView.lua @@ -90,7 +90,7 @@ function M:__sysinit() local config = ExtendManager.GetExtendConfig(tem.game_id) config.game_data = tem local mode = config:GetGameInfo() - item.icon = mode:GetIconUrl() + --item.icon = mode:GetIconUrl() local mode_data = {} mode_data.type = 0 diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua index 05e7f7ac..ea5180f0 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua @@ -116,7 +116,7 @@ function M:OnRenderItem(index, obj) exconfig:FillRoomConfig(r, data) gameStr = string.gsub(r.room_config:GetDes(), "\r", "") - gameStr = "[color=#08a805]玩法说明:[/color]".."[color=#2365bb]"..gameStr.."[/color]" + gameStr = "[color=#009F50]玩法说明:[/color]".."[color=#435D81]"..gameStr.."[/color]" end obj:GetChild("com_gameinfo"):GetChild("tex_room_info").text = hpStr.."\n"..gameStr diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua index 04879a1b..9a65272e 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua @@ -69,7 +69,7 @@ function M:ShowDetails(play) exconfig:FillRoomConfig(r, data) gameStr = string.gsub(r.room_config:GetDes(), "\r", "") - gameStr = "[color=#f22d3c]玩法说明:[/color]".."[color=#776a5e]"..gameStr.."[/color]" + gameStr = "[color=#009F50]玩法说明:[/color]".."[color=#435D81]"..gameStr.."[/color]" return gameStr end diff --git a/fk101/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info b/fk101/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info index 01c113f5..b8ada2cf 100644 --- a/fk101/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info +++ b/fk101/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info @@ -1,25 +1,22 @@ { "objectStatus": { - "n141_c4r1": { - "collapsed": true + "n101_gsb6": { + "hidden": true }, - "n129_t038": { - "collapsed": true + "n90_nip5": { + "hidden": true }, - "n231_ttbr": { - "collapsed": true + "n162_c4r1": { + "hidden": true }, - "n132_t038": { - "collapsed": true + "n108_xhvg": { + "hidden": true }, - "n78_se1s": { - "collapsed": true + "n52_v38k": { + "hidden": true }, - "n209_rjio": { - "collapsed": true - }, - "n168_c4r1": { - "collapsed": true + "n58_iqv0": { + "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info index 62aff3e2..809be82e 100644 --- a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info +++ b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info @@ -1,14 +1,14 @@ { "objectStatus": { - "n69_vyn3": { - "hidden": true - }, "n71_vyn3": { "hidden": true }, "n70_vyn3": { "hidden": true }, + "n67_vyn3": { + "hidden": true + }, "n63_10xl7": { "hidden": true }, @@ -16,6 +16,5 @@ "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/97mlcin.info b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/97mlcin.info new file mode 100644 index 00000000..6727976d --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/97mlcin.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_cns5": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/442j0uep/ygxgd.info b/fk101/wb_new_ui/.objs/metas/442j0uep/ygxgd.info index 0b846d5b..5af0d66f 100644 --- a/fk101/wb_new_ui/.objs/metas/442j0uep/ygxgd.info +++ b/fk101/wb_new_ui/.objs/metas/442j0uep/ygxgd.info @@ -1,10 +1,26 @@ { "objectStatus": { + "n250_os7u": { + "hidden": true + }, "n70_m25s": { + "hidden": true, "collapsed": true }, + "n181_ey1o": { + "hidden": true + }, "n128_r282": { "collapsed": true + }, + "n251_os7u": { + "hidden": true + }, + "n252_os7u": { + "hidden": true + }, + "n253_os7u": { + "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/4wmd3o8g/otx0h.info b/fk101/wb_new_ui/.objs/metas/4wmd3o8g/otx0h.info new file mode 100644 index 00000000..8dcf9ba5 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/4wmd3o8g/otx0h.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n369_gj65": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info b/fk101/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info index a25ebe79..1629cbbb 100644 --- a/fk101/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info +++ b/fk101/wb_new_ui/.objs/metas/96mvx2ml/10kys6.info @@ -6,6 +6,9 @@ "n153_udgc": { "hidden": true }, + "n152_udgc": { + "hidden": true + }, "n149_udgc": { "hidden": true, "collapsed": true diff --git a/fk101/wb_new_ui/.objs/metas/boq0ohep/otx0h.info b/fk101/wb_new_ui/.objs/metas/boq0ohep/otx0h.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/boq0ohep/otx0h.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info b/fk101/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info index eb6c1fea..36378fe3 100644 --- a/fk101/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info +++ b/fk101/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info @@ -1,18 +1,9 @@ { "objectStatus": { - "n146_piwz": { + "n163_ozsy": { "collapsed": true }, - "n122_c4r1": { - "collapsed": true - }, - "n154_j47e": { - "collapsed": true - }, - "n136_c4r1": { - "collapsed": true - }, - "n15_mw5l": { + "n157_ug6y": { "collapsed": true }, "n74_nip5": { diff --git a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info index cedc4a8e..33321412 100644 --- a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info +++ b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp38j.info @@ -1,22 +1,11 @@ { "objectStatus": { - "n172_r282": { + "n322_gz8w": { "collapsed": true }, - "n70_m25s": { - "collapsed": true - }, - "n133_r282": { - "collapsed": true - }, - "n294_fnpw": { - "collapsed": true - }, - "n5_mw5l": { - "collapsed": true - }, - "n231_ey1o": { + "n317_ffp3": { "collapsed": true } - } + }, + "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/eyxz924g/ffp34e.info b/fk101/wb_new_ui/.objs/metas/eyxz924g/ffp34e.info index 26dcc464..a971bccd 100644 --- a/fk101/wb_new_ui/.objs/metas/eyxz924g/ffp34e.info +++ b/fk101/wb_new_ui/.objs/metas/eyxz924g/ffp34e.info @@ -1,15 +1,12 @@ { "objectStatus": { - "n302_hxjc": { - "collapsed": true - }, "n172_r282": { "collapsed": true }, "n70_m25s": { "collapsed": true }, - "n133_r282": { + "n302_hxjc": { "collapsed": true }, "n294_fnpw": { diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/gjxx7ia7.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/gjxx7ia7.info new file mode 100644 index 00000000..e5bfea59 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/gjxx7ia7.info @@ -0,0 +1,3 @@ +{ + "adaptiveTest": true +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info index e79cf842..e42104f4 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info @@ -3,5 +3,7 @@ "n6_y6xi": { "hidden": true } - } + }, + "adaptiveTest": true, + "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info index 232fd206..b818230a 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info @@ -6,5 +6,6 @@ "n16_rpaz": { "hidden": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info index a25ae142..bf2f641c 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info @@ -1,15 +1,11 @@ { "objectStatus": { "n147_10tp2": { - "hidden": true - }, - "n165_umid": { + "hidden": true, "collapsed": true }, "n145_10tp2": { - "hidden": true - }, - "n156_10tp2": { + "hidden": true, "collapsed": true } } diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info index 6d865fbb..cf05517a 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info @@ -1,9 +1,11 @@ { "objectStatus": { + "n108_vyn3": { + "hidden": true + }, "n104_vyn3": { "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info index 77afce4a..40b2c3f8 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info @@ -1,12 +1,31 @@ { "objectStatus": { - "n131_kwi0": { + "n199_t7dq": { + "hidden": true + }, + "n156_g21o": { "collapsed": true }, + "n183_s2gd": { + "locked": true + }, "n198_r0qx": { - "hidden": true + "hidden": true, + "collapsed": true + }, + "n147_r4s4": { + "collapsed": true + }, + "n131_kwi0": { + "hidden": true, + "collapsed": true + }, + "n153_g21o": { + "collapsed": true + }, + "n146_r4s4": { + "collapsed": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info b/fk101/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info index 52fe77fb..08b42843 100644 --- a/fk101/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info +++ b/fk101/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info @@ -1,19 +1,7 @@ { "objectStatus": { - "n46_6cpq": { - "collapsed": true - }, "n82_e8zl": { "hidden": true - }, - "n9_mw5l": { - "collapsed": true - }, - "n112_i9b1": { - "collapsed": true - }, - "n162_mpnc": { - "collapsed": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info b/fk101/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info index 20616fc8..6da54cfb 100644 --- a/fk101/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info +++ b/fk101/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info @@ -1,10 +1,28 @@ { "objectStatus": { - "n46_g92u": { + "n172_r282": { + "collapsed": true + }, + "n70_m25s": { + "collapsed": true + }, + "n133_r282": { + "collapsed": true + }, + "n294_fnpw": { + "collapsed": true + }, + "n5_mw5l": { "collapsed": true }, "n123_r282": { "collapsed": true + }, + "n231_ey1o": { + "collapsed": true + }, + "n46_g92u": { + "collapsed": true } } } \ 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 b2d1e285..2ebdd4bd 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 283, + "libview.firstColumnWidth": 356, "expanded_nodes": [ "27vd145b", "/", @@ -21,6 +21,76 @@ "ui://3z9lj55vjokmei", "ui://27vd145bofsx1e", "ui://27vd145bep9w7ik3", + "ui://m7iejg46tqi8hwa", + "ui://m7iejg46taski05", + "ui://m7iejg46pfvz7i98", + "ui://m7iejg46r4s4hs5", + "ui://m7iejg46i9oq7i3m", + "ui://m7iejg46kwi0hkb", + "ui://m7iejg46mpllhv2", + "ui://m7iejg46mpllhv5", + "ui://m7iejg46kwi0hkg", + "ui://m7iejg46mkdvhdu", + "ui://m7iejg46r4s4hry", + "ui://m7iejg46mpllhv7", + "ui://m7iejg46k46xhuk", + "ui://m7iejg46kwi0hjx", + "ui://m7iejg46jj657i2h", + "ui://2d9xdj6z75efcz", + "ui://2d9xdj6z97mlcin", + "ui://bx1t0boos9wxc", + "ui://boq0ohepotx0h", + "ui://d1qrzqprc4r116", + "ui://z3z0ysurygxgd", + "ui://qubt49z8c4r116", + "ui://qubt49z8mpncc1i", + "ui://fnuxqefli1r6j", + "ui://27vd145br0qx7i5y", + "ui://boq0ohepvlhjcz", + "ui://boq0ohepvlhjcx", + "ui://27vd145bamco5z", + "ui://niy3ldiwl9mn1l", + "ui://ikt2n9thoiw80", + "ui://1hl55dqmq9sx0", + "ui://1hl55dqmp6vl1d", + "ui://du0ovweooiw80", + "ui://iwpp66naoiw80", + "ui://70k0xjl0oiw80", + "ui://v09du5djgq7mb", + "ui://y8prev1ms9wxc", + "ui://b50sd5s6s9wxc", + "ui://xul2z8cts9wxc", + "ui://visk5g30gq7m4f", + "ui://s63l0suw6cpqy", + "ui://425x67nrs9wxc", + "ui://ypulwxjhl9mn1l", + "ui://oubpz2r2i1jugv", + "ui://4wmd3o8gotx0h", + "ui://4wmd3o8gvlhjdd", + "ui://eyxz924gffp34e", + "ui://dbnd189aotx0h", + "ui://v2emygzogq7md", + "ui://egnzysm7ffp38j", + "ui://kplym8mus9wxc", + "ui://d1qrzqpr6cpqy", + "ui://lv2le67toiw80", + "ui://fm39zduwoiw80", + "ui://k15boclkl9mn1l", + "ui://442j0uepygxgd", + "ui://z3z0ysurajif7d", + "ui://z3z0ysurvlhj7q", + "ui://3op8sm5eu86s1w", + "ui://egnzysm7ffp38z", + "ui://egnzysm7ffp38x", + "ui://egnzysm7ffp38u", + "ui://egnzysm7ffp38q", + "ui://egnzysm7ffp38n", + "ui://egnzysm7ffp38m", + "ui://egnzysm7ffp38l", + "ui://egnzysm7ffp38k", + "ui://4wmd3o8gvlhjdb", + "ui://m7iejg46kwi0hl8", + "ui://m7iejg46pfvz7i99", "ui://27vd145bcvc87i5t", "ui://3z9lj55vjokmev", "ui://3z9lj55vjokm9z", @@ -99,11 +169,36 @@ "ui://m7iejg46l679hwn", "ui://m7iejg46kwi0hm9", "ui://m7iejg46kwi0hk0", + "ui://27vd145beeqmch0", "ui://m7iejg46kwi0hm3", "ui://m7iejg46qlxihsm", "ui://m7iejg46kwi0hm5", "ui://m7iejg46l679hws", "ui://m7iejg46kwi0hls", + "ui://m7iejg46gjxx7ia7", + "ui://m7iejg46kwi0hk1", + "ui://m7iejg46kwi0hk4", + "ui://m7iejg46mpllhuq", + "ui://m7iejg46lf2qhju", + "ui://m7iejg46kwi0hma", + "ui://m7iejg46e5q7hu2", + "ui://m7iejg46r0qx7i6v", + "ui://m7iejg46jgh8hwv", + "ui://m7iejg46hsbhhjn", + "ui://m7iejg46gojuhh5", + "ui://m7iejg46t1hqhxw", + "ui://m7iejg46efnuhdk", + "ui://m7iejg46e5q7hu9", + "ui://m7iejg46mpllhut", + "ui://27vd145bdo2f1z", + "ui://m7iejg46cioehpy", + "ui://27vd145beeqmcgp", + "ui://27vd145bh1uu3f", + "ui://27vd145bh1uu3i", + "ui://m7iejg46ivn3hxh", + "ui://m7iejg46gjxx7ia9", + "ui://m7iejg46gjxx7iac", + "ui://m7iejg46gjxx7iaf", "ui://m7iejg46kwi0hmc", "ui://m7iejg46n5sxha2", "ui://35sf1c1fr05e4l", @@ -154,41 +249,32 @@ "ui://3n2top74kpmglv", "ui://3n2top74kpmgm1", "ui://96mvx2ml10kys6", + "ui://96mvx2mlvlhjcss", "ui://96mvx2mlocbrsh" ], "packageGroup.mine": [ "2d9xdj6z" ], - "test.device": "iPhone XR", + "test.device": "iPhone 8 Plus", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46kwi0hls", + "doc.activeDoc": "ui://96mvx2ml10kys6", "libview.twoColumn": false, "libview.expandedNodes": [ - "3z9lj55v", + "442j0uep", "/", - "3z9lj55v", - "/Main_style_2/", - "3z9lj55v", + "442j0uep", "/component/", - "3z9lj55v", - "/component/clearing/", - "3z9lj55v", - "/component/clearing/clearing1/", - "3z9lj55v", - "/component/clearing/clearing2/", - "3z9lj55v", - "/component/clearing/room/", - "3z9lj55v", - "/images/", - "m7iejg46", + "442j0uep", + "/component/EPRHZMui/", + "442j0uep", + "/component/create_room/", + "1hl55dqm", "/", - "m7iejg46", - "/images/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/Mui/" + "z3z0ysur", + "/", + "z3z0ysur", + "/component/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/MessageBox1.xml b/fk101/wb_new_ui/assets/Common/MessageBox1.xml index 8e1ea9be..936e75bd 100644 --- a/fk101/wb_new_ui/assets/Common/MessageBox1.xml +++ b/fk101/wb_new_ui/assets/Common/MessageBox1.xml @@ -1,17 +1,17 @@ - + - - + +