diff --git a/modules/gourmet/model_gourmet.go b/modules/gourmet/model_gourmet.go index b56582e27..44919121d 100644 --- a/modules/gourmet/model_gourmet.go +++ b/modules/gourmet/model_gourmet.go @@ -112,13 +112,14 @@ func (this *modelGourmet) CalculationGourmet(uid string, gourmet *pb.DBGourmet) skillLv := gourmet.Skill[foodtype] // 获取技能等级 // 计算出需要的时间 _gourmetcfg := this.module.configure.GetGourmetConfigData(foodtype, skillLv) // 美食家配置表 - for i := 0; i < int(order.FoodCount); i++ { + iCount := int(order.FoodCount) + for i := 0; i < iCount; i++ { curTime += szTime[order.FoodType] order.FoodCount-- if order.FoodCount == 0 { order.CookTime = 0 } - order.CookTime -= szTime[order.FoodType] + order.CookTime = order.FoodCount * szTime[order.FoodType] if gourmet.CookingFood == nil { gourmet.CookingFood = &pb.Cooking{} gourmet.CookingFood.STime = time.Now().Unix() @@ -162,7 +163,15 @@ func (this *modelGourmet) CalculationGourmet(uid string, gourmet *pb.DBGourmet) gourmet.OrderCostTime += szTime[order.FoodType] * order.FoodCount } } + if gourmet.CookingFood != nil && gourmet.CookingFood.ETime <= time.Now().Unix() { // 当前时间超过正在做的时间 + foodtype := gourmet.CookingFood.FoodType + skillLv := gourmet.Skill[foodtype] // 获取技能等级 + _gourmetcfg := this.module.configure.GetGourmetConfigData(foodtype, skillLv) // 美食家配置表 + gourmet.Items = this.module.configure.GetMultipleDropReward(_gourmetcfg.Using, _gourmetcfg.Propsgroup, gourmet.Items) + gourmet.CookingFood = nil + } // 保存信息 + mapData["items"] = gourmet.Items mapData["foods"] = gourmet.Foods mapData["orderCostTime"] = gourmet.OrderCostTime mapData["cookingFood"] = gourmet.CookingFood // 正在做的