diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 759cc9cd2a..9f99acebb4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -844,7 +844,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -1498,7 +1498,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 120} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3723123758606190715 CanvasRenderer: @@ -2920,7 +2920,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8608652293910191374 RectTransform: m_ObjectHideFlags: 0 @@ -3602,7 +3602,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -4410,7 +4410,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3433503071718014541 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index e28acddbcc..88a8efc825 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -55,8 +55,6 @@ function DamageResultPanel:InitComponent() this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.OnTabChange) - this.TabCtrl:Init(this.tabbox, _TabData) - end --绑定事件(用于子类重写) @@ -77,7 +75,7 @@ end --界面打开时调用(用于子类重写) function DamageResultPanel:OnOpen(result) - + this.TabCtrl:Init(this.tabbox, _TabData) this.leftResult.sprite = this.spLoader:LoadSprite(result == 1 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh") this.rightResult.sprite = this.spLoader:LoadSprite(result == 0 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh") @@ -110,7 +108,9 @@ function DamageResultPanel:OnOpen(result) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function DamageResultPanel:OnShow()end +function DamageResultPanel:OnShow() + +end function this.isTabShow(index) if not this.battleRecord then @@ -402,7 +402,7 @@ function this.HeadAdapter(head, data) starType = 3 end SetHeroStars(this.spLoader, starRoot, star,starType) - Util.SetParticleSortLayer(starRoot,this.sortingorder + 1) + Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) -- 职业 prefess:SetActive(false) -- 属性 @@ -423,7 +423,7 @@ function this.HeadAdapter(head, data) lvText.text = roleLv -- 星级 SetHeroStars(this.spLoader, starRoot, star) - Util.SetParticleSortLayer(starRoot,this.sortingorder + 1) + Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) -- 头像 frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(SpiritAnimal[id].Quality)) icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon))