ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

place artefacts and add dialogue triggers

This commit is contained in:
Cat Flynn 2021-03-04 18:53:12 +00:00
parent fe1e69fa94
commit 427ca62821
9 changed files with 893 additions and 953 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0228856d50ce2a845abd7b3eda114390, type: 3}
m_Name: PA_Blink
m_EditorClassIdentifier:
_artefactID: 1
_artefactID: 10
_dialogueKey: PA_DASH
_name: Blink
_power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2}

2
game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Boost.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0228856d50ce2a845abd7b3eda114390, type: 3}
m_Name: PA_Boost
m_EditorClassIdentifier:
_artefactID: 2
_artefactID: 11
_dialogueKey: PA_BOOST
_name: Boost
_power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}

17
game/Assets/Data/Artefacts/ArtefactObjects/Written/WA_Widget.asset Normal file
View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ac91480061a1ea419ea525eb0a42807, type: 3}
m_Name: WA_Widget
m_EditorClassIdentifier:
_artefactID: 20
_dialogueKey: WA_0
_name: Widget

8
game/Assets/Data/Artefacts/ArtefactObjects/Written/WA_Widget.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 278d5a377b108cf4b8aada11c73ee6ba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

2
game/Assets/Prefabs/Artefacts/Interactable Artefact.prefab
View File

@ -304,4 +304,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
_artefact: {fileID: 0}
_artefact: {fileID: 3201523991801391447}

4
game/Assets/Prefabs/UI/Dialogue UI.prefab
View File

@ -193,7 +193,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -220,7 +220,7 @@ GameObject:
- component: {fileID: 5119468870989674483}
- component: {fileID: 5119468870989674482}
m_Layer: 5
m_Name: Dialogue
m_Name: Dialogue UI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

2
game/Assets/Prefabs/UI/Fade.prefab
View File

@ -62,7 +62,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:

1803
game/Assets/Scenes/Main.unity
View File

File diff suppressed because it is too large Load Diff

6
game/Assets/Scripts/Dialogue/DialogueSystem.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using FMOD.Studio;
using UnityEngine;
#if UNITY_EDITOR
@ -42,6 +43,11 @@ public partial class DialogueSystem : ScriptableObject
}
// retrieve cached key
if (!_fmodKeyCache.ContainsKey(key))
{
Debug.LogError($"{key} not present in dialogue database");
return;
}
var fmodKey = _fmodKeyCache[key];
EventDescription? eventDescription = null;