diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab index 33ea133a39..9d4472e1e1 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab @@ -43727,7 +43727,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &204864919719780093 RectTransform: m_ObjectHideFlags: 0 @@ -43737,15 +43737,15 @@ RectTransform: m_GameObject: {fileID: 204864919719780092} 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_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: [] m_Father: {fileID: 5508372000447838862} - m_RootOrder: 0 + m_RootOrder: 1 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: -67.3} - m_SizeDelta: {x: 624, y: 624} + m_AnchoredPosition: {x: 0.11, y: 0} + m_SizeDelta: {x: 1017.63, y: 565.22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &204864919719780095 CanvasRenderer: @@ -43769,14 +43769,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: e0912e6e3470d9e4fb6a958f6ebe3a85, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 31ed2bb0f9c6fa6438eb09d7ffbe95f0, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -44931,8 +44931,8 @@ RectTransform: 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: 16, y: -292} - m_SizeDelta: {x: 513.9, y: 108.9} + m_AnchoredPosition: {x: 16, y: -207} + m_SizeDelta: {x: 513.9, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5508371999065688679 CanvasRenderer: @@ -44955,15 +44955,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5254902} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 977a6d78e9a6d96478677ddaf76db101, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1886b8d23b34256438575467b4537802, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -45568,7 +45568,7 @@ RectTransform: 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: 195.1, y: -373} + m_AnchoredPosition: {x: 195.1, y: -289.6} m_SizeDelta: {x: 240, y: 92.22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5508372000111432841 @@ -45821,8 +45821,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 204864919719780093} - {fileID: 5508372000555612672} + - {fileID: 204864919719780093} - {fileID: 5508371999065688677} - {fileID: 5508371999245423291} - {fileID: 1115086626408175050} @@ -45832,7 +45832,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -880.69995, y: -1104.5} - m_SizeDelta: {x: 900, y: 700} + m_SizeDelta: {x: 900, y: 547} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7353564847290895015 CanvasRenderer: @@ -45934,12 +45934,12 @@ RectTransform: m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: [] m_Father: {fileID: 5508372000447838862} - m_RootOrder: 1 + 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: 4} - m_SizeDelta: {x: 850, y: 710} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1000, y: 547} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5508372000555612674 CanvasRenderer: @@ -45969,7 +45969,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: e6d5b8f086da0a44aac7d8d693a4f709, type: 3} + m_Sprite: {fileID: 21300000, guid: a340c6344b566774f9ed3a86cee4c631, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -46014,7 +46014,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -109.1, y: -56.3} + m_AnchoredPosition: {x: -109.100006, y: -56.30005} m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5508372000661152925 diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab index 394d6993fb..ad43596cd1 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab @@ -707,7 +707,7 @@ RectTransform: - {fileID: 3396381842035203533} - {fileID: 7253453419622975928} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3378,6 +3378,7 @@ RectTransform: - {fileID: 1939026368545009628} - {fileID: 8757331921433522578} - {fileID: 1939147951741209212} + - {fileID: 1939440021009367508} m_Father: {fileID: 1939780147945024782} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3455,7 +3456,7 @@ RectTransform: m_Children: - {fileID: 1939693728362238380} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3665,7 +3666,7 @@ RectTransform: - {fileID: 1939557741708470500} - {fileID: 6489019642982219627} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3786,7 +3787,6 @@ RectTransform: m_Children: - {fileID: 1939276525427312726} - {fileID: 1939295665501905992} - - {fileID: 1939440021009367508} - {fileID: 1939151130265643462} - {fileID: 1939177026611606392} - {fileID: 1939358997532767874} @@ -3956,12 +3956,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1939780147945024782} - m_RootOrder: 2 + m_Father: {fileID: 1939295665501905992} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -170.5, y: -339} + m_AnchoredPosition: {x: -86.2, y: -79.1} m_SizeDelta: {x: 74, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1936898050369953810 @@ -4319,11 +4319,11 @@ RectTransform: m_Children: - {fileID: 1367259152144817332} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 200, y: 372} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 200, y: -588} m_SizeDelta: {x: 250, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1937221655816918808 @@ -4455,7 +4455,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1939780147945024782} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7108,7 +7108,7 @@ RectTransform: - {fileID: 7653233907961251209} - {fileID: 7685895046604953429} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8642,7 +8642,7 @@ RectTransform: - {fileID: 5590974794200009685} - {fileID: 1031201325139666020} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8677,7 +8677,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6253e3364aa642840b7b6ca6ac30239b, type: 3} + m_Sprite: {fileID: 21300000, guid: 35aa35d9b8cfaf545ac835f7f36fb5b7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11006,7 +11006,7 @@ RectTransform: - {fileID: 3205400121457997369} - {fileID: 6944083300252590346} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11459,11 +11459,11 @@ RectTransform: m_Children: - {fileID: 3845921846944542029} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -200, y: 372} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -200, y: -588} m_SizeDelta: {x: 250, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7253453419435099524 @@ -14035,7 +14035,7 @@ RectTransform: - {fileID: 1329387434491404493} - {fileID: 3459241450312293151} m_Father: {fileID: 1939780147945024782} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index c5778c6bd2..c78087c04b 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -36,8 +36,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 85.2, y: 98} - m_SizeDelta: {x: 107, y: 107} + m_AnchoredPosition: {x: 49.2, y: 128.9} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7309446567827614688 CanvasRenderer: @@ -128,7 +128,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 61517d696d8d2294b883374e3effc9a5, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 9036dc0a0d..963b2da1de 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -88001,7 +88001,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u795E\u5668" + m_Text: "\u8D85\u7EA7\u6B66\u5668" --- !u!114 &2269109616073674670 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/EquipSellSelectPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/EquipSellSelectPopup.prefab index 97755195b7..3127eba28b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/EquipSellSelectPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/EquipSellSelectPopup.prefab @@ -3215,9 +3215,9 @@ RectTransform: m_Father: {fileID: 969168368802323383} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -141.3, y: -448.3} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 398.7, y: 511.7} m_SizeDelta: {x: 74, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2949068843894979054 diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index d537c97b3e..a4501e7266 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -28,7 +28,7 @@ local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_ function FindTreasureDispatchPanel:InitComponent() self.spLoader = SpriteLoader.New() - self.BtnBack = Util.GetGameObject(self.transform, "btnBack") + self.BtnBack = Util.GetGameObject(self.transform, "bg/btnBack") self.btnSure = Util.GetGameObject(self.transform, "btnSure") self.btnAutoSure = Util.GetGameObject(self.transform, "btnAutoSure") self.btnAutoSureText = Util.GetGameObject(self.transform, "btnAutoSure/Text"):GetComponent("Text")