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 12f720ce..0a750dc8 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ @@ -63,4 +64,15 @@ "libview.currentGroup": "", "gridSize": 30, "gridColor": 80 +======= + "doc.openedDocs": [], + "libview.iconScale": 0, + "libview.currentGroup": "", + "libview.expandedNodes": [ + "kof2x9ia", + "/" + ], + "libview.firstColumnWidth": 356, + "libview.twoColumn": false +>>>>>>> 0b0313d1f7fe0999ceff3986fd87f1d7c882b902 } \ No newline at end of file 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 @@ - + - - + +