Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
c259e72874
|
@ -145,14 +145,14 @@ function RoleGodSoulLayout:SetHeroData(heroGo,heroData,isCur)
|
||||||
starSize = Vector2.New(34.492,32.767)
|
starSize = Vector2.New(34.492,32.767)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,self.star))
|
||||||
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||||
SetHeroIcon(self.spLoader,heroData,icon,heroData.heroConfig)
|
SetHeroIcon(self.spLoader,heroData,icon,heroData.heroConfig)
|
||||||
SetHeroStars(self.spLoader, starGrid, star,starType,starSize,starScale)
|
SetHeroStars(self.spLoader, starGrid, star,starType,starSize,starScale)
|
||||||
else
|
else
|
||||||
local lv = Util.GetGameObject(heroGo,"lv/Text"):GetComponent("Text")
|
local lv = Util.GetGameObject(heroGo,"lv/Text"):GetComponent("Text")
|
||||||
lv.text = self.level
|
lv.text = self.level
|
||||||
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.star))
|
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,self.star))
|
||||||
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||||
SetHeroIcon(self.spLoader,heroData,icon,heroData)
|
SetHeroIcon(self.spLoader,heroData,icon,heroData)
|
||||||
SetHeroStars(self.spLoader, starGrid, self.star,1)
|
SetHeroStars(self.spLoader, starGrid, self.star,1)
|
||||||
|
|
Loading…
Reference in New Issue