无尽之塔

Assets/Content/Config/LanguagePackage_cn.csv

@@ -2158,6 +2158,7 @@ RP10155005,（天選之人，我只能幫你到這了，快動手！）
 RP10155006,快進攻，波利王善良的本性正在掙扎！
 RP10155007,對不住了，大波利！
 TitleClimbingTower,試煉之塔
+TowerMode,切換試煉
 TowerPassed,已通關
 LevelInfoTitle,通關信息
 BtnTowerChallenge,挑戰

Assets/Content/Prefabs/UI/UIClimbingTower/UIClimbingTower.prefab

@@ -1623,7 +1623,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 20
+  m_Spacing: 30
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -4489,7 +4489,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_key: TitleClimbingTower
+  m_key: TowerMode
 --- !u!114 &2280043023916396913
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10635,10 +10635,10 @@ RectTransform:
   m_Father: {fileID: 5141356163039318393}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -555.90704}
-  m_SizeDelta: {x: 0, y: -1491.8141}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 500}
+  m_SizeDelta: {x: 1080, y: 500}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4645682070852290537
 MonoBehaviour:

Assets/Lua/Logic/ClimbingTower/ClimbingTowerDataMgr.lua

@@ -134,7 +134,7 @@ function ClimbingTowerDataMgr:FindLevelIsPassed()
     --end
     --return false
     --LogError("================ curChallengeLevel =  "..self.curChallengeLevel.."   ========================")
-    return self.curChallengeLevel >= 1001  --true --
+    return self.curChallengeLevel >= self:GetTopTowerUnlockLv()  --true --
 end
 
 function ClimbingTowerDataMgr:FindRankerData(uid)
@@ -583,4 +583,26 @@ function  ClimbingTowerDataMgr:GetCurWJTowerInfo()
     return info
 end
 
+function ClimbingTowerDataMgr:GetTopTowerUnlockLv()
+    return 1001
+end
+function ClimbingTowerDataMgr:GetWjTowerUnlockLv()
+    return 1001
+end
+function ClimbingTowerDataMgr:GetWjIsUnlock()
+    return false
+end
+
+function ClimbingTowerDataMgr:GetModelockInfo(mode)
+    local lockInfo ={isunlock = true, unlockLv = 0} 
+
+    if mode == 1 then
+        lockInfo.isunlock = self:FindLevelIsPassed()
+        lockInfo.unlockLv = self:GetTopTowerUnlockLv()
+    elseif mode == 2 then
+        lockInfo.isunlock  = self:GetWjIsUnlock()
+        lockInfo.unlockLv = self:GetWjTowerUnlockLv()
+    end
+    return lockInfo
+end
 return ClimbingTowerDataMgr

Assets/Lua/Logic/PeakTower/PeakTowerDataMgr.lua

@@ -238,11 +238,19 @@ end
 function PeakTowerDataMgr:GetCurUITowerType()
     local uid = ManagerContainer.DataMgr.UserData:GetUserId()
     local type = UnityEngine.PlayerPrefs.GetInt(tostring(uid).."_UITowerType")
+    local tdmgr = ManagerContainer.DataMgr.TowerDataMgr
+    if tdmgr:GetTowerMode() ~= 2 then
+        tdmgr:SetTowerMode(type)
+    end
     return type
 end
 
 function PeakTowerDataMgr:SaveCurUITowerType(type)
     local uid = ManagerContainer.DataMgr.UserData:GetUserId()
+    local tdmgr = ManagerContainer.DataMgr.TowerDataMgr
+    if tdmgr:GetTowerMode() ~= 2 then
+        tdmgr:SetTowerMode(type)
+    end
     UnityEngine.PlayerPrefs.SetInt(tostring(uid).."_UITowerType", type)
 end
 

Assets/Lua/UI/Common/BtnTowerItemCtr.lua

@@ -1,9 +1,9 @@
 local BtnTowerItemCtr = {}
 
 function BtnTowerItemCtr:SetData(wnd, itemlua, logicData, enterType, onClickOwner, onClickCB, params)
-    LogError("---------------"..itemlua:getClassName().."----------------"..Inspect(logicData))
+    --LogError("---------------"..itemlua:getClassName().."----------------"..Inspect(logicData))
 	self:InitUI(wnd, itemlua, logicData, enterType, onClickOwner, onClickCB, params)
-    --self:SetItemsData(itemlua, logicData)
+    self:SetItemsData(itemlua, logicData)
 	--self:SetBtns(itemlua, logicData)
 	
 end 
@@ -24,7 +24,16 @@ end
 
 
 function BtnTowerItemCtr:SetItemsData(itemlua, logicData)
-    
+    local tdmgr = ManagerContainer.DataMgr.TowerDataMgr
+    local isunlock = false
+    if logicData == 1 then
+        isunlock = tdmgr:FindLevelIsPassed()
+    elseif logicData == 2 then
+        isunlock =  tdmgr:GetWjIsUnlock()
+    else
+        isunlock = true     
+    end
+    itemlua.lockNode:SetActive(not isunlock)
 end
 
 function  BtnTowerItemCtr:SetBtns(itemlua, logicData)

