Merge branch 'feature/menus' into 'main'

made pretty button boyes

See merge request kernel-panic/revival!44

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:

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}

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

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_X: 0
-      m_Y: 128
+      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_X: 0
-      m_Y: 128
+      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_X: 128
-      m_Y: 3
+      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_X: 128
-      m_Y: 0
+      m_Y: 128
       m_Width: 128
       m_Height: 128
     m_Scale: 1.5

game/FMOD Project/Metadata/AudioFile/{a2f4c888-c688-412a-83d6-03a9be21ccd6}.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects serializationModel="Studio.02.01.00">
+	<object class="AudioFile" id="{a2f4c888-c688-412a-83d6-03a9be21ccd6}">
+		<property name="assetPath">
+			<value>CaiStuff/Enviroment/Artifact/artifact_new.wav</value>
+		</property>
+		<property name="frequencyInKHz">
+			<value>48</value>
+		</property>
+		<property name="channelCount">
+			<value>2</value>
+		</property>
+		<property name="length">
+			<value>5.875</value>
+		</property>
+		<relationship name="masterAssetFolder">
+			<destination>{4c43130b-9186-4fb6-9d65-a9acdac70927}</destination>
+		</relationship>
+	</object>
+</objects>

game/FMOD Project/Metadata/Event/{b268836f-6b26-490e-97f7-fe81e82238e5}.xml

@@ -60,7 +60,7 @@
 	<object class="MarkerTrack" id="{2551eeee-c584-468f-931b-da95b8804583}" />
 	<object class="GroupTrack" id="{bd8fcfb0-3d4c-4c12-8ec1-886ad3f7f224}">
 		<relationship name="modules">
-			<destination>{2cabdb72-c40c-42ea-8219-2c11294aa8fc}</destination>
+			<destination>{be57d41a-5871-4f56-91fb-c546cb37669e}</destination>
 		</relationship>
 		<relationship name="mixerGroup">
 			<destination>{2ad37aac-3e7e-43ec-988a-6d08b33de192}</destination>
@@ -68,7 +68,7 @@
 	</object>
 	<object class="Timeline" id="{83850091-ae5c-414c-b278-ef11f6238412}">
 		<relationship name="modules">
-			<destination>{2cabdb72-c40c-42ea-8219-2c11294aa8fc}</destination>
+			<destination>{be57d41a-5871-4f56-91fb-c546cb37669e}</destination>
 		</relationship>
 	</object>
 	<object class="EventMixerMaster" id="{8b793514-d735-4e11-9e86-ae1caddf7a61}">
@@ -88,14 +88,12 @@
 		</relationship>
 	</object>
 	<object class="MixerBusPanner" id="{0127e3d1-42b0-4cde-b299-c8a8408b4827}" />
-	<object class="MultiSound" id="{2cabdb72-c40c-42ea-8219-2c11294aa8fc}">
+	<object class="SingleSound" id="{be57d41a-5871-4f56-91fb-c546cb37669e}">
 		<property name="length">
-			<value>6.5</value>
+			<value>5.875</value>
 		</property>
-		<relationship name="sounds">
+		<relationship name="audioFile">
-			<destination>{0e538c10-ad28-4e42-a270-e744232e6f4b}</destination>
+			<destination>{a2f4c888-c688-412a-83d6-03a9be21ccd6}</destination>
-			<destination>{a4893d94-954f-4e2c-9254-a48e6cff1ac7}</destination>
-			<destination>{0fddbc76-b8a7-414e-a0be-31fc29826f9d}</destination>
 		</relationship>
 	</object>
 	<object class="EventMixerGroup" id="{2ad37aac-3e7e-43ec-988a-6d08b33de192}">
@@ -119,21 +117,6 @@
 	</object>
 	<object class="MixerBusPanner" id="{76617340-ac7e-4b25-a6c7-c251e2c06c39}" />
 	<object class="MixerBusFader" id="{12194f2c-37b3-41f7-800c-3edca95f2dfb}" />
-	<object class="SingleSound" id="{0e538c10-ad28-4e42-a270-e744232e6f4b}">
-		<relationship name="audioFile">
-			<destination>{cabf7375-e8dc-46b4-89a3-d1f7eb8d7598}</destination>
-		</relationship>
-	</object>
-	<object class="SingleSound" id="{a4893d94-954f-4e2c-9254-a48e6cff1ac7}">
-		<relationship name="audioFile">
-			<destination>{f03f8e8a-2775-4a53-a524-58f1ecb54841}</destination>
-		</relationship>
-	</object>
-	<object class="SingleSound" id="{0fddbc76-b8a7-414e-a0be-31fc29826f9d}">
-		<relationship name="audioFile">
-			<destination>{1d40268c-77d3-4703-866b-36a3dfab20dd}</destination>
-		</relationship>
-	</object>
 	<object class="MixerBusEffectChain" id="{3460d232-f349-4add-ac52-c99aa02b2028}">
 		<relationship name="effects">
 			<destination>{ce9d0166-298a-4700-958d-8e4807e4decd}</destination>