From bd9fec7816fc1ad781829007a4c7f09c3d6a94ff Mon Sep 17 00:00:00 2001
From: fy <>
Date: Sat, 24 Jan 2026 20:35:42 +0800
Subject: [PATCH] 1.24

---
 .../src/main/java/hunan/HuNanChangSha.java      | 12 ++++++------
 .../java/taurus/util/ChangShaSuanFaTest.java    | 17 +++++++----------
 .../src/main/java/taurus/util/TinHuChi.java     |  4 +++-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/libs/robot_common/src/main/java/hunan/HuNanChangSha.java b/libs/robot_common/src/main/java/hunan/HuNanChangSha.java
index 44d83ff..47e29b4 100644
--- a/libs/robot_common/src/main/java/hunan/HuNanChangSha.java
+++ b/libs/robot_common/src/main/java/hunan/HuNanChangSha.java
@@ -284,7 +284,7 @@ public class HuNanChangSha {
         yupanhandcard.addAll(changShaCardInhand);
         //进行操作之前能否下听
 
-        List<Integer> shifoutingpai = changShaSuanFaTest.handscardshifoutingpai(changShaCardInhand,chowGroup,pongGroup,gangdepai);
+        List<Integer> shifoutingpai = changShaSuanFaTest.handscardshifoutingpai(yupanhandcard,chowGroup,pongGroup,gangdepai); //问题111
         boolean beforelisten = false;//记录操作之前的下听状态
         System.out.println("shifoutingpai"+shifoutingpai);
         if (shifoutingpai.size() > 0) {
@@ -367,7 +367,6 @@ public class HuNanChangSha {
 
 
 
-                   // Util.removeCard(changShaCardInhand,card,4);
                     Util.removeCard(gangusecars,card,4);
                     List<Integer> shifoutingpai4 = changShaSuanFaTest.handscardshifoutingpai(gangusecars,chowGroup,pongGroup,gangdepai);
                     if (shifoutingpai4.size() > 0) {
@@ -605,7 +604,8 @@ public class HuNanChangSha {
 
 
             if (map.size() > 0 && weight==3) {
-
+                log.info("补map2  ++++++++++++++++++++++" + map2);
+                log.info("补map ================ ++++++++++" + map);
                 if (map2.size() > 0) {
                     //判断补牌后
                     if (Integer.parseInt(map2.get("remainingMelds").toString())>Integer.parseInt(map.get("remainingMelds").toString())&&Integer.parseInt(map.get("remainingMelds").toString())<=2){
@@ -631,7 +631,7 @@ public class HuNanChangSha {
                         }
 
                         System.out.println("补");
-
+                        System.out.println("类型----"+type);
                         params.putString("session", session + "," + token);
                         params.putInt("qi", 0);
                         params.putInt("id", id);
@@ -996,7 +996,7 @@ public class HuNanChangSha {
     /**
      * 处理杠碰胡操作
      *
-     * @param param 消息参数
+     * @param
      * @return
      */
     /*
@@ -1842,7 +1842,7 @@ public class HuNanChangSha {
       //  hands1.add(208);
 
         int card= 106;
-        huNanChangSha.changShaCardInhand.addAll(hands1);
+//        huNanChangSha.changShaCardInhand.addAll(hands1);
         TArray tiplist= new TArray();
         ITArray opcard = TArray.newInstance();
         opcard.addInt(108);
diff --git a/libs/robot_common/src/main/java/taurus/util/ChangShaSuanFaTest.java b/libs/robot_common/src/main/java/taurus/util/ChangShaSuanFaTest.java
index 3ebb02e..f6d99db 100644
--- a/libs/robot_common/src/main/java/taurus/util/ChangShaSuanFaTest.java
+++ b/libs/robot_common/src/main/java/taurus/util/ChangShaSuanFaTest.java
@@ -295,7 +295,6 @@ public class ChangShaSuanFaTest {
 
             Integer maxCard = maxCards.isEmpty() ? null : maxCards.get(0);
             System.out.println("maxCard++++++++++++++++++++++++++++++" + maxCard);
-            System.out.printf("特殊牌型处理333 +++++++++++++++++++++++++++++++++++");
 
             return String.valueOf(maxCard);
 
@@ -480,11 +479,6 @@ public class ChangShaSuanFaTest {
         }
 
 
-
-//        List<Integer> checktingpai = TinHuChi.checktingpai(cardInhand);
-
-
-
         //碰碰胡
         List<Integer> checktingpai1 = TinHuChi.checktingpai(cardInhand);
 
@@ -515,7 +509,6 @@ public class ChangShaSuanFaTest {
                         .collect(Collectors.toList());
 
                 Integer maxCard = maxCards.isEmpty() ? null : maxCards.get(0);
-                System.out.printf("特殊牌型处理777 +++++++++++++++++++++++++++++++++++");
 
                 return String.valueOf(maxCard);
 
@@ -4767,7 +4760,10 @@ public class ChangShaSuanFaTest {
 
     public static Map<Integer,List<Integer>> quyizhangDahuTingPai(List<Integer> cardhand,List<Integer> chowGroup,List<Integer> pongGroup,List<Integer> gangdepai){
         Map<Integer,List<Integer>> map = new HashMap<>();
-        List<Integer> tmphc = cardhand;
+        List<Integer> tmphc = new ArrayList<>();
+        tmphc.addAll(cardhand);
+//        List<Integer> tmphc = cardhand; //问题111
+
 
         for (int i = 0; i < cardhand.size(); i++) {
             int tmpcard = tmphc.get(0);
@@ -4806,8 +4802,9 @@ public class ChangShaSuanFaTest {
 
     public static  Map<Integer, List<Integer>> quyizhangTingPai(List<Integer> cardhand) {
         Map<Integer, List<Integer>> quxiatingmap = new HashMap<>();
-
-        List<Integer> tmphc = cardhand;
+        List<Integer> tmphc = new ArrayList<>();
+        tmphc.addAll(cardhand);
+//        List<Integer> tmphc = cardhand;    //问题111
 
         for (int i = 0; i < cardhand.size(); i++) {
             int tmpcard = tmphc.get(0);
diff --git a/libs/robot_common/src/main/java/taurus/util/TinHuChi.java b/libs/robot_common/src/main/java/taurus/util/TinHuChi.java
index 49bb625..a9fb68b 100644
--- a/libs/robot_common/src/main/java/taurus/util/TinHuChi.java
+++ b/libs/robot_common/src/main/java/taurus/util/TinHuChi.java
@@ -268,7 +268,9 @@ public class TinHuChi {
 
     public static List<Integer> checktingpai(List<Integer> cardhand) {
         List<Integer> tpcards = new ArrayList<>();
-        List<Integer> tmphc = cardhand;
+        List<Integer> tmphc = new ArrayList<>();
+        tmphc.addAll(cardhand);
+//        List<Integer> tmphc = cardhand;  //问题111
         for (int i = 0; i < cardhand.size(); i++) {
 
             int tmpcard = tmphc.get(0);