From 75049d619c7c243920b87cae620a1c061937aea0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 27 Sep 2021 20:07:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Likability/HeroLikeAbilityPanel.lua | 2 +- .../Modules/Likability/LikabilityManager.lua | 17 ++++++++++++++++- .../Modules/Likability/LikeAbilityPanel.lua | 3 ++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua index 83137969aa..80cd818ff0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua @@ -82,7 +82,7 @@ function HeroLikeAbilityPanel:OnPointerDown1(go, data) self.num = 0 self.numCount = 0 if LikabilityManager.CheckIsMaxLv(curHeroData.Id) then - PopupTipPanel.ShowTip("神将好感度最达最佳,无需更多赠予~") + PopupTipPanel.ShowTip("神将好感度已达最佳,无需更多赠予~") return end if LikabilityManager.GetRemainTimes() < 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua index 41c53df872..f01a9561fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua @@ -422,7 +422,7 @@ function this.SetProvalue(prolist,proType,tag,nextLv,indexType,_color) local str1 = "" if proType == 1 then str1 = PropertyConfig[k].Info..string.format(" +%s",_color,GetPropertyFormatStrOne(PropertyConfig[k].Style, v) ) - if nextLv and list[nextLv] then + if nextLv and not this.CheckIsMaxLv2(indexType,nextLv) then local pro1 = LikabilityManager.GetProData(indexType,nextLv,nextLv) if pro1[k] and pro1[k] > 0 then str1 = str1.." "..string.format("(下级额外 +%s)",color1,pro1[k]) @@ -440,4 +440,19 @@ function this.SetProvalue(prolist,proType,tag,nextLv,indexType,_color) return str end +function this.CheckIsMaxLv2(indexType,nextLv) + local list = {} + if indexType == 1 then + list = this.TotalLvList + else + list = this.HeroLvList + end + for i = 1,#list do + if list[i].lv == nextLv then + return false + end + end + return true +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua index 4984b36f22..7e111b6d86 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua @@ -4,7 +4,7 @@ LikeAbilityPanel = Inherit(BasePanel) --特权--橙色 --总好感度属性: --黄色 --+500 --绿色 - +local pos = {["h_haogandu_1"] = Vector3.zero,["h_haogandu_2"] = Vector3.zero,["h_haogandu_3"] = Vector3.New(-16.15,0,0) } local sortOrder = 0 local tabs = {} local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh"} @@ -100,6 +100,7 @@ function LikeAbilityPanel:UpdateTopLayoutPanel() local num,lv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1) local config = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LikeAbility,"Type",1,"Level",lv) self.likeabilityDi.sprite = self.spLoader:LoadSprite(config.Bg) + self.likeabilitymask.transform.localPosition = pos[config.Bg] self.lv.text = lv if LikabilityManager.CheckIsMaxLv(-1) then self.likeabilitymask.fillAmount = 1