Added sound effect, added tutorial ui

CccrizzZ · Apr 8, 2021 · bc622a4 · bc622a4
1 parent 6311fee
commit bc622a4
Show file tree

Hide file tree

Showing 62 changed files with 7,660 additions and 429 deletions.
diff --git a/Assets/Animations/Controllers/PlayerAnimator.controller b/Assets/Animations/Controllers/PlayerAnimator.controller
@@ -49,7 +49,7 @@ AnimatorState:
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: b509f2175cfd8244f97fb680a79249b2, type: 2}
-  m_Tag: 
+  m_Tag: MeleeAttack
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
@@ -148,37 +148,37 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: IsMoving
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: XMovement
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: IsThrowing
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: IsMelee
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: IsDead
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

diff --git a/Assets/Prefabs/Enemy/Enemy.prefab b/Assets/Prefabs/Enemy/Enemy.prefab
@@ -105,6 +105,7 @@ GameObject:
   - component: {fileID: 1513909706899306540}
   - component: {fileID: 6442093949208484515}
   - component: {fileID: 2916320306126706056}
+  - component: {fileID: 1610617386671125430}
   m_Layer: 0
   m_Name: WeaponHolder
   m_TagString: Untagged
@@ -151,11 +152,108 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 62c644809c46b494999bd5c7bb062dfc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AS_hit: {fileID: 1610617386671125430}
   WeaponList:
   - {fileID: 396173459236532918, guid: 55ce9d8d7161efc489bf37655644b8c8, type: 3}
   - {fileID: 6035334278351890463, guid: dfced701235e7104d8647c567966ca9a, type: 3}
   - {fileID: 5335602121887687162, guid: 318e8f25f6c30f34f9102db22234f78c, type: 3}
   IsAttacking: 0
+--- !u!82 &1610617386671125430
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7204329460852557800}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: e12600e7d66209844bf955432f3354b6, type: 3}
+  m_PlayOnAwake: 0
+  m_Volume: 0.2
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &8777128058622096460
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Pickups/SupplyBox Variant.prefab b/Assets/Prefabs/Pickups/SupplyBox Variant.prefab
@@ -43,11 +43,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   pickupSound: {fileID: 0}
   RandomCandidateArray:
+  - {fileID: 6568411229490831594, guid: 5c1256bc17526f2488a614b913002ef3, type: 3}
   - {fileID: 6035334278351890463, guid: dfced701235e7104d8647c567966ca9a, type: 3}
-  - {fileID: 8777128058622096460, guid: 6ef53e01ea433e641ae4b7e99b40da14, type: 3}
   - {fileID: 396173459236532918, guid: 55ce9d8d7161efc489bf37655644b8c8, type: 3}
   - {fileID: 5335602121887687162, guid: 318e8f25f6c30f34f9102db22234f78c, type: 3}
   - {fileID: 8777128058622096460, guid: 6ef53e01ea433e641ae4b7e99b40da14, type: 3}
+  - {fileID: 6493154997540439058, guid: 9fc3628b001820a47bc7b04299b000c5, type: 3}
 --- !u!1001 &2497472988600499758
 PrefabInstance:
   m_ObjectHideFlags: 0