diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab index 252b7f8425..14ec239ba3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab @@ -96,6 +96,42 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &291778953631168796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8362862673212308892} + m_Layer: 0 + m_Name: bossRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8362862673212308892 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 291778953631168796} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6991068049936083355} + m_Father: {fileID: 5889647029951348624} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 7} + m_SizeDelta: {x: 1080, y: 1251.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &649293686949060231 GameObject: m_ObjectHideFlags: 0 @@ -5952,13 +5988,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5889647029951348624} + m_Father: {fileID: 8362862673212308892} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -100} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5528235509091943958 GameObject: @@ -10948,7 +10984,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6991068049936083355} + - {fileID: 8362862673212308892} m_Father: {fileID: 1296008646247205113} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua index c8eaf8d125..17afc29dee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua @@ -12,7 +12,8 @@ local orginLayer = 0 function BattleBossInfoPanel:InitComponent() self.btnBack = Util.GetGameObject(self.gameObject,"mask") self.mask2 = Util.GetGameObject(self.gameObject,"mask2") - self.root = Util.GetGameObject(self.gameObject,"animation/root") + self.root = Util.GetGameObject(self.gameObject,"animation/bossRoot") + self.liveroot = Util.GetGameObject(self.gameObject,"animation/bossRoot/root") self.nameImg = Util.GetGameObject(self.gameObject,"bg2/content/Pos/NameImg"):GetComponent("Image") self.nameZh = Util.GetGameObject(self.gameObject,"bg2/content/Pos/NameZh"):GetComponent("Text") self.nameOther = Util.GetGameObject(self.gameObject,"bg2/content/Pos/NameOther"):GetComponent("Text") @@ -87,20 +88,20 @@ function BattleBossInfoPanel:OnShow() Timer.New(function () self.mask2:SetActive(false) end,1):Start() - self.timer1 = Timer.New(function () - PlayUIAnim(self.ani1) - PlayUIAnim(self.ani2) - self.effect:SetActive(false) - if self.timer2 then - self.timer2:Stop() - self.timer2 = nil - end - self.Img1:DOFade(0,0.7) - Timer.New(function () - self:ClosePanel() - end,0.7):Start() - end,time) - self.timer1:Start() + -- self.timer1 = Timer.New(function () + -- PlayUIAnim(self.ani1) + -- PlayUIAnim(self.ani2) + -- self.effect:SetActive(false) + -- if self.timer2 then + -- self.timer2:Stop() + -- self.timer2 = nil + -- end + -- self.Img1:DOFade(0,0.7) + -- Timer.New(function () + -- self:ClosePanel() + -- end,0.7):Start() + -- end,time) + -- self.timer1:Start() local thread2=coroutine.start(function() coroutine.wait(0.5) @@ -142,7 +143,7 @@ function BattleBossInfoPanel:OnShow() poolManager:UnLoadLive(bgName, Live) Live = nil end - Live = poolManager:LoadLive(bgName, self.root.transform, Vector3.one, Vector2.New(pos[1],pos[2])) + Live = poolManager:LoadLive(bgName, self.liveroot.transform, Vector3.one, Vector2.New(pos[1],pos[2])) self.root.transform.localScale = Vector3.one*scale --Bottom