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/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/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/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..b6119669 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -5,13 +5,34 @@ "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://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://v0j9abjygq7mct", + "ui://v0j9abjygq7md1", + "ui://4skil1l6piv91o5", "ui://m7iejg46imp57igi", "ui://m7iejg46n5sxha2", "ui://m7iejg46ilon7ias", @@ -23,22 +44,30 @@ "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v0j9abjygq7men", + "doc.activeDoc": "ui://v0j9abjygq7md3", "libview.twoColumn": false, "libview.expandedNodes": [ - "hrxsdiix", + "27vd145b", "/", - "hrxsdiix", - "/component/", - "hrxsdiix", - "/component/hu_effect/", - "hrxsdiix", - "/component/hu_effect/image/", + "27vd145b", + "/buttons/", + "27vd145b", + "/images/", + "27vd145b", + "/images/COMMui/", "v0j9abjy", "/", "v0j9abjy", "/Main_style_2/", "v0j9abjy", + "/component/", + "v0j9abjy", + "/component/clearing/", + "v0j9abjy", + "/component/clearing/clearing1/", + "v0j9abjy", + "/component/hu_tip/", + "v0j9abjy", "/images/", "v0j9abjy", "/images/cards/", @@ -47,23 +76,7 @@ "m7iejg46", "/", "m7iejg46", - "/NGMui/", - "m7iejg46", - "/component/", - "m7iejg46", - "/component/Btn/", - "m7iejg46", - "/component/Btn/date_set/", - "m7iejg46", - "/component/mail/", - "m7iejg46", - "/images/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/imgs/", - "m7iejg46", - "/mgr/imgs/addMenberAlone/" + "/NGMui/" ], "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 @@