diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua index 7f086ce9..09a54ceb 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua @@ -444,15 +444,15 @@ function M:FillItemData(room, data, item, active_player, niao) end end - - - - + --鸟牌总数量 + if data["zhong_jiang"] and data["zhong_jiang"] > 0 then + str1 = str1 .. "x" .. data["zhong_jiang"] + end item:GetChild("score3").text=str1 item:GetChild("score4").text=str1 local paixingCtr=item:GetController("detail") - -- table.insert(self.PaiXingXiangQingCtrList,paixingCtr) + -- table.insert(self.PaiXingXiangQingCtrList,paixingCtr)+ ------------------------- local hp_nonnegative = room:checkHpNonnegative() diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua index aca2c082..84dcb0dc 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua @@ -75,27 +75,31 @@ end function M:__BuGang(card1,card2, callback) - local _gang_tip_choice = UIPackage.CreateObject("Extend_MJ_HeChi", "Gang_tip_choice") - _gang_tip_choice.visible = true + -- local _gang_tip_choice = UIPackage.CreateObject("Extend_MJ_HeChi", "Gang_tip_choice") + -- _gang_tip_choice.visible = true - local gangcard1 = _gang_tip_choice:GetChild("card1") - -- local gangcard2 = _gang_tip_choice:GetChild("card2") + -- local gangcard1 = _gang_tip_choice:GetChild("card1") + -- -- local gangcard2 = _gang_tip_choice:GetChild("card2") - gangcard1.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card1) - -- gangcard2.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card2) + if callback then + callback(card1) + end - gangcard1.onClick:Add(function() - callback(card1) - end) + -- gangcard1.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card1) + -- -- gangcard2.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card2) - -- gangcard2.onClick:Add(function() - -- callback(card2) + -- gangcard1.onClick:Add(function() + -- callback(card1) -- end) - _gang_tip_choice.xy = Vector2((self._view.width - _gang_tip_choice.width)/2, (self._view.height - _gang_tip_choice.height)/2) - self._view:AddChild(_gang_tip_choice) - self._gang_tip_choice = _gang_tip_choice + -- -- gangcard2.onClick:Add(function() + -- -- callback(card2) + -- -- end) + + -- _gang_tip_choice.xy = Vector2((self._view.width - _gang_tip_choice.width)/2, (self._view.height - _gang_tip_choice.height)/2) + -- self._view:AddChild(_gang_tip_choice) + --self._gang_tip_choice = _gang_tip_choice end diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index c4be7e19..d328eeed 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -458,11 +458,15 @@ function M:CountCardLeftNum(card) end for j = 1, #p.fz_list do local fz = p.fz_list[j] - if fz.type == FZType.Chi then - for k = 1, #fz.opcard do - if card == fz.opcard[k] then - count = count - 1 - break + -- 修改开始：增加对 fz 和 fz.opcard 的空值检查 + if fz.type == FZType.Chi then + -- 确保 opcard 存在且是一个表 + if fz.opcard and type(fz.opcard) == "table" then + for k = 1, #fz.opcard do + if card == fz.opcard[k] then + count = count - 1 + break + end end end else diff --git a/wb_new_ui/.objs/metas/27vd145b/cvc87i5t.info b/wb_new_ui/.objs/metas/27vd145b/cvc87i5t.info new file mode 100644 index 00000000..0c12ff44 --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/cvc87i5t.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n19_ik9v": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index 66492f08..2f29def0 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -2,8 +2,13 @@ "objectStatus": { "n100_lumr": { "hidden": true + }, + "n157_btip": { + "hidden": true + }, + "n160_ik9v": { + "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info b/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info new file mode 100644 index 00000000..6356b5d5 --- /dev/null +++ b/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n13_sqe0": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index b6dfaa9d..e99c2420 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -8,8 +8,10 @@ }, "n251_ilon": { "hidden": true + }, + "n290_ik9v": { + "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info index 9e26dfee..a7afb294 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info @@ -1 +1,34 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n118_l7wn": { + "hidden": true + }, + "n112_l7wn": { + "hidden": true + }, + "n117_l7wn": { + "hidden": true + }, + "n114_l7wn": { + "hidden": true + }, + "n113_l7wn": { + "hidden": true + }, + "n116_l7wn": { + "hidden": true + }, + "n119_l7wn": { + "hidden": true + }, + "n115_l7wn": { + "hidden": true + }, + "n111_l7wn": { + "hidden": true + }, + "n110_l7wn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/csp47i3z.info b/wb_new_ui/.objs/metas/m7iejg46/csp47i3z.info new file mode 100644 index 00000000..b39317f1 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/csp47i3z.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n2_n6w8": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/h22dp7isu.info b/wb_new_ui/.objs/metas/m7iejg46/h22dp7isu.info new file mode 100644 index 00000000..a6d0f289 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/h22dp7isu.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n53_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/h22dp7isv.info b/wb_new_ui/.objs/metas/m7iejg46/h22dp7isv.info new file mode 100644 index 00000000..a6d0f289 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/h22dp7isv.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n53_n96g": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info index 8b9bcfe8..c4008630 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info +++ b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info @@ -2,6 +2,9 @@ "objectStatus": { "n17_ik9v": { "hidden": true + }, + "n18_h46p": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info index 839671a7..690a9bb2 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info @@ -9,10 +9,10 @@ "n96_imp5": { "hidden": true }, - "n104_nunk": { + "n91_j5s5": { "hidden": true }, - "n91_j5s5": { + "n105_hz87": { "hidden": true }, "n81_jr1l": { diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info index 2512902f..4a5666fd 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info @@ -2,6 +2,21 @@ "objectStatus": { "n69_jd7v": { "hidden": true + }, + "n132_z384": { + "hidden": true + }, + "n168_hz87": { + "hidden": true + }, + "n35_rpaz": { + "hidden": true + }, + "n33_rpaz": { + "hidden": true + }, + "n169_hz87": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info index e1485f0f..1533f2ec 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info @@ -3,19 +3,35 @@ "n47_rpaz": { "collapsed": true }, + "n67_z384": { + "hidden": true + }, "n51_t1hq": { + "hidden": true, "collapsed": true }, "n44_rpaz": { "collapsed": true }, + "n68_z384": { + "hidden": true + }, + "n58_ocx0": { + "hidden": true + }, "n72_mtk5": { "hidden": true }, + "n41_utix": { + "hidden": true + }, "n26_kwi0": { "hidden": true, "collapsed": true }, + "n57_ocx0": { + "hidden": true + }, "n77_m16m": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih3.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih3.info index cb31a427..0f9330e9 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57ih3.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih3.info @@ -9,6 +9,9 @@ "n20_kwi0": { "hidden": true }, + "n175_hz87": { + "hidden": true + }, "n153_imp5": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info index 39323f02..33e2f19c 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info +++ b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info @@ -1,15 +1,20 @@ { "objectStatus": { - "n55_g21o": { - "collapsed": true + "n122_sqe0": { + "locked": true + }, + "n119_sqe0": { + "locked": true }, "n94_jj65": { "hidden": true }, "n104_vyn3": { "hidden": true + }, + "n102_vyn3": { + "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info index 76876725..0fa9fd8d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info @@ -3,6 +3,12 @@ "n84_zgn4": { "hidden": true }, + "n90_hz87": { + "hidden": true + }, + "n88_hz87": { + "hidden": true + }, "n86_cpin": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info index 7b05fc42..690dbfcd 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info +++ b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n65_hz87": { + "hidden": true + }, "n62_r0qx": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6v.info b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6v.info index 8b6fe231..eb18e22a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6v.info +++ b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6v.info @@ -1,12 +1,18 @@ { "objectStatus": { + "n11_nk4v": { + "hidden": true + }, + "n67_joap": { + "hidden": true + }, "n68_joap": { "hidden": true }, "n51_r0qx": { "hidden": true }, - "n67_joap": { + "n71_hz87": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/tt6k7ika.info b/wb_new_ui/.objs/metas/m7iejg46/tt6k7ika.info new file mode 100644 index 00000000..48d90b09 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tt6k7ika.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n96_l7wn": { + "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 d8846dca..5362bc70 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n56_cnxs": { + "locked": true + }, "n117_kmwu": { "collapsed": true }, @@ -12,6 +15,9 @@ "n85_l2u4": { "collapsed": true }, + "n82_l2u4": { + "collapsed": true + }, "n107_go7q": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info index 057aff3b..c39b12b1 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info @@ -1,19 +1,22 @@ { "objectStatus": { - "n109_nlef": { - "hidden": true - }, - "n34_piv9": { - "hidden": true - }, "n41_ona1": { "hidden": true }, + "n79_uwvl": { + "collapsed": true + }, "n22_xtwh": { "hidden": true }, "n40_ona1": { "hidden": true + }, + "n109_nlef": { + "hidden": true + }, + "n34_piv9": { + "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 b65e51f1..d6e54632 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,17 +1,74 @@ { - "libview.firstColumnWidth": 356, + "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg46kwi0hma", "ui://m7iejg46m16m7igb", "ui://v0j9abjygq7med", + "ui://v0j9abjygq7ms2", + "ui://lkq9ne9speuq8b", + "ui://v0j9abjygq7mdj", "ui://v0j9abjygq7m8f", + "ui://hrxsdiixla4e24", "ui://v0j9abjygq7men", + "ui://m7iejg46imp57ih3", + "ui://27vd145bcvc87i5t", + "ui://m7iejg46ilon7ibl", + "ui://m7iejg46imp57igy", + "ui://m7iejg46ozazhxs", + "ui://m7iejg46tt6k7ika", + "ui://m7iejg46gls1hif", + "ui://m7iejg46imp57ih1", + "ui://27vd145bvg2c4", + "ui://m7iejg46csp47i42", + "ui://27vd145bst2l7ijp", + "ui://27vd145bofsx1e", + "ui://m7iejg46imp57ih5", + "ui://27vd145bmljn7ijt", + "ui://m7iejg46imp57ih4", + "ui://27vd145bcv577inp", "ui://v0j9abjygq7m8u", + "ui://v0j9abjygq7m8r", "ui://v0j9abjygq7m8k", "ui://v0j9abjygq7m8i", "ui://4skil1l6r6qo1kc", "ui://v0j9abjygq7mcu", + "ui://v0j9abjygq7md3", + "ui://m7iejg4610snh5j", + "ui://m7iejg46r0qx7i6v", + "ui://m7iejg4610xl7i1w", + "ui://m7iejg46ilon7ia2", + "ui://m7iejg46l7wn7i83", + "ui://m7iejg46r0qx7i6u", + "ui://27vd145bc6bub0", + "ui://m7iejg46eany7ie3", + "ui://m7iejg46eany7ie2", + "ui://m7iejg46r0qx7i70", + "ui://m7iejg46eany7ie1", + "ui://27vd145beeqmch0", + "ui://m7iejg46nk4vhwj", + "ui://m7iejg46lf2qhju", + "ui://m7iejg46lqkg7iry", + "ui://27vd145bh1uu3f", + "ui://27vd145bh1uu3i", + "ui://m7iejg46ivn3hxh", + "ui://m7iejg46h22dp7isu", + "ui://m7iejg46csp47i3z", + "ui://m7iejg46jiu8hef", + "ui://m7iejg46lnhahsf", + "ui://m7iejg46lnhahsh", + "ui://m7iejg46h46p7ish", + "ui://m7iejg46h22dp7isv", + "ui://m7iejg46hwww2f", + "ui://l0ds4ys6h1uu26", + "ui://z1qthxavlrfi0", + "ui://2d9xdj6zfn7fao", + "ui://m7iejg46ruljhmp", + "ui://2d9xdj6zlumrgj", + "ui://2d9xdj6zlwcl5m", + "ui://v0j9abjygq7mct", + "ui://v0j9abjygq7md1", + "ui://4skil1l6piv91o5", "ui://m7iejg46imp57igi", "ui://m7iejg46n5sxha2", "ui://m7iejg46ilon7ias", @@ -23,22 +80,42 @@ "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v0j9abjygq7men", + "doc.activeDoc": "ui://m7iejg46tt6k7ika", "libview.twoColumn": false, "libview.expandedNodes": [ - "hrxsdiix", + "27vd145b", "/", - "hrxsdiix", + "27vd145b", + "/buttons/", + "27vd145b", "/component/", - "hrxsdiix", - "/component/hu_effect/", - "hrxsdiix", - "/component/hu_effect/image/", + "27vd145b", + "/component/create_room/", + "27vd145b", + "/component/create_room/image/", + "27vd145b", + "/images/", + "27vd145b", + "/images/COMMui/", + "2d9xdj6z", + "/", + "2d9xdj6z", + "/images/", + "2d9xdj6z", + "/images/LobbyMui/", "v0j9abjy", "/", "v0j9abjy", "/Main_style_2/", "v0j9abjy", + "/component/", + "v0j9abjy", + "/component/clearing/", + "v0j9abjy", + "/component/clearing/clearing1/", + "v0j9abjy", + "/component/hu_tip/", + "v0j9abjy", "/images/", "v0j9abjy", "/images/cards/", @@ -49,21 +126,11 @@ "m7iejg46", "/NGMui/", "m7iejg46", - "/component/", - "m7iejg46", - "/component/Btn/", - "m7iejg46", - "/component/Btn/date_set/", - "m7iejg46", - "/component/mail/", - "m7iejg46", "/images/", "m7iejg46", - "/mgr/", + "/images/main/", "m7iejg46", - "/mgr/imgs/", - "m7iejg46", - "/mgr/imgs/addMenberAlone/" + "/mgr/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/MessageBox.xml b/wb_new_ui/assets/Common/MessageBox.xml index 0068f01b..ade619f9 100644 --- a/wb_new_ui/assets/Common/MessageBox.xml +++ b/wb_new_ui/assets/Common/MessageBox.xml @@ -6,7 +6,7 @@