Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
beefc36516
File diff suppressed because it is too large
Load Diff
|
|
@ -104,7 +104,7 @@ function RoleUpStarSuccessPanel:OnOpen(...)
|
||||||
this.UI_Effect_choukaSSR:SetActive(curHeroData.heroConfig.Quality == 5)
|
this.UI_Effect_choukaSSR:SetActive(curHeroData.heroConfig.Quality == 5)
|
||||||
this.UI_Effect_choukaSR:SetActive(curHeroData.heroConfig.Quality == 4)
|
this.UI_Effect_choukaSR:SetActive(curHeroData.heroConfig.Quality == 4)
|
||||||
this.UI_Effect_choukaR:SetActive(curHeroData.heroConfig.Quality == 3)
|
this.UI_Effect_choukaR:SetActive(curHeroData.heroConfig.Quality == 3)
|
||||||
this.LiveName = curHeroData.live
|
this.LiveName = curHeroData.painting
|
||||||
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
|
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
|
||||||
Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0))
|
Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0))
|
||||||
SetHeroStars(this.spLoader, this.starGrid, curHeroData.star+1,1,Vector2.New(60,60),-11,Vector2.New(0.5,0.5))
|
SetHeroStars(this.spLoader, this.starGrid, curHeroData.star+1,1,Vector2.New(60,60),-11,Vector2.New(0.5,0.5))
|
||||||
|
|
@ -127,7 +127,7 @@ function RoleUpStarSuccessPanel:OnOpen(...)
|
||||||
--this.quality:GetComponent("Text").text = curHeroData.heroConfig.Natural
|
--this.quality:GetComponent("Text").text = curHeroData.heroConfig.Natural
|
||||||
--this.doubleQuality:GetComponent("Text").text = curHeroData.heroConfig.Natural
|
--this.doubleQuality:GetComponent("Text").text = curHeroData.heroConfig.Natural
|
||||||
--定位描述相关
|
--定位描述相关
|
||||||
this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession))
|
--this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession))
|
||||||
-- this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
|
-- this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
|
||||||
this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation)
|
this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation)
|
||||||
SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft")
|
SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue