diff --git a/Assets/ManagedResources/SplashPanel/SplashPanel.prefab b/Assets/ManagedResources/SplashPanel/SplashPanel.prefab index d52d86baca..57bb1e225a 100644 --- a/Assets/ManagedResources/SplashPanel/SplashPanel.prefab +++ b/Assets/ManagedResources/SplashPanel/SplashPanel.prefab @@ -74,6 +74,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3488340326941456643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8670530557904193430} + - component: {fileID: 7387361441747703845} + - component: {fileID: 410446453689300424} + m_Layer: 5 + m_Name: image2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8670530557904193430 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3488340326941456643} + 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_Children: [] + m_Father: {fileID: 7947107066618031649} + 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.0032958984, y: 0.000030517578} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7387361441747703845 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3488340326941456643} + m_CullTransparentMesh: 0 +--- !u!114 &410446453689300424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3488340326941456643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 5c703ff68df238146947a99e6cb91405, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7877014286502686225 GameObject: m_ObjectHideFlags: 0 @@ -188,6 +262,7 @@ RectTransform: m_Children: - {fileID: 3975800032117975284} - {fileID: 2199938647287585304} + - {fileID: 8670530557904193430} m_Father: {fileID: 7873899251171172621} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/SplashPanel/splash.jpg b/Assets/ManagedResources/SplashPanel/splash.jpg new file mode 100644 index 0000000000..ad6c8801b5 Binary files /dev/null and b/Assets/ManagedResources/SplashPanel/splash.jpg differ diff --git a/Assets/ManagedResources/SplashPanel/splash.jpg.meta b/Assets/ManagedResources/SplashPanel/splash.jpg.meta new file mode 100644 index 0000000000..8edb4b8f13 --- /dev/null +++ b/Assets/ManagedResources/SplashPanel/splash.jpg.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5c703ff68df238146947a99e6cb91405 +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: -1 + 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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 43a53243b68bbf84cafe6f6b59c7fdab + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameInit/GameStart.cs b/Assets/Scripts/GameInit/GameStart.cs index d48cf3c0de..397e7f9e24 100644 --- a/Assets/Scripts/GameInit/GameStart.cs +++ b/Assets/Scripts/GameInit/GameStart.cs @@ -59,16 +59,21 @@ public class GameStart : MonoBehaviour GameObject gameObj = bundle.LoadAsset("SplashPanel"); GameObject gameObj2 = Instantiate(gameObj, Vector3.zero, Quaternion.identity); Image image = gameObj2.transform.Find("Canvas/image").GetComponent(); + Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent(); - image.color = new Color(image.color.r, image.color.g, image.color.b, 0); - image.DOFade(1, 1).OnComplete(() => { - image.DOFade(0, 1).SetDelay(1).OnComplete(() => { - DestroyImmediate(gameObj2); - if (bundle != null) bundle.Unload(true); - bundle = null; - App.Instance.Initialize(); - UpdateManager.Instance.StartUp(); - //StartCoroutine(playMovice()); + image2.DOFade(1, 0).OnComplete(() =>{ + image.DOFade(0, 0).SetDelay(2).OnComplete(() =>{ + image.color = new Color(image.color.r, image.color.g, image.color.b, 0); + image.DOFade(1, 1).OnComplete(() => { + image.DOFade(0, 1).SetDelay(2).OnComplete(() => { + DestroyImmediate(gameObj2); + if (bundle != null) bundle.Unload(true); + bundle = null; + App.Instance.Initialize(); + UpdateManager.Instance.StartUp(); + //StartCoroutine(playMovice()); + }); + }); }); }); }