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 2423e046..a6f81fea 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 @@ -19,7 +19,7 @@ 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 a14516d0..7f086ce9 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua @@ -306,9 +306,11 @@ function M:FillItemData(room, data, item, active_player, niao) for i=1,#win_list do local huName=Hu_Type_Name[win_list[i].type] if huName then - str1=str1..sp..huName.."x"..win_list[i].score + -- 如果是自摸或点炮，不拼接 x分数 + if huName ~= "自摸" and huName ~= "点炮" then + str1=str1..sp..huName.."x"..win_list[i].score + end end - end str1=str1.." +"..huadd.."分" end diff --git a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua index a5cc62d1..16307174 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua @@ -89,6 +89,33 @@ function M:UpdateHandCard(getcard, mp) end local cards = DataManager.CurrenRoom.self_player.card_list + + for i = 1, #cards do + if cards[i] > 400 then + local temp = cards[i]%10 + math.floor(cards[i]/100)*10 + cards[i] = temp + end + if cards[i] == 51 then + cards[i] = 1 + end + end + + if cards and #cards > 1 then + table.sort(cards, function(a, b) + return a < b + end) + end + + for i = 1, #cards do + if cards[i] < 100 then + local temp = cards[i]%10 + math.floor(cards[i]/10)*100 + cards[i] = temp + end + if cards[i] == 1 then + cards[i] = 501 + end + end + if (not mp) then for i = 0, (#cards) - 1 do local tem_card = cards[i + 1] diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 02fe81af..3546e521 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -4,6 +4,12 @@ "doc.openedDocs": [ "ui://m7iejg46kwi0hma", "ui://m7iejg46m16m7igb", + "ui://v0j9abjygq7med", + "ui://v0j9abjygq7m8f", + "ui://v0j9abjygq7m8k", + "ui://v0j9abjygq7m8i", + "ui://4skil1l6r6qo1kc", + "ui://v0j9abjygq7mcu", "ui://m7iejg46imp57igi", "ui://m7iejg46n5sxha2", "ui://m7iejg46ilon7ias", @@ -15,9 +21,25 @@ "test.device": "iPhone XR", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46m16m7igb", + "doc.activeDoc": "ui://v0j9abjygq7m8k", "libview.twoColumn": false, "libview.expandedNodes": [ + "hrxsdiix", + "/", + "hrxsdiix", + "/component/", + "hrxsdiix", + "/component/hu_effect/", + "hrxsdiix", + "/component/hu_effect/image/", + "v0j9abjy", + "/", + "v0j9abjy", + "/images/", + "v0j9abjy", + "/images/cards/", + "v0j9abjy", + "/images/cards/2/", "m7iejg46", "/", "m7iejg46", @@ -25,6 +47,10 @@ "m7iejg46", "/component/", "m7iejg46", + "/component/Btn/", + "m7iejg46", + "/component/Btn/date_set/", + "m7iejg46", "/component/mail/", "m7iejg46", "/images/", diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he2(2).png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he2(2).png new file mode 100644 index 00000000..dc9d74fd Binary files /dev/null and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he2(2).png differ diff --git a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he2.png index dc9d74fd..441f1750 100644 Binary files a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he2.png and b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he2.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 6b7e72af..0ee9f2fa 100644 --- a/wb_new_ui/assets/Extend_MJ_HeChi/package.xml +++ b/wb_new_ui/assets/Extend_MJ_HeChi/package.xml @@ -202,7 +202,7 @@ - + @@ -232,6 +232,7 @@ + \ No newline at end of file diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0.png index f926a2bd..df7c41b5 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_1.png index 868c1ad0..c55ab574 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_2.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_2.png index 35da157d..914f5588 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_2.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e1u.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e1u.png index 6ac8b273..580d34b1 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e1u.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e1u.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5g.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5g.png index b7239f01..b7c8887d 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5g.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5g.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5h.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5h.png index 82e9b62d..aca40124 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5h.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5h.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5i.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5i.png index c41f93b5..9cef35da 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5i.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5i.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5j.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5j.png index 6c43341b..7939983c 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5j.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_la4e5j.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_fui.bytes index 26608bdc..6876f7ec 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_fui.bytes differ