找服务接口

incubator-game/src/main/java/com/incubator/game/util/GDUtils.java

@@ -363,25 +363,21 @@ public final class GDUtils {
      */
     private static int comparePairSequence(List<Integer> previousPoints, List<Integer> currentPoints, int curLevel, int wildCardCountCurrent, int wildCardCountPrevious) {
         // 替换赖子牌为当前级牌点数，形成有效的对子序列
-        List<Integer> adjustedPrevious = replaceWildCardsWithTrump(previousPoints, wildCardCountPrevious, curLevel, 2);
-        List<Integer> adjustedCurrent = replaceWildCardsWithTrump(currentPoints, wildCardCountCurrent, curLevel, 2);
+        List<Integer> adjustedPrevious = replaceWildCardsWithTrump(previousPoints, wildCardCountPrevious, curLevel, 6);
+        List<Integer> adjustedCurrent = replaceWildCardsWithTrump(currentPoints, wildCardCountCurrent, curLevel, 6);
 
-        // 判断每个牌型的最大点数
-        int maxPrevious = getPairValue(adjustedPrevious);
-        int maxCurrent = getPairValue(adjustedCurrent);
+        // 获取三连对的最大点数
+        int maxPrevious = getMaxConsecutiveValue(adjustedPrevious);
+        int maxCurrent = getMaxConsecutiveValue(adjustedCurrent);
 
-        // 主牌优先级比较
+        // 级牌优先级比较
         boolean previousIsTrump = (maxPrevious == curLevel);
         boolean currentIsTrump = (maxCurrent == curLevel);
 
-        if (currentIsTrump && !previousIsTrump) {
-            return 1; // 当前牌是主牌对子，优先级更高
-        }
-        if (!currentIsTrump && previousIsTrump) {
-            return -1; // 上一手牌是主牌对子，优先级更高
-        }
+        if (currentIsTrump && !previousIsTrump) return 1; // 当前牌是级牌三连对
+        if (!currentIsTrump && previousIsTrump) return -1; // 上一手牌是级牌三连对
 
-        // 默认比较对子序列的最大点数（最后一个对的点数）
+        // 默认比较最大点数
         return Integer.compare(maxCurrent, maxPrevious);
     }
 
@@ -416,11 +412,11 @@ public final class GDUtils {
         List<Integer> adjustedPrevious = replaceWildCardsWithTrump(previousPoints, wildCardCountPrevious, curLevel, 2);
         List<Integer> adjustedCurrent = replaceWildCardsWithTrump(currentPoints, wildCardCountCurrent, curLevel, 2);
 
-        // 检查并获取每手牌的最大对子点数
+        // 获取对子的最大点数
         int maxPreviousPair = getPairValue(adjustedPrevious);
         int maxCurrentPair = getPairValue(adjustedCurrent);
 
-        // 主牌优先级比较（如果最大对子点数等于当前级数，则认为它是主牌对子）
+        // 级牌优先级比较
         boolean previousIsTrumpPair = (maxPreviousPair == curLevel);
         boolean currentIsTrumpPair = (maxCurrentPair == curLevel);
 
@@ -466,15 +462,15 @@ public final class GDUtils {
      * @return 正数表示当前牌较大，负数表示上一手牌较大，0表示相等
      */
     private static int compareTriple(List<Integer> previousPoints, List<Integer> currentPoints, int curLevel, int wildCardCountCurrent, int wildCardCountPrevious) {
-        // 替换赖子牌为当前级牌点数，形成有效的三张牌
+        // 替换赖子牌为当前级牌或其他牌点
         List<Integer> adjustedPrevious = replaceWildCardsWithTrump(previousPoints, wildCardCountPrevious, curLevel, 3);
         List<Integer> adjustedCurrent = replaceWildCardsWithTrump(currentPoints, wildCardCountCurrent, curLevel, 3);
 
-        // 获取每手牌的最大三张点数
+        // 获取三张牌的最大点数
         int maxPreviousTriple = getMaxFrequencyCard(adjustedPrevious, 3);
         int maxCurrentTriple = getMaxFrequencyCard(adjustedCurrent, 3);
 
-        // 主牌优先级比较
+        // 级牌优先级比较
         boolean previousIsTrumpTriple = (maxPreviousTriple == curLevel);
         boolean currentIsTrumpTriple = (maxCurrentTriple == curLevel);
 
@@ -485,7 +481,7 @@ public final class GDUtils {
             return -1; // 上一手牌是主牌三张，优先级更高
         }
 
-        // 默认比较三张点数
+        // 默认比较三张牌点数
         return Integer.compare(maxCurrentTriple, maxPreviousTriple);
     }
 
@@ -559,25 +555,23 @@ public final class GDUtils {
      * @return 正数表示当前牌较大，负数表示上一手牌较大，0表示相等
      */
     private static int compareThreeConsecutive(List<Integer> previousPoints, List<Integer> currentPoints, int curLevel, int wildCardCountCurrent, int wildCardCountPrevious) {
-        // 替换赖子牌为当前级牌点数，形成有效的三张连续牌
+        // 替换赖子牌为当前级牌或其他牌点
         List<Integer> adjustedPrevious = replaceWildCardsWithTrump(previousPoints, wildCardCountPrevious, curLevel, 6);
         List<Integer> adjustedCurrent = replaceWildCardsWithTrump(currentPoints, wildCardCountCurrent, curLevel, 6);
 
-        // 判断上一手牌和当前手牌的强度
-        int previousStrength = calculateHandStrength(adjustedPrevious, wildCardCountPrevious);
-        int currentStrength = calculateHandStrength(adjustedCurrent, wildCardCountCurrent);
+        // 获取三顺的最大点数
+        int maxPrevious = getMaxConsecutiveValue(adjustedPrevious);
+        int maxCurrent = getMaxConsecutiveValue(adjustedCurrent);
 
-        // 如果当前牌比上一手牌强，返回1
-        if (currentStrength > previousStrength) {
-            return 1;
-        }
-        // 如果上一手牌比当前牌强，返回-1
-        if (currentStrength < previousStrength) {
-            return -1;
-        }
+        // 级牌优先级比较
+        boolean previousIsTrump = (maxPrevious == curLevel);
+        boolean currentIsTrump = (maxCurrent == curLevel);
+
+        if (currentIsTrump && !previousIsTrump) return 1; // 当前牌是级牌三顺
+        if (!currentIsTrump && previousIsTrump) return -1; // 上一手牌是级牌三顺
 
-        // 如果两手牌的强度相同，按点数进行比较
-        return compareByPoints(adjustedPrevious, adjustedCurrent);
+        // 默认比较最大点数
+        return Integer.compare(maxCurrent, maxPrevious);
     }
 
     /**
@@ -660,11 +654,23 @@ public final class GDUtils {
      * @return 正数表示当前牌较大，负数表示上一手牌较大，0表示相等
      */
     private static int compareStraight(List<Integer> previousPoints, List<Integer> currentPoints, int curLevel, int wildCardCountCurrent, int wildCardCountPrevious) {
-        // 替换赖子牌为当前级牌点数，形成有效的顺子
+        // 替换赖子牌为当前级牌或其他牌点
         List<Integer> adjustedPrevious = replaceWildCardsWithTrump(previousPoints, wildCardCountPrevious, curLevel, 5);
         List<Integer> adjustedCurrent = replaceWildCardsWithTrump(currentPoints, wildCardCountCurrent, curLevel, 5);
+        // 获取每手牌的最小点数
+        int minPreviousStraight = getMinStraightValue(adjustedPrevious);
+        int minCurrentStraight = getMinStraightValue(adjustedCurrent);
 
-        // 获取每手牌的最大顺子点数
+        // 如果当前顺子的最小点数较大，返回1
+        if (minCurrentStraight > minPreviousStraight) {
+            return 1;
+        }
+        // 如果上一手牌的最小点数较大，返回-1
+        if (minCurrentStraight < minPreviousStraight) {
+            return -1;
+        }
+
+        // 如果顺子的最小点数相同，比较顺子的最大点数
         int maxPreviousStraight = getMaxStraightValue(adjustedPrevious);
         int maxCurrentStraight = getMaxStraightValue(adjustedCurrent);
 
@@ -677,11 +683,8 @@ public final class GDUtils {
             return -1;
         }
 
-        // 如果顺子的最大点数相同，比较顺子的最小点数（头牌）
-        int minPreviousStraight = getMinStraightValue(adjustedPrevious);
-        int minCurrentStraight = getMinStraightValue(adjustedCurrent);
-
-        return Integer.compare(minCurrentStraight, minPreviousStraight);
+        // 如果顺子的最小点数和最大点数都相同，返回0
+        return 0;
     }
 
  /*   *//**