Add scene transitions, lose sanity points

This commit is contained in:
2022-08-20 19:04:34 -07:00
parent 349c4dc4b6
commit 886b957039
21 changed files with 1178 additions and 1861 deletions

View File

@@ -0,0 +1,242 @@
%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: Crossfade_End
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.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 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_Alpha
path: Image
classID: 225
script: {fileID: 0}
- 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: 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_Interactable
path: Image
classID: 225
script: {fileID: 0}
- 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: 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_BlocksRaycasts
path: Image
classID: 225
script: {fileID: 0}
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: 83635035
attribute: 1574349066
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 83635035
attribute: 4287062452
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 83635035
attribute: 3739863151
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 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: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 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_Alpha
path: Image
classID: 225
script: {fileID: 0}
- 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: 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_Interactable
path: Image
classID: 225
script: {fileID: 0}
- 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: 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_BlocksRaycasts
path: Image
classID: 225
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c5aa2813498570b40bcbf86d6e4e9141
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,242 @@
%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: Crossfade_Start
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: 3.5
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_Alpha
path: Image
classID: 225
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.5
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_BlocksRaycasts
path: Image
classID: 225
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.5
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_Interactable
path: Image
classID: 225
script: {fileID: 0}
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: 83635035
attribute: 1574349066
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 83635035
attribute: 3739863151
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 83635035
attribute: 4287062452
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 3.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: 3.5
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_Alpha
path: Image
classID: 225
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.5
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_BlocksRaycasts
path: Image
classID: 225
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.5
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_Interactable
path: Image
classID: 225
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c0ca6dca4b789044caa447b833329afc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,32 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-4551316102621494482 --- !u!1107 &-7024913408499606670
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fade In
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 02d837642790b584f81473571a03096a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-349318642791667576
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -36,61 +10,58 @@ AnimatorStateMachine:
m_Name: Base Layer m_Name: Base Layer
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -4551316102621494482} m_State: {fileID: -1704583222104864510}
m_Position: {x: 290, y: -70, z: 0} m_Position: {x: 300, y: 120, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 5325082398587479290} m_State: {fileID: -3587757691948606260}
m_Position: {x: 330, y: 140, z: 0} m_Position: {x: 300, y: 10, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0} m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 40, y: 220, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 810, y: -110, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5325082398587479290} m_DefaultState: {fileID: -3587757691948606260}
--- !u!91 &9100000 --- !u!1101 &-3611989221606800925
AnimatorController: AnimatorStateTransition:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Level Changer m_Name:
serializedVersion: 5 m_Conditions:
m_AnimatorParameters: - m_ConditionMode: 1
- m_Name: FadeOut m_ConditionEvent: Start
m_Type: 9 m_EventTreshold: 0
m_DefaultFloat: 0 m_DstStateMachine: {fileID: 0}
m_DefaultInt: 0 m_DstState: {fileID: -1704583222104864510}
m_DefaultBool: 1 m_Solo: 0
m_Controller: {fileID: 0} m_Mute: 0
m_AnimatorLayers: m_IsExit: 0
- serializedVersion: 5 serializedVersion: 3
m_Name: Base Layer m_TransitionDuration: 0
m_StateMachine: {fileID: -349318642791667576} m_TransitionOffset: 0
m_Mask: {fileID: 0} m_ExitTime: 0.8333333
m_Motions: [] m_HasExitTime: 0
m_Behaviours: [] m_HasFixedDuration: 1
m_BlendingMode: 0 m_InterruptionSource: 0
m_SyncedLayerIndex: -1 m_OrderedInterruption: 1
m_DefaultWeight: 0 m_CanTransitionToSelf: 1
m_IKPass: 0 --- !u!1102 &-3587757691948606260
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &5325082398587479290
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Fade Out m_Name: Crossfade_End
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: 5581839668906474915} - {fileID: -3611989221606800925}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
@@ -100,33 +71,85 @@ AnimatorState:
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0 m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 35fbeed0df5b5e446b509cf1da4825b1, type: 2} m_Motion: {fileID: 7400000, guid: c5aa2813498570b40bcbf86d6e4e9141, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1101 &5581839668906474915 --- !u!1102 &-1704583222104864510
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Crossfade_Start
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1659286614911188497}
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: c0ca6dca4b789044caa447b833329afc, type: 2}
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: Fade
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Start
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: -7024913408499606670}
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!1101 &1659286614911188497
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: m_Name:
m_Conditions: m_Conditions: []
- m_ConditionMode: 1
m_ConditionEvent: FadeOut
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4551316102621494482} m_DstState: {fileID: -3587757691948606260}
m_Solo: 0 m_Solo: 0
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.875 m_ExitTime: 0.75
m_HasExitTime: 0 m_HasExitTime: 1
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b418c42f64280584994cddc4c3506296 guid: b17fab27390789c45b6e21210a63b4cf
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 9100000 mainObjectFileID: 9100000

