diff --git a/game/Assets/Data/Dialogue/Dialogue Settings.asset b/game/Assets/Data/Dialogue/Dialogue Settings.asset
index 779bfa7..490e935 100644
--- a/game/Assets/Data/Dialogue/Dialogue Settings.asset
+++ b/game/Assets/Data/Dialogue/Dialogue Settings.asset
@@ -13,13 +13,13 @@ MonoBehaviour:
m_Name: Dialogue Settings
m_EditorClassIdentifier:
_gamepadInputPrompts:
- blink: 0
- boost: 1
- timeFreeze: 2
- _keyboardInputPrompts:
blink: 4
boost: 5
- timeFreeze: 6
+ timeFreeze: 3
+ _keyboardInputPrompts:
+ blink: 1
+ boost: 2
+ timeFreeze: 0
_hideAfter: 5
_radioDialogueKey: event:/VO/Radio Dialogue Line
_dialogueClips:
diff --git a/game/Assets/Prefabs/UI/Canvas.prefab b/game/Assets/Prefabs/UI/Canvas.prefab
index a591153..ec40a7d 100644
--- a/game/Assets/Prefabs/UI/Canvas.prefab
+++ b/game/Assets/Prefabs/UI/Canvas.prefab
@@ -135,7 +135,7 @@ MonoBehaviour:
Duration: 1
Renderer: {fileID: 225077497674743764}
- Delay: 1.5
- Duration: 1.5
+ Duration: 0.25
Renderer: {fileID: 6808448286966862353}
- Delay: 3
Duration: 1.5
@@ -149,7 +149,7 @@ MonoBehaviour:
Renderer: {fileID: 3239557012103347769}
_dialogueDelay: 3.5
_unlockedSfx: event:/Environment/Interactables/Artefact
- _unlockedSfxDelay: 1.5
+ _unlockedSfxDelay: 0
artefactUI: {fileID: 6808448285566310707}
artefactText: {fileID: 5377945582605113368}
dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity
index 08559f4..7166600 100644
--- a/game/Assets/Scenes/Main.unity
+++ b/game/Assets/Scenes/Main.unity
@@ -2334,19 +2334,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
- value: 0.968036
+ value: 0.9680315
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
- value: 0.24655226
+ value: 0.24655113
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
- value: 0.044600967
+ value: 0.044697862
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
- value: -0.011359566
+ value: -0.011384245
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@@ -2434,15 +2434,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
- value: -0
+ value: -0.000000029802322
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
- value: -0.040505264
+ value: -0.040505223
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
- value: 0.022064105
+ value: 0.022064082
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_XAxis.m_InvertInput
@@ -2482,15 +2482,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
- value: -0.000000014901161
+ value: -0.000000014901163
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
- value: -0.00008790195
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
- value: 0.000047880225
+ value: -0.0000000018626454
objectReference: {fileID: 0}
- target: {fileID: 5623525084296723636, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Target
diff --git a/game/Assets/UI/Input Prompts/Sprites/input_prompts.asset b/game/Assets/UI/Input Prompts/Sprites/input_prompts.asset
index 2edf2f7..6447395 100644
--- a/game/Assets/UI/Input Prompts/Sprites/input_prompts.asset
+++ b/game/Assets/UI/Input Prompts/Sprites/input_prompts.asset
@@ -20,7 +20,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 0611a1c41577fb94ca74d3bdf8b8a621, type: 3}
+ m_Texture: {fileID: 2800000, guid: 445260a895bbbc74cbde61be5a1fe903, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
@@ -72,7 +72,7 @@ MonoBehaviour:
m_StrikethroughOffset: 0
m_StrikethroughThickness: 0
m_TabWidth: 0
- spriteSheet: {fileID: 2800000, guid: 0611a1c41577fb94ca74d3bdf8b8a621, type: 3}
+ spriteSheet: {fileID: 2800000, guid: 445260a895bbbc74cbde61be5a1fe903, type: 3}
m_SpriteCharacterTable:
- m_ElementType: 2
m_Unicode: 65534
@@ -83,25 +83,25 @@ MonoBehaviour:
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 1
- m_Scale: 1
+ m_Scale: 2
m_Name: input_prompts_1
m_HashCode: 2049246320
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 2
- m_Scale: 1
+ m_Scale: 2
m_Name: input_prompts_2
m_HashCode: 2049246323
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 3
- m_Scale: 1
+ m_Scale: 2
m_Name: input_prompts_3
m_HashCode: 2049246322
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 4
- m_Scale: 1
+ m_Scale: 2
m_Name: input_prompts_4
m_HashCode: 2049246325
- m_ElementType: 2
@@ -131,11 +131,11 @@ MonoBehaviour:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: -0
- m_HorizontalBearingY: 92
+ m_HorizontalBearingY: 80
m_HorizontalAdvance: 128
m_GlyphRect:
- m_X: 127
- m_Y: 128
+ m_X: 0
+ m_Y: 256
m_Width: 128
m_Height: 128
m_Scale: 1.5
@@ -146,11 +146,11 @@ MonoBehaviour:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: -0
- m_HorizontalBearingY: 92
+ m_HorizontalBearingY: 80
m_HorizontalAdvance: 128
m_GlyphRect:
- m_X: 256
- m_Y: 128
+ m_X: 0
+ m_Y: 384
m_Width: 128
m_Height: 128
m_Scale: 1.5
@@ -161,11 +161,11 @@ MonoBehaviour:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: -0
- m_HorizontalBearingY: 92
+ m_HorizontalBearingY: 80
m_HorizontalAdvance: 128
m_GlyphRect:
- m_X: 0
- m_Y: 3
+ m_X: 128
+ m_Y: 256
m_Width: 128
m_Height: 128
m_Scale: 1.5
@@ -176,11 +176,11 @@ MonoBehaviour:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: -0
- m_HorizontalBearingY: 92
+ m_HorizontalBearingY: 80
m_HorizontalAdvance: 128
m_GlyphRect:
m_X: 128
- m_Y: 0
+ m_Y: 384
m_Width: 128
m_Height: 128
m_Scale: 1.5
@@ -194,8 +194,8 @@ MonoBehaviour:
m_HorizontalBearingY: 92
m_HorizontalAdvance: 128
m_GlyphRect:
- m_X: 256
- m_Y: 0
+ m_X: 128
+ m_Y: 128
m_Width: 128
m_Height: 128
m_Scale: 1.5
diff --git a/game/FMOD Project/Assets/CaiStuff/Enviroment/Artifact/artifact_new.wav b/game/FMOD Project/Assets/CaiStuff/Enviroment/Artifact/artifact_new.wav
new file mode 100644
index 0000000..106c87e
--- /dev/null
+++ b/game/FMOD Project/Assets/CaiStuff/Enviroment/Artifact/artifact_new.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e2b34e38be8a70c5bd20f7ee88e0beb640b0912236f58c1c2f0c6e556615ebb
+size 1695422
diff --git a/game/FMOD Project/Build/Desktop/SFX.bank b/game/FMOD Project/Build/Desktop/SFX.bank
index 52503f6..def24ac 100644
--- a/game/FMOD Project/Build/Desktop/SFX.bank
+++ b/game/FMOD Project/Build/Desktop/SFX.bank
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bd312390649a89c05eda342705e972bbb34236c3197f15860c031f3b544aaf8b
-size 4151040
+oid sha256:14b269f631a92d5897e388475f18feae3aa3008fa894137e2b953d7666eebd3d
+size 4063552
diff --git a/game/FMOD Project/Metadata/AudioFile/{a2f4c888-c688-412a-83d6-03a9be21ccd6}.xml b/game/FMOD Project/Metadata/AudioFile/{a2f4c888-c688-412a-83d6-03a9be21ccd6}.xml
new file mode 100644
index 0000000..0c75b33
--- /dev/null
+++ b/game/FMOD Project/Metadata/AudioFile/{a2f4c888-c688-412a-83d6-03a9be21ccd6}.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/game/FMOD Project/Metadata/Event/{b268836f-6b26-490e-97f7-fe81e82238e5}.xml b/game/FMOD Project/Metadata/Event/{b268836f-6b26-490e-97f7-fe81e82238e5}.xml
index b4721cc..be37180 100644
--- a/game/FMOD Project/Metadata/Event/{b268836f-6b26-490e-97f7-fe81e82238e5}.xml
+++ b/game/FMOD Project/Metadata/Event/{b268836f-6b26-490e-97f7-fe81e82238e5}.xml
@@ -60,7 +60,7 @@
-