From beceeea318dc61fe341e66c47b4e77ac1ca2d1cc Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 23 Feb 2023 16:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E6=94=AF=E6=8C=81=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/smithy/api_atlasactivate.go |  2 +-
 modules/viking/api_challenge.go     | 10 +++++++---
 modules/viking/api_challengeover.go | 11 ++++++++---
 modules/viking/api_getlist.go       |  7 -------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go
index 154791da5..9d18be003 100644
--- a/modules/smithy/api_atlasactivate.go
+++ b/modules/smithy/api_atlasactivate.go
@@ -52,7 +52,7 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla
 			}
 		}
 		update := make(map[string]interface{}, 0)
-		update["atlas"] = v
+		update["atlas"] = atlas.Atlas
 		atlas.Score += addScore
 		update["score"] = atlas.Score
 		this.module.modelAtlas.modifySmithyAtlasList(session.GetUserId(), update)
diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go
index a301ddfab..8c1f571af 100644
--- a/modules/viking/api_challenge.go
+++ b/modules/viking/api_challenge.go
@@ -51,11 +51,15 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 		}
 	}
 
-	value, ok := viking.Boss[req.BossId]
-	if !ok { // 类型校验
+	if req.Difficulty == 1 && viking.Boss[req.BossId] == 0 { // 当前难度第一次打
 		viking.Boss[req.BossId] = 1
 	}
-	if value < req.Difficulty {
+	if value, ok := viking.Boss[req.BossId]; ok { // 类型校验
+		if value < req.Difficulty {
+			code = pb.ErrorCode_HuntingLvErr
+			return
+		}
+	} else {
 		code = pb.ErrorCode_HuntingLvErr
 		return
 	}
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 4332925a5..caaa81eac 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -56,11 +56,16 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 	// if code = this.module.CheckRes(session, []*cfg.Gameatn{costRes}); code != pb.ErrorCode_Success {
 	// 	return
 	// }
-	value, ok := viking.Boss[req.BossId]
-	if !ok { // 类型校验
+	if req.Difficulty == 1 && viking.Boss[req.BossId] == 0 {
 		viking.Boss[req.BossId] = 1
 	}
-	if value < req.Difficulty {
+
+	if value, ok := viking.Boss[req.BossId]; ok { // 类型校验
+		if value < req.Difficulty {
+			code = pb.ErrorCode_HuntingLvErr
+			return
+		}
+	} else {
 		code = pb.ErrorCode_HuntingLvErr
 		return
 	}
diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go
index d4a52250f..25d1f0bb8 100644
--- a/modules/viking/api_getlist.go
+++ b/modules/viking/api_getlist.go
@@ -4,7 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
-	"strconv"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"google.golang.org/protobuf/proto"
@@ -33,12 +32,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq
 			Boss:     make(map[int32]int32),
 			BossTime: make(map[string]int32),
 		}
-		_cfg := this.module.configure.GetVikingBossTypeConfigData()
-		for k := range _cfg {
-			list.Boss[k] = 1
-			str := strconv.Itoa(int(k)) + "_1"
-			list.BossTime[str] = 0
-		}
 
 		this.module.modelViking.Add(session.GetUserId(), list)
 	}