diff --git a/lua_probject/extend_project/extend/majiang/hechi/CardCheck.lua b/lua_probject/extend_project/extend/majiang/hechi/CardCheck.lua index daeb2431..d1e0cece 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/CardCheck.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/CardCheck.lua @@ -203,9 +203,9 @@ function M:tryPair2Zhong() end function M:tryWin() - if (self.zhong_count == 4 and not self.eight_laizi) or (self.zhong_count == 8 and self.eight_laizi) then - return true - end + -- if (self.zhong_count == 4 and not self.eight_laizi) or (self.zhong_count == 8 and self.eight_laizi) then + -- return true + -- end if (#self.cardList == 0 and self.pair_count == 1) then return true end diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/hechi/EXGameInfo.lua index a331e349..43b46345 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXGameInfo.lua @@ -146,8 +146,8 @@ function M:SelectedConfigData() end function M:LoadConfigData(data) - --printlog("加载房间配置=========>>>") - --pt(data) + printlog("加载房间配置=========>>>") + pt(data) local _config = self._config _config:GetController("round").selectedIndex = data.opt - 1 _config:GetController("play_list").selectedIndex = data.maxPlayers - 2 diff --git a/wb_new_ui/.objs/metas/27vd145b/l8gg53.info b/wb_new_ui/.objs/metas/27vd145b/l8gg53.info index f8c44124..eeba1ca4 100644 --- a/wb_new_ui/.objs/metas/27vd145b/l8gg53.info +++ b/wb_new_ui/.objs/metas/27vd145b/l8gg53.info @@ -6,10 +6,16 @@ "n0_l8gg": { "hidden": true }, + "n5_xyf8": { + "hidden": true + }, + "n19_bs5n": { + "hidden": true + }, "n4_xyf8": { "hidden": true }, - "n5_xyf8": { + "n21_syh3": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/27vd145b/yffnj6.info b/wb_new_ui/.objs/metas/27vd145b/yffnj6.info index 8b436efd..70b35759 100644 --- a/wb_new_ui/.objs/metas/27vd145b/yffnj6.info +++ b/wb_new_ui/.objs/metas/27vd145b/yffnj6.info @@ -1,7 +1,13 @@ { "objectStatus": { + "n7": { + "hidden": true + }, "n6": { "hidden": true + }, + "n20_qpk6": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/27vd145b/yffnj9.info b/wb_new_ui/.objs/metas/27vd145b/yffnj9.info new file mode 100644 index 00000000..81ae3fda --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/yffnj9.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n7_f2pr": { + "hidden": true + }, + "n3_h1uu": { + "hidden": true + }, + "n4_h1uu": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/27vd145b/yffnjo.info b/wb_new_ui/.objs/metas/27vd145b/yffnjo.info new file mode 100644 index 00000000..a6e7d57c --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/yffnjo.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_h1uu": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info index 20774816..f118f951 100644 --- a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info +++ b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info @@ -1,8 +1,5 @@ { "objectStatus": { - "n124_xevg": { - "collapsed": true - }, "n154_la4e": { "collapsed": true } diff --git a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info index c9ebfb2d..40ec1e04 100644 --- a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info +++ b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info @@ -5,9 +5,6 @@ }, "n70_zgd9": { "hidden": true - }, - "n77_syh3": { - "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ia2.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ia2.info index fbb05fbd..460d63b6 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ia2.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ia2.info @@ -2,6 +2,9 @@ "objectStatus": { "n190_hz87": { "hidden": true + }, + "n220_cv57": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info index 9e26dfee..430fe424 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n138_h46p": { + "hidden": 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 5362bc70..47f2c52e 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -3,9 +3,6 @@ "n56_cnxs": { "locked": true }, - "n117_kmwu": { - "collapsed": true - }, "n108_go7q": { "hidden": true }, @@ -15,13 +12,16 @@ "n85_l2u4": { "collapsed": true }, + "n114_itp8": { + "hidden": true + }, "n82_l2u4": { "collapsed": true }, "n107_go7q": { "hidden": true }, - "n90_8sat": { + "n71_l2u4": { "locked": true }, "n123_dzuu": { diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8l.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8l.info index cbe0e997..d3f4d245 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8l.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8l.info @@ -3,6 +3,18 @@ "n79_pzm0": { "hidden": true }, + "n72_pzm0": { + "hidden": true + }, + "n75_pzm0": { + "hidden": true + }, + "n51_nkur": { + "hidden": true + }, + "n74_pzm0": { + "hidden": true + }, "n81_pzm0": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8r.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8r.info index 74534a65..d14b22cf 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8r.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8r.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n5_cmc2": { + "hidden": true + }, "n6_rfcn": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info index b6a48536..d233973f 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info @@ -3,10 +3,16 @@ "n43_rfcn": { "hidden": true }, - "n45_rfcn": { + "n6": { "hidden": true }, - "n28_e54q": { + "n33_e7qn": { + "collapsed": true + }, + "n50_hez8": { + "locked": true + }, + "n45_rfcn": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info new file mode 100644 index 00000000..6a66164c --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info @@ -0,0 +1,19 @@ +{ + "objectStatus": { + "n50_hkbm": { + "hidden": true + }, + "n26": { + "hidden": true + }, + "n110_ni5n": { + "hidden": true + }, + "n30_lwcl": { + "hidden": true + }, + "n100_piv9": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/rdg6t9.info b/wb_new_ui/.objs/metas/v0j9abjy/rdg6t9.info new file mode 100644 index 00000000..d14b22cf --- /dev/null +++ b/wb_new_ui/.objs/metas/v0j9abjy/rdg6t9.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n5_cmc2": { + "hidden": true + }, + "n6_rfcn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 0aa0bf1f..28740ff5 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -7,16 +7,32 @@ "ui://m7iejg46jgh8hwv", "ui://m7iejg46tqi8hwa", "ui://v0j9abjygq7med", + "ui://v0j9abjygq7mcu", "ui://v0j9abjygq7mdj", - "ui://27vd145bvg2c4", - "ui://m7iejg46kwi0hlb", - "ui://m7iejg46l679hwn", - "ui://m7iejg46kwi0hm9" + "ui://m7iejg46ilon7ia2", + "ui://m7iejg46l7wn7i83", + "ui://l0ds4ys6h1uu26", + "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" ], "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v0j9abjygq7mdj", + "doc.activeDoc": "ui://h30s8vmela4eb", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -24,49 +40,21 @@ "27vd145b", "/buttons/", "27vd145b", - "/component/", - "27vd145b", - "/component/create_room/", - "27vd145b", - "/component/create_room/image/", - "27vd145b", "/images/", "27vd145b", "/images/COMMui/", - "hrxsdiix", - "/", - "hrxsdiix", - "/component/", - "hrxsdiix", - "/component/hu_effect/", - "hrxsdiix", - "/component/hu_effect/image/", - "2d9xdj6z", - "/", - "2d9xdj6z", - "/images/", - "2d9xdj6z", - "/images/LobbyMui/", "v0j9abjy", "/", "v0j9abjy", + "/Main_new/", + "v0j9abjy", + "/Main_new/Main/", + "v0j9abjy", "/Main_style_2/", - "v0j9abjy", - "/component/", - "v0j9abjy", - "/component/card/", - "v0j9abjy", - "/component/clearing/", - "v0j9abjy", - "/component/clearing/clearing1/", - "v0j9abjy", - "/component/hu_tip/", - "v0j9abjy", - "/images/", - "v0j9abjy", - "/images/cards/", - "v0j9abjy", - "/images/cards/2/" + "m7iejg46", + "/", + "m7iejg46", + "/NGMui/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/buttons/Btn_HeadRound5x_MX.xml b/wb_new_ui/assets/Common/buttons/Btn_HeadRound5x_MX.xml index 716a87fe..93effc03 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_HeadRound5x_MX.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_HeadRound5x_MX.xml @@ -2,7 +2,7 @@ - + diff --git a/wb_new_ui/assets/Common/component/Btn_chat.xml b/wb_new_ui/assets/Common/component/Btn_chat.xml index fca42a22..33a63e51 100644 --- a/wb_new_ui/assets/Common/component/Btn_chat.xml +++ b/wb_new_ui/assets/Common/component/Btn_chat.xml @@ -1,11 +1,12 @@ - + - + + -