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)