玉虚轮道等级 星级显示修改

(cherry picked from commit f02371a3ef)
tcx_xiyou_dev
wangzhenxing 2024-06-20 11:48:59 +08:00
parent 9e52779230
commit fa6951eeb5
4 changed files with 23 additions and 23 deletions

View File

@ -4690,8 +4690,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 206.5, y: -127.28998} m_AnchoredPosition: {x: 111, y: -127.28998}
m_SizeDelta: {x: 344.69, y: 118.58} m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.49999994, y: 0.5} m_Pivot: {x: 0.49999994, y: 0.5}
--- !u!222 &7230224505224635788 --- !u!222 &7230224505224635788
CanvasRenderer: CanvasRenderer:
@ -9365,7 +9365,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 203.7, y: -74.4} m_AnchoredPosition: {x: 178.2, y: -24}
m_SizeDelta: {x: 160, y: 43.45} m_SizeDelta: {x: 160, y: 43.45}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1879465128869538846 --- !u!222 &1879465128869538846

View File

@ -318,8 +318,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -341, y: 63} m_AnchoredPosition: {x: -387, y: 63}
m_SizeDelta: {x: 218, y: 88} m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1100476151660230019 --- !u!222 &1100476151660230019
CanvasRenderer: CanvasRenderer:
@ -4943,8 +4943,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -341, y: 63} m_AnchoredPosition: {x: -379.4, y: 63}
m_SizeDelta: {x: 218, y: 88} m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8167908131374529222 --- !u!222 &8167908131374529222
CanvasRenderer: CanvasRenderer:
@ -5131,8 +5131,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 133, y: 2} m_AnchoredPosition: {x: 235, y: 0.0000019073}
m_SizeDelta: {x: 602.86, y: 201.33} m_SizeDelta: {x: 602.9, y: 83.333}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6728350999838711093 --- !u!222 &6728350999838711093
CanvasRenderer: CanvasRenderer:
@ -7394,8 +7394,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 133, y: 2} m_AnchoredPosition: {x: 229.4, y: 0.00050735}
m_SizeDelta: {x: 602.86, y: 201.33} m_SizeDelta: {x: 584.1, y: 83.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6117326121750782939 --- !u!222 &6117326121750782939
CanvasRenderer: CanvasRenderer:
@ -12422,8 +12422,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} m_Sprite: {fileID: 21300000, guid: 2aee8defd79a47546939fc58e0f3b963, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -14616,8 +14616,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 133, y: 2} m_AnchoredPosition: {x: 225.5, y: 0.000042915}
m_SizeDelta: {x: 602.86, y: 201.33} m_SizeDelta: {x: 591.3, y: 83.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &434156244263268523 --- !u!222 &434156244263268523
CanvasRenderer: CanvasRenderer:
@ -15201,8 +15201,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -341, y: 63} m_AnchoredPosition: {x: -382, y: 63}
m_SizeDelta: {x: 218, y: 88} m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4461231562431832511 --- !u!222 &4461231562431832511
CanvasRenderer: CanvasRenderer:

View File

@ -553,8 +553,8 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
local star,starType = heroData.GetStar() local star,starType = heroData.GetStar()
local level=heroData.lv local level=heroData.lv
if panelType == FORMATION_TYPE.WORLDARENA then if panelType == FORMATION_TYPE.WORLDARENA then
star=endLess[heroData.heroConfig.Id].Star --star=endLess[heroData.heroConfig.Id].Star
level=endLess[heroData.heroConfig.Id].Level --level=endLess[heroData.heroConfig.Id].Level
end end
if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then
bg.sprite = this.spLoader:LoadSprite(GetFormationHeroCardStarBg[star]) bg.sprite = this.spLoader:LoadSprite(GetFormationHeroCardStarBg[star])
@ -903,14 +903,14 @@ function this.SingleHeroDataShow(_go, _heroData)
end end
end end
LogError("heroData.heroConfig.Id=="..heroData.heroConfig.Id) LogError("heroData.heroConfig.Id=="..heroData.heroConfig.Id)
star=endLess[heroData.heroConfig.Id].Star --star=endLess[heroData.heroConfig.Id].Star
LogError("star=="..star) LogError("star=="..star)
if star>11 then if star>11 then
starSize = Vector3.New(1,-15.6) starSize = Vector3.New(1,-15.6)
else else
starSize = Vector2.New(60,57) starSize = Vector2.New(60,57)
end end
--
level=endLess[heroData.heroConfig.Id].Level level=endLess[heroData.heroConfig.Id].Level
end end

View File

@ -168,7 +168,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
self.Heros[index][hero.position].hero:SetActive(true) self.Heros[index][hero.position].hero:SetActive(true)
local star,starType = heroData.GetStar(1) local star,starType = heroData.GetStar(1)
LogError("heroData.id=="..heroData.id) LogError("heroData.id=="..heroData.id)
star=endLessConfig[heroData.id].Star --star=endLessConfig[heroData.id].Star
local starScale = -15 local starScale = -15
local starSize = Vector2.New(32,32) local starSize = Vector2.New(32,32)
if starType == 3 then if starType == 3 then
@ -183,7 +183,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
allPower=allPower+heroData.warPower allPower=allPower+heroData.warPower
self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId)) self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
self.Heros[index][hero.position].levelText.text = endLessConfig[heroData.id].Level or heroData.lv self.Heros[index][hero.position].levelText.text = heroData.lv --endLessConfig[heroData.id].Level or heroData.lv
self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,star)) self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,star))
SetHeroIcon(self.spLoader,heroData,self.Heros[index][hero.position].icon,heroConfig) SetHeroIcon(self.spLoader,heroData,self.Heros[index][hero.position].icon,heroConfig)
local heroData = {} local heroData = {}