From 0543114a36312af6345a4fb7b2428c55f3830b76 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 2 Nov 2022 16:26:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=98=9F=E7=BA=A7=E6=89=A9?= =?UTF-8?q?=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 6 +++--- .../ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua | 4 ++-- .../~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua | 6 ++++++ .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 4 ++-- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 671bc81473..83efa02a6f 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -451,7 +451,7 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList) local go=img if _star>11 then if _star>13 then - go.gameObject:SetActive(true) + go.gameObject:SetActive(false) else go.gameObject:SetActive(false) end @@ -545,7 +545,7 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer) return end img=img:GetComponent("Image") - img.gameObject:SetActive(true) + img.gameObject:SetActive(false) if _star==12 then img.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1") elseif _star==13 then @@ -793,7 +793,7 @@ function SetHeroBg(spLoader, bg,cardBg,star,quality,layer) bgEffect2:SetActive(false) long:SetActive(false) if star>13 then - flyImg.gameObject:SetActive(true) + flyImg.gameObject:SetActive(false) if star==14 then shan:SetActive(true) flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index e799db16a4..554b54de53 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -102,9 +102,9 @@ function this:OnOpen(...) end if curSkillData.needStar and curSkillData.needStar~=1 then LogError("urSkillData.needStar=="..curSkillData.needStar) - if curSkillData.needStar==13 then + if curSkillData.needStar==16 then --this.hintTxt.text=" ".."飞升3解锁" - des1="".."飞升2解锁".."".."\n"..des1 + des1="".."飞升5解锁".."".."\n"..des1 else --this.hintTxt.text=" ".. des1=""..NumToSimplenessFont[curSkillData.needStar].."星解锁\n"..""..des1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua index 1897d1099d..bf780bade4 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua @@ -157,6 +157,12 @@ function RoleFlyUpLayout:UpdateHeroUpStarData() elseif curHeroData.star==13 then str="r_tongyong_tianfufeishengxiao3" flyStr="飞升三阶" + elseif curHeroData.star==14 then + str="r_tongyong_tianfufeishengxiao3" + flyStr="飞升四阶" + elseif curHeroData.star==15 then + str="r_tongyong_tianfufeishengxiao3" + flyStr="飞升五阶" else str="r_hero_tianfu2_zh" end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 4a7d370318..e13552f834 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -372,8 +372,8 @@ function this.SkillInfo() sText.fontSize = GetCurLanguage() ~= 2 and 30 or 25 Util.SetGray(go,skillList[i].isOpen) if skillList[i].isOpen then - if skillList[i].needStar==13 then - sText.text="飞升2解锁" + if skillList[i].needStar==16 then + sText.text="飞升5解锁" else sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁" end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 122056a813..a833988993 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -578,7 +578,7 @@ function this:UpdateBtnList() end elseif k == RoleInfoPanelIndex.feiSheng then local isopen=ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FlyUp) - if curHeroData.heroConfig.MaxRank >11 and curHeroData.star>=11 and curHeroData.star < 14 then + if curHeroData.heroConfig.MaxRank >11 and curHeroData.star>=11 and curHeroData.star < 16 then tabsList[k].gameObject:SetActive(true) else tabsList[k].gameObject:SetActive(false)