From 5377fa936bc9ed4a82d555ed1921b294cc3e2de6 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 1 Sep 2022 20:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=AE=A1=E7=AE=97=E6=AD=A3=E5=9C=A8=E5=88=B6?=
 =?UTF-8?q?=E4=BD=9C=E7=9A=84=E9=A3=9F=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/gourmet/model_gourmet.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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 // 正在做的