From dd7e674d1f4aa5e03759b00f333b4560c03131da Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 5 Jul 2023 14:31:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=B2=E7=BB=8F=E5=BC=80=E5=90=AF=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                     |  1 +
 modules/sys/module.go               | 18 ++++++++++++++++++
 modules/viking/api_challengeover.go |  4 ++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index 573b244ad..a72e0b81a 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -40,6 +40,7 @@ type (
 		CheckFriendCond(session IUserSession, num int32)
 		// 查询opencond 配置
 		CheckOpenCondCfgById(uid string, id string) (bOpen bool, errdata *pb.ErrorData)
+		QueryOpenCondData(uid string) (data map[string]int32, errdata *pb.ErrorData) // 查询玩家当前已开启的功能
 	}
 
 	//邮件业务模块对外接口定义 提供给其他模块使用的
diff --git a/modules/sys/module.go b/modules/sys/module.go
index b5702401e..913094ae0 100644
--- a/modules/sys/module.go
+++ b/modules/sys/module.go
@@ -172,3 +172,21 @@ func (this *ModuleSys) FriendCountChange(uid string, count int32) {
 		}
 	}
 }
+func (this *ModuleSys) QueryOpenCondData(uid string) (data map[string]int32, errdata *pb.ErrorData) {
+	data = make(map[string]int32, 0)
+	list, err := this.modelSys.GetOpenCondList(uid)
+	if err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_SystemError,
+			Message: err.Error(),
+		}
+		return
+	}
+	for k, v := range list.Cond {
+		if v == 2 { // 已经开启的功能
+			data[k] = v
+		}
+	}
+
+	return
+}
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 08dba6be8..023b709fc 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -97,8 +97,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 
 	key := strconv.Itoa(int(req.BossId)) + "_" + strconv.Itoa(int(req.Difficulty))
 	if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励
-		viking.BossTime[key] = req.Report.Costtime
-		mapData["bossTime"] = viking.BossTime // 更新时间
+		//viking.BossTime[key] = req.Report.Costtime
+		//mapData["bossTime"] = viking.BossTime // 更新时间
 		if errdata = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil {
 			return
 		}

From 460725a94f8782d258f6488c473c31827a171ac8 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 5 Jul 2023 14:35:37 +0800
Subject: [PATCH 2/2] update

---
 modules/viking/api_challengeover.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 023b709fc..1254e1a12 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -104,7 +104,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 		}
 	}
 
-	if viking.BossTime[key] > req.Report.Costtime {
+	if viking.BossTime[key] == 0 || viking.BossTime[key] > req.Report.Costtime {
 		viking.BossTime[key] = req.Report.Costtime
 		mapData["bossTime"] = viking.BossTime // 更新时间
 		this.module.CheckRank(session.GetUserId(), req.BossId, req.Difficulty, req.Report)