diff --git a/Assets/ManagedResources/BG/UI/6all1/ui_19.png b/Assets/ManagedResources/BG/UI/6all1/ui_19.png new file mode 100644 index 0000000000..0054c5990f Binary files /dev/null and b/Assets/ManagedResources/BG/UI/6all1/ui_19.png differ diff --git a/Assets/ManagedResources/BG/UI/6all1/ui_19.png.meta b/Assets/ManagedResources/BG/UI/6all1/ui_19.png.meta new file mode 100644 index 0000000000..141a518ac4 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/6all1/ui_19.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a2fc1920b08c4cb45beb4c00ffc7ff10 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a495a00037b220c45a9adf627c15f911 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png b/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png index 67d1465b09..c1f93579cf 100644 Binary files a/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png and b/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png differ diff --git a/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png.meta b/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png.meta index 9ddf3fdb74..3b1ebe14fb 100644 --- a/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png.meta +++ b/Assets/ManagedResources/BG/UI/Pocket/UI_hz_beibao_02.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 53, y: 0, z: 116, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab index 8d0b745eed..a4f3fff8a5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab @@ -5739,8 +5739,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: -73.8, y: 533.7} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -83.33, y: 540.7} + m_SizeDelta: {x: 769.06, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6873535036526766864 CanvasRenderer: @@ -5770,8 +5770,8 @@ 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: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c39d460845b8bfb4aab7d859cd894c2f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab index 65a1110026..ad73a99397 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab @@ -755,7 +755,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: -47.100006, y: -46.5} + m_AnchoredPosition: {x: -55, y: -46.5} m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1791499386 @@ -902,8 +902,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: 0, y: -81} - m_SizeDelta: {x: 889.5, y: 1430} + m_AnchoredPosition: {x: 5.1, y: -87.4} + m_SizeDelta: {x: 912.2, y: 1442.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2083260476 CanvasRenderer: @@ -933,8 +933,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1782,7 +1782,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: -0.6, y: -2.2} + m_AnchoredPosition: {x: -0.6, y: 1.5} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1247983472323868181 @@ -2323,8 +2323,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: 0, y: -599} - m_SizeDelta: {x: 219.69, y: 74.11} + m_AnchoredPosition: {x: 0, y: -604.6} + m_SizeDelta: {x: 230.55, y: 85.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8971902199038096363 CanvasRenderer: @@ -2354,7 +2354,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: 0dc0640ffa275b742a82550b589865b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 76c7d4d91fc30cb468752f748318acbe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2514,8 +2514,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: -89, y: 672} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -67.770004, y: 675.75} + m_SizeDelta: {x: 818.54, y: 78.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2179404046346611410 CanvasRenderer: @@ -2546,7 +2546,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2701,7 +2701,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 48 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab index 085fbe50a6..9c72869eaa 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab @@ -697,7 +697,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: -217, y: 106} + m_AnchoredPosition: {x: -234, y: 106} m_SizeDelta: {x: 272.52002, y: 83.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8305654950852658372 @@ -728,7 +728,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: b1134bbf289f6804196269f211ceb031, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1091,8 +1091,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: -83.4, y: 588.5} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -71.2, y: 594.58} + m_SizeDelta: {x: 807, y: 83.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1257863281022048807 CanvasRenderer: @@ -1122,8 +1122,8 @@ 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: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c39d460845b8bfb4aab7d859cd894c2f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1189,7 +1189,7 @@ 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.5803922} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1241,7 +1241,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: -47.399994, y: -54.400024} + m_AnchoredPosition: {x: -55.3, y: -48.1} m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6537312319211603132 @@ -1924,7 +1924,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: -4.9, y: 595.6} + m_AnchoredPosition: {x: -4.9, y: 594.4} m_SizeDelta: {x: 196.3, y: 44.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5624973379128161263 @@ -2205,8 +2205,8 @@ 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: d93ad50a8a319c44c887d7e7743089a7, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2926,7 +2926,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: fa9b45624eb407043825833322436cd3, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3044,7 +3044,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: -5, y: 2.4} + m_AnchoredPosition: {x: 1, y: 2.4} m_SizeDelta: {x: 207.7, y: 66.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5920914393586057873 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 78d8db9460..b397ebe5e1 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -170,9 +170,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 165020988231383607} - - {fileID: 4886913768728016021} - - {fileID: 6917359110685646803} - {fileID: 2292758508042817037} + - {fileID: 6917359110685646803} + - {fileID: 4886913768728016021} - {fileID: 317543164816639867} - {fileID: 8022296635371832952} - {fileID: 4287217151237250124} @@ -521,7 +521,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: 172.1145, y: 0} + m_AnchoredPosition: {x: 173.07, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &178581007159197874 @@ -1005,7 +1005,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.00012207031, y: 0} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8613212963809518708 @@ -2471,11 +2471,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 164915241442772717} - m_RootOrder: 3 + m_RootOrder: 1 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.019012451, y: 1341} + m_AnchoredPosition: {x: -0.019012451, y: 957} m_SizeDelta: {x: 1082, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7389704353232830436 @@ -2506,7 +2506,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: 4da69516eac06094f8ef56da4a6d3de5, type: 3} + m_Sprite: {fileID: 21300000, guid: a2fc1920b08c4cb45beb4c00ffc7ff10, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4923,7 +4923,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 0.00375} m_Children: [] m_Father: {fileID: 164915241442772717} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4984,7 +4984,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6917359110685646803 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab index c28eda89b5..cc8f29d439 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab @@ -782,8 +782,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -85, y: 14} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -74.98, y: 23.190002} + m_SizeDelta: {x: 792.61, y: 89.38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1283532474458593309 CanvasRenderer: @@ -814,7 +814,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -858,7 +858,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: -74, y: 10} + m_AnchoredPosition: {x: -74, y: 21} m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1287097097289589055 diff --git a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab index 4c74cb92f9..b3547792bc 100644 --- a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab @@ -3775,8 +3775,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: 449.88, y: 380.8} - m_SizeDelta: {x: 117.83, y: 119.75} + m_AnchoredPosition: {x: 461.5, y: 396} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222980504537941378 CanvasRenderer: @@ -6339,7 +6339,7 @@ RectTransform: m_GameObject: {fileID: 314779471536052470} 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.8, y: 0.8, z: 1} m_Children: [] m_Father: {fileID: 569046450228175141} m_RootOrder: 0 @@ -6347,7 +6347,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1642692725313618963 CanvasRenderer: @@ -6377,7 +6377,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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6973,7 +6973,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.46, y: -167.72} - m_SizeDelta: {x: 233.87, y: 75.43} + m_SizeDelta: {x: 240, y: 75.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7905642217083021917 CanvasRenderer: @@ -7003,7 +7003,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8404,7 +8404,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: -191, y: 48.899994} + m_AnchoredPosition: {x: -183, y: 55.3} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2464455673645070915 @@ -9012,8 +9012,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: -151, y: 396} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -80.3, y: 401.97} + m_SizeDelta: {x: 927.1, y: 82.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2442406966528098836 CanvasRenderer: @@ -9043,8 +9043,8 @@ 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: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c39d460845b8bfb4aab7d859cd894c2f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9248,7 +9248,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.46, y: -167.72} - m_SizeDelta: {x: 233.87, y: 75.43} + m_SizeDelta: {x: 240, y: 75.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4072768111429968547 CanvasRenderer: @@ -9278,7 +9278,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9411,7 +9411,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.46, y: -167.72} - m_SizeDelta: {x: 233.87, y: 75.43} + m_SizeDelta: {x: 240, y: 75.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8984197148464189716 CanvasRenderer: @@ -9441,7 +9441,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index b22e52675e..509db0cb49 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -31226,7 +31226,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: 173.07, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222314792653266900 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab index 23bdc728cb..cfeedf8f6b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalentPopup.prefab @@ -1229,8 +1229,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: -83, y: -4.4} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -91.11, y: 0.24} + m_SizeDelta: {x: 766.22, y: 80.27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7886248892951742406 CanvasRenderer: @@ -1260,8 +1260,8 @@ 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: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c39d460845b8bfb4aab7d859cd894c2f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1385,7 +1385,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: 84, y: 8} + m_AnchoredPosition: {x: 84, y: -0.3} m_SizeDelta: {x: 197.07, y: 47.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5614760479803157645 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab index 4f61b91ef8..bbc4565d11 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.49019608, g: 0.48235294, b: 0.48235294, a: 1} + m_Color: {r: 0.95294124, g: 0.6862745, b: 0.058823533, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -134,7 +134,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4901961, g: 0.48235297, b: 0.48235297, a: 1} + m_Color: {r: 0.95294124, g: 0.6862745, b: 0.058823533, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -209,7 +209,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4901961, g: 0.48235297, b: 0.48235297, a: 1} + m_Color: {r: 0.95294124, g: 0.6862745, b: 0.058823533, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -917,10 +917,10 @@ RectTransform: m_Father: {fileID: 7370784809913978216} 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} - m_AnchoredPosition: {x: 0.0015144, y: -711.7} - m_SizeDelta: {x: 1020.5, y: 176} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0.0015258789, y: 95.099976} + m_SizeDelta: {x: -15.5, y: 162.40002} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1772369132417019297 CanvasRenderer: @@ -943,7 +943,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7843138, g: 0.7843138, b: 0.7843138, a: 1} + m_Color: {r: 0.7843138, g: 0.7843138, b: 0.7843138, a: 0.28627452} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1451,7 +1451,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.69803923, g: 0.69411767, b: 0.69411767, a: 1} + m_Color: {r: 0.69803923, g: 0.69411767, b: 0.69411767, a: 0.24313726} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2042,6 +2042,7 @@ GameObject: - component: {fileID: 8785790970003162804} - component: {fileID: 7268653739808899095} - component: {fileID: 3374003181213783884} + - component: {fileID: 5057797991045919724} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2110,6 +2111,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u661F\u7EA7\u63D0\u5347" +--- !u!114 &5057797991045919724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2686841465101743802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2896143749285433997 GameObject: m_ObjectHideFlags: 0 @@ -2308,10 +2324,10 @@ RectTransform: m_Father: {fileID: 1599235319721044276} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 590, y: -51.65} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2649783881678316887 CanvasRenderer: @@ -2705,8 +2721,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: 450.25, y: 739.63} - m_SizeDelta: {x: 120, y: 120} + m_AnchoredPosition: {x: 463, y: 752.2} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2870669693644151399 CanvasRenderer: @@ -3268,10 +3284,10 @@ RectTransform: m_Father: {fileID: 1599235319721044276} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210, y: -51.65} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4602249034998197443 CanvasRenderer: @@ -3634,6 +3650,7 @@ GameObject: - component: {fileID: 4241989016896541161} - component: {fileID: 2352038511377459513} - component: {fileID: 5635596861776415754} + - component: {fileID: 6455645331091531575} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3702,6 +3719,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5168\u4F53\u5C5E\u6027\u63D0\u5347" +--- !u!114 &6455645331091531575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4654929018364386875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &4727334835831721925 GameObject: m_ObjectHideFlags: 0 @@ -3919,9 +3951,9 @@ RectTransform: m_Father: {fileID: 7370784809913978216} 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: 508.54498, y: -1517} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 82} m_SizeDelta: {x: 260, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8249586693005641494 @@ -3952,7 +3984,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4661,6 +4693,7 @@ GameObject: - component: {fileID: 58843376725224928} - component: {fileID: 1420187768674036769} - component: {fileID: 4800833065617973730} + - component: {fileID: 7074275530190362919} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -4729,6 +4762,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6280\u80FD\u63D0\u5347" +--- !u!114 &7074275530190362919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178998977080599659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6240756178860082561 GameObject: m_ObjectHideFlags: 0 @@ -5263,8 +5311,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: 5.69, y: 22.12} - m_SizeDelta: {x: 1020.47, y: 1599.26} + m_AnchoredPosition: {x: 3.7, y: 22.12} + m_SizeDelta: {x: 1036.9, y: 1599.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7368232595790026856 CanvasRenderer: @@ -5294,7 +5342,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5422,9 +5470,9 @@ RectTransform: m_Father: {fileID: 3747604606915676520} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 463.5, y: -789.6401} m_SizeDelta: {x: 927, y: 179.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6884981510677940618 @@ -5909,10 +5957,10 @@ RectTransform: m_Father: {fileID: 7370784809913978216} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 508.54498, y: -1516} - m_SizeDelta: {x: 260, y: 88} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 83} + m_SizeDelta: {x: 259, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &393867596834846613 CanvasRenderer: @@ -5942,7 +5990,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6027,8 +6075,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: -153, y: 751} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -79.23, y: 757.56} + m_SizeDelta: {x: 931.93, y: 84.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4962862647560687252 CanvasRenderer: @@ -6059,7 +6107,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4