Binary file not shown.

View File

@@ -301,7 +301,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
useGroundChecking: 0
--- !u!1 &57368835 --- !u!1 &57368835
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -331,6 +330,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1561401314} - {fileID: 1561401314}
- {fileID: 1716491136}
m_Father: {fileID: 2077331998} m_Father: {fileID: 2077331998}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1096,9 +1096,7 @@ GameObject:
- component: {fileID: 651040295} - component: {fileID: 651040295}
- component: {fileID: 651040294} - component: {fileID: 651040294}
- component: {fileID: 651040293} - component: {fileID: 651040293}
- component: {fileID: 651040292}
- component: {fileID: 651040296} - component: {fileID: 651040296}
- component: {fileID: 651040297}
m_Layer: 0 m_Layer: 0
m_Name: Mountain B Zone m_Name: Mountain B Zone
m_TagString: Untagged m_TagString: Untagged
@@ -1121,22 +1119,6 @@ Transform:
m_Father: {fileID: 324165025} m_Father: {fileID: 324165025}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &651040292
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 651040290}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8d750c023dab0b040a63e345c8b2830d, type: 3}
m_Name:
m_EditorClassIdentifier:
cameras:
- {fileID: 434372713}
- {fileID: 939848617}
- {fileID: 418125935}
--- !u!65 &651040293 --- !u!65 &651040293
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1213,19 +1195,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
backgroundMusic: {fileID: 8300000, guid: 269192823cbbfdd46bac8719d24d4b28, type: 3} backgroundMusic: {fileID: 8300000, guid: 269192823cbbfdd46bac8719d24d4b28, type: 3}
--- !u!114 &651040297
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 651040290}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name:
m_EditorClassIdentifier:
useGroundChecking: 0
--- !u!1 &669402557 --- !u!1 &669402557
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1705,6 +1674,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_spawnPoint: {fileID: 696198453} _spawnPoint: {fileID: 696198453}
camerasToActivate:
- {fileID: 669402559}
- {fileID: 1595843837}
- {fileID: 872275960}
--- !u!1 &872275958 --- !u!1 &872275958
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2318,6 +2291,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_spawnPoint: {fileID: 728462891} _spawnPoint: {fileID: 728462891}
camerasToActivate:
- {fileID: 434372713}
- {fileID: 418125935}
- {fileID: 939848617}
--- !u!1001 &1595843826 --- !u!1001 &1595843826
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2754,7 +2731,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ce44efba2e7898048a76f03b184fd342, type: 3} m_Script: {fileID: 11500000, guid: ce44efba2e7898048a76f03b184fd342, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_spawnPoint: {fileID: 0} _spawnPoint: {fileID: 2126766554}
camerasToActivate:
- {fileID: 1996453977}
- {fileID: 1009805974}
--- !u!64 &1620235928 --- !u!64 &1620235928
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2859,10 +2839,6 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 2082500391} m_TransformParent: {fileID: 2082500391}
m_Modifications: m_Modifications:
- target: {fileID: 36671747401237298, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 0
@@ -2911,14 +2887,6 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: SingletonManager value: SingletonManager
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9083411855967246993, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9106198387064842738, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
--- !u!4 &1631886794 stripped --- !u!4 &1631886794 stripped
@@ -3024,6 +2992,118 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1651078843} m_GameObject: {fileID: 1651078843}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1716491135
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1716491136}
- component: {fileID: 1716491140}
- component: {fileID: 1716491139}
- component: {fileID: 1716491138}
- component: {fileID: 1716491137}
m_Layer: 0
m_Name: To World Map
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1716491136
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1716491135}
m_LocalRotation: {x: 0.68841404, y: -0.000000048428777, z: 0.09282742, w: 0.7193533}
m_LocalPosition: {x: -1373.3, y: -97.803635, z: -3332.4}
m_LocalScale: {x: 6.2758, y: 6.2758, z: 6.2758}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 57368836}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 82.065, y: 67.794, z: 75.339}
--- !u!114 &1716491137
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1716491135}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2f7cf3b0e87656149a3acee1198cb0e0, type: 3}
m_Name:
m_EditorClassIdentifier:
scene: WorldMap
--- !u!64 &1716491138
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1716491135}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1716491139
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1716491135}
m_Enabled: 0
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 &1716491140
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1716491135}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1733846366 --- !u!1 &1733846366
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3151,9 +3231,7 @@ GameObject:
- component: {fileID: 1805221252} - component: {fileID: 1805221252}
- component: {fileID: 1805221251} - component: {fileID: 1805221251}
- component: {fileID: 1805221250} - component: {fileID: 1805221250}
- component: {fileID: 1805221253}
- component: {fileID: 1805221254} - component: {fileID: 1805221254}
- component: {fileID: 1805221255}
m_Layer: 0 m_Layer: 0
m_Name: Mountain C Zone m_Name: Mountain C Zone
m_TagString: Untagged m_TagString: Untagged
@@ -3239,21 +3317,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1805221248} m_GameObject: {fileID: 1805221248}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1805221253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1805221248}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8d750c023dab0b040a63e345c8b2830d, type: 3}
m_Name:
m_EditorClassIdentifier:
cameras:
- {fileID: 1009805974}
- {fileID: 1996453977}
--- !u!114 &1805221254 --- !u!114 &1805221254
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3267,19 +3330,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
backgroundMusic: {fileID: 8300000, guid: 79a5e6bec678bf847a3ee6852890a652, type: 3} backgroundMusic: {fileID: 8300000, guid: 79a5e6bec678bf847a3ee6852890a652, type: 3}
--- !u!114 &1805221255
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1805221248}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name:
m_EditorClassIdentifier:
useGroundChecking: 0
--- !u!1 &1974776453 --- !u!1 &1974776453
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3688,6 +3738,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_spawnPoint: {fileID: 550186601} _spawnPoint: {fileID: 550186601}
camerasToActivate:
- {fileID: 418125935}
- {fileID: 434372713}
- {fileID: 939848617}
--- !u!64 &2072720217 --- !u!64 &2072720217
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3849,7 +3903,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2091088279} m_GameObject: {fileID: 2091088279}
m_LocalRotation: {x: 0.007379282, y: -0.17910917, z: 0.0013395336, w: 0.9838006} m_LocalRotation: {x: 0.007379282, y: -0.17910917, z: 0.0013395336, w: 0.9838006}
m_LocalPosition: {x: -341.436, y: -27.138, z: -830.897} m_LocalPosition: {x: -343.692, y: -26.268, z: -822.702}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -3995,7 +4049,7 @@ SphereCollider:
m_GameObject: {fileID: 2126766553} m_GameObject: {fileID: 2126766553}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 0
serializedVersion: 2 serializedVersion: 2
m_Radius: 0.5 m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
@@ -4006,7 +4060,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2126766553} m_GameObject: {fileID: 2126766553}
m_Enabled: 1 m_Enabled: 0
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1

