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

starting dialogue

This commit is contained in:
cyndrdev 2021-05-17 23:32:40 +01:00
parent 11a4bc510e
commit caa45adb47
9 changed files with 1196 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
game/Assets/Materials/Black Innit.mat Normal file
View File

@ -0,0 +1,125 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2020420980695442095
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Black Innit
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SampleGI: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []

8
game/Assets/Materials/Black Innit.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4200cbd6ac9fc4c4aad26fea25d41b10
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

6
game/Assets/Prefabs/UI/Canvas.prefab
View File

@ -44,8 +44,8 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 6808448285566310704}
- {fileID: 1833095292628238768}
- {fileID: 2469130771264784599}
- {fileID: 1833095292628238768}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -409,7 +409,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_AnchorMax.x
@ -511,7 +511,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_AnchorMax.x

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

File diff suppressed because it is too large Load Diff

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

@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Configuration;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.Serialization;
public class ScriptedDialogueTrigger : MonoBehaviour
@ -24,6 +25,9 @@ public class ScriptedDialogueTrigger : MonoBehaviour
[SerializeField] private string[] _keys;
private float[] _durations;
[SerializeField]
private UnityEvent _onDialogueFinish;
[SerializeField] private bool _log;
private void Awake()
@ -87,6 +91,8 @@ public class ScriptedDialogueTrigger : MonoBehaviour
yield return null;
}
_onDialogueFinish.Invoke();
}
private void PlayLine(string key, Transform speakerObject)

2
game/Assets/Scripts/PressurePlate/PressurePlate.cs
View File

@ -28,7 +28,7 @@ public class PressurePlate : MonoBehaviour
private void OnTriggerEnter(Collider other)
{
if (other.CompareTag("Player"))
if (other.CompareTag("Player") && !triggered.HasValue)
{
triggered = Time.time;
_onPress.Invoke();

BIN
game/FMOD Project/Build/Desktop/SFX.bank (Stored with Git LFS)
View File

Binary file not shown.

3
game/FMOD Project/Metadata/Event/{123d09ec-b33f-4ec5-aea3-36727a9f97b4}.xml
View File

@ -72,6 +72,9 @@
</relationship>
</object>
<object class="EventMixerMaster" id="{0cea3da4-c157-418e-8af6-7a47a5c56830}">
<property name="volume">
<value>-5</value>
</property>
<relationship name="effectChain">
<destination>{6d4fe6be-e12f-463e-84bc-a8a56f6bc5d8}</destination>
</relationship>

2
game/FMOD Project/Metadata/Event/{d5ba71b3-85bc-4648-90ae-3a03a08cdefe}.xml
View File

@ -73,7 +73,7 @@
</object>
<object class="EventMixerMaster" id="{0d83d777-2c92-4127-a870-a304d26fd185}">
<property name="volume">
<value>-8.5</value>
<value>-6.5</value>
</property>
<relationship name="effectChain">
<destination>{cf49e2c5-ce0c-469a-bb85-33f178ce9b0b}</destination>