From 0c2d4edad51b2349b8b574a8e7847aff3a1c0683 Mon Sep 17 00:00:00 2001 From: mxj <2116869896@qq.com> Date: Thu, 21 May 2026 20:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=B8=B8=E6=88=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=81=8A=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/ChatView.lua | 2 +- .../main/majiang/MJSettingViewNew.lua | 2 +- wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info | 6 +- wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info | 3 - wb_new_ui/.objs/metas/v0j9abjy/gq7mg3.info | 1 + wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info | 31 +++- wb_new_ui/.objs/workspace.json | 59 ++----- wb_new_ui/assets/Chat/Main.xml | 54 +++--- .../assets/Chat/component/Btn_YYItem.xml | 16 +- .../assets/Chat/component/Btn_biaoqing.xml | 7 +- .../assets/Chat/images/chatMui/Frame 1351.png | Bin 0 -> 18992 bytes .../assets/Chat/images/chatMui/Frame 1353.png | Bin 0 -> 75355 bytes .../Chat/images/chatMui/Frame 13541.png | Bin 0 -> 96569 bytes .../Chat/images/chatMui/Frame 135611.png | Bin 0 -> 7329 bytes .../Chat/images/chatMui/Frame 1356111.png | Bin 0 -> 21861 bytes .../Chat/images/chatMui/Frame 135711.png | Bin 0 -> 22014 bytes .../Chat/images/chatMui/Frame 1357111.png | Bin 0 -> 6683 bytes .../assets/Chat/images/chatMui/Mask group.png | Bin 0 -> 162381 bytes .../Chat/images/chatMui/Rectangle 3000.png | Bin 0 -> 5394 bytes .../Chat/images/chatMui/Rectangle 3001.png | Bin 0 -> 2202 bytes .../Chat/images/chatMui/Rectangle 3003.png | Bin 0 -> 18354 bytes .../Chat/images/chatMui/Rectangle 30041.png | Bin 0 -> 1039 bytes wb_new_ui/assets/Chat/package.xml | 12 ++ wb_new_ui/assets/Main_Majiang/Main_2.xml | 138 ++++++++-------- .../Main_Majiang/Main_style_2/Main_2_s2.xml | 12 +- .../Main_Majiang/buttons/Btn_Yellow_New.xml | 6 +- .../assets/Main_Majiang/buttons/Btn_close.xml | 4 +- .../Main_Majiang/buttons/Btn_set_NewM.xml | 10 ++ .../component/setting_new/SettingWindow2.xml | 156 +++++++++++------- .../component/setting_new/btn_select_card.xml | 24 ++- .../setting_new/component/Slider1_grip2.xml | 6 +- .../setting_new/component/Slider2.xml | 13 +- .../Main_Majiang/images/MMaJiangMui/3.png | Bin 0 -> 5409 bytes .../images/MMaJiangMui/Frame 1339.png | Bin 0 -> 27450 bytes .../images/MMaJiangMui/Frame 1350.png | Bin 0 -> 15968 bytes .../images/MMaJiangMui/Frame 1351.png | Bin 0 -> 18992 bytes .../images/MMaJiangMui/Frame 1353.png | Bin 0 -> 75355 bytes .../images/MMaJiangMui/Frame 1354.png | Bin 0 -> 97022 bytes .../images/MMaJiangMui/Frame 13541.png | Bin 0 -> 96569 bytes .../images/MMaJiangMui/Frame 1356.png | Bin 0 -> 9063 bytes .../images/MMaJiangMui/Frame 13561.png | Bin 0 -> 23185 bytes .../images/MMaJiangMui/Frame 135611.png | Bin 0 -> 7329 bytes .../images/MMaJiangMui/Frame 1356111.png | Bin 0 -> 21861 bytes .../images/MMaJiangMui/Frame 1357.png | Bin 0 -> 23723 bytes .../images/MMaJiangMui/Frame 13571.png | Bin 0 -> 9799 bytes .../images/MMaJiangMui/Frame 135711.png | Bin 0 -> 22014 bytes .../images/MMaJiangMui/Frame 1357111.png | Bin 0 -> 6683 bytes .../images/MMaJiangMui/Frame 1358.png | Bin 0 -> 7366 bytes .../images/MMaJiangMui/Frame 13581.png | Bin 0 -> 7872 bytes .../images/MMaJiangMui/Frame 13591.png | Bin 0 -> 8118 bytes .../images/MMaJiangMui/Frame 1360.png | Bin 0 -> 6096 bytes .../images/MMaJiangMui/Frame 13601.png | Bin 0 -> 7613 bytes .../images/MMaJiangMui/Frame 1361.png | Bin 0 -> 7792 bytes .../images/MMaJiangMui/Mask group.png | Bin 0 -> 162381 bytes .../images/MMaJiangMui/Mask group1.png | Bin 0 -> 58915 bytes .../images/MMaJiangMui/Rectangle 2934.png | Bin 0 -> 3192 bytes .../images/MMaJiangMui/Rectangle 3000.png | Bin 0 -> 5394 bytes .../images/MMaJiangMui/Rectangle 3001.png | Bin 0 -> 2202 bytes .../images/MMaJiangMui/Rectangle 3003.png | Bin 0 -> 18354 bytes .../images/MMaJiangMui/Rectangle 3004.png | Bin 0 -> 2238 bytes .../images/MMaJiangMui/Rectangle 30041.png | Bin 0 -> 1039 bytes wb_new_ui/assets/Main_Majiang/package.xml | 30 ++++ .../Assets/ART/base/chat/ui/Chat_atlas0.png | Bin 659962 -> 1095606 bytes .../Assets/ART/base/chat/ui/Chat_fui.bytes | Bin 32443 -> 33671 bytes .../main_majiang/ui/Main_Majiang_atlas0.png | Bin 1575596 -> 2588683 bytes .../main_majiang/ui/Main_Majiang_atlas0_1.png | Bin 3529159 -> 3329495 bytes .../main_majiang/ui/Main_Majiang_atlas0_2.png | Bin 1056421 -> 1035899 bytes .../main_majiang/ui/Main_Majiang_atlas0_3.png | Bin 493641 -> 512385 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 238583 -> 241426 bytes .../main_majiang/ui/main_majiang_atlas0_4.png | Bin 983713 -> 374179 bytes 70 files changed, 353 insertions(+), 239 deletions(-) create mode 100644 wb_new_ui/.objs/metas/v0j9abjy/gq7mg3.info create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Frame 1351.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Frame 1353.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Frame 13541.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Frame 135611.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Frame 1356111.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Frame 135711.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Frame 1357111.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Mask group.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Rectangle 3000.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Rectangle 3001.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Rectangle 3003.png create mode 100644 wb_new_ui/assets/Chat/images/chatMui/Rectangle 30041.png create mode 100644 wb_new_ui/assets/Main_Majiang/buttons/Btn_set_NewM.xml create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/3.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1339.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1350.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1351.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1353.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1354.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 13541.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1356.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 13561.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 135611.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1356111.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1357.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 13571.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 135711.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1357111.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1358.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 13581.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 13591.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1360.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 13601.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Frame 1361.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Mask group.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Mask group1.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Rectangle 2934.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Rectangle 3000.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Rectangle 3001.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Rectangle 3003.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Rectangle 3004.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/MMaJiangMui/Rectangle 30041.png diff --git a/lua_probject/base_project/Game/View/ChatView.lua b/lua_probject/base_project/Game/View/ChatView.lua index 8b38f2da..7bfaa898 100644 --- a/lua_probject/base_project/Game/View/ChatView.lua +++ b/lua_probject/base_project/Game/View/ChatView.lua @@ -89,7 +89,7 @@ end function M:Show() getmetatable(M).__index.Show(self) self._view:Center() - self._view.x = self._view.x + (GRoot.inst.width - self._view.width -300)/2 + --self._view.x = self._view.x + (GRoot.inst.width - self._view.width -300)/2 end return M diff --git a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua index d70e1d8e..6a6205bf 100644 --- a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua +++ b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua @@ -22,7 +22,7 @@ function MJSettingViewNew.new(blur_view, show_dialect) self._btn_dismiss_room_enable = true self._full = true self._full_offset = false - self._anim_pop = 2 + self._anim_pop = 0 self._close_zone = true self._show_dialect = show_dialect self:init("ui://Main_Majiang/SettingWindow2") diff --git a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info index 40ec1e04..f1f10a74 100644 --- a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info +++ b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info @@ -1,10 +1,14 @@ { "objectStatus": { + "n76_syh3": { + "hidden": true + }, "n58_h1uu": { "hidden": true }, "n70_zgd9": { - "hidden": true + "hidden": true, + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info index 47f2c52e..0aa4358b 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -6,9 +6,6 @@ "n108_go7q": { "hidden": true }, - "n59_v38k": { - "collapsed": true - }, "n85_l2u4": { "collapsed": true }, diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7mg3.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7mg3.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7mg3.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info index 6a66164c..0af72f2d 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info @@ -1,19 +1,40 @@ { "objectStatus": { - "n50_hkbm": { - "hidden": true - }, "n26": { "hidden": true }, - "n110_ni5n": { + "n103_ni5n": { "hidden": true }, - "n30_lwcl": { + "n106_ni5n": { + "hidden": true + }, + "n84_hxz4": { + "collapsed": true + }, + "n107_ni5n": { "hidden": true }, "n100_piv9": { "hidden": true + }, + "n55_n6fs": { + "collapsed": true + }, + "n30_lwcl": { + "hidden": true + }, + "n114_ttbr": { + "collapsed": true + }, + "n35_h4ge": { + "hidden": true + }, + "n50_hkbm": { + "hidden": true + }, + "n93_n6cm": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 8d6511b5..7b8429ae 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,39 +2,26 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46l679hws", - "ui://m7iejg46kwi0hm5", - "ui://m7iejg46jgh8hwv", - "ui://m7iejg46tqi8hwa", - "ui://v0j9abjygq7med", - "ui://v0j9abjygq7mcu", - "ui://v0j9abjygq7mdj", - "ui://m7iejg46ilon7ia2", - "ui://m7iejg46l7wn7i83", + "ui://v0j9abjygq7mgo", "ui://l0ds4ys6h1uu26", + "ui://v0j9abjygq7ms2", + "ui://v0j9abjygq7m7m", + "ui://v0j9abjygq7mgx", "ui://v0j9abjygq7m8f", - "ui://m7iejg46kwi0hkb", - "ui://h30s8vmela4eb", - "ui://27vd145bl8gg53", - "ui://27vd145bj0h759", - "ui://27vd145bl8gg54", - "ui://27vd145bmljn7ijt", - "ui://27vd145byffnj6", - "ui://v0j9abjygq7m8k", - "ui://v0j9abjygq7m8h", - "ui://v0j9abjygq7m8l", - "ui://v0j9abjyrdg6t9", - "ui://v0j9abjygq7m5z", - "ui://v0j9abjygq7m8r", - "ui://v0j9abjygq7m8u", - "ui://v0j9abjygq7mgo" + "ui://v0j9abjygq7m8u" ], "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://h30s8vmela4eb", + "doc.activeDoc": "ui://v0j9abjygq7m8f", "libview.twoColumn": false, "libview.expandedNodes": [ + "l0ds4ys6", + "/", + "l0ds4ys6", + "/images/", + "l0ds4ys6", + "/images/chatMui/", "27vd145b", "/", "27vd145b", @@ -43,28 +30,16 @@ "/images/", "27vd145b", "/images/COMMui/", - "hrxsdiix", - "/", - "hrxsdiix", - "/component/", - "hrxsdiix", - "/component/hu_effect/", - "hrxsdiix", - "/component/hu_effect/image/", - "h30s8vme", - "/", - "h30s8vme", - "/component/", - "h30s8vme", - "/component/create_room/", "v0j9abjy", "/", "v0j9abjy", - "/Main_new/", + "/buttons/", "v0j9abjy", - "/Main_new/Main/", + "/image/", "v0j9abjy", - "/Main_style_2/", + "/images/", + "v0j9abjy", + "/images/MMaJiangMui/", "m7iejg46", "/", "m7iejg46", diff --git a/wb_new_ui/assets/Chat/Main.xml b/wb_new_ui/assets/Chat/Main.xml index 47350074..604cedb4 100644 --- a/wb_new_ui/assets/Chat/Main.xml +++ b/wb_new_ui/assets/Chat/Main.xml @@ -1,19 +1,33 @@ - - + + - - - - + + + + + + + + + + + + + + + + + +