From 52d19fbdc56aa22026732285547c0058cf860c4c Mon Sep 17 00:00:00 2001 From: dengdan Date: Wed, 30 Nov 2022 19:12:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FightLevelSingleLevelInfoPopup.prefab | 2 +- .../UI/Formation/FormationPanelV2.prefab | 14 ++--- .../Prefabs/UI/Mail/MailMainPanel.prefab | 4 +- .../UI/Popup/RewardItemSingleShowPopup.prefab | 58 +++++++++---------- .../QuickPurchase/QuickPurchasePanel.prefab | 6 +- .../UI/RewardBox/RewardBoxPanel.prefab | 4 +- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab index e7da9c5621..58f4bd526b 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab @@ -5422,7 +5422,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: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 65d5d3ff57..40b08c2c7a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -42217,7 +42217,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: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -63640,7 +63640,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: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -69320,11 +69320,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_LocalPosition.y - value: 43 - objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -69335,6 +69330,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_LocalPosition.y + value: 43 + objectReference: {fileID: 0} - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab index f5cebaacdd..d07217cda9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab @@ -771,7 +771,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2352,7 +2352,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index 2b4a7a63da..b36efbe103 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -690,9 +690,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -111.00625} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &900680271470056465 @@ -1055,7 +1055,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1158,9 +1158,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -191.58127} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1793275980231118631 @@ -1445,7 +1445,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1547,9 +1547,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} 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: 80, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4176913724073967866 @@ -1878,9 +1878,9 @@ RectTransform: m_Father: {fileID: 9015164529682029271} 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: 50.200012, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 52.4, y: 218.1} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5765816421488786280 @@ -2003,9 +2003,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -231.86877} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &59271303520494573 @@ -2627,9 +2627,9 @@ RectTransform: m_Father: {fileID: 9015164529682029271} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 511.835, y: -109.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 489.31, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5008996957804351971 @@ -3145,9 +3145,9 @@ RectTransform: m_Father: {fileID: 9015164529682029271} 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: 171.79001, y: -109.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &862557542865219844 @@ -3190,9 +3190,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -151.29376} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4555694585401691132 @@ -3445,9 +3445,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} 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: 80, y: -70.71875} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6093494655719889455 diff --git a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab index a765723b1e..1aae2420fd 100644 --- a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab @@ -6594,7 +6594,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7128,7 +7128,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8174,7 +8174,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab index 8172e8d683..8a75995624 100644 --- a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab @@ -1122,7 +1122,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1767,7 +1767,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1