灵兽详情修改提交
parent
f02488801d
commit
76528c3b7a
|
|
@ -1534,7 +1534,7 @@ 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: 2.1, y: 12.9}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 46.01, y: 217.55}
|
m_SizeDelta: {x: 46.01, y: 217.55}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4357930264456814047
|
--- !u!222 &4357930264456814047
|
||||||
|
|
@ -1567,7 +1567,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 50
|
m_FontSize: 40
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 0
|
m_MinSize: 0
|
||||||
|
|
@ -1577,7 +1577,7 @@ MonoBehaviour:
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1.3
|
m_LineSpacing: 1
|
||||||
m_Text: "\u51B0\u51E4"
|
m_Text: "\u51B0\u51E4"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &2337782129293525483
|
--- !u!1 &2337782129293525483
|
||||||
|
|
@ -1884,7 +1884,7 @@ 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: 02d017b768196614cba74209330fa078, type: 3}
|
m_Sprite: {fileID: 21300000, guid: e70dd6b8466df8b4882e22fd021d69af, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,8 @@ function this.GetShowPanelData()
|
||||||
local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonBackData.tempId)
|
local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonBackData.tempId)
|
||||||
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
|
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
|
||||||
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
|
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
|
||||||
this.ShowPokemonLive(pokemonSData)
|
this.pokemonIcon:GetComponent("Image").sprite=this.spLoader:LoadSprite( GetResourcePath(pokemonSData.Picture))
|
||||||
|
--this.ShowPokemonLive(pokemonSData)
|
||||||
--星级
|
--星级
|
||||||
local starSize = Vector2.New(65,65)
|
local starSize = Vector2.New(65,65)
|
||||||
local starSize = Vector2.New(32.5,32.5)
|
local starSize = Vector2.New(32.5,32.5)
|
||||||
|
|
@ -166,19 +167,19 @@ end
|
||||||
|
|
||||||
function this.ShowPokemonLive(_heroSConfigData)
|
function this.ShowPokemonLive(_heroSConfigData)
|
||||||
LogPink("_heroSConfigData.Live ".._heroSConfigData.Live)
|
LogPink("_heroSConfigData.Live ".._heroSConfigData.Live)
|
||||||
this.testLiveGO = poolManager:LoadLive(GetResourcePath(_heroSConfigData.Live), this.liveRoot.transform,
|
-- this.testLiveGO = poolManager:LoadLive(GetResourcePath(_heroSConfigData.Live), this.liveRoot.transform,
|
||||||
Vector3.one * _heroSConfigData.Scale * 0.7, Vector3.New(_heroSConfigData.Position[1], _heroSConfigData.Position[2], 0))
|
-- Vector3.one * _heroSConfigData.Scale * 0.7, Vector3.New(_heroSConfigData.Position[1], _heroSConfigData.Position[2], 0))
|
||||||
local SkeletonGraphic = this.testLiveGO:GetComponent("SkeletonGraphic")
|
-- local SkeletonGraphic = this.testLiveGO:GetComponent("SkeletonGraphic")
|
||||||
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
|
-- local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
|
||||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
|
-- SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
|
||||||
poolManager:SetLiveClearCall(GetResourcePath(_heroSConfigData.Live), this.testLiveGO, function ()
|
-- poolManager:SetLiveClearCall(GetResourcePath(_heroSConfigData.Live), this.testLiveGO, function ()
|
||||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
-- SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
||||||
end)
|
-- end)
|
||||||
end
|
end
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function PokemonGetInfoPopup:OnClose()
|
function PokemonGetInfoPopup:OnClose()
|
||||||
|
|
||||||
poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
|
--poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
|
||||||
this.testLiveGO = nil
|
this.testLiveGO = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue