diff --git a/Assets/Animation/DemoAnimCont.controller b/Assets/Animation/DemoAnimCont.controller
index f0091af8478e440b76105f0ed1904937a88b221a..33d42d7e1c11219f9b1d0c2dccc388f6b4303725 100644
--- a/Assets/Animation/DemoAnimCont.controller
+++ b/Assets/Animation/DemoAnimCont.controller
@@ -72,10 +72,10 @@ AnimatorStateMachine:
m_Position: {x: -930, y: -710, z: 0}
- serializedVersion: 1
m_State: {fileID: -3598405539660271968}
- m_Position: {x: -110, y: -60, z: 0}
+ m_Position: {x: -130, y: -60, z: 0}
- serializedVersion: 1
m_State: {fileID: -559945096527024752}
- m_Position: {x: 30, y: -20, z: 0}
+ m_Position: {x: -60, y: -180, z: 0}
- serializedVersion: 1
m_State: {fileID: -7662852991570609333}
m_Position: {x: -930, y: -860, z: 0}
@@ -111,10 +111,8 @@ AnimatorStateMachine:
m_Position: {x: -720, y: -50, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- - {fileID: 5672730045910559782}
- {fileID: -4207306183555998510}
- {fileID: -2490007414861408632}
- - {fileID: 7811862424673922177}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -177,6 +175,19 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!114 &-5677519925833175889
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5fbc260995126864fa282c516333cb50, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ stopAttackingDistance: 10
--- !u!1102 &-5406021241023745067
AnimatorState:
serializedVersion: 6
@@ -213,7 +224,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 2
- m_ConditionEvent: isMoving
+ m_ConditionEvent: isChasing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3386475665903461414}
@@ -225,7 +236,7 @@ AnimatorStateTransition:
m_TransitionOffset: 0
m_ExitTime: 0.9483471
m_HasExitTime: 0
- m_HasFixedDuration: 1
+ m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@@ -288,7 +299,9 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -5225358317953329473}
- m_StateMachineBehaviours: []
+ - {fileID: 7294712563980727361}
+ m_StateMachineBehaviours:
+ - {fileID: 4385255203883211487}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -393,8 +406,10 @@ AnimatorState:
m_Name: Demon|Shoot1
m_Speed: 2
m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
+ m_Transitions:
+ - {fileID: 3406999575806121299}
+ m_StateMachineBehaviours:
+ - {fileID: -5677519925833175889}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -472,38 +487,38 @@ AnimatorController:
m_Name: DemoAnimCont
serializedVersion: 5
m_AnimatorParameters:
- - m_Name: Attack
+ - m_Name: Run
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: Run
+ - m_Name: Damaged
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: Damaged
+ - m_Name: Die
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: Die
+ - m_Name: Shoot
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: isMoving
+ - m_Name: isAttacking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: Shoot
- m_Type: 9
+ - m_Name: isChasing
+ m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
@@ -548,6 +563,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &1805689232521941239
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 3386475665903461414}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.7844827
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &2024956899172425831
AnimatorState:
serializedVersion: 6
@@ -575,6 +612,20 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!114 &2331426070324036276
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2b9481fc1b72308498db766500cd2b72, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ idleTime: 0
+ detectionAreaRadius: 50
--- !u!1102 &2366477326876693888
AnimatorState:
serializedVersion: 6
@@ -614,7 +665,8 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 5653717242115008750}
- m_StateMachineBehaviours: []
+ m_StateMachineBehaviours:
+ - {fileID: 2331426070324036276}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -630,6 +682,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &3406999575806121299
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 2
+ m_ConditionEvent: isAttacking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -3598405539660271968}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.1
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8991935
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &3692755630637599100
AnimatorState:
serializedVersion: 6
@@ -694,7 +771,8 @@ AnimatorState:
m_Name: Demon|Get-damage
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: 1805689232521941239}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -711,6 +789,21 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!114 &4385255203883211487
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 878739fc82a3d9647b16047b917dceca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ chaseSpeed: 3
+ stopChasingDistance: 21
+ attackingDistance: 10
--- !u!1102 &5059992649267543909
AnimatorState:
serializedVersion: 6
@@ -747,7 +840,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
- m_ConditionEvent: isMoving
+ m_ConditionEvent: isChasing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3598405539660271968}
@@ -759,32 +852,7 @@ AnimatorStateTransition:
m_TransitionOffset: 0
m_ExitTime: 0.9483471
m_HasExitTime: 0
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
---- !u!1101 &5672730045910559782
-AnimatorStateTransition:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: Attack
- m_EventTreshold: 0
- m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1576319320708969274}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0.25
- m_TransitionOffset: 0
- m_ExitTime: 0.75
- m_HasExitTime: 0
- m_HasFixedDuration: 1
+ m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@@ -842,6 +910,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &7294712563980727361
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: isAttacking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -559945096527024752}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.1
+ m_TransitionOffset: 0
+ m_ExitTime: 0.9483471
+ m_HasExitTime: 0
+ m_HasFixedDuration: 0
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &7446140799436774745
AnimatorState:
serializedVersion: 6
@@ -923,31 +1016,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1101 &7811862424673922177
-AnimatorStateTransition:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: Shoot
- m_EventTreshold: 0
- m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: -559945096527024752}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0.25
- m_TransitionOffset: 0
- m_ExitTime: 0.75
- m_HasExitTime: 0
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
--- !u!1102 &9203091667843522827
AnimatorState:
serializedVersion: 6
diff --git a/Assets/Animation/Demon.fbx.meta b/Assets/Animation/Demon.fbx.meta
index 971c102a6e413b9169a6269e7640f6fb25707d0f..1cc972fb79034e9ea11252bffb4d2d39c50f17c7 100644
--- a/Assets/Animation/Demon.fbx.meta
+++ b/Assets/Animation/Demon.fbx.meta
@@ -450,7 +450,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
- loopTime: 0
+ loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
diff --git a/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Demon.prefab b/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Demon.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..2b085491408413a27c3f6fef4a182836db33af45
--- /dev/null
+++ b/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Demon.prefab
@@ -0,0 +1,349 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &208206302859983185
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 704072451697791476}
+ m_Layer: 0
+ m_Name: AttackPoint1 (2)
+ m_TagString: DemonAtkPoint
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &704072451697791476
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 208206302859983185}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.00566, y: 0.00468, z: 0.00148}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1959795103463432177}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &357213369212992582
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 743178913079332026}
+ m_Layer: 0
+ m_Name: AttackPoint1 (1)
+ m_TagString: DemonAtkPoint
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &743178913079332026
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 357213369212992582}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.00277, y: 0.00966, z: -0.00271}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1959795103463432177}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6237511595293278117
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5944364167880170427}
+ m_Layer: 0
+ m_Name: AttackPoint1
+ m_TagString: DemonAtkPoint
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5944364167880170427
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6237511595293278117}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.00093, y: 0.01202, z: 0.00305}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1959795103463432177}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &6452329696435258504
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.4
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.4
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.4
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 5.886
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -2.97
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_Name
+ value: Demon
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_TagString
+ value: Enemy
+ objectReference: {fileID: 0}
+ - target: {fileID: 1041781708020795772, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: de0e9e622d89126479a89df28f1dd942, type: 2}
+ - target: {fileID: 4281138625131155463, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 743485f4fbbac50488eb186ffd67e4a7, type: 2}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: -4415268234345407623, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 5944364167880170427}
+ - targetCorrespondingSourceObject: {fileID: -4415268234345407623, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 743178913079332026}
+ - targetCorrespondingSourceObject: {fileID: -4415268234345407623, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 704072451697791476}
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 9070017204314413568}
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2116437814060357323}
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2992733197648141700}
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 6101070847805783052}
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: -1804337221023529904}
+ m_SourcePrefab: {fileID: 100100000, guid: c3d73ba06daaeef40b556c623d33fc02, type: 3}
+--- !u!4 &1959795103463432177 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -4415268234345407623, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ m_PrefabInstance: {fileID: 6452329696435258504}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &6145775758820735449 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c3d73ba06daaeef40b556c623d33fc02,
+ type: 3}
+ m_PrefabInstance: {fileID: 6452329696435258504}
+ m_PrefabAsset: {fileID: 0}
+--- !u!95 &9070017204314413568
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6145775758820735449}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 8437027a25bfa1345832449c3b1d1fbf, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &2116437814060357323
+NavMeshAgent:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6145775758820735449}
+ m_Enabled: 1
+ m_AgentTypeID: 0
+ m_Radius: 0.5
+ m_Speed: 3.5
+ m_Acceleration: 8
+ avoidancePriority: 50
+ m_AngularSpeed: 120
+ m_StoppingDistance: 0
+ m_AutoTraverseOffMeshLink: 1
+ m_AutoBraking: 1
+ m_AutoRepath: 1
+ m_Height: 2
+ m_BaseOffset: 0
+ m_WalkableMask: 4294967295
+ m_ObstacleAvoidanceType: 4
+--- !u!114 &2992733197648141700
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6145775758820735449}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 10b4eb38ab974dd40b87d27a6f284453, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ spawnObject: {fileID: 8375146908231575235, guid: f2eb78a592a2b6c428c7793ce6cdf576,
+ type: 3}
+--- !u!136 &6101070847805783052
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6145775758820735449}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 136
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 1.78
+ m_Height: 6.54
+ m_Direction: 1
+ m_Center: {x: 0, y: 2.58, z: 0}
+--- !u!114 &-1804337221023529904
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6145775758820735449}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5e78361fee1604c44badcdb080681990, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ isDead: 0
+ type: Demon
+ sightDistance: 20
+ fieldOfView: 85
+ eyeHeight: 0
+ gunBarrel: {fileID: 0}
+ fireRate: 1.3
+ damage: 10
+ health: 100
+ deathTimer: 0
+ orbs:
+ - {fileID: 5103332666229170312, guid: 2c3f0080d55ebce4a8a8eba4af526b26, type: 3}
+ - {fileID: 5103332666229170312, guid: 43cdafe18d6d82045a04c1ac7cab091c, type: 3}
+ - {fileID: 5103332666229170312, guid: eab3796f0cddb994f89da3c619ad0c2e, type: 3}
+ droppedGold: 50
diff --git a/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Demon.prefab.meta b/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Demon.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f626656e9a440dd429d67ee5da1d9856edcce10d
--- /dev/null
+++ b/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Demon.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: de5b8f5296745e1478f98ef3a2e8e487
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Materials/Demon_default_mat.mat b/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Materials/Demon_default_mat.mat
index 06a91a91475bc9606b2f87d89197bbb82ff40767..05be4a0218ccffb6c350e986a1ba8d77d22c407d 100644
--- a/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Materials/Demon_default_mat.mat
+++ b/Assets/Prefabs/Enemies/Demon Horror Creature with Weapon/Materials/Demon_default_mat.mat
@@ -9,19 +9,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Demon_default_mat
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
+ m_Parent: {fileID: 2100000, guid: 0fc11aa9ba67b934c966d099ba2f6648, type: 2}
+ m_ModifiedSerializedProperties: 22
m_ValidKeywords:
- - _METALLICSPECGLOSSMAP
+ - _ALPHATEST_ON
- _NORMALMAP
+ - _RECEIVE_SHADOWS_OFF
+ - _SPECULAR_SETUP
m_InvalidKeywords:
- _METALLICGLOSSMAP
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
+ m_LightmapFlags: 6
+ m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2450
stringTagMap:
- RenderType: Opaque
+ RenderType: TransparentCutout
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
@@ -35,22 +37,6 @@ Material:
m_Texture: {fileID: 2800000, guid: 266ef81647f1aeb489ad3444dcfd4d50, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- - _DetailAlbedoMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailNormalMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _EmissionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: eb5e388e52c40024b8906c20526ff7ca, type: 3}
m_Scale: {x: 1, y: 1}
@@ -63,65 +49,19 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- - _ParallaxMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _SpecGlossMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - unity_Lightmaps:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - unity_LightmapsInd:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - unity_ShadowMasks:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- - _AlphaClip: 0
- - _AlphaToMask: 0
- - _Blend: 0
- - _BlendModePreserveSpecular: 1
- - _BumpScale: 1
- - _ClearCoatMask: 0
- - _ClearCoatSmoothness: 0
- - _Cull: 2
- - _Cutoff: 0.5
- - _DetailAlbedoMapScale: 1
- - _DetailNormalMapScale: 1
- - _DstBlend: 0
- - _DstBlendAlpha: 0
- - _EnvironmentReflections: 1
+ - _AlphaClip: 1
+ - _AlphaToMask: 1
+ - _BumpScale: 3
+ - _Cutoff: 0.62
- _GlossMapScale: 0.329
- _Glossiness: 0.5
- - _GlossyReflections: 1
- - _Metallic: 0
- - _Mode: 0
- - _OcclusionStrength: 1
- - _Parallax: 0.02
- - _QueueOffset: 0
- - _ReceiveShadows: 1
- - _Smoothness: 0.329
+ - _ReceiveShadows: 0
+ - _Smoothness: 0.34
- _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
- - _SrcBlend: 1
- - _SrcBlendAlpha: 1
- - _Surface: 0
- - _UVSec: 0
- - _WorkflowMode: 1
- - _ZWrite: 1
- m_Colors:
- - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+ - _WorkflowMode: 0
+ m_Colors: []
m_BuildTextureStacks: []
--- !u!114 &5227153845110640691
MonoBehaviour:
diff --git a/Assets/Script/Bot/Enemy/Demon.meta b/Assets/Script/Bot/Enemy/Demon.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fe7870ba39f5eefe7d7a4a86da2f205daad9ce3b
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 743ea30d96034844283b0bc5cc7311e3
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Script/Bot/Enemy/Demon/Demon.cs b/Assets/Script/Bot/Enemy/Demon/Demon.cs
new file mode 100644
index 0000000000000000000000000000000000000000..aa1ae0a87806d31f848f020c2f30edef6f6939b9
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/Demon.cs
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Demon : MonoBehaviour
+{
+ public GameObject spawnObject;
+ private bool isSpawnReady;
+ private float spawnCooldown = 5f;
+ void Start()
+ {
+ isSpawnReady = true;
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ if (isSpawnReady)
+ {
+ isSpawnReady=false;
+ SpawnSlave();
+ }
+ }
+
+ private void SpawnSlave()
+ {
+ Instantiate(spawnObject, gameObject.transform.position, Quaternion.identity);
+ StartCoroutine(SpawnReady());
+ }
+
+ private IEnumerator SpawnReady()
+ {
+ yield return new WaitForSeconds(spawnCooldown);
+ isSpawnReady = true;
+ }
+}
diff --git a/Assets/Script/Bot/Enemy/Demon/Demon.cs.meta b/Assets/Script/Bot/Enemy/Demon/Demon.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..a1cf49796887234ddececc7e7e1dcbe9becc443e
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/Demon.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 10b4eb38ab974dd40b87d27a6f284453
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Script/Bot/Enemy/Demon/DemonAttackState.cs b/Assets/Script/Bot/Enemy/Demon/DemonAttackState.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1bc8e4de7de643b794b22a23f9b0c14b8dbf7622
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/DemonAttackState.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.AI;
+using static UnityEngine.EventSystems.EventTrigger;
+
+public class DemonAttackState : StateMachineBehaviour
+{
+ Transform player;
+ NavMeshAgent agent;
+ float timer;
+ private bool isReadyShoot = true;
+ float attackdelay;
+ public float stopAttackingDistance = 10f;
+
+ override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ player = GameObject.FindGameObjectWithTag("Player").transform;
+ agent = animator.GetComponent<NavMeshAgent>();
+ timer = 2.48f;
+ }
+
+ override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ /*LookAtPlayer();*/
+ attackdelay += Time.deltaTime;
+ if (attackdelay >= 0.4715 && isReadyShoot)
+ {
+ isReadyShoot = false;
+ Debug.Log("SHOOT");
+ Shoot(animator);
+ }
+ timer += Time.deltaTime;
+ if (timer >= 1.24)
+ {
+ timer = 0;
+ isReadyShoot = true;
+ }
+ animator.gameObject.transform.LookAt(player);
+ double timing = (29 / 25);
+ timing = timing / 2.48;
+ /*Debug.Log(timer);*/
+ float distanceFromPlayer = Vector3.Distance(player.position, animator.transform.position);
+ if (distanceFromPlayer > stopAttackingDistance)
+ {
+ // Debug.Log("Gak kena");
+ animator.SetBool("isAttacking", false);
+ }
+ }
+
+ private void Shoot(Animator animator)
+ {
+ Enemy enemy = animator.gameObject.GetComponent<Enemy>();
+ GameObject[] attackPoints = GameObject.FindGameObjectsWithTag("DemonAtkPoint");
+ foreach (var attackPoint in attackPoints)
+ {
+ GameObject bullet = Instantiate(Resources.Load("Prefabs/Bullet") as GameObject, attackPoint.transform.position, enemy.transform.rotation);
+ Bullet bull = bullet.GetComponent<Bullet>();
+ bull.damage = enemy.damage;
+ bull.target = "Player";
+ Vector3 shootDirection = (enemy.Player.transform.position - attackPoint.transform.position).normalized;
+ bullet.GetComponent<Rigidbody>().velocity = Quaternion.AngleAxis(UnityEngine.Random.Range(-3f, 3f), Vector3.up) * shootDirection * 40;
+
+ }
+ attackdelay = 0;
+ }
+
+ override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+
+ }
+
+ private void LookAtPlayer()
+ {
+ Vector3 direction = player.position - agent.transform.position;
+ agent.transform.rotation = Quaternion.LookRotation(direction);
+
+ var yRotation = agent.transform.eulerAngles.y;
+ agent.transform.rotation = Quaternion.Euler(0, yRotation, 0);
+ }
+}
diff --git a/Assets/Script/Bot/Enemy/Demon/DemonAttackState.cs.meta b/Assets/Script/Bot/Enemy/Demon/DemonAttackState.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f838718e15be53c9d09fd5234ee7c1cbee75838c
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/DemonAttackState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5fbc260995126864fa282c516333cb50
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Script/Bot/Enemy/Demon/DemonChaseState.cs b/Assets/Script/Bot/Enemy/Demon/DemonChaseState.cs
new file mode 100644
index 0000000000000000000000000000000000000000..79a53ba555f9950ad981bd0187eaa7c517b533a3
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/DemonChaseState.cs
@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.AI;
+
+public class DemonChaseState : StateMachineBehaviour
+{
+ NavMeshAgent agent;
+ Transform player;
+
+ public float chaseSpeed = 3f;
+
+ public float stopChasingDistance = 21;
+ public float attackingDistance = 2.5f;
+
+ override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ player = GameObject.FindGameObjectWithTag("Player").transform;
+ agent = animator.GetComponent<NavMeshAgent>();
+
+ agent.speed = chaseSpeed;
+ }
+
+ override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ agent.SetDestination(player.transform.position);
+ animator.gameObject.transform.LookAt(player);
+
+ float distanceFromPlayer = Vector3.Distance(player.position, animator.transform.position);
+
+ if (distanceFromPlayer > stopChasingDistance)
+ {
+ animator.SetBool("isChasing", false);
+ }
+
+ if (distanceFromPlayer < attackingDistance)
+ {
+ animator.SetBool("isAttacking", true);
+ }
+ }
+
+ override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ agent.SetDestination(agent.transform.position);
+ }
+}
diff --git a/Assets/Script/Bot/Enemy/Demon/DemonChaseState.cs.meta b/Assets/Script/Bot/Enemy/Demon/DemonChaseState.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..59cfa33e6df7415c9a4ef00f08f55281b73a81c6
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/DemonChaseState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 878739fc82a3d9647b16047b917dceca
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Script/Bot/Enemy/Demon/DemonIdleState.cs b/Assets/Script/Bot/Enemy/Demon/DemonIdleState.cs
new file mode 100644
index 0000000000000000000000000000000000000000..5dca157680eceb96605fbbe3f4cd10efe7092633
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/DemonIdleState.cs
@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DemonIdleState : StateMachineBehaviour
+{
+ float timer;
+ public float idleTime = 0f;
+
+ Transform player;
+
+ public float detectionAreaRadius = 50f;
+
+ override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ timer = 0;
+ player = GameObject.FindGameObjectWithTag("Player").transform;
+ }
+
+ override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+
+
+ float distanceFromPlayer = Vector3.Distance(player.position, animator.transform.position);
+ if (distanceFromPlayer < detectionAreaRadius)
+ {
+ animator.SetBool("isChasing", true);
+ }
+ }
+}
diff --git a/Assets/Script/Bot/Enemy/Demon/DemonIdleState.cs.meta b/Assets/Script/Bot/Enemy/Demon/DemonIdleState.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..966b8233362e5610d1ea9224a62cb882bf1cb335
--- /dev/null
+++ b/Assets/Script/Bot/Enemy/Demon/DemonIdleState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2b9481fc1b72308498db766500cd2b72
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Script/Bot/Enemy/Enemy.cs b/Assets/Script/Bot/Enemy/Enemy.cs
index 370911770e289e1e876ae23942150d02c6d430e0..aa32fb23a56b8b257c5280e6af3d7d0308cece9b 100644
--- a/Assets/Script/Bot/Enemy/Enemy.cs
+++ b/Assets/Script/Bot/Enemy/Enemy.cs
@@ -10,7 +10,7 @@ public class Enemy : MonoBehaviour
private NavMeshAgent agent;
private GameObject player;
private Animator animator;
- private bool isDead;
+ public bool isDead;
public NavMeshAgent Agent { get => agent; }
@@ -49,6 +49,7 @@ public class Enemy : MonoBehaviour
private IEnumerator DestroyEnemy()
{
+ Debug.Log("Mati");
yield return new WaitForSeconds(4f);
Destroy(gameObject);
}
diff --git a/Assets/Script/Bot/Enemy/Slave State.meta b/Assets/Script/Bot/Enemy/Slave.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State.meta
rename to Assets/Script/Bot/Enemy/Slave.meta
diff --git a/Assets/Script/Bot/Enemy/Slave State/Claw.cs b/Assets/Script/Bot/Enemy/Slave/Claw.cs
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/Claw.cs
rename to Assets/Script/Bot/Enemy/Slave/Claw.cs
diff --git a/Assets/Script/Bot/Enemy/Slave State/Claw.cs.meta b/Assets/Script/Bot/Enemy/Slave/Claw.cs.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/Claw.cs.meta
rename to Assets/Script/Bot/Enemy/Slave/Claw.cs.meta
diff --git a/Assets/Script/Bot/Enemy/Slave State/Slave.cs b/Assets/Script/Bot/Enemy/Slave/Slave.cs
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/Slave.cs
rename to Assets/Script/Bot/Enemy/Slave/Slave.cs
diff --git a/Assets/Script/Bot/Enemy/Slave State/Slave.cs.meta b/Assets/Script/Bot/Enemy/Slave/Slave.cs.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/Slave.cs.meta
rename to Assets/Script/Bot/Enemy/Slave/Slave.cs.meta
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveAttackState.cs b/Assets/Script/Bot/Enemy/Slave/SlaveAttackState.cs
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveAttackState.cs
rename to Assets/Script/Bot/Enemy/Slave/SlaveAttackState.cs
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveAttackState.cs.meta b/Assets/Script/Bot/Enemy/Slave/SlaveAttackState.cs.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveAttackState.cs.meta
rename to Assets/Script/Bot/Enemy/Slave/SlaveAttackState.cs.meta
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveChaseState.cs b/Assets/Script/Bot/Enemy/Slave/SlaveChaseState.cs
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveChaseState.cs
rename to Assets/Script/Bot/Enemy/Slave/SlaveChaseState.cs
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveChaseState.cs.meta b/Assets/Script/Bot/Enemy/Slave/SlaveChaseState.cs.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveChaseState.cs.meta
rename to Assets/Script/Bot/Enemy/Slave/SlaveChaseState.cs.meta
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveHand.cs b/Assets/Script/Bot/Enemy/Slave/SlaveHand.cs
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveHand.cs
rename to Assets/Script/Bot/Enemy/Slave/SlaveHand.cs
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveHand.cs.meta b/Assets/Script/Bot/Enemy/Slave/SlaveHand.cs.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveHand.cs.meta
rename to Assets/Script/Bot/Enemy/Slave/SlaveHand.cs.meta
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveIdleState.cs b/Assets/Script/Bot/Enemy/Slave/SlaveIdleState.cs
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveIdleState.cs
rename to Assets/Script/Bot/Enemy/Slave/SlaveIdleState.cs
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlaveIdleState.cs.meta b/Assets/Script/Bot/Enemy/Slave/SlaveIdleState.cs.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlaveIdleState.cs.meta
rename to Assets/Script/Bot/Enemy/Slave/SlaveIdleState.cs.meta
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlavePatrolState.cs b/Assets/Script/Bot/Enemy/Slave/SlavePatrolState.cs
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlavePatrolState.cs
rename to Assets/Script/Bot/Enemy/Slave/SlavePatrolState.cs
diff --git a/Assets/Script/Bot/Enemy/Slave State/SlavePatrolState.cs.meta b/Assets/Script/Bot/Enemy/Slave/SlavePatrolState.cs.meta
similarity index 100%
rename from Assets/Script/Bot/Enemy/Slave State/SlavePatrolState.cs.meta
rename to Assets/Script/Bot/Enemy/Slave/SlavePatrolState.cs.meta
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 9929d0b3ae1a464c63fa518684f6ec07774000f8..8bd1cae30ada7a3efef80ef377c60d3c2c046bef 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -12,6 +12,7 @@ TagManager:
- HUD
- Virtual Camera
- Sword
+ - DemonAtkPoint
- Pet
layers:
- Default