diff --git a/Assets/Scenes/BaseScene.unity b/Assets/Scenes/BaseScene.unity index aaf5d61..cdd75a1 100644 --- a/Assets/Scenes/BaseScene.unity +++ b/Assets/Scenes/BaseScene.unity @@ -530,8 +530,73 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &984933985 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalPosition.x + value: -94.7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalPosition.y + value: 17 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalPosition.z + value: 2041 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.49229085 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0082955705 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalRotation.y + value: 0.87026846 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalRotation.z + value: -0.014619638 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_Name + value: zscamp + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 25774ba084a08a647804a07356ecfc7c, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} --- !u!1 &1146950388 GameObject: m_ObjectHideFlags: 0 @@ -658,7 +723,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 &1155087354 GameObject: @@ -1114,7 +1179,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1529631650 GameObject: @@ -1146,7 +1211,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1529631652 AudioSource: @@ -1244,432 +1309,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1001 &1616869271 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8936662915076299308, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalPosition.x - value: 99.4 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalPosition.y - value: 75.2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalPosition.z - value: -4002.3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalRotation.w - value: 0.68185794 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7314846 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 94.022 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8457201792415929351, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8321495095878352914, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8178091452995197199, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -7654349456735570476, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -7481858892885570454, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -7135036068415632452, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -6495664172983269596, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -6472901777028512744, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -6372769342367674201, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -6336823103227844826, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -5542263650748451227, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -5491797191467294006, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -4752943147450919307, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -4171780612800514233, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -3854372878954649910, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -3742542376984406859, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -2903442259486870075, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -2297121653656721135, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -2252613596853913228, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -1550373254802444765, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -1309103771977093232, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -1143002648105199716, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -407488064208061982, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 741808593568725213, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Name - value: main guy NO TAIL - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_TagString - value: Player - objectReference: {fileID: 0} - - target: {fileID: 1125189680483043797, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1496902749836305131, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1553818472520004410, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1990259349311269489, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2821734335913747327, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2914030534685422301, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3041684121135178120, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3552917097803291005, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4648173097540977474, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5110369099885796516, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 6719245597448002910, guid: be309ea0408dde94f847f8652a016bfa, type: 3} - - target: {fileID: 5110369099885796516, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: -8863482124825134610, guid: be309ea0408dde94f847f8652a016bfa, type: 3} - - target: {fileID: 5110369099885796516, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Materials.Array.data[2] - value: - objectReference: {fileID: -7402678110970815514, guid: be309ea0408dde94f847f8652a016bfa, type: 3} - - target: {fileID: 5110369099885796516, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Materials.Array.data[3] - value: - objectReference: {fileID: 3426583105778912102, guid: be309ea0408dde94f847f8652a016bfa, type: 3} - - target: {fileID: 5836408523566088756, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6080284256566336753, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6417378453489898291, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7036213049465896255, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7420247560260948679, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8145190420312904227, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8569524280027945864, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} ---- !u!1 &1616869272 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - m_PrefabInstance: {fileID: 1616869271} - m_PrefabAsset: {fileID: 0} ---- !u!95 &1616869273 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616869272} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: d08a11f3c6ed72a4c9cce89f2517e097, type: 3} - m_Controller: {fileID: 9100000, guid: 1b07e714861fe674995e2d57201756cf, 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!143 &1616869275 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616869272} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 2.5 - m_Radius: 0.5 - m_SlopeLimit: 90 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: -0.5, z: 0} ---- !u!114 &1616869276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616869272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 492ccac425c363548b6f9be7835cbc6a, type: 3} - m_Name: - m_EditorClassIdentifier: - Speed: 30 - RotateSpeed: 0.5 ---- !u!114 &1616869278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616869272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3dc835db21e8a7244a1e4ca279799cd6, type: 3} - m_Name: - m_EditorClassIdentifier: - grassStep: {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3} - templeStep: {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3} - sandStep: {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3} - audioSource: {fileID: 1616869279} ---- !u!82 &1616869279 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616869272} - 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!1 &1839310345 GameObject: m_ObjectHideFlags: 0 @@ -1944,7 +1583,7 @@ RectTransform: - {fileID: 329640572} - {fileID: 1171907736} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2189,3 +1828,152 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6689462114757999464 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3} + m_PrefabInstance: {fileID: 984933985} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6689462114757999465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689462114757999464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dc835db21e8a7244a1e4ca279799cd6, type: 3} + m_Name: + m_EditorClassIdentifier: + grassStep: {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3} + templeStep: {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3} + sandStep: {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3} + audioSource: {fileID: 0} +--- !u!114 &6689462114757999466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689462114757999464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 492ccac425c363548b6f9be7835cbc6a, type: 3} + m_Name: + m_EditorClassIdentifier: + Speed: 30 + RotateSpeed: 0.5 +--- !u!82 &6689462114757999467 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689462114757999464} + 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!143 &6689462114757999468 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689462114757999464} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 2.5 + m_Radius: 0.5 + m_SlopeLimit: 90 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.5, z: 0} diff --git a/Assets/Scenes/TempleA.unity b/Assets/Scenes/Temple/TempleA.unity similarity index 84% rename from Assets/Scenes/TempleA.unity rename to Assets/Scenes/Temple/TempleA.unity index 72c09f2..c6400ed 100644 --- a/Assets/Scenes/TempleA.unity +++ b/Assets/Scenes/Temple/TempleA.unity @@ -291,6 +291,68 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &308872690 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1218502425} + m_Modifications: + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalPosition.x + value: -1703.9132 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalPosition.y + value: 15.217169 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalPosition.z + value: -1169.2153 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.w + value: 0.86802125 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000008646809 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.y + value: 0.49652714 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000015116221 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5511731137256522041, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_Name + value: WorldMapTempleSpawn + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} +--- !u!4 &308872691 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + m_PrefabInstance: {fileID: 308872690} + m_PrefabAsset: {fileID: 0} --- !u!1001 &500660188 PrefabInstance: m_ObjectHideFlags: 0 @@ -530,6 +592,119 @@ Transform: m_Father: {fileID: 293610884} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1218502421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1218502425} + - component: {fileID: 1218502424} + - component: {fileID: 1218502423} + - component: {fileID: 1218502422} + - component: {fileID: 1218502426} + m_Layer: 0 + m_Name: ToWorldMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1218502422 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218502421} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 100, y: 100, z: 20} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1218502423 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218502421} + 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 &1218502424 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218502421} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1218502425 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218502421} + m_LocalRotation: {x: -0.000008646809, y: -0.49652714, z: 0.000015116221, w: 0.86802125} + m_LocalPosition: {x: -116, y: 19.782175, z: 2056} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 308872691} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: -59.541, z: 0.002} +--- !u!114 &1218502426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218502421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e6d9a426a8d6e57489b2cd44e9ee79e1, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnPoint: {fileID: 308872691} + scene: WorldMap --- !u!64 &1355668034 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TempleB.unity b/Assets/Scenes/Temple/TempleB.unity similarity index 98% rename from Assets/Scenes/TempleB.unity rename to Assets/Scenes/Temple/TempleB.unity index 021cf87..212f7cd 100644 --- a/Assets/Scenes/TempleB.unity +++ b/Assets/Scenes/Temple/TempleB.unity @@ -574,24 +574,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 832d86e1123494b4fbb6df828bb1512f, type: 3} ---- !u!1 &969049081 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5268505398859674628, guid: 832d86e1123494b4fbb6df828bb1512f, type: 3} - m_PrefabInstance: {fileID: 969049080} - m_PrefabAsset: {fileID: 0} ---- !u!114 &969049082 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 969049081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6a15b9faa55177745bfc9aa5c273dd2a, type: 3} - m_Name: - m_EditorClassIdentifier: - scene: TempleC --- !u!1001 &1864713634 PrefabInstance: m_ObjectHideFlags: 0 @@ -877,7 +859,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a15b9faa55177745bfc9aa5c273dd2a, type: 3} m_Name: m_EditorClassIdentifier: - scene: 0 + scene: TempleA --- !u!1001 &3739636451633463118 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TempleC.unity b/Assets/Scenes/Temple/TempleC.unity similarity index 99% rename from Assets/Scenes/TempleC.unity rename to Assets/Scenes/Temple/TempleC.unity index 4d894d5..79b11d7 100644 --- a/Assets/Scenes/TempleC.unity +++ b/Assets/Scenes/Temple/TempleC.unity @@ -318,27 +318,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8204319871629574049, guid: fcc610cb1a1eda742b01eb6d81b8e4be, type: 3} propertyPath: m_LocalRotation.w - value: -0.7154622 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8204319871629574049, guid: fcc610cb1a1eda742b01eb6d81b8e4be, type: 3} propertyPath: m_LocalRotation.x - value: 0.010510414 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8204319871629574049, guid: fcc610cb1a1eda742b01eb6d81b8e4be, type: 3} propertyPath: m_LocalRotation.y - value: -0.698497 + value: -0.9998922 objectReference: {fileID: 0} - target: {fileID: 8204319871629574049, guid: fcc610cb1a1eda742b01eb6d81b8e4be, type: 3} propertyPath: m_LocalRotation.z - value: -0.010263026 + value: -0.0146863265 objectReference: {fileID: 0} - target: {fileID: 8204319871629574049, guid: fcc610cb1a1eda742b01eb6d81b8e4be, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -1.683 objectReference: {fileID: 0} - target: {fileID: 8204319871629574049, guid: fcc610cb1a1eda742b01eb6d81b8e4be, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -180 objectReference: {fileID: 0} - target: {fileID: 8204319871629574049, guid: fcc610cb1a1eda742b01eb6d81b8e4be, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -670,19 +670,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3124016421593227009, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124016421593227009, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124016421593227009, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3124016421593227009, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124016421593227009, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -690,7 +690,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3124016421593227009, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 3124016421593227009, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -698,7 +698,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3124016421593227013, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: scene - value: TempleD + value: TempleSanctum objectReference: {fileID: 0} - target: {fileID: 3124016421593227013, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: sceneIndex @@ -850,7 +850,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.x @@ -858,7 +858,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.z @@ -870,7 +870,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -907,7 +907,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a15b9faa55177745bfc9aa5c273dd2a, type: 3} m_Name: m_EditorClassIdentifier: - scene: TempleD + scene: TempleSanctum --- !u!1001 &5353799689149836086 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TempleD.unity b/Assets/Scenes/Temple/TempleSanctum.unity similarity index 99% rename from Assets/Scenes/TempleD.unity rename to Assets/Scenes/Temple/TempleSanctum.unity index f5443a3..32615c7 100644 --- a/Assets/Scenes/TempleD.unity +++ b/Assets/Scenes/Temple/TempleSanctum.unity @@ -352,7 +352,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.x @@ -360,7 +360,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalRotation.z @@ -372,7 +372,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 6211219502105168093, guid: 02d4f68a2743c2f4fb1b479a45973c3b, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/Assets/Scenes/WorldMap.unity b/Assets/Scenes/WorldMap.unity index 2bb4951..3c47cd3 100644 --- a/Assets/Scenes/WorldMap.unity +++ b/Assets/Scenes/WorldMap.unity @@ -425,8 +425,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 353649658} - m_LocalRotation: {x: -0.0023236433, y: 0.55255604, z: 0.00081902323, w: 0.83347213} - m_LocalPosition: {x: 30, y: 35.7, z: -14.3} + m_LocalRotation: {x: -0.0017626067, y: 0.15015484, z: 0.0017214346, w: 0.98865944} + m_LocalPosition: {x: 37.69, y: 34.69, z: -10.98} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: @@ -435,7 +435,7 @@ Transform: - {fileID: 134360703} m_Father: {fileID: 0} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: -0.274, y: 67.085, z: -0.069} + m_LocalEulerAnglesHint: {x: -0.229, y: 17.272, z: 0.165} --- !u!143 &353649664 CharacterController: m_ObjectHideFlags: 0 @@ -2893,3 +2893,107 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1001 &9087790729299159286 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalPosition.x + value: 37.11 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalPosition.y + value: 34.94 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalPosition.z + value: -11.265 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 912914381368423871, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5511731137256522041, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_Name + value: WorldMapTempleSpawn + objectReference: {fileID: 0} + - target: {fileID: 7834781336015973420, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_Size.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7834781336015973420, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_Size.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7834781336015973420, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_Size.z + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7834781336015973420, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} +--- !u!1 &9087790729299159287 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5511731137256522041, guid: f4b72fa024b04614fbaa7b387b850911, type: 3} + m_PrefabInstance: {fileID: 9087790729299159286} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9087790729299159288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9087790729299159287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a15b9faa55177745bfc9aa5c273dd2a, type: 3} + m_Name: + m_EditorClassIdentifier: + scene: TempleA +--- !u!114 &9087790729299159289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9087790729299159287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a15b9faa55177745bfc9aa5c273dd2a, type: 3} + m_Name: + m_EditorClassIdentifier: + scene: BaseScene diff --git a/Assets/Scripts/BGMManager.cs b/Assets/Scripts/BGMManager.cs index 3126c22..4228a0c 100644 --- a/Assets/Scripts/BGMManager.cs +++ b/Assets/Scripts/BGMManager.cs @@ -1,4 +1,7 @@ -using UnityEngine; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.SceneManagement; namespace Scampz.GameJam.Assets.Scripts { @@ -18,6 +21,24 @@ namespace Scampz.GameJam.Assets.Scripts Instance = this; } + public void PlaySong() + { + audioSource.Stop(); + + var sceneCount = SceneManager.sceneCount; + var scenes = new List(); + + for (var i = 0; i < sceneCount; ++i) + scenes.Add(SceneManager.GetSceneAt(i)); + + if (scenes.Any(x => x.name.Contains("Temple"))) + audioSource.clip = backgroundMusic[0]; + if (scenes.Any(x => x.name.Contains("Sanctum"))) + audioSource.clip = backgroundMusic[1]; + + audioSource.Play(); + } + } } diff --git a/Assets/Scripts/BaseSceneManager.cs b/Assets/Scripts/BaseSceneManager.cs index 33b8acd..27b9585 100644 --- a/Assets/Scripts/BaseSceneManager.cs +++ b/Assets/Scripts/BaseSceneManager.cs @@ -8,7 +8,7 @@ namespace Scampz.GameJam { void Start() { - GameManager.Instance.LoadScene(SceneNames.TempleC, LoadSceneMode.Additive); + GameManager.Instance.LoadScene(SceneNames.TempleA, LoadSceneMode.Additive); } } } diff --git a/Assets/Scripts/SceneNames.cs b/Assets/Scripts/SceneNames.cs index 0010038..850d359 100644 --- a/Assets/Scripts/SceneNames.cs +++ b/Assets/Scripts/SceneNames.cs @@ -8,10 +8,12 @@ public static string TempleC => "TempleC"; - public static string TempleD => "TempleD"; + public static string TempleSanctum => "TempleSanctum"; public static string TitleScreenScene => "TitleScreen"; public static string BaseScene => "BaseScene"; + + public static string WorldMap => "WorldMap"; } } diff --git a/Assets/SpawnPoints/WorldMapTempleSpawn.prefab b/Assets/SpawnPoints/WorldMapTempleSpawn.prefab new file mode 100644 index 0000000..6d52de4 --- /dev/null +++ b/Assets/SpawnPoints/WorldMapTempleSpawn.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5511731137256522041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 912914381368423871} + - component: {fileID: 2540135985126737440} + - component: {fileID: 3801528142558614558} + - component: {fileID: 7834781336015973420} + m_Layer: 0 + m_Name: WorldMapTempleSpawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &912914381368423871 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5511731137256522041} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 37.11, y: 34.94, z: -11.265} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2540135985126737440 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5511731137256522041} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3801528142558614558 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5511731137256522041} + 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!65 &7834781336015973420 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5511731137256522041} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index cf48c0f..2fd8e59 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,16 +6,16 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/TempleA.unity + path: Assets/Scenes/Temple/TempleA.unity guid: c6a70898e2b6d9f4485bdca0c0afba8c - enabled: 1 - path: Assets/Scenes/TempleB.unity + path: Assets/Scenes/Temple/TempleB.unity guid: daf9b0324f60aac4c99fcf52002405e1 - enabled: 1 - path: Assets/Scenes/TempleC.unity + path: Assets/Scenes/Temple/TempleC.unity guid: fcd4b3031ff239848af0ff7f5d351aa3 - enabled: 1 - path: Assets/Scenes/TempleD.unity + path: Assets/Scenes/Temple/TempleSanctum.unity guid: 3e61d4e4cd3f85540908dac3592aca4f - enabled: 1 path: Assets/Scenes/WorldMap.unity