diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_lianqi.png b/Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_lianqi.png new file mode 100644 index 0000000000..54d557ab19 Binary files /dev/null and b/Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_lianqi.png differ diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_lianqi.png.meta b/Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_lianqi.png.meta new file mode 100644 index 0000000000..440b97ecab --- /dev/null +++ b/Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_lianqi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: bd51a14301a91c148ab9648f9d60e599 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7cd44f8280820b64b8edeae9313a2cd8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PracticeAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab index 0ac55e5c7d..00a13d64c6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab @@ -4089,7 +4089,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 408.45, y: 595.1} - m_SizeDelta: {x: 104.900024, y: 104.1} + m_SizeDelta: {x: 108.4, y: 104.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222151933813083262 CanvasRenderer: @@ -4569,7 +4569,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 408.45, y: 246.2} - m_SizeDelta: {x: 104.900024, y: 104.1} + m_SizeDelta: {x: 113.9, y: 118.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3267218600504713114 CanvasRenderer: @@ -11579,7 +11579,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -15.9, y: -14.545} + m_AnchoredPosition: {x: -15.900002, y: -14.544998} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} --- !u!114 &852041599239361690 @@ -12368,7 +12368,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 @@ -18158,7 +18158,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -15.9, y: -14.545} + m_AnchoredPosition: {x: -15.900002, y: -14.544998} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} --- !u!114 &4264832845071739287 @@ -18339,7 +18339,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 408.45, y: 363} - m_SizeDelta: {x: 104.900024, y: 104.1} + m_SizeDelta: {x: 109.7, y: 107.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7420883504802131627 CanvasRenderer: @@ -18858,7 +18858,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 @@ -18963,7 +18963,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -15.9, y: -14.545} + m_AnchoredPosition: {x: -15.900002, y: -14.544998} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} --- !u!114 &6461304907180084663 @@ -19724,7 +19724,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -15.9, y: -14.545} + m_AnchoredPosition: {x: -15.900002, y: -14.544998} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} --- !u!114 &26355278912618985 @@ -22205,7 +22205,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -15.9, y: -14.545} + m_AnchoredPosition: {x: -15.900002, y: -14.544998} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} --- !u!114 &2806595334037932904 @@ -22303,7 +22303,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: 346, y: -928} + m_AnchoredPosition: {x: 37, y: -865} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5160507017332407076 @@ -22336,7 +22336,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -22347,7 +22347,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4ECA\u65E5\u514D\u8D39\u6B21\u6570:" + m_Text: "\u4ECA\u65E5\u514D\u8D39\u6311\u6218\u6B21\u6570:" --- !u!1 &5160507017579478064 GameObject: m_ObjectHideFlags: 0 @@ -27809,7 +27809,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -15.9, y: -14.545} + m_AnchoredPosition: {x: -15.900002, y: -14.544998} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} --- !u!114 &3652949810854533540 @@ -33950,7 +33950,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 @@ -34977,7 +34977,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 @@ -40280,7 +40280,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -81.20001, y: 479} - m_SizeDelta: {x: 98.19, y: 98.19} + m_SizeDelta: {x: 109.4, y: 106.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1107691422901530761 CanvasRenderer: @@ -47147,7 +47147,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 404.2, y: 710} - m_SizeDelta: {x: 98.19, y: 98.19} + m_SizeDelta: {x: 111.3, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4907411027470930202 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab index 9d5eeb7bbf..3de87ac015 100644 --- a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab @@ -2727,7 +2727,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 @@ -9005,7 +9005,7 @@ ParticleSystem: --- !u!199 &7339349329135318123 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15165,7 +15165,7 @@ ParticleSystem: --- !u!199 &1083645269967354099 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16657,7 +16657,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 @@ -20284,7 +20284,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 @@ -26583,7 +26583,7 @@ ParticleSystem: --- !u!199 &8451515492985319499 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31829,7 +31829,7 @@ ParticleSystem: --- !u!199 &4601301602350369631 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36623,7 +36623,7 @@ ParticleSystem: --- !u!199 &6598447891554960103 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42589,7 +42589,7 @@ ParticleSystem: --- !u!199 &6480377966023457774 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47412,7 +47412,7 @@ ParticleSystem: --- !u!199 &8058538806607775397 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48033,7 +48033,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: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -53654,7 +53654,7 @@ ParticleSystem: --- !u!199 &1950377569286577154 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60394,7 +60394,7 @@ ParticleSystem: --- !u!199 &5882379970318000206 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -65068,7 +65068,7 @@ ParticleSystem: --- !u!199 &7674023838084424449 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72095,7 +72095,7 @@ ParticleSystem: --- !u!199 &7814950345972295480 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77458,7 +77458,7 @@ ParticleSystem: --- !u!199 &1126609627244775874 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab index f86cb37ebb..e7da9c5621 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab @@ -2882,7 +2882,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 @@ -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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -8507,7 +8507,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5255812259340674406 RectTransform: m_ObjectHideFlags: 0 @@ -10877,41 +10877,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &2809983629817972921 stripped @@ -11352,41 +11317,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &178257981875944100 stripped @@ -11517,41 +11447,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &178257981348217190 stripped @@ -11682,41 +11577,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &178257981416813641 stripped @@ -11847,41 +11707,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &178257983082476793 stripped @@ -12012,41 +11837,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &178257982649030533 stripped @@ -12177,41 +11967,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &999579402348902576 stripped @@ -12342,41 +12097,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &999579402481097727 stripped @@ -12507,41 +12227,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &999579402041866371 stripped @@ -12672,41 +12357,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &999579403689858466 stripped @@ -12837,41 +12487,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &999579403141738080 stripped @@ -13002,41 +12617,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &999579403209333583 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index 98142b2653..9f1ef2e317 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -478,7 +478,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5721786367756259710 RectTransform: m_ObjectHideFlags: 0 @@ -497,10 +497,10 @@ RectTransform: m_Father: {fileID: 1828482313430278523} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -371} - m_SizeDelta: {x: 800, y: 742} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 400, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6564633287418016112 CanvasRenderer: @@ -1024,10 +1024,10 @@ RectTransform: m_Father: {fileID: 1355861628806571315} 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: 225, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7418777062941389373 CanvasRenderer: @@ -1119,10 +1119,10 @@ RectTransform: m_Father: {fileID: 2250771599379592760} 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: 225, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8060951611899848155 CanvasRenderer: @@ -1657,7 +1657,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 @@ -1890,7 +1890,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 @@ -1993,10 +1993,10 @@ RectTransform: m_Father: {fileID: 924720670130497372} 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: 300.5, y: -25} - m_SizeDelta: {x: 201, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 300.5, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7806133268890467616 CanvasRenderer: @@ -2092,10 +2092,10 @@ RectTransform: m_Father: {fileID: 1264858252363124705} 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: 0, y: -75} - m_SizeDelta: {x: 359, y: 50} + 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, y: 0.5} --- !u!222 &7741321786643379348 CanvasRenderer: @@ -2369,8 +2369,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -107.5} - m_SizeDelta: {x: 600, y: 215} + m_AnchoredPosition: {x: 275, y: -107.5} + m_SizeDelta: {x: 550, y: 215} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3770493636493369945 CanvasRenderer: @@ -2454,10 +2454,10 @@ RectTransform: m_Father: {fileID: 1264858252363124705} 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: 0, y: -25} - m_SizeDelta: {x: 444, y: 50} + 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, y: 0.5} --- !u!222 &5395953206203207470 CanvasRenderer: @@ -2691,10 +2691,10 @@ RectTransform: m_Father: {fileID: 3174771755204953363} 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: 99.5, y: -25} - m_SizeDelta: {x: 199, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 99.5, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &945439901331378685 CanvasRenderer: @@ -3102,10 +3102,10 @@ RectTransform: m_Father: {fileID: 1355861628806571315} 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: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5805905788596669956 CanvasRenderer: @@ -3366,10 +3366,10 @@ RectTransform: m_Father: {fileID: 4712478903995929972} 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: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1416450623860271430 CanvasRenderer: @@ -3461,10 +3461,10 @@ RectTransform: m_Father: {fileID: 1355861628806571315} 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: 396.5, y: -25} - m_SizeDelta: {x: 95, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 396.5, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3938937209416967994 CanvasRenderer: @@ -3556,10 +3556,10 @@ RectTransform: m_Father: {fileID: 4712478903995929972} 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: 225, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8599583589358969000 CanvasRenderer: @@ -3656,8 +3656,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -107.5} - m_SizeDelta: {x: 600, y: 215} + m_AnchoredPosition: {x: 275, y: -107.5} + m_SizeDelta: {x: 550, y: 215} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4780749988992621811 CanvasRenderer: @@ -3831,10 +3831,10 @@ RectTransform: m_Father: {fileID: 5721786367756259710} 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: 400, y: -491} - m_SizeDelta: {x: 800, y: 2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5247720434718979946 CanvasRenderer: @@ -3910,10 +3910,10 @@ RectTransform: m_Father: {fileID: 335557586683497297} 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: 0, y: -25} - m_SizeDelta: {x: 401, y: 50} + 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, y: 0.5} --- !u!222 &2421845223579065037 CanvasRenderer: @@ -3993,10 +3993,10 @@ RectTransform: m_Father: {fileID: 924720670130497372} 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: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5998027819608919339 CanvasRenderer: @@ -4183,10 +4183,10 @@ RectTransform: m_Father: {fileID: 9045460093574333866} 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: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2958206296540576537 CanvasRenderer: @@ -4279,10 +4279,10 @@ RectTransform: m_Father: {fileID: 5721786367756259710} 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: 400, y: -80} - m_SizeDelta: {x: 800, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6933076532105948109 MonoBehaviour: @@ -4613,8 +4613,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -145} - m_SizeDelta: {x: 600, y: 290} + m_AnchoredPosition: {x: 283.3, y: -145} + m_SizeDelta: {x: 566.6, y: 290} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3052509476415502145 CanvasRenderer: @@ -4694,10 +4694,10 @@ RectTransform: m_Father: {fileID: 9045460093574333866} 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: 260, y: -25} - m_SizeDelta: {x: 120, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 260, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4947008996810090568 CanvasRenderer: @@ -4793,7 +4793,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 79} - m_SizeDelta: {x: 199, y: 50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3907014541233657107 MonoBehaviour: @@ -4868,7 +4868,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -145} + m_AnchoredPosition: {x: 275, y: -145} m_SizeDelta: {x: 550, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6585703927883856743 @@ -5290,7 +5290,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 350, y: -400.5} + m_AnchoredPosition: {x: 350, y: -399.5} m_SizeDelta: {x: 700, y: 531} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3189403236109491580 @@ -5740,7 +5740,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -145} + m_AnchoredPosition: {x: 275, y: -145} m_SizeDelta: {x: 550, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &902351682421173202 @@ -6247,10 +6247,10 @@ RectTransform: m_Father: {fileID: 335557586683497297} 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: 0, y: -75} - m_SizeDelta: {x: 389, y: 50} + 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, y: 0.5} --- !u!222 &1425900642157062012 CanvasRenderer: @@ -6484,10 +6484,10 @@ RectTransform: m_Father: {fileID: 3654047215629047484} 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: -25} - 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: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5348042731866088490 CanvasRenderer: @@ -8153,10 +8153,10 @@ RectTransform: m_Father: {fileID: 4712478903995929972} 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: 278.5, y: -25} - m_SizeDelta: {x: 57, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 278.5, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2441074346481437667 CanvasRenderer: @@ -8347,10 +8347,10 @@ RectTransform: m_Father: {fileID: 7597728541393088481} 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: 100, y: -145} - m_SizeDelta: {x: 320, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1975991492497867983 CanvasRenderer: @@ -9104,10 +9104,10 @@ RectTransform: m_Father: {fileID: 2250771599379592760} 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: 319.5, y: -25} - m_SizeDelta: {x: 139, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 319.5, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7237484067923446230 CanvasRenderer: @@ -9203,7 +9203,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 350, y: -182.5} + m_AnchoredPosition: {x: 333.3, y: -182.5} m_SizeDelta: {x: 466.6, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6149370324057953709 @@ -9836,10 +9836,10 @@ RectTransform: m_Father: {fileID: 5721786367756259710} 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: 400, y: -612} - m_SizeDelta: {x: 800, y: 200} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4898913716422827285 MonoBehaviour: @@ -10052,8 +10052,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -67.5} - m_SizeDelta: {x: 600, y: 135} + m_AnchoredPosition: {x: 17.5, y: -201.5} + m_SizeDelta: {x: 35, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4014181124040103831 CanvasRenderer: @@ -10134,10 +10134,10 @@ RectTransform: m_Father: {fileID: 7597728541393088481} 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: 300.5, y: -240} - m_SizeDelta: {x: 401, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 300.5, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4375033394773365716 MonoBehaviour: @@ -10289,10 +10289,10 @@ RectTransform: m_Father: {fileID: 3654047215629047484} 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: 91, y: -25} - m_SizeDelta: {x: 32, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 91, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5928281640393949936 CanvasRenderer: @@ -10458,10 +10458,10 @@ RectTransform: m_Father: {fileID: 1355861628806571315} 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: 299.5, y: -25} - m_SizeDelta: {x: 99, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 299.5, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3474437847163268524 CanvasRenderer: @@ -10724,10 +10724,10 @@ RectTransform: m_Father: {fileID: 7597728541393088481} 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: 322, y: -50} - m_SizeDelta: {x: 444, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 322, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6625401259515975234 MonoBehaviour: @@ -11394,10 +11394,10 @@ RectTransform: m_Father: {fileID: 2250771599379592760} 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: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7191380186268093466 CanvasRenderer: @@ -11489,10 +11489,10 @@ RectTransform: m_Father: {fileID: 4712478903995929972} 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: 333, y: -25} - m_SizeDelta: {x: 52, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 333, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4290993114741131031 CanvasRenderer: @@ -12114,7 +12114,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 79} - m_SizeDelta: {x: 107, y: 50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6918624617625577160 MonoBehaviour: @@ -12283,10 +12283,10 @@ RectTransform: m_Father: {fileID: 5721786367756259710} 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: 400, y: -310} - m_SizeDelta: {x: 800, y: 320} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 400, y: 0} + m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2023646437244318246 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab index 023f339e6c..ca2c3c338a 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab @@ -1638,9 +1638,9 @@ RectTransform: m_Father: {fileID: 1816408236878896668} 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: 104.5, y: -26.435} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4048250634787269212 @@ -4258,9 +4258,9 @@ RectTransform: m_Father: {fileID: 7644492056687066972} 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: 35, y: -35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6887090391774359567 @@ -4432,9 +4432,9 @@ RectTransform: m_Father: {fileID: 7159837365308353879} 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: 450, y: -64.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 900, y: 119.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2740151535180593362 @@ -5426,7 +5426,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 @@ -6847,10 +6847,10 @@ RectTransform: m_Father: {fileID: 7159837365308353879} 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: 450, y: -0} - m_SizeDelta: {x: 900, y: 5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 450, y: 0} + m_SizeDelta: {x: 900, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8679767192226356083 MonoBehaviour: @@ -6980,7 +6980,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7159837365308353879 RectTransform: m_ObjectHideFlags: 0 @@ -7001,10 +7001,10 @@ RectTransform: m_Father: {fileID: 5372385286984290946} 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: 450, y: -104} - m_SizeDelta: {x: 900, y: 153.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 450, y: 0} + m_SizeDelta: {x: 900, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1103144245032003519 MonoBehaviour: @@ -9833,10 +9833,10 @@ RectTransform: m_Father: {fileID: 7644492056687066972} 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: 185.56, y: -35} - m_SizeDelta: {x: 208, y: 52.87} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 52.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &45783679607002300 CanvasRenderer: @@ -11045,7 +11045,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -367.1, y: -15.905} - m_SizeDelta: {x: 289.56, y: 70} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6766546576535640258 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index b5e00b608e..660344fac6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -604,7 +604,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: 257, y: 320} + m_AnchoredPosition: {x: 264.4, y: 320.8999} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1586863083 @@ -6776,7 +6776,7 @@ ParticleSystem: --- !u!199 &3612650515471756776 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -13466,7 +13466,7 @@ ParticleSystem: --- !u!199 &2077135144819501974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -13554,7 +13554,7 @@ RectTransform: m_GameObject: {fileID: 1467236698220827544} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6140339858662291730} - {fileID: 8094237296367249862} @@ -13566,7 +13566,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: 435, y: 488} + m_AnchoredPosition: {x: 162, y: 90} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6051061268542503837 @@ -13590,7 +13590,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -19440,7 +19440,7 @@ ParticleSystem: --- !u!199 &5382233283546536858 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23567,7 +23567,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: 98, y: 133} + m_AnchoredPosition: {x: -9, y: 189} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3840882077209159326 @@ -28615,7 +28615,7 @@ ParticleSystem: --- !u!199 &4678487443364567018 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33567,7 +33567,7 @@ ParticleSystem: --- !u!199 &3301434479282110283 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39525,7 +39525,7 @@ ParticleSystem: --- !u!199 &8426323061574149814 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44517,7 +44517,7 @@ ParticleSystem: --- !u!199 &3988090302360095373 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50163,7 +50163,7 @@ ParticleSystem: --- !u!199 &5461926455895321923 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55377,7 +55377,7 @@ ParticleSystem: --- !u!199 &6960492284779320589 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61227,7 +61227,7 @@ ParticleSystem: --- !u!199 &4261467272199160834 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66438,7 +66438,7 @@ ParticleSystem: --- !u!199 &166348205603765908 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77206,7 +77206,7 @@ ParticleSystem: --- !u!199 &1706209193022837301 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85788,7 +85788,7 @@ ParticleSystem: --- !u!199 &8234207848460451360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90869,7 +90869,7 @@ ParticleSystem: --- !u!199 &3615746855071839570 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab index 7262826896..aba46bb799 100644 --- a/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab @@ -478,7 +478,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: 899d77ec337556943b30b2365195276b, 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/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 23d599ef7d..83238fb16e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -29836,10 +29836,10 @@ RectTransform: m_Father: {fileID: 1514742784526019917} 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: 94, y: -39.665} - m_SizeDelta: {x: 80, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 94, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &719194494920943748 CanvasRenderer: @@ -46034,9 +46034,9 @@ RectTransform: m_Father: {fileID: 1514742784526019917} 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: 27, y: -39.665} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6198227662777375596 @@ -50247,7 +50247,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 237.3, y: -95.34} - m_SizeDelta: {x: 134, y: 79.33} + m_SizeDelta: {x: 0, y: 79.33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8047649643578717371 CanvasRenderer: @@ -55020,9 +55020,9 @@ RectTransform: m_Father: {fileID: 7843831536758449798} 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: 706.275, y: -37} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7841663904524152744 @@ -55053,7 +55053,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: 899d77ec337556943b30b2365195276b, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55159,9 +55159,9 @@ RectTransform: m_Father: {fileID: 7843831536758449798} 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: 235.425, y: -37} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7841404854095346338 @@ -55465,7 +55465,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7843436345893266768 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index 919e9739c1..a4e2291bc5 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -4689,7 +4689,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/RoleInfo/RoleUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab index c69723ff8b..0ace12ceb5 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab @@ -1693,7 +1693,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 @@ -3073,7 +3073,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 @@ -3317,7 +3317,7 @@ RectTransform: 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: 0, y: -21.48} + m_AnchoredPosition: {x: 0, y: -21.479996} m_SizeDelta: {x: 150, y: 42.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5103503315900522486 diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab index 17956975c3..5220d7422a 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab @@ -518,7 +518,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 @@ -3510,7 +3510,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -170.30005, y: 52} + m_AnchoredPosition: {x: -473.4, y: 134.1} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3749885727694296359 @@ -3543,7 +3543,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -3554,7 +3554,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4ECA\u65E5\u514D\u8D39\u6B21\u6570:" + m_Text: "\u4ECA\u65E5\u514D\u8D39\u6311\u6218\u6B21\u6570:" --- !u!1 &2749129484027848889 GameObject: m_ObjectHideFlags: 0 @@ -3935,7 +3935,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -5735,7 +5735,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 @@ -6797,7 +6797,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: 02c65ae47d2194346a31595fe141bf79, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f54a6724a14e294584ef8a1af1ea60d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7133,7 +7133,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 @@ -9493,7 +9493,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 @@ -9819,7 +9819,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/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 49846cf6e2..34c4ccd00b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -778,16 +778,16 @@ RedPointType = { --- 主界面商店大页签红点 Shop_Page_Recharge = 2530, Shop_Page_General = 2531, - Shop_Page_Coin = 2532, - Shop_Page_Play = 2533, + Shop_Page_Coin = 2532,--代币大页签 + Shop_Page_Play = 2533,--玩法大页签 --Shop_Page_Exchange = 2534, Shop_Page_Roam = 2535, ---=== 商店小页签 --Shop_Tab_Recharge = 25300, Shop_Tab_General = 25310, - Shop_Tab_Soul = 25320, + Shop_Tab_Soul = 25320,--魂印小页签 Shop_Tab_Secret = 25321, - Shop_Tab_God = 25322,--神印页签 + Shop_Tab_God = 25322,--神印小页签 Shop_Tab_Arena = 25330, Shop_Tab_Guild = 25331, Shop_Tab_Roam = 25350, diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 4d78c32009..ee84fd4116 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -984,6 +984,7 @@ local OpenSeverWelfareRewardShow = { [19] = {image1 = "r_guanka_guankajianglishenfu",image2 = "r_guanka_guankajiangli02_zh"}, [81128] = {image1 = "r_guanka_guankajianglibaoxiang",image2 = "r_guanka_guankajiangli03_zh"}, [11023] = {image1 = "r_guanka_guankajianglishunwukong",image2 = "r_guanka_guankajiangli04_zh"}, + [11014] = {image1 = "c_nz_00029_t1",image2 = "r_guanka_guankajiangli03_zh"}, [87] = {image1 = "r_Material_Mineral_0003",image2 = ""}, } function this.UpdateOpenSeverWelfare() diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua index 40b32b5d1c..e3c2ecb515 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua @@ -1,6 +1,6 @@ ----- 关卡 ----- -local CarbonFormation = {} -local this = CarbonFormation +local ExploreFormation = {} +local this = ExploreFormation local mainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) local SpecialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,141) --- 是否需要切换编队的功能 @@ -64,18 +64,15 @@ function this.GetOneKeyUpHeroList() end --- btn1点击回调事件 -function this.On_Btn2_Click() +function this.On_Btn2_Click(formationId) if not hadClick then hadClick = true - for k,v in pairs(this.FormationData) do - if k == this.GetFormationIndex() then - FormationManager.SaveFormation(k, this.root.choosedList, - FormationManager.formationList[k].teamPokemonInfos) - else - FormationManager.SaveFormation(k, v.formationinfo, - FormationManager.formationList[k].teamPokemonInfos) - end + if this.FormationData[formationId] then + local formationinfo=this.FormationData[formationId].formationinfo + local teamPokemonInfos=FormationManager.formationList[formationId].teamPokemonInfos + FormationManager.SaveFormation(formationId,formationinfo,teamPokemonInfos) end + end this.root:ClosePanel() end diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index f597ca4fdb..87b79cec62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -46,14 +46,14 @@ function this.HongMengGuideFun(OnOff) this.IsFirstOpenHarmonyBei = true end end - +--修行引导 function this.PracticeGuideFun() - if not AppConst.isGuide then - LogGreen("不在引导内,不引导神印") - return - end - table.insert(_FuncGuideList, 102500) - this.CheckFuncGuide() + -- if not AppConst.isGuide then + -- LogGreen("不在引导内,不引导神印") + -- return + -- end + -- table.insert(_FuncGuideList, 102500) + -- this.CheckFuncGuide() end function this.OnLevelChange() diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua index 1a6abc6bec..e011ffc041 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -266,6 +266,12 @@ function this.ShowSingleData(go,data,i) Util.GetGameObject(go, "sdBtn/Text"):SetActive(not data.hadProud) Util.GetGameObject(go, "sdBtn/dianzanImage/Text"):GetComponent("Text").text = data.worshipTime dianzanImage:SetActive(data.hadProud) + if data.hadProud then + sdBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_button_001") + else + sdBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("f_feishengshi_huanganniu") + end + Util.AddOnceClick(sdBtn,function() if not data.hadProud then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index ee4b9106f9..3cacef27f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -132,12 +132,12 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Shop_Page_Roam, RedPointType.Shop) -- === 商店小页签 RPData:SetParent(RedPointType.Shop_Tab_General, RedPointType.Shop_Page_General) - RPData:SetParent(RedPointType.Shop_Tab_Soul, RedPointType.Shop_Page_General) + RPData:SetParent(RedPointType.Shop_Tab_Soul, RedPointType.Shop_Page_Coin) RPData:SetParent(RedPointType.Shop_Tab_Secret, RedPointType.Shop_Page_Coin) RPData:SetParent(RedPointType.Shop_Tab_Arena, RedPointType.Shop_Page_Play) RPData:SetParent(RedPointType.Shop_Tab_Guild, RedPointType.Shop_Page_Play) RPData:SetParent(RedPointType.Shop_Tab_Roam, RedPointType.Shop_Page_Roam) - RPData:SetParent(RedPointType.Shop_Tab_God, RedPointType.Shop_Page_Play) + RPData:SetParent(RedPointType.Shop_Tab_God, RedPointType.Shop_Page_Coin) RPData:SetParent(RedPointType.Shop_God_Refresh, RedPointType.Shop_Tab_God) -- ====== 商店功能 RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General)