diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 6feddcd224..037c79e72f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -378,7 +378,11 @@ function this.ChallengeCopyShow() local data = CarbonManager.GetBattleResult() Util.GetGameObject(this.challengeInfo,"layout/rounds"):GetComponent("Text").text= data[1] local progressBar= Util.GetGameObject(this.challengeInfo,"layout/progressBg/progressBar"):GetComponent("Image") - progressBar.fillAmount = data[2] + this.tween1 = DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 0 end), + DG.Tweening.Core.DOSetter_float(function (t) + progressBar.fillAmount =t + end), data[2], 1):SetEase(Ease.Linear) + local scoreTextArr = {"良好","优秀","史诗","传说","神话"} local scoreImageArr = {"r_hero_tujian_lianghao","r_hero_tujian_youxiu","r_hero_tujian_shishi","r_hero_tujian_chuanshuo","r_hero_tujian_shenhua"} local scoreText= Util.GetGameObject(this.challengeInfo,"layout/progressBg/scoreText") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index c239780d03..dfdb58401c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -109,6 +109,7 @@ function RoleInfoLayout:InitComponent() this.upLvBtn=Util.GetGameObject(this.upLv,"upLvBtn") this.upMaxLvBtn=Util.GetGameObject(this.upLv,"upMaxLvBtn") this.upLvBtnRedPoint=Util.GetGameObject(this.upLvBtn,"redPoint") + this.upMaxLvBtnRedPoint=Util.GetGameObject(this.upMaxLvBtn,"redPoint") this.upLvTrigger = Util.GetEventTriggerListener(this.upLvBtn) this.upLvBtnText=Util.GetGameObject(this.upLvBtn,"Text"):GetComponent("Text") this.upLvBtnImage=this.upLvBtn:GetComponent("Image") @@ -840,6 +841,7 @@ function this:UpdateHeroUpLvAndBreakMaterialShow() --红点检测 local upLvRedpoint = HeroManager.LvUpBtnRedPoint(curHeroData) this.upLvBtnRedPoint:SetActive(upLvRedpoint) + this.upMaxLvBtnRedPoint:SetActive(upLvRedpoint) parent:CheckRedPointType(RoleInfoPanelIndex.qingbao,upLvRedpoint) end