From 6ca39af90a2b83a1ea7c43c2d39e88022c4fd3c1 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 21 Jul 2022 19:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=8D=87=E7=BA=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=BB=9F=E8=AE=A1=20=E6=89=93=E5=8D=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_strengthenUplv.go | 6 ++++++
 modules/mainline/api_getReward.go  | 4 ++--
 modules/mainline/model_story.go    | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go
index 4d9aff09f..180d88233 100644
--- a/modules/hero/api_strengthenUplv.go
+++ b/modules/hero/api_strengthenUplv.go
@@ -35,6 +35,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 		_expHero  *pb.DBHero // 消耗英雄
 		minAddExp int32
 		_costHero []*pb.DBHero // 删除的英雄
+		bLvUp     bool         // 是否升级
 	)
 
 	code = this.StrengthenUplvCheck(session, req) // check
@@ -126,6 +127,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 					curLv -= 1
 					break
 				}
+				bLvUp = true
 			}
 		}
 	} else {
@@ -179,5 +181,9 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 	_hero.Property = m
 	session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: []*pb.DBHero{_hero}})
 	session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{Hero: _hero})
+	if bLvUp { // 升级了 统计任务
+		this.module.ModuleTask.SendToTask(session.GetUserId(), comm.TaskTypeGetHero, &pb.TaskParam{First: _hero.Lv})
+	}
+
 	return
 }
diff --git a/modules/mainline/api_getReward.go b/modules/mainline/api_getReward.go
index add27a6b5..d2301ea8d 100644
--- a/modules/mainline/api_getReward.go
+++ b/modules/mainline/api_getReward.go
@@ -25,11 +25,11 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MainlineGetRew
 	}
 
 	_obj := this.module.modelMainline.getOneChapterInfo(session.GetUserId(), req.ChapterObj)
-	if _obj != nil {
+	if _obj == nil {
 		code = pb.ErrorCode_DBError
 		return
 	}
-	if _obj.AwaredID >= 0 {
+	if _obj.AwaredID > 0 {
 		code = pb.ErrorCode_MainlineRepeatReward // 重复领奖
 		return
 	}
diff --git a/modules/mainline/model_story.go b/modules/mainline/model_story.go
index 9e747b256..7f18500d5 100644
--- a/modules/mainline/model_story.go
+++ b/modules/mainline/model_story.go
@@ -49,6 +49,7 @@ func (this *ModelMainline) getOneChapterInfo(uid, obj string) *pb.DBMainline {
 	data := &pb.DBMainline{}
 	err := this.module.modelMainline.GetListObj(uid, obj, data)
 	if err != nil {
+		this.module.Errorf("%v", err)
 		return nil
 	}
 	return data