diff --git a/Assets/Animations/FadeOut.anim b/Assets/Animations/Fade In.anim similarity index 89% rename from Assets/Animations/FadeOut.anim rename to Assets/Animations/Fade In.anim index 3f4f097..8ff4f1d 100644 --- a/Assets/Animations/FadeOut.anim +++ b/Assets/Animations/Fade In.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FadeOut + m_Name: Fade In serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -22,35 +22,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.0166667 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -64,6 +45,34 @@ AnimationClip: path: Canvas/BlackFade classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Canvas/BlackFade + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -72,13 +81,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 3602832736 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3602832736 attribute: 3305885265 @@ -86,13 +88,20 @@ AnimationClip: typeID: 114 customType: 24 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3602832736 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.0166667 + m_StopTime: 2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -113,35 +122,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.0166667 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -155,6 +145,34 @@ AnimationClip: path: Canvas/BlackFade classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Canvas/BlackFade + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/FadeIn.anim.meta b/Assets/Animations/Fade In.anim.meta similarity index 79% rename from Assets/Animations/FadeIn.anim.meta rename to Assets/Animations/Fade In.anim.meta index 5a51226..bc0a42f 100644 --- a/Assets/Animations/FadeIn.anim.meta +++ b/Assets/Animations/Fade In.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d0798941af101248adfe9d67668d3d2 +guid: 02d837642790b584f81473571a03096a NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Animations/Fade Out.anim b/Assets/Animations/Fade Out.anim new file mode 100644 index 0000000..5c0ec90 --- /dev/null +++ b/Assets/Animations/Fade Out.anim @@ -0,0 +1,179 @@ +%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: Fade Out + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Canvas/BlackFade + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.55 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Canvas/BlackFade + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + 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: + - serializedVersion: 2 + path: 3602832736 + attribute: 3305885265 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3602832736 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Canvas/BlackFade + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.55 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Canvas/BlackFade + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/FadeOut.anim.meta b/Assets/Animations/Fade Out.anim.meta similarity index 79% rename from Assets/Animations/FadeOut.anim.meta rename to Assets/Animations/Fade Out.anim.meta index f4b8751..433526b 100644 --- a/Assets/Animations/FadeOut.anim.meta +++ b/Assets/Animations/Fade Out.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ddbd486794b08cb4c86d21109f602e31 +guid: 35fbeed0df5b5e446b509cf1da4825b1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Animations/FadeIn.anim b/Assets/Animations/FadeIn.anim deleted file mode 100644 index 8f1b9af..0000000 --- a/Assets/Animations/FadeIn.anim +++ /dev/null @@ -1,368 +0,0 @@ -%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: FadeIn - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - 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: - - serializedVersion: 2 - path: 3602832736 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 3602832736 - attribute: 3305885265 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 24 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 3602832736 - attribute: 2526845255 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 3602832736 - attribute: 4215373228 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 3602832736 - attribute: 2334886179 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 4.5 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - 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: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.5 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Canvas/BlackFade - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Animations/LevelChanger.controller b/Assets/Animations/Level Changer.controller similarity index 64% rename from Assets/Animations/LevelChanger.controller rename to Assets/Animations/Level Changer.controller index eb6c33d..46cbe0a 100644 --- a/Assets/Animations/LevelChanger.controller +++ b/Assets/Animations/Level Changer.controller @@ -1,39 +1,16 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-7838097800900256574 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8010416536009612745} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &-5233240795257937764 +--- !u!1102 &-4551316102621494482 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FadeOut + m_Name: Fade In m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -7838097800900256574} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -43,19 +20,44 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: ddbd486794b08cb4c86d21109f602e31, type: 2} + m_Motion: {fileID: 7400000, guid: 02d837642790b584f81473571a03096a, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &-349318642791667576 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4551316102621494482} + m_Position: {x: 290, y: -70, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5325082398587479290} + m_Position: {x: 330, y: 140, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 40, y: 220, z: 0} + m_ExitPosition: {x: 810, y: -110, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5325082398587479290} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: LevelChanger + m_Name: Level Changer serializedVersion: 5 m_AnimatorParameters: - m_Name: FadeOut @@ -67,7 +69,7 @@ AnimatorController: m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: 6863634840650260608} + m_StateMachine: {fileID: -349318642791667576} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -77,65 +79,18 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &5527063463032576873 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -5233240795257937764} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.9444444 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1107 &6863634840650260608 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 8010416536009612745} - m_Position: {x: 350, y: 100, z: 0} - - serializedVersion: 1 - m_State: {fileID: -5233240795257937764} - m_Position: {x: 290, y: 200, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 10, y: 110, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 8010416536009612745} ---- !u!1102 &8010416536009612745 +--- !u!1102 &5325082398587479290 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FadeIn + m_Name: Fade Out m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 5527063463032576873} + - {fileID: 5581839668906474915} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -145,9 +100,34 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 8d0798941af101248adfe9d67668d3d2, type: 2} + m_Motion: {fileID: 7400000, guid: 35fbeed0df5b5e446b509cf1da4825b1, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &5581839668906474915 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: FadeOut + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4551316102621494482} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.875 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/LevelChanger.controller.meta b/Assets/Animations/Level Changer.controller.meta similarity index 79% rename from Assets/Animations/LevelChanger.controller.meta rename to Assets/Animations/Level Changer.controller.meta index 5db63d5..cb9ecaf 100644 --- a/Assets/Animations/LevelChanger.controller.meta +++ b/Assets/Animations/Level Changer.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d2f6406cd97d604a8a3fca1f0e86380 +guid: b418c42f64280584994cddc4c3506296 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index c2070d7..39f91c8 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -905,8 +905,8 @@ CharacterController: serializedVersion: 2 m_Height: 2 m_Radius: 0.5 - m_SlopeLimit: 45 - m_StepOffset: 0.3 + m_SlopeLimit: 75 + m_StepOffset: 1 m_SkinWidth: 0.08 m_MinMoveDistance: 0.001 m_Center: {x: 0, y: 0, z: 0} @@ -922,8 +922,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e12a799f5a50bc34a94898baf2917b7b, type: 3} m_Name: m_EditorClassIdentifier: - rayCastDistance: 10 - rayCastAngle: 20 + rayCastDistance: 3 + rayCastAngle: 45 --- !u!114 &7831886137308850989 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Temple/TempleA.unity b/Assets/Scenes/Temple/TempleA.unity index e820ac4..dc6790d 100644 --- a/Assets/Scenes/Temple/TempleA.unity +++ b/Assets/Scenes/Temple/TempleA.unity @@ -474,12 +474,7 @@ PrefabInstance: propertyPath: m_Name value: SingletonManager objectReference: {fileID: 0} - - target: {fileID: 7941352839808612940, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: _startingSpawnPoint - value: - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 3584299648992395887, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} --- !u!1001 &1000163313 PrefabInstance: @@ -752,6 +747,74 @@ MonoBehaviour: m_EditorClassIdentifier: scene: TempleB _spawnPoint: {fileID: 7410213429604957170, guid: 055a1c57510672e47b19821a48e29f1a, type: 3} +--- !u!1 &1778834591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1778834594} + - component: {fileID: 1778834593} + - component: {fileID: 1778834592} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1778834592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1778834591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1778834593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1778834591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1778834594 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1778834591} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &2053038484 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Temple/TempleB.unity b/Assets/Scenes/Temple/TempleB.unity index 859c78e..8f2a879 100644 --- a/Assets/Scenes/Temple/TempleB.unity +++ b/Assets/Scenes/Temple/TempleB.unity @@ -414,6 +414,11 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 546913424} m_Enabled: 1 +--- !u!4 &590975485 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 325339469f6b77d4a8f54684fbc34abc, type: 3} + m_PrefabInstance: {fileID: 2018795829} + m_PrefabAsset: {fileID: 0} --- !u!64 &596794302 MeshCollider: m_ObjectHideFlags: 0 @@ -428,6 +433,53 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4579454407841743219, guid: 325339469f6b77d4a8f54684fbc34abc, type: 3} +--- !u!1 &627836311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 627836313} + - component: {fileID: 627836312} + m_Layer: 0 + m_Name: PlayerSpawnController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &627836312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627836311} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3} + m_Name: + m_EditorClassIdentifier: + _player: {fileID: 0} + _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3} + _spawnLocation: {fileID: 4686233381775535308, guid: 055a1c57510672e47b19821a48e29f1a, type: 3} +--- !u!4 &627836313 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627836311} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -34.246365, y: 16.896793, z: -8.326412} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &806200286 MeshCollider: m_ObjectHideFlags: 0 @@ -691,6 +743,104 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8929340590942090684, guid: 325339469f6b77d4a8f54684fbc34abc, type: 3} +--- !u!1 &1283894810 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1283894814} + - component: {fileID: 1283894813} + - component: {fileID: 1283894812} + - component: {fileID: 1283894811} + m_Layer: 0 + m_Name: Cylinder Fix + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!136 &1283894811 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283894810} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!23 &1283894812 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283894810} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1283894813 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283894810} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1283894814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283894810} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -30.96, y: 17.236832, z: 0.23} + m_LocalScale: {x: 19.56, y: 19.56, z: 19.56} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 590975485} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1700758058 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Animation.meta b/Assets/Scripts/Animation.meta new file mode 100644 index 0000000..de4a5b1 --- /dev/null +++ b/Assets/Scripts/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e54d2e73072e765469e22a8140f22395 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Animation/LevelChanger.cs b/Assets/Scripts/Animation/LevelChanger.cs new file mode 100644 index 0000000..8c8174c --- /dev/null +++ b/Assets/Scripts/Animation/LevelChanger.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace Scampz.GameJam +{ + public class LevelChanger : MonoBehaviour + { + [SerializeField] + private Animator animator; + + public void FadeAnimation() + { + //animator.SetTrigger("FadeOut"); + } + } +} diff --git a/Assets/Scripts/SceneManagement/LevelChanger.cs.meta b/Assets/Scripts/Animation/LevelChanger.cs.meta similarity index 83% rename from Assets/Scripts/SceneManagement/LevelChanger.cs.meta rename to Assets/Scripts/Animation/LevelChanger.cs.meta index cdeeef2..3270e8f 100644 --- a/Assets/Scripts/SceneManagement/LevelChanger.cs.meta +++ b/Assets/Scripts/Animation/LevelChanger.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b57ff8788cd779d4d8c417c92aa953e2 +guid: e1dc86bbd94602841978d59aadff3442 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/GameManager/GameManager.cs b/Assets/Scripts/GameManager/GameManager.cs index 3b319f2..f89a993 100644 --- a/Assets/Scripts/GameManager/GameManager.cs +++ b/Assets/Scripts/GameManager/GameManager.cs @@ -6,44 +6,31 @@ namespace Scampz.GameJam { public class GameManager : MonoBehaviour { - private static Animator _animator; - private static GameManager _instance; + public static GameManager Instance; + private LevelChanger _levelChanger; - public static GameManager Instance + private void Awake() { - get + if (Instance != null && Instance != this) { - if (!_instance) - { - _instance = new GameObject().AddComponent(); - _animator = new GameObject().AddComponent(); - _instance.name = _instance.GetType().ToString(); - DontDestroyOnLoad(_instance.gameObject); - DontDestroyOnLoad(_animator.gameObject); - } - - return _instance; + Destroy(this); + return; } + + Instance = this; + _levelChanger = GetComponentInChildren(); } + public void LoadScene(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode) { - StartCoroutine(LoadSceneAsync(sceneName, loadSceneMode)); - var player = GameObject.FindGameObjectWithTag("Player"); - var cc = player.GetComponent(); - cc.enabled = false; - player.transform.position = spawnPoint.transform.position; - player.transform.rotation = spawnPoint.transform.rotation; - cc.enabled = true; + StartCoroutine(LoadSceneAsync(sceneName, spawnPoint, loadSceneMode)); } - public void UnloadScene(string sceneName) - { - StartCoroutine(UnloadSceneAsync(sceneName)); - } - - private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode) + private IEnumerator LoadSceneAsync(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode) { + Debug.Log("Start Level Load"); + yield return null; var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); loadSceneOperation.allowSceneActivation = false; while (!loadSceneOperation.isDone) @@ -55,13 +42,16 @@ namespace Scampz.GameJam loadSceneOperation.allowSceneActivation = true; yield return loadSceneOperation; - } - private IEnumerator UnloadSceneAsync(string sceneName) - { - yield return null; - if (SceneManager.GetSceneByName(sceneName).IsValid()) - SceneManager.UnloadSceneAsync(sceneName); + Debug.Log("Stop Level Load"); + + if (SceneManager.GetActiveScene().name == sceneName) + { + Debug.Log("Move Player"); + var player = GameObject.FindGameObjectWithTag("Player"); + player.transform.position = spawnPoint.transform.position; + player.transform.rotation = spawnPoint.transform.rotation; + } } } } diff --git a/Assets/Scripts/SceneManagement/LevelChanger.cs b/Assets/Scripts/SceneManagement/LevelChanger.cs deleted file mode 100644 index ac100e6..0000000 --- a/Assets/Scripts/SceneManagement/LevelChanger.cs +++ /dev/null @@ -1,35 +0,0 @@ -using UnityEngine; - -namespace Scampz.GameJam -{ - public class LevelChanger : MonoBehaviour - { - public Animator animator; - public int sceneIndex = 0; - - public static LevelChanger Singleton { get; private set; } - - public void OnTriggerEnter(Collider collider) - { - //animator.SetTrigger("FadeOut"); - } - - public void EnableControls() - { - //InputManager.Instance.enabled = true; - } - - public void DisableControls() - { - //InputManager.Instance.enabled = false; - } - - private void Awake() - { - if (Singleton is not null && Singleton != this) - Destroy(this); - else - Singleton = this; - } - } -} diff --git a/Assets/Scripts/SceneManagement/LoadScene.cs b/Assets/Scripts/SceneManagement/LoadScene.cs index e90a166..e890d0b 100644 --- a/Assets/Scripts/SceneManagement/LoadScene.cs +++ b/Assets/Scripts/SceneManagement/LoadScene.cs @@ -16,7 +16,11 @@ namespace Scampz.GameJam if (!loaded && collider.CompareTag("Player")) { loaded = true; + var player = GameObject.FindGameObjectWithTag("Player"); + var cc = player.GetComponent(); + cc.enabled = false; GameManager.Instance.LoadScene(scene, _spawnPoint, LoadSceneMode.Single); + cc.enabled = true; } } } diff --git a/Assets/Singleton/LevelChanger.prefab b/Assets/Singleton/LevelChanger.prefab new file mode 100644 index 0000000..bde950f --- /dev/null +++ b/Assets/Singleton/LevelChanger.prefab @@ -0,0 +1,246 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5162256089903956807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5162256089903956806} + - component: {fileID: 5162256089903956805} + - component: {fileID: 5162256089903956804} + m_Layer: 0 + m_Name: LevelChanger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5162256089903956806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256089903956807} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -39.765285, y: -36.31613, z: 13.348324} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5162256090866012225} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5162256089903956805 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256089903956807} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b418c42f64280584994cddc4c3506296, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5162256089903956804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256089903956807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1dc86bbd94602841978d59aadff3442, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 5162256089903956805} +--- !u!1 &5162256090866012237 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5162256090866012225} + - component: {fileID: 5162256090866012226} + - component: {fileID: 5162256090866012227} + - component: {fileID: 5162256090866012236} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5162256090866012225 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256090866012237} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5162256091118042696} + m_Father: {fileID: 5162256089903956806} + 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_Pivot: {x: 0, y: 0} +--- !u!223 &5162256090866012226 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256090866012237} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &5162256090866012227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256090866012237} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &5162256090866012236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256090866012237} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &5162256091118042697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5162256091118042696} + - component: {fileID: 5162256091118042702} + - component: {fileID: 5162256091118042703} + m_Layer: 5 + m_Name: BlackFade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5162256091118042696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256091118042697} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5162256090866012225} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5162256091118042702 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256091118042697} + m_CullTransparentMesh: 1 +--- !u!114 &5162256091118042703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162256091118042697} + 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: 0} + 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/Singleton/LevelChanger.prefab.meta b/Assets/Singleton/LevelChanger.prefab.meta new file mode 100644 index 0000000..a1942f3 --- /dev/null +++ b/Assets/Singleton/LevelChanger.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c390af9ecffc95f49bdacd88b68d2399 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Singleton/SingletonManager.prefab b/Assets/Singleton/SingletonManager.prefab index 5736f3e..68e06ff 100644 --- a/Assets/Singleton/SingletonManager.prefab +++ b/Assets/Singleton/SingletonManager.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 3584299648992395886} - component: {fileID: 7941352839808612940} + - component: {fileID: 733647315673962512} + - component: {fileID: 2454376186782432871} m_Layer: 0 m_Name: Game Manager m_TagString: Untagged @@ -28,7 +30,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2936616004047497683} m_Father: {fileID: 3584299649024768172} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -44,6 +47,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 253db048700363d419cdd2430bb39594, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &733647315673962512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3584299648992395873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1dc86bbd94602841978d59aadff3442, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 2454376186782432871} +--- !u!95 &2454376186782432871 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3584299648992395873} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b418c42f64280584994cddc4c3506296, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &3584299649024768175 GameObject: m_ObjectHideFlags: 0 @@ -201,3 +237,65 @@ Transform: m_Father: {fileID: 3584299649024768172} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8026804466792065685 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3584299648992395886} + m_Modifications: + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalPosition.x + value: -39.765285 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalPosition.y + value: -36.31613 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalPosition.z + value: 13.348324 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5162256089903956807, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + propertyPath: m_Name + value: LevelChanger + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} +--- !u!4 &2936616004047497683 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5162256089903956806, guid: c390af9ecffc95f49bdacd88b68d2399, type: 3} + m_PrefabInstance: {fileID: 8026804466792065685} + m_PrefabAsset: {fileID: 0}