View File

@@ -696,7 +696,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Player: {fileID: 0} Player: {fileID: 0}
_playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3} _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3}
_spawnLocation: {fileID: 1892337346} _spawnLocation: {fileID: 353656669}
--- !u!4 &294425620 --- !u!4 &294425620
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1011,7 +1011,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
useGroundChecking: 0
--- !u!54 &312982516 --- !u!54 &312982516
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4107,7 +4106,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
useGroundChecking: 1
--- !u!54 &862491693 --- !u!54 &862491693
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4338,7 +4336,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
useGroundChecking: 1
--- !u!54 &889289043 --- !u!54 &889289043
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -6184,6 +6181,10 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 13204277} m_TransformParent: {fileID: 13204277}
m_Modifications: m_Modifications:
- target: {fileID: 2058872885, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 0
@@ -7292,7 +7293,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
useGroundChecking: 1
--- !u!1 &1527842954 --- !u!1 &1527842954
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -8544,7 +8544,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
useGroundChecking: 1
--- !u!54 &1691950228 --- !u!54 &1691950228
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@@ -9,7 +9,7 @@ namespace Scampz.GameJam
public void FadeAnimation() public void FadeAnimation()
{ {
//animator.SetTrigger("FadeOut"); animator.SetTrigger("Start");
} }
} }
} }

View File

