From 4d0154f3ac8c3396310a735fa49d70baa1565c62 Mon Sep 17 00:00:00 2001
From: li <ljf@com>
Date: Wed, 11 Feb 2026 17:36:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=9B=E6=9D=A1=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E8=B0=83=E6=95=B4=E4=B8=BA=E9=AB=98?=
 =?UTF-8?q?=E4=BA=8E=E4=BA=94=E5=85=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JJJJK 这种牌既是五公又是四条，客户要求四条 > 五公，
将四条判断移到五公之前
---
 freedom/utils/CardPositionNn.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/freedom/utils/CardPositionNn.php b/freedom/utils/CardPositionNn.php
index 05b9b6a..7095626 100644
--- a/freedom/utils/CardPositionNn.php
+++ b/freedom/utils/CardPositionNn.php
@@ -489,15 +489,7 @@ class CardPositionNn
             }
         }
         $word = '';
-        if($king == 5){
-            $cow = 11;
-            $word = '五公';
-            $result['word'] = $word;
-            $result['cow'] = $cow;
-            $result['max'] = $max;
-            return $result;
-        }
-        //判断四条（炸弹）：4张相同点数
+        //判断四条（炸弹）：4张相同点数，四条 > 五公
         $cardNums = [];
         for($i=0;$i<5;$i++){
             $cardNums[] = $card[$i];
@@ -511,6 +503,14 @@ class CardPositionNn
             $result['max'] = $max;
             return $result;
         }
+        if($king == 5){
+            $cow = 11;
+            $word = '五公';
+            $result['word'] = $word;
+            $result['cow'] = $cow;
+            $result['max'] = $max;
+            return $result;
+        }
         for($i=0;$i<4;$i++){//对5张牌从大到小排序。
             for($j=$i+1;$j<5;$j++){
                 if($card[$i] < $card[$j]){