From 211a7d37ddfac95d930db122efae23e68e8d06e8 Mon Sep 17 00:00:00 2001 From: mxj <2116869896@qq.com> Date: Tue, 12 May 2026 21:09:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=B8=9F=E7=89=8C=E5=88=86?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=AE=BE=E7=BD=AE=E6=88=90=E5=91=98=E5=85=B6?= =?UTF-8?q?=E4=BB=96ui=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewGroup/MngView/GroupMngGameListView.lua | 6 +- .../extend/majiang/hechi/EXClearingView.lua | 25 +- .../extend/poker/runfast/EXGameInfo.lua | 2 +- wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info | 5 +- wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info | 9 +- wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info | 1 + wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info | 37 +++ wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info | 10 +- wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info | 5 +- wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info | 14 ++ wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info | 3 + wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info | 3 + wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info | 2 +- wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info | 3 - wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info | 3 + wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info | 11 +- wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info | 32 ++- wb_new_ui/.objs/workspace.json | 92 ++----- .../assets/Common/buttons/Btn_Common.xml | 12 +- wb_new_ui/assets/Lobby/SettingWindow1.xml | 38 +-- .../Lobby/component/user_info/UserInfo.xml | 46 ++-- .../clearing/clearing1/clearing_1_item.xml | 10 +- .../clearing/clearing1/clearing_fz_3.xml | 2 +- wb_new_ui/assets/NewGroup/Main_GroupInfo.xml | 10 +- .../assets/NewGroup/NGMui/Frame 1121514.png | Bin 0 -> 308005 bytes .../assets/NewGroup/NGMui/Frame 112254.png | Bin 0 -> 310276 bytes .../assets/NewGroup/NGMui/Frame 121514.png | Bin 0 -> 310275 bytes .../assets/NewGroup/NGMui/Frame 12154.png | Bin 0 -> 307916 bytes .../assets/NewGroup/NGMui/Frame 12181.png | Bin 0 -> 21380 bytes .../assets/NewGroup/NGMui/Frame 12512.png | Bin 0 -> 114539 bytes .../assets/NewGroup/NGMui/Frame 12771.png | Bin 0 -> 23699 bytes .../assets/NewGroup/NGMui/Frame 127711.png | Bin 0 -> 23420 bytes .../assets/NewGroup/NGMui/Frame 1279.png | Bin 0 -> 23293 bytes .../assets/NewGroup/NGMui/Frame 1289.png | Bin 0 -> 16729 bytes .../assets/NewGroup/NGMui/Frame 1290.png | Bin 0 -> 16436 bytes .../assets/NewGroup/NGMui/Frame 1308.png | Bin 0 -> 58793 bytes wb_new_ui/assets/NewGroup/NGMui/Line 23.png | Bin 0 -> 680 bytes .../NewGroup/NGMui/Rectangle 121908.png | Bin 0 -> 3241 bytes .../assets/NewGroup/NGMui/Rectangle 2924.png | Bin 0 -> 8235 bytes .../assets/NewGroup/NGMui/Rectangle 2925.png | Bin 0 -> 27197 bytes wb_new_ui/assets/NewGroup/Win_AddFriend.xml | 91 +++---- wb_new_ui/assets/NewGroup/Win_Banklog.xml | 41 ++-- .../assets/NewGroup/Win_GroupSetting.xml | 46 ++-- .../assets/NewGroup/Win_ManagerView_old.xml | 61 +++-- wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml | 76 +++--- wb_new_ui/assets/NewGroup/Win_Takelog.xml | 69 +++--- .../NewGroup/component/Btn/Btn_back1.xml | 4 +- .../NewGroup/component/nav/Btn_menu_h_old.xml | 33 +-- .../NewGroup/mgr/View_GroupGameList.xml | 19 +- .../NewGroup/mgr/View_GroupMemberList1.xml | 230 +++++++++--------- .../NewGroup/mgr/View_GroupPartnerList1.xml | 75 +++--- .../mgr/View_GroupPartnerStatAlone.xml | 65 ++--- .../assets/NewGroup/mgr/btn_create_game.xml | 6 +- .../mgr/component/fagpack/item_take.xml | 12 +- .../NewGroup/mgr/component/game/game_info.xml | 2 +- .../mgr/component/game/item_mng_game.xml | 73 +++--- .../mgr/component/member/item_member1.xml | 114 ++++----- .../member/partner/item_mng_partner1.xml | 44 ++-- .../member/partner/item_partner_stat.xml | 54 ++-- wb_new_ui/assets/NewGroup/package.xml | 18 +- .../ART/base/common/ui/Common_fui.bytes | Bin 274979 -> 274979 bytes .../Assets/ART/base/lobby/ui/Lobby_fui.bytes | Bin 62872 -> 62872 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 237403 -> 237393 bytes .../ART/base/newgroup/ui/NewGroup_atlas0.png | Bin 2661359 -> 2793390 bytes .../base/newgroup/ui/NewGroup_atlas0_1.png | Bin 574520 -> 348521 bytes .../base/newgroup/ui/NewGroup_atlas0_2.png | Bin 3133023 -> 2969619 bytes .../base/newgroup/ui/NewGroup_atlas0_3.png | Bin 1497803 -> 1559140 bytes .../base/newgroup/ui/NewGroup_atlas0_4.png | Bin 1881492 -> 1989082 bytes .../newgroup/ui/NewGroup_atlas_wqjdp7iwe.png | Bin 0 -> 307916 bytes .../ui/NewGroup_atlas_wqjdp7iwe.png.meta | 92 +++++++ .../newgroup/ui/NewGroup_atlas_wqjdp7iwm.png | Bin 0 -> 310275 bytes .../ui/NewGroup_atlas_wqjdp7iwm.png.meta | 92 +++++++ .../newgroup/ui/NewGroup_atlas_wqjdp7iwr.png | Bin 0 -> 308005 bytes .../ui/NewGroup_atlas_wqjdp7iwr.png.meta | 92 +++++++ .../ART/base/newgroup/ui/NewGroup_fui.bytes | Bin 353928 -> 356789 bytes .../ProjectSettings/GraphicsSettings.asset | 1 + 76 files changed, 1089 insertions(+), 702 deletions(-) create mode 100644 wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info create mode 100644 wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 1121514.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 112254.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 121514.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 12154.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 12181.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 12512.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 12771.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 127711.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 1279.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 1289.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 1290.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Frame 1308.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Line 23.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Rectangle 121908.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Rectangle 2924.png create mode 100644 wb_new_ui/assets/NewGroup/NGMui/Rectangle 2925.png create mode 100644 wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png create mode 100644 wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png.meta create mode 100644 wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png create mode 100644 wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png.meta create mode 100644 wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png create mode 100644 wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png.meta diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua index ea896c9f..b4493b41 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua @@ -95,9 +95,9 @@ function M:OnRenderItem(index, obj) -- end -- end - hpStr = "[color=#08a805]积分设置:[/color]" .. "[color=#2365bb]" .. str .. "[/color]" + hpStr = "[color=#19C42C]积分设置:[/color]" .. "[color=#A47B42]" .. str .. "[/color]" else - hpStr = "[color=#08a805]积分设置:[/color]" .. "积分关闭" + hpStr = "[color=#19C42C]积分设置:[/color]" .. "积分关闭" end --obj:GetChild("tex_fag_info").text = "积分关闭" local gameStr @@ -115,7 +115,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=#19C42C]玩法说明:[/color]" .. "[color=#A47B42]" .. gameStr .. "[/color]" end obj:GetChild("com_gameinfo"):GetChild("tex_room_info").text = hpStr .. "\n" .. gameStr diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua index 09a54ceb..4d76f4b5 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua @@ -238,7 +238,7 @@ function M:FillItemData(room, data, item, active_player, niao) local fz_card = p.fz_list local fz_card_list = item:GetChild("fz_card_list") - fz_card_list.width = 157 * #fz_card * 1.3 + fz_card_list.width = 163 * #fz_card * 1.3 fz_card_list:RemoveChildrenToPool() for i=1,#fz_card do @@ -253,7 +253,7 @@ function M:FillItemData(room, data, item, active_player, niao) local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") for j = 1,3 do local card = item:GetChild("card_" .. j) - card.icon = "ui://Main_Majiang/" .. self:GetPrefix().."202_"..fz_card[i].opcard[j] + card.icon = "ui://Main_Majiang/202_"..fz_card[i].opcard[j] end elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") @@ -313,6 +313,21 @@ function M:FillItemData(room, data, item, active_player, niao) end end str1=str1.." +"..huadd.."分" + + -- 鸟牌总数量 + if niao and #niao > 0 then + local zhongNiaoCount = 0 + for i, v in ipairs(niao) do + -- 假设 v.score 为 1 表示中鸟（具体值请根据服务器协议确认，有时可能是 >0） + if v.score > 0 then + zhongNiaoCount = zhongNiaoCount + 1 + end + end + + if zhongNiaoCount > 0 then + str1 = str1 .. "x" .. zhongNiaoCount + end + end end else @@ -444,11 +459,9 @@ function M:FillItemData(room, data, item, active_player, niao) end end - --鸟牌总数量 - if data["zhong_jiang"] and data["zhong_jiang"] > 0 then - str1 = str1 .. "x" .. data["zhong_jiang"] - end + + item:GetChild("score3").text=str1 item:GetChild("score4").text=str1 local paixingCtr=item:GetController("detail") diff --git a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua index 973ce45f..6db62aec 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua @@ -23,7 +23,7 @@ function M:FillData(view, index) self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Label_Detail_Play") local com_editSetting = self._config:GetChild("com_editSetting") - + com_editSetting:GetController("cGps").selectedIndex = 2 local ctr_round = self._config:GetController("round") diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info b/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info index d21cd228..6216e0a6 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info @@ -1,6 +1,6 @@ { "objectStatus": { - "n74_g24i": { + "n69_hz87": { "hidden": true }, "n71_g24i": { @@ -18,6 +18,9 @@ "n60_ovii": { "hidden": true }, + "n74_g24i": { + "hidden": true + }, "n24": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info index d12f64db..5cc9d6c4 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info @@ -1,14 +1,17 @@ { "objectStatus": { + "n8_naup": { + "hidden": true, + "collapsed": true + }, "n14_naup": { "hidden": true }, "n13_naup": { "hidden": true }, - "n8_naup": { - "hidden": true, - "collapsed": true + "n28_hz87": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info b/wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info b/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info new file mode 100644 index 00000000..89943a94 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info @@ -0,0 +1,37 @@ +{ + "objectStatus": { + "n86_omkm": { + "hidden": true + }, + "n81_omkm": { + "hidden": true + }, + "n79_omkm": { + "hidden": true + }, + "n27_fk7k": { + "hidden": true + }, + "n82_omkm": { + "hidden": true + }, + "n83_omkm": { + "hidden": true + }, + "n80_omkm": { + "hidden": true + }, + "n78_omkm": { + "hidden": true + }, + "n84_omkm": { + "hidden": true + }, + "n87_omkm": { + "hidden": true + }, + "n85_omkm": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info index 4171dcf4..d0847d49 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info +++ b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info @@ -5,8 +5,16 @@ }, "n79_ovii": { "hidden": true + }, + "n97_hz87": { + "hidden": true + }, + "n98_hz87": { + "hidden": true + }, + "n95_hz87": { + "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info index bc096e5b..ca753cd8 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info @@ -1,6 +1,9 @@ { "objectStatus": { - "n197_imp5": { + "n206_hz87": { + "hidden": true + }, + "n203_hz87": { "collapsed": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info index e5ec0083..e643b110 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info +++ b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info @@ -1,4 +1,18 @@ { + "objectStatus": { + "n181_b8zx": { + "hidden": true + }, + "n220_yvb2": { + "hidden": true + }, + "n218_yvb2": { + "hidden": true + }, + "n184_b5ny": { + "hidden": true + } + }, "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info index b757f528..523438b1 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n52_hz87": { + "hidden": true + }, "n35_p747": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info index e79cf842..f73f39e5 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n13_vyn3": { + "hidden": true + }, "n6_y6xi": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info index 7c8a615b..73aee11a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info @@ -1,6 +1,6 @@ { "objectStatus": { - "n17_rpaz": { + "n24_nk4v": { "collapsed": true }, "n16_rpaz": { diff --git a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info index 690dbfcd..cd9021eb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info +++ b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info @@ -6,9 +6,6 @@ "n62_r0qx": { "hidden": true }, - "n47_sbng": { - "collapsed": true - }, "n33_p747": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info index e6f1e907..51bdb2c0 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info @@ -2,6 +2,9 @@ "objectStatus": { "n68_tqi8": { "hidden": true + }, + "n87_hz87": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info index 04eb3948..57157cfd 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info +++ b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info @@ -1,10 +1,19 @@ { "objectStatus": { - "n87_csp4": { + "n91_hz87": { + "hidden": true + }, + "n89_hz87": { "hidden": true }, "n79_ovii": { "hidden": true + }, + "n90_hz87": { + "hidden": true + }, + "n87_csp4": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info index 905f684a..f693b976 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -1,7 +1,7 @@ { "objectStatus": { - "n46_tqi8": { - "collapsed": true + "n33_rpaz": { + "hidden": true }, "n142_ufim": { "hidden": true @@ -9,34 +9,30 @@ "n91_task": { "hidden": true }, - "n51_jd7v": { + "n151_cv57": { "hidden": true }, "n86_t1hq": { "hidden": true }, - "n33_rpaz": { - "hidden": true - }, - "n112_csp4": { - "hidden": true - }, - "n86_t1hq": { - "hidden": true - }, - "n89_t1hq": { - "collapsed": true - }, - "n69_jd7v": { + "n113_csp4": { "hidden": true }, "n85_t1hq": { "hidden": true }, - "n113_csp4": { + "n35_rpaz": { + "hidden": true + }, + "n51_jd7v": { + "hidden": true + }, + "n69_jd7v": { + "hidden": true + }, + "n112_csp4": { "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index d6e54632..8b237405 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,85 +2,23 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46kwi0hma", - "ui://m7iejg46m16m7igb", - "ui://v0j9abjygq7med", - "ui://v0j9abjygq7ms2", - "ui://lkq9ne9speuq8b", - "ui://v0j9abjygq7mdj", - "ui://v0j9abjygq7m8f", - "ui://hrxsdiixla4e24", - "ui://v0j9abjygq7men", - "ui://m7iejg46imp57ih3", - "ui://27vd145bcvc87i5t", - "ui://m7iejg46ilon7ibl", - "ui://m7iejg46imp57igy", - "ui://m7iejg46ozazhxs", - "ui://m7iejg46tt6k7ika", - "ui://m7iejg46gls1hif", - "ui://m7iejg46imp57ih1", - "ui://27vd145bvg2c4", - "ui://m7iejg46csp47i42", - "ui://27vd145bst2l7ijp", - "ui://27vd145bofsx1e", - "ui://m7iejg46imp57ih5", - "ui://27vd145bmljn7ijt", - "ui://m7iejg46imp57ih4", - "ui://27vd145bcv577inp", - "ui://v0j9abjygq7m8u", - "ui://v0j9abjygq7m8r", - "ui://v0j9abjygq7m8k", - "ui://v0j9abjygq7m8i", - "ui://4skil1l6r6qo1kc", - "ui://v0j9abjygq7mcu", - "ui://v0j9abjygq7md3", + "ui://m7iejg46yvb27ik0", + "ui://m7iejg46hsbhhjn", "ui://m7iejg4610snh5j", - "ui://m7iejg46r0qx7i6v", - "ui://m7iejg4610xl7i1w", - "ui://m7iejg46ilon7ia2", - "ui://m7iejg46l7wn7i83", - "ui://m7iejg46r0qx7i6u", - "ui://27vd145bc6bub0", - "ui://m7iejg46eany7ie3", - "ui://m7iejg46eany7ie2", - "ui://m7iejg46r0qx7i70", - "ui://m7iejg46eany7ie1", - "ui://27vd145beeqmch0", - "ui://m7iejg46nk4vhwj", - "ui://m7iejg46lf2qhju", - "ui://m7iejg46lqkg7iry", - "ui://27vd145bh1uu3f", - "ui://27vd145bh1uu3i", - "ui://m7iejg46ivn3hxh", - "ui://m7iejg46h22dp7isu", - "ui://m7iejg46csp47i3z", - "ui://m7iejg46jiu8hef", - "ui://m7iejg46lnhahsf", - "ui://m7iejg46lnhahsh", - "ui://m7iejg46h46p7ish", - "ui://m7iejg46h22dp7isv", - "ui://m7iejg46hwww2f", - "ui://l0ds4ys6h1uu26", - "ui://z1qthxavlrfi0", - "ui://2d9xdj6zfn7fao", - "ui://m7iejg46ruljhmp", - "ui://2d9xdj6zlumrgj", - "ui://2d9xdj6zlwcl5m", - "ui://v0j9abjygq7mct", + "ui://m7iejg46imp57ih3", "ui://v0j9abjygq7md1", - "ui://4skil1l6piv91o5", - "ui://m7iejg46imp57igi", - "ui://m7iejg46n5sxha2", - "ui://m7iejg46ilon7ias", - "ui://m7iejg46ilon7ibc", + "ui://v0j9abjygq7med", + "ui://v0j9abjygq7mcu", "ui://27vd145bik9v7ijw", - "ui://m7iejg46gltdhc9", - "ui://27vd145bcv577io8" + "ui://v0j9abjygq7mct", + "ui://4skil1l6piv91o5", + "ui://m7iejg46t1hqhy5", + "ui://m7iejg46t1hqhxw" ], "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46tt6k7ika", + "doc.activeDoc": "ui://v0j9abjygq7med", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -130,7 +68,15 @@ "m7iejg46", "/images/main/", "m7iejg46", - "/mgr/" + "/mgr/", + "m7iejg46", + "/mgr/component/", + "m7iejg46", + "/mgr/component/game/", + "m7iejg46", + "/mgr/imgs/", + "m7iejg46", + "/mgr/imgs/member/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/buttons/Btn_Common.xml b/wb_new_ui/assets/Common/buttons/Btn_Common.xml index 9bc3a007..7a737321 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_Common.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_Common.xml @@ -1,11 +1,11 @@ - + - + - - + + - + -