diff --git a/Assets/_CompletedAssets/Prefabs/ShotgunLine.prefab b/Assets/_CompletedAssets/Prefabs/ShotgunLine.prefab index bcfb6d8ad262641ea149eb4c8f1710426d1ed039..57efcca0f1e386081018ddf3d41483bd7635b23d 100644 --- a/Assets/_CompletedAssets/Prefabs/ShotgunLine.prefab +++ b/Assets/_CompletedAssets/Prefabs/ShotgunLine.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 8849857974068889211} - component: {fileID: 5238843749234509961} + - component: {fileID: 8715392843248018793} m_Layer: 0 m_Name: ShotgunLine m_TagString: Untagged @@ -136,3 +137,25 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!114 &8715392843248018793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9209258724073731464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 175848193c5e7f148bff2f9d0dacbc3f, type: 3} + m_Name: + m_EditorClassIdentifier: + damagePerAttack: 0 + timeBetweenAttack: 0 + powerUp: 0 + isUsed: 0 + isPlayerOwner: 1 + range: 10 + bulletsPerShoot: 7 + inaccuracyDistance: 2 + shotgunLine: {fileID: 0} + faceLight: {fileID: 0} diff --git a/Assets/_CompletedAssets/Scripts/Weapons/Shotgun.cs b/Assets/_CompletedAssets/Scripts/Weapons/Shotgun.cs index daf60dedd7bf6a8bd89a73d715d6535bf7dfe510..67e95b5eabb03e7c92d6bfacb6b033e47b084706 100644 --- a/Assets/_CompletedAssets/Scripts/Weapons/Shotgun.cs +++ b/Assets/_CompletedAssets/Scripts/Weapons/Shotgun.cs @@ -98,10 +98,6 @@ namespace CompleteProject IEnumerator DestroyLine(GameObject shootLineObject) { float timeDisplay = timeBetweenAttack* effectsDisplayTime; - if (enemyHealth.currentHealth <= 0) { - timeDisplay = 0; - } - while (timeDisplay > 0) { timeDisplay-= Time.deltaTime; yield return null; diff --git a/Assets/_CompletedAssets/Scripts/Weapons/ShotgunLine.cs b/Assets/_CompletedAssets/Scripts/Weapons/ShotgunLine.cs new file mode 100644 index 0000000000000000000000000000000000000000..4c7a252b7c1c389b5665311e50f0c1932dbe3754 --- /dev/null +++ b/Assets/_CompletedAssets/Scripts/Weapons/ShotgunLine.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace CompleteProject +{ + public class ShotgunLine : MonoBehaviour + { + // public GameObject shotgunLine; + + void Awake() + { + // Create a layer mask for the Shootable layer. + Destroy(gameObject, 0.1f); + } + } +} \ No newline at end of file diff --git a/Assets/_CompletedAssets/Scripts/Weapons/ShotgunLine.cs.meta b/Assets/_CompletedAssets/Scripts/Weapons/ShotgunLine.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..bf703b195f896e11ba77712de524cfbd515a6e59 --- /dev/null +++ b/Assets/_CompletedAssets/Scripts/Weapons/ShotgunLine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 175848193c5e7f148bff2f9d0dacbc3f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: