diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index e07269ed..be51738c 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -1007,27 +1007,28 @@ func (player *Player) FormatOrderReward() { }) OrderMod.OrderList[k] = v } - return - } - for k, v := range OrderMod.GetOrderList() { - if len(v.Items) != 0 { - continue - } - if v.Type != order.Common_type { - continue - } - Items := make([]*item.Item, 0) - Star := order.GetOrderStar(v.MergeId) - Star = int(float64(Star)*float64(OrderFactor)/10) * 10 - Items = player.GetPetOrderReward(Star, Items) - if len(Items) == 1 && Items[0].Id == item.ITEM_STAR_ID { - v.Type = order.Common_type - } else { - v.Type = order.Pet_type - } - v.Items = Items - OrderMod.OrderList[k] = v + } else { + for k, v := range OrderMod.GetOrderList() { + if len(v.Items) != 0 { + continue + } + if v.Type != order.Common_type { + continue + } + Items := make([]*item.Item, 0) + Star := order.GetOrderStar(v.MergeId) + Star = int(float64(Star)*float64(OrderFactor)/10) * 10 + Items = player.GetPetOrderReward(Star, Items) + if len(Items) == 1 && Items[0].Id == item.ITEM_STAR_ID { + v.Type = order.Common_type + } else { + v.Type = order.Pet_type + } + v.Items = Items + OrderMod.OrderList[k] = v + } } + // 触发式订单 满足条件生成零件订单 PartCost := DecorateMod.GetPartCost() PartBag := ChessMod.GetPartBag()