修复订单调整bug

This commit is contained in:
hahwu 2025-01-18 16:01:33 +08:00
parent 550330da90
commit 436c2049bc

View File

@ -484,17 +484,6 @@ func (o *OrderMod) CheckSuperOrder() bool {
*/
func (o *OrderMod) ChangeEnergyMul(lv int, Emit []int, EnergyMul int, ChessList []int) {
for k, v := range o.OrderList {
if v.Type == Preheat_type { // 预热订单 修改倍数时修改棋子等级
ChessId := v.MergeId[0]
ChessColor := mergeDataCfg.GetColorById(ChessId)
PreheatStep := o.PreheatStep[ChessColor]
NewChessId := mergeDataCfg.GetChessIdByLvAndColor(EnergyMul+PreheatStep, ChessColor)
delete(o.OrderList, k)
o.addOrder([]int{NewChessId}, diff_low, Preheat_type)
}
if v.Type != Common_type {
continue
}
NeedTrigger := false
HasOne := false
for _, vv := range v.MergeId {
@ -511,6 +500,17 @@ func (o *OrderMod) ChangeEnergyMul(lv int, Emit []int, EnergyMul int, ChessList
if HasOne { // 棋盘上有订单中的棋子,不进行修改
continue
}
if v.Type == Preheat_type { // 预热订单 修改倍数时修改棋子等级
ChessId := v.MergeId[0]
ChessColor := mergeDataCfg.GetColorById(ChessId)
PreheatStep := o.PreheatStep[ChessColor]
NewChessId := mergeDataCfg.GetChessIdByLvAndColor(EnergyMul+PreheatStep, ChessColor)
delete(o.OrderList, k)
o.addOrder([]int{NewChessId}, diff_low, Preheat_type)
}
if v.Type != Common_type {
continue
}
/**
当每次倍数调整玩家主动调整或因为体力不足跌落在普通订单中即不包括偷猫订单超级订单如果出现超出上下阈值
订单棋子等级<n且该棋子棋盘上没有