塔

Assets/Lua/Logic/ClimbingTower/ClimbingTowerDataMgr.lua

@@ -478,17 +478,21 @@ function ClimbingTowerDataMgr:BattleEnd(battleTime,isPlayRecord,timeStamp)
         ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_SHUT_TIMEBATTLE,Enum.UIPageName.UIClimbingTower)
         return
     end
-
+    if self:GetTowerMode() == 2  then
+        LogError("無盡模式！！")
+        ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIClimbingTowerBattleWin,{Enum.UIPageName.UIClimbingTower,nil})
+        return
+    end
     self:SendClimbingTowerEndReq(battleTime,self.curChallengeLevel,timeStamp)
 end
 
 function ClimbingTowerDataMgr:EnterBattle_WJ(towerLevel, factorList)
     local scenceName = "scene_climbingtower"
     local bgmName = "bgm_08"
-    local NpcList = self:CreateNpcList({{70001, 1}, {70006, 4}, {70001, 3}, {70001, 2}}, 1500)
+    local NpcList = self:CreateNpcList({{70001, 1}, {70006, 4}, {70001, 3}, {70001, 2}}, towerLevel)
     local maxFight = 120
 
-    local levelInfo = self:FindLevelData(towerLevel)
+    --local levelInfo = self:FindLevelData(towerLevel)
 
     local teams = ManagerContainer.DataMgr.UserData:GetTeamData(true);
     if teams ~= nil then
@@ -561,6 +565,9 @@ end
 
 
 function ClimbingTowerDataMgr:GetTowerMode()
+    if self.towerMode  == nil then
+        self.towerMode = 0
+    end
     return self.towerMode 
 end
 
@@ -571,8 +578,8 @@ end
 
 function  ClimbingTowerDataMgr:GetCurWJTowerInfo()
     local info = {}
-    info.npcList = self:CreateNpcList({{70001, 1}, {70006, 4}, {70001, 3}, {70001, 2}}, 1500)
-    info.lv = 1500
+    info.npcList = self:CreateNpcList({{70001, 1}, {70006, 4}, {70001, 3}, {70001, 2}}, 1)
+    info.lv = 1
     return info
 end
 

Assets/Lua/UI/UIClimbingTower/UIClimbingTowerBattleWinView.lua

@@ -77,10 +77,14 @@ function UIClimbingTowerBattleWinView:OnClickNext()
 end
 
 function UIClimbingTowerBattleWinView:OnClickClose()
+	local mode = ManagerContainer.DataMgr.TowerDataMgr:GetTowerMode()
 	local type = self.controller:GetLastUITowerType()
-	if type == Enum.UnlimitTowerType.PeakTower then
+	LogError("type = "..type)
+	if type == Enum.UnlimitTowerType.PeakTower and mode < 2 then
+		LogError("pppp")
 		ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_SHUT_PVPCIMBINGBATTLE,self.controller:BackPageId())
 	else
+		LogError("ttt")
 		ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_SHUT_TIMEBATTLE,self.controller:BackPageId())
 	end
 	ManagerContainer.LuaUIMgr:ClosePage(self.uiBase.PageId)

Assets/Lua/UI/UIClimbingTower/UIClimbingTowerView.lua

@@ -160,7 +160,7 @@ function UIClimbingTowerView:ShowChange(needChange)
 	self.cover:SetActive(true)
 	
 	self:InitGrid()
-
+	LogError("Show change "..Inspect(needChange))
 	--保护机制 5秒后关闭云
 	if not self.cloudTimer then
 		self.cloudTimer = Timer.New(slot(self.CloudOut, self), 1)
@@ -182,7 +182,7 @@ end
 
 function UIClimbingTowerView:OnBtnTowerClick()
 	--ManagerContainer.LuaUIMgr:ErrorNoticeDisplay('ClimbingTowerClickTips')
-
+	LogError('OnBtnTowerClick')
 	self.otherType = 1 - self.controller:GetCurTowerType()
 	local needQuery = self.controller:SendTowerInfoReq(self.otherType)
 	if not needQuery then
@@ -1010,7 +1010,7 @@ end
 
 
 function UIClimbingTowerView:OnClickWJBtn()
-	ManagerContainer.DataMgr.TowerDataMgr:EnterBattle_WJ(150,{})
+	ManagerContainer.DataMgr.TowerDataMgr:EnterBattle_WJ(1,{})
 end
 return UIClimbingTowerView