[飞升]=====飞升特效修改提交
parent
1f4c38a710
commit
b18db8765d
|
@ -552,7 +552,6 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer)
|
|||
-- long2:SetActive(true)
|
||||
img.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai2")
|
||||
else
|
||||
LogError("333333")
|
||||
img.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -493,18 +493,6 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
|
|||
local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
|
||||
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
||||
|
||||
if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then
|
||||
bg.sprite = this.spLoader:LoadSprite(GetFormationHeroCardStarBg[_heroData.star])
|
||||
Util.GetGameObject(o,"hpProgress").gameObject:SetActive(true)
|
||||
Util.GetGameObject(o,"rageProgress").gameObject:SetActive(false)
|
||||
|
||||
else
|
||||
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[_heroData.star])
|
||||
Util.GetGameObject(o,"hpProgress").gameObject:SetActive(false)
|
||||
Util.GetGameObject(o,"rageProgress").gameObject:SetActive(false)
|
||||
|
||||
end
|
||||
|
||||
local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image")
|
||||
-- local live=Util.GetGameObject(o,"Mask/Live")
|
||||
|
||||
|
@ -516,11 +504,24 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
|
|||
local yuanImage=Util.GetGameObject(o,"yuanImage")
|
||||
--local flyImg=Util.GetGameObject(o,"flyImg"):GetComponent("Image")
|
||||
local heroData = HeroManager.GetSingleHeroData(heroId)
|
||||
|
||||
local kaPaiEffect=Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai")
|
||||
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
|
||||
local liveName = heroData.live
|
||||
local roleConfig = {}
|
||||
local toward=0
|
||||
if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then
|
||||
bg.sprite = this.spLoader:LoadSprite(GetFormationHeroCardStarBg[_heroData.star])
|
||||
Util.GetGameObject(o,"hpProgress").gameObject:SetActive(true)
|
||||
Util.GetGameObject(o,"rageProgress").gameObject:SetActive(false)
|
||||
kaPaiEffect.transform.localScale=Vector3.New(1,1.1,1)
|
||||
kaPaiEffect.transform.localPosition=Vector3.New(-8,-16,0)
|
||||
else
|
||||
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[_heroData.star])
|
||||
Util.GetGameObject(o,"hpProgress").gameObject:SetActive(false)
|
||||
Util.GetGameObject(o,"rageProgress").gameObject:SetActive(false)
|
||||
kaPaiEffect.transform.localScale=Vector3.New(1,1,1)
|
||||
kaPaiEffect.transform.localPosition=Vector3.New(-8,0,0)
|
||||
end
|
||||
if heroData.skinId == 0 then
|
||||
roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.heroConfig.Id)
|
||||
toward=heroData.heroConfig.Toward
|
||||
|
@ -555,7 +556,6 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
|
|||
|
||||
|
||||
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroData.star])
|
||||
|
||||
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||
local star,starType = heroData.GetStar()
|
||||
if starType == 3 then
|
||||
|
@ -567,11 +567,12 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
|
|||
end
|
||||
SetCardStars(starGrid,star,starType)
|
||||
if heroData.star > 9 then
|
||||
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
|
||||
kaPaiEffect:SetActive(true)
|
||||
else
|
||||
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
|
||||
kaPaiEffect:SetActive(false)
|
||||
end
|
||||
SetHeroFormationFlyEffect(o,this.spLoader,Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai"),heroData.star,orginLayer)
|
||||
SetHeroFormationFlyEffect(o,this.spLoader,kaPaiEffect,heroData.star,orginLayer)
|
||||
|
||||
name.text=GetLanguageStrById(heroData.heroConfig.ReadingName)
|
||||
SetTextVerTial(name.gameObject,Vector3.New(29.24,-7.45,0),nil,nil,8)
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ function this:OnShow(_parent,_Data)
|
|||
end
|
||||
num.text = v.num > 0 and v.num or ""
|
||||
SetHeroStars(this.spLoader, starGrid, v.star,1,nil,-15.3)
|
||||
SetHeroFlyEffect(itemList[k][n],this.spLoader,v.star,sortingOrder,1,4)
|
||||
SetHeroFlyEffect(itemList[k][n],this.spLoader,v.star,sortingOrder,1,3,10)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue