From c48d23a265df45b9e60aaeaeff6df717f2db028c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Wed, 29 Nov 2023 15:09:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=89=E9=86=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 4 ++-- .../~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua | 12 ++++++------ .../~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua | 6 +++--- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index d71ab760fd..83ce8dd8b4 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -658,11 +658,11 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot if type==nil then type=1 end - if star>11 then + if star>=11 then type=3 end if type==3 then - star=star-11 + star=star-10 end local starSize if not _starSize and type == 3 then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua index 77710654f3..d7b9ff3c35 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua @@ -149,19 +149,19 @@ function RoleFlyUpLayout:UpdateHeroUpStarData() end local str="" local flyStr="" - if curHeroData.star==11 then + if curHeroData.star==10 then str="r_tongyong_tianfufeishengxiao1" flyStr="飞升一阶" - elseif curHeroData.star==12 then + elseif curHeroData.star==11 then str="r_tongyong_tianfufeishengxiao2" flyStr="飞升二阶" - elseif curHeroData.star==13 then + elseif curHeroData.star==12 then str="r_tongyong_tianfufeishengxiao3" flyStr="飞升三阶" - elseif curHeroData.star==14 then + elseif curHeroData.star==13 then str="r_tongyong_tianfufeishengxiao3" flyStr="飞升四阶" - elseif curHeroData.star==15 then + elseif curHeroData.star==14 then str="r_tongyong_tianfufeishengxiao3" flyStr="飞升五阶" else @@ -173,7 +173,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData() local str="激活飞升天赋: " if awaken then for key, value in pairs(awaken) do - if value[2]==curHeroData.star+14 then + if value[2]==curHeroData.star+15 then local aaa=ConfigManager.TryGetConfigData(ConfigName.PassiveSkillConfig,value[3]) if aaa then --this.skillInfoGrid.text="激活飞升天赋:".." "..aaa.Desc diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua index 65a75ef589..7993905faa 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua @@ -116,11 +116,11 @@ function RoleFlyUpSuccessPanel:OnOpen(...) this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId)) local upStar=curHeroData.star+1 local flyImg="" - if upStar==12 then + if upStar==11 then flyImg="r_tongyong_tianfufeishengxiao1" - elseif upStar==13 then + elseif upStar==12 then flyImg="r_tongyong_tianfufeishengxiao2" - elseif upStar==14 then + elseif upStar==13 then flyImg="r_tongyong_tianfufeishengxiao3" else flyImg="r_tongyong_tianfufeishengxiao3" diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index cd1b0400c6..767d3fa402 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -608,7 +608,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 < 16 then + if curHeroData.heroConfig.MaxRank >11 and curHeroData.star>=10 and curHeroData.star < 15 then tabsList[k].gameObject:SetActive(true) else tabsList[k].gameObject:SetActive(false) @@ -754,7 +754,7 @@ function this:UpdateHeroInfoData() _CurPageIndex = RoleInfoPanelIndex.qingbao end elseif _CurPageIndex == RoleInfoPanelIndex.feiSheng then - if curHeroData.heroConfig.MaxRank <= 11 or curHeroData.star == 16 then + if curHeroData.heroConfig.MaxRank <= 11 or curHeroData.star == 15 then _CurPageIndex=RoleInfoPanelIndex.qingbao else LogError("*********/////////////////222222")