bug 26481烹饪的菜吃了增加的好感度

modules/library/api_usegift.go

@@ -120,8 +120,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) // 获取食物的
+	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{
@@ -131,7 +131,8 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 		}
 		return
 	}
-	addExp *= itemConf.SpecialType
+
+	addExp *= itemConf
 	_heroObj.Favorexp += addExp / 1000
 
 	// 折算出等级

modules/mline/api_challengeover.go

@@ -213,6 +213,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall
 	this.module.modelMline.modifyMlineData(session.GetUserId(), curChapter.Id, update)
 	rsp.Data = curChapter
 	session.SendMsg(string(this.module.GetType()), MlineChallengeOverResp, rsp) // 数据推送
+	// 校验功能开启
+	module, err2 := this.module.service.GetModule(comm.ModuleSys)
+	if err2 == nil {
+		if isys, ok := module.(comm.ISys); ok {
+			isys.CheckLvUpCond(session, req.StageId) // 校验新功能是否开启
+		}
+	}
 	// 主线任务统计 Rtype60
 	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype60, 1))
 	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype61, 1, int32(req.StageId)))

modules/tools/comp_configure.go

@@ -623,6 +623,9 @@ func (this *MCompConfigure) GetGrormetLlame(id string) (data int32, err error) {
 			_d := conf.Get(id)
 			if _d != nil {
 				data = _d.Flame
+				if data == 0 {
+					err = comm.NewNotFoundConfErr("gourmet", game_food, id)
+				}
 				return
 			}
 		}