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 @@ - - + + - - - - + + + + + + + + + + + + + + + + + +