星级显示修改提交
parent
6c8c6182ad
commit
da4b07d862
|
@ -2004,6 +2004,11 @@ NumToSimplenessFont = {
|
||||||
[13] = Language[10013],
|
[13] = Language[10013],
|
||||||
[14] = Language[10014],
|
[14] = Language[10014],
|
||||||
[15] = Language[10015],
|
[15] = Language[10015],
|
||||||
|
[16] = "十六",
|
||||||
|
[17] = "十七",
|
||||||
|
[18] = "十八",
|
||||||
|
[19] = "十九",
|
||||||
|
[20] = "二十",
|
||||||
}
|
}
|
||||||
NumToWeek = {
|
NumToWeek = {
|
||||||
[1] = "周一",
|
[1] = "周一",
|
||||||
|
|
|
@ -450,7 +450,12 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList)
|
||||||
|
|
||||||
local go=img
|
local go=img
|
||||||
if _star>11 then
|
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
|
if effect==nil then
|
||||||
effect=poolManager:LoadAsset("c_long_touxiang_lizi", PoolManager.AssetType.GameObject)
|
effect=poolManager:LoadAsset("c_long_touxiang_lizi", PoolManager.AssetType.GameObject)
|
||||||
end
|
end
|
||||||
|
@ -470,13 +475,13 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList)
|
||||||
bg1:SetActive(false)
|
bg1:SetActive(false)
|
||||||
bg2:SetActive(false)
|
bg2:SetActive(false)
|
||||||
bg3:SetActive(false)
|
bg3:SetActive(false)
|
||||||
if _star==12 then
|
if _star==14 then
|
||||||
go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju1")
|
go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju1")
|
||||||
elseif _star==13 then
|
elseif _star==15 then
|
||||||
go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju2")
|
go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju2")
|
||||||
bg1:SetActive(true)
|
bg1:SetActive(true)
|
||||||
bg2:SetActive(true)
|
bg2:SetActive(true)
|
||||||
elseif _star==14 then
|
elseif _star==16 then
|
||||||
bg1:SetActive(true)
|
bg1:SetActive(true)
|
||||||
bg2:SetActive(true)
|
bg2:SetActive(true)
|
||||||
bg3: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 = starGrid:AddComponent(typeof(UnityEngine.UI.HorizontalLayoutGroup))
|
||||||
-- horizonta.childAlignment = "LowerLeft"
|
-- horizonta.childAlignment = "LowerLeft"
|
||||||
-- end
|
-- end
|
||||||
|
LogError("star====="..star)
|
||||||
|
if star>11 then
|
||||||
|
type=3
|
||||||
|
end
|
||||||
|
if type==3 then
|
||||||
|
star=star-11
|
||||||
|
end
|
||||||
local starSize
|
local starSize
|
||||||
if not _starSize and type == 3 then
|
if not _starSize and type == 3 then
|
||||||
--第一个值代表缩放,第二个值代表y轴移动到的y轴的位置
|
--第一个值代表缩放,第二个值代表y轴移动到的y轴的位置
|
||||||
|
@ -781,16 +792,16 @@ function SetHeroBg(spLoader, bg,cardBg,star,quality,layer)
|
||||||
bgEffect:SetActive(false)
|
bgEffect:SetActive(false)
|
||||||
bgEffect2:SetActive(false)
|
bgEffect2:SetActive(false)
|
||||||
long:SetActive(false)
|
long:SetActive(false)
|
||||||
if star>11 then
|
if star>13 then
|
||||||
flyImg.gameObject:SetActive(true)
|
flyImg.gameObject:SetActive(true)
|
||||||
if star==12 then
|
if star==14 then
|
||||||
shan:SetActive(true)
|
shan:SetActive(true)
|
||||||
flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1")
|
flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1")
|
||||||
elseif star==13 then
|
elseif star==15 then
|
||||||
shan:SetActive(true)
|
shan:SetActive(true)
|
||||||
bgEffect:SetActive(false)
|
bgEffect:SetActive(false)
|
||||||
flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai2")
|
flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai2")
|
||||||
elseif star==14 then
|
elseif star==16 then
|
||||||
shan:SetActive(true)
|
shan:SetActive(true)
|
||||||
bgEffect:SetActive(true)
|
bgEffect:SetActive(true)
|
||||||
--long:SetActive(true)
|
--long:SetActive(true)
|
||||||
|
@ -826,8 +837,18 @@ local star2index = {
|
||||||
}
|
}
|
||||||
function SetCardStars(starGrid, star,starType)
|
function SetCardStars(starGrid, star,starType)
|
||||||
local starScale = -12
|
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
|
if starType == 3 then
|
||||||
starScale = 7
|
starScale = 7
|
||||||
|
star=star-11
|
||||||
end
|
end
|
||||||
for i = 1, starGrid.transform.childCount do
|
for i = 1, starGrid.transform.childCount do
|
||||||
starGrid.transform:GetChild(i - 1).gameObject:SetActive(false)
|
starGrid.transform:GetChild(i - 1).gameObject:SetActive(false)
|
||||||
|
|
|
@ -270,7 +270,7 @@ ConfigName = {
|
||||||
ChongRank="ChongRank",
|
ChongRank="ChongRank",
|
||||||
ChongRankInfo="ChongRankInfo",
|
ChongRankInfo="ChongRankInfo",
|
||||||
ChongRankInformation ="ChongRankInformation",
|
ChongRankInformation ="ChongRankInformation",
|
||||||
|
ChangingCardStar = "ChangingCardStar",
|
||||||
}
|
}
|
||||||
|
|
||||||
require "Framework/GameDataBase"
|
require "Framework/GameDataBase"
|
||||||
|
|
|
@ -196,7 +196,9 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
|
||||||
local godSoulLv = GodSoulManager.GetGodSoulLv(heroData.dynamicId)
|
local godSoulLv = GodSoulManager.GetGodSoulLv(heroData.dynamicId)
|
||||||
if godSoulLv and godSoulLv > 0 then
|
if godSoulLv and godSoulLv > 0 then
|
||||||
return godSoulLv,3
|
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
|
return heroData.star,2
|
||||||
end
|
end
|
||||||
return heroData.star,index
|
return heroData.star,index
|
||||||
|
|
|
@ -93,6 +93,10 @@ function RoleTalentPopup:GetTalentDataShow()
|
||||||
titleStr="飞升二阶激活:\n"
|
titleStr="飞升二阶激活:\n"
|
||||||
elseif curUpStarId==27 then
|
elseif curUpStarId==27 then
|
||||||
titleStr="飞升三阶激活:\n"
|
titleStr="飞升三阶激活:\n"
|
||||||
|
elseif curUpStarId==28 then
|
||||||
|
titleStr="飞升四阶激活:\n"
|
||||||
|
elseif curUpStarId==29 then
|
||||||
|
titleStr="飞升五阶激活:\n"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue