From 04c33850c0ba5dd05a7ec0ab115a02709d814d4b Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 30 Sep 2025 10:23:30 +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/face/Face.go       |  1 -
 src/server/game/mod/order/Order.go     | 17 +++++------------
 src/server/game/mod/order/OrderFunc.go | 22 +++-------------------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/server/game/mod/face/Face.go b/src/server/game/mod/face/Face.go
index bde96eb3..51264fec 100644
--- a/src/server/game/mod/face/Face.go
+++ b/src/server/game/mod/face/Face.go
@@ -30,7 +30,6 @@ func (f *FaceMod) InitData() {
 	now := GoUtil.Now()
 	if f.List == nil {
 		f.List = make(map[int]*Face)
-
 		f.SetId = 1
 	}
 	InitId := faceCfg.GetInitList()
diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index fbe4ed05..5ca9e842 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -436,18 +436,11 @@ func (o *OrderMod) CreateNormalOrder(lv int, Emit []int, EnergyMul, OrderType in
 		}
 		break
 	}
-	// if len(mergeList) == 2 {
-	// 	ColorMap := make(map[string]int)
-	// 	for _, v := range mergeList {
-	// 		Color := mergeDataCfg.GetColorById(v)
-	// 		ColorMap[Color]++
-	// 		if ColorMap[Color] > 1 {
-	// 			log.Printf("CreateNormalOrder: %v, %v, %v", mergeList, OrderDiff, err)
-	// 			return fmt.Errorf("订单生成失败，重复颜色")
-	// 		}
-	// 	}
-
-	// }
+	for _, v := range mergeList {
+		if v == 0 {
+			return nil
+		}
+	}
 	o.addOrder(mergeList, OrderDiff, OrderType)
 	return nil
 }
diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go
index e4dffa4f..4c0fa88f 100644
--- a/src/server/game/mod/order/OrderFunc.go
+++ b/src/server/game/mod/order/OrderFunc.go
@@ -501,25 +501,6 @@ func randOrderChess(o *OrderMod, lv int, Emit []int, EnergyMul, OrderType int) (
 	//获取订单体力范围和棋子数量
 	MinEnergy, MaxEnergy, ChessNum := getChessByDiff(lv, OrderDiff, OrderType)
 	mergeList := getChessFromPoolByEnergy(o, MinEnergy, MaxEnergy, ChessNum, Emit, EnergyMul, OrderDiff)
-	// // 根据订单棋子难度生成棋子
-	// for _, v := range ChessDiff {
-	// 	ChessId := 0
-	// 	Num := 0
-	// 	for {
-	// 		Num++
-	// 		if Num > 50 {
-	// 			break
-	// 		}
-	// 		ChessId = getChessFromPoolByDiff(o, v, Emit, EnergyMul)
-	// 		if ChessId == 0 {
-	// 			continue
-	// 		}
-	// 		if !GoUtil.InArray(ChessId, mergeList) {
-	// 			break
-	// 		}
-	// 	}
-	// 	mergeList = append(mergeList, ChessId)
-	// }
 	return mergeList, OrderDiff, nil
 }
 
@@ -568,6 +549,9 @@ func filterPool(o *OrderMod) {
 }
 
 func ShuffleColor(List []string, Last string) []string {
+	if len(List) <= 1 {
+		return List
+	}
 	Break := 0
 	List2 := make([]string, len(List))
 	List3 := make([]string, len(List))