From 3023f1b10769196777496e3310773080080893ee Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 4 Aug 2023 15:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                |  1 -
 modules/library/api_usegift.go | 29 ++++++++++++++---------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index 02bc224a5..f71d03ae8 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -593,7 +593,6 @@ type (
 		GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err error)     // 通过活动id 获取活动信息
 		GetAllHdInfo() (hdList map[int32][]*pb.DBHuodong)                 // 获取所有活动信息
 		GetHdInfoByItype(itype int32) (result []*pb.DBHuodong, err error) //
-		UpdateActivitySlider(session IUserSession)                        // 修改活动进度
 
 		// 庆典活动
 		HDCelebration(session IUserSession, systemtype int32, bosstype int32) bool
diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go
index d4c19a917..321c1fbfe 100644
--- a/modules/library/api_usegift.go
+++ b/modules/library/api_usegift.go
@@ -84,6 +84,17 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 
 		addExp += attenuation[i]
 	}
+	itemConf, err1 := this.module.ModuleTools.GetGrormetLlame(req.Items)
+	if err1 != nil {
+		this.module.Errorf("赠送菜品配置没找到：%s", req.Items)
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err1.Error(),
+		}
+		return
+	}
+	addExp *= itemConf
 	_heroObj.Givecount += req.Counts
 	// 校验是否是自己喜欢的食物
 	_c, err := this.module.configure.GetFavorability(_heroObj.Heroid, _heroObj.Favorlv)
@@ -98,7 +109,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 	for _, v := range _c.LikesFood { // 喜欢的食物
 		if v == req.Items {
 			likeStates = 1
-			addExp = int32(math.Floor(float64(addExp*this.module.ModuleTools.GetGlobalConf().FavorabilityLikes*req.Counts) / 1000))
+			addExp = int32(math.Floor(float64(addExp/1000) * float64(this.module.ModuleTools.GetGlobalConf().FavorabilityLikes) / 1000))
 			break
 		}
 	}
@@ -106,7 +117,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 		for _, v := range _c.DislikingFood { //不喜欢
 			if v == req.Items {
 				likeStates = 2
-				addExp = int32(math.Floor(float64(addExp*this.module.ModuleTools.GetGlobalConf().FavorabilityDislikes*req.Counts) / 1000))
+				addExp = int32(math.Floor(float64(addExp/1000) * float64(this.module.ModuleTools.GetGlobalConf().FavorabilityDislikes) / 1000))
 				break
 			}
 		}
@@ -121,20 +132,8 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 	if errdata = this.module.CheckRes(session, res); errdata != nil { // 道具不够直接返回
 		return
 	}
-	itemConf, err1 := this.module.ModuleTools.GetGrormetLlame(req.Items)
-	//itemConf, err1 := this.module.configure.GetItemConfigureData(req.Items) // 获取食物的
-	if err1 != nil {
-		this.module.Errorf("赠送菜品配置没找到：%s", req.Items)
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_ConfigNoFound,
-			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-			Message: err1.Error(),
-		}
-		return
-	}
 
-	addExp *= itemConf
-	_heroObj.Favorexp += addExp / 1000
+	_heroObj.Favorexp += addExp
 
 	// 折算出等级
 	for {