diff --git a/Assets/Audio/Enviornment.meta b/Assets/Audio/Enviornment.meta new file mode 100644 index 0000000..c8a8406 --- /dev/null +++ b/Assets/Audio/Enviornment.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0a7cec05a5b98a48955a57890f8a064 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Enviornment/SX_Obstacle_Ballista_Fire_01.wav b/Assets/Audio/Enviornment/SX_Obstacle_Ballista_Fire_01.wav new file mode 100644 index 0000000..2c955ca Binary files /dev/null and b/Assets/Audio/Enviornment/SX_Obstacle_Ballista_Fire_01.wav differ diff --git a/Assets/Audio/Enviornment/SX_Obstacle_Ballista_Fire_01.wav.meta b/Assets/Audio/Enviornment/SX_Obstacle_Ballista_Fire_01.wav.meta new file mode 100644 index 0000000..fc3b93c --- /dev/null +++ b/Assets/Audio/Enviornment/SX_Obstacle_Ballista_Fire_01.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fc616ee51273cf4469982cbd6e6ea1c6 +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/Audio/Enviornment/SX_Obstacle_General_Place_01.wav b/Assets/Audio/Enviornment/SX_Obstacle_General_Place_01.wav new file mode 100644 index 0000000..774b7ea Binary files /dev/null and b/Assets/Audio/Enviornment/SX_Obstacle_General_Place_01.wav differ diff --git a/Assets/Audio/Enviornment/SX_Obstacle_General_Place_01.wav.meta b/Assets/Audio/Enviornment/SX_Obstacle_General_Place_01.wav.meta new file mode 100644 index 0000000..23960bb --- /dev/null +++ b/Assets/Audio/Enviornment/SX_Obstacle_General_Place_01.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 20e00a2cb085c3e4f8d642d437011043 +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/Audio/Enviornment/SX_Obstacle_PinballBumper_Hit_01.wav b/Assets/Audio/Enviornment/SX_Obstacle_PinballBumper_Hit_01.wav new file mode 100644 index 0000000..05fe560 Binary files /dev/null and b/Assets/Audio/Enviornment/SX_Obstacle_PinballBumper_Hit_01.wav differ diff --git a/Assets/Audio/Enviornment/SX_Obstacle_PinballBumper_Hit_01.wav.meta b/Assets/Audio/Enviornment/SX_Obstacle_PinballBumper_Hit_01.wav.meta new file mode 100644 index 0000000..95448ff --- /dev/null +++ b/Assets/Audio/Enviornment/SX_Obstacle_PinballBumper_Hit_01.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b5cac7d89a180194cbe3f024155b9f83 +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/Prefabs/Environment/Archer/Archer.prefab b/Assets/Prefabs/Environment/Archer/Archer.prefab index 7d9deaf..c259989 100644 --- a/Assets/Prefabs/Environment/Archer/Archer.prefab +++ b/Assets/Prefabs/Environment/Archer/Archer.prefab @@ -447,6 +447,7 @@ GameObject: - component: {fileID: 6689294808140859936} - component: {fileID: 8721692118063281005} - component: {fileID: 4856672042659442783} + - component: {fileID: 2545033675054052017} m_Layer: 0 m_Name: Archer m_TagString: Untagged @@ -495,6 +496,7 @@ MonoBehaviour: rotationSpeed: 10 ArrowPrefab: {fileID: 26604539265034267, guid: 0e61ec06fdabb014bb1868596534f8b7, type: 3} firePoint: {fileID: 4784627841241590487} + fireSound: {fileID: 2545033675054052017} --- !u!114 &8721692118063281005 MonoBehaviour: m_ObjectHideFlags: 0 @@ -560,6 +562,102 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!82 &2545033675054052017 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689294808140859937} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: fc616ee51273cf4469982cbd6e6ea1c6, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + 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 &7232804557796252435 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Enemy scripts/Archer.cs b/Assets/Scripts/Enemy scripts/Archer.cs index b0e2b73..1eb79e3 100644 --- a/Assets/Scripts/Enemy scripts/Archer.cs +++ b/Assets/Scripts/Enemy scripts/Archer.cs @@ -24,8 +24,11 @@ public class Archer : NetworkBehaviour public Transform ArrowPrefab; public Transform firePoint; + public AudioSource fireSound; + private GameObject arrowInScene; + // Start is called before the first frame update void Start() { // Only the host should update targetting @@ -92,6 +95,7 @@ public class Archer : NetworkBehaviour if (target != null && shootingCooldown <= 0f) { Vector3 position = target.position; ShootArrowServerRPC(position); + fireSound.Play(); shootingCooldown = 1f/ fireRate; } diff --git a/Assets/Scripts/Enemy scripts/Arrow.cs b/Assets/Scripts/Enemy scripts/Arrow.cs index 4656470..ec84055 100644 --- a/Assets/Scripts/Enemy scripts/Arrow.cs +++ b/Assets/Scripts/Enemy scripts/Arrow.cs @@ -12,6 +12,8 @@ public class Arrow : NetworkBehaviour { [SerializeField] private float bumpPower = 30; + + //finds targed public void Seek(UnityEngine.Vector3 _target) { //can also do effects, speed on the bullet, damage amount, etc. diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index fe0aebd..1ffce13 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,29 +12,29 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b180b651f3c272428041c30eae93a3dd6e225fda92f31352d1b flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0