Assets/Lua/UI/UIClimbingTower/UIClimbingTowerView.lua

@@ -97,28 +97,39 @@ function UIClimbingTowerView:QueryDatas()
 end
 
 function UIClimbingTowerView:Refresh()
-	local type = self.controller:GetCurTowerType()
-	if type == Enum.UnlimitTowerType.PeakTower then
-		self.rewardLoopGridMap = {}
-		self.scrollItemGoes = {}
-		self.roleSystemMap = {}
-		self.previewSystemMap = {}
-		self.scrollview.loopListView.mOnSnapItemFinished = function(loopListView, loopListViewItem)
-			return self:OnSnapItemFinished(loopListView, loopListViewItem)
-		end
-		self.boardTitle.uILocalizeScript:SetContent("TopTowerTitle")
-	elseif type == Enum.UnlimitTowerType.ClimbingTower then
-		self.boardTitle.uILocalizeScript:SetContent("TitleClimbingTower")
+    local tdmgr = ManagerContainer.DataMgr.TowerDataMgr
+    local mode = tdmgr:GetTowerMode()
+    local isWj = mode == 2
+    self.scrollview:SetActive(not isWj)
+    self.wJNode:SetActive(isWj)
+    local type = self.controller:GetCurTowerType()
+    self:SetTitle(mode)
+	if isWj then
+		local curwjInfo = tdmgr:GetCurWJTowerInfo()
+		self:RefWJNpcView(curwjInfo.npcList,curwjInfo.lv)	
 	end
-	local isShowTop_Lock = (self.controller:FindLevelIsPassed() == true and type == Enum.UnlimitTowerType.ClimbingTower)
+    if type == Enum.UnlimitTowerType.PeakTower then
+        self.rewardLoopGridMap = {}
+        self.scrollItemGoes = {}
+        self.roleSystemMap = {}
+        self.previewSystemMap = {}
+        self.scrollview.loopListView.mOnSnapItemFinished = function(loopListView, loopListViewItem)
+            return self:OnSnapItemFinished(loopListView, loopListViewItem)
+        end
+        -- self.boardTitle.uILocalizeScript:SetContent("TopTowerTitle")
+    elseif type == Enum.UnlimitTowerType.ClimbingTower then
+        -- self.boardTitle.uILocalizeScript:SetContent("TitleClimbingTower")
+    end
 
-	
-	self.btnTowerTop:SetActive(type == Enum.UnlimitTowerType.ClimbingTower)
-	self.btnTowerTop_lock:SetActive(not isShowTop_Lock)
-	self.btnTower:SetActive(type == Enum.UnlimitTowerType.PeakTower)
-	self.btnStatistics:SetActive(type == Enum.UnlimitTowerType.ClimbingTower)
+    --local isShowTop_Lock = (self.controller:FindLevelIsPassed() == true and type == Enum.UnlimitTowerType.ClimbingTower)
+    self.btnTowerTop:SetActive(false) --type == Enum.UnlimitTowerType.ClimbingTower
+    self.btnTowerTop_lock:SetActive(false) --not isShowTop_Lock
+    self.btnTower:SetActive(true)--type == Enum.UnlimitTowerType.PeakTower
+    self.btnStatistics:SetActive(type == Enum.UnlimitTowerType.ClimbingTower)
 end
 
+
+
 function UIClimbingTowerView:InitGrid()
 	self.scrollview.loopListView:InitListView(0, function(gridView, itemIndex)
 		return self:GetItemByRowColumn(gridView, itemIndex)
@@ -160,6 +171,7 @@ function UIClimbingTowerView:ShowChange(needChange)
 	self.cover:SetActive(true)
 	
 	self:InitGrid()
+		
 	LogError("Show change "..Inspect(needChange))
 	--保护机制 5秒后关闭云
 	if not self.cloudTimer then
@@ -928,6 +940,10 @@ function UIClimbingTowerView:OnClickTowerMode(btn, data)
     -- LogError("点击  data = " ..Inspect(data))
     local mdata = data[0]
     local TDMgr = ManagerContainer.DataMgr.TowerDataMgr
+	local UnlockInfo = TDMgr:GetModelockInfo(mdata)
+	if not UnlockInfo.isunlock then
+		return
+	end
     local tmode = TDMgr:GetTowerMode()
     if mdata < 2 then
         if tmode >= 2 then
@@ -992,6 +1008,7 @@ function UIClimbingTowerView:RefWJNpcView(npclist,lv)
 			end
 		end
 	end	
+	self.levelNum.text.text = I18N.SetLanguageValue("TopTowerLevel",lv)
 end
 
 function UIClimbingTowerView:SetTitle(mode)