Merge pull request #95 from GDAC-at-Davis/dev

SFX

NO

Author: Shylencce

YearLongProject/Assets/Fighters/Lady Luckless/Timelines/PirateLadyHeavy.playable

@@ -497,7 +497,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.25
+    m_Start: 0.21666666666666667
     m_ClipIn: 0
     m_Asset: {fileID: 3690644467178157319}
     m_Duration: 0.32476875185966486
@@ -564,7 +564,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: Whoosh
+    m_DisplayName: Lady_Heavy
   m_Markers:
     m_Objects: []
   template:
@@ -815,15 +815,15 @@ MonoBehaviour:
       Slot13: 0
       Slot14: 0
       Slot15: 0
-  EventLength: 0.611
+  EventLength: 0.437
   eventName: 
   EventReference:
     Guid:
-      Data1: 1065174180
-      Data2: 1090710763
-      Data3: 986670009
-      Data4: -1886672769
-    Path: event:/Characters/Ahab/LightAttackUse
+      Data1: 1500455391
+      Data2: 1082759141
+      Data3: 983504830
+      Data4: 1921487549
+    Path: event:/Characters/Lady/Lady_Heavy
   StopType: 0
   Parameters: []
 --- !u!114 &5749186314962794965

YearLongProject/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset

@@ -635,6 +635,7 @@ MonoBehaviour:
   - Master
   Banks:
   - Ahab
+  - Lady
   - Lancer
   - MalachiteMidlands
   - Test

YearLongProject_FMOD/.cache/buildrecords/Desktop/Master.br

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects serializationModel="Studio.02.03.00">
+	<object class="EncodableAsset" id="{731c47a5-ed4b-4329-ad7e-7a582f2386bf}">
+		<property name="assetPath">
+			<value>Characters/Lady/</value>
+		</property>
+		<relationship name="masterAssetFolder">
+			<destination>{91809af5-d656-4fcd-81fa-52f4061d6beb}</destination>
+		</relationship>
+	</object>
+</objects>

YearLongProject_FMOD/Assets/Characters/Lady/lady_heavy.wav

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects serializationModel="Studio.02.03.00">
+	<object class="AudioFile" id="{0ad4a4c0-c956-436b-abdf-f12c0ea10998}">
+		<property name="assetPath">
+			<value>Characters/Lady/lady_heavy.wav</value>
+		</property>
+		<property name="frequencyInKHz">
+			<value>44.0999985</value>
+		</property>
+		<property name="channelCount">
+			<value>2</value>
+		</property>
+		<property name="length">
+			<value>0.43750566893424037</value>
+		</property>
+		<relationship name="masterAssetFolder">
+			<destination>{91809af5-d656-4fcd-81fa-52f4061d6beb}</destination>
+		</relationship>
+	</object>
+</objects>

YearLongProject_FMOD/Assets/Characters/Lady/lady_heavy.wav.asd

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects serializationModel="Studio.02.03.00">
+	<object class="Bank" id="{ca6a44cc-9d3d-4a78-ad9d-e62cd7620a74}">
+		<property name="name">
+			<value>Lady</value>
+		</property>
+		<relationship name="folder">
+			<destination>{204e133e-7b27-4970-9f19-ca437c908b7d}</destination>
+		</relationship>
+	</object>
+</objects>