From 48c9812057950268266a982142ca0f82de51752a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B3=BD=E5=B8=86?= <411641460@qq.com>
Date: Wed, 7 Oct 2026 18:11:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=94=BE=E7=82=AE=E7=BD=9A?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/extend/zp/uitl/Paixing.java | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/game_zp_fangpaofa/src/main/java/extend/zp/uitl/Paixing.java b/game_zp_fangpaofa/src/main/java/extend/zp/uitl/Paixing.java
index 96f7e77..aa68c8f 100644
--- a/game_zp_fangpaofa/src/main/java/extend/zp/uitl/Paixing.java
+++ b/game_zp_fangpaofa/src/main/java/extend/zp/uitl/Paixing.java
@@ -40,55 +40,55 @@ public class Paixing {
 //			player.cardInhand.add(room.activeCard);
 //		}
 		// 新增代码1111111111
-		List<Integer> list = new ArrayList<>();
-		for (int card : player.cardInhand) {
-			list.add(card);
-		}
+//		List<Integer> list = new ArrayList<>();
+//		for (int card : player.cardInhand) {
+//			list.add(card);
+//		}
 //
-		// 处理30胡卡
-		MingtangCheck mingtangCheck30 = new MingtangCheck(list, drawCard);
-		for (int i = 0; i < player.opCardList.size(); i++) {
-			OpCard opCards = player.opCardList.get(i);
-			mingtangCheck30.huxiTotal += opCards.huXi;
-		}
-		boolean huka30 = mingtangCheck30.huka30(player, player.tiCount + player.kongCount);
-
-		if (huka30) {
-			logger.info("30胡卡：" + huka30);
-			player.huXi = 30;
-			player.total_huxi = 30;
-
-			player.handCard.clear();
-			player.opCardList.addAll(mingtangCheck30.opCardList);
-			return true;
-		}
-
-		// 处理20胡卡
-		MingtangCheck mingtangCheck20 = new MingtangCheck(list, drawCard);
-		boolean huka20 = mingtangCheck20.huka20(player, player.tiCount + player.kongCount);
-		mingtangCheck20.huxiTotal = 0;
-		for (int i = 0; i < player.opCardList.size(); i++) {
-			OpCard opCards = player.opCardList.get(i);
-//			logger.info("----------计算当前杠碰吃胡息：" + opCards.card1 + "---" + opCards.card2 + "---" + opCards.card3 + "---"
-//					+ opCards.huXi);
-
-			mingtangCheck20.huxiTotal += opCards.huXi;
-		}
-
-		if (huka20 && mingtangCheck20.huxiTotal >= 15) {
-			logger.info("20胡卡：" + huka20);
-			player.huXi = 20;
-			player.total_huxi = 20;
-			player.handCard.clear();
-			player.opCardList.addAll(mingtangCheck20.opCardList);
-//			for (int i = 0; i < mingtangCheck20.opCardList.size(); i++) {
-//				logger.info(mingtangCheck20.opCardList.get(i).card1 + "---" + mingtangCheck20.opCardList.get(i).card2
-//						+ "---" + mingtangCheck20.opCardList.get(i).card3 + "---"
-//						+ mingtangCheck20.opCardList.get(i).huXi);
-//			}
-
-			return true;
-		}
+//		// 处理30胡卡
+//		MingtangCheck mingtangCheck30 = new MingtangCheck(list, drawCard);
+//		for (int i = 0; i < player.opCardList.size(); i++) {
+//			OpCard opCards = player.opCardList.get(i);
+//			mingtangCheck30.huxiTotal += opCards.huXi;
+//		}
+//		boolean huka30 = mingtangCheck30.huka30(player, player.tiCount + player.kongCount);
+//
+//		if (huka30) {
+//			logger.info("30胡卡：" + huka30);
+//			player.huXi = 30;
+//			player.total_huxi = 30;
+//
+//			player.handCard.clear();
+//			player.opCardList.addAll(mingtangCheck30.opCardList);
+//			return true;
+//		}
+//
+//		// 处理20胡卡
+//		MingtangCheck mingtangCheck20 = new MingtangCheck(list, drawCard);
+//		boolean huka20 = mingtangCheck20.huka20(player, player.tiCount + player.kongCount);
+//		mingtangCheck20.huxiTotal = 0;
+//		for (int i = 0; i < player.opCardList.size(); i++) {
+//			OpCard opCards = player.opCardList.get(i);
+////			logger.info("----------计算当前杠碰吃胡息：" + opCards.card1 + "---" + opCards.card2 + "---" + opCards.card3 + "---"
+////					+ opCards.huXi);
+//
+//			mingtangCheck20.huxiTotal += opCards.huXi;
+//		}
+//
+//		if (huka20 && mingtangCheck20.huxiTotal >= 15) {
+//			logger.info("20胡卡：" + huka20);
+//			player.huXi = 20;
+//			player.total_huxi = 20;
+//			player.handCard.clear();
+//			player.opCardList.addAll(mingtangCheck20.opCardList);
+////			for (int i = 0; i < mingtangCheck20.opCardList.size(); i++) {
+////				logger.info(mingtangCheck20.opCardList.get(i).card1 + "---" + mingtangCheck20.opCardList.get(i).card2
+////						+ "---" + mingtangCheck20.opCardList.get(i).card3 + "---"
+////						+ mingtangCheck20.opCardList.get(i).huXi);
+////			}
+//
+//			return true;
+//		}
 
 		// 处理一块扁
 //		MingtangCheck mingtangCheck1 = new MingtangCheck(list, drawCard);