@@ -1,4 +1,5 @@
using UnityEngine; using System.Collections;
using UnityEngine;
namespace Scampz.GameJam.Assets.Scripts namespace Scampz.GameJam.Assets.Scripts
{ {
@@ -9,15 +10,13 @@ namespace Scampz.GameJam.Assets.Scripts
private void OnTriggerEnter(Collider collider) private void OnTriggerEnter(Collider collider)
{ {
var allCamerasInCurrentScene = FindObjectsOfType<Camera>();
foreach (var sceneCamera in allCamerasInCurrentScene)
sceneCamera.enabled = false;
if (collider.CompareTag("Player")) if (collider.CompareTag("Player"))
StartCoroutine(ActivateCameras());
}
private IEnumerator ActivateCameras()
{ {
foreach (var camera in cameras) yield return null;
camera.enabled = true;
}
} }
} }
} }

View File

@@ -4,27 +4,16 @@ namespace Scampz.GameJam
{ {
public class CameraFollow : MonoBehaviour public class CameraFollow : MonoBehaviour
{ {
[SerializeField]
private Transform targetObject;
[SerializeField] [SerializeField]
private Vector3 cameraOffset; private Vector3 cameraOffset;
[SerializeField] [SerializeField]
private float smoothFactor = 0.5f;
[SerializeField]
private bool lookAtTarget = false;
[SerializeField]
private float _cameraYPosition = 45f; private float _cameraYPosition = 45f;
private void Start() private void FixedUpdate()
{ {
transform.position = targetObject.transform.position - cameraOffset; var player = GameObject.FindGameObjectWithTag("Player");
} var lockedInYPosition = new Vector3(player.transform.position.x - cameraOffset.x, _cameraYPosition, player.transform.position.z - cameraOffset.z);
private void LateUpdate()
{
var lockedInYPosition = new Vector3(targetObject.transform.position.x - cameraOffset.x, _cameraYPosition, targetObject.transform.position.z - cameraOffset.z);
transform.position = lockedInYPosition; transform.position = lockedInYPosition;
transform.LookAt(transform);
} }
} }
} }

View File

@@ -7,7 +7,7 @@ namespace Scampz.GameJam
public class GameManager : MonoBehaviour public class GameManager : MonoBehaviour
{ {
public static GameManager Instance; public static GameManager Instance;
//private LevelChanger _levelChanger; private LevelChanger _levelChanger;
private void Awake() private void Awake()
{ {
@@ -18,7 +18,7 @@ namespace Scampz.GameJam
} }
Instance = this; Instance = this;
//_levelChanger = GetComponentInChildren<LevelChanger>(); _levelChanger = GetComponentInChildren<LevelChanger>();
} }
@@ -29,7 +29,9 @@ namespace Scampz.GameJam
private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode) private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode)
{ {
yield return null; _levelChanger.FadeAnimation();
yield return new WaitForSecondsRealtime(3f);
var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
loadSceneOperation.allowSceneActivation = false; loadSceneOperation.allowSceneActivation = false;
while (!loadSceneOperation.isDone) while (!loadSceneOperation.isDone)

View File

@@ -13,7 +13,6 @@ public class PlayerSpawnController : MonoBehaviour
Player = Instantiate(_playerPrefab); Player = Instantiate(_playerPrefab);
Player.transform.position = _spawnLocation.transform.position; Player.transform.position = _spawnLocation.transform.position;
Player.transform.rotation = _spawnLocation.transform.rotation; Player.transform.rotation = _spawnLocation.transform.rotation;
DontDestroyOnLoad(Player);
} }
} }

View File

@@ -1,21 +0,0 @@
using UnityEngine;
namespace Scampz.GameJam.Assets.Scripts
{
public class UseGroundChecking : MonoBehaviour
{
[SerializeField]
private bool useGroundChecking;
private void OnTriggerEnter(Collider collider)
{
if (collider.CompareTag("Player"))
{
var playerSpawnController = FindObjectOfType<PlayerSpawnController>();
var player = playerSpawnController.Player;
var rayCaster = player.GetComponent<RayCaster>();
rayCaster.enabled = useGroundChecking;
}
}
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: e569519f096090547aafb2a539705467
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,4 +1,5 @@
using UnityEngine; using System.Collections;
using UnityEngine;
namespace Scampz.GameJam.Assets.Scripts.SceneManagement namespace Scampz.GameJam.Assets.Scripts.SceneManagement
{ {
@@ -6,18 +7,38 @@ namespace Scampz.GameJam.Assets.Scripts.SceneManagement
{ {
[SerializeField] [SerializeField]
private Transform _spawnPoint; private Transform _spawnPoint;
[SerializeField]
private Camera[] camerasToActivate;
private void OnTriggerEnter(Collider collider) private void OnTriggerEnter(Collider collider)
{ {
if (collider.CompareTag("Player")) if (collider.CompareTag("Player"))
{ {
StartCoroutine(LoadNextLevel());
}
}
private IEnumerator LoadNextLevel()
{
var levelChanger = FindObjectOfType<LevelChanger>();
levelChanger.FadeAnimation();
yield return null;
yield return new WaitForSeconds(3.0f);
var player = GameObject.FindGameObjectWithTag("Player"); var player = GameObject.FindGameObjectWithTag("Player");
player.SetActive(false);
var cc = player.GetComponent<CharacterController>(); var cc = player.GetComponent<CharacterController>();
cc.enabled = false; cc.enabled = false;
player.transform.position = _spawnPoint.position; player.transform.position = _spawnPoint.position;
player.transform.rotation = _spawnPoint.rotation; player.transform.rotation = _spawnPoint.rotation;
cc.enabled = true; cc.enabled = true;
} yield return null;
var allCamerasInCurrentScene = FindObjectsOfType<Camera>();
foreach (var sceneCamera in allCamerasInCurrentScene)
sceneCamera.enabled = false;
foreach (var camera in camerasToActivate)
camera.enabled = true;
player.SetActive(true);
yield return null;
} }
} }
} }

View File

@@ -1,5 +1,262 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &1445798100
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1445798101}
- component: {fileID: 1445798105}
- component: {fileID: 1445798104}
- component: {fileID: 1445798103}
- component: {fileID: 1445798102}
- component: {fileID: 1445798106}
m_Layer: 0
m_Name: Fade
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1445798101
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445798100}
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: 2058872884}
m_Father: {fileID: 1523210320}
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 &1445798105
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445798100}
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 &1445798104
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445798100}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
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 &1445798103
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445798100}
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!95 &1445798102
Animator:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445798100}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: b17fab27390789c45b6e21210a63b4cf, 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 &1445798106
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445798100}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e1dc86bbd94602841978d59aadff3442, type: 3}
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 1445798102}
--- !u!1 &1523210319
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1523210320}
m_Layer: 0
m_Name: LevelLoader
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1523210320
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1523210319}
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: 1445798101}
m_Father: {fileID: 3584299649024768172}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2058872883
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2058872884}
- component: {fileID: 2058872887}
- component: {fileID: 2058872886}
- component: {fileID: 2058872885}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2058872884
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2058872883}
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: 1445798101}
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 &2058872887
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2058872883}
m_CullTransparentMesh: 1
--- !u!114 &2058872886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2058872883}
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
--- !u!225 &2058872885
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2058872883}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &2493305158315474755 --- !u!1 &2493305158315474755
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -203,8 +460,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 3584299648992395886} - component: {fileID: 3584299648992395886}
- component: {fileID: 7941352839808612940} - component: {fileID: 7941352839808612940}
- component: {fileID: 733647315673962512}
- component: {fileID: 2454376186782432871}
m_Layer: 0 m_Layer: 0
m_Name: Game Manager m_Name: Game Manager
m_TagString: Untagged m_TagString: Untagged
@@ -240,39 +495,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 253db048700363d419cdd2430bb39594, type: 3} m_Script: {fileID: 11500000, guid: 253db048700363d419cdd2430bb39594, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: 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 --- !u!1 &3584299649024768175
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -306,6 +528,7 @@ Transform:
- {fileID: 3584299648992395886} - {fileID: 3584299648992395886}
- {fileID: 3584299649380910131} - {fileID: 3584299649380910131}
- {fileID: 4605870207825934367} - {fileID: 4605870207825934367}
- {fileID: 1523210320}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -512,7 +735,6 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_animator: {fileID: 992122626} _animator: {fileID: 992122626}
_dialogueTextGUI: {fileID: 36671747401237298} _dialogueTextGUI: {fileID: 36671747401237298}
_defaultTextSpeed: 0.1
IsTalking: 0 IsTalking: 0
--- !u!82 &8281504758914613877 --- !u!82 &8281504758914613877
AudioSource: AudioSource:

View File

@@ -49,7 +49,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4255233373611660780} m_GameObject: {fileID: 4255233373611660780}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1

View File

@@ -8,24 +8,6 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/WorldMap.unity path: Assets/Scenes/WorldMap.unity
guid: 70adf3ac8cd6ed047afaee7d42e6d836 guid: 70adf3ac8cd6ed047afaee7d42e6d836
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 1 - enabled: 1
path: Assets/Scenes/Temple.unity path: Assets/Scenes/Temple.unity
guid: 47f46a65c6a9c8f4aa201e9b549862c6 guid: 47f46a65c6a9c8f4aa201e9b549862c6