diff --git a/game/Assets/Animation/Animations/BlackScreen.anim b/game/Assets/Animation/Animations/BlackScreen.anim new file mode 100644 index 0000000..943c923 --- /dev/null +++ b/game/Assets/Animation/Animations/BlackScreen.anim @@ -0,0 +1,287 @@ +%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: BlackScreen + 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: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.016666668 + 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: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.016666668 + 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: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.016666668 + 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: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0 + attribute: 304273561 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.016666668 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.016666668 + 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: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.016666668 + 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: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.016666668 + 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: + classID: 114 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/game/Assets/Animation/Animations/BlackScreen.anim.meta b/game/Assets/Animation/Animations/BlackScreen.anim.meta new file mode 100644 index 0000000..1f25bb0 --- /dev/null +++ b/game/Assets/Animation/Animations/BlackScreen.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0021b193cb620e499895ae77d00f398 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Animation/Animations/fadeInAnim.anim b/game/Assets/Animation/Animations/fadeToBlack.anim similarity index 69% rename from game/Assets/Animation/Animations/fadeInAnim.anim rename to game/Assets/Animation/Animations/fadeToBlack.anim index 1b85916..ff96057 100644 --- a/game/Assets/Animation/Animations/fadeInAnim.anim +++ b/game/Assets/Animation/Animations/fadeToBlack.anim @@ -6,9 +6,9 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fadeInAnim + m_Name: fadeToBlack serializedVersion: 6 - m_Legacy: 1 + m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 m_RotationCurves: [] @@ -22,7 +22,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -30,26 +30,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.016666668 - value: 0.6862745 - inSlope: -15.294116 - outSlope: -15.294116 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0.49019608 - inSlope: -20.588238 - outSlope: -20.588238 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 + time: 0.8333333 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -70,14 +52,21 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.05 + m_StopTime: 0.8333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -98,7 +87,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -106,26 +95,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.016666668 - value: 0.6862745 - inSlope: -15.294116 - outSlope: -15.294116 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0.49019608 - inSlope: -20.588238 - outSlope: -20.588238 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 + time: 0.8333333 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/game/Assets/Animation/Animations/fadeInAnim.anim.meta b/game/Assets/Animation/Animations/fadeToBlack.anim.meta similarity index 100% rename from game/Assets/Animation/Animations/fadeInAnim.anim.meta rename to game/Assets/Animation/Animations/fadeToBlack.anim.meta diff --git a/game/Assets/Animation/Animations/fadeAnim.anim b/game/Assets/Animation/Animations/fadeToClear.anim similarity index 67% rename from game/Assets/Animation/Animations/fadeAnim.anim rename to game/Assets/Animation/Animations/fadeToClear.anim index f652e67..189c881 100644 --- a/game/Assets/Animation/Animations/fadeAnim.anim +++ b/game/Assets/Animation/Animations/fadeToClear.anim @@ -6,9 +6,9 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fadeAnim + m_Name: fadeToClear serializedVersion: 6 - m_Legacy: 1 + m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 m_RotationCurves: [] @@ -22,37 +22,19 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: -5287.59 - outSlope: -5287.59 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.20263079 - - serializedVersion: 3 - time: 0.016666668 - value: 0.49019608 - inSlope: 0.47058824 - outSlope: 0.47058824 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0.6862745 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -70,14 +52,21 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 0.05 + m_StopTime: 0.8333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -98,37 +87,19 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: -5287.59 - outSlope: -5287.59 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.20263079 - - serializedVersion: 3 - time: 0.016666668 - value: 0.49019608 - inSlope: 0.47058824 - outSlope: 0.47058824 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0.6862745 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 diff --git a/game/Assets/Animation/Animations/fadeAnim.anim.meta b/game/Assets/Animation/Animations/fadeToClear.anim.meta similarity index 100% rename from game/Assets/Animation/Animations/fadeAnim.anim.meta rename to game/Assets/Animation/Animations/fadeToClear.anim.meta diff --git a/game/Assets/Animation/Animators/RawImage.controller b/game/Assets/Animation/Animators/RawImage.controller index 634bd7e..e5f7ed2 100644 --- a/game/Assets/Animation/Animators/RawImage.controller +++ b/game/Assets/Animation/Animators/RawImage.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-3577735776848910404 +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: 3341922562928796631} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-3291724757439480876 AnimatorState: serializedVersion: 6 @@ -7,7 +29,34 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fadeAnim + m_Name: fadeToBlack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3577735776848910404} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d34e1056e38f87244b2215fec863782f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2362328116766892452 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlackScreen m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -20,53 +69,230 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d0021b193cb620e499895ae77d00f398, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2151460925267006383 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fadeToClear + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5875120911203264227} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 0147fa7bffe280f489a93a60dd794a57, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-137021724380350547 +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: fadeToClear + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2151460925267006383} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RawImage + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: fadeToBlack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: fadeToClear + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7260327451793377849} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &3341922562928796631 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State 0 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -137021724380350547} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d0021b193cb620e499895ae77d00f398, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5517717011629803724 +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: fadeToBlack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3291724757439480876} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5875120911203264227 +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: 8039668491600310597} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &7260327451793377849 +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: -3291724757439480876} + m_Position: {x: -100, y: 260, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2151460925267006383} + m_Position: {x: 200, y: 260, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8039668491600310597} + m_Position: {x: 30, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3341922562928796631} + m_Position: {x: 50, y: 350, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2362328116766892452} + m_Position: {x: 85, y: 415, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8039668491600310597} +--- !u!1102 &8039668491600310597 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5517717011629803724} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 m_Motion: {fileID: 0} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RawImage - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 7260327451793377849} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1107 &7260327451793377849 -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: -3291724757439480876} - m_Position: {x: 40, y: 230, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -3291724757439480876} diff --git a/game/Assets/Scenes/Checkpoints.unity b/game/Assets/Scenes/Checkpoints.unity index f72430b..cbc7c97 100644 --- a/game/Assets/Scenes/Checkpoints.unity +++ b/game/Assets/Scenes/Checkpoints.unity @@ -1879,6 +1879,7 @@ MonoBehaviour: animator: {fileID: 597246038} fadeScreen: {fileID: 2047982323} respawnManager: {fileID: 254941228} + _playerInput: {fileID: 597246034} --- !u!65 &861196245 BoxCollider: m_ObjectHideFlags: 0 @@ -2822,23 +2823,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!111 &2047982325 -Animation: +--- !u!95 &2047982325 +Animator: + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2047982323} m_Enabled: 1 - serializedVersion: 3 - m_Animation: {fileID: 7400000, guid: 0147fa7bffe280f489a93a60dd794a57, type: 2} - m_Animations: - - {fileID: 7400000, guid: 0147fa7bffe280f489a93a60dd794a57, type: 2} - - {fileID: 7400000, guid: d34e1056e38f87244b2215fec863782f, type: 2} - m_WrapMode: 0 - m_PlayAutomatically: 0 - m_AnimatePhysics: 0 - m_CullingType: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7c0792564e8a1bb45a90af39ed7b2a70, 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!114 &2047982326 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scripts/Checkpoint/SafeZone.cs b/game/Assets/Scripts/Checkpoint/SafeZone.cs index af2757a..5739af9 100644 --- a/game/Assets/Scripts/Checkpoint/SafeZone.cs +++ b/game/Assets/Scripts/Checkpoint/SafeZone.cs @@ -12,6 +12,7 @@ public class SafeZone : MonoBehaviour private void OnTriggerEnter(Collider other) { + // Check to see if other collider is Player. If true set player to other game object. if (other.gameObject.name == "Player") { isSafe = true; @@ -21,6 +22,7 @@ public class SafeZone : MonoBehaviour private void OnTriggerExit(Collider other) { + // Check if other game object is Player. if (other.gameObject.name == "Player") { isSafe = false; @@ -29,6 +31,7 @@ public class SafeZone : MonoBehaviour private void FixedUpdate() { + // Sets the respawn point to the current player position as long as they are within a safe zone. if (isSafe) { SetRespawnPoint(player.transform.position); @@ -37,6 +40,7 @@ public class SafeZone : MonoBehaviour private void SetRespawnPoint(Vector3 _respawnPoint) { - _respawnManager.setRespawnPoint(_respawnPoint); + // Sets respawn point inside the respawn manager. + _respawnManager.SetRespawnPoint(_respawnPoint); } } diff --git a/game/Assets/Scripts/Death & Respawn/DeathZone.cs b/game/Assets/Scripts/Death & Respawn/DeathZone.cs index 5cec489..08f9a64 100644 --- a/game/Assets/Scripts/Death & Respawn/DeathZone.cs +++ b/game/Assets/Scripts/Death & Respawn/DeathZone.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - +using UnityEngine.InputSystem; public class DeathZone : MonoBehaviour { public Animator animator; @@ -10,28 +10,32 @@ public class DeathZone : MonoBehaviour private GameObject player; [SerializeField] private RespawnManager respawnManager; - + [SerializeField] private PlayerInput _playerInput; private void OnTriggerEnter(Collider other) { + // Checks to make sure other collider is the Player. Sets player variable as Player game object and starts the coroutine. if (other.gameObject.name == "Player") { player = other.gameObject; - StartCoroutine(respawnPlayer()); + StartCoroutine(RespawnPlayer()); } } - IEnumerator respawnPlayer() + // Corountine to trigger death animation, disable player movement, play fade, respawn player at last safe position and then play fade in animation and re-enable player movement. + IEnumerator RespawnPlayer() { animator.SetTrigger("IsDead"); - yield return new WaitForSeconds(2); + _playerInput.enabled = false; + yield return new WaitForSeconds(0.5f); - fadeScreen.GetComponent().Play("fadeAnim"); - //yield return new WaitForSeconds(0.5f); + fadeScreen.GetComponent().SetTrigger("fadeToBlack"); + yield return new WaitForSeconds(1.5f); - player.transform.position = respawnManager.getRespawnPoint(); - yield return new WaitForSeconds(2); + player.transform.position = respawnManager.GetRespawnPoint(); + fadeScreen.GetComponent().SetTrigger("fadeToClear"); + yield return new WaitForSeconds(0.5f); - fadeScreen.GetComponent().Play("fadeInAnim"); + _playerInput.enabled = true; yield return null; } } \ No newline at end of file diff --git a/game/Assets/RespawnManager.cs b/game/Assets/Scripts/Death & Respawn/RespawnManager.cs similarity index 56% rename from game/Assets/RespawnManager.cs rename to game/Assets/Scripts/Death & Respawn/RespawnManager.cs index b49d66f..ee3026d 100644 --- a/game/Assets/RespawnManager.cs +++ b/game/Assets/Scripts/Death & Respawn/RespawnManager.cs @@ -6,16 +6,19 @@ public class RespawnManager : MonoBehaviour { private Vector3 respawnPoint; - public void setRespawnPoint(Vector3 _respawnPoint) + // Set respawn point in Respawn Manager. + public void SetRespawnPoint(Vector3 _respawnPoint) { respawnPoint = _respawnPoint; } - public Vector3 getRespawnPoint() + // Return the respawn point. + public Vector3 GetRespawnPoint() { return respawnPoint; } + // Show current respawn point in log. This can be deleted at later stage. private void Update() { Debug.Log(respawnPoint); diff --git a/game/Assets/RespawnManager.cs.meta b/game/Assets/Scripts/Death & Respawn/RespawnManager.cs.meta similarity index 100% rename from game/Assets/RespawnManager.cs.meta rename to game/Assets/Scripts/Death & Respawn/RespawnManager.cs.meta