diff --git a/fk101/lua_probject/base_project/Game/View/ResultView.lua b/fk101/lua_probject/base_project/Game/View/ResultView.lua index d4911ad5..9a81c37f 100644 --- a/fk101/lua_probject/base_project/Game/View/ResultView.lua +++ b/fk101/lua_probject/base_project/Game/View/ResultView.lua @@ -119,16 +119,16 @@ function M:init(url, isBigFull) local big_result = self._view:GetChild('big_result') if big_result ~= nil then - if isBigFull then - - else - self._full = true - big_result:AddRelation(self._view, RelationType.Size) - big_result.width = self._view.width - big_result.height = self._view.height - end - - + if isBigFull then + + else + self._full = true + big_result:AddRelation(self._view, RelationType.Size) + big_result.width = self._view.width + big_result.height = self._view.height + end + + local btn_share_copy = big_result:GetChild('btn_share_copy') if btn_share_copy then btn_share_copy.onClick:Set( @@ -139,7 +139,6 @@ function M:init(url, isBigFull) ) end - local btn_share_link = big_result:GetChild('btn_share_link') if btn_share_link then btn_share_link.onClick:Set( @@ -150,7 +149,6 @@ function M:init(url, isBigFull) ) end - local btn_share_photo = big_result:GetChild('btn_share_photo') if btn_share_photo then btn_share_photo.onClick:Set( @@ -170,29 +168,34 @@ function M:init(url, isBigFull) ) end - local btn_result_confirm = big_result:GetChild('btn_result_confirm') - btn_result_confirm.onClick:Set( - function() - self:Destroy() - ViewManager.ChangeView(ViewManager.View_Lobby) - end - ) + if btn_result_confirm then + btn_result_confirm.onClick:Set( + function() + self:Destroy() + ViewManager.ChangeView(ViewManager.View_Lobby) + end + ) + end local btn_close = big_result:GetChild('btn_close') - btn_close.onClick:Set( - function() - self:Destroy() - ViewManager.ChangeView(ViewManager.View_Lobby) - end - ) + if btn_close then + btn_close.onClick:Set( + function() + self:Destroy() + ViewManager.ChangeView(ViewManager.View_Lobby) + end + ) + end local btn_close_share = big_result:GetChild('btn_close_share') - btn_close_share.onClick:Set( - function() - big_result:GetController('share').selectedIndex = 0 - end - ) + if btn_close_share then + btn_close_share.onClick:Set( + function() + big_result:GetController('share').selectedIndex = 0 + end + ) + end end end 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/base/ui/Main_RunBeard_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0.png index d92b11a5..00d20ccd 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png index dcc14fc4..c756b4d9 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png index 4a10ab00..90b24e6b 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_fui.bytes index c920b14f..b722b8fe 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_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/c7j2rnvq/tpf06k.info b/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06k.info new file mode 100644 index 00000000..eec550b9 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06k.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n6_nlz3": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06l.info b/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06l.info new file mode 100644 index 00000000..43f2df56 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06l.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n0_lwcl": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06t.info b/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06t.info new file mode 100644 index 00000000..eec550b9 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/c7j2rnvq/tpf06t.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n6_nlz3": { + "hidden": 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 bf2f641c..a1216701 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info @@ -1,12 +1,10 @@ { "objectStatus": { "n147_10tp2": { - "hidden": true, - "collapsed": true + "hidden": true }, "n145_10tp2": { - "hidden": true, - "collapsed": true + "hidden": true } } } \ 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 40b2c3f8..9a781832 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info @@ -3,9 +3,6 @@ "n199_t7dq": { "hidden": true }, - "n156_g21o": { - "collapsed": true - }, "n183_s2gd": { "locked": true }, diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 0a750dc8..0e85ddd0 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,4 +1,7 @@ { +<<<<<<< HEAD + "libview.firstColumnWidth": 356, +======= <<<<<<< HEAD "libview.firstColumnWidth": 413, "libview.iconScale": 0, @@ -66,13 +69,59 @@ "gridColor": 80 ======= "doc.openedDocs": [], +>>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed "libview.iconScale": 0, - "libview.currentGroup": "", - "libview.expandedNodes": [ - "kof2x9ia", - "/" + "doc.openedDocs": [ + "ui://c7j2rnvqtpf06k", + "ui://c7j2rnvqtpf06t", + "ui://m7iejg46mpllhv2", + "ui://m7iejg46kwi0hkl", + "ui://m7iejg46mpllhv5", + "ui://27vd145blwcl28", + "ui://m7iejg46mkdvhdu", + "ui://c7j2rnvqtpf06q", + "ui://c7j2rnvqtpf02w", + "ui://c7j2rnvqtpf06p", + "ui://c7j2rnvqtpf06l" ], + "auxline1": true, + "canvasColor": 10066329, + "auxline2": true, + "doc.activeDoc": "ui://c7j2rnvqtpf06k", + "libview.twoColumn": false, + "libview.expandedNodes": [ + "c7j2rnvq", + "/", + "c7j2rnvq", + "/component/", + "c7j2rnvq", + "/component/ENJCSMui/", + "c7j2rnvq", + "/component/qishou_hu/", + "c7j2rnvq", + "/component/qishou_hu/images/", + "c7j2rnvq", + "/component/result/", + "c7j2rnvq", + "/component/result/component/", + "m7iejg46", + "/", + "m7iejg46", + "/mgr/", + "m7iejg46", + "/mgr/component/", + "m7iejg46", + "/mgr/component/play_set/" + ], +<<<<<<< HEAD + "snapToGrid": true, + "backgroundColor": 6710886, + "libview.currentGroup": "", + "gridSize": 30, + "gridColor": 80 +======= "libview.firstColumnWidth": 356, "libview.twoColumn": false >>>>>>> 0b0313d1f7fe0999ceff3986fd87f1d7c882b902 +>>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed } \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/Win_Frame.xml b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/Win_Frame.xml index 033050dd..a45a6381 100644 --- a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/Win_Frame.xml +++ b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/Win_Frame.xml @@ -1,26 +1,26 @@ - + - + - + - + - + - + diff --git a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/buttons/Btn_Yellow_long.xml b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/buttons/Btn_Yellow_long.xml index 9d29ba50..a3cc5e00 100644 --- a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/buttons/Btn_Yellow_long.xml +++ b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/buttons/Btn_Yellow_long.xml @@ -1,8 +1,8 @@ - + - - + + -