From da4b07d86265e2eff0b3bd85f501e5f355691750 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 2 Nov 2022 15:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E7=BA=A7=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 5 +++ .../~Lua/Common/functions.lua | 39 ++++++++++++++----- .../ManagedResources/~Lua/Data/ConfigData.lua | 2 +- .../~Lua/Modules/Hero/HeroManager.lua | 4 +- .../~Lua/Modules/RoleInfo/RoleTalentPopup.lua | 4 ++ 5 files changed, 43 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f1a91ef901..82bc522011 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2004,6 +2004,11 @@ NumToSimplenessFont = { [13] = Language[10013], [14] = Language[10014], [15] = Language[10015], + [16] = "十六", + [17] = "十七", + [18] = "十八", + [19] = "十九", + [20] = "二十", } NumToWeek = { [1] = "周一", diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 2c852ecd06..671bc81473 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -450,7 +450,12 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList) local go=img if _star>11 then - go.gameObject:SetActive(true) + if _star>13 then + go.gameObject:SetActive(true) + else + go.gameObject:SetActive(false) + end + if effect==nil then effect=poolManager:LoadAsset("c_long_touxiang_lizi", PoolManager.AssetType.GameObject) end @@ -470,13 +475,13 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList) bg1:SetActive(false) bg2:SetActive(false) bg3:SetActive(false) - if _star==12 then + if _star==14 then go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju1") - elseif _star==13 then + elseif _star==15 then go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju2") bg1:SetActive(true) bg2:SetActive(true) - elseif _star==14 then + elseif _star==16 then bg1:SetActive(true) bg2:SetActive(true) bg3:SetActive(true) @@ -608,7 +613,13 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot -- horizonta = starGrid:AddComponent(typeof(UnityEngine.UI.HorizontalLayoutGroup)) -- horizonta.childAlignment = "LowerLeft" -- end - + LogError("star====="..star) + if star>11 then + type=3 + end + if type==3 then + star=star-11 + end local starSize if not _starSize and type == 3 then --第一个值代表缩放,第二个值代表y轴移动到的y轴的位置 @@ -781,16 +792,16 @@ function SetHeroBg(spLoader, bg,cardBg,star,quality,layer) bgEffect:SetActive(false) bgEffect2:SetActive(false) long:SetActive(false) - if star>11 then + if star>13 then flyImg.gameObject:SetActive(true) - if star==12 then + if star==14 then shan:SetActive(true) flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1") - elseif star==13 then + elseif star==15 then shan:SetActive(true) bgEffect:SetActive(false) flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai2") - elseif star==14 then + elseif star==16 then shan:SetActive(true) bgEffect:SetActive(true) --long:SetActive(true) @@ -826,8 +837,18 @@ local star2index = { } function SetCardStars(starGrid, star,starType) local starScale = -12 + if star==0 then + starGrid.gameObject:SetActive(false) + return + else + starGrid.gameObject:SetActive(true) + end + if star>11 then + starType=3 + end if starType == 3 then starScale = 7 + star=star-11 end for i = 1, starGrid.transform.childCount do starGrid.transform:GetChild(i - 1).gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index cb31598093..4c88415423 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -270,7 +270,7 @@ ConfigName = { ChongRank="ChongRank", ChongRankInfo="ChongRankInfo", ChongRankInformation ="ChongRankInformation", - + ChangingCardStar = "ChangingCardStar", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 6367e38a4d..921bd9e74e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -196,7 +196,9 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) local godSoulLv = GodSoulManager.GetGodSoulLv(heroData.dynamicId) if godSoulLv and godSoulLv > 0 then return godSoulLv,3 - elseif heroData.star > 9 then + elseif heroData.star >= 12 then + return heroData.star,3 + elseif heroData.star > 9 then return heroData.star,2 end return heroData.star,index diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua index 83dda77406..12d0e85d8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua @@ -93,6 +93,10 @@ function RoleTalentPopup:GetTalentDataShow() titleStr="飞升二阶激活:\n" elseif curUpStarId==27 then titleStr="飞升三阶激活:\n" + elseif curUpStarId==28 then + titleStr="飞升四阶激活:\n" + elseif curUpStarId==29 then + titleStr="飞升五阶激活:\n" end else