From 9c9c19c9a692173d05e29c2628aa50c61d28b443 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 29 May 2025 16:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=92=A4=E9=94=80=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=88?=
 =?UTF-8?q?=E8=BF=99=E5=9D=97=E9=80=BB=E8=BE=91=E6=B3=A8=E9=87=8A=E6=8E=89?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/mod/order/Order.go | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index ff6b91c9..d94d6cca 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -619,13 +619,8 @@ func (o *OrderMod) ChangeEnergyMul(lv int, Emit []int, EnergyMul int, ChessList
 	}
 	for k, v := range o.OrderList {
 		NeedTrigger := false
-		HasOne := false
 		for _, vv := range v.MergeId {
 			Lv := mergeDataCfg.GetLvById(vv)
-			if GoUtil.InArray(vv, ChessList) {
-				HasOne = true
-				break
-			}
 			Color := mergeDataCfg.GetColorById(vv)
 			EmitId := GetEmitByColor(Emit, Color)
 			_, Max := getChesslvRange(EmitId, EnergyMul)
@@ -635,9 +630,7 @@ func (o *OrderMod) ChangeEnergyMul(lv int, Emit []int, EnergyMul int, ChessList
 			}
 			NeedTrigger = true
 		}
-		if HasOne { // 棋盘上有订单中的棋子，不进行修改
-			continue
-		}
+
 		if v.Type == Preheat_type { // 预热订单 修改倍数时修改棋子等级
 			ChessId := v.MergeId[0]
 			ChessColor := mergeDataCfg.GetColorById(ChessId)