无尽++

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

@@ -8056,7 +8056,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3262710043394698592
 CanvasRenderer:
@@ -9915,7 +9915,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2780849448026990954
 CanvasRenderer:
@@ -10759,8 +10759,8 @@ RectTransform:
   - {fileID: 894349289931197299}
   - {fileID: 6195913601794351241}
   - {fileID: 3206820406458225732}
-  - {fileID: 4230022829604326248}
   - {fileID: 1040216839688129352}
+  - {fileID: 4230022829604326248}
   m_Father: {fileID: 5141356163039318393}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12525,7 +12525,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8435629548677925706
 CanvasRenderer:
@@ -14061,7 +14061,7 @@ RectTransform:
   m_Children:
   - {fileID: 8580436628047545267}
   m_Father: {fileID: 4841132984442310604}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -14275,7 +14275,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1040216839688129352
 RectTransform:
   m_ObjectHideFlags: 0
@@ -14298,7 +14298,7 @@ RectTransform:
   - {fileID: 5860794231308973992}
   - {fileID: 723098466145627742}
   m_Father: {fileID: 4841132984442310604}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -14362,7 +14362,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &778156858834137283
 CanvasRenderer:

Assets/Lua/Logic/ClimbingTower/ClimbingTowerDataMgr.lua

@@ -569,4 +569,11 @@ function ClimbingTowerDataMgr:SetTowerMode(mode)
 end
 
 
+function  ClimbingTowerDataMgr:GetCurWJTowerInfo()
+    local info = {}
+    info.npcList = self:CreateNpcList({{70001, 1}, {70006, 4}, {70001, 3}, {70001, 2}}, 1500)
+    info.lv = 1500
+    return info
+end
+
 return ClimbingTowerDataMgr

Assets/Lua/UI/UIClimbingTower/UIClimbingTowerView.lua

@@ -949,6 +949,7 @@ function UIClimbingTowerView:OnClickTowerMode(btn, data)
         end
        
     else
+		--self.boardTitle.uILocalizeScript:SetContent("TopTowerTitle")
 		self.cover:SetActive(true)
         -- 保护机制 5秒后关闭云
         if not self.cloudTimer then
@@ -959,7 +960,14 @@ function UIClimbingTowerView:OnClickTowerMode(btn, data)
         end
 
     end
-	self.scrollview:SetActive(mdata ~= 2)
+	local isWj = mdata == 2
+	self.scrollview:SetActive(not isWj)
+	self.wJNode:SetActive(isWj)
+	if isWj then
+		local curwjInfo = TDMgr:GetCurWJTowerInfo()
+		self:RefWJNpcView(curwjInfo.npcList,curwjInfo.lv)	
+	end
+	self:SetTitle(mdata)
 	TDMgr:SetTowerMode(mdata)
 	self.towerModes:SetActive(false)
 end
@@ -968,21 +976,35 @@ function UIClimbingTowerView:CloseModeNode()
 	self.towerModes:SetActive(false)
 end
 
-function UIClimbingTowerView:RefWJNpcView()
-	-- for i=1, #levelData.npcs do
-	-- 	local npc = levelData.npcs[i]
-	-- 	if npc.npcImg ~= nil then
-	-- 		if i == 1 then
-	-- 			self:SetNpcInfo(levelLua.npcList.npcLevel1,levelLua.npcList.npc1,levelLua.npcList.natureIcon1,npc,levelData.levelId)
-	-- 		elseif i == 2 then
-	-- 			self:SetNpcInfo(levelLua.npcList.npcLevel2,levelLua.npcList.npc2,levelLua.npcList.natureIcon2,npc,levelData.levelId)
-	-- 		elseif i == 3 then
-	-- 			self:SetNpcInfo(levelLua.npcList.npcLevel3,levelLua.npcList.npc3,levelLua.npcList.natureIcon3,npc,levelData.levelId)
-	-- 		elseif i == 4 then
-	-- 			self:SetNpcInfo(levelLua.npcList.npcLevel4,levelLua.npcList.npc4,levelLua.npcList.natureIcon4,npc,levelData.levelId)
-	-- 		end
-	-- 	end
-	-- end	
+function UIClimbingTowerView:RefWJNpcView(npclist,lv)
+	for i=1, #npclist do
+		local npc = npclist[i]
+		if npc.npcImg ~= nil then
+			if i == 1 then
+				self:SetNpcInfo(self.wjnpcList.npcLevel1,self.wjnpcList.npc1,self.wjnpcList.natureIcon1,npc,lv)
+			elseif i == 2 then
+				self:SetNpcInfo(self.wjnpcList.npcLevel2,self.wjnpcList.npc2,self.wjnpcList.natureIcon2,npc,lv)
+			elseif i == 3 then
+				self:SetNpcInfo(self.wjnpcList.npcLevel3,self.wjnpcList.npc3,self.wjnpcList.natureIcon3,npc,lv)
+			elseif i == 4 then
+				self:SetNpcInfo(self.wjnpcList.npcLevel4,self.wjnpcList.npc4,self.wjnpcList.natureIcon4,npc,lv)
+			end
+		end
+	end	
+end
+
+function UIClimbingTowerView:SetTitle(mode)
+	self.boardTitle.uILocalizeScript:SetContent(self:GetCurTowerTitle(mode))
+end
+
+function UIClimbingTowerView:GetCurTowerTitle(mode)
+	local modeTxt ="TitleClimbingTower"
+    if(mode == 1) then
+        modeTxt ="TopTowerTitle"
+    elseif mode == 2 then
+        modeTxt ="wjTower"
+    end
+	return modeTxt
 end
 return UIClimbingTowerView