From 4ca0fa397ab8bf9d357defe642a4b52282af9ab9 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 13 Jul 2023 15:36:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=8D=E5=90=8C=20?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=99=AE=E9=80=9A=E5=A1=94=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=80=9A=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go          |  2 +-
 modules/pagoda/module.go |  9 +++++++++
 modules/sys/model_sys.go | 11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index 35a2c4c48..2c873658b 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -313,7 +313,7 @@ type (
 	IPagoda interface {
 		ModifyPagodaFloor(session IUserSession, d1 int32, d2 int32) (errdata *pb.ErrorData)
 		CheckUserBasePagodaInfo(uid string) (data *pb.DBPagodaRecord) // 查询玩家最佳通关记录
-
+		CheckCompletePagoda(uid string) (bComplete bool)              // 校验是否通关普通塔
 		// Check Rtype84 Rtype85 Rtype86
 		CheckPagodaMaxFloor(uid string, pagodaType int32) int32 // 查询塔通关难度type 1 表示普通塔 2 赛季塔
 		///红点
diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go
index 551e576ca..37305b021 100644
--- a/modules/pagoda/module.go
+++ b/modules/pagoda/module.go
@@ -204,3 +204,12 @@ func (this *Pagoda) GetSeasonData() (endSeasonTime int64) {
 
 	return endSeasonTime
 }
+
+func (this *Pagoda) CheckCompletePagoda(uid string) (bComplete bool) {
+
+	if list, err := this.modelPagoda.getPagodaList(uid); err != nil {
+		return list.Complete
+	}
+
+	return false
+}
diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go
index eccd2582a..5b0b84040 100644
--- a/modules/sys/model_sys.go
+++ b/modules/sys/model_sys.go
@@ -111,6 +111,17 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri
 					return ""
 				}
 			}
+		case 5:
+			module, err := this.service.GetModule(comm.ModulePagoda)
+			if err != nil {
+				this.moduleSys.Debugln(err)
+				return ""
+			}
+			if v, ok := module.(comm.IPagoda); ok {
+				if !v.CheckCompletePagoda(uid) {
+					return ""
+				}
+			}
 		}
 	}
 	return condData.Id

From dd3e5244f9b5d9b03b8b5f5df6cc8011da0b987c Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 13 Jul 2023 15:38:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/pagoda/api_racechallenge.go     | 10 ----------
 modules/pagoda/api_racechallengeover.go | 11 +----------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/modules/pagoda/api_racechallenge.go b/modules/pagoda/api_racechallenge.go
index 50b5e8903..6af839c95 100644
--- a/modules/pagoda/api_racechallenge.go
+++ b/modules/pagoda/api_racechallenge.go
@@ -108,16 +108,6 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal
 		}
 	}
 
-	// 校验条件
-	if conf.Unlock != 1 {
-		if !this.mline.CheckCommpleteStage(session.GetUserId(), conf.Unlock) {
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_PagodaUnlock,
-				Title: pb.ErrorCode_PagodaUnlock.ToString(),
-			}
-			return
-		}
-	}
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
 		Ptype:   pb.PlayType_pagoda,
 		Title:   "",
diff --git a/modules/pagoda/api_racechallengeover.go b/modules/pagoda/api_racechallengeover.go
index 92cc8aff7..27213f46b 100644
--- a/modules/pagoda/api_racechallengeover.go
+++ b/modules/pagoda/api_racechallengeover.go
@@ -95,16 +95,7 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda
 			return
 		}
 	}
-	// 校验条件
-	if conf.Unlock != 1 {
-		if !this.mline.CheckCommpleteStage(session.GetUserId(), conf.Unlock) {
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_PagodaUnlock,
-				Title: pb.ErrorCode_PagodaUnlock.ToString(),
-			}
-			return
-		}
-	}
+
 	// 校验通过
 	errdata, isWin = this.module.battle.CheckBattleReport(session, req.Report)
 	if errdata != nil {