From deb7fcc0c46c3aee11635ce1961a05fdea31d160 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Thu, 27 Jul 2023 11:44:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B7=A5=E4=BC=9Aboos?=
 =?UTF-8?q?=E6=88=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/guildgve/api_challengefinish.go | 2 +-
 modules/guildgve/modelUnionRoulette.go  | 2 +-
 modules/tools/module.go                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/guildgve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go
index 50754a6c5..21f0f0243 100644
--- a/modules/guildgve/api_challengefinish.go
+++ b/modules/guildgve/api_challengefinish.go
@@ -68,7 +68,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 		}
 		return
 	}
-	if user = this.module.ModuleUser.GetUser(session.GetUserId()); user != nil {
+	if user = this.module.ModuleUser.GetUser(session.GetUserId()); user == nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),
diff --git a/modules/guildgve/modelUnionRoulette.go b/modules/guildgve/modelUnionRoulette.go
index 9a81cb7bc..9c87be5f3 100644
--- a/modules/guildgve/modelUnionRoulette.go
+++ b/modules/guildgve/modelUnionRoulette.go
@@ -80,7 +80,7 @@ func (this *ModelUnionroulette) roulettechangePush(unionid string, uid string, a
 		users = append(users, v.Uid)
 	}
 
-	lock, _ := this.module.modelGuildGve.userlock(unionid)
+	lock, _ := this.userlock(unionid)
 	err = lock.Lock()
 	if err != nil {
 		this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: unionid}, log.Field{Key: "err", Value: err.Error()})
diff --git a/modules/tools/module.go b/modules/tools/module.go
index 140e40c67..b3d320504 100644
--- a/modules/tools/module.go
+++ b/modules/tools/module.go
@@ -74,7 +74,7 @@ func (this *Tools) GetPlayerlvConf(uid string) (conf *cfg.GamePlayerlvData, errd
 		user *pb.DBUser
 		err  error
 	)
-	if user = this.ModuleUser.GetUser(uid); user != nil {
+	if user = this.ModuleUser.GetUser(uid); user == nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.String(),

From c0be6359fe7f0f3194715034aa7893d01a65e7ed Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Thu, 27 Jul 2023 11:51:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/mainline/model_mainline.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go
index e7e1c9541..5cec03b94 100644
--- a/modules/mainline/model_mainline.go
+++ b/modules/mainline/model_mainline.go
@@ -88,12 +88,12 @@ func (this *ModelMline) updateprogress(data *pb.DBMainline) {
 				chapteraward[conf.Chapterid] = &pb.DBMainlineAward{}
 			}
 			chapteraward[conf.Chapterid].Stage++
-		} else {
-			if _, ok = exploreaward[conf.Chapterid]; !ok && conf.Episodetype != 8 {
-				exploreaward[conf.Chapterid] = &pb.DBMainlineAward{}
-			}
-			exploreaward[conf.Chapterid].Stage++
 		}
+		if _, ok = exploreaward[conf.Chapterid]; !ok && conf.Episodetype != 8 {
+			exploreaward[conf.Chapterid] = &pb.DBMainlineAward{}
+		}
+		exploreaward[conf.Chapterid].Stage++
+
 		if _, ok = groupaward[conf.GroupId]; !ok {
 			groupaward[conf.GroupId] = &pb.DBMainlineAward{}
 		}