diff --git a/Assets/AI/FSM/FSM_Demon.asset b/Assets/AI/FSM/FSM_Demon.asset index f860a6f12..d78a0bc6c 100644 --- a/Assets/AI/FSM/FSM_Demon.asset +++ b/Assets/AI/FSM/FSM_Demon.asset @@ -236,7 +236,7 @@ MonoBehaviour: meteorPrefab: {fileID: 1947871717301538, guid: f99aa3faf46a5f94985344f44aaf21aa, type: 3} behindBossDistance: 6 - aboveBossHeight: 4 + aboveBossHeight: 6 castDelay: 1.5 targetTag: Player overlayClip: {fileID: 7400088, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} @@ -635,7 +635,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: 7927421991537792917} - isValid: 1 + isValid: 0 validated: 0 trueState: {fileID: -312774025800194259} falseState: {fileID: 0} @@ -1092,7 +1092,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3} m_Name: FSM_Demon m_EditorClassIdentifier: - selectedNode: {fileID: 4162026404432437805} + selectedNode: {fileID: 9112689765763526057} wantConnection: 0 connectionNode: {fileID: 0} showProperties: 1 @@ -1264,11 +1264,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 790 + x: 785 y: 185 width: 150 height: 62 - positionRect: {x: 790, y: 185} + positionRect: {x: 785, y: 185} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1287,13 +1287,13 @@ MonoBehaviour: parentState: {fileID: 766956384951898899} trueRect: serializedVersion: 2 - x: 780 + x: 775 y: 215 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 940 + x: 935 y: 225 width: 10 height: 10 @@ -1563,11 +1563,11 @@ MonoBehaviour: - decisions: - trueValue: 1 decision: {fileID: -7938248970223304488} - isValid: 0 + isValid: 1 validated: 0 - trueValue: 0 decision: {fileID: 1848419507865303702} - isValid: 1 + isValid: 0 validated: 0 trueState: {fileID: 766956384951898899} falseState: {fileID: 0} @@ -1599,11 +1599,11 @@ MonoBehaviour: - decisions: - trueValue: 1 decision: {fileID: 8113515040269600600} - isValid: 0 + isValid: 1 validated: 0 - trueValue: 0 decision: {fileID: 1848419507865303702} - isValid: 1 + isValid: 0 validated: 0 trueState: {fileID: 9112689765763526057} falseState: {fileID: 0} @@ -1635,7 +1635,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: -6379838510941931433} - isValid: 1 + isValid: 0 validated: 0 - trueValue: 1 decision: {fileID: 2998305265418220943} @@ -1754,7 +1754,7 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 0 - isSelected: 1 + isSelected: 0 nodeRect: serializedVersion: 2 x: 790 @@ -1950,7 +1950,7 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 1 - isSelected: 0 + isSelected: 1 nodeRect: serializedVersion: 2 x: 790 diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity index 52e071787..466153a57 100644 --- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity @@ -1893,69 +1893,6 @@ 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 @@ -14713,11 +14650,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1609097983679703347, guid: fe3f8cbdaa5d03147a0de1c74712d32b, - type: 3} - insertIndex: 0 - addedObject: {fileID: 168759814} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe3f8cbdaa5d03147a0de1c74712d32b, type: 3} --- !u!1 &868342459 @@ -23857,12 +23790,6 @@ 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,