diff --git a/Assets/Animations/Transition/Canvas.controller b/Assets/Animations/Transition/Canvas.controller new file mode 100644 index 0000000000000000000000000000000000000000..a9ce72e9f2f9cf8d764ef8629ebdd316a0811773 --- /dev/null +++ b/Assets/Animations/Transition/Canvas.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Canvas + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Animations/Transition/Canvas.controller.meta b/Assets/Animations/Transition/Canvas.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..8b743ef15a2bef4270f62342f1c0d8b513198244 --- /dev/null +++ b/Assets/Animations/Transition/Canvas.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b389855dca6c1a409f7f8c6b5762d70 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Transition/CircleSwipe.anim b/Assets/Animations/Transition/CircleSwipe.anim new file mode 100644 index 0000000000000000000000000000000000000000..f0edfd1fcbd7c5e318ec928ce56a1e1acfc0426e --- /dev/null +++ b/Assets/Animations/Transition/CircleSwipe.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CircleSwipe + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Transition/CircleSwipe.anim.meta b/Assets/Animations/Transition/CircleSwipe.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..c1f2bd359df08b75a315005594249bde6a46813d --- /dev/null +++ b/Assets/Animations/Transition/CircleSwipe.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9cea0b6640d108d4097981eb1d0869d0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Transition/Image.prefab b/Assets/Animations/Transition/Image.prefab new file mode 100644 index 0000000000000000000000000000000000000000..ca833613ee5018a4e696ff001bc3ef1fcc78bc83 --- /dev/null +++ b/Assets/Animations/Transition/Image.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7659010468970738341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7659010469709986932} + - component: {fileID: 7659010468970738339} + - component: {fileID: 7659010468970738340} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7659010469709986932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659010468970738341} + 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: 0} + 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: -989, y: 0} + m_SizeDelta: {x: 1118.2858, y: 1153.8844} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7659010468970738339 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659010468970738341} + m_CullTransparentMesh: 1 +--- !u!114 &7659010468970738340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659010468970738341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 895640b9f99f22e4f9d5f3a1d55e3e6b, 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 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Animations/Transition/Image.prefab.meta b/Assets/Animations/Transition/Image.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..c5118a7e5041c5e900e93a45b9c08d68fc031817 --- /dev/null +++ b/Assets/Animations/Transition/Image.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 776bce114e8ffcf4484f9164d6d3be27 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CHARRED ZARD.ttf b/Assets/Import/Font/CHARRED ZARD.ttf similarity index 100% rename from Assets/Import/CHARRED ZARD.ttf rename to Assets/Import/Font/CHARRED ZARD.ttf diff --git a/Assets/Import/CHARRED ZARD.ttf.meta b/Assets/Import/Font/CHARRED ZARD.ttf.meta similarity index 100% rename from Assets/Import/CHARRED ZARD.ttf.meta rename to Assets/Import/Font/CHARRED ZARD.ttf.meta diff --git a/Assets/Import/Image/circle.png b/Assets/Import/Image/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..32d17dd1e4104600f7e050d91dfeaa475ec668c7 Binary files /dev/null and b/Assets/Import/Image/circle.png differ diff --git a/Assets/Import/Image/circle.png.meta b/Assets/Import/Image/circle.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..490b6449e85f7ede44785a4764f5a16a49971ed1 --- /dev/null +++ b/Assets/Import/Image/circle.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 895640b9f99f22e4f9d5f3a1d55e3e6b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 64640f73d35dd6f31287b5b05c087d7ef57d9e22..c4e12ce97c7de11b995c3a69f67ee6faadfb365e 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -284,7 +284,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 601081838} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1459655253} + m_TargetAssemblyTypeName: Quit, Assembly-CSharp + m_MethodName: leave + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &601081838 MonoBehaviour: m_ObjectHideFlags: 0 @@ -561,6 +573,7 @@ GameObject: m_Component: - component: {fileID: 1459655252} - component: {fileID: 1459655251} + - component: {fileID: 1459655253} m_Layer: 0 m_Name: SceneController m_TagString: Untagged @@ -594,6 +607,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1459655253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1459655250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d888d62879d8e841bb450bce623de31, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1460786679 GameObject: m_ObjectHideFlags: 0 @@ -606,6 +631,7 @@ GameObject: - component: {fileID: 1460786682} - component: {fileID: 1460786681} - component: {fileID: 1460786680} + - component: {fileID: 1460786684} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -687,6 +713,7 @@ RectTransform: m_Children: - {fileID: 1840166394} - {fileID: 601081836} + - {fileID: 1895339867} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -695,6 +722,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!95 &1460786684 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1460786679} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9b389855dca6c1a409f7f8c6b5762d70, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1560803507 GameObject: m_ObjectHideFlags: 0 @@ -910,3 +956,105 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1840166393} m_CullTransparentMesh: 1 +--- !u!224 &1895339867 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + m_PrefabInstance: {fileID: 1172472844674887126} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1172472844674887126 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1460786683} + m_Modifications: + - target: {fileID: 1172472846012381836, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_Name + value: Image + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_SizeDelta.x + value: 1118.2858 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_SizeDelta.y + value: 1153.8844 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_AnchoredPosition.x + value: -989 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1172472846012381837, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3} diff --git a/Assets/Scripts/Scene/loadScene.cs b/Assets/Scripts/Scene/loadScene.cs index 7eba8336bcf2dd375a84baf7a9c4acc7d0a85d62..d13ba64ff65682f2051f322d9ff94eeeef05a4ab 100644 --- a/Assets/Scripts/Scene/loadScene.cs +++ b/Assets/Scripts/Scene/loadScene.cs @@ -8,7 +8,9 @@ using UnityEngine.SceneManagement; /// </summary> public class loadScene : MonoBehaviour { + public Animator animmator; public void ChargerScene(string name) { - SceneManager.LoadScene(name); + animmator.SetBool("Change",true); + //SceneManager.LoadScene(name); } } \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 33e2376fc122cc04e854a84aae18534f1e51f394..8149077d426afcf42eb36f75302e551b0c955b48 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,13 +12,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c4c1313191d1e2d2621253467083debf42d flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c4b1505032b29292623616d785326ece92021 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c4b1505032b29292623616d785326ece92021 + value: 22424703114646680e0b0227036c69111a12163e252668252320092a flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c69111a12163e252668252320092a + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c72151802563f22213229