diff --git a/lua_probject/extend_project/extend/majiang/hechi/CS_Win_Type.lua b/lua_probject/extend_project/extend/majiang/hechi/CS_Win_Type.lua index f0196d0d..4518f13f 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/CS_Win_Type.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/CS_Win_Type.lua @@ -21,9 +21,9 @@ local CS_Win_Type = { "碰碰胡混一色", "门清", "吃三比", - "抢杠胡", - "杠上开花", - "杠上炮", + "七大对", + "七大对清一色", + "七大对混一色", "双杠花", "双杠上炮", "三杠花", diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua index 1d8cbb81..103d3120 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua @@ -297,6 +297,7 @@ function M:FillItemData(room, data, item, active_player, niao) end local huadd = data["hu_score"] + local zhong_jiangz_nian = data["zhong_jiang"] local gangadd = data["gang_score"] local birdadd = data["niao_score"] local total = data["round_score"] @@ -339,15 +340,15 @@ function M:FillItemData(room, data, item, active_player, niao) else str1="接炮" end - -- 1. 先计算中鸟数量 (zhongNiaoCount) - local zhongNiaoCount = 0 - if niao and #niao > 0 then - for i, v in ipairs(niao) do - if v.score > 0 then - zhongNiaoCount = zhongNiaoCount + 1 - end - end - end + -- -- 1. 先计算中鸟数量 (zhongNiaoCount) + -- local zhongNiaoCount = 0 + -- if niao and #niao > 0 then + -- for i, v in ipairs(niao) do + -- if v.score > 0 then + -- zhongNiaoCount = zhongNiaoCount + 1 + -- end + -- end + -- end local baseScore = 0 -- 用于记录胡牌的基础总分 for i=1,#win_list do @@ -369,9 +370,8 @@ function M:FillItemData(room, data, item, active_player, niao) if chiSanBiStr ~= "" then str1 = str1 .. chiSanBiStr end - if zhongNiaoCount > 0 then - local finalScore = huadd * zhongNiaoCount - str1 = str1 ..sp.. "钓鱼+" .. finalScore + if zhong_jiangz_nian > 0 then + str1 = str1 ..sp.. "钓鱼+" .. zhong_jiangz_nian end end @@ -465,20 +465,20 @@ function M:FillItemData(room, data, item, active_player, niao) end if data["ming_gang_num"]>0 then - str1=str1.." 明杠x"..data["ming_gang_num"] + str1=str1.." 明杠+"..data["ming_gang_num"] end if data["an_gang_num"]>0 then - str1=str1.." 暗杠x"..data["an_gang_num"] + str1=str1.." 暗杠+"..(data["an_gang_num"]*2) end if data["dian_gang_num"]>0 then - str1=str1.." 点杠x"..data["dian_gang_num"] + str1=str1.." 点杠+"..data["dian_gang_num"] end if gangadd~=0 then if gangadd>0 then - str1=str1.." +"..gangadd.."分" + --str1=str1.." +"..gangadd.."分" else --str1=str1.." "..gangadd.."分" end diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua index 69e7e737..f88bb5e6 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua @@ -380,7 +380,7 @@ function M:OnEventHu(evt_data) -- 1. 基本有效性检查：必须有名字，且名字不为空 if huName and huName ~= "" then -- 2. 特定过滤逻辑：如果是 "吃三比"，则跳过 - if huName ~= "吃三比" then + if huName ~= "吃三比" and huName ~= "七大对" and huName ~= "七大对混一色"and huName ~= "七大对清一色"then -- 可选：如果分数为0也不想要，可以加上 and item.score > 0 table.insert(filtered_win_list, item) end diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info index 065c4ea6..c21352b4 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info @@ -7,6 +7,5 @@ "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info index 4bdca5e5..8cc3e562 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info @@ -1,9 +1,9 @@ { "objectStatus": { - "n123_omkm": { + "n139_k5m9": { "hidden": true }, - "n86_kwi0": { + "n123_omkm": { "hidden": true }, "n115_l679": { @@ -11,6 +11,12 @@ }, "n122_j120": { "hidden": true + }, + "n140_k5m9": { + "hidden": true + }, + "n86_kwi0": { + "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 2dd2a186..67e25089 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -4,13 +4,16 @@ "doc.openedDocs": [ "ui://m7iejg46hsbhhjn", "ui://m7iejg46jgh8hwv", - "ui://m7iejg46yvb27ijw", - "ui://m7iejg46j1207i2r" + "ui://m7iejg46l679hws", + "ui://m7iejg46kwi0hmc", + "ui://m7iejg46kwi0hme", + "ui://m7iejg46kwi0hmd", + "ui://27vd145bik9v7imt" ], "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46jgh8hwv", + "doc.activeDoc": "ui://m7iejg46kwi0hme", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 1129.png b/wb_new_ui/assets/NewGroup/NGMui/Frame 1129.png new file mode 100644 index 00000000..9d8809ba Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 1129.png differ diff --git a/wb_new_ui/assets/NewGroup/NGMui/Rectangle 333.png b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 333.png new file mode 100644 index 00000000..457933e6 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 333.png differ diff --git a/wb_new_ui/assets/NewGroup/NGMui/Rectangle 384.png b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 384.png new file mode 100644 index 00000000..f7608566 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 384.png differ diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml index 21f1001e..175abea4 100644 --- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml +++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml @@ -2,7 +2,7 @@ - + @@ -19,14 +19,16 @@ - + + + - + @@ -70,22 +72,22 @@