diff --git a/Assets/ManagedResources/BG/UI/1shaonv/bg_main_Helloween.png b/Assets/ManagedResources/BG/UI/1shaonv/bg_main_Helloween.png new file mode 100644 index 0000000000..034ae31500 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1shaonv/bg_main_Helloween.png differ diff --git a/Assets/ManagedResources/BG/UI/1shaonv/bg_main_Helloween.png.meta b/Assets/ManagedResources/BG/UI/1shaonv/bg_main_Helloween.png.meta new file mode 100644 index 0000000000..afa80cfc4e --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1shaonv/bg_main_Helloween.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 0cdab367ea790f94d81328f1855b1c60 +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: 6199950f5045a29449152bdd4240146b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index 2f090ce695..ff38493210 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -5189,7 +5189,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, y: -240} + m_AnchoredPosition: {x: -11, y: -225} m_SizeDelta: {x: 258, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6570150490061543940 @@ -5220,7 +5220,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: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} + m_Sprite: {fileID: 21300000, guid: f494cbf65575d6847bf980da78f83bbd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5606,14 +5606,14 @@ RectTransform: m_GameObject: {fileID: 677501226339939740} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} m_Children: [] m_Father: {fileID: 7649862179335180522} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -5, y: -55} + m_AnchoredPosition: {x: -3.3, y: -53} m_SizeDelta: {x: 38, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1650168728155003426 @@ -6134,7 +6134,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: 32a5f3cb99561fc42a9972ec2366d8dd, type: 3} + m_Sprite: {fileID: 21300000, guid: 16d2ad74af58bad46b87350b2f292673, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6168,13 +6168,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1053828115552263179} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4419380114545422260} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -5.199997, y: 1.2000008} @@ -6201,7 +6201,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6774,13 +6774,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1627211569070059466} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4766056588486434766} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -5.199997, y: 1.2000008} @@ -6807,7 +6807,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6944,7 +6944,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, y: -240} + m_AnchoredPosition: {x: 7, y: -225} m_SizeDelta: {x: 258, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2051331057137863113 @@ -6975,7 +6975,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: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} + m_Sprite: {fileID: 21300000, guid: 60543ff590fbc834aaf7693a3a83ab9e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11842,7 +11842,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: 32a5f3cb99561fc42a9972ec2366d8dd, type: 3} + m_Sprite: {fileID: 21300000, guid: 16d2ad74af58bad46b87350b2f292673, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -34394,7 +34394,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 600 + m_Text: 6000 --- !u!1 &4960087723020967919 GameObject: m_ObjectHideFlags: 0 @@ -34496,14 +34496,14 @@ RectTransform: m_GameObject: {fileID: 4986582075745720307} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} m_Children: [] m_Father: {fileID: 6863123208851967492} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -5, y: -68.9} + m_AnchoredPosition: {x: 2.6, y: -66.2} m_SizeDelta: {x: 38, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2870685493956242169 @@ -34570,15 +34570,15 @@ RectTransform: m_GameObject: {fileID: 5119841417447577915} 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.48, y: 0.45, z: 1} m_Children: [] m_Father: {fileID: 6993125278731340963} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 307} - m_SizeDelta: {x: 930, y: 438} + m_AnchoredPosition: {x: 0, y: 286} + m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2307080691147230398 CanvasRenderer: @@ -34608,7 +34608,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: 1d9d3196766a70b48b279299f93ae5a0, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cdab367ea790f94d81328f1855b1c60, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -49109,7 +49109,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 600 + m_Text: 6000 --- !u!1 &5802744881267014826 GameObject: m_ObjectHideFlags: 0 @@ -54497,7 +54497,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: 32a5f3cb99561fc42a9972ec2366d8dd, type: 3} + m_Sprite: {fileID: 21300000, guid: 16d2ad74af58bad46b87350b2f292673, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -54531,13 +54531,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6645557316925916960} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7609198574399096519} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -5.199997, y: 1.2000008} @@ -54564,7 +54564,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -79449,7 +79449,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 9.6, y: -54.2} + m_AnchoredPosition: {x: 13.5, y: -54.2} m_SizeDelta: {x: 0, y: -5.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2862711272857401436 @@ -79493,7 +79493,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 600 + m_Text: 6000 --- !u!1 &7954472338185196800 GameObject: m_ObjectHideFlags: 0 @@ -80341,7 +80341,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, y: -240} + m_AnchoredPosition: {x: 3, y: -225} m_SizeDelta: {x: 258, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2591578538568476979 @@ -80372,7 +80372,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: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c13ee1b60f5c104ba8da33dcea7c65e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -80601,14 +80601,14 @@ RectTransform: m_GameObject: {fileID: 8631375517919415466} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} m_Children: [] m_Father: {fileID: 1198748879690571250} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -5, y: -55} + m_AnchoredPosition: {x: -1.9, y: -53.1} m_SizeDelta: {x: 38, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3378820835352334479