添加门清,排序红中,去掉自摸或*1
|
|
@ -19,7 +19,7 @@ local CS_Win_Type = {
|
|||
"七小对混一色",
|
||||
"碰碰胡清一色",
|
||||
"碰碰胡混一色",
|
||||
"清一色",
|
||||
"门清",
|
||||
"字一色",
|
||||
"抢杠胡",
|
||||
"杠上开花",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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/",
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 98 KiB |
|
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 81 KiB |
|
|
@ -202,7 +202,7 @@
|
|||
<image id="la4e5i" name="he19.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
|
||||
<image id="la4e5j" name="he20.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
|
||||
<image id="la4e5k" name="he1.png" path="/component/hu_effect/image/" exported="true"/>
|
||||
<image id="la4e5l" name="he2.png" path="/component/hu_effect/image/" exported="true"/>
|
||||
<image id="la4e5l" name="he2(2).png" path="/component/hu_effect/image/"/>
|
||||
<image id="la4e5m" name="he21.png" path="/component/hu_effect/image/" exported="true"/>
|
||||
<image id="la4e5n" name="he22.png" path="/component/hu_effect/image/" exported="true"/>
|
||||
<image id="la4e5o" name="he23.png" path="/component/hu_effect/image/" exported="true"/>
|
||||
|
|
@ -232,6 +232,7 @@
|
|||
<image id="la4e6c" name="Head0.png" path="/images/clearing/" exported="true"/>
|
||||
<image id="la4e6d" name="niao.png" path="/images/niao/" exported="true"/>
|
||||
<image id="la4e6e" name="icon.png" path="/images/" exported="true"/>
|
||||
<image id="d7446f" name="he2.png" path="/component/hu_effect/image/" exported="true"/>
|
||||
</resources>
|
||||
<publish name="Extend_MJ_HeChi" path="..\wb_unity_pro\Assets\ART\extend\majiang\hechi\ui" packageCount="2"/>
|
||||
</packageDescription>
|
||||
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 1.5 MiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 942 KiB |
|
Before Width: | Height: | Size: 751 KiB After Width: | Height: | Size: 628 KiB |
|
Before Width: | Height: | Size: 167 KiB After Width: | Height: | Size: 198 KiB |
|
Before Width: | Height: | Size: 214 KiB After Width: | Height: | Size: 215 KiB |
|
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 223 KiB |
|
Before Width: | Height: | Size: 275 KiB After Width: | Height: | Size: 276 KiB |
|
Before Width: | Height: | Size: 282 KiB After Width: | Height: | Size: 283 KiB |