diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua index 612242ae1f..1e69be4e99 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua @@ -295,9 +295,9 @@ function this.RefreshWindowData() if i<=#proList-1 then this.proGrid.transform:GetChild(i-1).gameObject:SetActive(true) LogError("originalList[i]======================"..originalList[i]) - this.proGrid.transform:GetChild(i-1):GetComponent("Text").text=proList[i].. - string.format(" 命格加成+%s (%s%%)",math.floor(originalList[i]*GiftManager.GetPlayerGiftAdd()/100), GiftManager.GetPlayerGiftAdd()) - ..string.format(" 特训加成+%s (%s%%)",math.floor(originalList[i]*HeroManager.ReturnGiftAtt()),HeroManager.ReturnGiftAtt()) + this.proGrid.transform:GetChild(i-1):GetComponent("Text").text=proList[i]--.. + --string.format(" 命格加成+%s (%s%%)",math.floor(originalList[i]*GiftManager.GetPlayerGiftAdd()/100), GiftManager.GetPlayerGiftAdd()) + --..string.format(" 特训加成+%s (%s%%)",math.floor(originalList[i]*HeroManager.ReturnGiftAtt()),HeroManager.ReturnGiftAtt()) elseif i==#proList then this.proGrid.transform:GetChild(i-1).gameObject:SetActive(true) this.proGrid.transform:GetChild(i-1):GetComponent("Text").text=proList[i] diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua index 562dfb61b8..689d40c428 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua @@ -100,7 +100,8 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) local trainingIcon= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/trainingIcon") trainingIcon:GetComponent("Image").sprite=self.spLoader:LoadSprite("r_map_time") local DesTip=Util.GetGameObject(_go,"DesTip") - DesTip.gameObject:SetActive(tData.Level==#self.showList) + --DesTip.gameObject:SetActive(tData.Level==#self.showList) + DesTip.gameObject:SetActive(false) -- local isOpen=self._curHerodata.star>=tData.MyselfCondition and curLevel>=tData.Level local lastLevelData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",self._curHerodata.id,"Level",tData.Level-1==0 and 1 or tData.Level-1) local isOpen= self._curHerodata.star>=lastLevelData.MyselfCondition and curLevel>=tData.Level