From dc6a8900cf14e40566ff9c40f1845b1900ac4f04 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 13 Dec 2022 11:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/pagoda/module.go     | 14 +++++++++++++-
 modules/user/model_expand.go | 10 ----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go
index 48c95e88d..1d05d3e66 100644
--- a/modules/pagoda/module.go
+++ b/modules/pagoda/module.go
@@ -95,9 +95,21 @@ func (this *Pagoda) ModifyPagodaFloor(session comm.IUserSession, level int32) (c
 		list.PagodaId = level
 		mapData := make(map[string]interface{}, 0)
 		mapData["pagodaId"] = level
+		// 通关校验
+		Nomalcfg := this.configure.GetPagodaConfigData(comm.PagodaType, level+1)
+		if Nomalcfg == nil {
+			// 修改expand 数据
+			update := map[string]interface{}{
+				"completePagoda": true,
+			}
+			this.ModuleUser.ChangeUserExpand(session.GetUserId(), update)
+			list.Complete = true
+			mapData["complete"] = true
+		}
 		code = this.ModifyPagodaData(session.GetUserId(), mapData)
 		session.SendMsg(string(this.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list})
 	}
+
 	return
 }
 
@@ -263,7 +275,7 @@ func (this *Pagoda) ModifySeasonPagodaFloor(session comm.IUserSession, level int
 			list.PagodaId = level
 			mapData := make(map[string]interface{}, 0)
 			mapData["pagodaId"] = level
-			code = this.ModifyPagodaData(session.GetUserId(), mapData)
+			code = this.ModifySeasonPagodaData(session.GetUserId(), mapData)
 			session.SendMsg(string(this.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list})
 		}
 	}
diff --git a/modules/user/model_expand.go b/modules/user/model_expand.go
index 6b4c7a99e..2cfcf3439 100644
--- a/modules/user/model_expand.go
+++ b/modules/user/model_expand.go
@@ -88,13 +88,3 @@ func (this *ModelExpand) updateLoginDay(uid string, timestamp int64) (err error)
 	}
 	return
 }
-
-// 通关了普通塔
-func (this *ModelExpand) CompleteNormalPagoda(uid string) (err error) {
-	update := map[string]interface{}{
-		"completePagoda": true,
-	}
-	err = this.ChangeUserExpand(uid, update)
-
-	return
-}