From 9a245d94c75407a3ba4aaad3da893d3c8e4de228 Mon Sep 17 00:00:00 2001 From: Zenny Date: Mon, 15 Aug 2022 15:40:04 -0700 Subject: [PATCH] Re-think singleton player idea, add raycasting to stop from falling off ledges --- .../{Scripts/Character.meta => Player.meta} | 2 +- .../Model.meta} | 0 .../Model}/PlayerModel.controller | 0 .../Model}/PlayerModel.controller.meta | 0 .../Model}/PlayerModel.fbx | 0 .../Model}/PlayerModel.fbx.meta | 0 Assets/Scenes/Temple/TempleB.unity | 300 ++++++++++++++++++ Assets/Scenes/Temple/TempleC.unity | 184 ++++++++++- Assets/Scenes/Temple/TempleSanctum.unity | 287 ++++++----------- Assets/Scenes/World Map/WorldMap.unity | 32 +- Assets/Scripts/Audio/BGMManager.cs | 19 +- Assets/Scripts/Dialogue/Dialogue.meta | 8 - Assets/Scripts/Dialogue/DialogueManager.cs | 19 +- Assets/Scripts/GameManager/GameManager.cs | 17 +- .../CharacterInputController.cs | 12 +- .../CharacterInputController.cs.meta | 2 +- Assets/Scripts/Input/InputManager.cs | 15 - Assets/Scripts/Input/RayCaster.cs | 22 ++ ...InputManager.cs.meta => RayCaster.cs.meta} | 2 +- Assets/Scripts/Scenes/SingletonManager.cs | 13 - .../Scripts/Scenes/SingletonManager.cs.meta | 11 - ...ngleton.prefab => SingletonManager.prefab} | 155 +-------- ...efab.meta => SingletonManager.prefab.meta} | 0 23 files changed, 661 insertions(+), 439 deletions(-) rename Assets/{Scripts/Character.meta => Player.meta} (77%) rename Assets/{Character Models.meta => Player/Model.meta} (100%) rename Assets/{Character Models => Player/Model}/PlayerModel.controller (100%) rename Assets/{Character Models => Player/Model}/PlayerModel.controller.meta (100%) rename Assets/{Character Models => Player/Model}/PlayerModel.fbx (100%) rename Assets/{Character Models => Player/Model}/PlayerModel.fbx.meta (100%) delete mode 100644 Assets/Scripts/Dialogue/Dialogue.meta rename Assets/Scripts/{Character => Input}/CharacterInputController.cs (59%) rename Assets/Scripts/{Character => Input}/CharacterInputController.cs.meta (83%) delete mode 100644 Assets/Scripts/Input/InputManager.cs create mode 100644 Assets/Scripts/Input/RayCaster.cs rename Assets/Scripts/Input/{InputManager.cs.meta => RayCaster.cs.meta} (83%) delete mode 100644 Assets/Scripts/Scenes/SingletonManager.cs delete mode 100644 Assets/Scripts/Scenes/SingletonManager.cs.meta rename Assets/Singleton/{Singleton.prefab => SingletonManager.prefab} (53%) rename Assets/Singleton/{Singleton.prefab.meta => SingletonManager.prefab.meta} (100%) diff --git a/Assets/Scripts/Character.meta b/Assets/Player.meta similarity index 77% rename from Assets/Scripts/Character.meta rename to Assets/Player.meta index c998ac3..4d70244 100644 --- a/Assets/Scripts/Character.meta +++ b/Assets/Player.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f9f232ff3b526024b8abc7198b211a10 +guid: d663a02202c9c0842a272ca3c108e343 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Character Models.meta b/Assets/Player/Model.meta similarity index 100% rename from Assets/Character Models.meta rename to Assets/Player/Model.meta diff --git a/Assets/Character Models/PlayerModel.controller b/Assets/Player/Model/PlayerModel.controller similarity index 100% rename from Assets/Character Models/PlayerModel.controller rename to Assets/Player/Model/PlayerModel.controller diff --git a/Assets/Character Models/PlayerModel.controller.meta b/Assets/Player/Model/PlayerModel.controller.meta similarity index 100% rename from Assets/Character Models/PlayerModel.controller.meta rename to Assets/Player/Model/PlayerModel.controller.meta diff --git a/Assets/Character Models/PlayerModel.fbx b/Assets/Player/Model/PlayerModel.fbx similarity index 100% rename from Assets/Character Models/PlayerModel.fbx rename to Assets/Player/Model/PlayerModel.fbx diff --git a/Assets/Character Models/PlayerModel.fbx.meta b/Assets/Player/Model/PlayerModel.fbx.meta similarity index 100% rename from Assets/Character Models/PlayerModel.fbx.meta rename to Assets/Player/Model/PlayerModel.fbx.meta diff --git a/Assets/Scenes/Temple/TempleB.unity b/Assets/Scenes/Temple/TempleB.unity index 5e6f6e1..9efd660 100644 --- a/Assets/Scenes/Temple/TempleB.unity +++ b/Assets/Scenes/Temple/TempleB.unity @@ -856,6 +856,121 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1202705515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1202705520} + - component: {fileID: 1202705519} + - component: {fileID: 1202705518} + - component: {fileID: 1202705517} + - component: {fileID: 1202705516} + m_Layer: 0 + m_Name: Additional Wall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!54 &1202705516 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1202705515} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1202705517 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1202705515} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1202705518 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1202705515} + 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 &1202705519 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1202705515} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1202705520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1202705515} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 30.16, y: 20.088358, z: -22.2} + m_LocalScale: {x: 3.4607766, y: 3.4607766, z: 3.86822} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1983498954} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!64 &1245741803 MeshCollider: m_ObjectHideFlags: 0 @@ -1006,6 +1121,11 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!4 &1983498954 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4c88c808114e5ed4f847bc9020d6d14d, type: 3} + m_PrefabInstance: {fileID: 590303671} + m_PrefabAsset: {fileID: 0} --- !u!64 &1985122467 MeshCollider: m_ObjectHideFlags: 0 @@ -1133,6 +1253,62 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 191421781300405256, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1132614529121076248, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1470212332987815241, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1599514017621476042, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1627257314007560466, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1851799116907509067, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1859224544651911344, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1984897892368757733, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2606942213250507095, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2628892940074264505, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2701012525469053062, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3036323209669769244, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3262506042743216593, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3584299648161773333, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_SlopeLimit + value: 80 + objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_RootOrder value: 4 @@ -1181,5 +1357,129 @@ PrefabInstance: propertyPath: m_Name value: Singleton objectReference: {fileID: 0} + - target: {fileID: 3584299649369559659, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: Speed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3584299649369559659, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: RotateSpeed + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3622976468931491769, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalScale.x + value: 2.78 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalScale.y + value: 2.78 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalScale.z + value: 2.78 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.x + value: -14.5 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.y + value: -6.1 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.z + value: -29.20583 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4259286276449679764, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4320803028191161008, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4411805553781190019, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4430579254357913404, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4476727047306763192, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4556632016483447964, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4662485664712917070, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4728428520250869233, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5468973352663149455, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5771464040372711250, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5836918366571621145, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5882547242217519996, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6289275084056740010, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6612984335370894414, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6658814509636173309, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7339882073013063324, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7544345460647395678, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8159499173479043375, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8621901968422675754, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8880950872368542887, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 9057350192525035224, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} diff --git a/Assets/Scenes/Temple/TempleC.unity b/Assets/Scenes/Temple/TempleC.unity index d1b62e1..37097ba 100644 --- a/Assets/Scenes/Temple/TempleC.unity +++ b/Assets/Scenes/Temple/TempleC.unity @@ -2225,37 +2225,101 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 191421781300405256, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1132614529121076248, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1470212332987815241, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1599514017621476042, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1627257314007560466, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1851799116907509067, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1859224544651911344, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1984897892368757733, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2606942213250507095, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2628892940074264505, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2701012525469053062, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3036323209669769244, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3262506042743216593, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalScale.x + value: 2.3734448 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalScale.y + value: 2.3734448 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalScale.z + value: 2.3734448 + objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalPosition.x - value: 39.765285 + value: 196.27 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalPosition.y - value: 36.31613 + value: 31.04 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalPosition.z - value: -13.348324 + value: -194.06 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.78522784 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.6192069 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2263,16 +2327,120 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -76.516 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3584299649024768175, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_Name value: Singleton objectReference: {fileID: 0} + - target: {fileID: 3622976468931491769, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.x + value: 88.99 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.y + value: 7.06 + objectReference: {fileID: 0} + - target: {fileID: 3906667029809575302, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.z + value: 9.8 + objectReference: {fileID: 0} + - target: {fileID: 4259286276449679764, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4320803028191161008, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4411805553781190019, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4430579254357913404, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4476727047306763192, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4556632016483447964, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4662485664712917070, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4728428520250869233, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5468973352663149455, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5771464040372711250, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5836918366571621145, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5882547242217519996, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6289275084056740010, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6612984335370894414, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6658814509636173309, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7339882073013063324, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7544345460647395678, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8159499173479043375, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8621901968422675754, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8880950872368542887, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 9057350192525035224, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} --- !u!64 &1031880337 diff --git a/Assets/Scenes/Temple/TempleSanctum.unity b/Assets/Scenes/Temple/TempleSanctum.unity index 455b6d0..63c7f3c 100644 --- a/Assets/Scenes/Temple/TempleSanctum.unity +++ b/Assets/Scenes/Temple/TempleSanctum.unity @@ -222,203 +222,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &393575676 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 191421781300405256, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1132614529121076248, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1470212332987815241, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1599514017621476042, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1627257314007560466, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1851799116907509067, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1859224544651911344, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1984897892368757733, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 2606942213250507095, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 2628892940074264505, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 2701012525469053062, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 3036323209669769244, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 3262506042743216593, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalPosition.x - value: 4.19 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalPosition.y - value: 49.69 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalPosition.z - value: -24.57 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3584299649024768175, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Name - value: Singleton - objectReference: {fileID: 0} - - target: {fileID: 3622976468931491769, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4259286276449679764, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4320803028191161008, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4411805553781190019, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4430579254357913404, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4476727047306763192, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4556632016483447964, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4662485664712917070, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4728428520250869233, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5468973352663149455, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5771464040372711250, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5836918366571621145, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5882547242217519996, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 6289275084056740010, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 6612984335370894414, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 6658814509636173309, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 7339882073013063324, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 7544345460647395678, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8159499173479043375, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8621901968422675754, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8880950872368542887, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 9057350192525035224, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} --- !u!1 &633364550 GameObject: m_ObjectHideFlags: 0 @@ -738,3 +541,93 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1884696862 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.x + value: 39.765285 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.y + value: 36.31613 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.z + value: -13.348324 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768175, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Name + value: Singleton + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 3584299649369559659, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} +--- !u!1 &1884696863 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4430579254357913404, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + m_PrefabInstance: {fileID: 1884696862} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1884696864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1884696863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e12a799f5a50bc34a94898baf2917b7b, type: 3} + m_Name: + m_EditorClassIdentifier: + rayCastDistance: 10 +--- !u!114 &1884696865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1884696863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05cf47d54a6d28d47b5d9b54e95d2751, type: 3} + m_Name: + m_EditorClassIdentifier: + Speed: 10 + RotateSpeed: 1 diff --git a/Assets/Scenes/World Map/WorldMap.unity b/Assets/Scenes/World Map/WorldMap.unity index 74cf72a..583b422 100644 --- a/Assets/Scenes/World Map/WorldMap.unity +++ b/Assets/Scenes/World Map/WorldMap.unity @@ -357,8 +357,8 @@ GameObject: m_Component: - component: {fileID: 353649663} - component: {fileID: 353649661} - - component: {fileID: 353649664} - component: {fileID: 353649665} + - component: {fileID: 353649666} m_Layer: 7 m_Name: Player m_TagString: Untagged @@ -425,20 +425,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -0.229, y: 17.272, z: 0.165} ---- !u!114 &353649664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353649658} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 98567cc44adfaf2418a60d67d5fe5fb0, type: 3} - m_Name: - m_EditorClassIdentifier: - Speed: 5 - RotateSpeed: 1 --- !u!143 &353649665 CharacterController: m_ObjectHideFlags: 0 @@ -453,10 +439,24 @@ CharacterController: m_Height: 3.2 m_Radius: 1 m_SlopeLimit: 45 - m_StepOffset: 0.3 + m_StepOffset: 0.8 m_SkinWidth: 0.08 m_MinMoveDistance: 0.001 m_Center: {x: 0, y: -0.2, z: -4} +--- !u!114 &353649666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353649658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05cf47d54a6d28d47b5d9b54e95d2751, type: 3} + m_Name: + m_EditorClassIdentifier: + Speed: 10 + RotateSpeed: 1 --- !u!1 &565357678 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8821623529969584324, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} diff --git a/Assets/Scripts/Audio/BGMManager.cs b/Assets/Scripts/Audio/BGMManager.cs index 4455db2..d918a72 100644 --- a/Assets/Scripts/Audio/BGMManager.cs +++ b/Assets/Scripts/Audio/BGMManager.cs @@ -7,18 +7,27 @@ namespace Scampz.GameJam.Assets.Scripts { public class BGMManager : MonoBehaviour { - public static BGMManager Instance { get; private set; } - [SerializeField] private AudioSource audioSource; [SerializeField] private AudioClip[] backgroundMusic; - private void Awake() + private static BGMManager _instance; + + public static BGMManager Instance { - if (Instance == null) - Instance = this; + get + { + if (!_instance) + { + _instance = new GameObject().AddComponent(); + _instance.name = _instance.GetType().ToString(); + DontDestroyOnLoad(_instance.gameObject); + } + + return _instance; + } } public void PlaySong() diff --git a/Assets/Scripts/Dialogue/Dialogue.meta b/Assets/Scripts/Dialogue/Dialogue.meta deleted file mode 100644 index e7e60f7..0000000 --- a/Assets/Scripts/Dialogue/Dialogue.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bcdc358652295014e9f9d90638ab5d0d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Dialogue/DialogueManager.cs b/Assets/Scripts/Dialogue/DialogueManager.cs index 1a4a15e..6fef953 100644 --- a/Assets/Scripts/Dialogue/DialogueManager.cs +++ b/Assets/Scripts/Dialogue/DialogueManager.cs @@ -12,14 +12,23 @@ namespace Scampz.GameJam private TextMeshProUGUI dialogueTextGUI; public float TextSpeed = 0.1f; - public static DialogueManager Instance { get; private set; } - public Queue sentences; - private void Awake() + private static DialogueManager _instance; + + public static DialogueManager Instance { - if (Instance == null) - Instance = this; + get + { + if (!_instance) + { + _instance = new GameObject().AddComponent(); + _instance.name = _instance.GetType().ToString(); + DontDestroyOnLoad(_instance.gameObject); + } + + return _instance; + } } public void Start() diff --git a/Assets/Scripts/GameManager/GameManager.cs b/Assets/Scripts/GameManager/GameManager.cs index 1b3b944..1122adf 100644 --- a/Assets/Scripts/GameManager/GameManager.cs +++ b/Assets/Scripts/GameManager/GameManager.cs @@ -6,17 +6,24 @@ namespace Scampz.GameJam { public class GameManager : MonoBehaviour { - public static GameManager Instance; public Animator animator; - void Awake() + private static GameManager _instance; + + public static GameManager Instance { - if (Instance == null) + get { - Instance = this; + if (!_instance) + { + _instance = new GameObject().AddComponent(); + _instance.name = _instance.GetType().ToString(); + DontDestroyOnLoad(_instance.gameObject); + } + + return _instance; } } - void OnEnable() { //SceneManager.sceneLoaded += OnSceneLoaded; diff --git a/Assets/Scripts/Character/CharacterInputController.cs b/Assets/Scripts/Input/CharacterInputController.cs similarity index 59% rename from Assets/Scripts/Character/CharacterInputController.cs rename to Assets/Scripts/Input/CharacterInputController.cs index c16207b..3fbe203 100644 --- a/Assets/Scripts/Character/CharacterInputController.cs +++ b/Assets/Scripts/Input/CharacterInputController.cs @@ -5,22 +5,28 @@ namespace Scampz.GameJam.Assets.Scripts public class CharacterInputController : MonoBehaviour { private CharacterController _controller; + private RayCaster _caster; public float Speed = 10f; public float RotateSpeed = 1.0f; private void Start() { _controller = GetComponent(); + _caster = _controller.GetComponent(); } void Update() { // Rotation transform.Rotate(0, Input.GetAxis(InputOptions.Horizontal) * RotateSpeed, 0); + // Move - var forward = transform.TransformDirection(Vector3.forward); - var curSpeed = Speed * Input.GetAxis(InputOptions.Vertical); - _controller.SimpleMove(forward * curSpeed); + if (_caster.IsWithinBounds()) + { + var forward = transform.TransformDirection(Vector3.forward); + var curSpeed = Speed * Input.GetAxis(InputOptions.Vertical); + _controller.SimpleMove(forward * curSpeed); + } } } } diff --git a/Assets/Scripts/Character/CharacterInputController.cs.meta b/Assets/Scripts/Input/CharacterInputController.cs.meta similarity index 83% rename from Assets/Scripts/Character/CharacterInputController.cs.meta rename to Assets/Scripts/Input/CharacterInputController.cs.meta index 317cb7e..d79d1f3 100644 --- a/Assets/Scripts/Character/CharacterInputController.cs.meta +++ b/Assets/Scripts/Input/CharacterInputController.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 98567cc44adfaf2418a60d67d5fe5fb0 +guid: 05cf47d54a6d28d47b5d9b54e95d2751 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Input/InputManager.cs b/Assets/Scripts/Input/InputManager.cs deleted file mode 100644 index 3339bbd..0000000 --- a/Assets/Scripts/Input/InputManager.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine; - -namespace Scampz.GameJam.Assets.Scripts -{ - public class InputManager : MonoBehaviour - { - public static InputManager Instance { get; private set; } - - private void Awake() - { - if (Instance == null) - Instance = this; - } - } -} diff --git a/Assets/Scripts/Input/RayCaster.cs b/Assets/Scripts/Input/RayCaster.cs new file mode 100644 index 0000000..320967b --- /dev/null +++ b/Assets/Scripts/Input/RayCaster.cs @@ -0,0 +1,22 @@ +using UnityEngine; + +namespace Scampz.GameJam.Assets.Scripts +{ + public class RayCaster : MonoBehaviour + { + [SerializeField] + private float rayCastDistance = 1f; + + public bool IsWithinBounds() + { + var offsetAngle = Quaternion.AngleAxis(45, transform.right); + return Physics.Raycast(transform.position, offsetAngle * transform.forward); + } + + private void OnDrawGizmosSelected() + { + var offsetAngle = Quaternion.AngleAxis(45, transform.right); + Debug.DrawRay(transform.position, offsetAngle * transform.forward * rayCastDistance); + } + } +} diff --git a/Assets/Scripts/Input/InputManager.cs.meta b/Assets/Scripts/Input/RayCaster.cs.meta similarity index 83% rename from Assets/Scripts/Input/InputManager.cs.meta rename to Assets/Scripts/Input/RayCaster.cs.meta index 4d80004..8e30c6a 100644 --- a/Assets/Scripts/Input/InputManager.cs.meta +++ b/Assets/Scripts/Input/RayCaster.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b39191ac21e3c3c46b862363cf286165 +guid: e12a799f5a50bc34a94898baf2917b7b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Scenes/SingletonManager.cs b/Assets/Scripts/Scenes/SingletonManager.cs deleted file mode 100644 index 2819d2e..0000000 --- a/Assets/Scripts/Scenes/SingletonManager.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UnityEngine; -using UnityEngine.SceneManagement; - -namespace Scampz.GameJam.Assets.Scripts -{ - public class SingletonManager : MonoBehaviour - { - void Start() - { - GameManager.Instance.LoadScene(SceneNames.TempleA, LoadSceneMode.Single); - } - } -} diff --git a/Assets/Scripts/Scenes/SingletonManager.cs.meta b/Assets/Scripts/Scenes/SingletonManager.cs.meta deleted file mode 100644 index 5770a57..0000000 --- a/Assets/Scripts/Scenes/SingletonManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 438ec7acec4f7004682b7953c3b96401 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Singleton/Singleton.prefab b/Assets/Singleton/SingletonManager.prefab similarity index 53% rename from Assets/Singleton/Singleton.prefab rename to Assets/Singleton/SingletonManager.prefab index 08de5e9..6f17c4e 100644 --- a/Assets/Singleton/Singleton.prefab +++ b/Assets/Singleton/SingletonManager.prefab @@ -1,49 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3584299648849070154 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3584299648849070152} - - component: {fileID: 3584299648849070155} - m_Layer: 0 - m_Name: Singleton Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3584299648849070152 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3584299648849070154} - 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: 3584299649024768172} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3584299648849070155 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3584299648849070154} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 438ec7acec4f7004682b7953c3b96401, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3584299648992395873 GameObject: m_ObjectHideFlags: 0 @@ -74,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3584299649024768172} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3584299648992395887 MonoBehaviour: @@ -99,7 +55,7 @@ GameObject: m_Component: - component: {fileID: 3584299649024768172} m_Layer: 0 - m_Name: Singleton + m_Name: SingletonManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -117,12 +73,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3584299648849070152} - {fileID: 3584299649035273204} - {fileID: 3584299648992395886} - {fileID: 3584299649380910131} - {fileID: 3584299649216310805} - - {fileID: 3906667029809575302} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -156,7 +110,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3584299649024768172} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3584299649035273207 MonoBehaviour: @@ -204,7 +158,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3584299649024768172} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3584299649216310802 MonoBehaviour: @@ -249,104 +203,5 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3584299649024768172} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3584299649369559661 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3584299649024768172} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalPosition.x - value: -39.765285 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalPosition.y - value: -36.31613 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalPosition.z - value: 13.348324 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - propertyPath: m_Name - value: PlayerModel - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} ---- !u!4 &3906667029809575302 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - m_PrefabInstance: {fileID: 3584299649369559661} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4430579254357913404 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: eb3105b5c8151a64c83b894b6c496fdb, type: 3} - m_PrefabInstance: {fileID: 3584299649369559661} - m_PrefabAsset: {fileID: 0} ---- !u!143 &3584299648161773333 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4430579254357913404} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 2 - m_Radius: 0.5 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &3584299649369559659 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4430579254357913404} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 98567cc44adfaf2418a60d67d5fe5fb0, type: 3} - m_Name: - m_EditorClassIdentifier: - Speed: 10 - RotateSpeed: 1 diff --git a/Assets/Singleton/Singleton.prefab.meta b/Assets/Singleton/SingletonManager.prefab.meta similarity index 100% rename from Assets/Singleton/Singleton.prefab.meta rename to Assets/Singleton/SingletonManager.prefab.meta