diff --git a/Assets/Animation/Quest3/PolicePistolAC.controller b/Assets/Animation/Quest3/PolicePistolAC.controller index 0eecdb60156b4cf1be9ba4cd0fee408dda9e8209..0f68cdfcfaab3fb69aa1ab4a7b27819bf661682e 100644 --- a/Assets/Animation/Quest3/PolicePistolAC.controller +++ b/Assets/Animation/Quest3/PolicePistolAC.controller @@ -129,7 +129,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 59bf1829938c045949c3eea9dad66c4d, type: 3} + m_Motion: {fileID: -203655887218126122, guid: 809229448ca194cfd81889eb1020986d, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -200,19 +200,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PlayerDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Shooting 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/EnemyQuest2/Ironman.prefab b/Assets/Prefabs/EnemyQuest2/Ironman.prefab index 90bb157415a08a9c49abd81d22b68912ce0b2ee7..db767d3e6a4b6d43a14c23cc56ed535b95aec8ff 100644 --- a/Assets/Prefabs/EnemyQuest2/Ironman.prefab +++ b/Assets/Prefabs/EnemyQuest2/Ironman.prefab @@ -5162,6 +5162,7 @@ MonoBehaviour: attackEndOffset: 0.2 attackDamage: 2 range: 100 + restTime: 3 anim: {fileID: 8455970826929332194} enemyHealth: {fileID: 8455970826929332219} shootableMask: diff --git a/Assets/Prefabs/EnemyQuest3/PolicePistol.prefab b/Assets/Prefabs/EnemyQuest3/PolicePistol.prefab index 0391d3ef97b9485f4e50c0bff3b75d6f92101f48..eed3b441d5f307ba6b55a8a0a641c71bba1ee6b8 100644 --- a/Assets/Prefabs/EnemyQuest3/PolicePistol.prefab +++ b/Assets/Prefabs/EnemyQuest3/PolicePistol.prefab @@ -153,7 +153,7 @@ GameObject: - component: {fileID: 6450476087473441181} - component: {fileID: 6450476087473441183} - component: {fileID: 6450476087473441185} - - component: {fileID: 6450476087473441184} + - component: {fileID: 7675565710638059007} m_Layer: 6 m_Name: PolicePistol m_TagString: Enemy @@ -385,7 +385,7 @@ MonoBehaviour: sinkSpeed: 2.5 scoreValue: 10 deathClip: {fileID: 0} ---- !u!114 &6450476087473441184 +--- !u!114 &7675565710638059007 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -394,7 +394,7 @@ MonoBehaviour: m_GameObject: {fileID: 301545098197076323} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 77bfe5952477444b3a2b8b150cab53cd, type: 3} + m_Script: {fileID: 11500000, guid: d608ed5b718b04ce0a337570601b57f0, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &468456287810166087 @@ -10683,6 +10683,7 @@ MonoBehaviour: attackEndOffset: 0.2 attackDamage: 3 range: 100 + restTime: 4 anim: {fileID: 6450476087473441187} enemyHealth: {fileID: 6450476087473441185} shootableMask: diff --git a/Assets/Prefabs/Map.meta b/Assets/Prefabs/Map.meta new file mode 100644 index 0000000000000000000000000000000000000000..9b0271880b1d2d6fe7752e1f51fef550e608e311 --- /dev/null +++ b/Assets/Prefabs/Map.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69d7adabc279042258f1f9a2b97544a5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyShootingAttack.cs b/Assets/Scripts/Enemy/EnemyShootingAttack.cs index 00ef5e5d0a2809de1591666539ee76f5b5018f8b..e60171ba5a41f889eaaf246d88d0a5db9bf1cdf3 100644 --- a/Assets/Scripts/Enemy/EnemyShootingAttack.cs +++ b/Assets/Scripts/Enemy/EnemyShootingAttack.cs @@ -8,6 +8,7 @@ public class EnemyShootingAttack : MonoBehaviour public float attackEndOffset = 0.5f; public int attackDamage = 10; public float range = 100f; + public float restTime = 1f; public Animator anim; GameObject player; @@ -57,7 +58,7 @@ public class EnemyShootingAttack : MonoBehaviour gunLight.enabled = false; } return; - } else { + } else if (animating == false && rest == false){ anim.SetBool("Shooting", true); } timer += Time.deltaTime; @@ -83,7 +84,7 @@ public class EnemyShootingAttack : MonoBehaviour } } - if (rest == true && timer >= 1f) { + if (rest == true && timer >= restTime) { rest = false; anim.SetBool("Shooting", true); timer = 0f;