diff --git a/Assets/AI/Demon/Meteor.prefab b/Assets/AI/Demon/Meteor.prefab index 5aad2eefc..30505b8f9 100644 --- a/Assets/AI/Demon/Meteor.prefab +++ b/Assets/AI/Demon/Meteor.prefab @@ -9648,7 +9648,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 1410334711 currentTargetPoint: {x: 0, y: 0, z: 0} - speed: 15 + speed: 10 trackingTime: 1.5 arriveEpsilon: 0.35 maxLifetime: 30 diff --git a/Assets/AI/FSM/FSM_Demon.asset b/Assets/AI/FSM/FSM_Demon.asset index c3ff5b751..f860a6f12 100644 --- a/Assets/AI/FSM/FSM_Demon.asset +++ b/Assets/AI/FSM/FSM_Demon.asset @@ -235,8 +235,8 @@ MonoBehaviour: editingName: 0 meteorPrefab: {fileID: 1947871717301538, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} - behindBossDistance: 10 - aboveBossHeight: 20 + behindBossDistance: 6 + aboveBossHeight: 4 castDelay: 1.5 targetTag: Player overlayClip: {fileID: 7400088, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} @@ -1563,11 +1563,11 @@ MonoBehaviour: - decisions: - trueValue: 1 decision: {fileID: -7938248970223304488} - isValid: 1 + isValid: 0 validated: 0 - trueValue: 0 decision: {fileID: 1848419507865303702} - isValid: 0 + isValid: 1 validated: 0 trueState: {fileID: 766956384951898899} falseState: {fileID: 0} @@ -1599,11 +1599,11 @@ MonoBehaviour: - decisions: - trueValue: 1 decision: {fileID: 8113515040269600600} - isValid: 1 + isValid: 0 validated: 0 - trueValue: 0 decision: {fileID: 1848419507865303702} - isValid: 0 + isValid: 1 validated: 0 trueState: {fileID: 9112689765763526057} falseState: {fileID: 0} @@ -1635,7 +1635,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: -6379838510941931433} - isValid: 0 + isValid: 1 validated: 0 - trueValue: 1 decision: {fileID: 2998305265418220943} diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity index 466153a57..52e071787 100644 --- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity @@ -1893,6 +1893,69 @@ Material: - _TintColor: {r: 0.47794116, g: 0, b: 0, a: 0.728} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!1001 &168759813 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1865215210} + m_Modifications: + - target: {fileID: 1947871717301538, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_Name + value: Meteor + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalPosition.x + value: -0.15 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalPosition.z + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} +--- !u!4 &168759814 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4209731392266258, guid: f99aa3faf46a5f94985344f44aaf21aa, + type: 3} + m_PrefabInstance: {fileID: 168759813} + m_PrefabAsset: {fileID: 0} --- !u!1 &170780850 GameObject: m_ObjectHideFlags: 0 @@ -14650,7 +14713,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1609097983679703347, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + insertIndex: 0 + addedObject: {fileID: 168759814} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe3f8cbdaa5d03147a0de1c74712d32b, type: 3} --- !u!1 &868342459 @@ -23790,6 +23857,12 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1865215210 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1609097983679703347, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + m_PrefabInstance: {fileID: 861395855} + m_PrefabAsset: {fileID: 0} --- !u!4 &1886116475 stripped Transform: m_CorrespondingSourceObject: {fileID: 6858198192782613031, guid: 851e8e61247888340bdec90fc8aa37f5,