Nearly finished.....
This commit is contained in:
@@ -826,6 +826,17 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
m_CorrespondingSourceObject: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
||||||
m_PrefabInstance: {fileID: 338826489}
|
m_PrefabInstance: {fileID: 338826489}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &338826491 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 36671747401237298, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 338826489}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 0
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &345771167
|
--- !u!1 &345771167
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2225,6 +2236,7 @@ GameObject:
|
|||||||
- component: {fileID: 1075144248}
|
- component: {fileID: 1075144248}
|
||||||
- component: {fileID: 1075144247}
|
- component: {fileID: 1075144247}
|
||||||
- component: {fileID: 1075144246}
|
- component: {fileID: 1075144246}
|
||||||
|
- component: {fileID: 1075144251}
|
||||||
m_Layer: 3
|
m_Layer: 3
|
||||||
m_Name: Dialogue Radius
|
m_Name: Dialogue Radius
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -2276,7 +2288,7 @@ MonoBehaviour:
|
|||||||
Not really sure
|
Not really sure
|
||||||
what specifically.'
|
what specifically.'
|
||||||
- As you can see they didn't have much time to talk.
|
- As you can see they didn't have much time to talk.
|
||||||
- Mother power back then was like a piece of art.
|
- Mother's power back then was like a piece of art.
|
||||||
- Powerful, beautiful, extraordinary.
|
- Powerful, beautiful, extraordinary.
|
||||||
- Everyday I see the wreckage, it reminds me why I was created.
|
- Everyday I see the wreckage, it reminds me why I was created.
|
||||||
- But unfortunately the casualties of war doesn't make my job any easier.
|
- But unfortunately the casualties of war doesn't make my job any easier.
|
||||||
@@ -2294,6 +2306,7 @@ MonoBehaviour:
|
|||||||
volumeMin: 0.7
|
volumeMin: 0.7
|
||||||
volumeMax: 1.3
|
volumeMax: 1.3
|
||||||
TextSpeed: 0.02
|
TextSpeed: 0.02
|
||||||
|
_dialogueTextGUI: {fileID: 338826491}
|
||||||
--- !u!114 &1075144247
|
--- !u!114 &1075144247
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2370,6 +2383,18 @@ MeshFilter:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1075144244}
|
m_GameObject: {fileID: 1075144244}
|
||||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!114 &1075144251
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1075144244}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 6b68a11e9789f6344a053b00f7cc3dcc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &1077272319 stripped
|
--- !u!1 &1077272319 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: -3215555783603854218, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
|
m_CorrespondingSourceObject: {fileID: -3215555783603854218, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
|
||||||
|
|||||||
@@ -551,6 +551,7 @@ GameObject:
|
|||||||
- component: {fileID: 392546072}
|
- component: {fileID: 392546072}
|
||||||
- component: {fileID: 392546076}
|
- component: {fileID: 392546076}
|
||||||
- component: {fileID: 392546075}
|
- component: {fileID: 392546075}
|
||||||
|
- component: {fileID: 392546077}
|
||||||
m_Layer: 3
|
m_Layer: 3
|
||||||
m_Name: Ice Guy
|
m_Name: Ice Guy
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -655,7 +656,7 @@ MonoBehaviour:
|
|||||||
- it's kinda funny that a youth would symbolize death for us.
|
- it's kinda funny that a youth would symbolize death for us.
|
||||||
- "you are almost to the peak of the mountain. \ni bet you are excited to reach
|
- "you are almost to the peak of the mountain. \ni bet you are excited to reach
|
||||||
the top."
|
the top."
|
||||||
- mountains, volcanos, everyone is excited to reach the top.
|
- mountains, volcanoes, everyone is excited to reach the top.
|
||||||
- "i think that the real beauty can be found down here.\r"
|
- "i think that the real beauty can be found down here.\r"
|
||||||
- 'the snow, the rocks, whole worlds are built on it.
|
- 'the snow, the rocks, whole worlds are built on it.
|
||||||
|
|
||||||
@@ -678,6 +679,7 @@ MonoBehaviour:
|
|||||||
volumeMin: 1
|
volumeMin: 1
|
||||||
volumeMax: 1
|
volumeMax: 1
|
||||||
TextSpeed: 0.07
|
TextSpeed: 0.07
|
||||||
|
_dialogueTextGUI: {fileID: 1631886795}
|
||||||
--- !u!114 &392546076
|
--- !u!114 &392546076
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -691,6 +693,18 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_dialogueTrigger: {fileID: 392546075}
|
_dialogueTrigger: {fileID: 392546075}
|
||||||
|
--- !u!114 &392546077
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 392546070}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 26df9f81f16eb254dae2480172770084, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &415365760
|
--- !u!1 &415365760
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -3434,6 +3448,17 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
m_CorrespondingSourceObject: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
||||||
m_PrefabInstance: {fileID: 1631886793}
|
m_PrefabInstance: {fileID: 1631886793}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &1631886795 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 36671747401237298, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1631886793}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 0
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &1651078843
|
--- !u!1 &1651078843
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -3580,7 +3605,6 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_scene: WorldMap
|
_scene: WorldMap
|
||||||
_spawnPoint: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
|
|
||||||
_promptToEnter: 0
|
_promptToEnter: 0
|
||||||
_promptText: {fileID: 0}
|
_promptText: {fileID: 0}
|
||||||
--- !u!64 &1716491138
|
--- !u!64 &1716491138
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1806,10 +1806,6 @@ PrefabInstance:
|
|||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 1445798105, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
|
||||||
propertyPath: m_AdditionalShaderChannelsFlag
|
|
||||||
value: 25
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
- target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 4
|
value: 4
|
||||||
@@ -3041,6 +3037,55 @@ MeshCollider:
|
|||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: -5053925668127403250, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
m_Mesh: {fileID: -5053925668127403250, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
||||||
|
--- !u!1 &1925236431
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1925236433}
|
||||||
|
- component: {fileID: 1925236432}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: OpenVoid
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1925236432
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1925236431}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c388cea5ac5cb0241bc77335e96e4f59, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
TalkedToFrog: 0
|
||||||
|
TalkedToIceGuy: 0
|
||||||
|
TalkedToAirshipGuy: 0
|
||||||
|
SanctumUnlocked: 0
|
||||||
|
VoidOpened: 0
|
||||||
|
--- !u!4 &1925236433
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1925236431}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 289.46613, y: 145.5, z: -1.7971573}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 10
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1949102717 stripped
|
--- !u!1 &1949102717 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
||||||
|
|||||||
@@ -61,5 +61,7 @@ namespace Scampz.GameJam.Assets.Scripts.Audio
|
|||||||
public static string TempleStep => "temple step ed";
|
public static string TempleStep => "temple step ed";
|
||||||
|
|
||||||
public static string GrassStep => "grass step ed";
|
public static string GrassStep => "grass step ed";
|
||||||
|
|
||||||
|
public static string Void => "void";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,8 +45,9 @@ namespace Scampz.GameJam
|
|||||||
EndDialogue();
|
EndDialogue();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StartDialogue(Dialogue dialogue)
|
public void StartDialogue(Dialogue dialogue, TextMeshProUGUI textMeshProUGUI)
|
||||||
{
|
{
|
||||||
|
_dialogueTextGUI = textMeshProUGUI;
|
||||||
_animator.SetBool("IsOpen", true);
|
_animator.SetBool("IsOpen", true);
|
||||||
IsTalking = true;
|
IsTalking = true;
|
||||||
sentences.Clear();
|
sentences.Clear();
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Scampz.GameJam
|
namespace Scampz.GameJam
|
||||||
@@ -5,10 +6,12 @@ namespace Scampz.GameJam
|
|||||||
public class DialogueTrigger : MonoBehaviour
|
public class DialogueTrigger : MonoBehaviour
|
||||||
{
|
{
|
||||||
public Dialogue dialogue;
|
public Dialogue dialogue;
|
||||||
|
[SerializeField]
|
||||||
|
private TextMeshProUGUI _dialogueTextGUI;
|
||||||
|
|
||||||
public void TriggerDialogue()
|
public void TriggerDialogue()
|
||||||
{
|
{
|
||||||
DialogueManager.Instance.StartDialogue(dialogue);
|
DialogueManager.Instance.StartDialogue(dialogue, _dialogueTextGUI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
13
Assets/Scripts/Player/OpenVoid.cs
Normal file
13
Assets/Scripts/Player/OpenVoid.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Scampz.GameJam.Assets.Scripts.Player
|
||||||
|
{
|
||||||
|
public class OpenVoid : MonoBehaviour
|
||||||
|
{
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (UnlockSanctumState.Instance.VoidOpened)
|
||||||
|
gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Player/OpenVoid.cs.meta
Normal file
11
Assets/Scripts/Player/OpenVoid.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ac239a5b51bd7c84d8abe88686241cf1
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
13
Assets/Scripts/Player/TalkedToAirshipGuy.cs
Normal file
13
Assets/Scripts/Player/TalkedToAirshipGuy.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Scampz.GameJam.Assets.Scripts.Player
|
||||||
|
{
|
||||||
|
public class TalkedToAirshipGuy : MonoBehaviour
|
||||||
|
{
|
||||||
|
public void OnTriggerStay(Collider other)
|
||||||
|
{
|
||||||
|
if (Input.GetButton(InputOptions.Submit))
|
||||||
|
UnlockSanctumState.Instance.TalkedToAirshipGuy = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Player/TalkedToAirshipGuy.cs.meta
Normal file
11
Assets/Scripts/Player/TalkedToAirshipGuy.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6b68a11e9789f6344a053b00f7cc3dcc
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
13
Assets/Scripts/Player/TalkedToFrogLady.cs
Normal file
13
Assets/Scripts/Player/TalkedToFrogLady.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Scampz.GameJam.Assets.Scripts.Player
|
||||||
|
{
|
||||||
|
public class TalkedToFrogLady : MonoBehaviour
|
||||||
|
{
|
||||||
|
public void OnTriggerStay(Collider other)
|
||||||
|
{
|
||||||
|
if (Input.GetButton(InputOptions.Submit))
|
||||||
|
UnlockSanctumState.Instance.TalkedToFrog = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Player/TalkedToFrogLady.cs.meta
Normal file
11
Assets/Scripts/Player/TalkedToFrogLady.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0be6aa3e5193f4f4e91e4b2707b8e1ae
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
13
Assets/Scripts/Player/TalkedToIceGuy.cs
Normal file
13
Assets/Scripts/Player/TalkedToIceGuy.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Scampz.GameJam.Assets.Scripts.Player
|
||||||
|
{
|
||||||
|
public class TalkedToIceGuy : MonoBehaviour
|
||||||
|
{
|
||||||
|
public void OnTriggerStay(Collider other)
|
||||||
|
{
|
||||||
|
if (Input.GetButton(InputOptions.Submit))
|
||||||
|
UnlockSanctumState.Instance.TalkedToIceGuy = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Player/TalkedToIceGuy.cs.meta
Normal file
11
Assets/Scripts/Player/TalkedToIceGuy.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 26df9f81f16eb254dae2480172770084
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
16
Assets/Scripts/Player/TalkedToVoid.cs
Normal file
16
Assets/Scripts/Player/TalkedToVoid.cs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Scampz.GameJam.Assets.Scripts.Player
|
||||||
|
{
|
||||||
|
public class TalkedToVoid : MonoBehaviour
|
||||||
|
{
|
||||||
|
public void OnTriggerStay(Collider other)
|
||||||
|
{
|
||||||
|
if (other.CompareTag("Player"))
|
||||||
|
{
|
||||||
|
if (Input.GetButton(InputOptions.Submit))
|
||||||
|
UnlockSanctumState.Instance.VoidOpened = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Player/TalkedToVoid.cs.meta
Normal file
11
Assets/Scripts/Player/TalkedToVoid.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b45a63a9fe7ce264e9e339f4366a5651
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
32
Assets/Scripts/Player/UnlockSanctumState.cs
Normal file
32
Assets/Scripts/Player/UnlockSanctumState.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Scampz.GameJam.Assets.Scripts
|
||||||
|
{
|
||||||
|
public class UnlockSanctumState : MonoBehaviour
|
||||||
|
{
|
||||||
|
public bool TalkedToFrog = false;
|
||||||
|
public bool TalkedToIceGuy = false;
|
||||||
|
public bool TalkedToAirshipGuy = false;
|
||||||
|
public bool SanctumUnlocked = false;
|
||||||
|
public bool VoidOpened = false;
|
||||||
|
|
||||||
|
public static UnlockSanctumState Instance;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
if (Instance != null && Instance != this)
|
||||||
|
{
|
||||||
|
Destroy(this);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Instance = this;
|
||||||
|
DontDestroyOnLoad(gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (TalkedToFrog && TalkedToIceGuy && TalkedToAirshipGuy)
|
||||||
|
SanctumUnlocked = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Player/UnlockSanctumState.cs.meta
Normal file
11
Assets/Scripts/Player/UnlockSanctumState.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c388cea5ac5cb0241bc77335e96e4f59
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
57
Assets/Scripts/SceneManagement/ConditionalTeleportPlayer.cs
Normal file
57
Assets/Scripts/SceneManagement/ConditionalTeleportPlayer.cs
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Scampz.GameJam.Assets.Scripts.SceneManagement
|
||||||
|
{
|
||||||
|
public class ConditionalTeleportPlayer : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField]
|
||||||
|
private Transform _spawnPointA;
|
||||||
|
[SerializeField]
|
||||||
|
private Transform _spawnPointB;
|
||||||
|
[SerializeField]
|
||||||
|
private Camera[] camerasToActivateA;
|
||||||
|
[SerializeField]
|
||||||
|
private Camera[] camerasToActivateB;
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider collider)
|
||||||
|
{
|
||||||
|
if (collider.CompareTag("Player"))
|
||||||
|
{
|
||||||
|
StartCoroutine(LoadNextLevel());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerator LoadNextLevel()
|
||||||
|
{
|
||||||
|
var spawnPoint = _spawnPointA;
|
||||||
|
var cameras = camerasToActivateA;
|
||||||
|
|
||||||
|
if (UnlockSanctumState.Instance.SanctumUnlocked)
|
||||||
|
{
|
||||||
|
spawnPoint = _spawnPointB;
|
||||||
|
cameras = camerasToActivateB;
|
||||||
|
}
|
||||||
|
|
||||||
|
var levelChanger = FindObjectOfType<LevelChanger>();
|
||||||
|
levelChanger.FadeAnimation();
|
||||||
|
yield return null;
|
||||||
|
var player = GameObject.FindGameObjectWithTag("Player");
|
||||||
|
var cc = player.GetComponent<CharacterController>();
|
||||||
|
cc.enabled = false;
|
||||||
|
player.SetActive(false);
|
||||||
|
yield return new WaitForSeconds(1.0f);
|
||||||
|
yield return null;
|
||||||
|
player.transform.position = spawnPoint.position;
|
||||||
|
player.transform.rotation = spawnPoint.rotation;
|
||||||
|
cc.enabled = true;
|
||||||
|
var allCamerasInCurrentScene = FindObjectsOfType<Camera>();
|
||||||
|
foreach (var sceneCamera in allCamerasInCurrentScene)
|
||||||
|
sceneCamera.enabled = false;
|
||||||
|
foreach (var camera in cameras)
|
||||||
|
camera.enabled = true;
|
||||||
|
player.SetActive(true);
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1fb7be0fc28d35643b97add275864329
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using Scampz.GameJam.Assets.Scripts;
|
using Scampz.GameJam.Assets.Scripts;
|
||||||
|
using Scampz.GameJam.Assets.Scripts.Audio;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
@@ -42,6 +43,7 @@ namespace Scampz.GameJam
|
|||||||
private void LoadNextLevel()
|
private void LoadNextLevel()
|
||||||
{
|
{
|
||||||
_loaded = true;
|
_loaded = true;
|
||||||
|
SFXManager.Instance.PlaySoundEffect(SoundEffectName.Ok);
|
||||||
GameManager.Instance.LoadScene(_scene, LoadSceneMode.Single);
|
GameManager.Instance.LoadScene(_scene, LoadSceneMode.Single);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ Canvas:
|
|||||||
m_OverrideSorting: 0
|
m_OverrideSorting: 0
|
||||||
m_OverridePixelPerfect: 0
|
m_OverridePixelPerfect: 0
|
||||||
m_SortingBucketNormalizedSize: 0
|
m_SortingBucketNormalizedSize: 0
|
||||||
m_AdditionalShaderChannelsFlag: 0
|
m_AdditionalShaderChannelsFlag: 25
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 0
|
||||||
m_TargetDisplay: 0
|
m_TargetDisplay: 0
|
||||||
@@ -293,6 +293,7 @@ RectTransform:
|
|||||||
- {fileID: 2892224927131087056}
|
- {fileID: 2892224927131087056}
|
||||||
- {fileID: 9048025182165106366}
|
- {fileID: 9048025182165106366}
|
||||||
- {fileID: 8261970056456307927}
|
- {fileID: 8261970056456307927}
|
||||||
|
- {fileID: 5230657984148141075}
|
||||||
m_Father: {fileID: 3584299649024768172}
|
m_Father: {fileID: 3584299649024768172}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@@ -986,6 +987,7 @@ MonoBehaviour:
|
|||||||
- {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3}
|
- {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3}
|
||||||
- {fileID: 8300000, guid: 86c52bd1f805a814d89d60ef7f85d86b, type: 3}
|
- {fileID: 8300000, guid: 86c52bd1f805a814d89d60ef7f85d86b, type: 3}
|
||||||
- {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3}
|
- {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3}
|
||||||
|
- {fileID: 8300000, guid: 22d7e3c026615e4488ba2fd9afa47c7e, type: 3}
|
||||||
--- !u!114 &3909244205962771672
|
--- !u!114 &3909244205962771672
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1096,6 +1098,141 @@ AudioSource:
|
|||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
--- !u!1 &6423959981900839893
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5230657984148141075}
|
||||||
|
- component: {fileID: 4906054560261868901}
|
||||||
|
- component: {fileID: 7044309525315592055}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Void Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5230657984148141075
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6423959981900839893}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 4605870207825934367}
|
||||||
|
m_RootOrder: 4
|
||||||
|
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_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &4906054560261868901
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6423959981900839893}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &7044309525315592055
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6423959981900839893}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text:
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: e6f310aedf7b70147b22891784df1a2a, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 8322181474587916427, guid: e6f310aedf7b70147b22891784df1a2a, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278190080
|
||||||
|
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
m_enableVertexGradient: 0
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 0}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_StyleSheet: {fileID: 0}
|
||||||
|
m_TextStyleHashCode: -1183493901
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontSize: 64
|
||||||
|
m_fontSizeBase: 64
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 1
|
||||||
|
m_HorizontalAlignment: 1
|
||||||
|
m_VerticalAlignment: 256
|
||||||
|
m_textAlignment: 65535
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
parentLinkedComponent: {fileID: 0}
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_IsTextObjectScaleStatic: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: -24.914513, z: 352.36157, w: -321.4821}
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
--- !u!1 &8847259146616550776
|
--- !u!1 &8847259146616550776
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1222,7 +1359,7 @@ MonoBehaviour:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 9106198387064842738}
|
m_GameObject: {fileID: 9106198387064842738}
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -1235,9 +1372,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: Mankind knew that they Could not change Society, So Instead of Reflecting
|
m_text:
|
||||||
on themselves, they blamed the Beasts. But they saw Beauty in the Lives of Beasts,
|
|
||||||
and could not Lie to themselves about it.
|
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 57cd765597493004c95d8f49761d0505, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 57cd765597493004c95d8f49761d0505, type: 2}
|
||||||
m_sharedMaterial: {fileID: 3212845772593861766, guid: 57cd765597493004c95d8f49761d0505, type: 2}
|
m_sharedMaterial: {fileID: 3212845772593861766, guid: 57cd765597493004c95d8f49761d0505, type: 2}
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ TagManager:
|
|||||||
- TempleD
|
- TempleD
|
||||||
- Sanctum
|
- Sanctum
|
||||||
- PromptToEnter
|
- PromptToEnter
|
||||||
|
- Void Text
|
||||||
|
- VoidBarrier
|
||||||
layers:
|
layers:
|
||||||
- Default
|
- Default
|
||||||
- TransparentFX
|
- TransparentFX
|
||||||
|
|||||||
Reference in New Issue
Block a user