From 78bfb4eb2dad812aee0886b3a788f31455cb6160 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/mod/order/OrderFunc.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go
index 41847480..c286cfe4 100644
--- a/src/server/game/mod/order/OrderFunc.go
+++ b/src/server/game/mod/order/OrderFunc.go
@@ -1,6 +1,7 @@
 package order
 
 import (
+	"log"
 	"math"
 	"server/GoUtil"
 	mergeDataCfg "server/conf/mergeData"
@@ -648,8 +649,12 @@ func getEmitSeries(o *OrderMod, Emit []int) string {
 			o.initColorShuffle(Emit)
 			continue
 		}
+		if o.LastColor == PopEmitId {
+			continue
+		}
 		PopEmitIdProductNum := mergeDataCfg.GetEmitProductNumByColor(PopEmitId)
 		o.initColorShuffle(Emit)
+		// 单链棋子 且订单中已有两个 跳过
 		if PopEmitIdProductNum == 1 && ChessColorNum[PopEmitId] >= 2 {
 			continue
 		} else {
@@ -845,6 +850,9 @@ func getChessFromPoolByEnergy(o *OrderMod, MinEnergy, MaxEnergy, ChessNum int, E
 	for i := 0; i < ChessNum; i++ {
 		ColorArr = append(ColorArr, getEmitSeries(o, Emit))
 	}
+	if len(ColorArr) == 2 && ColorArr[0] == ColorArr[1] {
+		log.Default()
+	}
 	ChessArr := make([]int, 0)
 	if len(ColorArr) == 1 {
 		Chess, _ := o.getChessIdPool(Emit, ColorArr[0], EnergyMul, 0, MinEnergy, MaxEnergy, OrderDiff, 0)