diff --git a/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua b/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua index 3d7fc801..e44489b0 100644 --- a/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua +++ b/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua @@ -106,10 +106,11 @@ function M:init(url) click_item.height = self._view.height end else + self._root_view.height = GRoot.inst.height + self._root_view.width = GRoot.inst.width contentPane:AddChild(self._view) - contentPane.height = self._view.height - contentPane.width = self._view.width - contentPane:Center() + self._view:Center() + end self._contentPane = contentPane if self._put_map then diff --git a/fk101/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua index 1041c9a7..0e15b02d 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua @@ -8,7 +8,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua index aa59ffac..8e16a6cc 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua @@ -8,7 +8,7 @@ local M = CS_ClearingView function CS_ClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua index 8ac99cc5..edbd152e 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua @@ -8,7 +8,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua index 293a7f0e..b261f6f1 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua @@ -7,7 +7,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua index 7ec75dd7..1eafe747 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua @@ -8,7 +8,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua index e4bd30a6..3e92fecc 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua @@ -8,7 +8,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua index cca6f11e..0d1aa9d0 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua @@ -7,7 +7,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, { __index = ResultView }) local self = setmetatable({}, { __index = M }) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/qizhiba/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/qizhiba/EXClearingView.lua index bb3c51ba..e66181c8 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/qizhiba/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/qizhiba/EXClearingView.lua @@ -8,7 +8,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_PokeMaJiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua index 11ed6d81..371a5010 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua @@ -8,7 +8,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua index 11b25aa3..3afb31ba 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua @@ -7,7 +7,7 @@ local M = EXClearingView function EXClearingView.new(blur_view) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full = true + -- self._full = true ResultView.init(self, "ui://Main_Majiang/clearing") self._currenIndex = 0 diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua index e07482a3..e261d2be 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua @@ -7,7 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full=true + -- self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua index 1759a8ad..c04ea7bb 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua @@ -7,7 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full=true + -- self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua index ba258bce..41ab9383 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua @@ -7,7 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full=true + -- self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua index e7c8a659..bfa45021 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua @@ -7,7 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full=true + -- self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua index 7f2f66bc..f56e82f2 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua @@ -7,7 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full=true + -- self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua index 9ff97556..f2a9c2cb 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua @@ -7,7 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) - self._full=true + -- self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas0.png index ca718339..c635875d 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png index 728352a5..7fb99d2b 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes index 9b289d6c..e815dc19 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png index e9e3f5bc..0432708c 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png index b1e41936..b35e1357 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png index 130c8d22..f71057ab 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png index f2379c3f..c0bdb23f 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes index b45fca6c..f2fbea75 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes differ diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index 78256ea4..ab4b6654 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 8d790170..3bd21833 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info index 7bb28257..d055db31 100644 --- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info @@ -1,22 +1,13 @@ { "objectStatus": { - "n79_uwvl": { - "collapsed": true + "n40_ona1": { + "hidden": true }, "n36_piv9": { "hidden": true }, "n22_xtwh": { "hidden": true - }, - "n40_ona1": { - "hidden": true - }, - "n29_10imx": { - "collapsed": true - }, - "n52_ona1": { - "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 2df9670b..4353208d 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,29 +1,58 @@ { "libview.firstColumnWidth": 356, + "test.device": "Xiaomi 9", "libview.iconScale": 0, "doc.openedDocs": [ "ui://27vd145bhxjc7i4q", "ui://kplym8mus9wxa", "ui://fnuxqeflnrnod", + "ui://egnzysm7ffp36a", + "ui://27vd145bimywcd5", + "ui://egnzysm7ffp370", + "ui://v2hilfzbgq7mde", + "ui://ypulwxjhl9mn14", + "ui://yzaioi79aen81b0", + "ui://k15boclkl9mn14", + "ui://oubpz2r2ofil7k", + "ui://442j0uepygxga", + "ui://3n2top74kpmgkd", + "ui://9n9stu2eprgzee", + "ui://awernf6xbazq7n", + "ui://qpsoxvaiprgzee", + "ui://b8jloj2qg8ktcmb", + "ui://3op8sm5eu86s1f", + "ui://niy3ldiwl9mn14", + "ui://5cdldr01qaqf2c", "ui://c7j2rnvqtpf02f", "ui://y8prev1ms9wx7", + "ui://b50sd5s6s9wx7", + "ui://xul2z8cts9wx7", + "ui://visk5g30gq7m2c", + "ui://s63l0suw6cpqv", + "ui://425x67nrs9wx7", + "ui://kplym8mus9wx7", "ui://3z9lj55vjokmft", + "ui://27vd145blwcl28", + "ui://m7iejg46mpllhuq", + "ui://3z9lj55vjokmet", + "ui://3z9lj55vjokm8z", + "ui://3z9lj55vjokmdt", + "ui://3z9lj55vjokmey", "ui://4skil1l6piv91ny", "ui://niy3ldiwl9mny", "ui://niy3ldiwl9mn19", "ui://9n9stu2eprgzei", - "ui://9n9stu2eprgzef" + "ui://9n9stu2eprgzef", + "ui://27vd145bpgy941" ], "auxline1": true, "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://9n9stu2eprgzef", + "doc.activeDoc": "ui://27vd145blwcl28", "libview.twoColumn": false, - "libview.expandedNodes": [ - "27vd145b", - "/" - ], + "libview.expandedNodes": [], "snapToGrid": true, + "test.orientation": "landscape", "backgroundColor": 6710886, "libview.currentGroup": "", "gridSize": 30, diff --git a/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml b/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml index e95c10d3..c9caa17c 100644 --- a/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml +++ b/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml @@ -5,9 +5,9 @@ - - - + + + @@ -24,11 +24,11 @@ -