diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua index f88bb5e6..69e7e737 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 ~= "吃三比" and huName ~= "七大对" and huName ~= "七大对混一色"and huName ~= "七大对清一色"then + if huName ~= "吃三比" then -- 可选：如果分数为0也不想要，可以加上 and item.score > 0 table.insert(filtered_win_list, item) end diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info index ea51502c..cef2181a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm5.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/l679hwn.info b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info index 95391ef8..f74d0dc1 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info @@ -2,11 +2,7 @@ "objectStatus": { "n98_k5m9": { "hidden": true - }, - "n102_t8gf": { - "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info b/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info index 8826b854..ff3594d8 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info +++ b/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info @@ -3,6 +3,9 @@ "n8_e8zl": { "hidden": true }, + "n10_zplu": { + "hidden": true + }, "n6_e8zl": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info index 51bdb2c0..c3a5f630 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info @@ -1,10 +1,13 @@ { "objectStatus": { - "n68_tqi8": { + "n70_tqi8": { "hidden": true }, "n87_hz87": { "hidden": true + }, + "n68_tqi8": { + "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 67e25089..0aa0bf1f 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,18 +2,21 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46hsbhhjn", - "ui://m7iejg46jgh8hwv", "ui://m7iejg46l679hws", - "ui://m7iejg46kwi0hmc", - "ui://m7iejg46kwi0hme", - "ui://m7iejg46kwi0hmd", - "ui://27vd145bik9v7imt" + "ui://m7iejg46kwi0hm5", + "ui://m7iejg46jgh8hwv", + "ui://m7iejg46tqi8hwa", + "ui://v0j9abjygq7med", + "ui://v0j9abjygq7mdj", + "ui://27vd145bvg2c4", + "ui://m7iejg46kwi0hlb", + "ui://m7iejg46l679hwn", + "ui://m7iejg46kwi0hm9" ], "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46kwi0hme", + "doc.activeDoc": "ui://v0j9abjygq7mdj", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -63,21 +66,7 @@ "v0j9abjy", "/images/cards/", "v0j9abjy", - "/images/cards/2/", - "m7iejg46", - "/", - "m7iejg46", - "/NGMui/", - "m7iejg46", - "/images/", - "m7iejg46", - "/images/main/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/component/", - "m7iejg46", - "/mgr/imgs/" + "/images/cards/2/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/images/COMMui/Frame 1253.png b/wb_new_ui/assets/Common/images/COMMui/Frame 1253.png new file mode 100644 index 00000000..b87f19ac Binary files /dev/null and b/wb_new_ui/assets/Common/images/COMMui/Frame 1253.png differ diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 3e2921f3..340ece15 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1616,6 +1616,7 @@ + diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he23.png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he23.png index 5082fd06..2d93c07e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he23.png and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he23.png differ diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he23_1.png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he23_1.png new file mode 100644 index 00000000..5082fd06 Binary files /dev/null and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he23_1.png differ diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he24.png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he24.png index ec07b832..f277f94e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he24.png and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he24.png differ diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he24_1.png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he24_1.png new file mode 100644 index 00000000..ec07b832 Binary files /dev/null and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he24_1.png differ diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he25.png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he25.png index a0240e25..73d499b9 100644 Binary files a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he25.png and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he25.png differ diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he25_1.png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he25_1.png new file mode 100644 index 00000000..a0240e25 Binary files /dev/null and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he25_1.png differ diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/package.xml b/wb_new_ui/assets/Extend_MJ_HeChi/package.xml index 481a3c16..52e5487d 100644 --- a/wb_new_ui/assets/Extend_MJ_HeChi/package.xml +++ b/wb_new_ui/assets/Extend_MJ_HeChi/package.xml @@ -205,9 +205,9 @@ - - - + + + @@ -233,6 +233,9 @@ + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml index 6b69150f..cf409e3a 100644 --- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml +++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml @@ -22,6 +22,7 @@ +