[飞升]=====图鉴显示修改
parent
4c00b471ad
commit
e5494e65ab
|
@ -431,6 +431,11 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList)
|
||||||
--img:GetComponent("RectTransform").sizeDelta = Vector2.New(116,50)
|
--img:GetComponent("RectTransform").sizeDelta = Vector2.New(116,50)
|
||||||
img.transform.localScale = Vector3.one*_scale
|
img.transform.localScale = Vector3.one*_scale
|
||||||
img.transform.localPosition = Vector3.New(0,71*_scale+y,0)
|
img.transform.localPosition = Vector3.New(0,71*_scale+y,0)
|
||||||
|
if imgFloor then
|
||||||
|
img.transform:SetSiblingIndex(imgFloor)
|
||||||
|
else
|
||||||
|
img.transform:SetSiblingIndex(3)
|
||||||
|
end
|
||||||
else
|
else
|
||||||
if _star>11 then
|
if _star>11 then
|
||||||
img.gameObject:SetActive(true)
|
img.gameObject:SetActive(true)
|
||||||
|
@ -439,11 +444,7 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if imgFloor then
|
|
||||||
img.transform:SetSiblingIndex(imgFloor)
|
|
||||||
else
|
|
||||||
img.transform:SetSiblingIndex(3)
|
|
||||||
end
|
|
||||||
|
|
||||||
img=img:GetComponent("Image")
|
img=img:GetComponent("Image")
|
||||||
|
|
||||||
|
|
|
@ -138,7 +138,7 @@ function HandBookHeroInfoPanel:OnOpen(...)
|
||||||
heroStar=temp[5]
|
heroStar=temp[5]
|
||||||
end
|
end
|
||||||
_CurPageIndex = RoleInfoPanelIndex.qingbao
|
_CurPageIndex = RoleInfoPanelIndex.qingbao
|
||||||
heroDatas = PlayerManager.heroHandBookListData[heroConFigData.Natural]
|
heroDatas = PlayerManager.heroHandBookListData[_curStar]
|
||||||
for i = 1, #heroDatas do
|
for i = 1, #heroDatas do
|
||||||
if heroConFigData.Id == heroDatas[i].Id then
|
if heroConFigData.Id == heroDatas[i].Id then
|
||||||
index = i
|
index = i
|
||||||
|
@ -193,7 +193,6 @@ end
|
||||||
--刷新左右两边的英雄星级和index
|
--刷新左右两边的英雄星级和index
|
||||||
function HandBookHeroInfoPanel:UpdateLiveList()
|
function HandBookHeroInfoPanel:UpdateLiveList()
|
||||||
local starIndex = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.RoleAwake) and 11 or 10
|
local starIndex = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.RoleAwake) and 11 or 10
|
||||||
LogError("star==".._curStar)
|
|
||||||
if index - 1 > 0 then
|
if index - 1 > 0 then
|
||||||
_leftStar = _curStar
|
_leftStar = _curStar
|
||||||
leftIndex = index - 1
|
leftIndex = index - 1
|
||||||
|
@ -252,8 +251,8 @@ function this:UpdateHeroInfoData()
|
||||||
this.heroName.text = GetLanguageStrById(heroConFigData.ReadingName)
|
this.heroName.text = GetLanguageStrById(heroConFigData.ReadingName)
|
||||||
this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(heroConFigData.PropertyName))
|
this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(heroConFigData.PropertyName))
|
||||||
--定位描述相关
|
--定位描述相关
|
||||||
LogError("heroConFigData.natural=="..heroConFigData.Natural)
|
--self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroConFigData.Natural))
|
||||||
self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroConFigData.Natural))
|
self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(_curStar))
|
||||||
self.pizhiImg:SetNativeSize()
|
self.pizhiImg:SetNativeSize()
|
||||||
if _CurPageIndex == RoleInfoPanelIndex.pifu then
|
if _CurPageIndex == RoleInfoPanelIndex.pifu then
|
||||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id)
|
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id)
|
||||||
|
@ -305,13 +304,12 @@ function this:UpdateHeroInfoData()
|
||||||
self.talentBtn:SetActive(false)
|
self.talentBtn:SetActive(false)
|
||||||
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
||||||
self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
|
self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
|
||||||
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
|
local OpenPassiveSkillRules = heroStar >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
|
||||||
if OpenPassiveSkillRules then
|
if OpenPassiveSkillRules then
|
||||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
|
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
|
||||||
self.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
self.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(self.talentBtn,function()
|
Util.AddOnceClick(self.talentBtn,function()
|
||||||
LogError("breakid=="..breakId.." upStarId=="..upStarId)
|
|
||||||
if heroStar==11 then
|
if heroStar==11 then
|
||||||
UIManager.OpenPanel(UIName.RoleAwakeTalentPopup,heroConFigData)
|
UIManager.OpenPanel(UIName.RoleAwakeTalentPopup,heroConFigData)
|
||||||
else
|
else
|
||||||
|
@ -397,7 +395,11 @@ function HandBookHeroInfoPanel:OnPageTabChange(index)
|
||||||
this.PageList[index] = SubUIManager.Open(tabs[index].sub,self.layout.transform)
|
this.PageList[index] = SubUIManager.Open(tabs[index].sub,self.layout.transform)
|
||||||
end
|
end
|
||||||
this.PageList[index]:OnShow()
|
this.PageList[index]:OnShow()
|
||||||
this.PageList[index]:SetData(this.sortingOrder,self,heroConFigData,heroConFigData.MaxRank,_curLv)
|
local showStar=heroConFigData.MaxRank
|
||||||
|
if _curStar==6 then
|
||||||
|
showStar=11
|
||||||
|
end
|
||||||
|
this.PageList[index]:SetData(this.sortingOrder,self,heroConFigData,showStar,_curLv)
|
||||||
end
|
end
|
||||||
|
|
||||||
function HandBookHeroInfoPanel:ChangeCurentHeroSkinLive(herodata)
|
function HandBookHeroInfoPanel:ChangeCurentHeroSkinLive(herodata)
|
||||||
|
|
|
@ -106,16 +106,13 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
|
||||||
lv=1
|
lv=1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--计算面板属性
|
--计算面板属性
|
||||||
allAddProVal=self:CalculateHeroAllProValList(_starType,star,lv)
|
allAddProVal=self:CalculateHeroAllProValList(_starType,star,lv)
|
||||||
self.atkPro.text=allAddProVal[HeroProType.Attack]
|
self.atkPro.text=allAddProVal[HeroProType.Attack]
|
||||||
self.hpPro.text=allAddProVal[HeroProType.Hp]
|
self.hpPro.text=allAddProVal[HeroProType.Hp]
|
||||||
self.phyDef.text=allAddProVal[HeroProType.PhysicalDefence]
|
self.phyDef.text=allAddProVal[HeroProType.PhysicalDefence]
|
||||||
self.magDef.text=allAddProVal[HeroProType.MagicDefence]
|
self.magDef.text=allAddProVal[HeroProType.MagicDefence]
|
||||||
|
|
||||||
self.lvTxt.text= " "..lv
|
self.lvTxt.text= " "..lv
|
||||||
LogError("star=="..star.." lv=="..lv)
|
|
||||||
self.posTxt.text=star >= HeroManager.awakeNextStarIndex and GetLanguageStrById(heroConFigData.HeroLocationDesc4) or GetLanguageStrById(heroConFigData.HeroLocationDesc1)
|
self.posTxt.text=star >= HeroManager.awakeNextStarIndex and GetLanguageStrById(heroConFigData.HeroLocationDesc4) or GetLanguageStrById(heroConFigData.HeroLocationDesc1)
|
||||||
self.proImg.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroConFigData.Profession))
|
self.proImg.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroConFigData.Profession))
|
||||||
self.proTxt.text=GetLanguageStrById(heroConFigData.HeroLocation)
|
self.proTxt.text=GetLanguageStrById(heroConFigData.HeroLocation)
|
||||||
|
@ -156,7 +153,11 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
|
||||||
Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image"):SetNativeSize()
|
Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image"):SetNativeSize()
|
||||||
local OpenPassiveSkillRules = star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
|
local OpenPassiveSkillRules = star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
|
||||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
|
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
|
||||||
Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
if star==11 then
|
||||||
|
Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..10
|
||||||
|
else
|
||||||
|
Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||||
|
end
|
||||||
Util.AddOnceClick(allBtns[len+1],function()
|
Util.AddOnceClick(allBtns[len+1],function()
|
||||||
|
|
||||||
UIManager.ClosePanel(currPanelName)
|
UIManager.ClosePanel(currPanelName)
|
||||||
|
@ -304,7 +305,6 @@ function HandBookRoleInfoLayout:CalculateHeroAllProValList(_starType,_starNum,cu
|
||||||
for i, v in ConfigPairs(propertyConfig) do
|
for i, v in ConfigPairs(propertyConfig) do
|
||||||
allAddProVal[i] = 0
|
allAddProVal[i] = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
breakId = 0
|
breakId = 0
|
||||||
upStarId = 0
|
upStarId = 0
|
||||||
if _starType == 2 then
|
if _starType == 2 then
|
||||||
|
|
|
@ -258,7 +258,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
|
||||||
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||||
local star,starType = heroData.GetStar(1)
|
local star,starType = heroData.GetStar(1)
|
||||||
SetHeroStars(self.spLoader,starGrid, star,starType)
|
SetHeroStars(self.spLoader,starGrid, star,starType)
|
||||||
SetHeroFlyEffect(self.Hero,self.spLoader,heroData.star,self.sortingOrder+1,1,2,0)
|
SetHeroFlyEffect(Util.GetGameObject(self.head, "GameObject"),self.spLoader,heroData.star,self.sortingOrder+1,1,3,0)
|
||||||
Util.SetParticleSortLayer(starGrid,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(starGrid,self.sortingOrder + 1)
|
||||||
curhero = _serverData.subId
|
curhero = _serverData.subId
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue