From b907cdcd9b046e2a0aed1814d31115a54578668d Mon Sep 17 00:00:00 2001 From: Zenny Date: Wed, 31 Aug 2022 22:56:09 -0700 Subject: [PATCH] Bug Fixes from v1.0 - Fix lighting on desert - Move dialogue radius to correct spot - Disable movement while talking to NPCs - Move desert spawn point a little bit --- Assets/Scenes/Airship.meta | 8 + Assets/Scenes/Airship.unity | 439 +++++++++++++++++- Assets/Scenes/Airship/LightingData.asset | Bin 0 -> 18192 bytes Assets/Scenes/Airship/LightingData.asset.meta | 8 + Assets/Scenes/Airship/ReflectionProbe-0.exr | 3 + .../Scenes/Airship/ReflectionProbe-0.exr.meta | 98 ++++ Assets/Scenes/Mountain.unity | 40 +- Assets/Scenes/Temple.unity | 98 ++++ Assets/Scenes/TitleScreen.unity | 125 ++++- Assets/Scenes/WorldMap.unity | 2 +- Assets/Scripts/Animation/LevelChanger.cs | 12 + Assets/Scripts/Dialogue/DialogueManager.cs | 4 + Assets/Scripts/Dialogue/PromptDialogue.cs | 8 +- Assets/Scripts/GameManager/GameManager.cs | 5 +- .../Scripts/Input/CharacterInputController.cs | 10 + Assets/Scripts/Player/TalkedToVoid.cs | 2 +- Assets/Scripts/TitleScreen/TitleScreen.cs | 11 +- Assets/Singleton/SingletonManager.prefab | 4 +- ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/TagManager.asset | 1 + 20 files changed, 828 insertions(+), 52 deletions(-) create mode 100644 Assets/Scenes/Airship.meta create mode 100644 Assets/Scenes/Airship/LightingData.asset create mode 100644 Assets/Scenes/Airship/LightingData.asset.meta create mode 100644 Assets/Scenes/Airship/ReflectionProbe-0.exr create mode 100644 Assets/Scenes/Airship/ReflectionProbe-0.exr.meta diff --git a/Assets/Scenes/Airship.meta b/Assets/Scenes/Airship.meta new file mode 100644 index 0000000..8b631cf --- /dev/null +++ b/Assets/Scenes/Airship.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 015eaf7503a4c8441a198bd2ba9ca929 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Airship.unity b/Assets/Scenes/Airship.unity index e1f96be..c44e763 100644 --- a/Assets/Scenes/Airship.unity +++ b/Assets/Scenes/Airship.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 6864b4eb1e1acbf40a57a1a506e1e3ee, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -226,6 +226,11 @@ Transform: m_Father: {fileID: 178155227} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &138018146 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + m_PrefabInstance: {fileID: 1361982760} + m_PrefabAsset: {fileID: 0} --- !u!1 &148242351 GameObject: m_ObjectHideFlags: 0 @@ -832,7 +837,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 338826489} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: @@ -1102,6 +1107,103 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382428140} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &400394926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 400394927} + - component: {fileID: 400394930} + - component: {fileID: 400394929} + - component: {fileID: 400394928} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &400394927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400394926} + m_LocalRotation: {x: -0, y: 0.49368256, z: -0, w: 0.86964214} + m_LocalPosition: {x: -66.2, y: 5.3, z: -244} + m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1378396660} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 59.166, z: 0} +--- !u!65 &400394928 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400394926} + 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} +--- !u!23 &400394929 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400394926} + 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 &400394930 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400394926} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &418943754 GameObject: m_ObjectHideFlags: 0 @@ -2147,6 +2249,103 @@ MonoBehaviour: _scene: WorldMap _promptToEnter: 0 _promptText: {fileID: 0} +--- !u!1 &1007946222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1007946223} + - component: {fileID: 1007946226} + - component: {fileID: 1007946225} + - component: {fileID: 1007946224} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1007946223 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007946222} + m_LocalRotation: {x: -0, y: -0.25153917, z: -0, w: 0.96784717} + m_LocalPosition: {x: -106.2, y: -11, z: -202.8} + m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1378396660} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -29.137, z: 0} +--- !u!65 &1007946224 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007946222} + 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} +--- !u!23 &1007946225 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007946222} + 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 &1007946226 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007946222} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!20 &1051381684 stripped Camera: m_CorrespondingSourceObject: {fileID: -1853094968961178454, guid: 2aea073605c49c44183ba251f4d708b3, type: 3} @@ -2252,7 +2451,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1075144244} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 702.3, y: 256.52673, z: 2627.1} + m_LocalPosition: {x: 687.3, y: 256.52673, z: 2638.7} m_LocalScale: {x: 34.02, y: 7.38, z: 34.02} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2603,7 +2802,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1163178682} m_LocalRotation: {x: 0, y: 0.5, z: 0, w: 0.8660254} - m_LocalPosition: {x: 3.2516403, y: 26.956305, z: -27.744102} + m_LocalPosition: {x: 3.2516403, y: -129, z: -27.744102} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2613,6 +2812,7 @@ Transform: - {fileID: 183386901} - {fileID: 1458446960} - {fileID: 1075144245} + - {fileID: 138018146} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 60, z: 0} @@ -2761,6 +2961,127 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -1550514412580984892, guid: 150291eb022c5b24cae3bc1f64f43aae, type: 3} +--- !u!1001 &1361982760 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1163178683} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalScale.x + value: 6.2178373 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalScale.y + value: 6.2178383 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalScale.z + value: 6.2178373 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalPosition.x + value: 729 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalPosition.y + value: 243.9 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalPosition.z + value: 2641.8 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.45041186 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.050598767 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.8735228 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.17755802 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 20.841 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -124.638 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 4.391 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5824510187379060028, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3215555783603854218, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1018664272722485354, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -391268320553695201, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Name + value: desert + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_TagString + value: MainCamera + objectReference: {fileID: 0} + - target: {fileID: 1365132098506396400, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3735102090226358198, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4424396828587804706, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6809363509681133152, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7861854473326295642, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8208229975827745842, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3} --- !u!1 &1378396659 GameObject: m_ObjectHideFlags: 0 @@ -2794,6 +3115,9 @@ Transform: - {fileID: 200011757} - {fileID: 1430509576} - {fileID: 427392945} + - {fileID: 1007946223} + - {fileID: 1815534398} + - {fileID: 400394927} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} @@ -2848,6 +3172,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -1853094968961178454, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1853094968961178454, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3} propertyPath: m_ClearFlags value: 3 @@ -3635,6 +3963,103 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 3447038591770236762, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3} +--- !u!1 &1815534397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815534398} + - component: {fileID: 1815534401} + - component: {fileID: 1815534400} + - component: {fileID: 1815534399} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1815534398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815534397} + m_LocalRotation: {x: -0, y: -0.49486074, z: -0, w: 0.8689723} + m_LocalPosition: {x: -91.5, y: -11, z: -178} + m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1378396660} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: -59.321, z: 0} +--- !u!65 &1815534399 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815534397} + 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} +--- !u!23 &1815534400 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815534397} + 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 &1815534401 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815534397} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1863585018 GameObject: m_ObjectHideFlags: 0 @@ -4427,15 +4852,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3} propertyPath: m_LocalPosition.x - value: -9.8 + value: -13.61 objectReference: {fileID: 0} - target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3} propertyPath: m_LocalPosition.y - value: 2.6 + value: 1.27 objectReference: {fileID: 0} - target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3} propertyPath: m_LocalPosition.z - value: 39.9 + value: 40.47 objectReference: {fileID: 0} - target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scenes/Airship/LightingData.asset b/Assets/Scenes/Airship/LightingData.asset new file mode 100644 index 0000000000000000000000000000000000000000..845e6ca0c4421d74e690af81148e2ead886e34c6 GIT binary patch literal 18192 zcmdU%dz@9(b;tK*WF-#u&W=aWC$ z?$6wP_SxUF*M6=yc=-Jc0~!Yrq}jr4=; zLG+7<%JG9v^)^3820US2rna?EKKch;NE9jJP}#quDL;`Cin{#%4FNA>n%yc>pmX%^ zWI7&G!4sz1?4|j;n)1;<*h##6!qj;Bcbw%#id_JY>)-K|?f2iwzm@VKf2idYaj29( zjPm{RzWm_z%KO@1p zEDo4Ij6dcF?H^_HKwQB5#O;4HW&7=~_QoG`>~q)t$0;A}9|K;bh(l%jPoez8GeRND z*RNB-%h+<*C)yABW5J8%3#k2`eU1Z9#ktcjvCr|~WlZTB&puBJc*5+byr0t#<9B+% zegAfb)_$&#TQK;=||%|Fa_C{`yJx8dSbWu?v;!=Ss@< zd9^u6{&ghD$GycW%WEli0p)j6+a?o-e`%m!!qhrw(~eJNzFOhan6FXzbmkWX+_i5e zakOu3!2R~EQ@FJ6LWN8FE>gI(Z+*b4%`G&34b(pRGZ$M<5eKZV;G39#mhvm-7vsN; z`?taJS}u)i{r+uKxb!craOvMBg-ib$1MbHE8g5@x!2R|`3YYdZD_q*QS>e(?+{gO* zS8Z;hXM;PreHqIs;(+nHpT_rL;uv?bvx@O|{4wTR75+4Htik^Lx$@s--lp&unP(OL zQ|9do{{{07g&$ykiNfDwo>TaT%<~Gbs&f6ty?#&qKZ1Fu!jEHqslrDx-=^@>n0G0B z3iIxOJO6zSarp1cz>5@dsPx~LQ+^^P6n*vm_Z8q}Z25YU4gU@QbY;NZ{d114IgHp< z3g6Crd%zRsR$>p(5A834BjSMj7d+qXW_~s0`@G7#KfVS$#f6b3|AhNbxj+7#&GY$l zBpdxpQTDX~uQA>9eDO=V2J6#x0q^TQUtDi_kzyATrmuH@d;?|s>r;(gpMFd7F}^oi zUQ4kHD8G~1ChOBpl>u+CL9I-y`u$&?e@IUZRg9xJi zx6#knpT3@d`nxah~9DO~j9&lN8E@pXlZemtmf(T|4|F8cAX!bLy+LgAtx z-%z;d$2S!&`tgXuML!-@xah~X0`C0#IMNUJ|6Slkia5~v7_J0}h8oR%|jINB7j`bzO{I3*VVE&}SuV(&K4;=pWHsbKF ze;sh&es(Kd?B{8Pi~a0TxY*C%C|vAkufoNC{#M~)KhG#!?B_cQ7yEfu;bK4g6fXAj zU4@JNd{5zGKhG&#?C1Lm7yJ2v!o_}`54iKM_pyHL54f)%f2VNKj~5g!`thQ|ML&M1 zaM6#K6fXMl_X-#N_>sazKYpxm(T|@fT=e4~6fXMlvcg3_eyVWMkAGCS=*KGx7ybB| z!bLw`4Y>2KkCA@Bzy1?=ks=P2{`KdS-sU?zjJ#K)&DpV*~ED|2Tz9`;QN}YyXYh{-NN#w0{`*GkW`n zSIEcr4PPbM(61w@*oZ*B)6Z|wHSnJ&RFoI}{Q>h6d*H7TJ4nC7sQgI*clvvX%hxJ= za9>yd$beUyCDis�i;E;3-OQ!29KwY5#CMap>=8@S;$Z@#p_!@Mq%OpZ_u7WlZTR z`+W_@5Ash5?3AcYDc)55mKS}UZNxU8Z`1s*F z0QxJ1O8+t`;J$rMR=C*blz_YT-^A^o3SKN#AGH50@Kl`p<3BBsUuE~lpkIUxzGJ{q z0`wdGznkjE_)o9kOEQ~V3YqNY`RPJ>PCg$M%!(C-+{^_{nL>MRL02Kl<}>Zt*`{s7 z!c1#aKc5mS(uEdE*y~p0qUQ9b`fR?C&NfD~UFNFBC>vQ}C}+>;XlrUqcjS$vP-hHK za(*T!5G7mEP3_y3rt@3rWX|%2sH@PKi}JA|`FZKamIy7&yQ*#J6}k3JQ66>2PUQ?O zSlZqcnN=MvQ7+S%Ze5(twY6t6jrk>YbkW@O)~IPt+onvEEm%SI*(I55l+Kxa%SE*l zFSduIJJh+uBzKtX4pZD=sym$J4%6J>Y7*o`l%$iAbW)N|O43P5Iw?sf zrOrvIb5iP@lsYG+&Pl0rQtC)bdHg$~rj=2)Dau7TI|1H_oz$gKzGb%Qyc9=Mh;q4f zCOf}7n{LZAu3odM!E~8!bD7yDXkJTac59rsLZ@h)>#3G5wj z)0lC?zbYy$PE$KJbr+)iMbu}PpkBKK_1h(==Pp5gcM0mfOHlt^g2vG$Xe3>N#?mD) zDV!?F#?)|LNjfHo^GLorto8Hr#%liZOHl+GJ2}Y&Ae2+Dsx$6(uLM^-sRim^5$mpHfvqJ zJ6T87cXSq-IQt1XA0f1JaRzRzM}#>fdg|OoP0oeq-6y9oeOrn<^mznKsbJx~q*P7VLI&J1kb3`h_`cq1f_n|po-dUh=U`H9x zG9Bpp^2Wy2PPk<|lWt7gB@ga$UQ0Tgjao~N7Cz1TJh8PNGa9-(BGZ=XikhrkYKJY8 z$>VB_j6JT5np;VssdhUJ^Ex+0Wa=?L-0OAdXis90Uz$8#7rgT|Q4T$}%Nm~H=w@y6 zi))UWd(~GSx$2BD``&r=(Cc{h_Hb2s`8$i2J=}8HGDREP2utFpeKL+msZaZ4d=y=S zC6%fqiA9QCz$sG(KCRpp<$d}60{%by zWL)I;56b)U2L$|o|C8~0YSUW!VSWeEF*f`(R(;F{%DRj>wrzY~WpDXE&m506KKF0Q zj{;92a-s5;{Ad9&j@P8PB|D#vLjvwT33!O|p&Q329Iv9lk5%|y=Eo@&rF(N!N;gNYILD(PsoGBu5fgb6+ zSF)!gJLMSSO8YsZjBE=0O_C4$fq$G}b8Bsk2<_WR>|&}P<8!7ZwKhg1d;@dnm@&0B zMkGAVJZVX-jS<0rpnv$J8vUz7W)YDK)PJvklaQTq46$r^$Rj&^eLR4-lWg=4wmBsZ zDUJSP%lS&W2EJ=*z}=STwZ!QU|1`=A=->U+etc35KFy=ZbNnvmXDj?`%%>~-A?7m_ z{%z(n6~3GKEQRl5K3n1VB%1!rISPN7c}n50GoPdI1I*_t{CCXfDg0yR^A+B=k8A$| zg%4)FFyL-WXc%$m|00EtX1+M!PQS+!hkj!%?M=VW1y3Pzp;Euk6Ah9Ku2#6%?;3@R{a&DOv0vOL#e>+t*zdYHq_l9c z-wPEk_Ir`S#eUZ-T00 zO#yfIJAiyN>^BOy+cLa}^|u+kSiXq#+gpD&1Eu2J-!g0|Bb&nd-A=Nx{~Jd8fi(VScH?@yZtSvrXY|G4E3NJIuQk{yuX& zN5zAT??=opk3&ie??Vs9Xx|kI@6Y^7g%4(amBR7L7xK3&{6ywOg^yu=wZczlevQH> zG5?&xr!&7c;Lg715Xbs^9eA;PQKfxf50r{?-@b1sBb$PKUqG^9-;jS}z^ly+@;zI* z{+j|`^&J6^Jix!h|498`h(k(4 zKhgi&x&AK(+^_%kfcy2|(F3Q?1#JBZVs}<>ySwK0F#ouhEoDKxV`dLlGVPi-(AI6b zC2Gp0TQirronUNk_L^x*oVMCB*``dR+jEyB?Tky3w#Fq%d*j)NHkCKE=j;xB`Gl@7 zpHPYN36)uzF61&@le#818``O+q=_a@q+gPLb@ZELq9mOs={!m2Njk5i^Ex`Oqw~5+ zCX-)7ox|4T;?CCAmFez0znkDaVj2Z{FN7^qO4Zx95p?PQ<+llLBb+*9H>s%`*!`w` zPwbB_YtNRZ2Xh)Vd0nIT1$2?!T%Fe*H8;~66nf`CZy|bm&-MTOU6$>oRsYgnxZCWu zBT~*|Jt$?^BBBVTTpG4gI=+1lyQMYGn7NPK1Vc6(Z5;bYs2_i`FY+Y_$GI&y{5zk# z@zVRx&-v2gn{)e?zYC8;Va&RhI?gGiz@-m!bi=-Xyb8S>V1y9bU~JahlsL!W%~*&Q=qU;O)7 zqZ*H&wR_`Td!Bmv!l}E){&>m@LoRswzLvI`vmcrEzcOpo&#swu@+bTE zJpR`Ar|ww4VCwr%z4r9P8y3x+_~5`N-`sLR(); + inputController.EnableActions(); } } } diff --git a/Assets/Scripts/Dialogue/PromptDialogue.cs b/Assets/Scripts/Dialogue/PromptDialogue.cs index e361333..86e3517 100644 --- a/Assets/Scripts/Dialogue/PromptDialogue.cs +++ b/Assets/Scripts/Dialogue/PromptDialogue.cs @@ -1,3 +1,4 @@ +using Scampz.GameJam.Assets.Scripts; using UnityEngine; using UnityEngine.InputSystem; @@ -33,7 +34,9 @@ namespace Scampz.GameJam private void OnTriggerExit(Collider other) { if (other.CompareTag("Player")) + { _isWithinRange = false; + } } private void Update() @@ -41,10 +44,9 @@ namespace Scampz.GameJam if (_isWithinRange && confirmAction.triggered && !DialogueManager.Instance.IsTalking) { var player = GameObject.FindGameObjectWithTag("Player"); - var cc = player.GetComponent(); - cc.enabled = false; + var inputController = player.GetComponent(); + inputController.DisableActions(); _dialogueTrigger.TriggerDialogue(); - cc.enabled = true; } } } diff --git a/Assets/Scripts/GameManager/GameManager.cs b/Assets/Scripts/GameManager/GameManager.cs index c31e14f..3bf9a1e 100644 --- a/Assets/Scripts/GameManager/GameManager.cs +++ b/Assets/Scripts/GameManager/GameManager.cs @@ -12,7 +12,7 @@ namespace Scampz.GameJam { if (Instance != null && Instance != this) { - Destroy(this); + DestroyImmediate(this); return; } Instance = this; @@ -28,8 +28,7 @@ namespace Scampz.GameJam { yield return null; var player = GameObject.FindGameObjectWithTag("Player"); - var levelChanger = GetComponentInChildren(); - levelChanger.FadeAnimation(); + LevelChanger.Instance.FadeAnimation(); yield return null; var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); yield return new WaitForSeconds(3f); diff --git a/Assets/Scripts/Input/CharacterInputController.cs b/Assets/Scripts/Input/CharacterInputController.cs index 12cd43e..b98eb7b 100644 --- a/Assets/Scripts/Input/CharacterInputController.cs +++ b/Assets/Scripts/Input/CharacterInputController.cs @@ -15,6 +15,16 @@ namespace Scampz.GameJam.Assets.Scripts private InputAction move; private InputAction sprint; + public void EnableActions() + { + move.Enable(); + } + + public void DisableActions() + { + move.Disable(); + } + private void Awake() { playerControls = new PlayerControls(); diff --git a/Assets/Scripts/Player/TalkedToVoid.cs b/Assets/Scripts/Player/TalkedToVoid.cs index a606baf..04fd231 100644 --- a/Assets/Scripts/Player/TalkedToVoid.cs +++ b/Assets/Scripts/Player/TalkedToVoid.cs @@ -21,7 +21,7 @@ namespace Scampz.GameJam.Assets.Scripts.Player public void OnTriggerStay(Collider other) { - if (confirmAction.triggered) + if (other.CompareTag("Player") && confirmAction.triggered) UnlockSanctumState.Instance.VoidOpened = true; } } diff --git a/Assets/Scripts/TitleScreen/TitleScreen.cs b/Assets/Scripts/TitleScreen/TitleScreen.cs index 16be05d..78a5a1b 100644 --- a/Assets/Scripts/TitleScreen/TitleScreen.cs +++ b/Assets/Scripts/TitleScreen/TitleScreen.cs @@ -1,4 +1,5 @@ using Scampz.GameJam.Assets.Scripts; +using TMPro; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; @@ -16,10 +17,18 @@ namespace Scampz.GameJam confirmAction.Enable(); } + private void OnDisable() + { + confirmAction.Disable(); + } + void Update() { - if (confirmAction.triggered) + var uiText = GetComponentInChildren(); + if (confirmAction.inProgress) + { GameManager.Instance.LoadScene(SceneNames.WorldMap, LoadSceneMode.Single); + } } } } diff --git a/Assets/Singleton/SingletonManager.prefab b/Assets/Singleton/SingletonManager.prefab index 30f6123..45e7365 100644 --- a/Assets/Singleton/SingletonManager.prefab +++ b/Assets/Singleton/SingletonManager.prefab @@ -1064,7 +1064,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 230, y: -250} + m_AnchoredPosition: {x: 230, y: -233} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4906054560261868901 @@ -1272,7 +1272,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 230, y: -250} + m_AnchoredPosition: {x: 230, y: -244} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7154132065920303895 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7770577..f12a765 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -811,7 +811,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 1 + activeInputHandler: 2 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 9654edd..3a1b117 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -12,6 +12,7 @@ TagManager: - PromptToEnter - Void Text - VoidBarrier + - Input layers: - Default - TransparentFX