From 695fe2f6076f916e0093e4b92000068917bf8d98 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 23 Dec 2022 18:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E5=BE=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hunting/api_getlist.go      |  6 +-----
 modules/viking/api_challenge.go     |  8 +++-----
 modules/viking/api_challengeover.go | 29 +++++++++++++----------------
 modules/viking/api_getlist.go       |  6 ++----
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/modules/hunting/api_getlist.go b/modules/hunting/api_getlist.go
index 11605d3e8..0f045710c 100644
--- a/modules/hunting/api_getlist.go
+++ b/modules/hunting/api_getlist.go
@@ -40,7 +40,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe
 		}
 		_cfg := this.module.configure.GetHuntingBossTypeConfigData()
 		for k := range _cfg {
-			list.Boss[k] = 0
+			list.Boss[k] = 1
 			str := strconv.Itoa(int(k)) + "_1"
 			list.BossTime[str] = 0
 		}
@@ -120,10 +120,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe
 	}
 	mapData["recoveryTime"] = list.RecoveryTime
 	code = this.module.ModifyHuntingData(session.GetUserId(), mapData) //修改内存信息
-	// 发送难度
-	for k := range list.Boss {
-		list.Boss[k] += 1
-	}
 	session.SendMsg(string(this.module.GetType()), HuntingGetListResp, &pb.HuntingGetListResp{Data: list})
 	return
 }
diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go
index 54494172c..d8fcd09d2 100644
--- a/modules/viking/api_challenge.go
+++ b/modules/viking/api_challenge.go
@@ -51,13 +51,11 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 
 	value, ok := viking.Boss[req.BossId]
 	if !ok { // 类型校验
-		viking.Boss[req.BossId] = 0
+		viking.Boss[req.BossId] = 1
 	}
 	if value < req.Difficulty {
-		if value+1 != req.Difficulty {
-			code = pb.ErrorCode_VikingLvErr
-			return
-		}
+		code = pb.ErrorCode_HuntingLvErr
+		return
 	}
 
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 1c8fc9f53..a5b66cd5a 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -61,26 +61,21 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 	}
 	value, ok := viking.Boss[req.BossId]
 	if !ok { // 类型校验
-		viking.Boss[req.BossId] = 0
+		viking.Boss[req.BossId] = 1
 	}
-	if value < req.Difficulty {
-		if value+1 != req.Difficulty {
-			code = pb.ErrorCode_VikingLvErr
-			return
-		}
+	if value == req.Difficulty {
 		newChallenge = true
-		viking.Boss[req.BossId]++
-		// 校验是不是达到最大难度
-		maxDifficulity := this.module.configure.GetMaxDifficultyByBossID(req.BossId)
-		if viking.Boss[req.BossId] > maxDifficulity {
-			viking.Boss[req.BossId] = maxDifficulity
-		}
-		mapData["boss"] = viking.Boss
-	}
-
-	if code != pb.ErrorCode_Success {
+	} else if value < req.Difficulty {
+		code = pb.ErrorCode_HuntingLvErr
 		return
 	}
+	// 校验是不是达到最大难度
+	maxDifficulity := this.module.configure.GetMaxDifficultyByBossID(req.BossId)
+	if viking.Boss[req.BossId] > maxDifficulity {
+		viking.Boss[req.BossId] = maxDifficulity
+	}
+	mapData["boss"] = viking.Boss
+
 	// 校验门票数量够不够
 	if code = this.module.ConsumeRes(session, []*cfg.Gameatn{costRes}, true); code != pb.ErrorCode_Success {
 		return
@@ -100,6 +95,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 	}
 	mapData["bossTime"] = viking.BossTime // 更新时间
 	if newChallenge && bWin {             // 新关卡挑战通过 发放首通奖励
+		viking.Boss[req.BossId]++
+		mapData["boss"] = viking.Boss
 		if code = this.module.DispenseRes(session, vikingCfg.Firstprize, true); code != pb.ErrorCode_Success {
 			return
 		}
diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go
index 2a1ad4655..d98f3e058 100644
--- a/modules/viking/api_getlist.go
+++ b/modules/viking/api_getlist.go
@@ -40,7 +40,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq
 		}
 		_cfg := this.module.configure.GetVikingBossTypeConfigData()
 		for k := range _cfg {
-			list.Boss[k] = 0
+			list.Boss[k] = 1
 			str := strconv.Itoa(int(k)) + "_1"
 			list.BossTime[str] = 0
 		}
@@ -117,9 +117,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq
 	}
 	mapData["recoveryTime"] = list.RecoveryTime
 	code = this.module.ModifyVikingData(session.GetUserId(), mapData) //修改内存信息
-	for k := range list.Boss {
-		list.Boss[k] += 1
-	}
+
 	session.SendMsg(string(this.module.GetType()), VikingGetListResp, &pb.VikingGetListResp{Data: list})
 	return
 }