From e672bbd20dd230c5d79c26068b154a5e06f97b5c Mon Sep 17 00:00:00 2001 From: Vladdie Date: Sat, 30 Apr 2022 14:03:59 -0500 Subject: [PATCH] changes to arrow --- Assets/Scenes/Game-Mountain.unity | 50 +++++++++++++-------------- Assets/Scripts/Enemy scripts/Arrow.cs | 9 +++-- UserSettings/EditorUserSettings.asset | 4 +-- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 29aa597..74915ed 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -1680,7 +1680,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -9323,7 +9323,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -10234,7 +10234,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -20536,7 +20536,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -25955,7 +25955,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -37461,7 +37461,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -40742,7 +40742,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c7c0e77f9d86f246a98035477e22afa, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -50492,7 +50492,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -61586,7 +61586,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -62723,7 +62723,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -68540,7 +68540,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -69125,7 +69125,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -95438,7 +95438,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -135092,7 +135092,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -144868,7 +144868,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f3337b88e20674642a9d19171068eedf, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -159612,7 +159612,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -186947,7 +186947,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -211550,7 +211550,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -244784,7 +244784,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -260986,7 +260986,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -267526,7 +267526,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -292276,7 +292276,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -306084,7 +306084,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 21333c8c82f2ff24bbfb0194f8835a84, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -306256,7 +306256,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 4 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -327393,7 +327393,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name diff --git a/Assets/Scripts/Enemy scripts/Arrow.cs b/Assets/Scripts/Enemy scripts/Arrow.cs index 6544626..92dfe3f 100644 --- a/Assets/Scripts/Enemy scripts/Arrow.cs +++ b/Assets/Scripts/Enemy scripts/Arrow.cs @@ -4,13 +4,13 @@ using System.Collections; using UnityEngine; public class Arrow : NetworkBehaviour { - private Vector3 target; - private bool isLive = false; - private Vector3 dir = Vector3.zero; + public Vector3 target; + public bool isLive = false; + public Vector3 dir = Vector3.zero; public float speed = 90f; - [SerializeField] private float bumpPower = 30; + [SerializeField] public float bumpPower = 30; @@ -64,7 +64,6 @@ public class Arrow : NetworkBehaviour { // Is called whenever something collides with the bumper void OnTriggerEnter(Collider objectHit) { - if (objectHit != null) { return; } if (objectHit.gameObject.tag == "ArcherTarget") { //Checks if the other object is the player diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 82661be..7cd1ae9 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,10 +24,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb