diff --git a/Assets/Animations/Crossfade_End.anim b/Assets/Animations/Crossfade_End.anim new file mode 100644 index 0000000..6dd2628 --- /dev/null +++ b/Assets/Animations/Crossfade_End.anim @@ -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: [] diff --git a/Assets/Animations/Crossfade_End.anim.meta b/Assets/Animations/Crossfade_End.anim.meta new file mode 100644 index 0000000..14fad52 --- /dev/null +++ b/Assets/Animations/Crossfade_End.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5aa2813498570b40bcbf86d6e4e9141 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Crossfade_Start.anim b/Assets/Animations/Crossfade_Start.anim new file mode 100644 index 0000000..404668e --- /dev/null +++ b/Assets/Animations/Crossfade_Start.anim @@ -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: [] diff --git a/Assets/Animations/Crossfade_Start.anim.meta b/Assets/Animations/Crossfade_Start.anim.meta new file mode 100644 index 0000000..dc796ea --- /dev/null +++ b/Assets/Animations/Crossfade_Start.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0ca6dca4b789044caa447b833329afc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Level Changer.controller b/Assets/Animations/Fade.controller similarity index 64% rename from Assets/Animations/Level Changer.controller rename to Assets/Animations/Fade.controller index 46cbe0a..458ec51 100644 --- a/Assets/Animations/Level Changer.controller +++ b/Assets/Animations/Fade.controller @@ -1,32 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-4551316102621494482 -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 +--- !u!1107 &-7024913408499606670 AnimatorStateMachine: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -36,61 +10,58 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -4551316102621494482} - m_Position: {x: 290, y: -70, z: 0} + m_State: {fileID: -1704583222104864510} + m_Position: {x: 300, y: 120, z: 0} - serializedVersion: 1 - m_State: {fileID: 5325082398587479290} - m_Position: {x: 330, y: 140, z: 0} + m_State: {fileID: -3587757691948606260} + m_Position: {x: 300, y: 10, 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_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: 5325082398587479290} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 + m_DefaultState: {fileID: -3587757691948606260} +--- !u!1101 &-3611989221606800925 +AnimatorStateTransition: + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Level Changer - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: FadeOut - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 1 - m_Controller: {fileID: 0} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -349318642791667576} - 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 &5325082398587479290 + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Start + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1704583222104864510} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.8333333 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-3587757691948606260 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Fade Out + m_Name: Crossfade_End m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 5581839668906474915} + - {fileID: -3611989221606800925} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -100,33 +71,85 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 35fbeed0df5b5e446b509cf1da4825b1, type: 2} + m_Motion: {fileID: 7400000, guid: c5aa2813498570b40bcbf86d6e4e9141, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: 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: 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_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -4551316102621494482} + m_DstState: {fileID: -3587757691948606260} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.875 - m_HasExitTime: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/Level Changer.controller.meta b/Assets/Animations/Fade.controller.meta similarity index 79% rename from Assets/Animations/Level Changer.controller.meta rename to Assets/Animations/Fade.controller.meta index cb9ecaf..15dd50d 100644 --- a/Assets/Animations/Level Changer.controller.meta +++ b/Assets/Animations/Fade.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b418c42f64280584994cddc4c3506296 +guid: b17fab27390789c45b6e21210a63b4cf NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/Audio/BGM/outside mountain theme.wav b/Assets/Audio/BGM/outside mountain theme.wav index dd860d6..4755c9b 100644 --- a/Assets/Audio/BGM/outside mountain theme.wav +++ b/Assets/Audio/BGM/outside mountain theme.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:481f2f1f8d66bd4b48df1e5dbb87ce028c31e4e1148d765f889b9c6649372ca2 +oid sha256:308986f8b55925a8806d5c8b7bc1b4751539fc78603c48ff76f949a36ecd6d66 size 7798784 diff --git a/Assets/Scenes/Mountain.unity b/Assets/Scenes/Mountain.unity index f620799..b1031c3 100644 --- a/Assets/Scenes/Mountain.unity +++ b/Assets/Scenes/Mountain.unity @@ -301,7 +301,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Name: m_EditorClassIdentifier: - useGroundChecking: 0 --- !u!1 &57368835 GameObject: m_ObjectHideFlags: 0 @@ -331,6 +330,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1561401314} + - {fileID: 1716491136} m_Father: {fileID: 2077331998} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1096,9 +1096,7 @@ GameObject: - component: {fileID: 651040295} - component: {fileID: 651040294} - component: {fileID: 651040293} - - component: {fileID: 651040292} - component: {fileID: 651040296} - - component: {fileID: 651040297} m_Layer: 0 m_Name: Mountain B Zone m_TagString: Untagged @@ -1121,22 +1119,6 @@ Transform: m_Father: {fileID: 324165025} m_RootOrder: 4 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 BoxCollider: m_ObjectHideFlags: 0 @@ -1213,19 +1195,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: 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 GameObject: m_ObjectHideFlags: 0 @@ -1705,6 +1674,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 696198453} + camerasToActivate: + - {fileID: 669402559} + - {fileID: 1595843837} + - {fileID: 872275960} --- !u!1 &872275958 GameObject: m_ObjectHideFlags: 0 @@ -2318,6 +2291,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 728462891} + camerasToActivate: + - {fileID: 434372713} + - {fileID: 418125935} + - {fileID: 939848617} --- !u!1001 &1595843826 PrefabInstance: m_ObjectHideFlags: 0 @@ -2754,7 +2731,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ce44efba2e7898048a76f03b184fd342, type: 3} m_Name: m_EditorClassIdentifier: - _spawnPoint: {fileID: 0} + _spawnPoint: {fileID: 2126766554} + camerasToActivate: + - {fileID: 1996453977} + - {fileID: 1009805974} --- !u!64 &1620235928 MeshCollider: m_ObjectHideFlags: 0 @@ -2859,10 +2839,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2082500391} m_Modifications: - - target: {fileID: 36671747401237298, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_RootOrder value: 0 @@ -2911,14 +2887,6 @@ PrefabInstance: propertyPath: m_Name value: SingletonManager 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_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} --- !u!4 &1631886794 stripped @@ -3024,6 +2992,118 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1651078843} 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 GameObject: m_ObjectHideFlags: 0 @@ -3151,9 +3231,7 @@ GameObject: - component: {fileID: 1805221252} - component: {fileID: 1805221251} - component: {fileID: 1805221250} - - component: {fileID: 1805221253} - component: {fileID: 1805221254} - - component: {fileID: 1805221255} m_Layer: 0 m_Name: Mountain C Zone m_TagString: Untagged @@ -3239,21 +3317,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805221248} 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 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3267,19 +3330,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: 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 GameObject: m_ObjectHideFlags: 0 @@ -3688,6 +3738,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 550186601} + camerasToActivate: + - {fileID: 418125935} + - {fileID: 434372713} + - {fileID: 939848617} --- !u!64 &2072720217 MeshCollider: m_ObjectHideFlags: 0 @@ -3849,7 +3903,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2091088279} 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_ConstrainProportionsScale: 0 m_Children: [] @@ -3995,7 +4049,7 @@ SphereCollider: m_GameObject: {fileID: 2126766553} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} @@ -4006,7 +4060,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2126766553} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 diff --git a/Assets/Scenes/Temple.unity b/Assets/Scenes/Temple.unity index 7a86499..a972d98 100644 --- a/Assets/Scenes/Temple.unity +++ b/Assets/Scenes/Temple.unity @@ -696,7 +696,7 @@ MonoBehaviour: m_EditorClassIdentifier: Player: {fileID: 0} _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3} - _spawnLocation: {fileID: 1892337346} + _spawnLocation: {fileID: 353656669} --- !u!4 &294425620 Transform: m_ObjectHideFlags: 0 @@ -1011,7 +1011,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Name: m_EditorClassIdentifier: - useGroundChecking: 0 --- !u!54 &312982516 Rigidbody: m_ObjectHideFlags: 0 @@ -4107,7 +4106,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Name: m_EditorClassIdentifier: - useGroundChecking: 1 --- !u!54 &862491693 Rigidbody: m_ObjectHideFlags: 0 @@ -4338,7 +4336,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Name: m_EditorClassIdentifier: - useGroundChecking: 1 --- !u!54 &889289043 Rigidbody: m_ObjectHideFlags: 0 @@ -6184,6 +6181,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 13204277} m_Modifications: + - target: {fileID: 2058872885, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Alpha + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_RootOrder value: 0 @@ -7292,7 +7293,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Name: m_EditorClassIdentifier: - useGroundChecking: 1 --- !u!1 &1527842954 GameObject: m_ObjectHideFlags: 0 @@ -8544,7 +8544,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} m_Name: m_EditorClassIdentifier: - useGroundChecking: 1 --- !u!54 &1691950228 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/WorldMap.unity b/Assets/Scenes/WorldMap.unity index e7d68ee..ded53fa 100644 --- a/Assets/Scenes/WorldMap.unity +++ b/Assets/Scenes/WorldMap.unity @@ -320,7 +320,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &345961373 stripped GameObject: @@ -357,6 +357,11 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4047570355474788538, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &544673480 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4255233373611660780, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} + m_PrefabInstance: {fileID: 4255233374537296698} + m_PrefabAsset: {fileID: 0} --- !u!1 &565357678 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8821623529969584324, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} @@ -509,10 +514,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 52e2c0daeb1e2f641935e8e907dd1a9b, type: 3} m_Name: m_EditorClassIdentifier: - targetObject: {fileID: 7726711925996169486} - cameraOffset: {x: -1.5, y: 5, z: -18} - smoothFactor: 0.5 - lookAtTarget: 1 + cameraOffset: {x: -0.71, y: 0, z: -13.27} _cameraYPosition: 45 --- !u!1001 &777919482 PrefabInstance: @@ -800,6 +802,117 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6239881831769578202, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &954622452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 954622453} + - component: {fileID: 954622456} + - component: {fileID: 954622455} + - component: {fileID: 954622454} + - component: {fileID: 954622457} + m_Layer: 0 + m_Name: To Mountain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &954622453 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954622452} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -21.71, y: -3.74, z: -8.33} + m_LocalScale: {x: 4.9663115, y: 0.49663115, z: 4.9663115} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2082247706} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &954622454 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954622452} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &954622455 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954622452} + 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 &954622456 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954622452} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &954622457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954622452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f7cf3b0e87656149a3acee1198cb0e0, type: 3} + m_Name: + m_EditorClassIdentifier: + scene: Mountain --- !u!1 &960119718 stripped GameObject: m_CorrespondingSourceObject: {fileID: -817925072480010518, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} @@ -975,7 +1088,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalPosition.x @@ -1021,10 +1134,6 @@ PrefabInstance: propertyPath: m_Name value: SingletonManager objectReference: {fileID: 0} - - target: {fileID: 3584299649035273207, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: BackgroundMusic - value: - objectReference: {fileID: 1817080298} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} --- !u!1 &1260112086 stripped @@ -1145,7 +1254,7 @@ GameObject: - component: {fileID: 1350757413} - component: {fileID: 1350757412} m_Layer: 0 - m_Name: Sphere + m_Name: To Temple m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1521,9 +1630,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3} m_Name: m_EditorClassIdentifier: - _player: {fileID: 0} - _playerPrefab: {fileID: 6949365539638014900} - _spawnLocation: {fileID: 6871527874556698274, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3} + Player: {fileID: 0} + _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3} + _spawnLocation: {fileID: 544673480} --- !u!4 &1617146419 Transform: m_ObjectHideFlags: 0 @@ -1670,7 +1779,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1775691383 MonoBehaviour: @@ -1728,7 +1837,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1921331804 stripped GameObject: @@ -1864,41 +1973,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1350757411} + - {fileID: 954622453} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &100578909981352309 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2242378972001291675} - m_Layer: 3 - m_Name: footUpper.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &489631560430002374 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5522369426549929037} - m_Layer: 3 - m_Name: footLower.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &549891546759081644 GameObject: m_ObjectHideFlags: 0 @@ -1909,7 +1987,6 @@ GameObject: m_Component: - component: {fileID: 5226704616502216479} - component: {fileID: 7471959759673995188} - - component: {fileID: 6685013563550260642} - component: {fileID: 679170038} m_Layer: 0 m_Name: WorldMapCamera @@ -1918,232 +1995,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &741529496522054690 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3307697696803658192} - m_Layer: 3 - m_Name: tween.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &868465941509666705 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1327168430209755862} - m_Layer: 3 - m_Name: legLower.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &913824955770415092 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1965463523831461493} - m_Layer: 3 - m_Name: BASE - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &942893408741635034 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1696202148362942864} - - component: {fileID: 2766921631674576505} - - component: {fileID: 8343511731746854910} - m_Layer: 3 - m_Name: Armature - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1327168430209755862 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 868465941509666705} - m_LocalRotation: {x: -0.17913254, y: -0.00068839773, z: 0.07249591, w: 0.9811501} - m_LocalPosition: {x: -2.2351741e-10, y: 0.007018339, z: 1.6298145e-10} - m_LocalScale: {x: 1.0000008, y: 1.0000001, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2242378972001291675} - m_Father: {fileID: 6652114554427844064} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1650636547496703751 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5873774405144390898} - m_Layer: 3 - m_Name: tail7 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1696202148362942864 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942893408741635034} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6710507912602182226} - m_Father: {fileID: 7726711925996169486} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1965463523831461493 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913824955770415092} - m_LocalRotation: {x: -0.005244123, y: -0.0000003139122, z: 0.0000000016462165, w: 0.9999863} - m_LocalPosition: {x: -0.0016283506, y: -0.0028404184, z: -0.01490103} - m_LocalScale: {x: 1, y: 1, z: 0.99999994} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7083985933822359072} - m_Father: {fileID: 6710507912602182226} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2059077242933221753 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3199417660577892354} - m_Layer: 3 - m_Name: tail4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &2142013003448556742 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8014010973838442639} - m_Layer: 3 - m_Name: knee.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2242378972001291675 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 100578909981352309} - m_LocalRotation: {x: 0.0500009, y: -0.0030695829, z: -0.10298955, w: 0.9934202} - m_LocalPosition: {x: -3.202331e-10, y: 0.004596097, z: 1.862645e-10} - m_LocalScale: {x: 1, y: 1.0000001, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5522369426549929037} - m_Father: {fileID: 1327168430209755862} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2359784478551071312 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2392774704602887165} - m_Layer: 3 - m_Name: tail1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2392774704602887165 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2359784478551071312} - m_LocalRotation: {x: -0.6957175, y: -0.017872615, z: 0.016950062, w: 0.71789306} - m_LocalPosition: {x: 0.0002835852, y: 0.00084874936, z: -0.0032038975} - m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6581695361673234704} - m_Father: {fileID: 7083985933822359072} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &2394760432514068894 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8752248120440109873} - m_LocalRotation: {x: 0.05189458, y: -0.020570938, z: 0.10204847, w: 0.9932119} - m_LocalPosition: {x: -2.7692293e-10, y: 0.0045960974, z: 3.04135e-11} - m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6926374915013361031} - m_Father: {fileID: 7613678625139616986} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2485690312226532337 PrefabInstance: m_ObjectHideFlags: 0 @@ -2206,413 +2057,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3} m_PrefabInstance: {fileID: 2485690312226532337} m_PrefabAsset: {fileID: 0} ---- !u!4 &2493267243652647653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8728036934905331167} - m_LocalRotation: {x: 0.11876045, y: 0.011406302, z: -0.01800643, w: 0.99269414} - m_LocalPosition: {x: 7.4505804e-11, y: 0.0011612521, z: -7.45058e-10} - m_LocalScale: {x: 1.0000001, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5873774405144390898} - m_Father: {fileID: 3555729486353597694} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2752533608625989679 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5524351644234235449} - - component: {fileID: 3052278830202393153} - m_Layer: 3 - m_Name: guy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2766921631674576505 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942893408741635034} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3dc835db21e8a7244a1e4ca279799cd6, type: 3} - m_Name: - m_EditorClassIdentifier: - grassStep: - audioClip: {fileID: 0} - pitchMin: 0 - pitchMax: 0 - volumeMin: 0 - volumeMax: 0 - templeStep: - audioClip: {fileID: 0} - pitchMin: 0 - pitchMax: 0 - volumeMin: 0 - volumeMax: 0 - sandStep: - audioClip: {fileID: 0} - pitchMin: 0 - pitchMax: 0 - volumeMin: 0 - volumeMax: 0 - audioSource: {fileID: 8343511731746854910} ---- !u!137 &3052278830202393153 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2752533608625989679} - 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: 3 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 6719245597448002910, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - - {fileID: -8863482124825134610, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - - {fileID: -7402678110970815514, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - - {fileID: 3426583105778912102, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - 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 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: -3285829343988091788, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - m_Bones: - - {fileID: 6710507912602182226} - - {fileID: 5219313948897174668} - - {fileID: 8014010973838442639} - - {fileID: 6990576957352109783} - - {fileID: 3805680127763400912} - - {fileID: 1965463523831461493} - - {fileID: 7083985933822359072} - - {fileID: 6652114554427844064} - - {fileID: 1327168430209755862} - - {fileID: 2242378972001291675} - - {fileID: 5522369426549929037} - - {fileID: 8554613827624298900} - - {fileID: 3307697696803658192} - - {fileID: 5719527601179723573} - - {fileID: 6418342486111642071} - - {fileID: 8754648254418464147} - - {fileID: 2392774704602887165} - - {fileID: 6581695361673234704} - - {fileID: 3419277190627279172} - - {fileID: 3199417660577892354} - - {fileID: 3555729486353597694} - - {fileID: 2493267243652647653} - - {fileID: 5873774405144390898} - - {fileID: 7738189314038806904} - - {fileID: 3997386720659313157} - - {fileID: 9061592991067281561} - - {fileID: 8399137118164969114} - - {fileID: 9067110422972181348} - - {fileID: 5475383673912119799} - - {fileID: 7613678625139616986} - - {fileID: 2394760432514068894} - - {fileID: 6926374915013361031} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 6710507912602182226} - m_AABB: - m_Center: {x: -0.001643748, y: -0.0019878487, z: -0.014948057} - m_Extent: {x: 0.014469312, y: 0.009668684, z: 0.017142138} - m_DirtyAABB: 0 ---- !u!1 &3074455860140980642 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5475383673912119799} - m_Layer: 3 - m_Name: legUpper.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &3184557568497208743 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3419277190627279172} - m_Layer: 3 - m_Name: tail3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3199417660577892354 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2059077242933221753} - m_LocalRotation: {x: 0.09560003, y: 0.009181876, z: -0.014494844, w: 0.995272} - m_LocalPosition: {x: -7.4505804e-11, y: 0.0012692743, z: -1.862645e-10} - m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3555729486353597694} - m_Father: {fileID: 3419277190627279172} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &3249946306315907139 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &3307697696803658192 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 741529496522054690} - m_LocalRotation: {x: -0.0000006752887, y: 0.0000000137752485, z: 0.9931299, w: 0.11701704} - m_LocalPosition: {x: -2.4980017e-18, y: 0.012373335, z: -1.7763568e-17} - m_LocalScale: {x: 0.99999976, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5719527601179723573} - m_Father: {fileID: 8554613827624298900} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &3419277190627279172 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3184557568497208743} - m_LocalRotation: {x: 0.14094262, y: 0.013536767, z: -0.021369671, w: 0.98969454} - m_LocalPosition: {x: 9.3132255e-12, y: 0.0013097831, z: -3.7252902e-11} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3199417660577892354} - m_Father: {fileID: 6581695361673234704} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &3555729486353597694 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6932287492418187531} - m_LocalRotation: {x: 0.07905232, y: 0.0075925477, z: -0.011985896, w: 0.99676955} - m_LocalPosition: {x: 1.862645e-10, y: 0.0014313105, z: 8.1956386e-10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2493267243652647653} - m_Father: {fileID: 3199417660577892354} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &3805680127763400912 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8680235200476064782} - m_LocalRotation: {x: 0.9876926, y: 6.607506e-10, z: -0.04896644, w: 0.14854535} - m_LocalPosition: {x: -0.00005306337, y: -0.012092744, z: -0.0010703295} - m_LocalScale: {x: 1, y: 1, z: 1.0000011} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6990576957352109783} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3872929934971837910 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9061592991067281561} - m_Layer: 3 - m_Name: tail10 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3997386720659313157 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5961171141441902736} - m_LocalRotation: {x: 0.08505018, y: 0.008168606, z: -0.012895286, w: 0.99625975} - m_LocalPosition: {x: 2.2351741e-10, y: 0.0013052833, z: 5.3085386e-10} - m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9061592991067281561} - m_Father: {fileID: 7738189314038806904} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4094318121248264724 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7083985933822359072} - m_Layer: 3 - m_Name: pelvis - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1001 &4255233374537296698 PrefabInstance: m_ObjectHideFlags: 0 @@ -2620,9 +2064,13 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1286079015} m_Modifications: + - target: {fileID: 4255233373611660771, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4255233373611660780, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} propertyPath: m_Name - value: Snow A To World Map + value: Mountain A To World Map objectReference: {fileID: 0} - target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} propertyPath: m_RootOrder @@ -2630,15 +2078,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} propertyPath: m_LocalPosition.x - value: 15.6 + value: 16.57 objectReference: {fileID: 0} - target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} propertyPath: m_LocalPosition.y - value: 34.962 + value: 35.82 objectReference: {fileID: 0} - target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} propertyPath: m_LocalPosition.z - value: -27.64 + value: -26.96 objectReference: {fileID: 0} - target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} propertyPath: m_LocalRotation.w @@ -2670,70 +2118,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} ---- !u!1 &4953790283971455427 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6652114554427844064} - m_Layer: 3 - m_Name: legUpper.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &4954176913119329336 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6926374915013361031} - m_Layer: 3 - m_Name: footLower.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &5081829931018530669 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6990576957352109783} - m_Layer: 3 - m_Name: ik-leg.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5219313948897174668 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7075691392997779476} - m_LocalRotation: {x: -0.024482083, y: 0.15081573, z: 0.9882516, w: -0.0037361484} - m_LocalPosition: {x: -0.0023761387, y: -0.00043886248, z: -0.0041216314} - m_LocalScale: {x: 1, y: 0.9999996, z: 0.99999696} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8014010973838442639} - m_Father: {fileID: 6710507912602182226} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &5226704616502216479 Transform: m_ObjectHideFlags: 0 @@ -2747,254 +2131,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: -1.383, z: 0} ---- !u!1 &5290235514121750977 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5719527601179723573} - m_Layer: 3 - m_Name: ear.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &5422073359998852674 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6581695361673234704} - m_Layer: 3 - m_Name: tail2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &5447282556692245914 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6418342486111642071} - m_Layer: 3 - m_Name: tween.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5475383673912119799 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3074455860140980642} - m_LocalRotation: {x: 0.04553886, y: 0.0074582403, z: 0.99214953, w: -0.11623187} - m_LocalPosition: {x: 0.0012910846, y: 0.0005881012, z: -0.0000005316734} - m_LocalScale: {x: 0.99996054, y: 0.99999917, z: 0.999995} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7613678625139616986} - m_Father: {fileID: 7083985933822359072} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &5522369426549929037 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 489631560430002374} - m_LocalRotation: {x: 0.41784534, y: 0.18244319, z: -0.12606981, w: 0.88103706} - m_LocalPosition: {x: 1.6065314e-10, y: 0.002616764, z: 1.2107193e-10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2242378972001291675} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &5524351644234235449 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2752533608625989679} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0.55316055, z: 0} - m_LocalScale: {x: 0.94472885, y: 0.94472885, z: 0.94472885} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7726711925996169486} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &5719527601179723573 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5290235514121750977} - m_LocalRotation: {x: 0.0003686165, y: 0.0003957917, z: -0.6806629, w: 0.7325966} - m_LocalPosition: {x: 1.0835777e-15, y: 0.007839521, z: 4.973799e-16} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3307697696803658192} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &5873774405144390898 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1650636547496703751} - m_LocalRotation: {x: 0.0715128, y: 0.0068684164, z: -0.01084275, w: 0.99735713} - m_LocalPosition: {x: 2.2351741e-10, y: 0.0012962809, z: -7.45058e-10} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7738189314038806904} - m_Father: {fileID: 2493267243652647653} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5961171141441902736 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3997386720659313157} - m_Layer: 3 - m_Name: tail9 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &6340134094770291448 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3dc835db21e8a7244a1e4ca279799cd6, type: 3} - m_Name: - m_EditorClassIdentifier: - grassStep: - audioClip: {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3} - pitchMin: 0 - pitchMax: 0 - volumeMin: 0.6 - volumeMax: 0.8 - templeStep: - audioClip: {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3} - pitchMin: 0.7 - pitchMax: 1.1 - volumeMin: 0.6 - volumeMax: 1 - sandStep: - audioClip: {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3} - pitchMin: 0 - pitchMax: 0 - volumeMin: 0 - volumeMax: 0 - audioSource: {fileID: 3249946306315907139} ---- !u!4 &6418342486111642071 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5447282556692245914} - m_LocalRotation: {x: -0.0000006586442, y: -0.00000014339737, z: 0.9931299, w: -0.11701704} - m_LocalPosition: {x: -2.4980017e-18, y: 0.012373335, z: -1.7763568e-17} - m_LocalScale: {x: 0.99999976, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8754648254418464147} - m_Father: {fileID: 8554613827624298900} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &6581695361673234704 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5422073359998852674} - m_LocalRotation: {x: 0.13256858, y: -0.14360605, z: 0.00600586, w: 0.9806971} - m_LocalPosition: {x: 3.1141097e-11, y: 0.0021672184, z: 4.6566128e-12} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3419277190627279172} - m_Father: {fileID: 2392774704602887165} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &6652114554427844064 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4953790283971455427} - m_LocalRotation: {x: 0.007564412, y: 0.0727435, z: 0.9973128, w: 0.0042864583} - m_LocalPosition: {x: -0.0012910845, y: 0.0005881012, z: -0.00000053167344} - m_LocalScale: {x: 0.99996126, y: 0.9999998, z: 0.9999937} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1327168430209755862} - m_Father: {fileID: 7083985933822359072} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &6685013563550260642 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 549891546759081644} - m_Enabled: 1 ---- !u!4 &6710507912602182226 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420555658527061560} - m_LocalRotation: {x: 0.9999863, y: 0, z: 0, w: -0.005244007} - m_LocalPosition: {x: 0.0000078912, y: -0.00042302613, z: -0.01590823} - m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999999} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1965463523831461493} - - {fileID: 5219313948897174668} - - {fileID: 6990576957352109783} - m_Father: {fileID: 1696202148362942864} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &6871527873662044849 PrefabInstance: m_ObjectHideFlags: 0 @@ -3006,6 +2144,10 @@ PrefabInstance: propertyPath: m_Name value: Temple A To World Map objectReference: {fileID: 0} + - target: {fileID: 6871527874556698276, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3} propertyPath: m_RootOrder value: 0 @@ -3052,175 +2194,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3} ---- !u!1 &6892088942429993088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8554613827624298900} - m_Layer: 3 - m_Name: HEAD - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6926374915013361031 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4954176913119329336} - m_LocalRotation: {x: 0.42236057, y: -0.17889898, z: 0.10999964, w: 0.8817635} - m_LocalPosition: {x: -6.519258e-11, y: 0.002616763, z: 5.5879353e-11} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2394760432514068894} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6932287492418187531 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3555729486353597694} - m_Layer: 3 - m_Name: tail5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &6949365539638014900 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7726711925996169486} - - component: {fileID: 7831886136720144165} - - component: {fileID: 8519787472397417066} - - component: {fileID: 7831886136720144155} - - component: {fileID: 7831886136720144154} - - component: {fileID: 9124306866224365096} - - component: {fileID: 6340134094770291448} - - component: {fileID: 3249946306315907139} - m_Layer: 3 - m_Name: WorldMapPlayer - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6990576957352109783 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5081829931018530669} - m_LocalRotation: {x: 0.024482083, y: 0.15081573, z: 0.9882516, w: 0.0037361484} - m_LocalPosition: {x: 0.0023603563, y: -0.00043886248, z: -0.0041216314} - m_LocalScale: {x: 1, y: 0.9999996, z: 0.99999696} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3805680127763400912} - m_Father: {fileID: 6710507912602182226} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7075691392997779476 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5219313948897174668} - m_Layer: 3 - m_Name: ik-leg.l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7083985933822359072 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4094318121248264724} - m_LocalRotation: {x: -0.7071067, y: 0.00000022197246, z: 0.00000022197243, w: 0.7071068} - m_LocalPosition: {x: 1.8119976e-11, y: 0.0022609541, z: -2.570337e-11} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8554613827624298900} - - {fileID: 6652114554427844064} - - {fileID: 5475383673912119799} - - {fileID: 2392774704602887165} - m_Father: {fileID: 1965463523831461493} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7146378079216813872 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9067110422972181348} - m_Layer: 3 - m_Name: tail12 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &7354810528696083740 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8399137118164969114} - m_Layer: 3 - m_Name: tail11 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &7420555658527061560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6710507912602182226} - m_Layer: 3 - m_Name: root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!20 &7471959759673995188 Camera: m_ObjectHideFlags: 0 @@ -3264,417 +2237,3 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &7613678625139616986 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8019480055862504241} - m_LocalRotation: {x: -0.0023885712, y: 0.008634832, z: -0.0009596637, w: 0.9999594} - m_LocalPosition: {x: 1.5512341e-10, y: 0.007018339, z: -2.0954757e-11} - m_LocalScale: {x: 0.99999905, y: 1.0000001, z: 1.0000004} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2394760432514068894} - m_Father: {fileID: 5475383673912119799} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &7726711925996169486 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - 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: 1 - m_Children: - - {fileID: 1696202148362942864} - - {fileID: 5524351644234235449} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &7738189314038806904 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8091614540905006425} - m_LocalRotation: {x: 0.1793865, y: 0.017229099, z: -0.02719853, w: 0.9832517} - m_LocalPosition: {x: 1.4901161e-10, y: 0.0013052833, z: 7.4505804e-11} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3997386720659313157} - m_Father: {fileID: 5873774405144390898} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7831886136720144154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 05cf47d54a6d28d47b5d9b54e95d2751, type: 3} - m_Name: - m_EditorClassIdentifier: - Speed: 8 - RotateSpeed: 720 ---- !u!114 &7831886136720144155 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e12a799f5a50bc34a94898baf2917b7b, type: 3} - m_Name: - m_EditorClassIdentifier: - rayCastDistance: 4 - rayCastAngle: 60 - sphereRadius: 1 ---- !u!143 &7831886136720144165 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 3 - m_Radius: 1 - m_SlopeLimit: 75 - m_StepOffset: 1 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} ---- !u!4 &8014010973838442639 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2142013003448556742} - m_LocalRotation: {x: 0.9876926, y: -6.607506e-10, z: 0.04896644, w: 0.14854535} - m_LocalPosition: {x: 0.00005306337, y: -0.012092744, z: -0.0010703295} - m_LocalScale: {x: 1, y: 1, z: 1.0000011} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5219313948897174668} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8019480055862504241 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7613678625139616986} - m_Layer: 3 - m_Name: legLower.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8091614540905006425 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7738189314038806904} - m_Layer: 3 - m_Name: tail8 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &8343511731746854910 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942893408741635034} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &8399137118164969114 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7354810528696083740} - m_LocalRotation: {x: 0.11433403, y: 0.01098116, z: -0.0173353, w: 0.9932304} - m_LocalPosition: {x: -3.288733e-10, y: 0.0013390393, z: 0.0000000015133992} - m_LocalScale: {x: 0.9999999, y: 0.99999994, z: 0.9999999} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9067110422972181348} - m_Father: {fileID: 9061592991067281561} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &8519787472397417066 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 25774ba084a08a647804a07356ecfc7c, 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!4 &8554613827624298900 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6892088942429993088} - m_LocalRotation: {x: -3.1150252e-10, y: 0.000000020934669, z: -0.16930735, w: 0.9855633} - m_LocalPosition: {x: -0, y: 0.001525086, z: -4.2934078e-18} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3307697696803658192} - - {fileID: 6418342486111642071} - m_Father: {fileID: 7083985933822359072} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8587978179214501012 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8754648254418464147} - m_Layer: 3 - m_Name: ear.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8680235200476064782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3805680127763400912} - m_Layer: 3 - m_Name: knee.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8728036934905331167 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2493267243652647653} - m_Layer: 3 - m_Name: tail6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8752248120440109873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2394760432514068894} - m_Layer: 3 - m_Name: footUpper.r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8754648254418464147 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8587978179214501012} - m_LocalRotation: {x: 0.00036859183, y: -0.00039773318, z: 0.68066293, w: 0.7325965} - m_LocalPosition: {x: 1.4901289e-10, y: 0.007839521, z: 2.842171e-16} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6418342486111642071} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &9061592991067281561 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3872929934971837910} - m_LocalRotation: {x: 0.06751043, y: 0.0064840117, z: -0.0102359075, w: 0.997645} - m_LocalPosition: {x: 7.4505804e-11, y: 0.0012377682, z: -2.910383e-10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8399137118164969114} - m_Father: {fileID: 3997386720659313157} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &9067110422972181348 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7146378079216813872} - m_LocalRotation: {x: 0.11852669, y: 0.011383837, z: -0.017970975, w: 0.992723} - m_LocalPosition: {x: -2.6077032e-10, y: 0.0012602723, z: 7.4505804e-11} - m_LocalScale: {x: 0.99999994, y: 1, z: 0.9999999} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8399137118164969114} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9124306866224365096 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949365539638014900} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d14f1a4437a41724c91591bb70a63248, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Scripts/Animation/LevelChanger.cs b/Assets/Scripts/Animation/LevelChanger.cs index 8c8174c..b952028 100644 --- a/Assets/Scripts/Animation/LevelChanger.cs +++ b/Assets/Scripts/Animation/LevelChanger.cs @@ -9,7 +9,7 @@ namespace Scampz.GameJam public void FadeAnimation() { - //animator.SetTrigger("FadeOut"); + animator.SetTrigger("Start"); } } } diff --git a/Assets/Scripts/Camera/ActivateCamera.cs b/Assets/Scripts/Camera/ActivateCamera.cs index 4e3c1a2..4dd6765 100644 --- a/Assets/Scripts/Camera/ActivateCamera.cs +++ b/Assets/Scripts/Camera/ActivateCamera.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System.Collections; +using UnityEngine; namespace Scampz.GameJam.Assets.Scripts { @@ -9,15 +10,13 @@ namespace Scampz.GameJam.Assets.Scripts private void OnTriggerEnter(Collider collider) { - var allCamerasInCurrentScene = FindObjectsOfType(); - foreach (var sceneCamera in allCamerasInCurrentScene) - sceneCamera.enabled = false; - if (collider.CompareTag("Player")) - { - foreach (var camera in cameras) - camera.enabled = true; - } + StartCoroutine(ActivateCameras()); + } + + private IEnumerator ActivateCameras() + { + yield return null; } } } diff --git a/Assets/Scripts/Camera/CameraFollow.cs b/Assets/Scripts/Camera/CameraFollow.cs index 32faa7d..ef3c9b7 100644 --- a/Assets/Scripts/Camera/CameraFollow.cs +++ b/Assets/Scripts/Camera/CameraFollow.cs @@ -4,27 +4,16 @@ namespace Scampz.GameJam { public class CameraFollow : MonoBehaviour { - [SerializeField] - private Transform targetObject; [SerializeField] private Vector3 cameraOffset; [SerializeField] - private float smoothFactor = 0.5f; - [SerializeField] - private bool lookAtTarget = false; - [SerializeField] private float _cameraYPosition = 45f; - private void Start() + private void FixedUpdate() { - transform.position = targetObject.transform.position - cameraOffset; - } - - private void LateUpdate() - { - var lockedInYPosition = new Vector3(targetObject.transform.position.x - cameraOffset.x, _cameraYPosition, targetObject.transform.position.z - cameraOffset.z); + var player = GameObject.FindGameObjectWithTag("Player"); + var lockedInYPosition = new Vector3(player.transform.position.x - cameraOffset.x, _cameraYPosition, player.transform.position.z - cameraOffset.z); transform.position = lockedInYPosition; - transform.LookAt(transform); } } } diff --git a/Assets/Scripts/GameManager/GameManager.cs b/Assets/Scripts/GameManager/GameManager.cs index 779176b..9265ac4 100644 --- a/Assets/Scripts/GameManager/GameManager.cs +++ b/Assets/Scripts/GameManager/GameManager.cs @@ -7,7 +7,7 @@ namespace Scampz.GameJam public class GameManager : MonoBehaviour { public static GameManager Instance; - //private LevelChanger _levelChanger; + private LevelChanger _levelChanger; private void Awake() { @@ -18,7 +18,7 @@ namespace Scampz.GameJam } Instance = this; - //_levelChanger = GetComponentInChildren(); + _levelChanger = GetComponentInChildren(); } @@ -29,7 +29,9 @@ namespace Scampz.GameJam private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode) { - yield return null; + _levelChanger.FadeAnimation(); + yield return new WaitForSecondsRealtime(3f); + var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); loadSceneOperation.allowSceneActivation = false; while (!loadSceneOperation.isDone) diff --git a/Assets/Scripts/GameManager/PlayerSpawnController.cs b/Assets/Scripts/GameManager/PlayerSpawnController.cs index 42b77af..3ea1329 100644 --- a/Assets/Scripts/GameManager/PlayerSpawnController.cs +++ b/Assets/Scripts/GameManager/PlayerSpawnController.cs @@ -13,7 +13,6 @@ public class PlayerSpawnController : MonoBehaviour Player = Instantiate(_playerPrefab); Player.transform.position = _spawnLocation.transform.position; Player.transform.rotation = _spawnLocation.transform.rotation; - DontDestroyOnLoad(Player); } } \ No newline at end of file diff --git a/Assets/Scripts/Input/UseGroundChecking.cs b/Assets/Scripts/Input/UseGroundChecking.cs deleted file mode 100644 index 193fb93..0000000 --- a/Assets/Scripts/Input/UseGroundChecking.cs +++ /dev/null @@ -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(); - var player = playerSpawnController.Player; - var rayCaster = player.GetComponent(); - rayCaster.enabled = useGroundChecking; - } - } - } -} diff --git a/Assets/Scripts/Input/UseGroundChecking.cs.meta b/Assets/Scripts/Input/UseGroundChecking.cs.meta deleted file mode 100644 index ffd4d1c..0000000 --- a/Assets/Scripts/Input/UseGroundChecking.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e569519f096090547aafb2a539705467 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SceneManagement/TeleportPlayer.cs b/Assets/Scripts/SceneManagement/TeleportPlayer.cs index cf03757..6507263 100644 --- a/Assets/Scripts/SceneManagement/TeleportPlayer.cs +++ b/Assets/Scripts/SceneManagement/TeleportPlayer.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System.Collections; +using UnityEngine; namespace Scampz.GameJam.Assets.Scripts.SceneManagement { @@ -6,18 +7,38 @@ namespace Scampz.GameJam.Assets.Scripts.SceneManagement { [SerializeField] private Transform _spawnPoint; + [SerializeField] + private Camera[] camerasToActivate; private void OnTriggerEnter(Collider collider) { if (collider.CompareTag("Player")) { - var player = GameObject.FindGameObjectWithTag("Player"); - var cc = player.GetComponent(); - cc.enabled = false; - player.transform.position = _spawnPoint.position; - player.transform.rotation = _spawnPoint.rotation; - cc.enabled = true; + StartCoroutine(LoadNextLevel()); } } + + private IEnumerator LoadNextLevel() + { + var levelChanger = FindObjectOfType(); + levelChanger.FadeAnimation(); + yield return null; + yield return new WaitForSeconds(3.0f); + var player = GameObject.FindGameObjectWithTag("Player"); + player.SetActive(false); + var cc = player.GetComponent(); + cc.enabled = false; + player.transform.position = _spawnPoint.position; + player.transform.rotation = _spawnPoint.rotation; + cc.enabled = true; + yield return null; + var allCamerasInCurrentScene = FindObjectsOfType(); + foreach (var sceneCamera in allCamerasInCurrentScene) + sceneCamera.enabled = false; + foreach (var camera in camerasToActivate) + camera.enabled = true; + player.SetActive(true); + yield return null; + } } } diff --git a/Assets/Singleton/SingletonManager.prefab b/Assets/Singleton/SingletonManager.prefab index e4e75bf..26ea085 100644 --- a/Assets/Singleton/SingletonManager.prefab +++ b/Assets/Singleton/SingletonManager.prefab @@ -1,5 +1,262 @@ %YAML 1.1 %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 GameObject: m_ObjectHideFlags: 0 @@ -203,8 +460,6 @@ 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 @@ -240,39 +495,6 @@ 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 @@ -306,6 +528,7 @@ Transform: - {fileID: 3584299648992395886} - {fileID: 3584299649380910131} - {fileID: 4605870207825934367} + - {fileID: 1523210320} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -512,7 +735,6 @@ MonoBehaviour: m_EditorClassIdentifier: _animator: {fileID: 992122626} _dialogueTextGUI: {fileID: 36671747401237298} - _defaultTextSpeed: 0.1 IsTalking: 0 --- !u!82 &8281504758914613877 AudioSource: diff --git a/Assets/SpawnPoints/Snow A To World Map.prefab b/Assets/SpawnPoints/Snow A To World Map.prefab index aaa4565..e324db8 100644 --- a/Assets/SpawnPoints/Snow A To World Map.prefab +++ b/Assets/SpawnPoints/Snow A To World Map.prefab @@ -49,7 +49,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4255233373611660780} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index f87cafc..b908d00 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,24 +8,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/WorldMap.unity 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 path: Assets/Scenes/Temple.unity guid: 47f46a65c6a9c8f4aa201e9b549862c6