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 29f5b427..cca6f11e 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua @@ -64,6 +64,8 @@ function M:ShowSelectMaPai(niaoList) self:IsMapaiShow(self.maPaiList[i], true) self:SetMaPaiValue(self.maPaiList[i], niaoList[i].card) if niaoList[i].score > 0 then + self:SetMaPaiColor(self.maPaiList[i], 0) + else self:SetMaPaiColor(self.maPaiList[i], 2) end end @@ -227,7 +229,8 @@ 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 * 0.8 + fz_card_list.width = 157 * #fz_card * 1.3 + print("你好 ", fz_card_list.width) fz_card_list:RemoveChildrenToPool() for i = 1, #fz_card do if fz_card[i].type == FZType.Peng 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 c16641ab..713544c4 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/3z9lj55v/jokmdt.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info new file mode 100644 index 00000000..73dab957 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info @@ -0,0 +1,14 @@ +{ + "objectStatus": { + "n35_piv9": { + "hidden": true + }, + "n45_ona1": { + "hidden": true + }, + "n51_tki6": { + "hidden": true + } + }, + "adaptiveTest": true +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info new file mode 100644 index 00000000..a79867df --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n27_tjnv": { + "hidden": true + }, + "n28_tjnv": { + "hidden": true + }, + "n15_tjnv": { + "hidden": true + }, + "n29_tjnv": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info new file mode 100644 index 00000000..d055db31 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n40_ona1": { + "hidden": true + }, + "n36_piv9": { + "hidden": true + }, + "n22_xtwh": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info new file mode 100644 index 00000000..43591265 --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n4_hz87": { + "hidden": true + }, + "n6_ik9v": { + "hidden": 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 2bebea77..6dd7c720 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 413, + "libview.firstColumnWidth": 283, "expanded_nodes": [ "27vd145b", "/", @@ -8,19 +8,199 @@ ], "libview.iconScale": 0, "doc.openedDocs": [ +<<<<<<< HEAD "ui://l0ds4ys6h1uu26" +======= + "ui://3n2top74kpmgp5", + "ui://3n2top74kpmgp4", + "ui://3n2top74kpmgq4", + "ui://27vd145bl8gg53", + "ui://27vd145bhugj7i61", + "ui://bx1t0boos9wx7", + "ui://4skil1l6piv91ny", + "ui://v0j9abjygq7med", + "ui://3z9lj55vjokmft", + "ui://3z9lj55vjokmet", + "ui://3z9lj55vjokmei", + "ui://27vd145bofsx1e", + "ui://27vd145bep9w7ik3", + "ui://27vd145bcvc87i5t", + "ui://3z9lj55vjokmev", + "ui://3z9lj55vjokm9z", + "ui://3z9lj55vjokm8z", + "ui://3z9lj55vjokmfu", + "ui://4skil1l6piv91mg", + "ui://4skil1l6piv91o5", + "ui://v0j9abjygq7md1", + "ui://v0j9abjygq7mct", + "ui://v0j9abjygq7md3", + "ui://bx1t0boos9wx8", + "ui://bx1t0boos9wxa", + "ui://bx1t0boos9wx9", + "ui://c7j2rnvqtpf02f", + "ui://27vd145bimywcd5", + "ui://c7j2rnvqtpf01r", + "ui://c7j2rnvqtpf02g", + "ui://c7j2rnvqtpf02b", + "ui://y8prev1ms9wx7", + "ui://y8prev1ms9wx8", + "ui://y8prev1ms9wx9", + "ui://y8prev1ms9wxa", + "ui://b50sd5s6s9wx7", + "ui://b50sd5s6s9wx8", + "ui://b50sd5s6s9wx9", + "ui://b50sd5s6s9wxa", + "ui://xul2z8cts9wx7", + "ui://xul2z8cts9wx8", + "ui://xul2z8cts9wx9", + "ui://xul2z8cts9wxa", + "ui://visk5g30gq7mo", + "ui://visk5g30gq7m18", + "ui://visk5g30gq7m1b", + "ui://visk5g30gq7m2c", + "ui://visk5g30gq7m45", + "ui://visk5g30gq7m48", + "ui://visk5g30gq7m2a", + "ui://kplym8mus9wxa", + "ui://egnzysm7ffp386", + "ui://s63l0suw6cpqv", + "ui://s63l0suw6cpqr", + "ui://s63l0suw6cpqt", + "ui://kplym8mus9wx8", + "ui://425x67nrs9wx8", + "ui://425x67nrs9wx9", + "ui://3z9lj55vjokm6h", + "ui://3z9lj55vjokmlo", + "ui://3z9lj55vjokmlr", + "ui://4skil1l6piv91nt", + "ui://v0j9abjygq7mcu", + "ui://3z9lj55vjokmdt", + "ui://3z9lj55vjokmdr", + "ui://442j0uepona1bm", + "ui://3z9lj55vjokme6", + "ui://3z9lj55vjokme4", + "ui://3z9lj55vjokmdq", + "ui://3z9lj55vjokme2", + "ui://niy3ldiwl9mny", + "ui://m7iejg4610snh5j", + "ui://27vd145b7jqkcdl", + "ui://s63l0suw6cpqs", + "ui://425x67nrs9wx7", + "ui://kplym8mus9wx7", + "ui://fnuxqeflnrnod", + "ui://egnzysm7ffp36a", + "ui://v2hilfzbgq7mde", + "ui://v2hilfzbgq7mc9", + "ui://ypulwxjhl9mn14", + "ui://k15boclkl9mn14", + "ui://oubpz2r2ofil7k", + "ui://27vd145bj0h759", + "ui://27vd145bvg2c4", + "ui://v6yvqp7wf55qwa", + "ui://35sf1c1fr05e8u", + "ui://35sf1c1fr05e5z", + "ui://m7iejg46l679hwn", + "ui://m7iejg46kwi0hm9", + "ui://m7iejg46kwi0hk0", + "ui://m7iejg46kwi0hm3", + "ui://m7iejg46qlxihsm", + "ui://m7iejg46kwi0hm5", + "ui://m7iejg46l679hws", + "ui://m7iejg46kwi0hls", + "ui://m7iejg46kwi0hmc", + "ui://m7iejg46n5sxha2", + "ui://35sf1c1fr05e4l", + "ui://35sf1c1fr05e4u", + "ui://35sf1c1fr05e9k", + "ui://35sf1c1fr05e57", + "ui://35sf1c1fr05e4r", + "ui://35sf1c1fr05e3w", + "ui://35sf1c1fr05e4c", + "ui://27vd145bl8gg54", + "ui://27vd145bcjli6", + "ui://27vd145bhznkce2", + "ui://27vd145blwcl28", + "ui://27vd145btjnvcg9", + "ui://27vd145btjnvcgc", + "ui://c7j2rnvqtpf03e", + "ui://visk5g30gq7m30", + "ui://v2hilfzbgq7mcl", + "ui://oubpz2r2ofil87", + "ui://3n2top74kpmgkn", + "ui://9n9stu2em9jahn", + "ui://awernf6xbazq8a", + "ui://qpsoxvaim9jahn", + "ui://3z9lj55vjokmey", + "ui://3z9lj55vjokmf5", + "ui://3z9lj55vjokmf7", + "ui://v0j9abjygq7mdo", + "ui://4skil1l6piv91mn", + "ui://b8jloj2qm9jahn", + "ui://3n2top74kpmge", + "ui://3n2top74kpmgh", + "ui://3n2top74kpmg2", + "ui://lx6k641gajzhoe", + "ui://3n2top74kpmgoh", + "ui://3n2top74kpmgoa", + "ui://3n2top74kpmgog", + "ui://3n2top74kpmgbc", + "ui://3n2top74kpmgdq", + "ui://3n2top74kpmge8", + "ui://3n2top74kpmg9f", + "ui://3n2top74kpmga4", + "ui://3n2top74kpmga1", + "ui://3z9lj55vjokm7l", + "ui://v0j9abjygq7m8f", + "ui://3z9lj55vjokm8c", + "ui://4skil1l6r6qo1kc", + "ui://3n2top74kpmgm2", + "ui://3n2top74kpmglv", + "ui://3n2top74kpmgm1", + "ui://96mvx2ml10kys6", + "ui://96mvx2mlocbrsh" +>>>>>>> cba10b0ffff21510cffe8fda2a55188ccbbfbe99 ], "packageGroup.mine": [ "2d9xdj6z" ], - "test.device": "iPhone Xs", + "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, +<<<<<<< HEAD "doc.activeDoc": "ui://l0ds4ys6h1uu26", "libview.twoColumn": false, "libview.expandedNodes": [ "l0ds4ys6", "/" +======= + "doc.activeDoc": "ui://m7iejg46kwi0hls", + "libview.twoColumn": false, + "libview.expandedNodes": [ + "3z9lj55v", + "/", + "3z9lj55v", + "/Main_style_2/", + "3z9lj55v", + "/component/", + "3z9lj55v", + "/component/clearing/", + "3z9lj55v", + "/component/clearing/clearing1/", + "3z9lj55v", + "/component/clearing/clearing2/", + "3z9lj55v", + "/component/clearing/room/", + "3z9lj55v", + "/images/", + "m7iejg46", + "/", + "m7iejg46", + "/images/", + "m7iejg46", + "/mgr/", + "m7iejg46", + "/mgr/Mui/" +>>>>>>> cba10b0ffff21510cffe8fda2a55188ccbbfbe99 ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml b/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml index 1d477c26..8bd2a94a 100644 --- a/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml +++ b/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml @@ -2,14 +2,14 @@ - + - - + + - + \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml b/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml index 5b6dd5cb..d8a4800c 100644 --- a/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml +++ b/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml @@ -7,20 +7,20 @@ - - - + + +