diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index ab81cef9..8c90b754 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -1052,6 +1052,20 @@ func (player *Player) AddOrder() { OrderMod := player.PlayMod.getOrderMod() MaxOrderNum := orderCfg.GetOrderNum(BaseMod.GetLevel()) n := 0 + if OrderMod.LastOrder.Type == order.Preheat_type { + ChessId := OrderMod.LastOrder.MergeId[0] + ChessColor := mergeDataCfg.GetColorById(ChessId) + PreheatStep := OrderMod.PreheatStep[ChessColor] + if PreheatStep < 4 { + NewChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+PreheatStep+1, ChessColor) + Items, ok := order.PreheatItems[OrderMod.PreheatStep[ChessColor]] + if !ok { + Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId}))} + } + OrderMod.AddPreheatOrder([]int{NewChessId}, order.DIFF_LOW, order.Preheat_type, Items) + OrderMod.PreheatStep[ChessColor]++ + } + } for _, v := range OrderMod.OrderList { if v.Type == order.Common_type || v.Type == order.Pet_type || v.Type == order.Part_type || v.Type == order.Fixed_type || v.Type == order.Preview_type { n++ @@ -1072,21 +1086,6 @@ func (player *Player) CreateNormalOrder() { OrderMod := player.PlayMod.getOrderMod() // 预热订单 - if OrderMod.LastOrder.Type == order.Preheat_type { - ChessId := OrderMod.LastOrder.MergeId[0] - ChessColor := mergeDataCfg.GetColorById(ChessId) - PreheatStep := OrderMod.PreheatStep[ChessColor] - if PreheatStep < 4 { - NewChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+PreheatStep+1, ChessColor) - Items, ok := order.PreheatItems[OrderMod.PreheatStep[ChessColor]] - if !ok { - Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId}))} - } - OrderMod.AddPreheatOrder([]int{NewChessId}, order.DIFF_LOW, order.Preheat_type, Items) - OrderMod.PreheatStep[ChessColor]++ - return - } - } // 安慰订单 Now := GoUtil.Now()