From e8fd0d99531ab49c831e70e614df1623c415a6ab Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 15 Jan 2025 14:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go
index dab8967c..f89a0bd5 100644
--- a/src/server/game/mod/order/OrderFunc.go
+++ b/src/server/game/mod/order/OrderFunc.go
@@ -247,22 +247,6 @@ func randOrderChess(o *OrderMod, lv int, Emit []int, EnergyMul int) ([]int, int,
 	mergeList := make([]int, 0, len(ChessDiff))
 	// 根据订单棋子难度生成棋子
 	for _, v := range ChessDiff {
-		// EmitId := getEmitId(o, Emit)
-		// ColorRand := mergeDataCfg.GetEmitOrderProduce(EmitId)
-		// Color := GoUtil.RandStringSlice(ColorRand)
-		// EmitChessId := getEmitByColor(Emit, Color)
-		// ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul)
-		// NewLev := getChessLv(ChessMinLv, ChessMaxLv, v)
-		// ColorMaxLv := mergeDataCfg.GetMaxLvByColor(Color)
-		// NewLev = min(NewLev, ColorMaxLv)
-		// ChessId := mergeDataCfg.GetChessIdByLvAndColor(NewLev, Color)
-		// Type := mergeDataCfg.GetTypeById(ChessId)
-		// if Type != "Product" {
-		// 	continue
-		// }
-		// if ChessId == 0 {
-		// 	continue
-		// }
 		ChessId := 0
 		for {
 			ChessId = getChessFromPoolByDiff(o, v, Emit, EnergyMul)
@@ -340,19 +324,9 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in
 		if !GoUtil.InStringArray(chessColor, ColorRand) {
 			continue
 		}
-		if reflectChess[chess] == Diff {
-			// ChessLev := mergeDataCfg.GetLvById(chess)
+		ChessLv := mergeDataCfg.GetLvById(chess)
+		if reflectChess[chess] == Diff && ChessLv >= EnergyMul+1 && ChessLv <= EnergyMul+12 {
 			o.ChessPool = append(o.ChessPool[:i], o.ChessPool[i+1:]...)
-			// for _, i := range ColorRand {
-			// 	if i == Color {
-			// 		continue
-			// 	}
-			// 	NewLev2 := mergeDataCfg.DynamicLev2(ChessLev, EmitChessId, Color, i)
-			// 	ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, i)
-			// 	if ChessId2 != 0 {
-			// 		o.ChessPool = append(o.ChessPool, ChessId2)
-			// 	}
-			// }
 			return chess
 		}
 	}
@@ -361,6 +335,7 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in
 	ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul)
 	NewLev := getChessLv(ChessMinLv, ChessMaxLv, Diff)
 	NewLev1 := mergeDataCfg.DynamicLev(NewLev, EmitChessId, Color)
+	NewLev1 = adjustLev(NewLev1, EnergyMul)
 	if MinChessId != 0 {
 		MinChessColor := mergeDataCfg.GetColorById(MinChessId)
 		MinChessLv := mergeDataCfg.GetLvById(MinChessId)
@@ -382,6 +357,7 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in
 			continue
 		}
 		NewLev2 := mergeDataCfg.DynamicLev2(NewLev1, EmitChessId, Color, i)
+		NewLev2 = adjustLev(NewLev2, EnergyMul)
 		ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, i)
 		if ChessId2 != 0 {
 			o.ChessPool = append(o.ChessPool, ChessId2)
@@ -427,3 +403,7 @@ func initReflectChess2(Color string, Start, End, Diff, adjust int) {
 		reflectChess[ChessId] = Diff
 	}
 }
+
+func adjustLev(Lev, EnergyMul int) int {
+	return max(min(Lev, EnergyMul+12), EnergyMul+1)
+}