Update - 1.12.0.120

EN: 1.12.0.120
CN: 1.12.0.120
JP: 1.12.0.124
KR: 1.12.0.124

lua/game/ui/towerdefense/towerdefensectrl.lua

@@ -5,8 +5,7 @@ local WwiseAudioMgr = CS.WwiseAudioManager.Instance
 local barMaxLength = 200
 local bar_exp_minX = -98
 local bar_exp_maxX = 106
-local bar_item_minX = 3
-local bar_item_maxX = 215
+local itemBarWidth = 215
 local Time = CS.UnityEngine.Time
 local cardAnimCD = 0.1
 local ItemType = {
@@ -101,6 +100,7 @@ TowerDefenseCtrl._mapNodeConfig = {
 	go_item = {},
 	cd_mask = {},
 	img_disable = {},
+	bg_Itembar = {},
 	item_bar = {
 		sComponentName = "RectTransform"
 	},
@@ -224,7 +224,9 @@ TowerDefenseCtrl._mapEventConfig = {
 	ResetEnergy = "OnEvent_UpdateEnergy",
 	TowerDefenseShowFullScreenPanel = "OnEvent_OnPause",
 	TowerDefenseShowHideScreenPanel = "OnEvent_OnResume",
-	ActivityTowerDefenseLevelSettleFailed = "OnEvent_ActivityTowerDefenseLevelSettleFailed"
+	ActivityTowerDefenseLevelSettleFailed = "OnEvent_ActivityTowerDefenseLevelSettleFailed",
+	TOWERDEFENSE_SHOW_ITEM_ENERGY = "OnEvent_ShowItemEnergy",
+	TOWERDEFENSE_UPDATE_ITEM_ENERGY = "OnEvent_UpdateItemEnergy"
 }
 TowerDefenseCtrl._mapRedDotConfig = {}
 function TowerDefenseCtrl:Awake()
@@ -1236,4 +1238,24 @@ function TowerDefenseCtrl:OnEvent_ActivityTowerDefenseLevelSettleFailed()
 	end
 	self.TowerDefenseData:RequestFinishLevelFailed(self.nLevelId, 0, requestCb)
 end
+function TowerDefenseCtrl:OnEvent_UpdateItemEnergy(curValue, maxValue, nTime, bAuto)
+	curValue = math.max(0, maxValue - curValue)
+	if self.itemTweener ~= nil then
+		self.itemTweener:Kill()
+	end
+	if bAuto then
+		self.itemTweener = DOTween.To(function()
+			return maxValue - curValue
+		end, function(v)
+			self._mapNode.item_bar.sizeDelta = Vector2(itemBarWidth * (v / maxValue), self._mapNode.item_bar.sizeDelta.y)
+		end, maxValue, nTime):OnComplete(function()
+			self._mapNode.item_bar.sizeDelta = Vector2(itemBarWidth, self._mapNode.bar.sizeDelta.y)
+		end)
+	else
+		self._mapNode.item_bar.sizeDelta = Vector2(itemBarWidth * ((maxValue - curValue) / maxValue), self._mapNode.item_bar.sizeDelta.y)
+	end
+end
+function TowerDefenseCtrl:OnEvent_ShowItemEnergy(bIsShow)
+	self._mapNode.bg_Itembar:SetActive(bIsShow)
+end
 return TowerDefenseCtrl

lua/game/ui/towerdefense/towerdefenseguidectrl.lua

@@ -296,7 +296,7 @@ function TowerDefenseGuideCtrl:UpdateDetail()
 			return
 		end
 		NovaAPI.SetTMPText(self._mapNode.txt_itemName, config.Name)
-		NovaAPI.SetTMPText(self._mapNode.txt_itemCD, ConfigTable.GetUIText("TowerDef_CD") .. config.Cd .. "s")
+		NovaAPI.SetTMPText(self._mapNode.txt_itemCD, ConfigTable.GetUIText("TowerDef_CD") .. config.Cd .. ConfigTable.GetUIText("CommonTips_CDSec"))
 		NovaAPI.SetTMPText(self._mapNode.txt_des, config.Des)
 		self._mapNode.item_detail:SetActive(true)
 	end

lua/game/ui/towerdefense/towerdefenseleveldetailctrl.lua

@@ -74,6 +74,16 @@ TowerDefenseLevelDetailCtrl._mapNodeConfig = {
 	goDragMin = {sComponentName = "Transform"},
 	goDragMax = {sComponentName = "Transform"},
 	special_item = {},
+	db_fixed = {},
+	txt_fixed = {
+		sComponentName = "TMP_Text",
+		sLanguageId = "TowerDef_Fixed"
+	},
+	db_head = {},
+	txt_head = {
+		sComponentName = "TMP_Text",
+		sLanguageId = "TowerDef_Head"
+	},
 	animator = {
 		sNodeName = "----SafeAreaRoot_Detail---",
 		sComponentName = "Animator"
@@ -243,13 +253,18 @@ function TowerDefenseLevelDetailCtrl:UpdateCharacter()
 	local teamCharacterCount = floorConfig.MemberNum
 	if teamCharacterCount == 0 then
 		self.tbCharGuideId = {}
-		local foreach = function(data)
-			if data.ActivityId == self.nActId and data.GuideType == GameEnum.TowerDefGuideType.Character and table.indexof(floorConfig.TeamGroup, data.ObjectId) > 0 then
-				table.insert(self.tbCharGuideId, data.Id)
+		for k, v in ipairs(floorConfig.TeamGroup) do
+			local foreach = function(data)
+				if data.ActivityId == self.nActId and data.GuideType == GameEnum.TowerDefGuideType.Character and data.ObjectId == v then
+					table.insert(self.tbCharGuideId, data.Id)
+					return
+				end
 			end
+			ForEachTableLine(DataTable.TowerDefenseGuide, foreach)
 		end
-		ForEachTableLine(DataTable.TowerDefenseGuide, foreach)
 	end
+	self._mapNode.db_fixed:SetActive(teamCharacterCount == 0)
+	self._mapNode.db_head:SetActive(teamCharacterCount ~= 0)
 	for i = 1, 6 do
 		if teamCharacterCount == 0 then
 			if i > #self.tbCharGuideId then
@@ -260,7 +275,7 @@ function TowerDefenseLevelDetailCtrl:UpdateCharacter()
 			NovaAPI.SetTMPText(self._mapNode.txt_charCount, string.format("<color=#ffde6a>%d</color>/%d", #self.tbCharGuideId, #self.tbCharGuideId))
 			self:InitDragOrderList()
 		else
-			if teamCharacterCount < i then
+			if i > teamCharacterCount then
 				self._mapNode.team_character[i]:SetData(-1, false, i)
 			elseif i > #self.tbCharGuideId then
 				self._mapNode.team_character[i]:SetData(0, true, i)

lua/game/ui/towerdefense/towerdefensemonsterinfoctrl.lua

@@ -54,7 +54,7 @@ TowerDefenseMonsterInfoCtrl._mapNodeConfig = {
 	},
 	txtStoryTitle = {
 		sComponentName = "TMP_Text",
-		sLanguageId = "EnemyInfo_Window_StoryTitle"
+		sLanguageId = "TowerDefense_Monster_Brief"
 	}
 }
 TowerDefenseMonsterInfoCtrl._mapEventConfig = {
@@ -181,7 +181,12 @@ function TowerDefenseMonsterInfoCtrl:RefreshMonsterInfo(nMonsterId)
 	else
 		self._mapNode.goMonsterType:SetActive(false)
 	end
-	NovaAPI.SetTMPText(self._mapNode.txtStory, monsterManual.Desc)
+	local tdMonsterConfig = ConfigTable.GetData("TowerDefenseMonster", nMonsterId)
+	if tdMonsterConfig == nil then
+		printError(string.format("TowerDefenseMonster数据为空！！！id = [%s]", nMonsterId))
+		return
+	end
+	NovaAPI.SetTMPText(self._mapNode.txtStory, tdMonsterConfig.Brief)
 	LayoutRebuilder.ForceRebuildLayoutImmediate(self._mapNode.goStory)
 	local eets = monsterAdjust.EET
 	self:RefreshAbility(monsterManual)