diff --git a/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab index 2076b46456..4f55e94e51 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab @@ -217,7 +217,7 @@ RectTransform: - {fileID: 3635456858319298487} - {fileID: 1325025083111620447} - {fileID: 4276829474227143814} - - {fileID: 1475120091422015330} + - {fileID: 9012805244000243689} - {fileID: 130060101533686417} - {fileID: 1336373663856583455} - {fileID: 2140757090972229825} @@ -1473,13 +1473,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7920936004859207622} - m_RootOrder: 3 + m_Father: {fileID: 9012805244000243689} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -100} - m_SizeDelta: {x: 0, y: -200} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3615097020972840977 CanvasRenderer: @@ -1849,6 +1849,51 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 999 +--- !u!1 &5882628314230884587 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9012805244000243689} + - component: {fileID: 6763139347968426087} + m_Layer: 5 + m_Name: root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9012805244000243689 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5882628314230884587} + 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: 1475120091422015330} + m_Father: {fileID: 7920936004859207622} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 0, y: -200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6763139347968426087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5882628314230884587} + m_CullTransparentMesh: 0 --- !u!1 &5920251869144039016 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index b086c6b85c..518435b408 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -19,7 +19,8 @@ local herosList={} function this:InitComponent() this.root = self.gameObject this.btnBack =Util.GetGameObject(this.root,"EnemyInfo/btnBack") - this.e_liveRoot=Util.GetGameObject(this.root,"EnemyInfo/liveRoot") + this.rootLive=Util.GetGameObject(this.root,"EnemyInfo/root") + this.e_liveRoot=Util.GetGameObject(this.root,"EnemyInfo/root/liveRoot") this.e_name=Util.GetGameObject(this.root,"EnemyInfo/name/text"):GetComponent("Text") this.e_level=Util.GetGameObject(this.root,"EnemyInfo/name/level/Text"):GetComponent("Text") this.e_cancelBtn=Util.GetGameObject(this.root,"EnemyInfo/cancelBtn") @@ -142,7 +143,8 @@ function this.SetSelectHero() local pos = heroConfig[monsterId].Position _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)) + _LiveNode = poolManager:LoadLive(_LiveName, this.e_liveRoot.transform, Vector3.one * heroConfig[monsterId].Scale, Vector3.New(pos[1], pos[2], 0)) + this.rootLive.transform.localScale = Vector3.one*0.7 this.e_level.text = "lv."..MonsterConfig[t].Level this.e_name.text = MonsterConfig[t].ReadingName