diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab index 92b939cb74..781af72447 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab @@ -33,10 +33,10 @@ RectTransform: m_Father: {fileID: 5562965766551207654} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 37.5, y: -37.5} - m_SizeDelta: {x: 75, y: 75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3273262054332790659 CanvasRenderer: @@ -691,7 +691,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.000030517578} + m_AnchoredPosition: {x: 0.000030517578, y: 0.000030517578} m_SizeDelta: {x: 0, y: 188} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3071489648356579259 @@ -1019,7 +1019,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.37497807, y: 0.5} - m_SizeDelta: {x: 75, y: 75} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5149688219218794396 MonoBehaviour: @@ -1539,7 +1539,7 @@ GameObject: - component: {fileID: 1475120091422015330} - component: {fileID: 3615097020972840977} m_Layer: 5 - m_Name: liveRoot + m_Name: root m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1555,14 +1555,15 @@ RectTransform: 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: [] + m_Children: + - {fileID: 3838225097379245401} m_Father: {fileID: 7555683376229264185} 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: -58.223} - m_SizeDelta: {x: 916, y: 1243.2} + m_AnchoredPosition: {x: 0, y: 17} + m_SizeDelta: {x: 1080.2, y: 1927} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3615097020972840977 CanvasRenderer: @@ -1725,6 +1726,50 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6328812906356547549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3838225097379245401} + - component: {fileID: 2110235193013985081} + m_Layer: 5 + m_Name: liveRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3838225097379245401 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6328812906356547549} + 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: [] + m_Father: {fileID: 1475120091422015330} + 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: -0.000091553} + m_SizeDelta: {x: 1080.2, y: 1927} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2110235193013985081 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6328812906356547549} + m_CullTransparentMesh: 0 --- !u!1 &6537675973867770291 GameObject: m_ObjectHideFlags: 0 @@ -1837,10 +1882,10 @@ RectTransform: m_Father: {fileID: 5562965766551207654} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 75, y: -37.5} - m_SizeDelta: {x: 0, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7168286033210327038 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua index aa4a9964f8..b4f8fc90e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua @@ -25,7 +25,8 @@ function XiaoYaoLuckyBossPopup:InitComponent() this.root = self.gameObject this.btnBack =Util.GetGameObject(this.root,"Panel/bg/btnBack") this.title =Util.GetGameObject(this.root,"Panel/bg/title"):GetComponent("Text") - this.e_liveRoot=Util.GetGameObject(this.root,"Panel/EnemyInfo/liveRoot") + this.liveRoot=Util.GetGameObject(this.root,"Panel/EnemyInfo/root") + this.e_liveRoot=Util.GetGameObject(this.root,"Panel/EnemyInfo/root/liveRoot") this.e_name=Util.GetGameObject(this.root,"Panel/EnemyInfo/name/text"):GetComponent("Text") this.e_level=Util.GetGameObject(this.root,"Panel/EnemyInfo/name/level/Text"):GetComponent("Text") this.hp = Util.GetGameObject(this.root,"Panel/EnemyInfo/hp/Image"):GetComponent("Image") @@ -173,7 +174,7 @@ function XiaoYaoLuckyBossPopup:SetSelectHero(monsterData) end _LiveName = ArtConfig[paintingId].Name _LiveNode = poolManager:LoadLive(_LiveName, this.e_liveRoot.transform, Vector3.one * heroConfig[monsterId].Scale*0.7, Vector3.New(pos[1], pos[2], 0)) - this.e_liveRoot.transform.localScale = Vector3.one*0.7 + this.liveRoot.transform.localScale = Vector3.one*0.7 this.e_level.text = "lv.".. _data.Level this.e_name.text = GetLanguageStrById(_data.ReadingName) this.hp.fillAmount = monsterData.monsterHp/_data.Hp