From e98e8c7da750bf4d84d750cb863a10f99c356964 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 3 Apr 2023 16:34:07 +0800
Subject: [PATCH] update

---
 modules/sys/api_getlist.go          |  2 +-
 modules/viking/api_challengeover.go | 23 +++++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go
index 062cf0581..eb1b48fbc 100644
--- a/modules/sys/api_getlist.go
+++ b/modules/sys/api_getlist.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func (this *apiComp) FuncGetListCheck(session comm.IUserSession, req *pb.SysFuncListReq) (code pb.ErrorCode) {
+func (this *apiComp) FuncGetListCheck(session comm.IUserSession, req *pb.SysFuncGetListReq) (code pb.ErrorCode) {
 	return
 }
 
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 4f51d57c0..737bf3dcb 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -47,15 +47,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
-	// costRes := this.module.configure.GetGlobalConf().VikingExpeditionCos
-	// if costRes == nil {
-	// 	code = pb.ErrorCode_ConfigNoFound
-	// 	return
-	// }
 
-	// if code = this.module.CheckRes(session, []*cfg.Gameatn{costRes}); code != pb.ErrorCode_Success {
-	// 	return
-	// }
 	if req.Difficulty == 1 && viking.Boss[req.BossId] == 0 {
 		viking.Boss[req.BossId] = 1
 	}
@@ -92,6 +84,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 	if code = this.module.ConsumeRes(session, vikingCfg.PsConsume, true); code != pb.ErrorCode_Success {
 		return
 	}
+
 	key := strconv.Itoa(int(req.BossId)) + "_" + strconv.Itoa(int(req.Difficulty))
 	if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励
 		viking.Boss[req.BossId]++
@@ -100,12 +93,14 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 			return
 		}
 	}
-	if viking.BossTime[key] > req.Report.Costtime || viking.BossTime[key] == 0 && req.Difficulty >= viking.Boss[req.BossId] {
+	viking.BossTime[key] = req.Report.Costtime
+	if viking.BossTime[key] > req.Report.Costtime || (viking.BossTime[key] == 0 && req.Difficulty >= viking.Boss[req.BossId]) {
 		viking.BossTime[key] = req.Report.Costtime
-		mapData["bossTime"] = viking.BossTime // 更新时间
 		userinfo := this.module.ModuleUser.GetUser(session.GetUserId())
 		this.module.CheckRank(session.GetUserId(), req.BossId, req.Difficulty, req.Report, userinfo)
 	}
+	mapData["bossTime"] = viking.BossTime // 更新时间
+
 	reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励
 	if code, atno = this.module.DispenseAtno(session, reward, true); code != pb.ErrorCode_Success {
 		return
@@ -125,14 +120,6 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 		this.equip.SellEquipments(session, del)
 	}
 
-	// if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
-	// 	for _, v := range req.Report.Info.Redflist[0].Team {
-	// 		if !v.Ishelp { // 助战英雄不加经验
-	// 			addExp, _ := this.module.ModuleHero.AddHeroExp(session, v.Oid, 500) //临时加500 后面等配置
-	// 			changExp[v.Oid] = addExp
-	// 		}
-	// 	}
-	// }
 	code = this.module.ModifyVikingData(session.GetUserId(), mapData)
 
 	if session.GetUserId() != "" { // 恢复时间