修改13烂以及其他

lua_probject/extend_project/extend/majiang/hechi/CS_Win_Type.lua

@@ -1,8 +1,8 @@
 local CS_Win_Type = {
 	"点炮",
 	"自摸",
-	"副烂",
 	"正烂",
+	"副烂",
 	"碰碰胡",
 	"七小对",
 	"天胡",

lua_probject/extend_project/extend/majiang/hechi/CardCheck.lua

@@ -272,59 +272,95 @@ function M:checkQidui()
 end
 
 function M:checkLanPai()
-	local cardList = membe_clone(self.cardList)
-	local narr = self:removeRepeat(cardList)
-	if #narr > #cardList or #narr < #cardList then
-		return false
-	end
+    -- 克隆手牌列表
+    local cardList = membe_clone(self.cardList)
+    
+    -- 获取赖子的数量
+    local laiziCount = self.zhong_count 
+    
+    -- 特殊情况处理：全赖子
+    if #cardList == 0 then
+        return laiziCount >= 0 
+    end
+    
+    -- 牌型分类
+    local ziCards = {} -- 字牌 (ID >= 400)
+    local wanVals = {} -- 万子点数
+    local tongVals = {} -- 筒子点数
+    local tiaoVals = {} -- 条子点数
+    
+    -- 整理成了四个独立的列表
+    for _, card in ipairs(cardList) do
+        if card >= 400 then
+            table.insert(ziCards, card)
+        elseif card > 100 and card < 200 then
+            table.insert(wanVals, card % 100)
+        elseif card > 200 and card < 300 then
+            table.insert(tongVals, card % 100)
+        elseif card > 300 and card < 400 then
+            table.insert(tiaoVals, card % 100)
+        end
+    end
 
-	local zf = 0
-	local wz = 0 --万字
-	local wzcard = 0
-	local bz = 0 --筒子
-	local bzcard = 0
-	local tz = 0 --条
-	local tzcard = 0
+    -- 1. 检查字牌是否有重复
+    local ziUnique = {}
+    for _, c in ipairs(ziCards) do
+        if ziUnique[c] then
+            return false -- 发现重复字牌
+        end
+        ziUnique[c] = true
+    end
+    
+    -- 检查是否属于固定的 1-4-7, 2-5-8, 3-6-9 组
+    local function checkFixedGroup(vals)
+        if #vals == 0 then return true end -- 没牌肯定合法
+        
+        -- 去重并排序
+        local uniqueVals = {}
+        local seen = {}
+        for _, v in ipairs(vals) do
+            if not seen[v] then
+                table.insert(uniqueVals, v)
+                seen[v] = true
+            end
+        end
+        table.sort(uniqueVals)
+        
+        -- 如果超过3张牌，或者存在重复牌（虽然上面去重了，但逻辑上13烂不能对子），直接失败
+        if #uniqueVals ~= #vals then return false end 
+        -- 任意两张牌的差值必须是3的倍数。
+        for i = 2, #uniqueVals do
+            if (uniqueVals[i] - uniqueVals[1]) % 3 ~= 0 then
+                return false -- 不属于同一组（例如 1 和 2，差值1，不是3的倍数）
+            end
+        end
+        return true
+    end
+    
+    --检查万、筒、条是否符合固定组规则
+    if not checkFixedGroup(wanVals) then return false  end
+    if not checkFixedGroup(tongVals) then  return false  end
+    if not checkFixedGroup(tiaoVals) then  return false  end
+    
+    -- 计算可用槽位 (用于赖子填充)
+    local function countFixedSlots(vals)
+        if #vals == 0 then
+            return 3 -- 没牌时，可以任选一组，最多3个位置
+        end
+        return 3 - #vals
+    end
 
-	for k, v in pairs(cardList) do
-		if v>=400 then
-			zf = zf+1
-		end
-		if v > 100 and v<200 then
-			wz = wz+1
-			if wzcard==0 then
-				wzcard = v
-			else
-				if v ~=  wzcard+3 and v~= wzcard+6 then
-					return false
-				end
-			end
-		end
-		if v > 200 and v<300 then
-			bz = bz+1
-			if bzcard==0 then
-				bzcard = v
-			else
-				if v ~= bzcard+3 and v~= bzcard+6 then
-					return false
-				end
-			end
-		end
-		if v > 300 and v<400 then
-			tz = tz+1
-			if tzcard==0 then
-				tzcard = v
-			else
-				if v ~= tzcard+3 and v ~= tzcard+6 then
-					return false
-				end
-			end
-		end
-	end
-	if zf>=5 and wz<4 and bz<4 and tz<4 then
-		return true
-	end
-	return false
+    local ziAvailable = 7 - #ziCards
+    local wanAvailable = countFixedSlots(wanVals)
+    local tongAvailable = countFixedSlots(tongVals)
+    local tiaoAvailable = countFixedSlots(tiaoVals)
+    
+    local totalAvailable = ziAvailable + wanAvailable + tongAvailable + tiaoAvailable
+    -- 如果手中的赖子数量 <= 总可用槽位，说明赖子可以全部填入合法位置
+    if laiziCount <= totalAvailable then
+        return true
+    end
+    return false
 end
 
 function M:removeRepeat(a)
@@ -384,9 +420,11 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
 	self.qidui = qidui
 	self.eight_laizi = eightLaizi
 	self.cardList[#self.cardList+1] = addCard
-
+    --是否启用“红中/赖子”玩法
 	if (isZhong) then
+		--将赖子的数量保存到 self.zhong_count 变量中
 		self.zhong_count = cardNum(zhongid, self.cardList)
+		--从 self.cardList 中移除所有刚才统计到的赖子牌。
 		removeCard(self.cardList, zhongid, self.zhong_count)
 	end
 	table.sort(self.cardList)
@@ -395,14 +433,8 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
 	return self:checkLanPai() or self:checkQidui() or self:tryWin()
 end
 
-local specialCardList={401,402,403,404,504,502,503}
+local specialCardList={401,402,403,404,502,503,501}
 function M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
-	printlog("isZhong",isZhong)
-	printlog("qidui",qidui)
-	printlog("eightLaizi",eightLaizi)
-	pt(cardInhand)
-	
-
 	local self = setmetatable({}, {__index = M})
 	local tingList = {}
 	if not cardInhand or #cardInhand == 0 then
@@ -418,8 +450,7 @@ function M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
 			end
 		end
 	end
-	printlog("ddddtt")
-	pt(tingList)
+	
 	
 	for j=1,#specialCardList do
 		local tem = specialCardList[j]

wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info

@@ -1,16 +1,25 @@
 {
   "objectStatus": {
-    "n85_l2u4": {
+    "n117_kmwu": {
       "collapsed": true
     },
-    "n90_8sat": {
-      "locked": true
-    },
     "n108_go7q": {
       "hidden": true
     },
+    "n59_v38k": {
+      "collapsed": true
+    },
+    "n85_l2u4": {
+      "collapsed": true
+    },
     "n107_go7q": {
       "hidden": true
+    },
+    "n90_8sat": {
+      "locked": true
+    },
+    "n123_dzuu": {
+      "collapsed": true
     }
   }
 }

wb_new_ui/.objs/workspace.json

@@ -6,6 +6,8 @@
     "ui://m7iejg46m16m7igb",
     "ui://v0j9abjygq7med",
     "ui://v0j9abjygq7m8f",
+    "ui://v0j9abjygq7men",
+    "ui://v0j9abjygq7m8u",
     "ui://v0j9abjygq7m8k",
     "ui://v0j9abjygq7m8i",
     "ui://4skil1l6r6qo1kc",
@@ -21,7 +23,7 @@
   "test.device": "iPhone XR",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://v0j9abjygq7m8k",
+  "doc.activeDoc": "ui://v0j9abjygq7men",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "hrxsdiix",
@@ -35,6 +37,8 @@
     "v0j9abjy",
     "/",
     "v0j9abjy",
+    "/Main_style_2/",
+    "v0j9abjy",
     "/images/",
     "v0j9abjy",
     "/images/cards/",

wb_new_ui/assets/Extend_MJ_HeChi/package.xml

@@ -184,8 +184,8 @@
     <component id="la4e50" name="别人胡.xml" path="/component/eff/" exported="true"/>
     <component id="la4e51" name="自己胡牌.xml" path="/component/eff/" exported="true"/>
     <image id="la4e52" name="he10.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="la4e53" name="he3.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="la4e54" name="he4.png" path="/component/hu_effect/image/" exported="true"/>
+    <image id="la4e53" name="he4.png" path="/component/hu_effect/image/" exported="true"/>
+    <image id="la4e54" name="he3.png" path="/component/hu_effect/image/" exported="true"/>
     <image id="la4e55" name="he5.png" path="/component/hu_effect/image/" exported="true"/>
     <image id="la4e56" name="he6.png" path="/component/hu_effect/image/" exported="true"/>
     <image id="la4e57" name="he7.png" path="/component/hu_effect/image/" exported="true"/>