From 553fdef352a87723e4cacf51fcf78d50e2621f67 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:55:10 +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/UnitTest.go            | 6 +++---
 src/server/game/mod/order/OrderFunc.go | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go
index a2392167..fec83c7e 100644
--- a/src/server/game/UnitTest.go
+++ b/src/server/game/UnitTest.go
@@ -54,10 +54,10 @@ func UnitChessShop(p *Player) error {
 func UnitOrder(p *Player) error {
 	OrderMod := p.PlayMod.getOrderMod()
 	ChessMod := p.PlayMod.getChessMod()
+	BaseMod := p.PlayMod.getBaseMod()
 	OrderMod.OrderList = make(map[int]order.Order)
-	OrderMod.LastDiff = 1
-	for i := 0; i < 3; i++ {
-		err := OrderMod.CreateNormalOrder(7, ChessMod.GetEmitList(), 3)
+	for i := 0; i < 1003; i++ {
+		err := OrderMod.CreateNormalOrder(BaseMod.GetLevel(), ChessMod.GetEmitList(), BaseMod.EnergyMul)
 		if err != nil {
 			return err
 		}
diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go
index 5ab238bb..a9ab36df 100644
--- a/src/server/game/mod/order/OrderFunc.go
+++ b/src/server/game/mod/order/OrderFunc.go
@@ -335,13 +335,13 @@ 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)
+		NewLev1 := mergeDataCfg.DynamicLev(NewLev, EmitChessId, MinChessColor)
+		NewLev2 := adjustLev(NewLev1, EnergyMul)
 		MinChessLv := mergeDataCfg.GetLvById(MinChessId)
 		NewEmitChessId := getEmitByColor(Emit, MinChessColor)
-		NewChessLv := mergeDataCfg.DynamicLev(NewLev1, NewEmitChessId, MinChessColor)
+		NewChessLv := mergeDataCfg.DynamicLev(NewLev2, NewEmitChessId, MinChessColor)
 		o.ChessPool = GoUtil.DeleteEleByValue(o.ChessPool, MinChessId)
 		for i := NewChessLv; i < MinChessLv; i++ {
 			ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(i, MinChessColor)
@@ -349,8 +349,9 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in
 				o.ChessPool = append(o.ChessPool, ChessId2)
 			}
 		}
-		return mergeDataCfg.GetChessIdByLvAndColor(NewLev1, MinChessColor)
+		return mergeDataCfg.GetChessIdByLvAndColor(NewLev2, MinChessColor)
 	}
+	NewLev1 := mergeDataCfg.DynamicLev(NewLev, EmitChessId, Color)
 	ChessId := mergeDataCfg.GetChessIdByLvAndColor(NewLev1, Color)
 	ProductColor := mergeDataCfg.GetEmitProduceType(EmitChessId)
 	for _, i := range ProductColor {