diff --git a/Assets/BowAndArrow.cs b/Assets/BowAndArrow.cs index b28cea731fb0405007f5ebe22d8059c5ebe1fca4..b2b782f5a7cbcc203de220c1984efb9b591069f8 100644 --- a/Assets/BowAndArrow.cs +++ b/Assets/BowAndArrow.cs @@ -52,6 +52,7 @@ public class BowAndArrow : MonoBehaviour, IWeapon if(Input.GetButtonUp("Fire1")) { + gunAudio.Play(); Debug.Log("Fire1 up"); bowPower.value = 0f; Shoot(); diff --git a/Assets/LowPolyRPGWeapons_Lite/LowPolyRPGWeaponsLite_2020.3.0_HDRP_v1.0.unitypackage.meta b/Assets/LowPolyRPGWeapons_Lite/LowPolyRPGWeaponsLite_2020.3.0_HDRP_v1.0.unitypackage.meta deleted file mode 100644 index b454cdc8a153babc0629da4adc6587b7ff4c099a..0000000000000000000000000000000000000000 --- a/Assets/LowPolyRPGWeapons_Lite/LowPolyRPGWeaponsLite_2020.3.0_HDRP_v1.0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: dc011e675dff36648b315d5e9b8b76ec -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/LowPolyRPGWeapons_Lite/LowPolyRPGWeaponsLite_2020.3.0_URP_v1.0.unitypackage.meta b/Assets/LowPolyRPGWeapons_Lite/LowPolyRPGWeaponsLite_2020.3.0_URP_v1.0.unitypackage.meta deleted file mode 100644 index b8fc59b10d97db66a52450b55c619b0952fae7ba..0000000000000000000000000000000000000000 --- a/Assets/LowPolyRPGWeapons_Lite/LowPolyRPGWeaponsLite_2020.3.0_URP_v1.0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2c299b1162740664ba55a2fd6c2a8aee -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sword.cs b/Assets/Sword.cs index 42870868ed11c27c348119a44552a5ba4905a282..86a3e45f23dc00a73050411ee28b83ffcdf9e36c 100644 --- a/Assets/Sword.cs +++ b/Assets/Sword.cs @@ -6,6 +6,7 @@ public class Sword : MonoBehaviour, IWeapon { public GameObject sword; public GameObject player; + public AudioSource audioSource; public bool canAttack = true; public int damage = 10; public float attackSpeed = 1f; @@ -14,7 +15,7 @@ public class Sword : MonoBehaviour, IWeapon void Start() { - + audioSource = GetComponent<AudioSource>(); } // Update is called once per frame @@ -39,6 +40,7 @@ public class Sword : MonoBehaviour, IWeapon void Attack() { isAttacking = true; + audioSource.Play(); Debug.Log("Attack"); canAttack = false; Animator animator = sword.GetComponent<Animator>(); diff --git a/Assets/pedang.mp3 b/Assets/pedang.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..d9903298ca463ed565c39706638c16f55a1828d9 --- /dev/null +++ b/Assets/pedang.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a0675a71f039599747f6480a3aba02198450cc8528d634819ddfccd7c6cb0e7 +size 66455 diff --git a/Assets/pedang.mp3.meta b/Assets/pedang.mp3.meta new file mode 100644 index 0000000000000000000000000000000000000000..f50021f9bef8fddbe81c28190bd2668e58edc169 --- /dev/null +++ b/Assets/pedang.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 19a0da156b253817a95a9ecc68e44110 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/shotgun-firing-3-14483.mp3 b/Assets/shotgun-firing-3-14483.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..55cc8e4e0a0ddd18754aba5e5452aa0b0a99f6bf --- /dev/null +++ b/Assets/shotgun-firing-3-14483.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d277f8642795240cc42e3320057603603e75ff2dbff516935f5ebe495f6975f4 +size 39360 diff --git a/Assets/shotgun-firing-3-14483.mp3.meta b/Assets/shotgun-firing-3-14483.mp3.meta new file mode 100644 index 0000000000000000000000000000000000000000..0fe2749d3a24b4eded70335182b87a8e479505e4 --- /dev/null +++ b/Assets/shotgun-firing-3-14483.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7b534d839f6c9a353ac7de2d6c87e217 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/whoosh-transitions-sfx-01-118227.mp3 b/Assets/whoosh-transitions-sfx-01-118227.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..0f05d32ba4f98bd56622fa629fb258c100b6d6c7 --- /dev/null +++ b/Assets/whoosh-transitions-sfx-01-118227.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5359fc08a11e1e41d5b7add2965ac2002f85cf752d91548373d35d91104d2287 +size 9216 diff --git a/Assets/whoosh-transitions-sfx-01-118227.mp3.meta b/Assets/whoosh-transitions-sfx-01-118227.mp3.meta new file mode 100644 index 0000000000000000000000000000000000000000..32599bb298d9b82e555f28b18cd1ce715be3599d --- /dev/null +++ b/Assets/whoosh-transitions-sfx-01-118227.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9d28ec8e73f0d45f99b7afc4882d01e4 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: