From 8067a01b8e0c024874b59868f1edee7facd6bb2f Mon Sep 17 00:00:00 2001 From: marcin Date: Fri, 5 Sep 2025 15:26:40 +0200 Subject: [PATCH 1/7] animation fixes, combo trigger break, new attack animation settings --- Assets/AI/Demon/DestroyableTurret.cs | 4 +- .../Bow/Materials/Adam_body_Metal.mat | 13 + .../Bow/Materials/Adam_head_metal.mat | 13 + .../Bow/Materials/Bow.mat | 13 + .../Bow/Materials/Eva_Body_Metal.mat | 13 + .../Bow/Materials/Eva_Head_Metal.mat | 13 + .../Bow/Materials/Helmet.mat | 13 + ...nvector@MeleeCombat Player PRO2.controller | 178 +- Assets/Scenes/Fight_Arena/Fight_Arena.unity | 37 +- .../bMeleeAttackControl.cs | 15 +- .../InvectorDerivatives/bMeleeCombatInput.cs | 4 + Assets/Settings/High_PipelineAsset.asset | 2 + Assets/Settings/LWRP-HighQuality.asset | 2 + Assets/Settings/Low_PipelineAsset.asset | 2 + Assets/Settings/Medium_PipelineAsset.asset | 2 + Assets/Settings/Very Low_PipelineAsset.asset | 2 + .../Attack_Combo_02_04_Anim.FBX.meta | 587 +++-- .../Animations/Longsword_Animset_pt2.fbx.meta | 1887 +++++++++++++---- .../Vampire/Materials/VampArmsLegs_MAT.mat | 2 +- .../Vampire/Materials/VampEyeRetinaMAT.mat | 3 +- .../Models/Vampire/Materials/VampHeadMAT.mat | 2 +- .../Models/Vampire/Materials/VampTorsoMAT.mat | 2 +- 22 files changed, 2077 insertions(+), 732 deletions(-) diff --git a/Assets/AI/Demon/DestroyableTurret.cs b/Assets/AI/Demon/DestroyableTurret.cs index 949ff2e9f..808c44e72 100644 --- a/Assets/AI/Demon/DestroyableTurret.cs +++ b/Assets/AI/Demon/DestroyableTurret.cs @@ -339,13 +339,12 @@ namespace DemonBoss.Magic Gizmos.DrawWireCube(transform.position + Vector3.up * 2f, Vector3.one * 0.5f); // HP text in Scene View -#if UNITY_EDITOR if (Application.isPlaying) { UnityEditor.Handles.Label(transform.position + Vector3.up * 2.5f, $"HP: {currentHealth}/{maxHealth}"); } -#endif } +#endif public void AddHealth(int value) { @@ -362,6 +361,5 @@ namespace DemonBoss.Magic throw new System.NotImplementedException(); } -#endif } } \ No newline at end of file diff --git a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat index 496f4a05d..149197550 100644 --- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat +++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4038453504596325930 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat index 1c9b0fed0..5e744515b 100644 --- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat +++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat @@ -134,3 +134,16 @@ Material: - _SpecColor: {r: 0.625, g: 0.7206896, b: 1, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!114 &5618362483761361914 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 diff --git a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat index e52485211..51ac6cfc9 100644 --- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat +++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat @@ -129,3 +129,16 @@ Material: - _SpecColor: {r: 0.8602941, g: 0.89594316, b: 1, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!114 &6956751399976171411 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 diff --git a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat index a8a35460b..a76e75eb9 100644 --- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat +++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7691346883607124648 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat index 62db43aad..09abfc824 100644 --- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat +++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4499385966301197659 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Helmet.mat b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Helmet.mat index bcc8498c2..4572b5b1c 100644 --- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Helmet.mat +++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Helmet.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1019187969406195858 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller index 14e591460..1ab9c2fa7 100644 --- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller +++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller @@ -22,6 +22,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2074274001345678418} +--- !u!1101 &-9191327555805306621 +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: 1102861933717182418} + m_Solo: 0 + m_Mute: 1 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6808511 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-9143515860420698953 AnimatorState: serializedVersion: 6 @@ -738,7 +760,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9c0e8cc669ad24ae3bcdae73fa4c003b, type: 3} m_Name: m_EditorClassIdentifier: - startDamage: 0.3 + startDamage: 0.2 endDamage: 0.4 damageMultiplier: 0 recoilID: 1 @@ -758,9 +780,9 @@ MonoBehaviour: positionLerpSpeed: 2 stoppingDistance: 1.2 useComboTimingWindow: 1 - comboWindowStartTime: 0.5 - comboWindowDuration: 0.2 - comboWindowTimeScale: 0.3 + comboWindowStartTime: 0.7 + comboWindowDuration: 0.4 + comboWindowTimeScale: 0.2 useAttackTimeScale: 0 maxTargetDistance: 3 lowHealthTh: 10 @@ -769,7 +791,7 @@ MonoBehaviour: attackTimeScaleEnd: 0.37 rotatePlayerTowardsTarget: 1 degreeThreshold: 100 - debug: 1 + debug: 0 --- !u!1101 &-8051095333111886674 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -2715,7 +2737,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9c0e8cc669ad24ae3bcdae73fa4c003b, type: 3} m_Name: m_EditorClassIdentifier: - startDamage: 0.4 + startDamage: 0.3 endDamage: 0.5 damageMultiplier: 2 recoilID: 2 @@ -2736,8 +2758,8 @@ MonoBehaviour: stoppingDistance: 1.2 useComboTimingWindow: 1 comboWindowStartTime: 0.6 - comboWindowDuration: 0.2 - comboWindowTimeScale: 0.3 + comboWindowDuration: 0.4 + comboWindowTimeScale: 0.2 useAttackTimeScale: 1 maxTargetDistance: 3 lowHealthTh: 30 @@ -4604,6 +4626,24 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!114 &-2385230577109390366 +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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} + m_Name: + m_EditorClassIdentifier: + stateInfos: [] + debug: 0 + tags: + - tagName: Attack + tagType: 3 + normalizedTime: {x: 0.1, y: 0.8} --- !u!206 &-2382170802819547054 BlendTree: m_ObjectHideFlags: 1 @@ -4832,6 +4872,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1951197489304851175 +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: -262143111545491946} + m_Solo: 0 + m_Mute: 1 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.99222386 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1890823228988152332 AnimatorState: serializedVersion: 6 @@ -5163,8 +5225,8 @@ MonoBehaviour: stoppingDistance: 1.2 useComboTimingWindow: 1 comboWindowStartTime: 0.6 - comboWindowDuration: 0.2 - comboWindowTimeScale: 0.3 + comboWindowDuration: 0.4 + comboWindowTimeScale: 0.2 useAttackTimeScale: 1 maxTargetDistance: 3 lowHealthTh: 10 @@ -6086,6 +6148,36 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction +--- !u!1102 &-262143111545491946 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: A1 + m_Speed: 1.4 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3665975024854504718} + - {fileID: -9191327555805306621} + m_StateMachineBehaviours: + - {fileID: -2385230577109390366} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 1 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 6399467581995111687, guid: fb07a934dbc1969468121112ca048964, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1109 &-164828508768324166 AnimatorTransition: m_ObjectHideFlags: 1 @@ -29503,10 +29595,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.23156369 - m_TransitionOffset: 0.05401399 - m_ExitTime: 0.7634842 - m_HasExitTime: 1 + m_TransitionDuration: 0.17750603 + m_TransitionOffset: 0.12662058 + m_ExitTime: 0.8490755 + m_HasExitTime: 0 m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -33828,10 +33920,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.09166676 - m_TransitionOffset: 0.012494694 - m_ExitTime: 0.617021 - m_HasExitTime: 1 + m_TransitionDuration: 0.15347171 + m_TransitionOffset: 0.008216396 + m_ExitTime: 0.8888667 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -36601,12 +36693,13 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: A + m_Name: A0 m_Speed: 1.3 m_CycleOffset: 0 m_Transitions: - {fileID: 1101963861138605418} - {fileID: 1101255493625229458} + - {fileID: -1951197489304851175} m_StateMachineBehaviours: - {fileID: 114405241802589726} - {fileID: 114667135945300734} @@ -40730,30 +40823,33 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102466317250516052} - m_Position: {x: 240, y: 120, z: 0} + m_Position: {x: 170, y: 140, z: 0} - serializedVersion: 1 m_State: {fileID: 1102861933717182418} - m_Position: {x: 240, y: 50, z: 0} + m_Position: {x: 170, y: 20, z: 0} - serializedVersion: 1 m_State: {fileID: 1102186001672383516} - m_Position: {x: 240, y: -10, z: 0} + m_Position: {x: 400, y: -50, z: 0} - serializedVersion: 1 m_State: {fileID: 2206263804988382436} - m_Position: {x: 240, y: -120, z: 0} + m_Position: {x: 390, y: -140, z: 0} - serializedVersion: 1 m_State: {fileID: -493156934175870501} m_Position: {x: -30, y: -130, z: 0} - serializedVersion: 1 m_State: {fileID: -3801079781883241350} m_Position: {x: 270, y: -330, z: 0} + - serializedVersion: 1 + m_State: {fileID: -262143111545491946} + m_Position: {x: 440, y: 150, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 48, y: 60, z: 0} - m_EntryPosition: {x: 30, y: 120, z: 0} - m_ExitPosition: {x: 528, y: 60, z: 0} + m_AnyStatePosition: {x: 10, y: 60, z: 0} + m_EntryPosition: {x: -30, y: 140, z: 0} + m_ExitPosition: {x: 680, y: 40, z: 0} m_ParentStateMachinePosition: {x: 710, y: -50, z: 0} m_DefaultState: {fileID: 1102466317250516052} --- !u!1107 &1107517961391708756 @@ -46053,6 +46149,28 @@ MonoBehaviour: - tagName: LockRotation tagType: 3 normalizedTime: {x: 0.35, y: 0.65} +--- !u!1101 &3665975024854504718 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8717949 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!114 &3671708723907702589 MonoBehaviour: m_ObjectHideFlags: 1 @@ -48772,10 +48890,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.33513224 - m_TransitionOffset: 0 - m_ExitTime: 0.8191499 - m_HasExitTime: 1 + m_TransitionDuration: 0.26323152 + m_TransitionOffset: 0.018871611 + m_ExitTime: 0.8424806 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity index f1d3698ed..833176fe3 100644 --- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity @@ -17110,7 +17110,7 @@ PrefabInstance: - target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: -26.000061 + value: -26 objectReference: {fileID: 0} - target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -18565,12 +18565,12 @@ PrefabInstance: - target: {fileID: 5657452459766331955, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5657452459766331955, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5671630659928648966, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -19374,7 +19374,9 @@ MonoBehaviour: m_sunLight: {fileID: 1976683114} m_moonLight: {fileID: 0} WeatherPresent: 0 + WeatherSystem: {fileID: 0} m_sunLightExists: 1 + m_moonLightExists: 0 --- !u!4 &1013064392 Transform: m_ObjectHideFlags: 10 @@ -22865,6 +22867,8 @@ MonoBehaviour: x: 250 y: 250 z: 250 + m_allFloatingPointFixMembers: [] + m_allWorldSpaceParticleSystems: [] m_originTargetTileX: 0 m_originTargetTileZ: 0 m_terrainUnloadMemoryTreshold: 4294967296 @@ -23177,6 +23181,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05db168aa73c6d7489b4930e8ac0f2ce, type: 3} +--- !u!1 &1776088664 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + m_PrefabInstance: {fileID: 1993521574} + m_PrefabAsset: {fileID: 0} --- !u!1 &1785581995 GameObject: m_ObjectHideFlags: 0 @@ -24305,7 +24315,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1993521576} m_SourcePrefab: {fileID: 100100000, guid: ca5617ade2be349c3826daac1e6fdcf2, type: 3} --- !u!4 &1993521575 stripped Transform: @@ -24313,6 +24327,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1993521574} m_PrefabAsset: {fileID: 0} +--- !u!114 &1993521576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1776088664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5547fefaea58c4174adccc95d48c54ae, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OnTimeScaleChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2002250978 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs b/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs index 6c7d78093..5b985eebb 100644 --- a/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs +++ b/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs @@ -198,13 +198,18 @@ namespace Invector.vMelee // The TimeController now reliably handles resetting the time scale via its own coroutine. // A manual reset here is no longer necessary and could cause conflicts. -/* - if (mFighter != null && resetAttackTrigger) + /* + if (mFighter != null && resetAttackTrigger) + { + mFighter.ResetAttackTriggers(); + if (debug) Debug.Log($"({damageType}) Final trigger reset on exit due to 'Reset Attack Trigger' flag."); + } + */ + if (_comboWindowEffectTriggered && TimeController.Instance != null) { - mFighter.ResetAttackTriggers(); - if (debug) Debug.Log($"({damageType}) Final trigger reset on exit due to 'Reset Attack Trigger' flag."); + _comboWindowEffectTriggered = false; + TimeController.Instance.Reset(); } -*/ if (_characterController != null && _isRotationLockedByThis) { _characterController.lockRotation = false; diff --git a/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs b/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs index 079222d0e..fc3e26549 100644 --- a/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs +++ b/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs @@ -148,6 +148,10 @@ namespace Beyond { cc.animator.SetInteger(vAnimatorParameters.AttackID, AttackID); cc.animator.SetTrigger(vAnimatorParameters.WeakAttack); + if (TimeController.Instance != null) + { + TimeController.Instance.Reset(); // Ensure normal time scale on attack start + } } public virtual void MeleeStrongAttackInput() diff --git a/Assets/Settings/High_PipelineAsset.asset b/Assets/Settings/High_PipelineAsset.asset index 64ba3c7e7..d03540950 100644 --- a/Assets/Settings/High_PipelineAsset.asset +++ b/Assets/Settings/High_PipelineAsset.asset @@ -129,6 +129,8 @@ MonoBehaviour: m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterReflectionProbeBlending: 1 + m_PrefilterReflectionProbeBoxProjection: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/Settings/LWRP-HighQuality.asset b/Assets/Settings/LWRP-HighQuality.asset index 2ca5abe9b..66ba2e05d 100644 --- a/Assets/Settings/LWRP-HighQuality.asset +++ b/Assets/Settings/LWRP-HighQuality.asset @@ -129,6 +129,8 @@ MonoBehaviour: m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterReflectionProbeBlending: 0 + m_PrefilterReflectionProbeBoxProjection: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 2 m_Textures: diff --git a/Assets/Settings/Low_PipelineAsset.asset b/Assets/Settings/Low_PipelineAsset.asset index 5d7c40b17..bfa877d1c 100644 --- a/Assets/Settings/Low_PipelineAsset.asset +++ b/Assets/Settings/Low_PipelineAsset.asset @@ -129,6 +129,8 @@ MonoBehaviour: m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterReflectionProbeBlending: 1 + m_PrefilterReflectionProbeBoxProjection: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/Settings/Medium_PipelineAsset.asset b/Assets/Settings/Medium_PipelineAsset.asset index a6197f824..a83f88d3f 100644 --- a/Assets/Settings/Medium_PipelineAsset.asset +++ b/Assets/Settings/Medium_PipelineAsset.asset @@ -129,6 +129,8 @@ MonoBehaviour: m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterReflectionProbeBlending: 1 + m_PrefilterReflectionProbeBoxProjection: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/Settings/Very Low_PipelineAsset.asset b/Assets/Settings/Very Low_PipelineAsset.asset index f4bce9cd6..2b580adf5 100644 --- a/Assets/Settings/Very Low_PipelineAsset.asset +++ b/Assets/Settings/Very Low_PipelineAsset.asset @@ -129,6 +129,8 @@ MonoBehaviour: m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterReflectionProbeBlending: 1 + m_PrefilterReflectionProbeBoxProjection: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/SwordAnimsetPro/Animations/RootPlace/Attack_Combo_02_04_Anim.FBX.meta b/Assets/SwordAnimsetPro/Animations/RootPlace/Attack_Combo_02_04_Anim.FBX.meta index 962c7397e..00937aee6 100644 --- a/Assets/SwordAnimsetPro/Animations/RootPlace/Attack_Combo_02_04_Anim.FBX.meta +++ b/Assets/SwordAnimsetPro/Animations/RootPlace/Attack_Combo_02_04_Anim.FBX.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 guid: 33155b0e0a894984aaa6d5beee3b6e77 +AssetOrigin: + serializedVersion: 1 + productId: 269483 + packageName: One Handed Sword Animset Pro + packageVersion: 1.0 + assetPath: Assets/SwordAnimsetPro/Animations/RootPlace/Attack_Combo_02_04_Anim.FBX + uploadId: 738342 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: 1827226128182048838 @@ -19,8 +26,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -47,11 +52,11 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 1 + loopTime: 0 loopBlend: 0 loopBlendOrientation: 1 loopBlendPositionY: 1 - loopBlendPositionXZ: 1 + loopBlendPositionXZ: 0 keepOriginalOrientation: 1 keepOriginalPositionY: 1 keepOriginalPositionXZ: 1 @@ -212,6 +217,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -239,6 +245,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -412,14 +419,6 @@ ModelImporter: value: {x: 0, y: 0, z: 0} length: 0 modified: 0 - - boneName: ball_r - humanName: RightToes - limit: - min: {x: 0, y: 0, z: 0} - max: {x: 0, y: 0, z: 0} - value: {x: 0, y: 0, z: 0} - length: 0 - modified: 0 - boneName: thumb_01_l humanName: Left Thumb Proximal limit: @@ -669,400 +668,357 @@ ModelImporter: length: 0 modified: 0 skeleton: - - name: Armature(Clone) + - name: Attack_Combo_02_04_Anim(Clone) parentName: position: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: 0, w: 1} scale: {x: 1, y: 1, z: 1} - - name: Geometry - parentName: Armature(Clone) - position: {x: -0, y: 0, z: 0} - rotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: Armature_Mesh 1 - parentName: Geometry - position: {x: -0, y: 0, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - name: root - parentName: Armature(Clone) - position: {x: -0, y: 0, z: 0} - rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - scale: {x: 1, y: 1, z: 1} - - name: ik_foot_root - parentName: root - position: {x: -0, y: 0, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: ik_foot_l - parentName: ik_foot_root - position: {x: -0.1707627, y: 0.080721274, z: 0.13465731} - rotation: {x: 0.020529665, y: 0.71223336, z: -0.01172283, w: 0.7015445} - scale: {x: 1, y: 1, z: 1} - - name: ik_foot_r - parentName: ik_foot_root - position: {x: 0.17076288, y: 0.08072148, z: 0.13465573} - rotation: {x: 0.70154446, y: 0.011725438, z: 0.71223336, w: -0.020532234} - scale: {x: 1, y: 1, z: 1} - - name: ik_hand_root - parentName: root - position: {x: -0, y: 0, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: ik_hand_gun - parentName: ik_hand_root - position: {x: 0.56646097, y: 0.0033541175, z: 1.1167965} - rotation: {x: 0.6188494, y: 0.069541104, z: -0.38913622, w: 0.67879486} - scale: {x: 1, y: 1, z: 1} - - name: ik_hand_l - parentName: ik_hand_gun - position: {x: -0.77885526, y: -0.6960196, z: 0.43869558} - rotation: {x: 0.68747425, y: 0.61435777, z: -0.38722563, w: -0.000000527876} - scale: {x: 1, y: 1, z: 1} - - name: ik_hand_r - parentName: ik_hand_gun - position: {x: -0, y: 0, z: 0} - rotation: {x: 0.000000007450579, y: 0.0000000074505784, z: -0.000000089406946, - w: 1} - scale: {x: 1, y: 1, z: 1} + parentName: Attack_Combo_02_04_Anim(Clone) + position: {x: 0.00000019311905, y: -0.00000045776366, z: 0.000000054563714} + rotation: {x: -0.7071068, y: 0.00000034771128, z: 0.000000094830334, w: 0.7071068} + scale: {x: 1.0000007, y: 1.0000008, z: 1.0000005} - name: pelvis parentName: root - position: {x: 1.6940659e-23, y: 0.010561532, z: 0.967506} - rotation: {x: 0.0012919111, y: 0.7071056, z: 0.0012919111, w: 0.70710564} - scale: {x: 1, y: 1, z: 1} - - name: Weapon_Waist - parentName: pelvis - position: {x: -0.033212814, y: -0.013039031, z: -0.22270256} - rotation: {x: -0.27525714, y: 0.67732406, z: 0.5421512, w: -0.41417116} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.0015526001, y: 0, z: 0.89949095} + rotation: {x: -0.180187, y: 0.7303708, z: -0.0602064, w: 0.6560993} + scale: {x: 1, y: 1, z: 1.0000001} - name: spine_01 parentName: pelvis - position: {x: -0.10808952, y: -0.008514154, z: -1.0004442e-13} - rotation: {x: 1.9816575e-12, y: -1.2530104e-13, z: 0.06238869, w: 0.99805194} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.1080888, y: -0.008514154, z: 0.000000019073486} + rotation: {x: 0.071059406, y: -0.025649605, z: 0.098846145, w: 0.9922309} + scale: {x: 1.0000001, y: 1, z: 0.99999994} - name: spine_02 parentName: spine_01 - position: {x: -0.1887535, y: 0.0380116, z: 5.9673766e-10} - rotation: {x: 1.9856304e-12, y: -8.666872e-15, z: -0.122419976, w: 0.99247843} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.1887535, y: 0.03801159, z: 0} + rotation: {x: 0.1130694, y: -0.045137748, z: 0.23324236, w: 0.9647673} + scale: {x: 0.99999994, y: 1, z: 0.99999994} - name: spine_03 parentName: spine_02 - position: {x: -0.13407394, y: 0.0042047976, z: 1.1823431e-13} - rotation: {x: 1.5723038e-12, y: 2.2838824e-13, z: -0.02425258, w: 0.9997059} - scale: {x: 1, y: 1, z: 1} - - name: Weapon_B_B - parentName: spine_03 - position: {x: -0.13291, y: 0.17242967, z: -0.08474755} - rotation: {x: -0.077171534, y: 0.9732335, z: 0.009727723, w: 0.21625552} - scale: {x: 1, y: 1, z: 1} - - name: Weapon_B_A - parentName: spine_03 - position: {x: -0.1443399, y: 0.1984746, z: 0.08800269} - rotation: {x: 0.21625581, y: 0.009727914, z: 0.97323346, w: -0.07717145} - scale: {x: 0.999999, y: 1.000001, z: 1} - - name: neck_01 - parentName: spine_03 - position: {x: -0.16558838, y: -0.0035531996, z: -5.9652394e-10} - rotation: {x: 7.9457805e-13, y: -3.4253748e-14, z: 0.20371033, w: 0.9790312} - scale: {x: 1, y: 1, z: 1} - - name: head - parentName: neck_01 - position: {x: -0.09283508, y: 0.00364151, z: -5.002221e-14} - rotation: {x: 3.9399622e-13, y: -6.0260296e-14, z: -0.13354221, w: 0.99104315} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.13407329, y: 0.00420475, z: 0.000000028610229} + rotation: {x: 0.026746681, y: 0.04008734, z: 0.05746506, w: 0.99718374} + scale: {x: 1.0000001, y: 1.0000001, z: 0.9999999} - name: clavicle_l parentName: spine_03 - position: {x: -0.118836515, y: -0.027320823, z: -0.037819855} - rotation: {x: 0.15407036, y: -0.7262773, z: -0.066704944, w: 0.66658384} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.11883682, y: -0.027320862, z: -0.037819825} + rotation: {x: -0.013658353, y: -0.7949734, z: 0.14171273, w: 0.58970183} + scale: {x: 1.0000001, y: 1, z: 0.9999998} - name: upperarm_l parentName: clavicle_l - position: {x: -0.15784876, y: 5.9604643e-10, z: -0.00000030517577} - rotation: {x: 0.059959687, y: 0.03741067, z: 0.15131606, w: 0.9859558} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.15784872, y: 0, z: -0.00000015258789} + rotation: {x: 0.2841912, y: 0.1619693, z: -0.055562634, w: 0.9433526} + scale: {x: 0.9999998, y: 0.9999997, z: 0.99999976} - name: lowerarm_l parentName: upperarm_l - position: {x: -0.3033992, y: 0.000000019073486, z: -0.00000015258789} - rotation: {x: -0.061964918, y: 0.029636784, z: 0.027705546, w: 0.9972534} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.30339924, y: 0.000000009536743, z: 0.000000076293944} + rotation: {x: -0.057504058, y: 0.0030879676, z: 0.01000784, w: 0.9982904} + scale: {x: 1.0000001, y: 1.0000001, z: 1} - name: hand_l parentName: lowerarm_l - position: {x: -0.2697512, y: 0.000000057220458, z: -0.00000022888183} - rotation: {x: -0.6178948, y: -0.019371929, z: -0.010653258, w: 0.7859499} - scale: {x: 1, y: 1, z: 1} - - name: Weapon_L - parentName: hand_l - position: {x: -0.09643631, y: 0.040368345, z: 0.0017903136} - rotation: {x: 0.77167386, y: 0.034539346, z: 0.6346724, w: 0.022746237} - scale: {x: 1, y: 1, z: 1} - - name: thumb_01_l - parentName: hand_l - position: {x: -0.047620315, y: 0.023749694, z: -0.025378227} - rotation: {x: 0.60051745, y: -0.29971117, z: 0.1853573, w: 0.7177706} - scale: {x: 1, y: 1.000001, z: 1} - - name: thumb_02_l - parentName: thumb_01_l - position: {x: -0.03869667, y: 0.000000076293944, z: 0.00000022888183} - rotation: {x: 0.002636432, y: -0.019812906, z: -0.029710047, w: 0.9993588} - scale: {x: 1, y: 1, z: 1} - - name: thumb_03_l - parentName: thumb_02_l - position: {x: -0.040621642, y: -0.000000076293944, z: 0.00000022888183} - rotation: {x: 0.021399122, y: -0.0018833969, z: 0.10793767, w: 0.9939256} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.26975146, y: 0, z: 0} + rotation: {x: -0.55782324, y: 0.062217917, z: 0.3209781, w: 0.7628467} + scale: {x: 0.9999998, y: 0.9999998, z: 1.0000001} - name: index_01_l parentName: hand_l - position: {x: -0.120681114, y: 0.017634582, z: -0.021093978} - rotation: {x: 0.13733824, y: 0.009896379, z: -0.13344933, w: 0.98144364} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.12068119, y: 0.017634582, z: -0.021093959} + rotation: {x: -0.042163815, y: 0.03351595, z: 0.020672167, w: 0.9983344} + scale: {x: 1.0000001, y: 1.0000002, z: 1} - name: index_02_l parentName: index_01_l - position: {x: -0.04287502, y: 0.000000076293944, z: 0.000000038146972} - rotation: {x: 0.01210087, y: 0.0010687108, z: -0.038368557, w: 0.99918985} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.04287506, y: 0, z: -0.000000057220458} + rotation: {x: 0.012641782, y: 0.00019268683, z: -0.031927325, w: 0.9994102} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} - name: index_03_l parentName: index_02_l - position: {x: -0.033938065, y: -0.00000015258789, z: -0.000000057220458} - rotation: {x: 0.010611094, y: -0.0078507885, z: 0.082855195, w: 0.9964742} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.033937987, y: 0, z: -0.000000038146972} + rotation: {x: 0.010061978, y: -0.014899413, z: -0.12724501, w: 0.9917084} + scale: {x: 1, y: 0.99999994, z: 1.0000001} - name: middle_01_l parentName: hand_l - position: {x: -0.12244266, y: 0.012936401, z: 0.0057115746} - rotation: {x: 0.029485751, y: 0.040345762, z: -0.1303333, w: 0.9902101} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.12244286, y: 0.012936363, z: 0.005711651} + rotation: {x: -0.10508478, y: 0.10453472, z: -0.08622286, w: 0.98518795} + scale: {x: 1, y: 1.0000001, z: 1} - name: middle_02_l parentName: middle_01_l - position: {x: -0.046403885, y: -0.00000030517577, z: -0.000000038146972} - rotation: {x: -0.018723572, y: -0.002837239, z: -0.038118426, w: 0.9990938} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.046403732, y: -0.000000076293944, z: 0.000000019073486} + rotation: {x: -0.020515025, y: -0.0010910779, z: -0.032421418, w: 0.9992632} + scale: {x: 0.9999998, y: 0.99999994, z: 1.0000001} - name: middle_03_l parentName: middle_02_l - position: {x: -0.03648865, y: 0, z: 0.000000019073486} - rotation: {x: 0.0016213919, y: 0.038867008, z: 0.13362402, w: 0.99026835} - scale: {x: 1, y: 1, z: 1} - - name: ring_01_l - parentName: hand_l - position: {x: -0.11497879, y: 0.0175354, z: 0.028469028} - rotation: {x: -0.09728434, y: 0.07056106, z: -0.116225, w: 0.9859253} - scale: {x: 1, y: 1, z: 1} - - name: ring_02_l - parentName: ring_01_l - position: {x: -0.044301756, y: 0, z: 0.000000028610229} - rotation: {x: 0.004327772, y: 0.004577195, z: -0.03747059, w: 0.9992779} - scale: {x: 1, y: 1, z: 1} - - name: ring_03_l - parentName: ring_02_l - position: {x: -0.034766767, y: 0, z: 0.000000019073486} - rotation: {x: -0.00019881252, y: -0.026257839, z: 0.11221317, w: 0.99333715} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.036488418, y: 0, z: 0} + rotation: {x: 0.0089297835, y: 0.048352133, z: -0.17108564, w: 0.98402846} + scale: {x: 1, y: 0.99999994, z: 1} - name: pinky_01_l parentName: hand_l - position: {x: -0.101406746, y: 0.022631224, z: 0.04643154} - rotation: {x: -0.13504837, y: 0.09653543, z: -0.08907403, w: 0.98209405} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.10140666, y: 0.02263153, z: 0.046431445} + rotation: {x: -0.30704668, y: 0.096554, z: -0.0697224, w: 0.94421315} + scale: {x: 1, y: 0.99999994, z: 1} - name: pinky_02_l parentName: pinky_01_l - position: {x: -0.03570995, y: 0.00000015258789, z: 0.000000019073486} - rotation: {x: 0.010402318, y: 0.004141426, z: -0.03848013, w: 0.9991967} - scale: {x: 1.000001, y: 1, z: 1} + position: {x: -0.035709858, y: -0.000000038146972, z: 0} + rotation: {x: 0.014888434, y: 0.00030022112, z: -0.020904124, w: 0.9996706} + scale: {x: 0.9999999, y: 1.0000001, z: 1} - name: pinky_03_l parentName: pinky_02_l - position: {x: -0.029856643, y: -0.00000030517577, z: 0} - rotation: {x: 0.0035809448, y: -0.033796344, z: -0.008930362, w: 0.99938244} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.029856281, y: 0, z: 0} + rotation: {x: 0.00018234825, y: -0.038848173, z: -0.31119236, w: 0.9495526} + scale: {x: 0.99999994, y: 1, z: 1.0000001} + - name: ring_01_l + parentName: hand_l + position: {x: -0.11497894, y: 0.017535247, z: 0.028469104} + rotation: {x: -0.17491661, y: 0.092290685, z: -0.08976502, w: 0.97612953} + scale: {x: 0.9999998, y: 1.0000001, z: 0.99999994} + - name: ring_02_l + parentName: ring_01_l + position: {x: -0.044301834, y: 0, z: 0} + rotation: {x: 0.009538977, y: 0.0007756277, z: -0.022933194, w: 0.9996912} + scale: {x: 0.9999999, y: 1.0000001, z: 0.9999999} + - name: ring_03_l + parentName: ring_02_l + position: {x: -0.034766443, y: 0, z: -0.000000038146972} + rotation: {x: 0.0010915702, y: -0.026316691, z: -0.1960736, w: 0.9802354} + scale: {x: 1, y: 1, z: 1.0000001} + - name: thumb_01_l + parentName: hand_l + position: {x: -0.04762043, y: 0.023749733, z: -0.025378188} + rotation: {x: 0.37738293, y: 0.023550505, z: 0.30923915, w: 0.87258166} + scale: {x: 1.0000001, y: 0.99999976, z: 1.0000002} + - name: thumb_02_l + parentName: thumb_01_l + position: {x: -0.038696717, y: -0.000000038146972, z: 0} + rotation: {x: -0.013729625, y: -0.01217588, z: -0.028283292, w: 0.99943155} + scale: {x: 1.0000002, y: 1.0000001, z: 1} + - name: thumb_03_l + parentName: thumb_02_l + position: {x: -0.04062171, y: 0.000000019073486, z: 0} + rotation: {x: -0.070657775, y: -0.016861392, z: -0.40833193, w: 0.9099386} + scale: {x: 1.0000002, y: 0.9999999, z: 1.0000002} - name: lowerarm_twist_01_l parentName: lowerarm_l - position: {x: -0.13999976, y: 0.000000057220458, z: -0.0000003814697} - rotation: {x: 0.000000014901163, y: -0.000000029802322, z: 0.0000000074505815, - w: 1} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.14000002, y: 0, z: 0.000000076293944} + rotation: {x: 0.00210536, y: -0.000001305833, z: -0.0000009397513, w: 0.9999978} + scale: {x: 0.99999994, y: 1, z: 1} - name: upperarm_twist_01_l parentName: upperarm_l - position: {x: -0.005000229, y: 0, z: -0.00000030517577} - rotation: {x: -0.0000000018626451, y: -0.000000014901161, z: -0.0000000018626451, + position: {x: -0.0049999235, y: 0.000000028610229, z: 0.000000076293944} + rotation: {x: 0.00000003166497, y: -0.00000013411046, z: 0.000000027939684, w: 1} - scale: {x: 1, y: 1, z: 1} + scale: {x: 0.99999994, y: 1, z: 1} - name: clavicle_r parentName: spine_03 - position: {x: -0.11883758, y: -0.027321015, z: 0.037820004} - rotation: {x: 0.7262779, y: 0.15407024, z: 0.66658336, w: 0.066704765} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.118837886, y: -0.027321015, z: 0.037820052} + rotation: {x: 0.7222737, y: 0.10238078, z: 0.68398726, w: 0.00055002596} + scale: {x: 1.0000001, y: 1.0000001, z: 0.99999994} - name: upperarm_r parentName: clavicle_r - position: {x: 0.15784794, y: -0.00000004887581, z: -0.00000045776366} - rotation: {x: 0.059959557, y: 0.037411354, z: 0.15131633, w: 0.9859557} + position: {x: 0.15784796, y: -0.000000038146972, z: -0.00000015258789} + rotation: {x: 0.20276237, y: -0.010564359, z: -0.043542232, w: 0.97820246} scale: {x: 1, y: 1, z: 1} - name: lowerarm_r parentName: upperarm_r - position: {x: 0.30340058, y: -0.000000095367426, z: 0.000000076293944} - rotation: {x: -0.06196519, y: 0.029635787, z: 0.02770495, w: 0.9972535} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.30340055, y: -0.000000038146972, z: 0.000000076293944} + rotation: {x: -0.056995496, y: 0.0049532373, z: 0.016129415, w: 0.9982319} + scale: {x: 0.99999994, y: 1.0000001, z: 1} - name: hand_r parentName: lowerarm_r - position: {x: 0.26975238, y: 0.00000032424927, z: -0.00000015258789} - rotation: {x: -0.6178948, y: -0.019371944, z: -0.010653205, w: 0.7859499} - scale: {x: 1, y: 1, z: 1} - - name: Weapon_R - parentName: hand_r - position: {x: 0.096437946, y: -0.040366516, z: -0.0017925262} - rotation: {x: -0.63467234, y: 0.022746397, z: 0.771674, w: -0.034538984} - scale: {x: 0.999999, y: 1, z: 1} - - name: Weapon_RS - parentName: Weapon_R - position: {x: 0.06393559, y: 0.046391904, z: 0.000000038146972} - rotation: {x: 0.000000014901161, y: -0.000000011175873, z: 0.000000007450582, - w: 1} - scale: {x: 1, y: 1, z: 1} - - name: thumb_01_r - parentName: hand_r - position: {x: 0.04762108, y: -0.02375099, z: 0.025378035} - rotation: {x: 0.60051656, y: -0.29970273, z: 0.1853537, w: 0.7177759} - scale: {x: 1, y: 1, z: 1} - - name: thumb_02_r - parentName: thumb_01_r - position: {x: 0.038695678, y: 0.0000011825562, z: 0.00000045776366} - rotation: {x: 0.0026337197, y: -0.019816674, z: -0.02969921, w: 0.99935895} - scale: {x: 1, y: 1, z: 1} - - name: thumb_03_r - parentName: thumb_02_r - position: {x: 0.040621795, y: 0.00000022888183, z: 0} - rotation: {x: 0.021398976, y: -0.0018833367, z: 0.1079377, w: 0.9939256} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.26975247, y: 0.00000028610228, z: 0.000000076293944} + rotation: {x: -0.6027654, y: 0.008233023, z: 0.28878984, w: 0.7437786} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000002} - name: index_01_r parentName: hand_r - position: {x: 0.12067932, y: -0.017637176, z: 0.021094246} - rotation: {x: 0.13733743, y: 0.009890859, z: -0.13346796, w: 0.9814413} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.12067939, y: -0.017637406, z: 0.021094264} + rotation: {x: -0.058504958, y: 0.028943041, z: -0.11037121, w: 0.99174476} + scale: {x: 1.0000001, y: 1, z: 1.0000001} - name: index_02_r parentName: index_01_r - position: {x: 0.04287689, y: 0.0000009155273, z: -0.00000072479247} - rotation: {x: 0.012102056, y: 0.0010692998, z: -0.03836711, w: 0.99918985} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.04287693, y: 0.00000087738033, z: -0.00000074386594} + rotation: {x: 0.01461357, y: -0.00006722842, z: -0.013046635, w: 0.9998081} + scale: {x: 1, y: 0.9999999, z: 1.0000001} - name: index_03_r parentName: index_02_r - position: {x: 0.033938218, y: 0.0000011444091, z: -0.00000036239624} - rotation: {x: 0.010611209, y: -0.007850793, z: 0.08285527, w: 0.99647415} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.033937987, y: 0.0000011825562, z: -0.00000017166137} + rotation: {x: 0.008849856, y: -0.022383938, z: -0.367978, w: 0.92952293} + scale: {x: 0.9999999, y: 1, z: 1} - name: middle_01_r parentName: hand_r - position: {x: 0.12244102, y: -0.012937317, z: -0.0057113455} - rotation: {x: 0.029485688, y: 0.040343083, z: -0.13032185, w: 0.9902118} + position: {x: 0.1224411, y: -0.012937393, z: -0.0057113073} + rotation: {x: -0.18307386, y: 0.039525136, z: -0.09938775, w: 0.97726345} scale: {x: 1, y: 1, z: 1} - name: middle_02_r parentName: middle_01_r - position: {x: 0.046405602, y: -0.0000012969971, z: 0.000000057220458} - rotation: {x: -0.01872324, y: -0.0028387778, z: -0.038139753, w: 0.999093} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.046405792, y: -0.000001373291, z: 0.0000000667572} + rotation: {x: -0.023135256, y: -0.000003580001, z: -0.018414259, w: 0.9995628} + scale: {x: 0.9999999, y: 1, z: 0.99999994} - name: middle_03_r parentName: middle_02_r - position: {x: 0.03648918, y: 0.00000015258789, z: -0.000000076293944} - rotation: {x: 0.0016213522, y: 0.038867, z: 0.13362399, w: 0.99026835} - scale: {x: 1, y: 1, z: 1} - - name: ring_01_r - parentName: hand_r - position: {x: 0.114979625, y: -0.017537536, z: -0.028469123} - rotation: {x: -0.09728448, y: 0.07056085, z: -0.11623318, w: 0.9859243} - scale: {x: 1, y: 1, z: 1} - - name: ring_02_r - parentName: ring_01_r - position: {x: 0.044298783, y: 0.00000045776366, z: -0.00000021934508} - rotation: {x: 0.0043280036, y: 0.004581442, z: -0.037483945, w: 0.99927735} - scale: {x: 1, y: 1, z: 1} - - name: ring_03_r - parentName: ring_02_r - position: {x: 0.034766693, y: 0.0000012207031, z: -0.000000009536743} - rotation: {x: -0.00019881198, y: -0.026257785, z: 0.11221313, w: 0.99333715} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.03648918, y: 0.0000004196167, z: 0} + rotation: {x: 0.012308267, y: 0.050965574, z: -0.33058664, w: 0.94231814} + scale: {x: 0.9999999, y: 0.9999999, z: 0.99999994} - name: pinky_01_r parentName: hand_r - position: {x: 0.10140606, y: -0.022633513, z: -0.046431024} - rotation: {x: -0.13504949, y: 0.09653526, z: -0.08907446, w: 0.9820939} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.1014059, y: -0.02263359, z: -0.046430986} + rotation: {x: -0.25687522, y: 0.050173927, z: -0.09736127, w: 0.9602179} + scale: {x: 1.0000001, y: 1, z: 0.99999994} - name: pinky_02_r parentName: pinky_01_r - position: {x: 0.03571041, y: -0.0000007629394, z: -0.000000114440915} - rotation: {x: 0.010402859, y: 0.004140166, z: -0.038529016, w: 0.9991948} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.03571045, y: -0.00000072479247, z: -0.000000076293944} + rotation: {x: 0.015338253, y: 0.00023502106, z: -0.019417835, w: 0.9996938} + scale: {x: 0.99999976, y: 1, z: 0.99999994} - name: pinky_03_r parentName: pinky_02_r - position: {x: 0.02985405, y: 0.0000030517576, z: -0.00000028610228} - rotation: {x: 0.0035809623, y: -0.03379639, z: -0.008930348, w: 0.99938244} + position: {x: 0.0298542, y: 0.0000031280517, z: -0.00000036239624} + rotation: {x: -0.0009317214, y: -0.03974408, z: -0.4059237, w: 0.9130419} + scale: {x: 0.9999999, y: 1.0000001, z: 1} + - name: ring_01_r + parentName: hand_r + position: {x: 0.114979744, y: -0.017537765, z: -0.028469142} + rotation: {x: -0.20664908, y: 0.04222702, z: -0.09832964, w: 0.9725453} + scale: {x: 1.0000002, y: 1.0000001, z: 0.99999994} + - name: ring_02_r + parentName: ring_01_r + position: {x: 0.04429863, y: 0.0000009155273, z: -0.00000015258789} + rotation: {x: 0.010850424, y: 0.00041900927, z: -0.017983763, w: 0.99977934} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} + - name: ring_03_r + parentName: ring_02_r + position: {x: 0.034766614, y: 0.00000064849854, z: -0.000000047683713} + rotation: {x: 0.0007329484, y: -0.027318945, z: -0.32003888, w: 0.9470102} scale: {x: 1, y: 1, z: 1} + - name: thumb_01_r + parentName: hand_r + position: {x: 0.04762123, y: -0.023751296, z: 0.025377998} + rotation: {x: 0.36304766, y: -0.08274567, z: 0.30087903, w: 0.87796444} + scale: {x: 1.0000002, y: 1, z: 1.0000001} + - name: thumb_02_r + parentName: thumb_01_r + position: {x: 0.038695715, y: 0.0000012016296, z: 0.00000045776366} + rotation: {x: -0.059372235, y: 0.0008043343, z: -0.02048133, w: 0.99802554} + scale: {x: 1.0000001, y: 0.9999999, z: 1.0000001} + - name: thumb_03_r + parentName: thumb_02_r + position: {x: 0.040621776, y: 0.000000028610229, z: 0} + rotation: {x: -0.01654607, y: -0.008043621, z: -0.10649277, w: 0.9941433} + scale: {x: 1, y: 0.9999999, z: 0.99999994} + - name: Weapon_R + parentName: hand_r + position: {x: 0.09278992, y: -0.04018333, z: -0.012245731} + rotation: {x: 0.7716737, y: 0.034539174, z: 0.6346727, w: 0.022745846} + scale: {x: 0.99999815, y: 0.99999905, z: 0.9999991} - name: lowerarm_twist_01_r parentName: lowerarm_r - position: {x: 0.14000003, y: 0.0000002670288, z: -0.00000022888183} - rotation: {x: -0.117627375, y: 0.0000000017527845, z: -0.000000014797714, w: 0.9930578} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.14, y: 0.00000022888183, z: -0.000000076293944} + rotation: {x: -0.2383125, y: 0.000067337336, z: 0.000065920896, w: 0.97118855} + scale: {x: 1, y: 1.0000001, z: 1.0000002} - name: upperarm_twist_01_r parentName: upperarm_r - position: {x: 0.0049999235, y: -0.000000085830685, z: 0.00000022888183} - rotation: {x: -0.17323476, y: -0.000000088539196, z: -0.00000001273667, w: 0.98488057} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.005, y: -0.000000076293944, z: 0.000000076293944} + rotation: {x: -0.17323482, y: -0.00000024255803, z: 0.000000002725189, w: 0.98488057} + scale: {x: 0.99999994, y: 1, z: 1.0000001} + - name: neck_01 + parentName: spine_03 + position: {x: -0.16558777, y: -0.0035531996, z: 0} + rotation: {x: -0.17966738, y: -0.04215307, z: 0.027518744, w: 0.98243856} + scale: {x: 0.9999999, y: 0.99999994, z: 1} + - name: head + parentName: neck_01 + position: {x: -0.092836, y: 0.00364151, z: 0} + rotation: {x: 0.3703453, y: 0.051559858, z: 0.011037241, w: 0.9273965} + scale: {x: 0.9999999, y: 0.9999999, z: 0.99999994} - name: thigh_l parentName: pelvis - position: {x: 0.014487533, y: -0.0053142295, z: -0.090058096} - rotation: {x: 0.07370505, y: 0.062138807, z: 0.00858431, w: 0.9953053} - scale: {x: 1, y: 1, z: 1} - - name: thigh_twist_01_l - parentName: thigh_l - position: {x: 0.2209423, y: 0.0000000035762786, z: 0.000000038146972} - rotation: {x: -0.047443625, y: -0.000021479917, z: 0.00049110386, w: 0.99887383} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.01448822, y: -0.0053142332, z: -0.09005809} + rotation: {x: 0.52978396, y: 0.052502535, z: 0.08306465, w: 0.84242076} + scale: {x: 0.99999994, y: 1.0000002, z: 1} - name: calf_l parentName: thigh_l - position: {x: 0.4257201, y: 0.000000010728836, z: 0} - rotation: {x: -0.048884287, y: -0.01886392, z: 0.06552234, w: 0.99647444} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.42572033, y: 0, z: 0} + rotation: {x: -0.12707841, y: 0.08129498, z: 0.25464967, w: 0.9551942} + scale: {x: 1.0000001, y: 1.0000001, z: 1} - name: calf_twist_01_l parentName: calf_l - position: {x: 0.2047678, y: -0.000000047683713, z: -0.000000114440915} - rotation: {x: 0.0028089383, y: 0.0019333779, z: 0.007612651, w: 0.99996525} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.20476776, y: 0, z: 0.000000009536743} + rotation: {x: 0.010246529, y: 0.001842266, z: 0.007318746, w: 0.99991906} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000002} - name: foot_l parentName: calf_l - position: {x: 0.40196696, y: -0.000000038146972, z: 0.000000057220458} - rotation: {x: -0.0058857743, y: -0.03199126, z: -0.070354894, w: 0.9969915} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.40196693, y: -0.000000038146972, z: 0.000000023841856} + rotation: {x: -0.25984076, y: -0.15581343, z: -0.22225875, w: 0.9267179} + scale: {x: 1.0000002, y: 1.0000001, z: 1.0000001} - name: ball_l parentName: foot_l - position: {x: 0.10453844, y: -0.1657787, z: 0.00080156326} - rotation: {x: 0.000080097714, y: -0.000029610042, z: 0.7186337, w: 0.6953888} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.10453836, y: -0.16577853, z: 0.0008015823} + rotation: {x: 0.01150501, y: -0.015001778, z: 0.72166264, w: 0.69198674} + scale: {x: 0.99999994, y: 1.0000001, z: 1.0000001} + - name: thigh_twist_01_l + parentName: thigh_l + position: {x: 0.2209423, y: 0, z: -0.0000000047683715} + rotation: {x: -0.047443617, y: -0.000021427777, z: 0.0004910662, w: 0.99887383} + scale: {x: 0.99999994, y: 0.99999994, z: 1} - name: thigh_r parentName: pelvis - position: {x: 0.014485702, y: -0.00531427, z: 0.09005803} - rotation: {x: -0.062138796, y: 0.07370505, z: 0.9953053, w: -0.008584373} - scale: {x: 1, y: 1, z: 1} - - name: thigh_twist_01_r - parentName: thigh_r - position: {x: -0.2209423, y: 0.0000000017881393, z: 0.000000076293944} - rotation: {x: -0.04744529, y: -0.000021916712, z: 0.00049117446, w: 0.9988738} - scale: {x: 1, y: 1, z: 1} + position: {x: 0.014486427, y: -0.0053142747, z: 0.09005803} + rotation: {x: -0.18299462, y: -0.076263554, z: 0.9653992, w: -0.16941422} + scale: {x: 1.0000002, y: 1.0000002, z: 1.0000001} - name: calf_r parentName: thigh_r - position: {x: -0.42572248, y: -0.000000021457671, z: 0.000000038146972} - rotation: {x: -0.048884347, y: -0.01886393, z: 0.06552235, w: 0.99647444} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.42572254, y: -0.000000038146972, z: -0.000000019073486} + rotation: {x: 0.02881302, y: -0.07407041, z: 0.20719513, w: 0.97506595} + scale: {x: 1.0000001, y: 1, z: 0.99999994} - name: calf_twist_01_r parentName: calf_r - position: {x: -0.20476913, y: -0.000000028610229, z: 0} - rotation: {x: 0.0028072814, y: 0.0019337109, z: 0.007612502, w: 0.99996525} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.20476903, y: 0, z: 0.000000019073486} + rotation: {x: 0.013646815, y: 0.0018009463, z: 0.0071841157, w: 0.9998795} + scale: {x: 0.99999994, y: 0.99999994, z: 1.0000001} - name: foot_r parentName: calf_r - position: {x: -0.40196815, y: 0.000000009536743, z: -0.000000114440915} - rotation: {x: -0.005885775, y: -0.031991262, z: -0.07035491, w: 0.9969915} - scale: {x: 1, y: 1, z: 1} + position: {x: -0.4019682, y: 0.000000038146972, z: -0.0000001335144} + rotation: {x: -0.09342822, y: 0.41939205, z: -0.1945645, w: 0.8817745} + scale: {x: 0.9999999, y: 1, z: 0.9999999} - name: ball_r parentName: foot_r - position: {x: -0.10453817, y: 0.16577816, z: -0.00080169673} - rotation: {x: 0.00008009213, y: -0.000029603341, z: 0.7186337, w: 0.6953888} - scale: {x: 1, y: 1, z: 1} - - name: Armature_Mesh - parentName: Armature(Clone) + position: {x: -0.10453815, y: 0.16577792, z: -0.0008015823} + rotation: {x: -0.12946461, y: -0.00043473198, z: 0.4600271, w: 0.8784155} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} + - name: thigh_twist_01_r + parentName: thigh_r + position: {x: -0.22094238, y: 0, z: -0.000000019073486} + rotation: {x: -0.047445256, y: -0.000021972639, z: 0.0004911745, w: 0.9988738} + scale: {x: 1.0000001, y: 1, z: 1} + - name: ik_foot_root + parentName: root position: {x: -0, y: 0, z: 0} - rotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} - scale: {x: 1.029025, y: 1.029025, z: 1.029025} + rotation: {x: -1.1359555e-28, y: 1.4210855e-14, z: 7.993576e-15, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: ik_foot_l + parentName: ik_foot_root + position: {x: -0.3093263, y: 0.28878078, z: 0.11690766} + rotation: {x: 0.6488706, y: 0.32674825, z: -0.6179175, w: 0.30063355} + scale: {x: 1, y: 1, z: 1} + - name: ik_foot_r + parentName: ik_foot_root + position: {x: 0.27750742, y: -0.6174421, z: 0.18369715} + rotation: {x: 0.13791609, y: -0.35166878, z: 0.86564475, w: 0.3285841} + scale: {x: 0.99999994, y: 1, z: 1} + - name: ik_hand_root + parentName: root + position: {x: -0, y: 0, z: 0} + rotation: {x: -1.1359555e-28, y: 1.4210855e-14, z: 7.993576e-15, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: ik_hand_gun + parentName: ik_hand_root + position: {x: -0.1604951, y: 0.24690744, z: 0.81566244} + rotation: {x: 0.6849101, y: -0.29072824, z: 0.047615957, w: 0.6664143} + scale: {x: 1, y: 1, z: 1} + - name: ik_hand_l + parentName: ik_hand_gun + position: {x: -0.06526901, y: -0.16038367, z: 0.46446228} + rotation: {x: -0.42340243, y: 0.11589658, z: 0.8646669, w: -0.24423258} + scale: {x: 1, y: 1.0000001, z: 1.0000001} + - name: ik_hand_r + parentName: ik_hand_gun + position: {x: 0.0000016021728, y: -0.000000076293944, z: 0.0000047683716} + rotation: {x: 0.0000071935547, y: 0.0000055022288, z: -0.0000035018124, w: 1} + scale: {x: 1, y: 1, z: 0.99999994} armTwist: 1 foreArmTwist: 0.02 upperLegTwist: 1 @@ -1075,22 +1031,15 @@ ModelImporter: hasTranslationDoF: 0 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 36078ab0369161e49a29d349ae3e0739, - type: 3} + lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 - avatarSetup: 2 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 269483 - packageName: One Handed Sword Animset Pro - packageVersion: 1.0 - assetPath: Assets/SwordAnimsetPro/Animations/RootPlace/Attack_Combo_02_04_Anim.FBX - uploadId: 738342 diff --git a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt2.fbx.meta b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt2.fbx.meta index 18da09723..2afa5dfb1 100644 --- a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt2.fbx.meta +++ b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt2.fbx.meta @@ -1,335 +1,955 @@ fileFormatVersion: 2 guid: fb07a934dbc1969468121112ca048964 -timeCreated: 1490889171 -licenseType: Store +AssetOrigin: + serializedVersion: 1 + productId: 92239 + packageName: Longsword Animset Pro + packageVersion: 1.0 + assetPath: Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt2.fbx + uploadId: 340990 ModelImporter: - serializedVersion: 21 - fileIDToRecycleName: - 100000: DummyMESH - 100002: Head - 100004: Hips - 100006: LeftArm - 100008: LeftArmRoll - 100010: LeftFoot - 100012: LeftForeArm - 100014: LeftForeArmRoll - 100016: LeftHand - 100018: LeftHandIndex1 - 100020: LeftHandIndex2 - 100022: LeftHandIndex3 - 100024: LeftHandIndex4 - 100026: LeftHandMiddle1 - 100028: LeftHandMiddle2 - 100030: LeftHandMiddle3 - 100032: LeftHandMiddle4 - 100034: LeftHandPinky1 - 100036: LeftHandPinky2 - 100038: LeftHandPinky3 - 100040: LeftHandPinky4 - 100042: LeftHandProp - 100044: LeftHandRing1 - 100046: LeftHandRing2 - 100048: LeftHandRing3 - 100050: LeftHandRing4 - 100052: LeftHandThumb1 - 100054: LeftHandThumb2 - 100056: LeftHandThumb3 - 100058: LeftHandThumb4 - 100060: LeftLeg - 100062: LeftLegRoll - 100064: LeftShoulder - 100066: LeftToeBase - 100068: LeftToeBase_END - 100070: LeftUpLeg - 100072: LeftUpLegRoll - 100074: //RootNode - 100076: Neck - 100078: RightArm - 100080: RightArmRoll - 100082: RightFoot - 100084: RightForeArm - 100086: RightForeArmRoll - 100088: RightHand - 100090: RightHandIndex1 - 100092: RightHandIndex2 - 100094: RightHandIndex3 - 100096: RightHandIndex4 - 100098: RightHandMiddle1 - 100100: RightHandMiddle2 - 100102: RightHandMiddle3 - 100104: RightHandMiddle4 - 100106: RightHandPinky1 - 100108: RightHandPinky2 - 100110: RightHandPinky3 - 100112: RightHandPinky4 - 100114: RightHandProp - 100116: RightHandRing1 - 100118: RightHandRing2 - 100120: RightHandRing3 - 100122: RightHandRing4 - 100124: RightHandThumb1 - 100126: RightHandThumb2 - 100128: RightHandThumb3 - 100130: RightHandThumb4 - 100132: RightLeg - 100134: RightLegRoll - 100136: RightShoulder - 100138: RightToeBase - 100140: RightToeBase_END - 100142: RightUpLeg - 100144: RightUpLegRoll - 100146: Root - 100148: Spine - 100150: Spine1 - 100152: Jaw - 100154: Jaw_END - 100156: LeftBrow1 - 100158: LeftBrow2 - 100160: LeftBrow3 - 100162: LeftCheek - 100164: LeftCheek1 - 100166: LeftCheekMouth - 100168: LeftCheekUp - 100170: LeftCheekUp1 - 100172: LeftChin - 100174: LeftEye - 100176: LeftEyeLidDown - 100178: LeftEyeLidUp - 100180: LeftFrontSkirt1 - 100182: LeftFrontSkirt2 - 100184: LeftNostril - 100186: LeftPauldron - 100188: MouthCenterDown - 100190: MouthCenterUp - 100192: MouthLeftCorner - 100194: MouthLeftDown - 100196: MouthLeftDown1 - 100198: MouthLeftUp - 100200: MouthLeftUp1 - 100202: MouthRightCorner - 100204: MouthRightDown - 100206: MouthRightDown1 - 100208: MouthRightUp - 100210: MouthRightUp1 - 100212: RightBrow1 - 100214: RightBrow2 - 100216: RightBrow3 - 100218: RightCheek - 100220: RightCheek1 - 100222: RightCheekMouth - 100224: RightCheekUp - 100226: RightCheekUp1 - 100228: RightChin - 100230: RightEye - 100232: RightEyeLidDown - 100234: RightEyeLidUp - 100236: RightFrontSkirt1 - 100238: RightFrontSkirt2 - 100240: RightNostril - 100242: RightPauldron - 100244: Tongue - 100246: Tongue1 - 100248: Tongue2 - 100250: VampArmsLegsMESH_LOD0 - 100252: VampCapeMESH - 100254: VampHeadMESH_LOD0 - 100256: VampTeethMESH_LOD0 - 100258: VampTorsoMESH_LOD0 - 400000: DummyMESH - 400002: Head - 400004: Hips - 400006: LeftArm - 400008: LeftArmRoll - 400010: LeftFoot - 400012: LeftForeArm - 400014: LeftForeArmRoll - 400016: LeftHand - 400018: LeftHandIndex1 - 400020: LeftHandIndex2 - 400022: LeftHandIndex3 - 400024: LeftHandIndex4 - 400026: LeftHandMiddle1 - 400028: LeftHandMiddle2 - 400030: LeftHandMiddle3 - 400032: LeftHandMiddle4 - 400034: LeftHandPinky1 - 400036: LeftHandPinky2 - 400038: LeftHandPinky3 - 400040: LeftHandPinky4 - 400042: LeftHandProp - 400044: LeftHandRing1 - 400046: LeftHandRing2 - 400048: LeftHandRing3 - 400050: LeftHandRing4 - 400052: LeftHandThumb1 - 400054: LeftHandThumb2 - 400056: LeftHandThumb3 - 400058: LeftHandThumb4 - 400060: LeftLeg - 400062: LeftLegRoll - 400064: LeftShoulder - 400066: LeftToeBase - 400068: LeftToeBase_END - 400070: LeftUpLeg - 400072: LeftUpLegRoll - 400074: //RootNode - 400076: Neck - 400078: RightArm - 400080: RightArmRoll - 400082: RightFoot - 400084: RightForeArm - 400086: RightForeArmRoll - 400088: RightHand - 400090: RightHandIndex1 - 400092: RightHandIndex2 - 400094: RightHandIndex3 - 400096: RightHandIndex4 - 400098: RightHandMiddle1 - 400100: RightHandMiddle2 - 400102: RightHandMiddle3 - 400104: RightHandMiddle4 - 400106: RightHandPinky1 - 400108: RightHandPinky2 - 400110: RightHandPinky3 - 400112: RightHandPinky4 - 400114: RightHandProp - 400116: RightHandRing1 - 400118: RightHandRing2 - 400120: RightHandRing3 - 400122: RightHandRing4 - 400124: RightHandThumb1 - 400126: RightHandThumb2 - 400128: RightHandThumb3 - 400130: RightHandThumb4 - 400132: RightLeg - 400134: RightLegRoll - 400136: RightShoulder - 400138: RightToeBase - 400140: RightToeBase_END - 400142: RightUpLeg - 400144: RightUpLegRoll - 400146: Root - 400148: Spine - 400150: Spine1 - 400152: Jaw - 400154: Jaw_END - 400156: LeftBrow1 - 400158: LeftBrow2 - 400160: LeftBrow3 - 400162: LeftCheek - 400164: LeftCheek1 - 400166: LeftCheekMouth - 400168: LeftCheekUp - 400170: LeftCheekUp1 - 400172: LeftChin - 400174: LeftEye - 400176: LeftEyeLidDown - 400178: LeftEyeLidUp - 400180: LeftFrontSkirt1 - 400182: LeftFrontSkirt2 - 400184: LeftNostril - 400186: LeftPauldron - 400188: MouthCenterDown - 400190: MouthCenterUp - 400192: MouthLeftCorner - 400194: MouthLeftDown - 400196: MouthLeftDown1 - 400198: MouthLeftUp - 400200: MouthLeftUp1 - 400202: MouthRightCorner - 400204: MouthRightDown - 400206: MouthRightDown1 - 400208: MouthRightUp - 400210: MouthRightUp1 - 400212: RightBrow1 - 400214: RightBrow2 - 400216: RightBrow3 - 400218: RightCheek - 400220: RightCheek1 - 400222: RightCheekMouth - 400224: RightCheekUp - 400226: RightCheekUp1 - 400228: RightChin - 400230: RightEye - 400232: RightEyeLidDown - 400234: RightEyeLidUp - 400236: RightFrontSkirt1 - 400238: RightFrontSkirt2 - 400240: RightNostril - 400242: RightPauldron - 400244: Tongue - 400246: Tongue1 - 400248: Tongue2 - 400250: VampArmsLegsMESH_LOD0 - 400252: VampCapeMESH - 400254: VampHeadMESH_LOD0 - 400256: VampTeethMESH_LOD0 - 400258: VampTorsoMESH_LOD0 - 4300000: DummyMESH - 4300002: VampTeethMESH_LOD0 - 4300004: VampTorsoMESH_LOD0 - 4300006: VampCapeMESH - 4300008: VampArmsLegsMESH_LOD0 - 4300010: VampHeadMESH_LOD0 - 7400000: Longs_Attack_p_R - 7400002: Longs_Attack_p_RD - 7400004: Longs_Attack_p_LD - 7400006: Longs_Attack_p_L - 7400008: Longs_Attack_p_RD2 - 7400010: Longs_Attack_p_RU - 7400012: Longs_Attack_p_LU - 7400014: Longs_Attack_p_D - 7400016: Longs_Attack_p_RLow - 7400018: Longs_Attack_p_DoubleRL - 7400020: Longs_Attack_RD - 7400022: Longs_Attack_RD2 - 7400024: Longs_Attack_R - 7400026: Longs_Attack_L - 7400028: Longs_Attack_LD - 7400030: Longs_Attack_RU - 7400032: Longs_Attack_L2 - 7400034: Longs_Attack_Thrust - 7400036: Longs_Attack_D - 7400038: Longs_Attack_DoubleRR - 7400040: Longs_Attack_L3 - 7400042: Longs_Attack_Thrust2 - 7400044: Longs_Attack_D2 - 7400046: Longs_Block_p_L - 7400048: Longs_Block_p_R - 7400050: Longs_Block_p_L2 - 7400052: Longs_Block_p_LLow - 7400054: Longs_Block_p_RLow - 7400056: Longs_Block_p_D - 7400058: Longs_Block_R - 7400060: Longs_Block_L - 7400062: Longs_Block_D - 7400064: Longs_Block_R2 - 7400066: Longs_Block_L2 - 9500000: //RootNode - 13700000: DummyMESH - 13700002: VampArmsLegsMESH_LOD0 - 13700004: VampCapeMESH - 13700006: VampHeadMESH_LOD0 - 13700008: VampTeethMESH_LOD0 - 13700010: VampTorsoMESH_LOD0 + serializedVersion: 22200 + internalIDToNameTable: + - first: + 1: 100000 + second: DummyMESH + - first: + 1: 100002 + second: Head + - first: + 1: 100004 + second: Hips + - first: + 1: 100006 + second: LeftArm + - first: + 1: 100008 + second: LeftArmRoll + - first: + 1: 100010 + second: LeftFoot + - first: + 1: 100012 + second: LeftForeArm + - first: + 1: 100014 + second: LeftForeArmRoll + - first: + 1: 100016 + second: LeftHand + - first: + 1: 100018 + second: LeftHandIndex1 + - first: + 1: 100020 + second: LeftHandIndex2 + - first: + 1: 100022 + second: LeftHandIndex3 + - first: + 1: 100024 + second: LeftHandIndex4 + - first: + 1: 100026 + second: LeftHandMiddle1 + - first: + 1: 100028 + second: LeftHandMiddle2 + - first: + 1: 100030 + second: LeftHandMiddle3 + - first: + 1: 100032 + second: LeftHandMiddle4 + - first: + 1: 100034 + second: LeftHandPinky1 + - first: + 1: 100036 + second: LeftHandPinky2 + - first: + 1: 100038 + second: LeftHandPinky3 + - first: + 1: 100040 + second: LeftHandPinky4 + - first: + 1: 100042 + second: LeftHandProp + - first: + 1: 100044 + second: LeftHandRing1 + - first: + 1: 100046 + second: LeftHandRing2 + - first: + 1: 100048 + second: LeftHandRing3 + - first: + 1: 100050 + second: LeftHandRing4 + - first: + 1: 100052 + second: LeftHandThumb1 + - first: + 1: 100054 + second: LeftHandThumb2 + - first: + 1: 100056 + second: LeftHandThumb3 + - first: + 1: 100058 + second: LeftHandThumb4 + - first: + 1: 100060 + second: LeftLeg + - first: + 1: 100062 + second: LeftLegRoll + - first: + 1: 100064 + second: LeftShoulder + - first: + 1: 100066 + second: LeftToeBase + - first: + 1: 100068 + second: LeftToeBase_END + - first: + 1: 100070 + second: LeftUpLeg + - first: + 1: 100072 + second: LeftUpLegRoll + - first: + 1: 100074 + second: //RootNode + - first: + 1: 100076 + second: Neck + - first: + 1: 100078 + second: RightArm + - first: + 1: 100080 + second: RightArmRoll + - first: + 1: 100082 + second: RightFoot + - first: + 1: 100084 + second: RightForeArm + - first: + 1: 100086 + second: RightForeArmRoll + - first: + 1: 100088 + second: RightHand + - first: + 1: 100090 + second: RightHandIndex1 + - first: + 1: 100092 + second: RightHandIndex2 + - first: + 1: 100094 + second: RightHandIndex3 + - first: + 1: 100096 + second: RightHandIndex4 + - first: + 1: 100098 + second: RightHandMiddle1 + - first: + 1: 100100 + second: RightHandMiddle2 + - first: + 1: 100102 + second: RightHandMiddle3 + - first: + 1: 100104 + second: RightHandMiddle4 + - first: + 1: 100106 + second: RightHandPinky1 + - first: + 1: 100108 + second: RightHandPinky2 + - first: + 1: 100110 + second: RightHandPinky3 + - first: + 1: 100112 + second: RightHandPinky4 + - first: + 1: 100114 + second: RightHandProp + - first: + 1: 100116 + second: RightHandRing1 + - first: + 1: 100118 + second: RightHandRing2 + - first: + 1: 100120 + second: RightHandRing3 + - first: + 1: 100122 + second: RightHandRing4 + - first: + 1: 100124 + second: RightHandThumb1 + - first: + 1: 100126 + second: RightHandThumb2 + - first: + 1: 100128 + second: RightHandThumb3 + - first: + 1: 100130 + second: RightHandThumb4 + - first: + 1: 100132 + second: RightLeg + - first: + 1: 100134 + second: RightLegRoll + - first: + 1: 100136 + second: RightShoulder + - first: + 1: 100138 + second: RightToeBase + - first: + 1: 100140 + second: RightToeBase_END + - first: + 1: 100142 + second: RightUpLeg + - first: + 1: 100144 + second: RightUpLegRoll + - first: + 1: 100146 + second: Root + - first: + 1: 100148 + second: Spine + - first: + 1: 100150 + second: Spine1 + - first: + 1: 100152 + second: Jaw + - first: + 1: 100154 + second: Jaw_END + - first: + 1: 100156 + second: LeftBrow1 + - first: + 1: 100158 + second: LeftBrow2 + - first: + 1: 100160 + second: LeftBrow3 + - first: + 1: 100162 + second: LeftCheek + - first: + 1: 100164 + second: LeftCheek1 + - first: + 1: 100166 + second: LeftCheekMouth + - first: + 1: 100168 + second: LeftCheekUp + - first: + 1: 100170 + second: LeftCheekUp1 + - first: + 1: 100172 + second: LeftChin + - first: + 1: 100174 + second: LeftEye + - first: + 1: 100176 + second: LeftEyeLidDown + - first: + 1: 100178 + second: LeftEyeLidUp + - first: + 1: 100180 + second: LeftFrontSkirt1 + - first: + 1: 100182 + second: LeftFrontSkirt2 + - first: + 1: 100184 + second: LeftNostril + - first: + 1: 100186 + second: LeftPauldron + - first: + 1: 100188 + second: MouthCenterDown + - first: + 1: 100190 + second: MouthCenterUp + - first: + 1: 100192 + second: MouthLeftCorner + - first: + 1: 100194 + second: MouthLeftDown + - first: + 1: 100196 + second: MouthLeftDown1 + - first: + 1: 100198 + second: MouthLeftUp + - first: + 1: 100200 + second: MouthLeftUp1 + - first: + 1: 100202 + second: MouthRightCorner + - first: + 1: 100204 + second: MouthRightDown + - first: + 1: 100206 + second: MouthRightDown1 + - first: + 1: 100208 + second: MouthRightUp + - first: + 1: 100210 + second: MouthRightUp1 + - first: + 1: 100212 + second: RightBrow1 + - first: + 1: 100214 + second: RightBrow2 + - first: + 1: 100216 + second: RightBrow3 + - first: + 1: 100218 + second: RightCheek + - first: + 1: 100220 + second: RightCheek1 + - first: + 1: 100222 + second: RightCheekMouth + - first: + 1: 100224 + second: RightCheekUp + - first: + 1: 100226 + second: RightCheekUp1 + - first: + 1: 100228 + second: RightChin + - first: + 1: 100230 + second: RightEye + - first: + 1: 100232 + second: RightEyeLidDown + - first: + 1: 100234 + second: RightEyeLidUp + - first: + 1: 100236 + second: RightFrontSkirt1 + - first: + 1: 100238 + second: RightFrontSkirt2 + - first: + 1: 100240 + second: RightNostril + - first: + 1: 100242 + second: RightPauldron + - first: + 1: 100244 + second: Tongue + - first: + 1: 100246 + second: Tongue1 + - first: + 1: 100248 + second: Tongue2 + - first: + 1: 100250 + second: VampArmsLegsMESH_LOD0 + - first: + 1: 100252 + second: VampCapeMESH + - first: + 1: 100254 + second: VampHeadMESH_LOD0 + - first: + 1: 100256 + second: VampTeethMESH_LOD0 + - first: + 1: 100258 + second: VampTorsoMESH_LOD0 + - first: + 4: 400000 + second: DummyMESH + - first: + 4: 400002 + second: Head + - first: + 4: 400004 + second: Hips + - first: + 4: 400006 + second: LeftArm + - first: + 4: 400008 + second: LeftArmRoll + - first: + 4: 400010 + second: LeftFoot + - first: + 4: 400012 + second: LeftForeArm + - first: + 4: 400014 + second: LeftForeArmRoll + - first: + 4: 400016 + second: LeftHand + - first: + 4: 400018 + second: LeftHandIndex1 + - first: + 4: 400020 + second: LeftHandIndex2 + - first: + 4: 400022 + second: LeftHandIndex3 + - first: + 4: 400024 + second: LeftHandIndex4 + - first: + 4: 400026 + second: LeftHandMiddle1 + - first: + 4: 400028 + second: LeftHandMiddle2 + - first: + 4: 400030 + second: LeftHandMiddle3 + - first: + 4: 400032 + second: LeftHandMiddle4 + - first: + 4: 400034 + second: LeftHandPinky1 + - first: + 4: 400036 + second: LeftHandPinky2 + - first: + 4: 400038 + second: LeftHandPinky3 + - first: + 4: 400040 + second: LeftHandPinky4 + - first: + 4: 400042 + second: LeftHandProp + - first: + 4: 400044 + second: LeftHandRing1 + - first: + 4: 400046 + second: LeftHandRing2 + - first: + 4: 400048 + second: LeftHandRing3 + - first: + 4: 400050 + second: LeftHandRing4 + - first: + 4: 400052 + second: LeftHandThumb1 + - first: + 4: 400054 + second: LeftHandThumb2 + - first: + 4: 400056 + second: LeftHandThumb3 + - first: + 4: 400058 + second: LeftHandThumb4 + - first: + 4: 400060 + second: LeftLeg + - first: + 4: 400062 + second: LeftLegRoll + - first: + 4: 400064 + second: LeftShoulder + - first: + 4: 400066 + second: LeftToeBase + - first: + 4: 400068 + second: LeftToeBase_END + - first: + 4: 400070 + second: LeftUpLeg + - first: + 4: 400072 + second: LeftUpLegRoll + - first: + 4: 400074 + second: //RootNode + - first: + 4: 400076 + second: Neck + - first: + 4: 400078 + second: RightArm + - first: + 4: 400080 + second: RightArmRoll + - first: + 4: 400082 + second: RightFoot + - first: + 4: 400084 + second: RightForeArm + - first: + 4: 400086 + second: RightForeArmRoll + - first: + 4: 400088 + second: RightHand + - first: + 4: 400090 + second: RightHandIndex1 + - first: + 4: 400092 + second: RightHandIndex2 + - first: + 4: 400094 + second: RightHandIndex3 + - first: + 4: 400096 + second: RightHandIndex4 + - first: + 4: 400098 + second: RightHandMiddle1 + - first: + 4: 400100 + second: RightHandMiddle2 + - first: + 4: 400102 + second: RightHandMiddle3 + - first: + 4: 400104 + second: RightHandMiddle4 + - first: + 4: 400106 + second: RightHandPinky1 + - first: + 4: 400108 + second: RightHandPinky2 + - first: + 4: 400110 + second: RightHandPinky3 + - first: + 4: 400112 + second: RightHandPinky4 + - first: + 4: 400114 + second: RightHandProp + - first: + 4: 400116 + second: RightHandRing1 + - first: + 4: 400118 + second: RightHandRing2 + - first: + 4: 400120 + second: RightHandRing3 + - first: + 4: 400122 + second: RightHandRing4 + - first: + 4: 400124 + second: RightHandThumb1 + - first: + 4: 400126 + second: RightHandThumb2 + - first: + 4: 400128 + second: RightHandThumb3 + - first: + 4: 400130 + second: RightHandThumb4 + - first: + 4: 400132 + second: RightLeg + - first: + 4: 400134 + second: RightLegRoll + - first: + 4: 400136 + second: RightShoulder + - first: + 4: 400138 + second: RightToeBase + - first: + 4: 400140 + second: RightToeBase_END + - first: + 4: 400142 + second: RightUpLeg + - first: + 4: 400144 + second: RightUpLegRoll + - first: + 4: 400146 + second: Root + - first: + 4: 400148 + second: Spine + - first: + 4: 400150 + second: Spine1 + - first: + 4: 400152 + second: Jaw + - first: + 4: 400154 + second: Jaw_END + - first: + 4: 400156 + second: LeftBrow1 + - first: + 4: 400158 + second: LeftBrow2 + - first: + 4: 400160 + second: LeftBrow3 + - first: + 4: 400162 + second: LeftCheek + - first: + 4: 400164 + second: LeftCheek1 + - first: + 4: 400166 + second: LeftCheekMouth + - first: + 4: 400168 + second: LeftCheekUp + - first: + 4: 400170 + second: LeftCheekUp1 + - first: + 4: 400172 + second: LeftChin + - first: + 4: 400174 + second: LeftEye + - first: + 4: 400176 + second: LeftEyeLidDown + - first: + 4: 400178 + second: LeftEyeLidUp + - first: + 4: 400180 + second: LeftFrontSkirt1 + - first: + 4: 400182 + second: LeftFrontSkirt2 + - first: + 4: 400184 + second: LeftNostril + - first: + 4: 400186 + second: LeftPauldron + - first: + 4: 400188 + second: MouthCenterDown + - first: + 4: 400190 + second: MouthCenterUp + - first: + 4: 400192 + second: MouthLeftCorner + - first: + 4: 400194 + second: MouthLeftDown + - first: + 4: 400196 + second: MouthLeftDown1 + - first: + 4: 400198 + second: MouthLeftUp + - first: + 4: 400200 + second: MouthLeftUp1 + - first: + 4: 400202 + second: MouthRightCorner + - first: + 4: 400204 + second: MouthRightDown + - first: + 4: 400206 + second: MouthRightDown1 + - first: + 4: 400208 + second: MouthRightUp + - first: + 4: 400210 + second: MouthRightUp1 + - first: + 4: 400212 + second: RightBrow1 + - first: + 4: 400214 + second: RightBrow2 + - first: + 4: 400216 + second: RightBrow3 + - first: + 4: 400218 + second: RightCheek + - first: + 4: 400220 + second: RightCheek1 + - first: + 4: 400222 + second: RightCheekMouth + - first: + 4: 400224 + second: RightCheekUp + - first: + 4: 400226 + second: RightCheekUp1 + - first: + 4: 400228 + second: RightChin + - first: + 4: 400230 + second: RightEye + - first: + 4: 400232 + second: RightEyeLidDown + - first: + 4: 400234 + second: RightEyeLidUp + - first: + 4: 400236 + second: RightFrontSkirt1 + - first: + 4: 400238 + second: RightFrontSkirt2 + - first: + 4: 400240 + second: RightNostril + - first: + 4: 400242 + second: RightPauldron + - first: + 4: 400244 + second: Tongue + - first: + 4: 400246 + second: Tongue1 + - first: + 4: 400248 + second: Tongue2 + - first: + 4: 400250 + second: VampArmsLegsMESH_LOD0 + - first: + 4: 400252 + second: VampCapeMESH + - first: + 4: 400254 + second: VampHeadMESH_LOD0 + - first: + 4: 400256 + second: VampTeethMESH_LOD0 + - first: + 4: 400258 + second: VampTorsoMESH_LOD0 + - first: + 43: 4300000 + second: DummyMESH + - first: + 43: 4300002 + second: VampTeethMESH_LOD0 + - first: + 43: 4300004 + second: VampTorsoMESH_LOD0 + - first: + 43: 4300006 + second: VampCapeMESH + - first: + 43: 4300008 + second: VampArmsLegsMESH_LOD0 + - first: + 43: 4300010 + second: VampHeadMESH_LOD0 + - first: + 74: 7400000 + second: Longs_Attack_p_R + - first: + 74: 7400002 + second: Longs_Attack_p_RD + - first: + 74: 7400004 + second: Longs_Attack_p_LD + - first: + 74: 7400006 + second: Longs_Attack_p_L + - first: + 74: 7400008 + second: Longs_Attack_p_RD2 + - first: + 74: 7400010 + second: Longs_Attack_p_RU + - first: + 74: 7400012 + second: Longs_Attack_p_LU + - first: + 74: 7400014 + second: Longs_Attack_p_D + - first: + 74: 7400016 + second: Longs_Attack_p_RLow + - first: + 74: 7400018 + second: Longs_Attack_p_DoubleRL + - first: + 74: 7400020 + second: Longs_Attack_RD + - first: + 74: 7400022 + second: Longs_Attack_RD2 + - first: + 74: 7400024 + second: Longs_Attack_R + - first: + 74: 7400026 + second: Longs_Attack_L + - first: + 74: 7400028 + second: Longs_Attack_LD + - first: + 74: 7400030 + second: Longs_Attack_RU + - first: + 74: 7400032 + second: Longs_Attack_L2 + - first: + 74: 7400034 + second: Longs_Attack_Thrust + - first: + 74: 7400036 + second: Longs_Attack_D + - first: + 74: 7400038 + second: Longs_Attack_DoubleRR + - first: + 74: 7400040 + second: Longs_Attack_L3 + - first: + 74: 7400042 + second: Longs_Attack_Thrust2 + - first: + 74: 7400044 + second: Longs_Attack_D2 + - first: + 74: 7400046 + second: Longs_Block_p_L + - first: + 74: 7400048 + second: Longs_Block_p_R + - first: + 74: 7400050 + second: Longs_Block_p_L2 + - first: + 74: 7400052 + second: Longs_Block_p_LLow + - first: + 74: 7400054 + second: Longs_Block_p_RLow + - first: + 74: 7400056 + second: Longs_Block_p_D + - first: + 74: 7400058 + second: Longs_Block_R + - first: + 74: 7400060 + second: Longs_Block_L + - first: + 74: 7400062 + second: Longs_Block_D + - first: + 74: 7400064 + second: Longs_Block_R2 + - first: + 74: 7400066 + second: Longs_Block_L2 + - first: + 95: 9500000 + second: //RootNode + - first: + 137: 13700000 + second: DummyMESH + - first: + 137: 13700002 + second: VampArmsLegsMESH_LOD0 + - first: + 137: 13700004 + second: VampCapeMESH + - first: + 137: 13700006 + second: VampHeadMESH_LOD0 + - first: + 137: 13700008 + second: VampTeethMESH_LOD0 + - first: + 137: 13700010 + second: VampTorsoMESH_LOD0 + externalObjects: {} materials: - importMaterials: 0 + materialImportMode: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: Root - rigImportErrors: - rigImportWarnings: "Copied Avatar Rig Configuration mis-match. Bone length in - copied configuration does not match position in animation file:\n\t'RightToeBase' - : position error = 5.100823 mm\n" animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.2 animationPositionError: 0.2 @@ -341,6 +961,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_R takeName: Longs_Attack_p_R + internalID: 0 firstFrame: 0 lastFrame: 104 wrapMode: 0 @@ -521,6 +1142,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_RD takeName: Longs_Attack_p_RD + internalID: 0 firstFrame: 0 lastFrame: 130 wrapMode: 0 @@ -545,30 +1167,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.2396313 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.25686064 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -739,6 +1373,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_LD takeName: Longs_Attack_p_LD + internalID: 0 firstFrame: 0 lastFrame: 98 wrapMode: 0 @@ -763,30 +1398,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.39159468 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.41804352 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -957,6 +1604,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_L takeName: Longs_Attack_p_L + internalID: 0 firstFrame: 0 lastFrame: 120 wrapMode: 0 @@ -1137,6 +1785,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_RD2 takeName: Longs_Attack_p_RD2 + internalID: 0 firstFrame: 0 lastFrame: 163 wrapMode: 0 @@ -1317,6 +1966,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_RU takeName: Longs_Attack_p_RU + internalID: 0 firstFrame: 0 lastFrame: 130 wrapMode: 0 @@ -1497,6 +2147,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_LU takeName: Longs_Attack_p_LU + internalID: 0 firstFrame: 0 lastFrame: 140 wrapMode: 0 @@ -1677,6 +2328,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_D takeName: Longs_Attack_p_D + internalID: 0 firstFrame: 0 lastFrame: 145 wrapMode: 0 @@ -1857,6 +2509,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_RLow takeName: Longs_Attack_p_RLow + internalID: 0 firstFrame: 0 lastFrame: 130 wrapMode: 0 @@ -2037,6 +2690,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_p_DoubleRL takeName: Longs_Attack_p_DoubleRL + internalID: 0 firstFrame: 0 lastFrame: 130 wrapMode: 0 @@ -2217,6 +2871,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_RD takeName: Longs_Attack_RD + internalID: 0 firstFrame: 0 lastFrame: 130 wrapMode: 0 @@ -2241,30 +2896,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.35 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.39 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -2442,6 +3109,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_RD2 takeName: Longs_Attack_RD2 + internalID: 0 firstFrame: 0 lastFrame: 153 wrapMode: 0 @@ -2466,30 +3134,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.40577066 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.41333812 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -2674,6 +3354,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_R takeName: Longs_Attack_R + internalID: 0 firstFrame: 0 lastFrame: 120 wrapMode: 0 @@ -2698,30 +3379,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.46111104 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.48054352 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -2892,6 +3585,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_L takeName: Longs_Attack_L + internalID: 0 firstFrame: 0 lastFrame: 113 wrapMode: 0 @@ -2916,30 +3610,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.49847922 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.5154214 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -3124,6 +3830,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_LD takeName: Longs_Attack_LD + internalID: 0 firstFrame: 0 lastFrame: 111 wrapMode: 0 @@ -3304,6 +4011,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_RU takeName: Longs_Attack_RU + internalID: 0 firstFrame: 0 lastFrame: 120 wrapMode: 0 @@ -3484,6 +4192,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_L2 takeName: Longs_Attack_L2 + internalID: 0 firstFrame: 0 lastFrame: 117 wrapMode: 0 @@ -3508,30 +4217,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.3220307 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.3397029 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -3709,6 +4430,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_Thrust takeName: Longs_Attack_Thrust + internalID: 0 firstFrame: 0 lastFrame: 104 wrapMode: 0 @@ -3733,30 +4455,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.4830123 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.49934393 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -3934,6 +4668,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_D takeName: Longs_Attack_D + internalID: 0 firstFrame: 0 lastFrame: 122 wrapMode: 0 @@ -3958,30 +4693,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.31310463 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.3235696 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -4166,6 +4913,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_DoubleRR takeName: Longs_Attack_DoubleRR + internalID: 0 firstFrame: 0 lastFrame: 143 wrapMode: 0 @@ -4346,6 +5094,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_L3 takeName: Longs_Attack_L3 + internalID: 0 firstFrame: 0 lastFrame: 124 wrapMode: 0 @@ -4526,6 +5275,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_Thrust2 takeName: Longs_Attack_Thrust2 + internalID: 0 firstFrame: 0 lastFrame: 136 wrapMode: 0 @@ -4706,6 +5456,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Attack_D2 takeName: Longs_Attack_D2 + internalID: 0 firstFrame: 0 lastFrame: 142 wrapMode: 0 @@ -4730,30 +5481,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.403747 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.42515695 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -4938,6 +5701,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_p_L takeName: Longs_Block_p_L + internalID: 0 firstFrame: 0 lastFrame: 61 wrapMode: 0 @@ -5118,6 +5882,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_p_R takeName: Longs_Block_p_R + internalID: 0 firstFrame: 0 lastFrame: 66 wrapMode: 0 @@ -5298,6 +6063,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_p_L2 takeName: Longs_Block_p_L2 + internalID: 0 firstFrame: 0 lastFrame: 68 wrapMode: 0 @@ -5478,6 +6244,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_p_LLow takeName: Longs_Block_p_LLow + internalID: 0 firstFrame: 0 lastFrame: 87 wrapMode: 0 @@ -5658,6 +6425,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_p_RLow takeName: Longs_Block_p_RLow + internalID: 0 firstFrame: 0 lastFrame: 86 wrapMode: 0 @@ -5838,6 +6606,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_p_D takeName: Longs_Block_p_D + internalID: 0 firstFrame: 0 lastFrame: 74 wrapMode: 0 @@ -6018,6 +6787,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_R takeName: Longs_Block_R + internalID: 0 firstFrame: 0 lastFrame: 79 wrapMode: 0 @@ -6198,6 +6968,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_L takeName: Longs_Block_L + internalID: 0 firstFrame: 0 lastFrame: 92 wrapMode: 0 @@ -6378,6 +7149,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_D takeName: Longs_Block_D + internalID: 0 firstFrame: 0 lastFrame: 80 wrapMode: 0 @@ -6558,6 +7330,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_R2 takeName: Longs_Block_R2 + internalID: 0 firstFrame: 0 lastFrame: 81 wrapMode: 0 @@ -6738,6 +7511,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_Block_L2 takeName: Longs_Block_L2 + internalID: 0 firstFrame: 0 lastFrame: 89 wrapMode: 0 @@ -6915,36 +7689,417 @@ ModelImporter: maskType: 0 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Longs_Attack_L2_Middle + takeName: Longs_Attack_L2 + internalID: 2626174355906348275 + firstFrame: 0 + lastFrame: 70 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: DummyMESH + weight: 0 + - path: Root + weight: 1 + - path: Root/Hips + weight: 1 + - path: Root/Hips/LeftUpLeg + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftFoot + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftFoot/LeftToeBase + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftFoot/LeftToeBase/LeftToeBase_END + weight: 0 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftLegRoll + weight: 0 + - path: Root/Hips/LeftUpLeg/LeftUpLegRoll + weight: 0 + - path: Root/Hips/RightUpLeg + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg/RightFoot + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg/RightFoot/RightToeBase + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg/RightFoot/RightToeBase/RightToeBase_END + weight: 0 + - path: Root/Hips/RightUpLeg/RightLeg/RightLegRoll + weight: 0 + - path: Root/Hips/RightUpLeg/RightUpLegRoll + weight: 0 + - path: Root/Hips/Spine + weight: 1 + - path: Root/Hips/Spine/Spine1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftForeArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1/LeftHandIndex2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1/LeftHandIndex2/LeftHandIndex3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1/LeftHandIndex2/LeftHandIndex3/LeftHandIndex4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1/LeftHandMiddle2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1/LeftHandMiddle2/LeftHandMiddle3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1/LeftHandMiddle2/LeftHandMiddle3/LeftHandMiddle4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1/LeftHandPinky2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1/LeftHandPinky2/LeftHandPinky3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1/LeftHandPinky2/LeftHandPinky3/LeftHandPinky4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandProp + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1/LeftHandRing2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1/LeftHandRing2/LeftHandRing3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1/LeftHandRing2/LeftHandRing3/LeftHandRing4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1/LeftHandThumb2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1/LeftHandThumb2/LeftHandThumb3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1/LeftHandThumb2/LeftHandThumb3/LeftHandThumb4 + weight: 0 + - path: Root/Hips/Spine/Spine1/Neck + weight: 1 + - path: Root/Hips/Spine/Spine1/Neck/Head + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightForeArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1/RightHandIndex2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1/RightHandIndex2/RightHandIndex3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1/RightHandIndex2/RightHandIndex3/RightHandIndex4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1/RightHandMiddle2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1/RightHandMiddle2/RightHandMiddle3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1/RightHandMiddle2/RightHandMiddle3/RightHandMiddle4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1/RightHandPinky2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1/RightHandPinky2/RightHandPinky3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1/RightHandPinky2/RightHandPinky3/RightHandPinky4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandProp + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1/RightHandRing2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1/RightHandRing2/RightHandRing3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1/RightHandRing2/RightHandRing3/RightHandRing4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1/RightHandThumb2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1/RightHandThumb2/RightHandThumb3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1/RightHandThumb2/RightHandThumb3/RightHandThumb4 + weight: 0 + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Longs_Attack_L2_End + takeName: Longs_Attack_L2 + internalID: 6399467581995111687 + firstFrame: 70 + lastFrame: 117 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: DummyMESH + weight: 0 + - path: Root + weight: 1 + - path: Root/Hips + weight: 1 + - path: Root/Hips/LeftUpLeg + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftFoot + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftFoot/LeftToeBase + weight: 1 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftFoot/LeftToeBase/LeftToeBase_END + weight: 0 + - path: Root/Hips/LeftUpLeg/LeftLeg/LeftLegRoll + weight: 0 + - path: Root/Hips/LeftUpLeg/LeftUpLegRoll + weight: 0 + - path: Root/Hips/RightUpLeg + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg/RightFoot + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg/RightFoot/RightToeBase + weight: 1 + - path: Root/Hips/RightUpLeg/RightLeg/RightFoot/RightToeBase/RightToeBase_END + weight: 0 + - path: Root/Hips/RightUpLeg/RightLeg/RightLegRoll + weight: 0 + - path: Root/Hips/RightUpLeg/RightUpLegRoll + weight: 0 + - path: Root/Hips/Spine + weight: 1 + - path: Root/Hips/Spine/Spine1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftForeArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1/LeftHandIndex2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1/LeftHandIndex2/LeftHandIndex3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandIndex1/LeftHandIndex2/LeftHandIndex3/LeftHandIndex4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1/LeftHandMiddle2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1/LeftHandMiddle2/LeftHandMiddle3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandMiddle1/LeftHandMiddle2/LeftHandMiddle3/LeftHandMiddle4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1/LeftHandPinky2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1/LeftHandPinky2/LeftHandPinky3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandPinky1/LeftHandPinky2/LeftHandPinky3/LeftHandPinky4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandProp + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1/LeftHandRing2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1/LeftHandRing2/LeftHandRing3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandRing1/LeftHandRing2/LeftHandRing3/LeftHandRing4 + weight: 0 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1/LeftHandThumb2 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1/LeftHandThumb2/LeftHandThumb3 + weight: 1 + - path: Root/Hips/Spine/Spine1/LeftShoulder/LeftArm/LeftForeArm/LeftHand/LeftHandThumb1/LeftHandThumb2/LeftHandThumb3/LeftHandThumb4 + weight: 0 + - path: Root/Hips/Spine/Spine1/Neck + weight: 1 + - path: Root/Hips/Spine/Spine1/Neck/Head + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightForeArmRoll + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1/RightHandIndex2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1/RightHandIndex2/RightHandIndex3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandIndex1/RightHandIndex2/RightHandIndex3/RightHandIndex4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1/RightHandMiddle2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1/RightHandMiddle2/RightHandMiddle3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandMiddle1/RightHandMiddle2/RightHandMiddle3/RightHandMiddle4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1/RightHandPinky2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1/RightHandPinky2/RightHandPinky3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandPinky1/RightHandPinky2/RightHandPinky3/RightHandPinky4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandProp + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1/RightHandRing2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1/RightHandRing2/RightHandRing3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandRing1/RightHandRing2/RightHandRing3/RightHandRing4 + weight: 0 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1/RightHandThumb2 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1/RightHandThumb2/RightHandThumb3 + weight: 1 + - path: Root/Hips/Spine/Spine1/RightShoulder/RightArm/RightForeArm/RightHand/RightHandThumb1/RightHandThumb2/RightHandThumb3/RightHandThumb4 + weight: 0 + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 0 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 1 humanDescription: - serializedVersion: 2 + serializedVersion: 3 human: - boneName: Hips humanName: Hips @@ -8022,23 +9177,21 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 + globalScale: 1 rootMotionBoneName: Root - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 1 skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 3aaf38176678e1d4994b710ba08065f2, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 92239 - packageName: Longsword Animset Pro - packageVersion: 1.0 - assetPath: Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt2.fbx - uploadId: 340990 diff --git a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampArmsLegs_MAT.mat b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampArmsLegs_MAT.mat index eff2efb06..62d0ed9f6 100644 --- a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampArmsLegs_MAT.mat +++ b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampArmsLegs_MAT.mat @@ -68,7 +68,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ecfd8dee444853641b96003ca2f834e8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampEyeRetinaMAT.mat b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampEyeRetinaMAT.mat index 6c5e89458..df4b39507 100644 --- a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampEyeRetinaMAT.mat +++ b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampEyeRetinaMAT.mat @@ -25,6 +25,7 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -122,7 +123,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0, g: 0, b: 0, a: 0.13} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 0.13} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.29411763, g: 0.29411763, b: 0.29411763, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampHeadMAT.mat b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampHeadMAT.mat index a82a378fd..7262f7a11 100644 --- a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampHeadMAT.mat +++ b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampHeadMAT.mat @@ -68,7 +68,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 586f46705bac2a64383b5a9f7b024323, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampTorsoMAT.mat b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampTorsoMAT.mat index 1b9162412..ce459ac7d 100644 --- a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampTorsoMAT.mat +++ b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampTorsoMAT.mat @@ -68,7 +68,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 3038f9b0643c18c4c9f7ece56db63dca, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: From 2437efe6141fe2ed6babd699145ccd5a538f1e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Mi=C5=9B?= <> Date: Tue, 9 Sep 2025 02:27:50 +0200 Subject: [PATCH 2/7] Giant animation polish --- .../AI/Gigant/RandomizeAnimatorIntOnEnter.cs | 48 ++ .../RandomizeAnimatorIntOnEnter.cs.meta | 2 + Assets/Scenes/Fight_Arena/Fight_Arena.unity | 728 ++++++------------ .../Animator/Invector@Giant.controller | 642 ++++++++++++--- 4 files changed, 827 insertions(+), 593 deletions(-) create mode 100644 Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs create mode 100644 Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs.meta diff --git a/Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs b/Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs new file mode 100644 index 000000000..c6850a804 --- /dev/null +++ b/Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs @@ -0,0 +1,48 @@ +using UnityEngine; + +public class RandomizeAnimatorIntWeighted : StateMachineBehaviour +{ + [Header("Animator parameter name (must be int type)")] + public string parameterName = "Randomized"; + + [Header("Weights for each slot (index = int value)")] + public int[] weights = { 35, 35, 15, 15 }; + + // Example: {70, 20, 10} means index 0 has 70% chance, 1 has 20%, 2 has 10% + + // Called when the animator enters this state + public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + if (weights == null || weights.Length == 0) + { + return; + } + + int total = 0; + foreach (int w in weights) + { + total += Mathf.Max(0, w); + } + + if (total <= 0) + { + return; + } + + int randomValue = Random.Range(0, total); + int cumulative = 0; + int chosenIndex = 0; + + for (int i = 0; i < weights.Length; i++) + { + cumulative += Mathf.Max(0, weights[i]); + if (randomValue < cumulative) + { + chosenIndex = i; + break; + } + } + + animator.SetFloat(parameterName, (float)chosenIndex); + } +} \ No newline at end of file diff --git a/Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs.meta b/Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs.meta new file mode 100644 index 000000000..9f421cfee --- /dev/null +++ b/Assets/AI/Gigant/RandomizeAnimatorIntOnEnter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d20bc7e4150a82f4ba03191390f832f8 \ No newline at end of file diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity index f1d3698ed..ab779515b 100644 --- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity @@ -230,7 +230,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -704,7 +704,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1001,7 +1001,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1587,7 +1587,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1695,7 +1695,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1921,7 +1921,7 @@ Transform: m_GameObject: {fileID: 170780850} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.9007157, z: -0, w: 0.43440905} - m_LocalPosition: {x: -7.37, y: 42.81, z: -62.57} + m_LocalPosition: {x: -6.7109346, y: 42.81, z: -64.045525} m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1971,7 +1971,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2079,7 +2079,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2456,7 +2456,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2933,7 +2933,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f848890e0ce9c014a9753454258bf831, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3191,7 +3191,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3487,7 +3487,7 @@ Transform: m_GameObject: {fileID: 402038938} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.3297287, z: -0, w: 0.9440758} - m_LocalPosition: {x: -62.49, y: 42.81, z: -11.35} + m_LocalPosition: {x: -64.31508, y: 42.81, z: -9.232639} m_LocalScale: {x: 2.8564942, y: 13.079837, z: 24.258972} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3537,7 +3537,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3595,8 +3595,8 @@ Transform: m_GameObject: {fileID: 405816522} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.445181, z: -0, w: 0.89544064} - m_LocalPosition: {x: -1.4799957, y: 42.81, z: -69.57} - m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} + m_LocalPosition: {x: 14.9403, y: 42.81, z: -56.589} + m_LocalScale: {x: 2.8630643, y: 13.079837, z: 65.420105} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 799294619} @@ -3645,7 +3645,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3720,222 +3720,6 @@ Transform: m_Children: [] m_Father: {fileID: 878574876} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &440688996 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 440688997} - - component: {fileID: 440689000} - - component: {fileID: 440688999} - - component: {fileID: 440688998} - m_Layer: 0 - m_Name: Cube (24) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &440688997 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440688996} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.445181, z: -0, w: 0.89544064} - m_LocalPosition: {x: 14.6, y: 42.81, z: -57.4} - m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 799294619} - m_LocalEulerAnglesHint: {x: 0, y: 52.87, z: 0} ---- !u!65 &440688998 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440688996} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &440688999 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440688996} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &440689000 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440688996} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &458667166 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 458667167} - - component: {fileID: 458667170} - - component: {fileID: 458667169} - - component: {fileID: 458667168} - m_Layer: 0 - m_Name: Cube (22) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &458667167 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 458667166} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.445181, z: -0, w: 0.89544064} - m_LocalPosition: {x: 32.800003, y: 42.81, z: -43.620003} - m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 799294619} - m_LocalEulerAnglesHint: {x: 0, y: 52.87, z: 0} ---- !u!65 &458667168 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 458667166} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &458667169 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 458667166} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &458667170 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 458667166} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &466846472 GameObject: m_ObjectHideFlags: 0 @@ -4060,7 +3844,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4090,6 +3874,67 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 485336291} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &502839873 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1031498901634068, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_Name + value: Effect9_Collision + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalPosition.x + value: -36.498665 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalPosition.y + value: 39.9 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalPosition.z + value: -118.46762 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 270 + objectReference: {fileID: 0} + - target: {fileID: 4742084896385740, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1775194324312346, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1020356331} + m_SourcePrefab: {fileID: 100100000, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, type: 3} --- !u!1 &554046660 GameObject: m_ObjectHideFlags: 0 @@ -12327,7 +12172,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12555,7 +12400,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13433,8 +13278,8 @@ Transform: m_GameObject: {fileID: 709397782} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.445181, z: -0, w: 0.89544064} - m_LocalPosition: {x: -30.32, y: 42.81, z: -91.37} - m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} + m_LocalPosition: {x: -46.246, y: 42.81, z: -103.4279} + m_LocalScale: {x: 2.8564942, y: 13.079837, z: 63.805077} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 799294619} @@ -13483,7 +13328,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14246,14 +14091,10 @@ Transform: - {fileID: 1785581996} - {fileID: 135797430} - {fileID: 709397783} - - {fileID: 458667167} - {fileID: 341141739} - {fileID: 22718060} - - {fileID: 1386725320} - - {fileID: 440688997} - {fileID: 597220798} - {fileID: 485336292} - - {fileID: 2129105958} - {fileID: 405816523} - {fileID: 628914433} - {fileID: 1342792087} @@ -14671,7 +14512,7 @@ Transform: m_GameObject: {fileID: 868342459} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.31838122, z: -0, w: 0.9479628} - m_LocalPosition: {x: -6.8, y: 42.81, z: -105.9} + m_LocalPosition: {x: -6.5674477, y: 42.81, z: -106.44257} m_LocalScale: {x: 2.8564942, y: 13.079837, z: 25.1563} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14721,7 +14562,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -15486,7 +15327,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16210,7 +16051,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16249,8 +16090,8 @@ Transform: m_GameObject: {fileID: 1003710846} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.31791243, z: -0, w: 0.9481201} - m_LocalPosition: {x: -54.4, y: 43.07, z: -78.36} - m_LocalScale: {x: 2.8564944, y: 13.079837, z: 31.535051} + m_LocalPosition: {x: -52.46924, y: 43.07, z: -80.92055} + m_LocalScale: {x: 2.8564944, y: 13.079837, z: 35.789127} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 799294619} @@ -16319,42 +16160,42 @@ PrefabInstance: - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -135 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210.00003 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -45 objectReference: {fileID: 0} - target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -17110,7 +16951,12 @@ PrefabInstance: - target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: -26.000061 + value: -26.000122 + objectReference: {fileID: 0} + - target: {fileID: 3806889720014357836, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 4.800049 objectReference: {fileID: 0} - target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -17210,22 +17056,22 @@ PrefabInstance: - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -225 objectReference: {fileID: 0} - target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -17465,22 +17311,22 @@ PrefabInstance: - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -315 objectReference: {fileID: 0} - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -18830,22 +18676,22 @@ PrefabInstance: - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -405 objectReference: {fileID: 0} - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -19394,6 +19240,35 @@ Transform: - {fileID: 1734395329} m_Father: {fileID: 878574876} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1020356329 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1775194324312346, guid: 0ff49e2dd236f364ab8b6ece0a44d04a, + type: 3} + m_PrefabInstance: {fileID: 502839873} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1020356331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020356329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 --- !u!1 &1083766998 GameObject: m_ObjectHideFlags: 0 @@ -20439,7 +20314,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20933,114 +20808,6 @@ Material: - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!1 &1386725319 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1386725320} - - component: {fileID: 1386725323} - - component: {fileID: 1386725322} - - component: {fileID: 1386725321} - m_Layer: 0 - m_Name: Cube (15) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1386725320 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386725319} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.445181, z: -0, w: 0.89544064} - m_LocalPosition: {x: -48.52, y: 42.81, z: -105.15} - m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 799294619} - m_LocalEulerAnglesHint: {x: 0, y: 52.87, z: 0} ---- !u!65 &1386725321 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386725319} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1386725322 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386725319} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1386725323 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386725319} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1402720963 GameObject: m_ObjectHideFlags: 0 @@ -21069,7 +20836,7 @@ Transform: m_GameObject: {fileID: 1402720963} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.31838122, z: -0, w: 0.9479628} - m_LocalPosition: {x: 5.7, y: 42.81, z: -96.5} + m_LocalPosition: {x: 5.8367324, y: 42.81, z: -97.051094} m_LocalScale: {x: 2.8564942, y: 13.079837, z: 25.1563} m_ConstrainProportionsScale: 0 m_Children: [] @@ -21119,7 +20886,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21404,7 +21171,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22513,7 +22280,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22552,7 +22319,7 @@ Transform: m_GameObject: {fileID: 1659354714} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.9007157, z: -0, w: 0.43440905} - m_LocalPosition: {x: -36.1, y: 42.81, z: -85.43} + m_LocalPosition: {x: -34.4418, y: 42.81, z: -85.83173} m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} m_ConstrainProportionsScale: 0 m_Children: [] @@ -23255,7 +23022,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23790,6 +23557,79 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1004473948} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1901343302 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1024337125332675931, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_Radius + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 4089514887418515818, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_Name + value: DemonShield + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalPosition.x + value: -38.78861 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalPosition.y + value: 49.34992 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalPosition.z + value: -98.52919 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7058331355936229169, guid: 8a811a4a039beaf4e8ca078a19bdfd33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8a811a4a039beaf4e8ca078a19bdfd33, type: 3} --- !u!1001 &1905404674 PrefabInstance: m_ObjectHideFlags: 0 @@ -24341,8 +24181,8 @@ Transform: m_GameObject: {fileID: 2002250978} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.31838122, z: -0, w: 0.9479628} - m_LocalPosition: {x: -24.28, y: 42.81, z: -82.07} - m_LocalScale: {x: 2.8564942, y: 13.079837, z: 9.69327} + m_LocalPosition: {x: -23.7635, y: 42.81, z: -82.6386} + m_LocalScale: {x: 2.8564942, y: 13.079837, z: 5.512457} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 799294619} @@ -24391,7 +24231,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25084,7 +24924,7 @@ Transform: m_GameObject: {fileID: 2110501328} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.3297287, z: -0, w: 0.9440758} - m_LocalPosition: {x: -73.27, y: 42.81, z: -19.92} + m_LocalPosition: {x: -72.951385, y: 42.81, z: -19.751585} m_LocalScale: {x: 2.8564942, y: 13.079837, z: 24.258972} m_ConstrainProportionsScale: 0 m_Children: [] @@ -25134,7 +24974,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 3683a1c419775aa488a7c762e1648383, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25164,114 +25004,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2110501328} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2129105957 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2129105958} - - component: {fileID: 2129105961} - - component: {fileID: 2129105960} - - component: {fileID: 2129105959} - m_Layer: 0 - m_Name: Cube (16) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2129105958 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129105957} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.445181, z: -0, w: 0.89544064} - m_LocalPosition: {x: -64.6, y: 42.81, z: -117.32} - m_LocalScale: {x: 2.8564942, y: 13.079837, z: 23.676517} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 799294619} - m_LocalEulerAnglesHint: {x: 0, y: 52.87, z: 0} ---- !u!65 &2129105959 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129105957} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &2129105960 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129105957} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2129105961 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129105957} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &13319305218930205 GameObject: m_ObjectHideFlags: 0 @@ -40507,3 +40239,5 @@ SceneRoots: - {fileID: 289966095} - {fileID: 861395855} - {fileID: 1751752836} + - {fileID: 502839873} + - {fileID: 1901343302} diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller index f5cb81c2e..073350e91 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller +++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller @@ -1,5 +1,120 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!206 &-5514068382861804739 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: d7cb15fed9779ae43932120fa9039536, + type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Randomized + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: b099b07870330624fabaaebe261aec21, + type: 3} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Randomized + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: a504b51fdbc45c742b8e58c8ef61647e, + type: 3} + m_Threshold: 2 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Randomized + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: cc87a090795c76f44a6912db9e02f618, + type: 3} + m_Threshold: 3 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Randomized + m_Mirror: 0 + m_BlendParameter: Randomized + m_BlendParameterY: InputHorizontal + m_MinThreshold: 0 + m_MaxThreshold: 3 + m_UseAutomaticThresholds: 0 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1102 &-3586438440143645230 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6629174028218037947} + m_StateMachineBehaviours: + - {fileID: -881403512226571619} + - {fileID: 1041230552015527588} + - {fileID: -709582740070635242} + - {fileID: 9038955521651375425} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 1 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -5514068382861804739} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!114 &-881403512226571619 +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: d20bc7e4150a82f4ba03191390f832f8, type: 3} + m_Name: + m_EditorClassIdentifier: + parameterName: Randomized + weights: 23000000230000000f0000000f000000 +--- !u!114 &-709582740070635242 +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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} + sounds: + - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} + - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} + - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} + - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} + triggerTime: 0 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -201,6 +316,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Randomized + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -287,13 +408,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &11400864 MonoBehaviour: m_ObjectHideFlags: 1 @@ -329,7 +449,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 0 reactionID: 0 @@ -341,6 +462,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &11404640 MonoBehaviour: @@ -401,9 +531,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 0} - audioMixerGroup: {fileID: 0} sounds: [] - triggerTime: [] + triggerTime: 0 --- !u!114 &11414206 MonoBehaviour: m_ObjectHideFlags: 1 @@ -439,7 +568,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 2 reactionID: 1 @@ -451,6 +581,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 1 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &11424034 MonoBehaviour: @@ -465,13 +604,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &11427704 MonoBehaviour: m_ObjectHideFlags: 1 @@ -658,13 +796,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &11467206 MonoBehaviour: m_ObjectHideFlags: 1 @@ -677,7 +814,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 2 reactionID: 0 @@ -689,6 +827,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 1 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &11468922 MonoBehaviour: @@ -702,7 +849,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -714,6 +862,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &11476414 MonoBehaviour: @@ -773,7 +930,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -785,6 +943,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &11483756 MonoBehaviour: @@ -867,7 +1034,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 0 reactionID: 0 @@ -879,6 +1047,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &11487874 MonoBehaviour: @@ -13864,7 +14041,7 @@ AnimatorStateMachine: m_Position: {x: 288, y: 192, z: 0} - serializedVersion: 1 m_StateMachine: {fileID: 1107514516130166158} - m_Position: {x: 288, y: 144, z: 0} + m_Position: {x: 290, y: 140, z: 0} m_AnyStateTransitions: [] m_EntryTransitions: - {fileID: 110978568} @@ -13917,12 +14094,12 @@ AnimatorStateMachine: m_StateMachineTransitions: - first: {fileID: 0} second: [] - - first: {fileID: 1107073249461883974} - second: - - {fileID: 1109023572194860680} - first: {fileID: 1107244300605973448} second: - {fileID: 1109977525054438924} + - first: {fileID: 1107073249461883974} + second: + - {fileID: 1109023572194860680} m_StateMachineBehaviours: - {fileID: 114176214234564994} m_AnyStatePosition: {x: 50, y: 20, z: 0} @@ -13952,11 +14129,11 @@ AnimatorStateMachine: m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: - - first: {fileID: 110751810} + - first: {fileID: 110756666} second: [] - first: {fileID: 110752648} second: [] - - first: {fileID: 110756666} + - first: {fileID: 110751810} second: [] m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 48, y: 84, z: 0} @@ -14036,10 +14213,10 @@ AnimatorStateMachine: m_StateMachineTransitions: - first: {fileID: 0} second: [] - - first: {fileID: 110790156} - second: [] - first: {fileID: 1107000012077418080} second: [] + - first: {fileID: 110790156} + second: [] m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 48, y: 108, z: 0} m_EntryPosition: {x: 48, y: 156, z: 0} @@ -15126,7 +15303,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 0 reactionID: 0 @@ -15138,6 +15316,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114000012058145300 MonoBehaviour: @@ -15152,11 +15339,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: d488746f170863748a00445cf31c5420, type: 3} - {fileID: 8300000, guid: 720e39bac05da5048b9276f12dd7b342, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114000013180279414 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15170,12 +15356,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: aee2019cc66545a4f985b398633282d9, type: 3} - {fileID: 8300000, guid: 5bf5901be61ca8f4980147086570884c, type: 3} - {fileID: 8300000, guid: c34afd223de25df498932cfa325cd0ea, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114004190595170916 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15189,10 +15374,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114030386879188540 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15205,7 +15389,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -15217,6 +15402,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114037387642052710 MonoBehaviour: @@ -15230,6 +15424,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockMovement --- !u!114 &114056155133226516 @@ -15244,6 +15439,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114101577822421078 @@ -15258,7 +15454,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 2 reactionID: 0 @@ -15270,6 +15467,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 1 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114109424512592286 MonoBehaviour: @@ -15284,10 +15490,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114117847423423608 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15300,6 +15505,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - Airborne --- !u!114 &114140785865532380 @@ -15314,6 +15520,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114149171879887332 @@ -15328,6 +15535,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - Attack --- !u!114 &114161323810139554 @@ -15342,6 +15550,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114167711196437060 @@ -15356,7 +15565,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -15368,6 +15578,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114173081088732178 MonoBehaviour: @@ -15382,10 +15601,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114176214234564994 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15398,6 +15616,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - Attack - LockMovement @@ -15414,7 +15633,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -15426,6 +15646,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114204451307792824 MonoBehaviour: @@ -15440,13 +15669,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114215453694696434 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15459,7 +15687,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 2 reactionID: 0 @@ -15471,6 +15700,15 @@ MonoBehaviour: activeRagdoll: 1 senselessTime: 0 resetAttackTrigger: 1 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114231790030935560 MonoBehaviour: @@ -15484,6 +15722,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114240448336761074 @@ -15498,6 +15737,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114251243649655538 @@ -15513,13 +15753,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114263588767966834 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15532,6 +15771,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] debug: 0 tags: - tagName: Attack @@ -15555,6 +15795,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114280139870868682 @@ -15569,7 +15810,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 0 reactionID: 0 @@ -15581,6 +15823,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114296478714166974 MonoBehaviour: @@ -15594,6 +15845,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114304692954732270 @@ -15609,13 +15861,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114312089054784788 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15629,13 +15880,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114324329624715244 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15648,6 +15898,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockMovement - LockRotation @@ -15663,6 +15914,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114347403225532272 @@ -15677,6 +15929,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - IsEquipping --- !u!114 &114354692356897974 @@ -15691,6 +15944,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114379477415056970 @@ -15705,6 +15959,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] debug: 0 tags: - tagName: LockMovement @@ -15725,6 +15980,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] debug: 0 tags: - tagName: CustomAction @@ -15743,13 +15999,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114406195790751738 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15762,6 +16017,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114413044913778916 @@ -15777,10 +16033,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114430748385182422 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15793,6 +16048,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114433705987055478 @@ -15808,13 +16064,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114437571679399682 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15828,13 +16083,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114442204576443440 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15847,6 +16101,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114444099356613836 @@ -15861,7 +16116,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -15873,6 +16129,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114446205462832556 MonoBehaviour: @@ -15886,6 +16151,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockRotation --- !u!114 &114448441641897960 @@ -15901,13 +16167,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114479960763606770 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15920,7 +16185,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 2 reactionID: 1 @@ -15932,6 +16198,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 1 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114480230802912944 MonoBehaviour: @@ -15945,6 +16220,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - Dead --- !u!114 &114493270973445908 @@ -15959,6 +16235,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114494131096334520 @@ -15973,6 +16250,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114508175772919680 @@ -15999,6 +16277,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - ClimbLadder --- !u!114 &114535907351570938 @@ -16014,13 +16293,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114542169226534450 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16033,6 +16311,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - ClimbLadder --- !u!114 &114543123080938928 @@ -16047,6 +16326,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - TurnOnSpot --- !u!114 &114557618396540762 @@ -16061,6 +16341,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] debug: 0 tags: - tagName: LockRotation @@ -16081,6 +16362,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114576052143006314 @@ -16095,6 +16377,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114588492908204932 @@ -16109,7 +16392,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 0 reactionID: 0 @@ -16121,6 +16405,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114608773870077618 MonoBehaviour: @@ -16134,7 +16427,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 2 reactionID: 0 @@ -16146,6 +16440,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 1 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114610283087860218 MonoBehaviour: @@ -16159,6 +16462,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - TurnOnSpot --- !u!114 &114613723513732792 @@ -16173,6 +16477,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114618567475193292 @@ -16187,6 +16492,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockMovement --- !u!114 &114618808418225444 @@ -16201,6 +16507,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - TurnOnSpot --- !u!114 &114619198827271856 @@ -16215,7 +16522,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -16227,6 +16535,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114633244054452058 MonoBehaviour: @@ -16240,6 +16557,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LadderSlideDown - CustomAction @@ -16255,6 +16573,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - IsRolling - IgnoreIK @@ -16270,6 +16589,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockMovement --- !u!114 &114662961632292434 @@ -16284,6 +16604,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockMovement - LockRotation @@ -16299,6 +16620,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] debug: 0 tags: - tagName: Attack @@ -16322,6 +16644,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - ClimbLadder --- !u!114 &114681395673698336 @@ -16336,6 +16659,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114687335062540730 @@ -16350,6 +16674,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - ClimbLadder - CustomAction @@ -16366,10 +16691,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114690627014714542 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16382,6 +16706,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - ClimbLadder --- !u!114 &114750145593357160 @@ -16396,6 +16721,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114756031459307912 @@ -16410,6 +16736,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] debug: 0 tags: - tagName: Attack @@ -16433,6 +16760,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - ClimbLadder --- !u!114 &114774349693074110 @@ -16448,10 +16776,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - audioMixerGroup: {fileID: 0} sounds: - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - triggerTime: [] + triggerTime: 0 --- !u!114 &114776088302950842 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16464,6 +16791,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] debug: 0 tags: - tagName: LockRotation @@ -16484,6 +16812,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockMovement --- !u!114 &114790590439853166 @@ -16498,6 +16827,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114819569208418972 @@ -16512,6 +16842,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - LockMovement --- !u!114 &114825370114345668 @@ -16526,7 +16857,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9058122f6ec699438581f28f117350d, type: 3} m_Name: m_EditorClassIdentifier: - damageTriggerTime: [] + startDamage: 0.05 + endDamage: 0.9 damageMultiplier: 0 recoilID: 1 reactionID: 0 @@ -16538,6 +16870,15 @@ MonoBehaviour: activeRagdoll: 0 senselessTime: 0 resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 debug: 0 --- !u!114 &114838529179133088 MonoBehaviour: @@ -16551,6 +16892,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114846628944281222 @@ -16565,6 +16907,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - TurnOnSpot --- !u!114 &114855645635961444 @@ -16579,6 +16922,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - Attack --- !u!114 &114864265999398174 @@ -16593,6 +16937,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114901359404671022 @@ -16620,6 +16965,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114947298916534572 @@ -16634,6 +16980,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114967854510753606 @@ -16648,6 +16995,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - Attack --- !u!114 &114978102867242824 @@ -16662,6 +17010,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - ClimbLadder --- !u!114 &114981111988109574 @@ -16676,6 +17025,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!114 &114984482878044234 @@ -16690,6 +17040,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d23a79fe8deb55a4fb192f4d8b417fea, type: 3} m_Name: m_EditorClassIdentifier: + stateInfos: [] tags: - CustomAction --- !u!206 &206000010013534088 @@ -19752,6 +20103,41 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!114 &1041230552015527588 +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: f9058122f6ec699438581f28f117350d, type: 3} + m_Name: + m_EditorClassIdentifier: + startDamage: 0.05 + endDamage: 0.9 + damageMultiplier: 1 + recoilID: 1 + reactionID: 0 + meleeAttackType: 1 + damageType: + bodyParts: + - RightLowerArm + ignoreDefense: 0 + activeRagdoll: 0 + senselessTime: 2 + resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.8 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 + debug: 0 --- !u!1101 &1101000010056439178 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -32859,12 +33245,12 @@ AnimatorStateMachine: m_StateMachineTransitions: - first: {fileID: 0} second: [] - - first: {fileID: 1107524540227454336} - second: - - {fileID: 1109578743125361602} - first: {fileID: 1107861237161253520} second: - {fileID: 1109396380286432528} + - first: {fileID: 1107524540227454336} + second: + - {fileID: 1109578743125361602} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 48, y: 84, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} @@ -33108,12 +33494,12 @@ AnimatorStateMachine: m_StateMachineTransitions: - first: {fileID: 0} second: [] - - first: {fileID: 1107238439717288928} - second: - - {fileID: 1109528509627008278} - first: {fileID: 1107817243907799292} second: - {fileID: 1109521766839647786} + - first: {fileID: 1107238439717288928} + second: + - {fileID: 1109528509627008278} m_StateMachineBehaviours: - {fileID: 114117847423423608} m_AnyStatePosition: {x: -528, y: 60, z: 0} @@ -33708,16 +34094,20 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102466317250516052} - m_Position: {x: 240, y: 120, z: 0} + m_Position: {x: 250, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: 1102861933717182418} - m_Position: {x: 240, y: 48, z: 0} + m_Position: {x: 240, y: -10, z: 0} - serializedVersion: 1 m_State: {fileID: 1102186001672383516} - m_Position: {x: 240, y: -20, z: 0} + m_Position: {x: 240, y: -70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3586438440143645230} + m_Position: {x: 240, y: 180, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: [] + m_EntryTransitions: + - {fileID: 6184355516693046008} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 48, y: 60, z: 0} @@ -33789,33 +34179,33 @@ AnimatorStateMachine: m_StateMachineTransitions: - first: {fileID: 0} second: [] - - first: {fileID: 1107195903750868412} - second: - - {fileID: 1109315854676260964} - - first: {fileID: 1107234123510542732} - second: - - {fileID: 1109633021300334774} - - first: {fileID: 1107289557424460618} - second: - - {fileID: 1109034240739169588} - - first: {fileID: 1107352502706023130} - second: - - {fileID: 1109515306538650046} - first: {fileID: 1107386280914322628} second: - {fileID: 1109956231591184804} - first: {fileID: 1107441501061591016} second: - {fileID: 1109612196035102268} - - first: {fileID: 1107522770563196282} + - first: {fileID: 1107234123510542732} second: - - {fileID: 1109195838345771488} - - first: {fileID: 1107745783126129282} - second: - - {fileID: 1109521855061353880} + - {fileID: 1109633021300334774} - first: {fileID: 1107964730024747042} second: - {fileID: 1109025621482636618} + - first: {fileID: 1107352502706023130} + second: + - {fileID: 1109515306538650046} + - first: {fileID: 1107289557424460618} + second: + - {fileID: 1109034240739169588} + - first: {fileID: 1107745783126129282} + second: + - {fileID: 1109521855061353880} + - first: {fileID: 1107522770563196282} + second: + - {fileID: 1109195838345771488} + - first: {fileID: 1107195903750868412} + second: + - {fileID: 1109315854676260964} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 84, y: -72, z: 0} m_EntryPosition: {x: 84, y: -36, z: 0} @@ -37193,3 +37583,63 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 1 +--- !u!1109 &6184355516693046008 +AnimatorTransition: + 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: -3586438440143645230} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 +--- !u!1101 &6629174028218037947 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8666667 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!114 &9038955521651375425 +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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} + m_Name: + m_EditorClassIdentifier: + stateInfos: [] + debug: 0 + tags: + - tagName: Attack + tagType: 3 + normalizedTime: {x: 0.1, y: 0.8} + - tagName: LockRotation + tagType: 0 + normalizedTime: {x: 0.1, y: 0.7} + - tagName: LockMovement + tagType: 1 + normalizedTime: {x: 0, y: 0.7} From 9d6c237088444a2d80018520897f54b2be572deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Mi=C5=9B?= <> Date: Tue, 9 Sep 2025 03:19:38 +0200 Subject: [PATCH 3/7] Animation fixes Demon --- Assets/AI/Demon/SA_CallMeteor.cs | 107 ++++- Assets/AI/Demon/SA_CastShield.cs | 421 +++++++++++++----- Assets/AI/Demon/SA_SpawnTurretSmart.cs | 81 +++- Assets/AI/FSM/FSM_Demon.asset | 272 +++++------ .../Invector@Bonel_Warrior.controller | 6 +- 5 files changed, 633 insertions(+), 254 deletions(-) diff --git a/Assets/AI/Demon/SA_CallMeteor.cs b/Assets/AI/Demon/SA_CallMeteor.cs index dc397bd07..d1e358377 100644 --- a/Assets/AI/Demon/SA_CallMeteor.cs +++ b/Assets/AI/Demon/SA_CallMeteor.cs @@ -1,12 +1,13 @@ using Invector.vCharacterController.AI.FSMBehaviour; using Lean.Pool; using UnityEngine; +using UnityEngine.Animations; +using UnityEngine.Playables; namespace DemonBoss.Magic { /// - /// Spawns a meteor behind the BOSS and launches it toward the player's position - /// Similar mechanics to FireballProjectile but coming from above + /// Spawns a meteor behind the BOSS and launches it toward the player's position. /// [CreateAssetMenu(menuName = "Invector/FSM/Actions/DemonBoss/Call Meteor")] public class SA_CallMeteor : vStateAction @@ -31,18 +32,37 @@ namespace DemonBoss.Magic [Tooltip("Tag used to find the target (usually Player)")] public string targetTag = "Player"; + [Header("One-off Overlay Clip (No Animator Params)")] + public AnimationClip overlayClip; + + [Tooltip("Playback speed (1 = normal)")] public float overlaySpeed = 1f; + [Tooltip("Blend-in seconds (instant in this minimal impl)")] public float overlayFadeIn = 0.10f; + [Tooltip("Blend-out seconds (instant in this minimal impl)")] public float overlayFadeOut = 0.10f; + [Header("Debug")] public bool enableDebug = false; private Transform _boss; private Transform _target; + // --- Playables runtime --- + private PlayableGraph _overlayGraph; + + private AnimationPlayableOutput _overlayOutput; + private AnimationClipPlayable _overlayPlayable; + private bool _overlayPlaying; + private float _overlayStopAtTime; + public override void DoAction(vIFSMBehaviourController fsm, vFSMComponentExecutionType execType = vFSMComponentExecutionType.OnStateUpdate) { if (execType == vFSMComponentExecutionType.OnStateEnter) { OnEnter(fsm); } + else if (execType == vFSMComponentExecutionType.OnStateUpdate) + { + if (_overlayPlaying && Time.time >= _overlayStopAtTime) StopOverlayWithFade(); + } } private void OnEnter(vIFSMBehaviourController fsm) @@ -58,7 +78,14 @@ namespace DemonBoss.Magic if (enableDebug) Debug.Log($"[SA_CallMeteor] Boss: {_boss.name}, Target: {_target.name}"); - SpawnMeteor(); + // Fire overlay clip (no Animator params) + PlayOverlayOnce(_boss); + + // Optional: wait for castDelay before spawning (simple timer via Invoke) + if (castDelay > 0f) + _boss.gameObject.AddComponent().Init(castDelay, SpawnMeteor); + else + SpawnMeteor(); } private void SpawnMeteor() @@ -101,5 +128,79 @@ namespace DemonBoss.Magic if (enableDebug) Debug.LogError("[SA_CallMeteor] Meteor prefab missing MeteorProjectile component!"); } } + + // -------- Playables helpers (no Animator params) -------- + private void PlayOverlayOnce(Transform owner) + { + if (overlayClip == null) return; + + var animator = owner.GetComponent(); + if (animator == null) return; + + StopOverlayImmediate(); + + _overlayGraph = PlayableGraph.Create("ActionOverlay(CallMeteor)"); + _overlayGraph.SetTimeUpdateMode(DirectorUpdateMode.GameTime); + + _overlayPlayable = AnimationClipPlayable.Create(_overlayGraph, overlayClip); + _overlayPlayable.SetApplyFootIK(false); + _overlayPlayable.SetApplyPlayableIK(false); + _overlayPlayable.SetSpeed(Mathf.Max(0.0001f, overlaySpeed)); + + _overlayOutput = AnimationPlayableOutput.Create(_overlayGraph, "AnimOut", animator); + _overlayOutput.SetSourcePlayable(_overlayPlayable); + + _overlayOutput.SetWeight(1f); + _overlayGraph.Play(); + _overlayPlaying = true; + + float len = overlayClip.length / Mathf.Max(0.0001f, overlaySpeed); + _overlayStopAtTime = Time.time + len; + + if (enableDebug) Debug.Log("[SA_CallMeteor] Overlay clip started via Playables"); + } + + private void StopOverlayImmediate() + { + if (_overlayGraph.IsValid()) + { + _overlayGraph.Stop(); + _overlayGraph.Destroy(); + } + _overlayPlaying = false; + } + + private void StopOverlayWithFade() + { + if (!_overlayPlaying) { StopOverlayImmediate(); return; } + if (_overlayOutput.IsOutputNull() == false) _overlayOutput.SetWeight(0f); + StopOverlayImmediate(); + if (enableDebug) Debug.Log("[SA_CallMeteor] Overlay clip stopped"); + } + + /// + /// Tiny helper MonoBehaviour to delay a callback without coroutines here. + /// + private sealed class DelayedInvoker : MonoBehaviour + { + private float _timeLeft; + private System.Action _callback; + + public void Init(float delay, System.Action callback) + { + _timeLeft = delay; + _callback = callback; + } + + private void Update() + { + _timeLeft -= Time.deltaTime; + if (_timeLeft <= 0f) + { + try { _callback?.Invoke(); } + finally { Destroy(this); } + } + } + } } } \ No newline at end of file diff --git a/Assets/AI/Demon/SA_CastShield.cs b/Assets/AI/Demon/SA_CastShield.cs index ea1789c72..3d96a678a 100644 --- a/Assets/AI/Demon/SA_CastShield.cs +++ b/Assets/AI/Demon/SA_CastShield.cs @@ -1,187 +1,376 @@ using Invector.vCharacterController.AI.FSMBehaviour; using Lean.Pool; using UnityEngine; +using UnityEngine.Animations; +using UnityEngine.Playables; namespace DemonBoss.Magic { /// - /// StateAction for Magic Shield spell - boss casts magical shield for 5 seconds - /// During casting boss stands still, after completion returns to Combat + /// Magic Shield + /// Spawns shield FX, holds for 'shieldDuration', then plays End and cleans up. /// - [CreateAssetMenu(menuName = "Invector/FSM/Actions/DemonBoss/Cast Shield")] + [CreateAssetMenu(menuName = "Invector/FSM/Actions/DemonBoss/Cast Shield (Start/Keep/End)")] public class SA_CastShield : vStateAction { public override string categoryName => "DemonBoss/Magic"; public override string defaultName => "Cast Shield"; - [Header("Shield Configuration")] + [Header("Shield Logic")] [Tooltip("Prefab with magical shield particle effect")] public GameObject shieldFXPrefab; - [Tooltip("Shield duration in seconds")] + [Tooltip("Shield duration in seconds (time spent in Keep phase before End)")] public float shieldDuration = 5f; - [Tooltip("Animator bool parameter name for blocking state")] + [Tooltip("Animator bool parameter name for blocking state (optional)")] public string animatorBlockingBool = "IsBlocking"; + [Header("Animation Clips (no Animator params)")] + [Tooltip("One-shot intro")] + public AnimationClip startClip; + + [Tooltip("Looping hold/maintain")] + public AnimationClip keepClip; + + [Tooltip("One-shot outro")] + public AnimationClip endClip; + + [Header("Playback & Fades")] + [Tooltip("Global playback speed for all clips")] + public float clipSpeed = 1f; + + [Tooltip("Seconds to crossfade between phases")] + public float crossfadeTime = 0.12f; + + [Tooltip("If the state exits early, still play End quickly before full teardown")] + public bool playEndOnEarlyExit = true; + [Header("Debug")] - [Tooltip("Enable debug logging")] - public bool enableDebug = false; + public bool debugLogs = false; - private GameObject spawnedShield; - private Animator npcAnimator; - private Transform npcTransform; - private float shieldStartTime; - private bool shieldActive = false; + // --- Runtime (shield/FX) --- + private Transform _npc; - /// - /// Main action execution method called by FSM - /// - public override void DoAction(vIFSMBehaviourController fsmBehaviour, vFSMComponentExecutionType executionType = vFSMComponentExecutionType.OnStateUpdate) + private Animator _anim; + private GameObject _spawnedShieldFX; + private float _shieldStartTime; + private bool _shieldActive; + + // --- Playables graph state --- + private PlayableGraph _graph; + + private AnimationPlayableOutput _output; + private AnimationMixerPlayable _mixer; // 2-way mixer for crossfades + + private AnimationClipPlayable _pStart; + private AnimationClipPlayable _pKeep; + private AnimationClipPlayable _pEnd; + + private enum Phase + { None, Start, Keep, End, Done } + + private Phase _phase = Phase.None; + + // crossfade bookkeeping + private int _fromInput = -1; // 0 or 1 + + private int _toInput = -1; // 0 or 1 + private float _fadeT0; // Time.time at fade start + private float _fadeDur; // seconds + private bool _fading; + + // which clip is bound to each input + private AnimationClipPlayable _input0; + + private AnimationClipPlayable _input1; + + // timers for auto-advance + private float _phaseScheduledEnd = 0f; // absolute Time.time when Start/End should be done + + public override void DoAction(vIFSMBehaviourController fsm, vFSMComponentExecutionType execType = vFSMComponentExecutionType.OnStateUpdate) { - if (executionType == vFSMComponentExecutionType.OnStateEnter) + if (execType == vFSMComponentExecutionType.OnStateEnter) OnEnter(fsm); + else if (execType == vFSMComponentExecutionType.OnStateUpdate) OnUpdate(fsm); + else if (execType == vFSMComponentExecutionType.OnStateExit) OnExit(fsm); + } + + // ------------------ FSM Hooks ------------------ + + private void OnEnter(vIFSMBehaviourController fsm) + { + _npc = fsm.transform; + _anim = _npc.GetComponent(); + + if (_anim != null && !string.IsNullOrEmpty(animatorBlockingBool)) + _anim.SetBool(animatorBlockingBool, true); + + SpawnShieldFX(); + + _shieldStartTime = Time.time; + _shieldActive = true; + + BuildGraphIfNeeded(); + + if (startClip != null) { - OnStateEnter(fsmBehaviour); + EnterStart(); } - else if (executionType == vFSMComponentExecutionType.OnStateUpdate) + else if (keepClip != null) { - OnStateUpdate(fsmBehaviour); + EnterKeep(); } - else if (executionType == vFSMComponentExecutionType.OnStateExit) + else { - OnStateExit(fsmBehaviour); + if (debugLogs) Debug.Log("[SA_CastShield] No Start/Keep clips; waiting to End."); + _phase = Phase.Keep; // logical keep (no anim) } } - /// - /// Called when entering state - starts shield casting - /// - private void OnStateEnter(vIFSMBehaviourController fsmBehaviour) + private void OnUpdate(vIFSMBehaviourController fsm) { - if (enableDebug) Debug.Log("[SA_CastShield] Entering shield casting state"); - - // Store NPC references - npcTransform = fsmBehaviour.transform; - npcAnimator = npcTransform.GetComponent(); - - var aiController = fsmBehaviour as Invector.vCharacterController.AI.vIControlAI; - if (aiController != null) + // handle crossfade + if (_fading) { - aiController.Stop(); - if (enableDebug) Debug.Log("[SA_CastShield] AI stopped"); + float u = Mathf.Clamp01((Time.time - _fadeT0) / Mathf.Max(0.0001f, _fadeDur)); + if (_fromInput >= 0) _mixer.SetInputWeight(_fromInput, 1f - u); + if (_toInput >= 0) _mixer.SetInputWeight(_toInput, u); + if (u >= 1f) _fading = false; } - if (npcAnimator != null && !string.IsNullOrEmpty(animatorBlockingBool)) + // auto-advance phases based on timers + if (_phase == Phase.Start && Time.time >= _phaseScheduledEnd) { - npcAnimator.SetBool(animatorBlockingBool, true); - if (enableDebug) Debug.Log($"[SA_CastShield] Set bool: {animatorBlockingBool} = true"); + if (keepClip != null) CrossfadeToKeep(); + else BeginEnd(); // no keep; go straight to End window } - - SpawnShieldEffect(fsmBehaviour); - - shieldStartTime = Time.time; - shieldActive = true; - } - - /// - /// Called every frame during state duration - /// - private void OnStateUpdate(vIFSMBehaviourController fsmBehaviour) - { - if (shieldActive && Time.time - shieldStartTime >= shieldDuration) + else if (_phase == Phase.Keep) { - if (enableDebug) Debug.Log("[SA_CastShield] Shield time passed, finishing state"); - FinishShield(fsmBehaviour); + // When shield timer is up, begin End + if (_shieldActive && (Time.time - _shieldStartTime) >= shieldDuration) + { + BeginEnd(); + } + } + else if (_phase == Phase.End && Time.time >= _phaseScheduledEnd) + { + // End completed + _phase = Phase.Done; + TeardownGraph(); + CleanupShieldFX(); + _shieldActive = false; } } - /// - /// Called when exiting state - cleanup - /// - private void OnStateExit(vIFSMBehaviourController fsmBehaviour) + private void OnExit(vIFSMBehaviourController fsm) { - if (enableDebug) Debug.Log("[SA_CastShield] Exiting shield state"); + if (_anim != null && !string.IsNullOrEmpty(animatorBlockingBool)) + _anim.SetBool(animatorBlockingBool, false); - if (npcAnimator != null && !string.IsNullOrEmpty(animatorBlockingBool)) + // If we left early, optionally play End briefly (best-effort) + if (playEndOnEarlyExit && _phase != Phase.End && _phase != Phase.Done && endClip != null) { - npcAnimator.SetBool(animatorBlockingBool, false); - if (enableDebug) Debug.Log($"[SA_CastShield] Set bool: {animatorBlockingBool} = false"); + if (debugLogs) Debug.Log("[SA_CastShield] Early exit: playing End quickly."); + // build graph if it was never built (e.g., no Start/Keep) + BuildGraphIfNeeded(); + CrossfadeTo(endClip, out _pEnd, quick: true); + _phase = Phase.End; + _phaseScheduledEnd = Time.time + Mathf.Min(endClip.length / SafeSpeed(), 0.25f); // quick outro + } + else + { + // otherwise normal cleanup + TeardownGraph(); } - if (shieldActive) - { - CleanupShield(); - } - - var aiController = fsmBehaviour as Invector.vCharacterController.AI.vIControlAI; - if (aiController != null) - { - if (enableDebug) Debug.Log("[SA_CastShield] AI resumed"); - } + CleanupShieldFX(); + _shieldActive = false; } - /// - /// Spawns magical shield particle effect - /// - private void SpawnShieldEffect(vIFSMBehaviourController fsmBehaviour) + // ------------------ Phase Transitions ------------------ + + private void EnterStart() { - if (shieldFXPrefab == null) + CrossfadeTo(startClip, out _pStart, quick: false); + _phase = Phase.Start; + _phaseScheduledEnd = Time.time + (startClip.length / SafeSpeed()); + if (debugLogs) Debug.Log("[SA_CastShield] Start phase."); + } + + private void CrossfadeToKeep() + { + if (keepClip == null) { - Debug.LogWarning("[SA_CastShield] Missing shieldFXPrefab!"); + BeginEnd(); return; } - - // Spawn shield at NPC's position and rotation - Vector3 spawnPosition = npcTransform.position; - Quaternion spawnRotation = npcTransform.rotation; - - spawnedShield = LeanPool.Spawn(shieldFXPrefab, spawnPosition, spawnRotation); - - if (enableDebug) Debug.Log($"[SA_CastShield] Shield spawned at NPC position: {spawnPosition}"); + CrossfadeTo(keepClip, out _pKeep, quick: false, loop: true); + _phase = Phase.Keep; + if (debugLogs) Debug.Log("[SA_CastShield] Switched to Keep (loop)."); } - /// - /// Finishes shield operation and transitions to next state - /// - private void FinishShield(vIFSMBehaviourController fsmBehaviour) + private void EnterKeep() { - shieldActive = false; - CleanupShield(); - - DEC_CheckCooldown.SetCooldownStatic(fsmBehaviour, "Shield", 15f); - - // End state - FSM will transition to next state - // FYI: In Invector FSM, state completion is handled automatically + CrossfadeTo(keepClip, out _pKeep, quick: false, loop: true); + _phase = Phase.Keep; + if (debugLogs) Debug.Log("[SA_CastShield] Entered Keep directly."); } - /// - /// Cleans up spawned shield - /// - private void CleanupShield() + private void BeginEnd() { - if (spawnedShield != null) + if (endClip == null) { - LeanPool.Despawn(spawnedShield); - spawnedShield = null; - if (enableDebug) Debug.Log("[SA_CastShield] Shield despawned"); + // No end clip; just finish + _phase = Phase.Done; + TeardownGraph(); + CleanupShieldFX(); + _shieldActive = false; + if (debugLogs) Debug.Log("[SA_CastShield] No End clip; finished."); + return; + } + CrossfadeTo(endClip, out _pEnd, quick: false); + _phase = Phase.End; + _phaseScheduledEnd = Time.time + (endClip.length / SafeSpeed()); + if (debugLogs) Debug.Log("[SA_CastShield] End phase."); + } + + // ------------------ Graph Setup / Crossfade ------------------ + + private void BuildGraphIfNeeded() + { + if (_graph.IsValid()) return; + + if (_anim == null) + { + _anim = _npc ? _npc.GetComponent() : null; + if (_anim == null) + { + if (debugLogs) Debug.LogWarning("[SA_CastShield] No Animator found; animation disabled."); + return; + } + } + + _graph = PlayableGraph.Create("ShieldOverlayGraph"); + _graph.SetTimeUpdateMode(DirectorUpdateMode.GameTime); + + _mixer = AnimationMixerPlayable.Create(_graph, 2); // 2-way mixer + _mixer.SetInputWeight(0, 0f); + _mixer.SetInputWeight(1, 0f); + + _output = AnimationPlayableOutput.Create(_graph, "AnimOut", _anim); + _output.SetSourcePlayable(_mixer); + _output.SetWeight(1f); + + _graph.Play(); + } + + private void TeardownGraph() + { + if (_graph.IsValid()) + { + _graph.Stop(); + _graph.Destroy(); + } + _input0 = default; + _input1 = default; + _fromInput = _toInput = -1; + _fading = false; + } + + private float SafeSpeed() => Mathf.Max(0.0001f, clipSpeed); + + /// + /// Fades from whatever is currently audible to the given clip. + /// Reuses the 2 inputs; swaps playables as needed. + /// + private void CrossfadeTo(AnimationClip clip, + out AnimationClipPlayable playableOut, + bool quick, + bool loop = false) + { + playableOut = default; + + if (!_graph.IsValid() || clip == null) return; + + float speed = SafeSpeed(); + + // Prepare or reuse a slot (two inputs that we swap between) + // Choose the silent input as target; if none is silent, pick the opposite of the currently "from". + int targetInput = (_mixer.GetInputWeight(0) < 0.0001f) ? 0 : (_mixer.GetInputWeight(1) < 0.0001f) ? 1 : (_toInput == 0 ? 1 : 0); + + // Destroy existing playable on that input if any + var currentPlayableOnTarget = (AnimationClipPlayable)_mixer.GetInput(targetInput); + if (currentPlayableOnTarget.IsValid()) + { + _graph.Disconnect(_mixer, targetInput); + currentPlayableOnTarget.Destroy(); + } + + // Create new clip playable + var newPlayable = AnimationClipPlayable.Create(_graph, clip); + newPlayable.SetApplyFootIK(false); + newPlayable.SetApplyPlayableIK(false); + newPlayable.SetSpeed(speed); + + // Connect to mixer + _graph.Connect(newPlayable, 0, _mixer, targetInput); + _mixer.SetInputWeight(targetInput, 0f); + + // Cache which playable is on which slot for optional debug + if (targetInput == 0) _input0 = newPlayable; else _input1 = newPlayable; + + // Determine current audible input to fade from + int sourceInput = (targetInput == 0) ? 1 : 0; + float wSource = _mixer.GetInputWeight(sourceInput); + bool hasSource = wSource > 0.0001f && _mixer.GetInput(sourceInput).IsValid(); + + // Start from beginning for new phase + newPlayable.SetTime(0); + playableOut = newPlayable; + + // Configure fade + _fromInput = hasSource ? sourceInput : -1; + _toInput = targetInput; + _fadeDur = Mathf.Max(0f, quick ? Mathf.Min(0.06f, crossfadeTime) : crossfadeTime); + _fadeT0 = Time.time; + _fading = _fadeDur > 0f && hasSource; + + // Set immediate weights if not fading + if (!_fading) + { + if (_fromInput >= 0) _mixer.SetInputWeight(_fromInput, 0f); + _mixer.SetInputWeight(_toInput, 1f); } } - /// - /// Checks if shield is currently active - /// - public bool IsShieldActive() + // ------------------ FX Helpers ------------------ + + private void SpawnShieldFX() { - return shieldActive; + if (shieldFXPrefab == null) return; + _spawnedShieldFX = LeanPool.Spawn(shieldFXPrefab, _npc.position, _npc.rotation); + if (debugLogs) Debug.Log("[SA_CastShield] Shield FX spawned."); } - /// - /// Returns remaining shield time - /// + private void CleanupShieldFX() + { + if (_spawnedShieldFX != null) + { + LeanPool.Despawn(_spawnedShieldFX); + _spawnedShieldFX = null; + if (debugLogs) Debug.Log("[SA_CastShield] Shield FX despawned."); + } + } + + // ------------------ Public Query ------------------ + + public bool IsShieldActive() => _shieldActive; + public float GetRemainingShieldTime() { - if (!shieldActive) return 0f; - return Mathf.Max(0f, shieldDuration - (Time.time - shieldStartTime)); + if (!_shieldActive) return 0f; + float t = Mathf.Max(0f, shieldDuration - (Time.time - _shieldStartTime)); + return (_phase == Phase.End || _phase == Phase.Done) ? 0f : t; } } } \ No newline at end of file diff --git a/Assets/AI/Demon/SA_SpawnTurretSmart.cs b/Assets/AI/Demon/SA_SpawnTurretSmart.cs index c00440bc0..31c8d2f51 100644 --- a/Assets/AI/Demon/SA_SpawnTurretSmart.cs +++ b/Assets/AI/Demon/SA_SpawnTurretSmart.cs @@ -1,13 +1,14 @@ using Invector.vCharacterController.AI.FSMBehaviour; using Lean.Pool; using UnityEngine; +using UnityEngine.Animations; +using UnityEngine.Playables; namespace DemonBoss.Magic { /// /// Spawns exactly 3 crystal turrets around the opponent. - /// Now with per-spawn randomness: global rotation offset and per-turret angle/radius jitter. - /// Validates positions (ground/obstacles) and enforces minimum separation. + /// Now with per-spawn randomness and position validation. /// [CreateAssetMenu(menuName = "Invector/FSM/Actions/DemonBoss/Spawn 3 Turrets Radial")] public class SA_SpawnTurretSmart : vStateAction @@ -43,6 +44,13 @@ namespace DemonBoss.Magic [Tooltip("Per-turret radius jitter (meters). 0 = disabled.")] public float perTurretRadiusJitter = 0.75f; + [Header("One-off Overlay Clip (No Animator Params)")] + public AnimationClip overlayClip; + + [Tooltip("Playback speed (1 = normal)")] public float overlaySpeed = 1f; + [Tooltip("Blend-in seconds (instant in this minimal impl)")] public float overlayFadeIn = 0.10f; + [Tooltip("Blend-out seconds (instant in this minimal impl)")] public float overlayFadeOut = 0.10f; + [Header("Debug")] public bool enableDebug = false; @@ -52,11 +60,25 @@ namespace DemonBoss.Magic private Transform npcTransform; private Transform playerTransform; - private readonly System.Collections.Generic.List _lastPlanned = new System.Collections.Generic.List(3); + private readonly System.Collections.Generic.List _lastPlanned = + new System.Collections.Generic.List(3); + + // --- Playables runtime --- + private PlayableGraph _overlayGraph; + + private AnimationPlayableOutput _overlayOutput; + private AnimationClipPlayable _overlayPlayable; + private bool _overlayPlaying; + private float _overlayStopAtTime; public override void DoAction(vIFSMBehaviourController fsmBehaviour, vFSMComponentExecutionType executionType = vFSMComponentExecutionType.OnStateUpdate) { if (executionType == vFSMComponentExecutionType.OnStateEnter) OnStateEnter(fsmBehaviour); + else if (executionType == vFSMComponentExecutionType.OnStateUpdate) + { + // Auto-stop overlay when finished + if (_overlayPlaying && Time.time >= _overlayStopAtTime) StopOverlayWithFade(); + } else if (executionType == vFSMComponentExecutionType.OnStateExit) OnStateExit(fsmBehaviour); } @@ -70,6 +92,8 @@ namespace DemonBoss.Magic if (npcAnimator != null && !string.IsNullOrEmpty(animatorBlockingBool)) npcAnimator.SetBool(animatorBlockingBool, true); + PlayOverlayOnce(npcTransform); + SpawnThreeTurretsRadial(fsmBehaviour); DEC_CheckCooldown.SetCooldownStatic(fsmBehaviour, "Turret", 12f); @@ -79,6 +103,8 @@ namespace DemonBoss.Magic { if (npcAnimator != null && !string.IsNullOrEmpty(animatorBlockingBool)) npcAnimator.SetBool(animatorBlockingBool, false); + + StopOverlayWithFade(); } private void FindPlayer(vIFSMBehaviourController fsmBehaviour) @@ -270,5 +296,54 @@ namespace DemonBoss.Magic prevPoint = newPoint; } } + + private void PlayOverlayOnce(Transform owner) + { + if (overlayClip == null) return; + + if (npcAnimator == null) + npcAnimator = owner.GetComponent(); + if (npcAnimator == null) return; + + StopOverlayImmediate(); // safety + + _overlayGraph = PlayableGraph.Create("ActionOverlay(SpawnTurret)"); + _overlayGraph.SetTimeUpdateMode(DirectorUpdateMode.GameTime); + + _overlayPlayable = AnimationClipPlayable.Create(_overlayGraph, overlayClip); + _overlayPlayable.SetApplyFootIK(false); + _overlayPlayable.SetApplyPlayableIK(false); + _overlayPlayable.SetSpeed(Mathf.Max(0.0001f, overlaySpeed)); + + _overlayOutput = AnimationPlayableOutput.Create(_overlayGraph, "AnimOut", npcAnimator); + _overlayOutput.SetSourcePlayable(_overlayPlayable); + + _overlayOutput.SetWeight(1f); + _overlayGraph.Play(); + _overlayPlaying = true; + + float len = overlayClip.length / Mathf.Max(0.0001f, overlaySpeed); + _overlayStopAtTime = Time.time + len; + + if (enableDebug) Debug.Log("[SA_SpawnTurretSmart] Overlay clip started via Playables"); + } + + private void StopOverlayImmediate() + { + if (_overlayGraph.IsValid()) + { + _overlayGraph.Stop(); + _overlayGraph.Destroy(); + } + _overlayPlaying = false; + } + + private void StopOverlayWithFade() + { + if (!_overlayPlaying) { StopOverlayImmediate(); return; } + if (_overlayOutput.IsOutputNull() == false) _overlayOutput.SetWeight(0f); + StopOverlayImmediate(); + if (enableDebug) Debug.Log("[SA_SpawnTurretSmart] Overlay clip stopped"); + } } } \ No newline at end of file diff --git a/Assets/AI/FSM/FSM_Demon.asset b/Assets/AI/FSM/FSM_Demon.asset index 8605f614b..45c8a25e4 100644 --- a/Assets/AI/FSM/FSM_Demon.asset +++ b/Assets/AI/FSM/FSM_Demon.asset @@ -134,7 +134,13 @@ MonoBehaviour: type: 3} shieldDuration: 10 animatorBlockingBool: IsBlocking - enableDebug: 1 + startClip: {fileID: 7400082, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} + keepClip: {fileID: 7400084, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} + endClip: {fileID: 7400086, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} + clipSpeed: 1 + crossfadeTime: 0.12 + playEndOnEarlyExit: 1 + debugLogs: 0 --- !u!114 &-6568372008305276654 MonoBehaviour: m_ObjectHideFlags: 1 @@ -158,11 +164,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -445 - y: 30 + x: -595 + y: 70 width: 150 height: 62 - positionRect: {x: -445, y: 30} + positionRect: {x: -595, y: 70} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 1, a: 1} @@ -189,14 +195,14 @@ MonoBehaviour: parentState: {fileID: -6568372008305276654} trueRect: serializedVersion: 2 - x: -295 - y: 60 + x: -445 + y: 100 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -295 - y: 70 + x: -445 + y: 110 width: 10 height: 10 selectedTrue: 0 @@ -233,6 +239,10 @@ MonoBehaviour: aboveBossHeight: 20 castDelay: 1.5 targetTag: Player + overlayClip: {fileID: 7400088, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} + overlaySpeed: 1 + overlayFadeIn: 0.1 + overlayFadeOut: 0.1 enableDebug: 1 --- !u!114 &-6379838510941931433 MonoBehaviour: @@ -287,11 +297,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -410 - y: 185 + x: -560 + y: 220 width: 150 height: 106 - positionRect: {x: -410, y: 185} + positionRect: {x: -560, y: 220} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -318,14 +328,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: -260 - y: 215 + x: -410 + y: 250 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -260 - y: 225 + x: -410 + y: 260 width: 10 height: 10 selectedTrue: 0 @@ -346,14 +356,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: -260 - y: 237 + x: -410 + y: 272 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -260 - y: 247 + x: -410 + y: 282 width: 10 height: 10 selectedTrue: 0 @@ -382,14 +392,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: -260 - y: 259 + x: -410 + y: 294 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -260 - y: 269 + x: -410 + y: 304 width: 10 height: 10 selectedTrue: 0 @@ -540,11 +550,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -130 - y: 35 + x: -285 + y: 75 width: 150 height: 62 - positionRect: {x: -130, y: 35} + positionRect: {x: -285, y: 75} rectWidth: 150 editingName: 1 nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1} @@ -563,14 +573,14 @@ MonoBehaviour: parentState: {fileID: -3177478727897100882} trueRect: serializedVersion: 2 - x: 20 - y: 65 + x: -135 + y: 105 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 20 - y: 75 + x: -135 + y: 115 width: 10 height: 10 selectedTrue: 0 @@ -609,11 +619,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 165 - y: -5 + x: 0 + y: 35 width: 150 height: 62 - positionRect: {x: 165, y: -5} + positionRect: {x: 0, y: 35} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1} @@ -625,7 +635,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: 7927421991537792917} - isValid: 0 + isValid: 1 validated: 0 trueState: {fileID: -312774025800194259} falseState: {fileID: 0} @@ -636,14 +646,14 @@ MonoBehaviour: parentState: {fileID: -2904979146780567904} trueRect: serializedVersion: 2 - x: 155 - y: 25 + x: -10 + y: 65 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 315 - y: 35 + x: 150 + y: 75 width: 10 height: 10 selectedTrue: 0 @@ -751,6 +761,10 @@ MonoBehaviour: globalStartAngleRandom: 1 perTurretAngleJitter: 10 perTurretRadiusJitter: 0.75 + overlayClip: {fileID: 7400080, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} + overlaySpeed: 1 + overlayFadeIn: 0.1 + overlayFadeOut: 0.1 enableDebug: 1 showGizmos: 1 --- !u!114 &-712571192746352845 @@ -776,11 +790,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -130 - y: -20 + x: -285 + y: 20 width: 150 height: 30 - positionRect: {x: -130, y: -20} + positionRect: {x: -285, y: 20} rectWidth: 150 editingName: 0 nodeColor: {r: 0, g: 1, b: 0, a: 1} @@ -852,11 +866,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -325 - y: 445 + x: -480 + y: 480 width: 150 height: 150 - positionRect: {x: -325, y: 445} + positionRect: {x: -480, y: 480} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1} @@ -883,14 +897,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -175 - y: 475 + x: -330 + y: 510 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -175 - y: 485 + x: -330 + y: 520 width: 10 height: 10 selectedTrue: 0 @@ -915,14 +929,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -175 - y: 497 + x: -330 + y: 532 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -175 - y: 507 + x: -330 + y: 542 width: 10 height: 10 selectedTrue: 0 @@ -955,14 +969,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -335 - y: 519 + x: -490 + y: 554 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -175 - y: 529 + x: -330 + y: 564 width: 10 height: 10 selectedTrue: 0 @@ -991,14 +1005,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -175 - y: 541 + x: -330 + y: 576 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -175 - y: 551 + x: -330 + y: 586 width: 10 height: 10 selectedTrue: 0 @@ -1023,14 +1037,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -175 - y: 563 + x: -330 + y: 598 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -175 - y: 573 + x: -330 + y: 608 width: 10 height: 10 selectedTrue: 0 @@ -1077,7 +1091,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3} m_Name: FSM_Demon m_EditorClassIdentifier: - selectedNode: {fileID: 4162026404432437805} + selectedNode: {fileID: 766956384951898899} wantConnection: 0 connectionNode: {fileID: 0} showProperties: 1 @@ -1094,7 +1108,7 @@ MonoBehaviour: - {fileID: 9112689765763526057} - {fileID: 766956384951898899} - {fileID: 4162026404432437805} - panOffset: {x: -1205, y: 130} + panOffset: {x: -860, y: -90} overNode: 0 actions: - {fileID: 0} @@ -1178,11 +1192,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 685 - y: 675 + x: 515 + y: 710 width: 150 height: 62 - positionRect: {x: 685, y: 675} + positionRect: {x: 515, y: 710} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1201,14 +1215,14 @@ MonoBehaviour: parentState: {fileID: 762670965814380212} trueRect: serializedVersion: 2 - x: 675 - y: 705 + x: 505 + y: 740 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 835 - y: 715 + x: 665 + y: 750 width: 10 height: 10 selectedTrue: 0 @@ -1245,14 +1259,14 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 1 - isSelected: 0 + isSelected: 1 nodeRect: serializedVersion: 2 - x: 750 - y: 125 + x: 580 + y: 165 width: 150 height: 62 - positionRect: {x: 750, y: 125} + positionRect: {x: 580, y: 165} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1271,14 +1285,14 @@ MonoBehaviour: parentState: {fileID: 766956384951898899} trueRect: serializedVersion: 2 - x: 740 - y: 155 + x: 570 + y: 195 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 900 - y: 165 + x: 730 + y: 205 width: 10 height: 10 selectedTrue: 0 @@ -1367,11 +1381,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 475 - y: 675 + x: 305 + y: 710 width: 150 height: 62 - positionRect: {x: 475, y: 675} + positionRect: {x: 305, y: 710} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1390,14 +1404,14 @@ MonoBehaviour: parentState: {fileID: 2691300596403639167} trueRect: serializedVersion: 2 - x: 465 - y: 705 + x: 295 + y: 740 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 625 - y: 715 + x: 455 + y: 750 width: 10 height: 10 selectedTrue: 0 @@ -1437,11 +1451,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 220 - y: 395 + x: 50 + y: 430 width: 150 height: 150 - positionRect: {x: 220, y: 395} + positionRect: {x: 50, y: 430} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -1464,14 +1478,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 210 - y: 425 + x: 40 + y: 460 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 370 - y: 435 + x: 200 + y: 470 width: 10 height: 10 selectedTrue: 0 @@ -1496,14 +1510,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 210 - y: 447 + x: 40 + y: 482 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 370 - y: 457 + x: 200 + y: 492 width: 10 height: 10 selectedTrue: 0 @@ -1517,11 +1531,11 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: -6379838510941931433} - isValid: 0 + isValid: 1 validated: 0 - trueValue: 1 decision: {fileID: -7938248970223304488} - isValid: 1 + isValid: 0 validated: 0 trueState: {fileID: 766956384951898899} falseState: {fileID: 0} @@ -1532,14 +1546,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 370 - y: 469 + x: 200 + y: 504 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 370 - y: 479 + x: 200 + y: 514 width: 10 height: 10 selectedTrue: 0 @@ -1553,7 +1567,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: -6379838510941931433} - isValid: 0 + isValid: 1 validated: 0 - trueValue: 1 decision: {fileID: 8113515040269600600} @@ -1568,14 +1582,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 370 - y: 491 + x: 200 + y: 526 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 370 - y: 501 + x: 200 + y: 536 width: 10 height: 10 selectedTrue: 0 @@ -1604,14 +1618,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 370 - y: 513 + x: 200 + y: 548 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 370 - y: 523 + x: 200 + y: 558 width: 10 height: 10 selectedTrue: 0 @@ -1708,14 +1722,14 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 0 - isSelected: 1 + isSelected: 0 nodeRect: serializedVersion: 2 - x: 745 - y: 340 + x: 575 + y: 375 width: 150 height: 30 - positionRect: {x: 745, y: 340} + positionRect: {x: 575, y: 375} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1734,14 +1748,14 @@ MonoBehaviour: parentState: {fileID: 4162026404432437805} trueRect: serializedVersion: 2 - x: 820 - y: 355 + x: 650 + y: 390 width: 0 height: 0 falseRect: serializedVersion: 2 - x: 820 - y: 355 + x: 650 + y: 390 width: 0 height: 0 selectedTrue: 0 @@ -1907,11 +1921,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 755 - y: -50 + x: 585 + y: -5 width: 150 height: 62 - positionRect: {x: 755, y: -50} + positionRect: {x: 585, y: -5} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1930,14 +1944,14 @@ MonoBehaviour: parentState: {fileID: 9112689765763526057} trueRect: serializedVersion: 2 - x: 745 - y: -20 + x: 575 + y: 25 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 905 - y: -10 + x: 735 + y: 35 width: 10 height: 10 selectedTrue: 0 diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller index 088d33cd5..73c213864 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller +++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller @@ -18027,7 +18027,7 @@ BlendTree: m_Name: Run m_Childs: - serializedVersion: 2 - m_Motion: {fileID: 7400012, guid: 37c6cfe59f56e8a4799011397a870a8b, type: 3} + m_Motion: {fileID: 7400106, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} m_Threshold: 0 m_Position: {x: 0, y: 1} m_TimeScale: 1 @@ -18153,7 +18153,7 @@ BlendTree: m_DirectBlendParameter: InputHorizontal m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 7400012, guid: 37c6cfe59f56e8a4799011397a870a8b, type: 3} + m_Motion: {fileID: 7400106, guid: 3ef453d7877555243997dba1cdaa2958, type: 3} m_Threshold: 0 m_Position: {x: 0, y: 0} m_TimeScale: 1 @@ -34993,7 +34993,7 @@ AnimatorStateMachine: m_ChildStateMachines: - serializedVersion: 1 m_StateMachine: {fileID: 1107736847571817844} - m_Position: {x: 540, y: 192, z: 0} + m_Position: {x: 540, y: 190, z: 0} - serializedVersion: 1 m_StateMachine: {fileID: 1107135120639222350} m_Position: {x: 324, y: 132, z: 0} From 058920055babc04d5ad991e7223175dafb152faf Mon Sep 17 00:00:00 2001 From: marcin Date: Wed, 10 Sep 2025 12:33:13 +0200 Subject: [PATCH 4/7] attack flow - breaking and blocking input, roll improvements --- .../Beasiculus/Bascileus_BaseModel.prefab | 2 +- ...nvector@MeleeCombat Player PRO2.controller | 46 +- .../Prefabs/Items/Powers/bBlueFireball.prefab | 16 - Assets/Scenes/Fight_Arena/Fight_Arena.unity | 21 +- Assets/Scripts/Characters/Player.cs | 22 +- .../bMeleeAttackControl.cs | 127 +- .../InvectorDerivatives/bMeleeCombatInput.cs | 10 +- .../bThirdPersonController.cs | 108 +- .../Animations/Longsword_Animset_pt4.fbx.meta | 1358 +++++++++++++---- 9 files changed, 1219 insertions(+), 491 deletions(-) diff --git a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab index 406750d95..fa810b350 100644 --- a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab +++ b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab @@ -105633,13 +105633,13 @@ MonoBehaviour: triggerDieBehaviour: 0 m_ignoreTriggers: 1 useAnimationBasedRotation: 0 - strafeRollInputThreshold: 0.3 strafeRollForwardAnim: Roll_Forward strafeRollBackwardAnim: Roll_Backward strafeRollLeftAnim: Roll_Left strafeRollRightAnim: Roll_Right strafeRollLeftCorrectionAngle: 70.6 strafeRollRightCorrectionAngle: 70 + strafeRollBackwardCorrectionAngle: 0 --- !u!114 &9202663235077955828 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller index 1ab9c2fa7..21791480e 100644 --- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller +++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller @@ -772,8 +772,7 @@ MonoBehaviour: ignoreDefense: 0 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 1 - resetTriggerBeforeTime: 0.5 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.5 lerpPositionTowardsTarget: 1 maxLerpDistance: 3.5 @@ -781,8 +780,8 @@ MonoBehaviour: stoppingDistance: 1.2 useComboTimingWindow: 1 comboWindowStartTime: 0.7 - comboWindowDuration: 0.4 - comboWindowTimeScale: 0.2 + comboWindowDuration: 0.3 + comboWindowTimeScale: 0.4 useAttackTimeScale: 0 maxTargetDistance: 3 lowHealthTh: 10 @@ -791,7 +790,7 @@ MonoBehaviour: attackTimeScaleEnd: 0.37 rotatePlayerTowardsTarget: 1 degreeThreshold: 100 - debug: 0 + debug: 1 --- !u!1101 &-8051095333111886674 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -2749,8 +2748,7 @@ MonoBehaviour: ignoreDefense: 0 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.3 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 1 maxLerpDistance: 3.5 @@ -2758,8 +2756,8 @@ MonoBehaviour: stoppingDistance: 1.2 useComboTimingWindow: 1 comboWindowStartTime: 0.6 - comboWindowDuration: 0.4 - comboWindowTimeScale: 0.2 + comboWindowDuration: 0.3 + comboWindowTimeScale: 0.4 useAttackTimeScale: 1 maxTargetDistance: 3 lowHealthTh: 30 @@ -4567,6 +4565,7 @@ MonoBehaviour: tags: - IsRolling - IgnoreIK + - LockRotation --- !u!206 &-2581317115762456654 BlendTree: m_ObjectHideFlags: 1 @@ -5216,8 +5215,7 @@ MonoBehaviour: ignoreDefense: 0 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.3 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 1 maxLerpDistance: 3.5 @@ -5225,8 +5223,8 @@ MonoBehaviour: stoppingDistance: 1.2 useComboTimingWindow: 1 comboWindowStartTime: 0.6 - comboWindowDuration: 0.4 - comboWindowTimeScale: 0.2 + comboWindowDuration: 0.3 + comboWindowTimeScale: 0.4 useAttackTimeScale: 1 maxTargetDistance: 3 lowHealthTh: 10 @@ -5738,8 +5736,7 @@ MonoBehaviour: ignoreDefense: 0 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.5 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 0 maxLerpDistance: 3.5 @@ -26561,15 +26558,14 @@ MonoBehaviour: ignoreDefense: 1 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.6 + blockInputBeforeTime: 1 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 1 maxLerpDistance: 3.5 positionLerpSpeed: 2 stoppingDistance: 1.2 useComboTimingWindow: 0 - comboWindowStartTime: 0.9 + comboWindowStartTime: 1 comboWindowDuration: 0.5 comboWindowTimeScale: 0.3 useAttackTimeScale: 0 @@ -26580,7 +26576,7 @@ MonoBehaviour: attackTimeScaleEnd: 0.58 rotatePlayerTowardsTarget: 1 degreeThreshold: 100 - debug: 0 + debug: 1 --- !u!1101 &542493047717198179 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -47984,8 +47980,7 @@ MonoBehaviour: ignoreDefense: 0 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.5 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 0 maxLerpDistance: 3.5 @@ -48139,8 +48134,7 @@ MonoBehaviour: ignoreDefense: 0 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 1 - resetTriggerBeforeTime: 0.5 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 0 maxLerpDistance: 3.5 @@ -48542,8 +48536,7 @@ MonoBehaviour: ignoreDefense: 1 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.6 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 1 maxLerpDistance: 3.5 @@ -49431,8 +49424,7 @@ MonoBehaviour: ignoreDefense: 1 activeRagdoll: 0 senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.6 + blockInputBeforeTime: 0.5 unlockRotationTime: 0.7 lerpPositionTowardsTarget: 1 maxLerpDistance: 3.5 diff --git a/Assets/Prefabs/Items/Powers/bBlueFireball.prefab b/Assets/Prefabs/Items/Powers/bBlueFireball.prefab index f22c9fece..59ca1886c 100644 --- a/Assets/Prefabs/Items/Powers/bBlueFireball.prefab +++ b/Assets/Prefabs/Items/Powers/bBlueFireball.prefab @@ -9838,7 +9838,6 @@ GameObject: - component: {fileID: 7898212980114005163} - component: {fileID: 8020189233111417037} - component: {fileID: 8020706684658151899} - - component: {fileID: 7789765392435096873} m_Layer: 0 m_Name: Particles m_TagString: Untagged @@ -14484,21 +14483,6 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!114 &7789765392435096873 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7893307381764779335} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dded6759b4b430e4283cf015251490b7, type: 3} - m_Name: - m_EditorClassIdentifier: - target: {fileID: 0} - Force: 1 - DistanceRelative: 0 --- !u!1 &7893317824759632779 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity index 833176fe3..ba47de92f 100644 --- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity @@ -16396,6 +16396,11 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 1385765897516864307, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: openCloseWindow + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1494204689157949844, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_Layer @@ -17420,7 +17425,17 @@ PrefabInstance: - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: strafeRollLeftCorrectionAngle - value: 70.6 + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: strafeRollRightCorrectionAngle + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: strafeRollBackwardCorrectionAngle + value: 180 objectReference: {fileID: 0} - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -18565,12 +18580,12 @@ PrefabInstance: - target: {fileID: 5657452459766331955, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5657452459766331955, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5671630659928648966, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} diff --git a/Assets/Scripts/Characters/Player.cs b/Assets/Scripts/Characters/Player.cs index d5c64b6d5..639186c56 100644 --- a/Assets/Scripts/Characters/Player.cs +++ b/Assets/Scripts/Characters/Player.cs @@ -81,8 +81,11 @@ namespace Beyond private PlayerAttribute brightnessAttribute; private PlayerAttribute maturityAttribute; private MagicAttacks m_magicAttacks; + private bMeleeCombatInput m_meleeCombatInput; public MagicAttacks Magic => m_magicAttacks; + public bMeleeCombatInput MeleeCombatInput => m_meleeCombatInput; + public PlayerAttribute MaturityAttribute { get @@ -186,6 +189,7 @@ namespace Beyond m_meleeManager = GetComponent(); m_magicAttacks = GetComponent(); m_autoTargetting = GetComponent(); + m_meleeCombatInput = GetComponent(); } @@ -867,10 +871,10 @@ namespace Beyond public void PlaySingleSound(AudioClip clipToPlay, bool destroyAfterPlaying = true) { - // Opcjonalne opóŸnienie na starcie poziomu, aby unikn¹æ "spamowania" dŸwiêkami + // Opcjonalne op�nienie na starcie poziomu, aby unikn�� "spamowania" d�wi�kami if (Time.timeSinceLevelLoad < 0.5f && clipToPlay != null) { - // Mo¿esz chcieæ to odkomentowaæ, jeœli dŸwiêki na starcie s¹ problemem + // Mo�esz chcie� to odkomentowa�, je�li d�wi�ki na starcie s� problemem // return; } @@ -885,28 +889,28 @@ namespace Beyond return; } - // Instancjonowanie prefabu dŸwiêkowego - // Upewnij siê, ¿e prefab 'audioSource' ma komponent AudioSource + // Instancjonowanie prefabu d�wi�kowego + // Upewnij si�, �e prefab 'audioSource' ma komponent AudioSource GameObject audioObjectInstance = Instantiate(this.audioSource, transform.position, transform.rotation); AudioSource sourceComponent = audioObjectInstance.GetComponent(); if (sourceComponent != null) { - // PlayOneShot jest dobre dla efektów, nie przerywa innych dŸwiêków na tym samym source, - // jeœli s¹ one odtwarzane przez .Play() i nie u¿ywaj¹ tego samego kana³u. + // PlayOneShot jest dobre dla efekt�w, nie przerywa innych d�wi�k�w na tym samym source, + // je�li s� one odtwarzane przez .Play() i nie u�ywaj� tego samego kana�u. sourceComponent.PlayOneShot(clipToPlay); if (destroyAfterPlaying) { - // Niszczymy obiekt GameObject zawieraj¹cy AudioSource po zakoñczeniu odtwarzania klipu. - // Dodajemy ma³y bufor czasowy, aby upewniæ siê, ¿e dŸwiêk zd¹¿y siê odtworzyæ w ca³oœci. + // Niszczymy obiekt GameObject zawieraj�cy AudioSource po zako�czeniu odtwarzania klipu. + // Dodajemy ma�y bufor czasowy, aby upewni� si�, �e d�wi�k zd��y si� odtworzy� w ca�o�ci. Destroy(audioObjectInstance, clipToPlay.length + 0.1f); } } else { Debug.LogWarning("The instantiated 'audioSource' prefab (from Player.cs) does not have an AudioSource component. Destroying instance."); - Destroy(audioObjectInstance); // Posprz¹taj, jeœli coœ posz³o nie tak + Destroy(audioObjectInstance); // Posprz�taj, je�li co� posz�o nie tak } } diff --git a/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs b/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs index 5b985eebb..c5e5621e3 100644 --- a/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs +++ b/Assets/Scripts/InvectorDerivatives/bMeleeAttackControl.cs @@ -13,6 +13,11 @@ namespace Invector.vMelee public class bMeleeAttackControl : StateMachineBehaviour { + // --- MODIFICATION: Static variable to track the currently active attack state --- + private static int activeAttackInstanceId = 0; + private int myAttackInstanceId; + // --- END MODIFICATION --- + [Header("Damage Window")] [Tooltip("NormalizedTime of Active Damage")] public float startDamage = 0.05f; @@ -37,10 +42,8 @@ namespace Invector.vMelee public float senselessTime; [Header("Attack Flow")] - [Tooltip("Check true in the last attack of your combo to reset the FSM attack triggers.")] - public bool resetAttackTrigger; - [Tooltip("Normalized time point to reset attack triggers. (Used only if Combo Timing Window is disabled)")] - public float resetTriggerBeforeTime = 0.5f; + [Tooltip("Normalized time point to start allowing the next attack input.")] + public float blockInputBeforeTime = 0.5f; [Header("Combo & Movement")] [Tooltip("Normalized time to unlock rotation, allowing the player to aim the next attack in a combo. Set to 1 to disable.")] @@ -62,7 +65,6 @@ namespace Invector.vMelee [Tooltip("How close the character should get to the target.")] public float stoppingDistance = 1.2f; - // --- MODIFIED: Switched to a real-time duration model --- [Header("Combo Timing Window")] [Tooltip("Enable a special timing window at the end of the attack to chain the next combo hit.")] public bool useComboTimingWindow = false; @@ -76,7 +78,6 @@ namespace Invector.vMelee [Tooltip("The time scale to use during the combo window for a slow-motion effect.")] public float comboWindowTimeScale = 0.1f; - // --- END MODIFICATION --- [Header("Slow Motion Settings")] [Tooltip("Enable slow motion effect during this attack based on conditions below.")] @@ -104,25 +105,30 @@ namespace Invector.vMelee private bThirdPersonController _characterController; private bool _isRotationLockedByThis; - private bool _comboWindowEffectTriggered; // --- NEW ---: Tracks if the slow-mo effect has been fired. + private bool _comboWindowEffectTriggered; private Animator _animator; + override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { - if (_animator == null) _animator = animator; + if (_animator == null) _animator = animator; + + // --- MODIFICATION: Assign a unique ID to this state instance --- + myAttackInstanceId = ++activeAttackInstanceId; + // --- END MODIFICATION --- mFighter = animator.GetComponent(); _characterController = animator.GetComponent(); if (Player.Instance != null) _autoTargettingInstance = Player.Instance.AutoTarget; - + if (_autoTargettingInstance == null && debug) Debug.LogWarning($"({damageType}) AutoTargetting instance not found. Rotation/Target features limited."); isAttacking = true; isActive = false; m_hasScaledTime = false; - _comboWindowEffectTriggered = false; // --- NEW ---: Reset the flag on enter. + _comboWindowEffectTriggered = false; if (_characterController != null) { @@ -134,26 +140,54 @@ namespace Invector.vMelee mFighter.OnEnableAttack(); if (debug) - Debug.Log($"({damageType}) OnStateEnter. The trigger that started this state has been consumed by the Animator."); + Debug.Log($"({damageType}, ID: {myAttackInstanceId}) OnStateEnter. Now the authoritative state."); + + // --- MODIFICATION: Immediately block input on enter --- + // This ensures the new state takes control right away. + BlockAttack(true); + // --- END MODIFICATION --- if (attackTimeScaleStart < 0f) attackTimeScaleStart = startDamage; if (attackTimeScaleEnd < 0f) attackTimeScaleEnd = endDamage; } + + void BlockAttack(bool block) + { + // --- MODIFICATION: Only allow the authoritative state to change the lock --- + if (myAttackInstanceId != activeAttackInstanceId) + { + if(debug) Debug.Log($"({damageType}, ID: {myAttackInstanceId}) Tried to change block but I am not the active instance ({activeAttackInstanceId}). Ignoring."); + return; + } + // --- END MODIFICATION --- + + if (Player.Instance != null) + { + var meleeInput = Player.Instance.MeleeCombatInput; + if (meleeInput != null) + { + if (meleeInput.BlockAttack != block) // Only log/change if there is a change + { + if(debug) Debug.Log($"({damageType}, ID: {myAttackInstanceId}) Setting BlockAttack to: {block}"); + meleeInput.BlockAttack = block; + } + } + } + } override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { if (Player.Instance.ActiveWeaponTrail) Player.Instance.ActiveWeaponTrail.m_colorMultiplier = Color.white + Color.red * damageMultiplier; - + float currentNormalizedTime = stateInfo.normalizedTime % 1; if (currentNormalizedTime == 0 && stateInfo.normalizedTime > 0.5f) currentNormalizedTime = 1f; - - // --- NEW: Centralized combo logic management --- + ManageComboLogic(currentNormalizedTime); - + if (_characterController != null && _characterController.lockRotation) - AttemptRotationTowardsAutoTarget(animator); - + AttemptRotationTowardsAutoTarget(animator); + AttemptPositionLerp(animator); UpdateRotationLock(currentNormalizedTime); @@ -173,16 +207,16 @@ namespace Invector.vMelee ActiveDamage(animator, false); } - if (isAttacking && currentNormalizedTime > endDamage) + if (isAttacking && currentNormalizedTime > endDamage) { if (mFighter != null) mFighter.OnDisableAttack(); - isAttacking = false; + isAttacking = false; } } override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { - if (debug) Debug.Log($"({damageType}) OnStateExit."); + if (debug) Debug.Log($"({damageType}, ID: {myAttackInstanceId}) OnStateExit."); if (isActive) { @@ -195,68 +229,53 @@ namespace Invector.vMelee isAttacking = false; m_hasScaledTime = false; - - // The TimeController now reliably handles resetting the time scale via its own coroutine. - // A manual reset here is no longer necessary and could cause conflicts. - /* - if (mFighter != null && resetAttackTrigger) - { - mFighter.ResetAttackTriggers(); - if (debug) Debug.Log($"({damageType}) Final trigger reset on exit due to 'Reset Attack Trigger' flag."); - } - */ + if (_comboWindowEffectTriggered && TimeController.Instance != null) { _comboWindowEffectTriggered = false; - TimeController.Instance.Reset(); + TimeController.Instance.Reset(); } + if (_characterController != null && _isRotationLockedByThis) { _characterController.lockRotation = false; _isRotationLockedByThis = false; } + + // --- MODIFICATION: When exiting, ensure the attack is unblocked. --- + // This is a safety net. If this was the last attack in a combo, + // we need to make sure the input is unlocked for future actions. + BlockAttack(false); + // --- END MODIFICATION --- } - /// - /// Manages the combo logic, including input window and time scale effects. - /// private void ManageComboLogic(float currentNormalizedTime) { - if (!useComboTimingWindow) + if (blockInputBeforeTime > 0f) { - // Fallback to old logic if new system is disabled for this state - if (resetAttackTrigger && currentNormalizedTime >= resetTriggerBeforeTime) + if (currentNormalizedTime >= blockInputBeforeTime) { - if (mFighter != null) - mFighter.ResetAttackTriggers(); + BlockAttack(false); // Unlock input + } + else + { + BlockAttack(true); // Block input } - return; } + + if (!useComboTimingWindow) return; - // --- FIX 2: Corrected window logic --- bool isInsideWindow = currentNormalizedTime >= comboWindowStartTime; if (isInsideWindow) { - // --- We are INSIDE the combo window --- - // We STOP resetting the trigger to allow the player's input to register. - if (!_comboWindowEffectTriggered && TimeController.Instance != null) { _comboWindowEffectTriggered = true; - TimeController.Instance.SetTimeScaleForRealTimeSec(comboWindowTimeScale, comboWindowDuration, false); - - if (debug) Debug.Log($"({damageType}) COMBO WINDOW OPEN. Accepting input. Animator mode set to UnscaledTime."); + if (debug) Debug.Log($"({damageType}) COMBO WINDOW OPEN. Accepting input."); } } - else - { - // --- We are OUTSIDE the combo window --- - // We continuously reset the trigger to consume any premature/late input. - if (mFighter != null) - mFighter.ResetAttackTriggers(); - } } // --- Other methods remain unchanged --- diff --git a/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs b/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs index fc3e26549..9d2b21a6c 100644 --- a/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs +++ b/Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs @@ -4,6 +4,7 @@ using Invector.vEventSystems; using Invector.vMelee; using UnityEngine; using System.Collections; +using UnityEngine.Android; namespace Beyond { @@ -23,6 +24,8 @@ namespace Beyond internal vMeleeManager meleeManager; protected bool _isAttacking; + public bool BlockAttack { get; set; } + public bool isAttacking { get => _isAttacking || (cc != null && cc.IsAnimatorTag("Attack")); @@ -87,16 +90,17 @@ namespace Beyond autoTargeting = GetComponent(); if (autoTargeting == null && Player.Instance != null && Player.Instance.gameObject == this.gameObject) { - autoTargeting = Player.Instance.GetComponent(); + autoTargeting = Player.Instance.GetComponent(); } if (autoTargeting == null && cc != null && cc.transform.root != null) { - autoTargeting = cc.transform.root.GetComponentInChildren(true); + autoTargeting = cc.transform.root.GetComponentInChildren(true); } if (autoTargeting == null) { Debug.LogWarning("bMeleeCombatInput: AutoTargetting component not found. Dash towards target will require manual aiming."); } + BlockAttack = false; } protected override void LateUpdate() @@ -241,7 +245,7 @@ namespace Beyond public virtual bool MeleeAttackConditions() { if (meleeManager == null) meleeManager = GetComponent(); - return meleeManager != null && cc != null && cc.isGrounded && !cc.customAction && !cc.IsAnimatorTag("special") && + return !BlockAttack && meleeManager != null && cc != null && cc.isGrounded && !cc.customAction && !cc.IsAnimatorTag("special") && !cc.isJumping && !cc.isCrouching && !cc.isRolling && !isEquipping && (cc.animator != null && !cc.animator.IsInTransition(cc.baseLayer)) && !isRotatingAndDashing; } diff --git a/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs b/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs index 5c198910c..74259e5e3 100644 --- a/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs +++ b/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs @@ -18,10 +18,6 @@ namespace Beyond public bool useAnimationBasedRotation = false; [Header("Beyond's Strafe Combat Settings")] - [Tooltip("The minimum horizontal input value to trigger a side roll instead of a forward/backward one.")] - [Range(0.1f, 1.0f)] - public float strafeRollInputThreshold = 0.3f; - [Tooltip("The name of the animation state to play when rolling forward while strafing. (This is now disabled)")] public string strafeRollForwardAnim = "Roll_Forward"; // Kept for reference, but won't be used [Tooltip("The name of the animation state to play when rolling backward while strafing.")] @@ -31,15 +27,19 @@ namespace Beyond [Tooltip("The name of the animation state to play when rolling right while strafing.")] public string strafeRollRightAnim = "Roll_Right"; - // --- UPDATED FIELDS FOR INDEPENDENT CONTROL --- + // --- UPDATED FIELDS FOR FINER CONTROL --- [Header("Beyond's Strafe Roll Correction")] - [Tooltip("The fixed angle to rotate the character before a LEFT strafe roll.")] - [Range(0f, 90f)] - public float strafeRollLeftCorrectionAngle = 45f; + [Tooltip("An additional angle to apply for a LEFT strafe roll.")] + [Range(-90f, 90f)] + public float strafeRollLeftCorrectionAngle = -45f; - [Tooltip("The fixed angle to rotate the character before a RIGHT strafe roll.")] - [Range(0f, 90f)] - public float strafeRollRightCorrectionAngle = 70f; + [Tooltip("An additional angle to apply for a RIGHT strafe roll.")] + [Range(-90f, 90f)] + public float strafeRollRightCorrectionAngle = 45f; + + [Tooltip("An additional angle to apply for a BACKWARD strafe roll. Use 0 for a standard 180-degree roll.")] + [Range(-180f, 180f)] + public float strafeRollBackwardCorrectionAngle = 0f; // --- END OF UPDATED FIELDS --- public bool GodMode @@ -64,27 +64,21 @@ namespace Beyond protected override void RollBehavior() { - // If we are not strafing, use the default Invector roll behavior. if (!isStrafing) { base.RollBehavior(); return; } - - // Custom Strafe Roll with Root Motion (no rotation logic needed here anymore) if (!isRolling) { return; } - Vector3 deltaPosition = new Vector3(animator.deltaPosition.x, 0f, animator.deltaPosition.z); Vector3 v = (deltaPosition / Time.deltaTime) * (1f - stopMoveWeight); - if (rollUseGravity && animator.GetNormalizedTime(baseLayer) >= rollUseGravityTime) { v.y = _rigidbody.linearVelocity.y; } - _rigidbody.linearVelocity = v; } @@ -120,7 +114,12 @@ namespace Beyond } } - // --- MODIFIED METHOD WITH TWO-ANGLE LOGIC --- + // --- FINAL ROBUST METHOD --- + // This logic now handles all specified cases: + // 1. Sets a base rotation facing the camera to ensure consistency. + // 2. Defaults to a backward roll if input is near-zero (fixing the lingering roll issue). + // 3. Never uses the forward roll; it triggers a backward roll instead. + // 4. Applies a unique correction angle for backward rolls as well as side rolls. private void TriggerStrafeRoll(string forwardAnim, string backwardAnim, string leftAnim, string rightAnim) { OnRoll.Invoke(); @@ -129,42 +128,59 @@ namespace Beyond currentStaminaRecoveryDelay = 2f; string animToPlay; + float correctionAngle = 0f; - // Prioritize side rolls based on horizontal input. - if (Mathf.Abs(horizontalSpeed) > strafeRollInputThreshold) + // Determine the base "forward" direction from the camera, ignoring vertical tilt. + Vector3 baseForward = Vector3.Scale(Camera.main.transform.forward, new Vector3(1, 0, 1)).normalized; + if (baseForward == Vector3.zero) baseForward = transform.forward; // Fallback + + // Set the character's rotation to this base direction. This provides a clean slate. + transform.rotation = Quaternion.LookRotation(baseForward); + + // Check if input is negligible (joystick is centered). + // input.sqrMagnitude is more efficient than input.magnitude. 0.1*0.1=0.01. + if (input.sqrMagnitude < 0.01f) { - float correction = 0f; - - // Check if rolling right (positive horizontal speed) - if (horizontalSpeed > 0) - { - animToPlay = rightAnim; - // For a right roll, we apply a negative rotation (turn left) to angle the trajectory forward. - correction = -strafeRollRightCorrectionAngle; - } - // Otherwise, rolling left - else - { - animToPlay = leftAnim; - // For a left roll, we apply a positive rotation (turn right) to angle the trajectory forward. - correction = strafeRollLeftCorrectionAngle; - } - - // Apply the calculated rotation instantly around the Y-axis. - if (correction != 0) - { - transform.Rotate(0, correction, 0); - } + // If no input, always perform a backward roll. + animToPlay = backwardAnim; + correctionAngle = strafeRollBackwardCorrectionAngle; } - // If horizontal input is not met, default to the backward roll. else { - animToPlay = backwardAnim; + // If there IS input, determine the dominant direction. + if (Mathf.Abs(verticalSpeed) >= Mathf.Abs(horizontalSpeed)) + { + // Vertical input is dominant. + // ALWAYS use the backward roll, regardless of forward or backward input. + animToPlay = backwardAnim; + correctionAngle = strafeRollBackwardCorrectionAngle; + } + else + { + // Horizontal input is dominant. + if (horizontalSpeed > 0) + { + animToPlay = rightAnim; + correctionAngle = strafeRollRightCorrectionAngle; + } + else + { + animToPlay = leftAnim; + correctionAngle = strafeRollLeftCorrectionAngle; + } + } } - + + // Apply the chosen correction angle if it's not zero. + if (correctionAngle != 0f) + { + transform.Rotate(0, correctionAngle, 0); + } + + // Play the selected animation. animator.CrossFadeInFixedTime(animToPlay, rollTransition, baseLayer); } - // --- END OF MODIFIED METHOD --- + // --- END OF FINAL METHOD --- public void OnEvadeStart() { if (!m_GodMode) isImmortal = true; } public void OnEvadeEnd() { if (!m_GodMode) isImmortal = false; } diff --git a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt4.fbx.meta b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt4.fbx.meta index 60ca88868..41988d1c7 100644 --- a/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt4.fbx.meta +++ b/Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt4.fbx.meta @@ -1,326 +1,934 @@ fileFormatVersion: 2 guid: c5937c944a220444aa33be3fe1480174 -timeCreated: 1490889342 -licenseType: Store +AssetOrigin: + serializedVersion: 1 + productId: 92239 + packageName: Longsword Animset Pro + packageVersion: 1.0 + assetPath: Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt4.fbx + uploadId: 340990 ModelImporter: - serializedVersion: 21 - fileIDToRecycleName: - 100000: DummyMESH - 100002: Head - 100004: Hips - 100006: LeftArm - 100008: LeftArmRoll - 100010: LeftFoot - 100012: LeftForeArm - 100014: LeftForeArmRoll - 100016: LeftHand - 100018: LeftHandIndex1 - 100020: LeftHandIndex2 - 100022: LeftHandIndex3 - 100024: LeftHandIndex4 - 100026: LeftHandMiddle1 - 100028: LeftHandMiddle2 - 100030: LeftHandMiddle3 - 100032: LeftHandMiddle4 - 100034: LeftHandPinky1 - 100036: LeftHandPinky2 - 100038: LeftHandPinky3 - 100040: LeftHandPinky4 - 100042: LeftHandProp - 100044: LeftHandRing1 - 100046: LeftHandRing2 - 100048: LeftHandRing3 - 100050: LeftHandRing4 - 100052: LeftHandThumb1 - 100054: LeftHandThumb2 - 100056: LeftHandThumb3 - 100058: LeftHandThumb4 - 100060: LeftLeg - 100062: LeftLegRoll - 100064: LeftShoulder - 100066: LeftToeBase - 100068: LeftToeBase_END - 100070: LeftUpLeg - 100072: LeftUpLegRoll - 100074: //RootNode - 100076: Neck - 100078: RightArm - 100080: RightArmRoll - 100082: RightFoot - 100084: RightForeArm - 100086: RightForeArmRoll - 100088: RightHand - 100090: RightHandIndex1 - 100092: RightHandIndex2 - 100094: RightHandIndex3 - 100096: RightHandIndex4 - 100098: RightHandMiddle1 - 100100: RightHandMiddle2 - 100102: RightHandMiddle3 - 100104: RightHandMiddle4 - 100106: RightHandPinky1 - 100108: RightHandPinky2 - 100110: RightHandPinky3 - 100112: RightHandPinky4 - 100114: RightHandProp - 100116: RightHandRing1 - 100118: RightHandRing2 - 100120: RightHandRing3 - 100122: RightHandRing4 - 100124: RightHandThumb1 - 100126: RightHandThumb2 - 100128: RightHandThumb3 - 100130: RightHandThumb4 - 100132: RightLeg - 100134: RightLegRoll - 100136: RightShoulder - 100138: RightToeBase - 100140: RightToeBase_END - 100142: RightUpLeg - 100144: RightUpLegRoll - 100146: Root - 100148: Spine - 100150: Spine1 - 100152: Jaw - 100154: Jaw_END - 100156: LeftBrow1 - 100158: LeftBrow2 - 100160: LeftBrow3 - 100162: LeftCheek - 100164: LeftCheek1 - 100166: LeftCheekMouth - 100168: LeftCheekUp - 100170: LeftCheekUp1 - 100172: LeftChin - 100174: LeftEye - 100176: LeftEyeLidDown - 100178: LeftEyeLidUp - 100180: LeftFrontSkirt1 - 100182: LeftFrontSkirt2 - 100184: LeftNostril - 100186: LeftPauldron - 100188: MouthCenterDown - 100190: MouthCenterUp - 100192: MouthLeftCorner - 100194: MouthLeftDown - 100196: MouthLeftDown1 - 100198: MouthLeftUp - 100200: MouthLeftUp1 - 100202: MouthRightCorner - 100204: MouthRightDown - 100206: MouthRightDown1 - 100208: MouthRightUp - 100210: MouthRightUp1 - 100212: RightBrow1 - 100214: RightBrow2 - 100216: RightBrow3 - 100218: RightCheek - 100220: RightCheek1 - 100222: RightCheekMouth - 100224: RightCheekUp - 100226: RightCheekUp1 - 100228: RightChin - 100230: RightEye - 100232: RightEyeLidDown - 100234: RightEyeLidUp - 100236: RightFrontSkirt1 - 100238: RightFrontSkirt2 - 100240: RightNostril - 100242: RightPauldron - 100244: Tongue - 100246: Tongue1 - 100248: Tongue2 - 100250: VampArmsLegsMESH_LOD0 - 100252: VampCapeMESH - 100254: VampHeadMESH_LOD0 - 100256: VampTeethMESH_LOD0 - 100258: VampTorsoMESH_LOD0 - 400000: DummyMESH - 400002: Head - 400004: Hips - 400006: LeftArm - 400008: LeftArmRoll - 400010: LeftFoot - 400012: LeftForeArm - 400014: LeftForeArmRoll - 400016: LeftHand - 400018: LeftHandIndex1 - 400020: LeftHandIndex2 - 400022: LeftHandIndex3 - 400024: LeftHandIndex4 - 400026: LeftHandMiddle1 - 400028: LeftHandMiddle2 - 400030: LeftHandMiddle3 - 400032: LeftHandMiddle4 - 400034: LeftHandPinky1 - 400036: LeftHandPinky2 - 400038: LeftHandPinky3 - 400040: LeftHandPinky4 - 400042: LeftHandProp - 400044: LeftHandRing1 - 400046: LeftHandRing2 - 400048: LeftHandRing3 - 400050: LeftHandRing4 - 400052: LeftHandThumb1 - 400054: LeftHandThumb2 - 400056: LeftHandThumb3 - 400058: LeftHandThumb4 - 400060: LeftLeg - 400062: LeftLegRoll - 400064: LeftShoulder - 400066: LeftToeBase - 400068: LeftToeBase_END - 400070: LeftUpLeg - 400072: LeftUpLegRoll - 400074: //RootNode - 400076: Neck - 400078: RightArm - 400080: RightArmRoll - 400082: RightFoot - 400084: RightForeArm - 400086: RightForeArmRoll - 400088: RightHand - 400090: RightHandIndex1 - 400092: RightHandIndex2 - 400094: RightHandIndex3 - 400096: RightHandIndex4 - 400098: RightHandMiddle1 - 400100: RightHandMiddle2 - 400102: RightHandMiddle3 - 400104: RightHandMiddle4 - 400106: RightHandPinky1 - 400108: RightHandPinky2 - 400110: RightHandPinky3 - 400112: RightHandPinky4 - 400114: RightHandProp - 400116: RightHandRing1 - 400118: RightHandRing2 - 400120: RightHandRing3 - 400122: RightHandRing4 - 400124: RightHandThumb1 - 400126: RightHandThumb2 - 400128: RightHandThumb3 - 400130: RightHandThumb4 - 400132: RightLeg - 400134: RightLegRoll - 400136: RightShoulder - 400138: RightToeBase - 400140: RightToeBase_END - 400142: RightUpLeg - 400144: RightUpLegRoll - 400146: Root - 400148: Spine - 400150: Spine1 - 400152: Jaw - 400154: Jaw_END - 400156: LeftBrow1 - 400158: LeftBrow2 - 400160: LeftBrow3 - 400162: LeftCheek - 400164: LeftCheek1 - 400166: LeftCheekMouth - 400168: LeftCheekUp - 400170: LeftCheekUp1 - 400172: LeftChin - 400174: LeftEye - 400176: LeftEyeLidDown - 400178: LeftEyeLidUp - 400180: LeftFrontSkirt1 - 400182: LeftFrontSkirt2 - 400184: LeftNostril - 400186: LeftPauldron - 400188: MouthCenterDown - 400190: MouthCenterUp - 400192: MouthLeftCorner - 400194: MouthLeftDown - 400196: MouthLeftDown1 - 400198: MouthLeftUp - 400200: MouthLeftUp1 - 400202: MouthRightCorner - 400204: MouthRightDown - 400206: MouthRightDown1 - 400208: MouthRightUp - 400210: MouthRightUp1 - 400212: RightBrow1 - 400214: RightBrow2 - 400216: RightBrow3 - 400218: RightCheek - 400220: RightCheek1 - 400222: RightCheekMouth - 400224: RightCheekUp - 400226: RightCheekUp1 - 400228: RightChin - 400230: RightEye - 400232: RightEyeLidDown - 400234: RightEyeLidUp - 400236: RightFrontSkirt1 - 400238: RightFrontSkirt2 - 400240: RightNostril - 400242: RightPauldron - 400244: Tongue - 400246: Tongue1 - 400248: Tongue2 - 400250: VampArmsLegsMESH_LOD0 - 400252: VampCapeMESH - 400254: VampHeadMESH_LOD0 - 400256: VampTeethMESH_LOD0 - 400258: VampTorsoMESH_LOD0 - 4300000: DummyMESH - 4300002: VampTeethMESH_LOD0 - 4300004: VampTorsoMESH_LOD0 - 4300006: VampCapeMESH - 4300008: VampArmsLegsMESH_LOD0 - 4300010: VampHeadMESH_LOD0 - 7400000: Longs_GetUpBack - 7400002: Longs_KO_1 - 7400004: Longs_KO_2 - 7400006: Longs_KO_Air - 7400008: Longs_KO_AirStrong - 7400010: Longs_KO_Fall_Start - 7400012: Longs_KO_Fall_End - 7400014: Longs_SprintLoop - 7400016: Longs_SprintStart - 7400018: Longs_SprintStop_LU - 7400020: Longs_SprintStop_RU - 7400022: Longs_RollFwd - 7400024: Longs_RollBwd - 7400026: Longs_RollLeft - 7400028: Longs_RollRight - 7400030: Longs_OnGround_Hit - 7400032: Longs_JumpAttack_R - 7400034: Longs_JumpAttack_RD - 7400036: Longs_JumpAttack_LD - 7400038: Longs_BlockStart - 7400040: Longs_BlockLoop - 7400042: Longs_BlockImpact - 7400044: Longs_BlockEnd - 7400046: Longs_BlockAdd - 7400048: Longs_CrouchLoop - 7400050: Longs_CrouchStart - 7400052: Longs_CrouchEnd - 9500000: //RootNode - 13700000: DummyMESH - 13700002: VampArmsLegsMESH_LOD0 - 13700004: VampCapeMESH - 13700006: VampHeadMESH_LOD0 - 13700008: VampTeethMESH_LOD0 - 13700010: VampTorsoMESH_LOD0 + serializedVersion: 22200 + internalIDToNameTable: + - first: + 1: 100000 + second: DummyMESH + - first: + 1: 100002 + second: Head + - first: + 1: 100004 + second: Hips + - first: + 1: 100006 + second: LeftArm + - first: + 1: 100008 + second: LeftArmRoll + - first: + 1: 100010 + second: LeftFoot + - first: + 1: 100012 + second: LeftForeArm + - first: + 1: 100014 + second: LeftForeArmRoll + - first: + 1: 100016 + second: LeftHand + - first: + 1: 100018 + second: LeftHandIndex1 + - first: + 1: 100020 + second: LeftHandIndex2 + - first: + 1: 100022 + second: LeftHandIndex3 + - first: + 1: 100024 + second: LeftHandIndex4 + - first: + 1: 100026 + second: LeftHandMiddle1 + - first: + 1: 100028 + second: LeftHandMiddle2 + - first: + 1: 100030 + second: LeftHandMiddle3 + - first: + 1: 100032 + second: LeftHandMiddle4 + - first: + 1: 100034 + second: LeftHandPinky1 + - first: + 1: 100036 + second: LeftHandPinky2 + - first: + 1: 100038 + second: LeftHandPinky3 + - first: + 1: 100040 + second: LeftHandPinky4 + - first: + 1: 100042 + second: LeftHandProp + - first: + 1: 100044 + second: LeftHandRing1 + - first: + 1: 100046 + second: LeftHandRing2 + - first: + 1: 100048 + second: LeftHandRing3 + - first: + 1: 100050 + second: LeftHandRing4 + - first: + 1: 100052 + second: LeftHandThumb1 + - first: + 1: 100054 + second: LeftHandThumb2 + - first: + 1: 100056 + second: LeftHandThumb3 + - first: + 1: 100058 + second: LeftHandThumb4 + - first: + 1: 100060 + second: LeftLeg + - first: + 1: 100062 + second: LeftLegRoll + - first: + 1: 100064 + second: LeftShoulder + - first: + 1: 100066 + second: LeftToeBase + - first: + 1: 100068 + second: LeftToeBase_END + - first: + 1: 100070 + second: LeftUpLeg + - first: + 1: 100072 + second: LeftUpLegRoll + - first: + 1: 100074 + second: //RootNode + - first: + 1: 100076 + second: Neck + - first: + 1: 100078 + second: RightArm + - first: + 1: 100080 + second: RightArmRoll + - first: + 1: 100082 + second: RightFoot + - first: + 1: 100084 + second: RightForeArm + - first: + 1: 100086 + second: RightForeArmRoll + - first: + 1: 100088 + second: RightHand + - first: + 1: 100090 + second: RightHandIndex1 + - first: + 1: 100092 + second: RightHandIndex2 + - first: + 1: 100094 + second: RightHandIndex3 + - first: + 1: 100096 + second: RightHandIndex4 + - first: + 1: 100098 + second: RightHandMiddle1 + - first: + 1: 100100 + second: RightHandMiddle2 + - first: + 1: 100102 + second: RightHandMiddle3 + - first: + 1: 100104 + second: RightHandMiddle4 + - first: + 1: 100106 + second: RightHandPinky1 + - first: + 1: 100108 + second: RightHandPinky2 + - first: + 1: 100110 + second: RightHandPinky3 + - first: + 1: 100112 + second: RightHandPinky4 + - first: + 1: 100114 + second: RightHandProp + - first: + 1: 100116 + second: RightHandRing1 + - first: + 1: 100118 + second: RightHandRing2 + - first: + 1: 100120 + second: RightHandRing3 + - first: + 1: 100122 + second: RightHandRing4 + - first: + 1: 100124 + second: RightHandThumb1 + - first: + 1: 100126 + second: RightHandThumb2 + - first: + 1: 100128 + second: RightHandThumb3 + - first: + 1: 100130 + second: RightHandThumb4 + - first: + 1: 100132 + second: RightLeg + - first: + 1: 100134 + second: RightLegRoll + - first: + 1: 100136 + second: RightShoulder + - first: + 1: 100138 + second: RightToeBase + - first: + 1: 100140 + second: RightToeBase_END + - first: + 1: 100142 + second: RightUpLeg + - first: + 1: 100144 + second: RightUpLegRoll + - first: + 1: 100146 + second: Root + - first: + 1: 100148 + second: Spine + - first: + 1: 100150 + second: Spine1 + - first: + 1: 100152 + second: Jaw + - first: + 1: 100154 + second: Jaw_END + - first: + 1: 100156 + second: LeftBrow1 + - first: + 1: 100158 + second: LeftBrow2 + - first: + 1: 100160 + second: LeftBrow3 + - first: + 1: 100162 + second: LeftCheek + - first: + 1: 100164 + second: LeftCheek1 + - first: + 1: 100166 + second: LeftCheekMouth + - first: + 1: 100168 + second: LeftCheekUp + - first: + 1: 100170 + second: LeftCheekUp1 + - first: + 1: 100172 + second: LeftChin + - first: + 1: 100174 + second: LeftEye + - first: + 1: 100176 + second: LeftEyeLidDown + - first: + 1: 100178 + second: LeftEyeLidUp + - first: + 1: 100180 + second: LeftFrontSkirt1 + - first: + 1: 100182 + second: LeftFrontSkirt2 + - first: + 1: 100184 + second: LeftNostril + - first: + 1: 100186 + second: LeftPauldron + - first: + 1: 100188 + second: MouthCenterDown + - first: + 1: 100190 + second: MouthCenterUp + - first: + 1: 100192 + second: MouthLeftCorner + - first: + 1: 100194 + second: MouthLeftDown + - first: + 1: 100196 + second: MouthLeftDown1 + - first: + 1: 100198 + second: MouthLeftUp + - first: + 1: 100200 + second: MouthLeftUp1 + - first: + 1: 100202 + second: MouthRightCorner + - first: + 1: 100204 + second: MouthRightDown + - first: + 1: 100206 + second: MouthRightDown1 + - first: + 1: 100208 + second: MouthRightUp + - first: + 1: 100210 + second: MouthRightUp1 + - first: + 1: 100212 + second: RightBrow1 + - first: + 1: 100214 + second: RightBrow2 + - first: + 1: 100216 + second: RightBrow3 + - first: + 1: 100218 + second: RightCheek + - first: + 1: 100220 + second: RightCheek1 + - first: + 1: 100222 + second: RightCheekMouth + - first: + 1: 100224 + second: RightCheekUp + - first: + 1: 100226 + second: RightCheekUp1 + - first: + 1: 100228 + second: RightChin + - first: + 1: 100230 + second: RightEye + - first: + 1: 100232 + second: RightEyeLidDown + - first: + 1: 100234 + second: RightEyeLidUp + - first: + 1: 100236 + second: RightFrontSkirt1 + - first: + 1: 100238 + second: RightFrontSkirt2 + - first: + 1: 100240 + second: RightNostril + - first: + 1: 100242 + second: RightPauldron + - first: + 1: 100244 + second: Tongue + - first: + 1: 100246 + second: Tongue1 + - first: + 1: 100248 + second: Tongue2 + - first: + 1: 100250 + second: VampArmsLegsMESH_LOD0 + - first: + 1: 100252 + second: VampCapeMESH + - first: + 1: 100254 + second: VampHeadMESH_LOD0 + - first: + 1: 100256 + second: VampTeethMESH_LOD0 + - first: + 1: 100258 + second: VampTorsoMESH_LOD0 + - first: + 4: 400000 + second: DummyMESH + - first: + 4: 400002 + second: Head + - first: + 4: 400004 + second: Hips + - first: + 4: 400006 + second: LeftArm + - first: + 4: 400008 + second: LeftArmRoll + - first: + 4: 400010 + second: LeftFoot + - first: + 4: 400012 + second: LeftForeArm + - first: + 4: 400014 + second: LeftForeArmRoll + - first: + 4: 400016 + second: LeftHand + - first: + 4: 400018 + second: LeftHandIndex1 + - first: + 4: 400020 + second: LeftHandIndex2 + - first: + 4: 400022 + second: LeftHandIndex3 + - first: + 4: 400024 + second: LeftHandIndex4 + - first: + 4: 400026 + second: LeftHandMiddle1 + - first: + 4: 400028 + second: LeftHandMiddle2 + - first: + 4: 400030 + second: LeftHandMiddle3 + - first: + 4: 400032 + second: LeftHandMiddle4 + - first: + 4: 400034 + second: LeftHandPinky1 + - first: + 4: 400036 + second: LeftHandPinky2 + - first: + 4: 400038 + second: LeftHandPinky3 + - first: + 4: 400040 + second: LeftHandPinky4 + - first: + 4: 400042 + second: LeftHandProp + - first: + 4: 400044 + second: LeftHandRing1 + - first: + 4: 400046 + second: LeftHandRing2 + - first: + 4: 400048 + second: LeftHandRing3 + - first: + 4: 400050 + second: LeftHandRing4 + - first: + 4: 400052 + second: LeftHandThumb1 + - first: + 4: 400054 + second: LeftHandThumb2 + - first: + 4: 400056 + second: LeftHandThumb3 + - first: + 4: 400058 + second: LeftHandThumb4 + - first: + 4: 400060 + second: LeftLeg + - first: + 4: 400062 + second: LeftLegRoll + - first: + 4: 400064 + second: LeftShoulder + - first: + 4: 400066 + second: LeftToeBase + - first: + 4: 400068 + second: LeftToeBase_END + - first: + 4: 400070 + second: LeftUpLeg + - first: + 4: 400072 + second: LeftUpLegRoll + - first: + 4: 400074 + second: //RootNode + - first: + 4: 400076 + second: Neck + - first: + 4: 400078 + second: RightArm + - first: + 4: 400080 + second: RightArmRoll + - first: + 4: 400082 + second: RightFoot + - first: + 4: 400084 + second: RightForeArm + - first: + 4: 400086 + second: RightForeArmRoll + - first: + 4: 400088 + second: RightHand + - first: + 4: 400090 + second: RightHandIndex1 + - first: + 4: 400092 + second: RightHandIndex2 + - first: + 4: 400094 + second: RightHandIndex3 + - first: + 4: 400096 + second: RightHandIndex4 + - first: + 4: 400098 + second: RightHandMiddle1 + - first: + 4: 400100 + second: RightHandMiddle2 + - first: + 4: 400102 + second: RightHandMiddle3 + - first: + 4: 400104 + second: RightHandMiddle4 + - first: + 4: 400106 + second: RightHandPinky1 + - first: + 4: 400108 + second: RightHandPinky2 + - first: + 4: 400110 + second: RightHandPinky3 + - first: + 4: 400112 + second: RightHandPinky4 + - first: + 4: 400114 + second: RightHandProp + - first: + 4: 400116 + second: RightHandRing1 + - first: + 4: 400118 + second: RightHandRing2 + - first: + 4: 400120 + second: RightHandRing3 + - first: + 4: 400122 + second: RightHandRing4 + - first: + 4: 400124 + second: RightHandThumb1 + - first: + 4: 400126 + second: RightHandThumb2 + - first: + 4: 400128 + second: RightHandThumb3 + - first: + 4: 400130 + second: RightHandThumb4 + - first: + 4: 400132 + second: RightLeg + - first: + 4: 400134 + second: RightLegRoll + - first: + 4: 400136 + second: RightShoulder + - first: + 4: 400138 + second: RightToeBase + - first: + 4: 400140 + second: RightToeBase_END + - first: + 4: 400142 + second: RightUpLeg + - first: + 4: 400144 + second: RightUpLegRoll + - first: + 4: 400146 + second: Root + - first: + 4: 400148 + second: Spine + - first: + 4: 400150 + second: Spine1 + - first: + 4: 400152 + second: Jaw + - first: + 4: 400154 + second: Jaw_END + - first: + 4: 400156 + second: LeftBrow1 + - first: + 4: 400158 + second: LeftBrow2 + - first: + 4: 400160 + second: LeftBrow3 + - first: + 4: 400162 + second: LeftCheek + - first: + 4: 400164 + second: LeftCheek1 + - first: + 4: 400166 + second: LeftCheekMouth + - first: + 4: 400168 + second: LeftCheekUp + - first: + 4: 400170 + second: LeftCheekUp1 + - first: + 4: 400172 + second: LeftChin + - first: + 4: 400174 + second: LeftEye + - first: + 4: 400176 + second: LeftEyeLidDown + - first: + 4: 400178 + second: LeftEyeLidUp + - first: + 4: 400180 + second: LeftFrontSkirt1 + - first: + 4: 400182 + second: LeftFrontSkirt2 + - first: + 4: 400184 + second: LeftNostril + - first: + 4: 400186 + second: LeftPauldron + - first: + 4: 400188 + second: MouthCenterDown + - first: + 4: 400190 + second: MouthCenterUp + - first: + 4: 400192 + second: MouthLeftCorner + - first: + 4: 400194 + second: MouthLeftDown + - first: + 4: 400196 + second: MouthLeftDown1 + - first: + 4: 400198 + second: MouthLeftUp + - first: + 4: 400200 + second: MouthLeftUp1 + - first: + 4: 400202 + second: MouthRightCorner + - first: + 4: 400204 + second: MouthRightDown + - first: + 4: 400206 + second: MouthRightDown1 + - first: + 4: 400208 + second: MouthRightUp + - first: + 4: 400210 + second: MouthRightUp1 + - first: + 4: 400212 + second: RightBrow1 + - first: + 4: 400214 + second: RightBrow2 + - first: + 4: 400216 + second: RightBrow3 + - first: + 4: 400218 + second: RightCheek + - first: + 4: 400220 + second: RightCheek1 + - first: + 4: 400222 + second: RightCheekMouth + - first: + 4: 400224 + second: RightCheekUp + - first: + 4: 400226 + second: RightCheekUp1 + - first: + 4: 400228 + second: RightChin + - first: + 4: 400230 + second: RightEye + - first: + 4: 400232 + second: RightEyeLidDown + - first: + 4: 400234 + second: RightEyeLidUp + - first: + 4: 400236 + second: RightFrontSkirt1 + - first: + 4: 400238 + second: RightFrontSkirt2 + - first: + 4: 400240 + second: RightNostril + - first: + 4: 400242 + second: RightPauldron + - first: + 4: 400244 + second: Tongue + - first: + 4: 400246 + second: Tongue1 + - first: + 4: 400248 + second: Tongue2 + - first: + 4: 400250 + second: VampArmsLegsMESH_LOD0 + - first: + 4: 400252 + second: VampCapeMESH + - first: + 4: 400254 + second: VampHeadMESH_LOD0 + - first: + 4: 400256 + second: VampTeethMESH_LOD0 + - first: + 4: 400258 + second: VampTorsoMESH_LOD0 + - first: + 43: 4300000 + second: DummyMESH + - first: + 43: 4300002 + second: VampTeethMESH_LOD0 + - first: + 43: 4300004 + second: VampTorsoMESH_LOD0 + - first: + 43: 4300006 + second: VampCapeMESH + - first: + 43: 4300008 + second: VampArmsLegsMESH_LOD0 + - first: + 43: 4300010 + second: VampHeadMESH_LOD0 + - first: + 74: 7400000 + second: Longs_GetUpBack + - first: + 74: 7400002 + second: Longs_KO_1 + - first: + 74: 7400004 + second: Longs_KO_2 + - first: + 74: 7400006 + second: Longs_KO_Air + - first: + 74: 7400008 + second: Longs_KO_AirStrong + - first: + 74: 7400010 + second: Longs_KO_Fall_Start + - first: + 74: 7400012 + second: Longs_KO_Fall_End + - first: + 74: 7400014 + second: Longs_SprintLoop + - first: + 74: 7400016 + second: Longs_SprintStart + - first: + 74: 7400018 + second: Longs_SprintStop_LU + - first: + 74: 7400020 + second: Longs_SprintStop_RU + - first: + 74: 7400022 + second: Longs_RollFwd + - first: + 74: 7400024 + second: Longs_RollBwd + - first: + 74: 7400026 + second: Longs_RollLeft + - first: + 74: 7400028 + second: Longs_RollRight + - first: + 74: 7400030 + second: Longs_OnGround_Hit + - first: + 74: 7400032 + second: Longs_JumpAttack_R + - first: + 74: 7400034 + second: Longs_JumpAttack_RD + - first: + 74: 7400036 + second: Longs_JumpAttack_LD + - first: + 74: 7400038 + second: Longs_BlockStart + - first: + 74: 7400040 + second: Longs_BlockLoop + - first: + 74: 7400042 + second: Longs_BlockImpact + - first: + 74: 7400044 + second: Longs_BlockEnd + - first: + 74: 7400046 + second: Longs_BlockAdd + - first: + 74: 7400048 + second: Longs_CrouchLoop + - first: + 74: 7400050 + second: Longs_CrouchStart + - first: + 74: 7400052 + second: Longs_CrouchEnd + - first: + 95: 9500000 + second: //RootNode + - first: + 137: 13700000 + second: DummyMESH + - first: + 137: 13700002 + second: VampArmsLegsMESH_LOD0 + - first: + 137: 13700004 + second: VampCapeMESH + - first: + 137: 13700006 + second: VampHeadMESH_LOD0 + - first: + 137: 13700008 + second: VampTeethMESH_LOD0 + - first: + 137: 13700010 + second: VampTorsoMESH_LOD0 + externalObjects: {} materials: - importMaterials: 0 + materialImportMode: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: Root - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.2 animationPositionError: 0.2 @@ -332,6 +940,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_GetUpBack takeName: Longs_GetUpBack + internalID: 0 firstFrame: 0 lastFrame: 100 wrapMode: 0 @@ -356,30 +965,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.66630864 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.6751964 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -387,30 +1008,42 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.60530937 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 0.6311676 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -574,6 +1207,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_KO_1 takeName: Longs_KO_1 + internalID: 0 firstFrame: 0 lastFrame: 117 wrapMode: 0 @@ -754,6 +1388,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_KO_2 takeName: Longs_KO_2 + internalID: 0 firstFrame: 0 lastFrame: 195 wrapMode: 0 @@ -941,6 +1576,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_KO_Air takeName: Longs_KO_Air + internalID: 0 firstFrame: 0 lastFrame: 108 wrapMode: 0 @@ -965,18 +1601,24 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -984,18 +1626,24 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -1159,6 +1807,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_KO_AirStrong takeName: Longs_KO_AirStrong + internalID: 0 firstFrame: 0 lastFrame: 108 wrapMode: 0 @@ -1339,6 +1988,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_KO_Fall_Start takeName: Longs_KO_Fall_Start + internalID: 0 firstFrame: 5 lastFrame: 150 wrapMode: 0 @@ -1519,6 +2169,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_KO_Fall_End takeName: Longs_KO_Fall_End + internalID: 0 firstFrame: 35 lastFrame: 108 wrapMode: 0 @@ -1699,6 +2350,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_SprintLoop takeName: Longs_SprintLoop + internalID: 0 firstFrame: 0 lastFrame: 38 wrapMode: 0 @@ -1879,6 +2531,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_SprintStart takeName: Longs_SprintStart + internalID: 0 firstFrame: 0 lastFrame: 26 wrapMode: 0 @@ -2066,6 +2719,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_SprintStop_LU takeName: Longs_SprintStop_LU + internalID: 0 firstFrame: 0 lastFrame: 66 wrapMode: 0 @@ -2246,6 +2900,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_SprintStop_RU takeName: Longs_SprintStop_RU + internalID: 0 firstFrame: 0 lastFrame: 60 wrapMode: 0 @@ -2426,6 +3081,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_RollFwd takeName: Longs_RollFwd + internalID: 0 firstFrame: 0 lastFrame: 102 wrapMode: 0 @@ -2606,6 +3262,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_RollBwd takeName: Longs_RollBwd + internalID: 0 firstFrame: 0 lastFrame: 117 wrapMode: 0 @@ -2786,6 +3443,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_RollLeft takeName: Longs_RollLeft + internalID: 0 firstFrame: 0 lastFrame: 104 wrapMode: 0 @@ -2966,6 +3624,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_RollRight takeName: Longs_RollRight + internalID: 0 firstFrame: 0 lastFrame: 102 wrapMode: 0 @@ -3146,6 +3805,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_OnGround_Hit takeName: Longs_OnGround_Hit + internalID: 0 firstFrame: 23 lastFrame: 108 wrapMode: 0 @@ -3170,18 +3830,24 @@ ModelImporter: curve: serializedVersion: 2 curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 preInfinity: 3 postInfinity: 3 rotationOrder: 0 @@ -3345,6 +4011,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_JumpAttack_R takeName: Longs_JumpAttack_R + internalID: 0 firstFrame: 0 lastFrame: 104 wrapMode: 0 @@ -3525,6 +4192,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_JumpAttack_RD takeName: Longs_JumpAttack_RD + internalID: 0 firstFrame: 0 lastFrame: 130 wrapMode: 0 @@ -3705,6 +4373,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_JumpAttack_LD takeName: Longs_JumpAttack_LD + internalID: 0 firstFrame: 0 lastFrame: 84 wrapMode: 0 @@ -3892,6 +4561,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_BlockStart takeName: Longs_BlockStart + internalID: 0 firstFrame: 0 lastFrame: 20 wrapMode: 0 @@ -4072,6 +4742,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_BlockLoop takeName: Longs_BlockLoop + internalID: 0 firstFrame: 240 lastFrame: 360 wrapMode: 0 @@ -4252,6 +4923,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_BlockImpact takeName: Longs_BlockImpact + internalID: 0 firstFrame: 0 lastFrame: 33 wrapMode: 0 @@ -4432,6 +5104,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_BlockEnd takeName: Longs_BlockEnd + internalID: 0 firstFrame: 0 lastFrame: 30 wrapMode: 0 @@ -4612,6 +5285,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_BlockAdd takeName: Longs_BlockAdd + internalID: 0 firstFrame: 0 lastFrame: 60 wrapMode: 0 @@ -4792,6 +5466,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_CrouchLoop takeName: Longs_CrouchLoop + internalID: 0 firstFrame: 0 lastFrame: 92 wrapMode: 0 @@ -4972,6 +5647,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_CrouchStart takeName: Longs_CrouchStart + internalID: 0 firstFrame: 0 lastFrame: 30 wrapMode: 0 @@ -5152,6 +5828,7 @@ ModelImporter: - serializedVersion: 16 name: Longs_CrouchEnd takeName: Longs_CrouchEnd + internalID: 0 firstFrame: 0 lastFrame: 20 wrapMode: 0 @@ -5335,30 +6012,49 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 0 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 1 humanDescription: - serializedVersion: 2 + serializedVersion: 3 human: - boneName: Hips humanName: Hips @@ -6436,23 +7132,21 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 + globalScale: 1 rootMotionBoneName: Root - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 1 skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 3aaf38176678e1d4994b710ba08065f2, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 92239 - packageName: Longsword Animset Pro - packageVersion: 1.0 - assetPath: Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt4.fbx - uploadId: 340990 From 1feb1263406cd046d33dda8571d4ab424de712ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Mi=C5=9B?= <> Date: Fri, 12 Sep 2025 15:11:10 +0200 Subject: [PATCH 5/7] Giant adjustment --- Assets/AI/Gigant/Giant.prefab | 4 +- .../Animator/Invector@Giant.controller | 482 +----------------- 2 files changed, 10 insertions(+), 476 deletions(-) diff --git a/Assets/AI/Gigant/Giant.prefab b/Assets/AI/Gigant/Giant.prefab index 30571e381..2bc2837c9 100644 --- a/Assets/AI/Gigant/Giant.prefab +++ b/Assets/AI/Gigant/Giant.prefab @@ -4629,9 +4629,9 @@ MonoBehaviour: m_EditorClassIdentifier: openCloseEvents: 0 openCloseWindow: 1 - selectedToolbar: 5 + selectedToolbar: 0 _isDead: 0 - _currentHealth: 100 + _currentHealth: 300 isImmortal: 0 fillHealthOnStart: 1 maxHealth: 100 diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller index 073350e91..69d78bc81 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller +++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller @@ -13,7 +13,7 @@ BlendTree: type: 3} m_Threshold: 0 m_Position: {x: 0, y: 0} - m_TimeScale: 1 + m_TimeScale: 0.75 m_CycleOffset: 0 m_DirectBlendParameter: Randomized m_Mirror: 0 @@ -22,7 +22,7 @@ BlendTree: type: 3} m_Threshold: 1 m_Position: {x: 0, y: 0} - m_TimeScale: 1 + m_TimeScale: 0.75 m_CycleOffset: 0 m_DirectBlendParameter: Randomized m_Mirror: 0 @@ -31,7 +31,7 @@ BlendTree: type: 3} m_Threshold: 2 m_Position: {x: 0, y: 0} - m_TimeScale: 1 + m_TimeScale: 0.75 m_CycleOffset: 0 m_DirectBlendParameter: Randomized m_Mirror: 0 @@ -40,7 +40,7 @@ BlendTree: type: 3} m_Threshold: 3 m_Position: {x: 0, y: 0} - m_TimeScale: 1 + m_TimeScale: 0.75 m_CycleOffset: 0 m_DirectBlendParameter: Randomized m_Mirror: 0 @@ -95,7 +95,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parameterName: Randomized - weights: 23000000230000000f0000000f000000 + weights: 19000000190000001900000019000000 --- !u!114 &-709582740070635242 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15377,41 +15377,6 @@ MonoBehaviour: sounds: - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} triggerTime: 0 ---- !u!114 &114030386879188540 -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: f9058122f6ec699438581f28f117350d, type: 3} - m_Name: - m_EditorClassIdentifier: - startDamage: 0.05 - endDamage: 0.9 - damageMultiplier: 0 - recoilID: 1 - reactionID: 0 - meleeAttackType: 1 - damageType: - bodyParts: - - RightLowerArm - ignoreDefense: 0 - activeRagdoll: 0 - senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.8 - useAttackTimeScale: 0 - slowMoActivationDistance: 3 - lowHealthTh: 10 - attackTimeScale: 0.2 - attackTimeScaleStart: -1 - attackTimeScaleEnd: -1 - rotatePlayerTowardsTarget: 0 - rotationActivationAngle: 45 - debug: 0 --- !u!114 &114037387642052710 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15442,41 +15407,6 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction ---- !u!114 &114101577822421078 -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: f9058122f6ec699438581f28f117350d, type: 3} - m_Name: - m_EditorClassIdentifier: - startDamage: 0.05 - endDamage: 0.9 - damageMultiplier: 0 - recoilID: 2 - reactionID: 0 - meleeAttackType: 1 - damageType: - bodyParts: - - RightLowerArm - ignoreDefense: 0 - activeRagdoll: 0 - senselessTime: 0 - resetAttackTrigger: 1 - resetTriggerBeforeTime: 0.8 - useAttackTimeScale: 0 - slowMoActivationDistance: 3 - lowHealthTh: 10 - attackTimeScale: 0.2 - attackTimeScaleStart: -1 - attackTimeScaleEnd: -1 - rotatePlayerTowardsTarget: 0 - rotationActivationAngle: 45 - debug: 0 --- !u!114 &114109424512592286 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15759,30 +15689,6 @@ MonoBehaviour: - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} triggerTime: 0 ---- !u!114 &114263588767966834 -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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} - m_Name: - m_EditorClassIdentifier: - stateInfos: [] - debug: 0 - tags: - - tagName: Attack - tagType: 3 - normalizedTime: {x: 0.1, y: 0.8} - - tagName: LockRotation - tagType: 0 - normalizedTime: {x: 0.1, y: 0.7} - - tagName: LockMovement - tagType: 1 - normalizedTime: {x: 0, y: 0.7} --- !u!114 &114275699407771092 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15848,44 +15754,6 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction ---- !u!114 &114304692954732270 -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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} - m_Name: - m_EditorClassIdentifier: - audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - sounds: - - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: 0 ---- !u!114 &114312089054784788 -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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} - m_Name: - m_EditorClassIdentifier: - audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - sounds: - - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: 0 --- !u!114 &114324329624715244 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15986,25 +15854,6 @@ MonoBehaviour: - tagName: CustomAction tagType: 0 normalizedTime: {x: 0.1, y: 0.35} ---- !u!114 &114405241802589726 -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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} - m_Name: - m_EditorClassIdentifier: - audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - sounds: - - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: 0 --- !u!114 &114406195790751738 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16608,30 +16457,6 @@ MonoBehaviour: tags: - LockMovement - LockRotation ---- !u!114 &114667135945300734 -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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} - m_Name: - m_EditorClassIdentifier: - stateInfos: [] - debug: 0 - tags: - - tagName: Attack - tagType: 3 - normalizedTime: {x: 0.1, y: 0.8} - - tagName: LockRotation - tagType: 0 - normalizedTime: {x: 0.1, y: 0.7} - - tagName: LockMovement - tagType: 1 - normalizedTime: {x: 0, y: 0.7} --- !u!114 &114669916436479170 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16724,30 +16549,6 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction ---- !u!114 &114756031459307912 -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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} - m_Name: - m_EditorClassIdentifier: - stateInfos: [] - debug: 0 - tags: - - tagName: Attack - tagType: 3 - normalizedTime: {x: 0.1, y: 0} - - tagName: LockRotation - tagType: 0 - normalizedTime: {x: 0.1, y: 0.7} - - tagName: LockMovement - tagType: 1 - normalizedTime: {x: 0, y: 0.7} --- !u!114 &114771221009366196 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16845,41 +16646,6 @@ MonoBehaviour: stateInfos: [] tags: - LockMovement ---- !u!114 &114825370114345668 -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: f9058122f6ec699438581f28f117350d, type: 3} - m_Name: - m_EditorClassIdentifier: - startDamage: 0.05 - endDamage: 0.9 - damageMultiplier: 0 - recoilID: 1 - reactionID: 0 - meleeAttackType: 1 - damageType: - bodyParts: - - RightLowerArm - ignoreDefense: 0 - activeRagdoll: 0 - senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.8 - useAttackTimeScale: 0 - slowMoActivationDistance: 3 - lowHealthTh: 10 - attackTimeScale: 0.2 - attackTimeScaleStart: -1 - attackTimeScaleEnd: -1 - rotatePlayerTowardsTarget: 0 - rotationActivationAngle: 45 - debug: 0 --- !u!114 &114838529179133088 MonoBehaviour: m_ObjectHideFlags: 1 @@ -22817,28 +22583,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101255493625229458 -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: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.8 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101259247973905158 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -22861,31 +22605,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101262937642278562 -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: WeakAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102186001672383516} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.11020672 - m_TransitionOffset: 0.01405192 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101264055223708130 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -24296,28 +24015,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101473625656561818 -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: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0.2 - m_TransitionOffset: 0 - m_ExitTime: 0.85 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101476070418764840 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -25076,28 +24773,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101559597476362148 -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: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0.2 - m_TransitionOffset: 0 - m_ExitTime: 0.8 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101561649539745982 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -27186,31 +26861,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101963861138605418 -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: WeakAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102861933717182418} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.15 - m_TransitionOffset: 0 - m_ExitTime: 0.7 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101967999082563810 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -28858,36 +28508,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102186001672383516 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: C - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101473625656561818} - m_StateMachineBehaviours: - - {fileID: 114101577822421078} - - {fileID: 114304692954732270} - - {fileID: 114263588767966834} - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 1 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400028, guid: fb07a934dbc1969468121112ca048964, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102186440903726776 AnimatorState: serializedVersion: 6 @@ -29966,37 +29586,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102466317250516052 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: A - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101963861138605418} - - {fileID: 1101255493625229458} - m_StateMachineBehaviours: - - {fileID: 114825370114345668} - - {fileID: 114405241802589726} - - {fileID: 114667135945300734} - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 1 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400022, guid: fb07a934dbc1969468121112ca048964, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102473272169605230 AnimatorState: serializedVersion: 6 @@ -31761,37 +31350,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102861933717182418 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: B - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101262937642278562} - - {fileID: 1101559597476362148} - m_StateMachineBehaviours: - - {fileID: 114030386879188540} - - {fileID: 114312089054784788} - - {fileID: 114756031459307912} - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 1 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400030, guid: fb07a934dbc1969468121112ca048964, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102866145726083920 AnimatorState: serializedVersion: 6 @@ -34092,29 +33650,19 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: SwordAttack m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102466317250516052} - m_Position: {x: 250, y: 60, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102861933717182418} - m_Position: {x: 240, y: -10, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102186001672383516} - m_Position: {x: 240, y: -70, z: 0} - serializedVersion: 1 m_State: {fileID: -3586438440143645230} - m_Position: {x: 240, y: 180, z: 0} + m_Position: {x: 300, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: - - {fileID: 6184355516693046008} + m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 48, y: 60, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 528, y: 60, z: 0} m_ParentStateMachinePosition: {x: 504, y: -36, z: 0} - m_DefaultState: {fileID: 1102466317250516052} + m_DefaultState: {fileID: -3586438440143645230} --- !u!1107 &1107517961391708756 AnimatorStateMachine: serializedVersion: 6 @@ -37583,20 +37131,6 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 1 ---- !u!1109 &6184355516693046008 -AnimatorTransition: - 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: -3586438440143645230} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 1 --- !u!1101 &6629174028218037947 AnimatorStateTransition: m_ObjectHideFlags: 1 From 959cc35c7d1fd301a22dfb7e5f187587a5a4d42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Mi=C5=9B?= <> Date: Fri, 12 Sep 2025 15:14:45 +0200 Subject: [PATCH 6/7] Hp fixes --- Assets/AI/GhostDemon.prefab | 4 ++-- Assets/AI/Gigant/Giant.prefab | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/AI/GhostDemon.prefab b/Assets/AI/GhostDemon.prefab index c99f0943e..eaeefd524 100644 --- a/Assets/AI/GhostDemon.prefab +++ b/Assets/AI/GhostDemon.prefab @@ -1133,10 +1133,10 @@ MonoBehaviour: openCloseWindow: 1 selectedToolbar: 0 _isDead: 0 - _currentHealth: 225 + _currentHealth: 250 isImmortal: 0 fillHealthOnStart: 1 - maxHealth: 225 + maxHealth: 250 healthRecovery: 0 healthRecoveryDelay: 0 currentHealthRecoveryDelay: 0 diff --git a/Assets/AI/Gigant/Giant.prefab b/Assets/AI/Gigant/Giant.prefab index 2bc2837c9..ca1abf458 100644 --- a/Assets/AI/Gigant/Giant.prefab +++ b/Assets/AI/Gigant/Giant.prefab @@ -4634,7 +4634,7 @@ MonoBehaviour: _currentHealth: 300 isImmortal: 0 fillHealthOnStart: 1 - maxHealth: 100 + maxHealth: 300 healthRecovery: 0 healthRecoveryDelay: 0 currentHealthRecoveryDelay: 0 From 8fadab05e8c0e8bb27032185624d41c26f2a5116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Mi=C5=9B?= <> Date: Sat, 13 Sep 2025 12:53:49 +0200 Subject: [PATCH 7/7] Fixes --- Assets/AI/Demon/FireBall new.prefab | 213 ++ Assets/AI/Demon/FireBall new.prefab.meta | 8 + Assets/AI/Demon/SA_CallMeteor.cs | 1 - Assets/AI/Demon/Turet.prefab | 232 -- Assets/AI/Demon/Turret.prefab | 2124 +++++++++++++++++ Assets/AI/Demon/Turret.prefab.meta | 7 + Assets/AI/FSM/FSM_Demon.asset | 293 ++- Assets/AI/FSM/FSM_Giant.asset | 38 +- Assets/Scenes/Fight_Arena/Fight_Arena.unity | 31 +- .../Models/Materials/Crystals_red 1.mat | 196 ++ .../Models/Materials/Crystals_red 1.mat.meta} | 6 +- .../Invector@Bonel_Warrior.controller | 644 ++--- .../Animator/Invector@Giant.controller | 2 +- 13 files changed, 2960 insertions(+), 835 deletions(-) create mode 100644 Assets/AI/Demon/FireBall new.prefab create mode 100644 Assets/AI/Demon/FireBall new.prefab.meta delete mode 100644 Assets/AI/Demon/Turet.prefab create mode 100644 Assets/AI/Demon/Turret.prefab create mode 100644 Assets/AI/Demon/Turret.prefab.meta create mode 100644 Assets/ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat rename Assets/{AI/Demon/Turet.prefab.meta => ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat.meta} (52%) diff --git a/Assets/AI/Demon/FireBall new.prefab b/Assets/AI/Demon/FireBall new.prefab new file mode 100644 index 000000000..429d978dd --- /dev/null +++ b/Assets/AI/Demon/FireBall new.prefab @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1947871717301538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4209731392266258} + - component: {fileID: -5586632368230897359} + - component: {fileID: 6785567375430979834} + m_Layer: 30 + m_Name: FireBall new + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4209731392266258 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1947871717301538} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 6.67, y: 1, z: -53.73} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6802751815913059821} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!136 &-5586632368230897359 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1947871717301538} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 1 + m_Height: 0 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6785567375430979834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1947871717301538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a863cb5e6092ec4a936c4eb21bb9166, type: 3} + m_Name: + m_EditorClassIdentifier: + targetTag: Player + targetHeightOffset: 1 + speed: 12 + lockTime: 0.5 + maxLifeTime: 60 + arrivalTolerance: 0.25 + damage: 5 + knockbackForce: 5 + enableDebug: 0 +--- !u!1001 &6802374026672139437 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4209731392266258} + m_Modifications: + - target: {fileID: 1363404153839300, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_Name + value: Effect12 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + propertyPath: Speed + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + propertyPath: Distance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + propertyPath: CollidesWith.m_Bits + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 114587680334040632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199693142139168640, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199728937019303074, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + - {fileID: 114587680334040632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1294706121055886, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1570972138348746864} + m_SourcePrefab: {fileID: 100100000, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3} +--- !u!1 &6801133233205277219 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1294706121055886, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + m_PrefabInstance: {fileID: 6802374026672139437} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1570972138348746864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6801133233205277219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!4 &6802751815913059821 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, + type: 3} + m_PrefabInstance: {fileID: 6802374026672139437} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/AI/Demon/FireBall new.prefab.meta b/Assets/AI/Demon/FireBall new.prefab.meta new file mode 100644 index 000000000..7eeb7d985 --- /dev/null +++ b/Assets/AI/Demon/FireBall new.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10813082aa17ea94f9eb5edcc37ac632 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AI/Demon/SA_CallMeteor.cs b/Assets/AI/Demon/SA_CallMeteor.cs index d1e358377..a363e2cf5 100644 --- a/Assets/AI/Demon/SA_CallMeteor.cs +++ b/Assets/AI/Demon/SA_CallMeteor.cs @@ -129,7 +129,6 @@ namespace DemonBoss.Magic } } - // -------- Playables helpers (no Animator params) -------- private void PlayOverlayOnce(Transform owner) { if (overlayClip == null) return; diff --git a/Assets/AI/Demon/Turet.prefab b/Assets/AI/Demon/Turet.prefab deleted file mode 100644 index 5c3694cdb..000000000 --- a/Assets/AI/Demon/Turet.prefab +++ /dev/null @@ -1,232 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &115880 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 417168} - - component: {fileID: 3365858} - - component: {fileID: 2323612} - - component: {fileID: 13662188} - - component: {fileID: 7020133711031364094} - - component: {fileID: -8194063383422297065} - - component: {fileID: 1536958584606674588} - - component: {fileID: 8851143338676511289} - m_Layer: 26 - m_Name: Turet - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &417168 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.8250632, y: -7.1673625e-17, z: 3.2278929} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8411050209285398990} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3365858 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - m_Mesh: {fileID: 4300002, guid: dee9a5e3bb15d7740bde7911bad2ba90, type: 3} ---- !u!23 &2323612 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 30d0d8732a281d349a5abc48f8171e83, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!136 &13662188 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.58 - m_Height: 2.64 - m_Direction: 1 - m_Center: {x: 0.0078576505, y: 1.0259461, z: -0.052128524} ---- !u!114 &7020133711031364094 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 906d915677721914dbe9708f218f574a, type: 3} - m_Name: - m_EditorClassIdentifier: - muzzle: {fileID: 8411050209285398990} - fireballPrefab: {fileID: 1947871717301538, guid: 9591667a35466484096c6e63785e136c, - type: 3} - fireRate: 6 - maxShots: 10 - despawnDelay: 10 - initialStaggerRange: {x: 0, y: 0.6} - fireRateJitter: 5 - aimJitterDegrees: 0 - turnSpeed: 0 - idleSpinSpeed: 0 - aimTolerance: 360 - autoFindPlayer: 1 - playerTag: Player - maxShootingRange: 50 - useShootEffects: 1 - muzzleFlashPrefab: {fileID: 1514282284419572, guid: ad259b29cbefa54479b68c8a4960565a, - type: 3} - shootSound: {fileID: 8300000, guid: f58578c3593cfcd40a4b21417e49421a, type: 3} - enableDebug: 1 - showGizmos: 1 ---- !u!114 &-8194063383422297065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 06579ea47ceeddd42a05f7720c15b5de, type: 3} - m_Name: - m_EditorClassIdentifier: - maxHealth: 50 - currentHealth: 0 - destructionEffect: {fileID: 8876690725160639820, guid: c1b3da9fe585c44479dda2cd5c3a7b83, - type: 3} - destructionSound: {fileID: 8300000, guid: 3c1f8b87da670734991b73bf5c30f0af, type: 3} - hitSound: {fileID: 8300000, guid: 0af332725d9792840a4caa29e8991d08, type: 3} - damagedMaterial: {fileID: 2100000, guid: f94eea72c30ac2e45ab55894421ea48c, type: 2} - damagedThreshold: 0.5 - enableDebug: 1 ---- !u!114 &1536958584606674588 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 605ff11ee57b0c241a82c0c37c40c0bc, type: 3} - m_Name: - m_EditorClassIdentifier: - openCloseEvents: 0 - openCloseWindow: 0 - selectedToolbar: 0 - messagesListeners: [] ---- !u!114 &8851143338676511289 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 312629d966d1a40e3874daa93364e1f3, type: 3} - m_Name: - m_EditorClassIdentifier: - targetIcon: {fileID: 8317937118480752073, guid: 82581d6c5dd5945b89394d83db5f4c8b, - type: 3} ---- !u!1 &6534933121460188189 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8411050209285398990} - m_Layer: 26 - m_Name: Spawnpoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8411050209285398990 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6534933121460188189} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 3.114, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 417168} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/AI/Demon/Turret.prefab b/Assets/AI/Demon/Turret.prefab new file mode 100644 index 000000000..f50bf20ba --- /dev/null +++ b/Assets/AI/Demon/Turret.prefab @@ -0,0 +1,2124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1224412995980154202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7547676358271123948} + - component: {fileID: 7581443780487529610} + - component: {fileID: 2446399388962860219} + - component: {fileID: 81254842707448291} + - component: {fileID: 7514724144135927949} + - component: {fileID: 6343269192000341970} + m_Layer: 30 + m_Name: shard7 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7547676358271123948 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224412995980154202} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.38870937, y: 0.2344816, z: 0.11797303} + m_LocalScale: {x: 0.84550816, y: 0.84550816, z: 0.84550816} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8117433061616129371} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7581443780487529610 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224412995980154202} + m_Mesh: {fileID: -1766809595301799932, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &2446399388962860219 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224412995980154202} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &81254842707448291 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224412995980154202} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -1766809595301799932, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!54 &7514724144135927949 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224412995980154202} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &6343269192000341970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224412995980154202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37fac21d1f093d344816942d1abce94e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TimeOut: 10 + m_DetachChildren: 0 +--- !u!1 &1639293500556673778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1763835787530053588} + - component: {fileID: 6667993074045824814} + - component: {fileID: 346611716220557774} + m_Layer: 30 + m_Name: Crystal_Destroy + m_TagString: Obstacle + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1763835787530053588 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639293500556673778} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000058673315, y: -0, z: 9.3132246e-10, w: 1} + m_LocalPosition: {x: 0.097, y: -0.437, z: 0} + m_LocalScale: {x: 0.90277, y: 0.90277, z: 0.90277} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8117433061616129371} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6667993074045824814 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639293500556673778} + m_Mesh: {fileID: -273897550871366581, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &346611716220557774 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639293500556673778} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2783787054013488430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5036138525147919325} + m_Layer: 30 + m_Name: Prefab + m_TagString: Untagged + m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5036138525147919325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2783787054013488430} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.341, y: 0.488, z: 0.483} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7477031357845589619} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3055178718369943354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8117433061616129371} + m_Layer: 30 + m_Name: Shards2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8117433061616129371 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3055178718369943354} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1763835787530053588} + - {fileID: 8837163000621531294} + - {fileID: 7131018235353110314} + - {fileID: 6116748789709557560} + - {fileID: 7547676358271123948} + - {fileID: 7449076762823431792} + - {fileID: 9046614280525735989} + - {fileID: 422657651648581450} + m_Father: {fileID: 1635909874913900173} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3551700211099784399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9046614280525735989} + - component: {fileID: 3636728138498802773} + - component: {fileID: 6542658680257125835} + - component: {fileID: 5464552797247576530} + - component: {fileID: 3148954803567898957} + - component: {fileID: 2644712373916199721} + m_Layer: 30 + m_Name: shard15 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9046614280525735989 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551700211099784399} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.050911076, y: 1.3506658, z: -0.017243626} + m_LocalScale: {x: 0.84550816, y: 0.84550816, z: 0.84550816} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8117433061616129371} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3636728138498802773 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551700211099784399} + m_Mesh: {fileID: -4729508461293722031, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &6542658680257125835 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551700211099784399} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5464552797247576530 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551700211099784399} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -4729508461293722031, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!54 &3148954803567898957 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551700211099784399} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &2644712373916199721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551700211099784399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37fac21d1f093d344816942d1abce94e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TimeOut: 10 + m_DetachChildren: 0 +--- !u!1 &3712228382455716251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5932380182666656162} + - component: {fileID: 4908346353504211865} + - component: {fileID: 3600400763413215838} + - component: {fileID: 244401252242746698} + - component: {fileID: 6224787886341077954} + - component: {fileID: 1012182916330860233} + m_Layer: 0 + m_Name: Spot Light (1) + m_TagString: Untagged + m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5932380182666656162 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712228382455716251} + serializedVersion: 2 + m_LocalRotation: {x: 0.7195643, y: -0.41792288, z: 0.20793515, w: 0.514131} + m_LocalPosition: {x: -0.12246178, y: 3.3837335, z: 1.8990121} + m_LocalScale: {x: 1.0204256, y: 0.9567102, z: 1.0204254} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7477031357845589619} + m_LocalEulerAnglesHint: {x: 66.022, y: -161.271, z: -107.473} +--- !u!108 &4908346353504211865 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712228382455716251} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 0 + m_Color: {r: 1, g: 0.6309549, b: 0.2028302, a: 1} + m_Intensity: 26.8 + m_Range: 5.1 + m_SpotAngle: 118.00821 + m_InnerSpotAngle: 30.942036 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &3600400763413215838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712228382455716251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 +--- !u!114 &244401252242746698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712228382455716251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26d9ad0aee30f1341bdca4781e509c2f, type: 3} + m_Name: + m_EditorClassIdentifier: + fireLight: {fileID: 4908346353504211865} + intensityMin: 2.49 + intensityMax: 32.05 + flickerSpeed: 1 + movementRadius: 0.96 + movementSpeed: 0.74 +--- !u!114 &6224787886341077954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712228382455716251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c437a86bce6693a43bbcc53fcff7bf88, type: 3} + m_Name: + m_EditorClassIdentifier: + LightCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + GraphTimeMultiplier: 1 + GraphIntensityMultiplier: 21.4 + IsLoop: 0 +--- !u!114 &1012182916330860233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712228382455716251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 481db906bb0d1404ca6f8572b0e19c4b, type: 3} + m_Name: + m_EditorClassIdentifier: + _distanceDisable: 20 + _distanceFrom: {fileID: 0} + _distanceFromMainCam: 1 + _disableCheckInterval: 0.74 + _enableCheckInterval: 0.58 + _disableOnStart: 0 + _useDistanceFade: 0 + _fadeRange: 5 +--- !u!1 &4665557765384928022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7477031357845589619} + - component: {fileID: 1257534352646044711} + - component: {fileID: 5181483123926940074} + - component: {fileID: 6872948357676167570} + - component: {fileID: 8003701927849340382} + - component: {fileID: 3085886617470294446} + - component: {fileID: 1907838059717701975} + - component: {fileID: 6826962682947838899} + - component: {fileID: 7043788756814954216} + - component: {fileID: 3258941429478150745} + - component: {fileID: 4789827571717438293} + m_Layer: 30 + m_Name: Turret + m_TagString: Obstacle + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7477031357845589619 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -29.561266, y: 40.18305, z: -121.28842} + m_LocalScale: {x: 0.9799832, y: 0.9799832, z: 0.9799832} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1635909874913900173} + - {fileID: 930674647713283208} + - {fileID: 5932380182666656162} + - {fileID: 5036138525147919325} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1257534352646044711 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Mesh: {fileID: 4300000, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &5181483123926940074 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &6872948357676167570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f56a83ea88140fa4f869bb2f7ffdb184, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 0 + selectedToolbar: 0 + _isDead: 0 + _currentHealth: 0 + isImmortal: 0 + fillHealthOnStart: 1 + maxHealth: 100 + healthRecovery: 0 + healthRecoveryDelay: 0 + currentHealthRecoveryDelay: 0 + checkHealthEvents: [] + _onStartReceiveDamage: + m_PersistentCalls: + m_Calls: [] + _onReceiveDamage: + m_PersistentCalls: + m_Calls: [] + _onDead: + m_PersistentCalls: + m_Calls: [] + onChangeHealth: + m_PersistentCalls: + m_Calls: [] + onResetHealth: + m_PersistentCalls: + m_Calls: [] +--- !u!82 &8003701927849340382 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &3085886617470294446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7406acb2f821aa245a9ed80d00bb9421, type: 3} + m_Name: + m_EditorClassIdentifier: + m_healthController: {fileID: 0} + mMaxHP: 10 + m_DestroySound: {fileID: 8300000, guid: c641aa777982080449bceabe2eeb691e, type: 3} + m_DestroySound2: {fileID: 0} + hitSounds: [] + m_ShardsGroup: + - {fileID: 3055178718369943354} + objectsToEnable: + - {fileID: 1639293500556673778} + objectsToDisable: [] + m_AudioSource: {fileID: 0} + m_onDestroy: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7043788756814954216} + m_TargetAssemblyTypeName: DemonBoss.Magic.CrystalShooterAI, Assembly-CSharp + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1639293500556673778} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + m_objectsToSpawn: + - prefab: {fileID: 7268478284668698993, guid: fdf1f78f87e1c22449aaa919466f4d59, + type: 3} + chance: 1 + - prefab: {fileID: 7268478284668698993, guid: fdf1f78f87e1c22449aaa919466f4d59, + type: 3} + chance: 1 + m_minObjectsToSpawn: 0 + m_maxObjectsToSpawn: 0 + m_spawnPoint: {fileID: 5036138525147919325} + explosiveDamage: 600 + randomPositionOffset: 1 + points: 20 +--- !u!65 &1907838059717701975 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1153543, y: 2.6258202, z: 1.1637211} + m_Center: {x: -0.10402425, y: 1.0240772, z: -0.0051041334} +--- !u!205 &6826962682947838899 +LODGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + serializedVersion: 2 + m_LocalReferencePoint: {x: -0.10394794, y: 1.024081, z: -0.0051270127} + m_Size: 2.6258202 + m_FadeMode: 0 + m_AnimateCrossFading: 0 + m_LastLODIsBillboard: 0 + m_LODs: + - screenRelativeHeight: 0.054405916 + fadeTransitionWidth: 0 + renderers: + - renderer: {fileID: 5181483123926940074} + - renderer: {fileID: 930674647729375224} + m_Enabled: 1 +--- !u!114 &7043788756814954216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 906d915677721914dbe9708f218f574a, type: 3} + m_Name: + m_EditorClassIdentifier: + muzzle: {fileID: 0} + fireballPrefab: {fileID: 1947871717301538, guid: 10813082aa17ea94f9eb5edcc37ac632, + type: 3} + fireRate: 6 + maxShots: 10 + despawnDelay: 10 + initialStaggerRange: {x: 0, y: 0.6} + fireRateJitter: 5 + aimJitterDegrees: 0 + turnSpeed: 0 + idleSpinSpeed: 0 + aimTolerance: 360 + autoFindPlayer: 1 + playerTag: Player + maxShootingRange: 50 + useShootEffects: 1 + muzzleFlashPrefab: {fileID: 1606542427775616, guid: 1c98fef7e42fa254b9191fcf255dec16, + type: 3} + shootSound: {fileID: 8300000, guid: f58578c3593cfcd40a4b21417e49421a, type: 3} + enableDebug: 1 + showGizmos: 1 +--- !u!114 &3258941429478150745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 605ff11ee57b0c241a82c0c37c40c0bc, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 0 + selectedToolbar: 0 + messagesListeners: [] +--- !u!114 &4789827571717438293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4665557765384928022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 312629d966d1a40e3874daa93364e1f3, type: 3} + m_Name: + m_EditorClassIdentifier: + targetIcon: {fileID: 8317937118480752073, guid: 82581d6c5dd5945b89394d83db5f4c8b, + type: 3} +--- !u!1 &4851053193912938949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6116748789709557560} + - component: {fileID: 1606434610006938257} + - component: {fileID: 8106519329174793414} + - component: {fileID: 8923861326887843497} + - component: {fileID: 7794721997121536004} + - component: {fileID: 8443626544467554857} + m_Layer: 30 + m_Name: shard6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6116748789709557560 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4851053193912938949} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.09383639, y: 0.4184111, z: 0.4162948} + m_LocalScale: {x: 0.84550816, y: 0.84550816, z: 0.84550816} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8117433061616129371} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1606434610006938257 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4851053193912938949} + m_Mesh: {fileID: -8094190371653704284, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &8106519329174793414 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4851053193912938949} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &8923861326887843497 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4851053193912938949} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -8094190371653704284, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!54 &7794721997121536004 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4851053193912938949} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &8443626544467554857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4851053193912938949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37fac21d1f093d344816942d1abce94e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TimeOut: 10 + m_DetachChildren: 0 +--- !u!1 &6775705339375325465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7131018235353110314} + - component: {fileID: 4231650184318594811} + - component: {fileID: 8330526715528419319} + - component: {fileID: 5913128401680055103} + - component: {fileID: 7570910282113462960} + - component: {fileID: 2895450115782628083} + m_Layer: 30 + m_Name: shard3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7131018235353110314 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775705339375325465} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.037433483, y: 0.8196256, z: 0.02379408} + m_LocalScale: {x: 0.84550816, y: 0.84550816, z: 0.84550816} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8117433061616129371} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4231650184318594811 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775705339375325465} + m_Mesh: {fileID: -6017172911788317743, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &8330526715528419319 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775705339375325465} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5913128401680055103 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775705339375325465} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -6017172911788317743, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!54 &7570910282113462960 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775705339375325465} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &2895450115782628083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775705339375325465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37fac21d1f093d344816942d1abce94e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TimeOut: 10 + m_DetachChildren: 0 +--- !u!1 &7749654387011560091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8837163000621531294} + - component: {fileID: 841299948293834188} + - component: {fileID: 1340576606832659695} + - component: {fileID: 5772256397962454774} + - component: {fileID: 4512878112566024052} + - component: {fileID: 2834085645031572330} + m_Layer: 30 + m_Name: shard1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8837163000621531294 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749654387011560091} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.118854664, y: 0.37441993, z: -0.3361029} + m_LocalScale: {x: 0.84550816, y: 0.84550816, z: 0.84550816} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8117433061616129371} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &841299948293834188 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749654387011560091} + m_Mesh: {fileID: -4122916103799640655, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &1340576606832659695 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749654387011560091} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5772256397962454774 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749654387011560091} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -4122916103799640655, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!54 &4512878112566024052 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749654387011560091} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &2834085645031572330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749654387011560091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37fac21d1f093d344816942d1abce94e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TimeOut: 10 + m_DetachChildren: 0 +--- !u!1 &8250290034252248129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7449076762823431792} + - component: {fileID: 6131168235839455513} + - component: {fileID: 6279194410338657294} + - component: {fileID: 5252189517975294150} + - component: {fileID: 8741640232884025994} + - component: {fileID: 6328608320940434720} + m_Layer: 30 + m_Name: shard12 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7449076762823431792 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250290034252248129} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.26147836, y: 0.48128107, z: -0.06935686} + m_LocalScale: {x: 0.84550816, y: 0.84550816, z: 0.84550816} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8117433061616129371} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6131168235839455513 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250290034252248129} + m_Mesh: {fileID: -5709274730607971892, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!23 &6279194410338657294 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250290034252248129} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4dd6a2e84f333e0448c7f41299d7e12d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5252189517975294150 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250290034252248129} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -5709274730607971892, guid: d1475cfae74a78e44a3cbf46bd17b23b, type: 3} +--- !u!54 &8741640232884025994 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250290034252248129} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &6328608320940434720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8250290034252248129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37fac21d1f093d344816942d1abce94e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TimeOut: 10 + m_DetachChildren: 0 +--- !u!1 &9114963989579175288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1635909874913900173} + m_Layer: 30 + m_Name: SHARDS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1635909874913900173 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114963989579175288} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000058673315, y: -0, z: -9.3132246e-10, w: 1} + m_LocalPosition: {x: -0.09699788, y: 0.38401034, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8117433061616129371} + m_Father: {fileID: 7477031357845589619} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &930674647713588538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7477031357845589619} + m_Modifications: + - target: {fileID: 182702, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_Name + value: Sparks_small_emiter + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalScale.x + value: 0.11109272 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalScale.y + value: 0.11109272 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalScale.z + value: 0.11109272 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1785776 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalPosition.y + value: 0.19436994 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalPosition.z + value: -0.11938652 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalRotation.x + value: -0.000000022257366 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000029802319 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalRotation.z + value: 2.999023e-10 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99ca53aa7d57540408357af2ba39fe48, type: 3} +--- !u!4 &930674647713283208 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, + type: 3} + m_PrefabInstance: {fileID: 930674647713588538} + m_PrefabAsset: {fileID: 0} +--- !u!199 &930674647729375224 stripped +ParticleSystemRenderer: + m_CorrespondingSourceObject: {fileID: 19997378, guid: 99ca53aa7d57540408357af2ba39fe48, + type: 3} + m_PrefabInstance: {fileID: 930674647713588538} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4628954788470639899 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 422657651648581450} + m_Modifications: + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalScale.x + value: 1.5834 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalScale.y + value: 1.5834 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalScale.z + value: 1.5834001 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.000041767955 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000021487474 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8868952 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.04454767 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.44175956 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.12759739 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 1.932 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 52.694 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -15.417 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160639820, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_Name + value: FX_hit (1) + objectReference: {fileID: 0} + - target: {fileID: 8876690725174354690, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: bbf7ffb2a18965949862565eb9b2f2bb, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c1b3da9fe585c44479dda2cd5c3a7b83, type: 3} +--- !u!4 &4255073671956206597 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + m_PrefabInstance: {fileID: 4628954788470639899} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5206643056630240556 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 422657651648581450} + m_Modifications: + - target: {fileID: 457455528123841398, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: c830f8b9f20934c45bbbc55443a44825, type: 2} + - target: {fileID: 5205259305346921688, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: UVModule.tilesX + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5205259305346921688, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: UVModule.tilesY + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5205259305346921688, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: InitialModule.startColor.maxColor.a + value: 0.54509807 + objectReference: {fileID: 0} + - target: {fileID: 5207942770962451854, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: b6377742966cbd841b3a7e2b9e3be5aa, type: 2} + - target: {fileID: 5207991404373417176, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: c830f8b9f20934c45bbbc55443a44825, type: 2} + - target: {fileID: 5370172312486487358, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_Name + value: Hit_Wood + objectReference: {fileID: 0} + - target: {fileID: 5372073680406038494, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalScale.x + value: 2.0880332 + objectReference: {fileID: 0} + - target: {fileID: 5372073680406038494, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalScale.y + value: 2.0880332 + objectReference: {fileID: 0} + - target: {fileID: 5372073680406038494, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalScale.z + value: 2.0880332 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalScale.x + value: 3.52845 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalScale.y + value: 3.52845 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalScale.z + value: 3.5284495 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.04000339 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.24399947 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.22003898 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1.04083375e-17 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalRotation.x + value: -4.6566123e-10 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8363266922458534964, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: c830f8b9f20934c45bbbc55443a44825, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b58328ce2e62fb04c94660492ce6881e, type: 3} +--- !u!4 &203436911516194838 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5373769129076657466, guid: b58328ce2e62fb04c94660492ce6881e, + type: 3} + m_PrefabInstance: {fileID: 5206643056630240556} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9146181691049416276 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8117433061616129371} + m_Modifications: + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.03699421 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.52932733 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.3200147 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000008055939 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.y + value: -4.770488e-17 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalRotation.z + value: 4.656613e-10 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876690725160639820, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: m_Name + value: FX_hit + objectReference: {fileID: 0} + - target: {fileID: 8876690725174354690, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: bbf7ffb2a18965949862565eb9b2f2bb, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4255073671956206597} + - targetCorrespondingSourceObject: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + insertIndex: -1 + addedObject: {fileID: 203436911516194838} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c1b3da9fe585c44479dda2cd5c3a7b83, type: 3} +--- !u!4 &422657651648581450 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8876690725160605982, guid: c1b3da9fe585c44479dda2cd5c3a7b83, + type: 3} + m_PrefabInstance: {fileID: 9146181691049416276} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/AI/Demon/Turret.prefab.meta b/Assets/AI/Demon/Turret.prefab.meta new file mode 100644 index 000000000..59119f205 --- /dev/null +++ b/Assets/AI/Demon/Turret.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0d20e89d7557c3b41b7ef0e6be87e319 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AI/FSM/FSM_Demon.asset b/Assets/AI/FSM/FSM_Demon.asset index 45c8a25e4..75b713d0f 100644 --- a/Assets/AI/FSM/FSM_Demon.asset +++ b/Assets/AI/FSM/FSM_Demon.asset @@ -164,11 +164,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -595 - y: 70 + x: -335 + y: 125 width: 150 height: 62 - positionRect: {x: -595, y: 70} + positionRect: {x: -335, y: 125} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 1, a: 1} @@ -195,14 +195,14 @@ MonoBehaviour: parentState: {fileID: -6568372008305276654} trueRect: serializedVersion: 2 - x: -445 - y: 100 + x: -185 + y: 155 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -445 - y: 110 + x: -185 + y: 165 width: 10 height: 10 selectedTrue: 0 @@ -297,11 +297,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -560 - y: 220 + x: -300 + y: 270 width: 150 height: 106 - positionRect: {x: -560, y: 220} + positionRect: {x: -300, y: 270} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -328,14 +328,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: -410 - y: 250 + x: -150 + y: 300 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -410 - y: 260 + x: -150 + y: 310 width: 10 height: 10 selectedTrue: 0 @@ -356,14 +356,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: -410 - y: 272 + x: -150 + y: 322 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -410 - y: 282 + x: -150 + y: 332 width: 10 height: 10 selectedTrue: 0 @@ -392,14 +392,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: -410 - y: 294 + x: -150 + y: 344 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -410 - y: 304 + x: -150 + y: 354 width: 10 height: 10 selectedTrue: 0 @@ -550,11 +550,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -285 - y: 75 + x: -40 + y: 130 width: 150 height: 62 - positionRect: {x: -285, y: 75} + positionRect: {x: -40, y: 130} rectWidth: 150 editingName: 1 nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1} @@ -573,14 +573,14 @@ MonoBehaviour: parentState: {fileID: -3177478727897100882} trueRect: serializedVersion: 2 - x: -135 - y: 105 + x: 110 + y: 160 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -135 - y: 115 + x: 110 + y: 170 width: 10 height: 10 selectedTrue: 0 @@ -619,11 +619,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 0 - y: 35 + x: 230 + y: 90 width: 150 height: 62 - positionRect: {x: 0, y: 35} + positionRect: {x: 230, y: 90} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1} @@ -646,14 +646,14 @@ MonoBehaviour: parentState: {fileID: -2904979146780567904} trueRect: serializedVersion: 2 - x: -10 - y: 65 + x: 220 + y: 120 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 150 - y: 75 + x: 380 + y: 130 width: 10 height: 10 selectedTrue: 0 @@ -790,11 +790,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -285 - y: 20 + x: -40 + y: 80 width: 150 height: 30 - positionRect: {x: -285, y: 20} + positionRect: {x: -40, y: 80} rectWidth: 150 editingName: 0 nodeColor: {r: 0, g: 1, b: 0, a: 1} @@ -866,11 +866,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -480 - y: 480 + x: -225 + y: 530 width: 150 height: 150 - positionRect: {x: -480, y: 480} + positionRect: {x: -225, y: 530} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1} @@ -897,14 +897,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -330 - y: 510 + x: -75 + y: 560 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -330 - y: 520 + x: -75 + y: 570 width: 10 height: 10 selectedTrue: 0 @@ -929,14 +929,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -330 - y: 532 + x: -75 + y: 582 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -330 - y: 542 + x: -75 + y: 592 width: 10 height: 10 selectedTrue: 0 @@ -969,14 +969,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -490 - y: 554 + x: -235 + y: 604 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -330 - y: 564 + x: -75 + y: 614 width: 10 height: 10 selectedTrue: 0 @@ -1005,14 +1005,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -330 - y: 576 + x: -75 + y: 626 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -330 - y: 586 + x: -75 + y: 636 width: 10 height: 10 selectedTrue: 0 @@ -1037,14 +1037,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: -330 - y: 598 + x: -75 + y: 648 width: 10 height: 10 falseRect: serializedVersion: 2 - x: -330 - y: 608 + x: -75 + y: 658 width: 10 height: 10 selectedTrue: 0 @@ -1091,7 +1091,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3} m_Name: FSM_Demon m_EditorClassIdentifier: - selectedNode: {fileID: 766956384951898899} + selectedNode: {fileID: 2986668563461644515} wantConnection: 0 connectionNode: {fileID: 0} showProperties: 1 @@ -1108,7 +1108,7 @@ MonoBehaviour: - {fileID: 9112689765763526057} - {fileID: 766956384951898899} - {fileID: 4162026404432437805} - panOffset: {x: -860, y: -90} + panOffset: {x: -600, y: -5} overNode: 0 actions: - {fileID: 0} @@ -1139,6 +1139,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} icon: {fileID: 0} --- !u!114 &117913083446138218 MonoBehaviour: @@ -1192,11 +1193,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 515 - y: 710 + x: 745 + y: 760 width: 150 height: 62 - positionRect: {x: 515, y: 710} + positionRect: {x: 745, y: 760} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1215,14 +1216,14 @@ MonoBehaviour: parentState: {fileID: 762670965814380212} trueRect: serializedVersion: 2 - x: 505 - y: 740 + x: 735 + y: 790 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 665 - y: 750 + x: 895 + y: 800 width: 10 height: 10 selectedTrue: 0 @@ -1259,14 +1260,14 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 1 - isSelected: 1 + isSelected: 0 nodeRect: serializedVersion: 2 - x: 580 - y: 165 + x: 810 + y: 220 width: 150 height: 62 - positionRect: {x: 580, y: 165} + positionRect: {x: 810, y: 220} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1285,14 +1286,14 @@ MonoBehaviour: parentState: {fileID: 766956384951898899} trueRect: serializedVersion: 2 - x: 570 - y: 195 + x: 800 + y: 250 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 730 - y: 205 + x: 960 + y: 260 width: 10 height: 10 selectedTrue: 0 @@ -1309,6 +1310,36 @@ MonoBehaviour: useDecisions: 1 parentGraph: {fileID: 11400000} defaultTransition: {fileID: 0} +--- !u!114 &1848419507865303702 +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: 57041025c9fb3ad459fbfb7da1224d25, type: 3} + m_Name: Check Health > 75 + m_EditorClassIdentifier: + parentFSM: {fileID: 11400000} + editingName: 0 + trueRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 10 + height: 10 + falseRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 10 + height: 10 + selectedTrue: 0 + selectedFalse: 0 + checkValue: 2 + value: 75 --- !u!114 &1913506767753201076 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1381,11 +1412,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 305 - y: 710 + x: 535 + y: 760 width: 150 height: 62 - positionRect: {x: 305, y: 710} + positionRect: {x: 535, y: 760} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1404,14 +1435,14 @@ MonoBehaviour: parentState: {fileID: 2691300596403639167} trueRect: serializedVersion: 2 - x: 295 - y: 740 + x: 525 + y: 790 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 455 - y: 750 + x: 685 + y: 800 width: 10 height: 10 selectedTrue: 0 @@ -1451,11 +1482,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 50 - y: 430 + x: 280 + y: 480 width: 150 height: 150 - positionRect: {x: 50, y: 430} + positionRect: {x: 280, y: 480} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -1478,14 +1509,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 40 - y: 460 + x: 270 + y: 510 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 200 - y: 470 + x: 430 + y: 520 width: 10 height: 10 selectedTrue: 0 @@ -1510,14 +1541,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 40 - y: 482 + x: 270 + y: 532 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 200 - y: 492 + x: 430 + y: 542 width: 10 height: 10 selectedTrue: 0 @@ -1529,14 +1560,14 @@ MonoBehaviour: scroolView: {x: 0, y: 0, z: 0} sameTargetCount: 0 - decisions: - - trueValue: 0 - decision: {fileID: -6379838510941931433} - isValid: 1 - validated: 0 - trueValue: 1 decision: {fileID: -7938248970223304488} isValid: 0 validated: 0 + - trueValue: 0 + decision: {fileID: 1848419507865303702} + isValid: 1 + validated: 0 trueState: {fileID: 766956384951898899} falseState: {fileID: 0} muteTrue: 0 @@ -1546,14 +1577,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 200 - y: 504 + x: 430 + y: 554 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 200 - y: 514 + x: 430 + y: 564 width: 10 height: 10 selectedTrue: 0 @@ -1565,14 +1596,14 @@ MonoBehaviour: scroolView: {x: 0, y: 0, z: 0} sameTargetCount: 0 - decisions: - - trueValue: 0 - decision: {fileID: -6379838510941931433} - isValid: 1 - validated: 0 - trueValue: 1 decision: {fileID: 8113515040269600600} isValid: 1 validated: 0 + - trueValue: 0 + decision: {fileID: 1848419507865303702} + isValid: 1 + validated: 0 trueState: {fileID: 9112689765763526057} falseState: {fileID: 0} muteTrue: 0 @@ -1582,14 +1613,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 200 - y: 526 + x: 430 + y: 576 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 200 - y: 536 + x: 430 + y: 586 width: 10 height: 10 selectedTrue: 0 @@ -1618,14 +1649,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 200 - y: 548 + x: 430 + y: 598 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 200 - y: 558 + x: 430 + y: 608 width: 10 height: 10 selectedTrue: 0 @@ -1725,11 +1756,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 575 - y: 375 + x: 805 + y: 425 width: 150 height: 30 - positionRect: {x: 575, y: 375} + positionRect: {x: 805, y: 425} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1748,14 +1779,14 @@ MonoBehaviour: parentState: {fileID: 4162026404432437805} trueRect: serializedVersion: 2 - x: 650 - y: 390 + x: 880 + y: 440 width: 0 height: 0 falseRect: serializedVersion: 2 - x: 650 - y: 390 + x: 880 + y: 440 width: 0 height: 0 selectedTrue: 0 @@ -1921,11 +1952,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 585 - y: -5 + x: 815 + y: 65 width: 150 height: 62 - positionRect: {x: 585, y: -5} + positionRect: {x: 815, y: 65} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1944,14 +1975,14 @@ MonoBehaviour: parentState: {fileID: 9112689765763526057} trueRect: serializedVersion: 2 - x: 575 - y: 25 + x: 805 + y: 95 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 735 - y: 35 + x: 965 + y: 105 width: 10 height: 10 selectedTrue: 0 diff --git a/Assets/AI/FSM/FSM_Giant.asset b/Assets/AI/FSM/FSM_Giant.asset index ec49e2aa7..24d4e1f90 100644 --- a/Assets/AI/FSM/FSM_Giant.asset +++ b/Assets/AI/FSM/FSM_Giant.asset @@ -134,7 +134,13 @@ MonoBehaviour: type: 3} shieldDuration: 10 animatorBlockingBool: IsBlocking - enableDebug: 1 + startClip: {fileID: 0} + keepClip: {fileID: 0} + endClip: {fileID: 0} + clipSpeed: 1 + crossfadeTime: 0.12 + playEndOnEarlyExit: 1 + debugLogs: 0 --- !u!114 &-7016508256595524775 MonoBehaviour: m_ObjectHideFlags: 1 @@ -206,7 +212,7 @@ MonoBehaviour: - decisions: - trueValue: 1 decision: {fileID: 5430119601860107240} - isValid: 1 + isValid: 0 validated: 0 - trueValue: 1 decision: {fileID: 117913083446138218} @@ -260,13 +266,14 @@ MonoBehaviour: executionType: -1 editingName: 0 meteorPrefab: {fileID: 0} - decalPrefab: {fileID: 1743301284569550, guid: ad2ab49d0a2a17148bd51c93d977bdbc, - type: 3} - spawnHeight: 40 + behindBossDistance: 3 + aboveBossHeight: 8 castDelay: 1.5 - groundMask: - serializedVersion: 2 - m_Bits: 4294967295 + targetTag: Player + overlayClip: {fileID: 0} + overlaySpeed: 1 + overlayFadeIn: 0.1 + overlayFadeOut: 0.1 enableDebug: 1 --- !u!114 &-6379838510941931433 MonoBehaviour: @@ -659,7 +666,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: 7927421991537792917} - isValid: 1 + isValid: 0 validated: 0 trueState: {fileID: -312774025800194259} falseState: {fileID: 0} @@ -778,8 +785,17 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 animatorBlockingBool: IsBlocking - backPreferenceMultiplier: 2 - maxSpawnAttempts: 12 + perTurretAdjustmentTries: 10 + maxAngleAdjust: 25 + maxRadiusAdjust: 1 + minSeparationBetweenTurrets: 1.5 + globalStartAngleRandom: 1 + perTurretAngleJitter: 10 + perTurretRadiusJitter: 0.75 + overlayClip: {fileID: 0} + overlaySpeed: 1 + overlayFadeIn: 0.1 + overlayFadeOut: 0.1 enableDebug: 1 showGizmos: 1 --- !u!114 &-712571192746352845 diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity index ba47de92f..8b633634b 100644 --- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity @@ -14528,6 +14528,26 @@ PrefabInstance: propertyPath: m_Name value: GhostDemon objectReference: {fileID: 0} + - target: {fileID: 974380812503253259, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + propertyPath: _maxAttackCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + propertyPath: _minAttackCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + propertyPath: selectedToolbar + value: 9 + objectReference: {fileID: 0} - target: {fileID: 1564533674011589205, guid: fe3f8cbdaa5d03147a0de1c74712d32b, type: 3} propertyPath: m_AnchorMax.x @@ -16506,6 +16526,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1979772587506359731, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.00030639363 + objectReference: {fileID: 0} - target: {fileID: 1979772587738893350, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_Enabled @@ -17115,7 +17140,7 @@ PrefabInstance: - target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: -26 + value: -26.000061 objectReference: {fileID: 0} - target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -19389,9 +19414,7 @@ MonoBehaviour: m_sunLight: {fileID: 1976683114} m_moonLight: {fileID: 0} WeatherPresent: 0 - WeatherSystem: {fileID: 0} m_sunLightExists: 1 - m_moonLightExists: 0 --- !u!4 &1013064392 Transform: m_ObjectHideFlags: 10 @@ -22882,8 +22905,6 @@ MonoBehaviour: x: 250 y: 250 z: 250 - m_allFloatingPointFixMembers: [] - m_allWorldSpaceParticleSystems: [] m_originTargetTileX: 0 m_originTargetTileZ: 0 m_terrainUnloadMemoryTreshold: 4294967296 diff --git a/Assets/ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat b/Assets/ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat new file mode 100644 index 000000000..2ec3cf98b --- /dev/null +++ b/Assets/ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat @@ -0,0 +1,196 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7966782797081402813 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Crystals_red 1 + m_Shader: {fileID: -6465566751694194690, guid: 00a0b3897399f8b42a61a0333dd40ced, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - BASETEXTYPE_ALBEDO_EMISSIVE + - USEDISSOLVE_DONT_USE + - USEFRESNEL + - _ALPHATEST_ON + - _USEDISTANCEFADE + m_InvalidKeywords: + - _EMISSION + - _ENVIRONMENTREFLECTIONS_OFF + - _METALLICSPECGLOSSMAP + - _NORMALMAP + m_LightmapFlags: 2 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - BaseTex: + m_Texture: {fileID: 2800000, guid: 7905193ef00a1844e9b9e2c14ce9be7f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - DissolveMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - NOSMap: + m_Texture: {fileID: 2800000, guid: ead716f17a0a0f347adaf3ff0a109e6a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c0d899801acbe0845902935b9e0e857e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 5a004b07e91ff744aa9143b4cdd46a2d, 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: 2800000, guid: 284695d770a91574cb92ebad906dc6f4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c0d899801acbe0845902935b9e0e857e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 18c6ef854a1f94045bcd407172b8d0f6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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: 2800000, guid: 18c6ef854a1f94045bcd407172b8d0f6, type: 3} + 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: + - AOStrength: 3 + - AlphaClipThreshold: 0.454 + - BASETEXTYPE: 0 + - DissolveNoiseScale: 25 + - EffectStrenght: 0.14 + - FresnelPower: 1.37 + - Metalness: 0.13 + - NormalStrength: 1.64 + - Smoothness: 1.74 + - USEDISSOLVE: 0 + - USEDISSOLVEMASK: 0 + - USEFRESNEL: 1 + - Vector1_473704f964214ae2bc68475022d1524b: 0.05 + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _BendEffect: 0 + - _BendMaxDistance: 1 + - _BendMaxHeight: 0 + - _BendMinDistance: 0.2 + - _BendMinHeight: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EffectThreshold: 0 + - _EmissionScaleUI: 1.5 + - _EnvironmentReflections: 0 + - _FadeDistance: 0.28 + - _FarFadeDistance: 500 + - _GlossMapScale: 0 + - _Glossiness: 0.613 + - _GlossyReflections: 0 + - _InverseFadeRange: 1 + - _InverseFarFadeRange: 0.5 + - _Metallic: 0.772 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _Threshold: 0.184 + - _USEDISTANCEFADE: 1 + - _USESCANWAVE: 0 + - _UVSec: 0 + - _WaveTrail: 4 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - BaseColor: {r: 0.92593974, g: 0.92593974, b: 0.92593974, a: 1} + - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} + - EmissiveColor: {r: 0.25206095, g: 0, b: 0.6901961, a: 1.5} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BendVector: {r: 0, g: -1, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 29.508846, g: 3.0899315, b: 0, a: 1.5} + - _EmissionColorUI: {r: 1, g: 0.10344824, b: 0, a: 1} + - _FresnelColor: {r: 0.03481903, g: 0, b: 0.70710677, a: 0} + - _ScanWaveColor: {r: 0, g: 0.5949242, b: 1, a: 0} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/AI/Demon/Turet.prefab.meta b/Assets/ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat.meta similarity index 52% rename from Assets/AI/Demon/Turet.prefab.meta rename to Assets/ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat.meta index a79e2bfc5..aed078b77 100644 --- a/Assets/AI/Demon/Turet.prefab.meta +++ b/Assets/ThirdParty/ENVIRO/Top-Down caves/Prefabs/Origin/Models/Materials/Crystals_red 1.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b5eabfbed738a224284015c33b62e54b -timeCreated: 1431698653 -licenseType: Store +guid: 4dd6a2e84f333e0448c7f41299d7e12d NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller index 73c213864..ef485fc4c 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller +++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Bonel_Warrior.controller @@ -1,5 +1,89 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9002994301735285202 +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: d20bc7e4150a82f4ba03191390f832f8, type: 3} + m_Name: + m_EditorClassIdentifier: + parameterName: Randomized + weights: 210000002100000021000000 +--- !u!1102 &-6212810689603984707 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4661024869372733565} + m_StateMachineBehaviours: + - {fileID: 6394280332537993716} + - {fileID: 9213551054618683998} + - {fileID: 6184924150879439133} + - {fileID: -9002994301735285202} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -1705551523853769300} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!206 &-1705551523853769300 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400008, guid: a9e228972999b0d46a21e30edf97d812, type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: a9e228972999b0d46a21e30edf97d812, type: 3} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400054, guid: a9e228972999b0d46a21e30edf97d812, type: 3} + m_Threshold: 2 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + m_BlendParameter: Randomized + m_BlendParameterY: InputHorizontal + m_MinThreshold: 0 + m_MaxThreshold: 2 + m_UseAutomaticThresholds: 0 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -201,6 +285,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Randomized + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -15256,41 +15346,6 @@ MonoBehaviour: sounds: - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} triggerTime: 0 ---- !u!114 &114030386879188540 -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: f9058122f6ec699438581f28f117350d, type: 3} - m_Name: - m_EditorClassIdentifier: - startDamage: 0.05 - endDamage: 0.9 - damageMultiplier: 0 - recoilID: 1 - reactionID: 1 - meleeAttackType: 1 - damageType: - bodyParts: - - RightLowerArm - ignoreDefense: 0 - activeRagdoll: 0 - senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.5 - useAttackTimeScale: 0 - slowMoActivationDistance: 3 - lowHealthTh: 10 - attackTimeScale: 0.2 - attackTimeScaleStart: -1 - attackTimeScaleEnd: -1 - rotatePlayerTowardsTarget: 0 - rotationActivationAngle: 45 - debug: 0 --- !u!114 &114037387642052710 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15321,41 +15376,6 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction ---- !u!114 &114101577822421078 -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: f9058122f6ec699438581f28f117350d, type: 3} - m_Name: - m_EditorClassIdentifier: - startDamage: 0.05 - endDamage: 0.9 - damageMultiplier: 0 - recoilID: 2 - reactionID: 1 - meleeAttackType: 1 - damageType: - bodyParts: - - RightLowerArm - ignoreDefense: 0 - activeRagdoll: 0 - senselessTime: 0 - resetAttackTrigger: 1 - resetTriggerBeforeTime: 0.5 - useAttackTimeScale: 0 - slowMoActivationDistance: 3 - lowHealthTh: 10 - attackTimeScale: 0.2 - attackTimeScaleStart: -1 - attackTimeScaleEnd: -1 - rotatePlayerTowardsTarget: 0 - rotationActivationAngle: 45 - debug: 0 --- !u!114 &114109424512592286 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15638,30 +15658,6 @@ MonoBehaviour: - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} triggerTime: 0 ---- !u!114 &114263588767966834 -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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} - m_Name: - m_EditorClassIdentifier: - stateInfos: [] - debug: 0 - tags: - - tagName: Attack - tagType: 3 - normalizedTime: {x: 0.1, y: 0.8} - - tagName: LockRotation - tagType: 0 - normalizedTime: {x: 0.1, y: 0.7} - - tagName: LockMovement - tagType: 1 - normalizedTime: {x: 0, y: 0.7} --- !u!114 &114275699407771092 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15727,44 +15723,6 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction ---- !u!114 &114304692954732270 -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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} - m_Name: - m_EditorClassIdentifier: - audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - sounds: - - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: 0 ---- !u!114 &114312089054784788 -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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} - m_Name: - m_EditorClassIdentifier: - audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - sounds: - - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - triggerTime: 0 --- !u!114 &114324329624715244 MonoBehaviour: m_ObjectHideFlags: 1 @@ -15865,25 +15823,6 @@ MonoBehaviour: - tagName: CustomAction tagType: 0 normalizedTime: {x: 0.1, y: 0.35} ---- !u!114 &114405241802589726 -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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} - m_Name: - m_EditorClassIdentifier: - audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} - sounds: - - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} - - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} - - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} - - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} - triggerTime: 0 --- !u!114 &114406195790751738 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16487,30 +16426,6 @@ MonoBehaviour: tags: - LockMovement - LockRotation ---- !u!114 &114667135945300734 -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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} - m_Name: - m_EditorClassIdentifier: - stateInfos: [] - debug: 0 - tags: - - tagName: Attack - tagType: 3 - normalizedTime: {x: 0.1, y: 0.8} - - tagName: LockRotation - tagType: 0 - normalizedTime: {x: 0.1, y: 0.7} - - tagName: LockMovement - tagType: 1 - normalizedTime: {x: 0, y: 0.7} --- !u!114 &114669916436479170 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16603,30 +16518,6 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction ---- !u!114 &114756031459307912 -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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} - m_Name: - m_EditorClassIdentifier: - stateInfos: [] - debug: 0 - tags: - - tagName: Attack - tagType: 3 - normalizedTime: {x: 0.1, y: 0} - - tagName: LockRotation - tagType: 0 - normalizedTime: {x: 0.1, y: 0.7} - - tagName: LockMovement - tagType: 1 - normalizedTime: {x: 0, y: 0.7} --- !u!114 &114771221009366196 MonoBehaviour: m_ObjectHideFlags: 1 @@ -16724,41 +16615,6 @@ MonoBehaviour: stateInfos: [] tags: - LockMovement ---- !u!114 &114825370114345668 -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: f9058122f6ec699438581f28f117350d, type: 3} - m_Name: - m_EditorClassIdentifier: - startDamage: 0.05 - endDamage: 0.9 - damageMultiplier: 1 - recoilID: 1 - reactionID: 1 - meleeAttackType: 1 - damageType: - bodyParts: - - RightLowerArm - ignoreDefense: 0 - activeRagdoll: 0 - senselessTime: 0 - resetAttackTrigger: 0 - resetTriggerBeforeTime: 0.5 - useAttackTimeScale: 0 - slowMoActivationDistance: 3 - lowHealthTh: 10 - attackTimeScale: 0.2 - attackTimeScaleStart: -1 - attackTimeScaleEnd: -1 - rotatePlayerTowardsTarget: 0 - rotationActivationAngle: 45 - debug: 0 --- !u!114 &114838529179133088 MonoBehaviour: m_ObjectHideFlags: 1 @@ -22661,28 +22517,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101255493625229458 -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: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.8 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101259247973905158 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -22705,31 +22539,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101262937642278562 -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: WeakAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102186001672383516} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.11020672 - m_TransitionOffset: 0.01405192 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101264055223708130 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -24140,28 +23949,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101473625656561818 -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: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0.2 - m_TransitionOffset: 0 - m_ExitTime: 0.85 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101476070418764840 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -24920,28 +24707,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101559597476362148 -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: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0.2 - m_TransitionOffset: 0 - m_ExitTime: 0.8 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101561649539745982 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -27030,31 +26795,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101963861138605418 -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: WeakAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102861933717182418} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.14999986 - m_TransitionOffset: 0.049623918 - m_ExitTime: 0.9116617 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1101967999082563810 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -28702,36 +28442,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102186001672383516 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: C - m_Speed: 1.2 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101473625656561818} - m_StateMachineBehaviours: - - {fileID: 114101577822421078} - - {fileID: 114304692954732270} - - {fileID: 114263588767966834} - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 1 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400064, guid: a9e228972999b0d46a21e30edf97d812, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102186440903726776 AnimatorState: serializedVersion: 6 @@ -29810,37 +29520,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102466317250516052 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: A - m_Speed: 1.3 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101963861138605418} - - {fileID: 1101255493625229458} - m_StateMachineBehaviours: - - {fileID: 114825370114345668} - - {fileID: 114405241802589726} - - {fileID: 114667135945300734} - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 1 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400008, guid: a9e228972999b0d46a21e30edf97d812, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102473272169605230 AnimatorState: serializedVersion: 6 @@ -31605,37 +31284,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102861933717182418 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: B - m_Speed: 1.4 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101262937642278562} - - {fileID: 1101559597476362148} - m_StateMachineBehaviours: - - {fileID: 114030386879188540} - - {fileID: 114312089054784788} - - {fileID: 114756031459307912} - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 1 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400002, guid: a9e228972999b0d46a21e30edf97d812, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102866145726083920 AnimatorState: serializedVersion: 6 @@ -33937,14 +33585,8 @@ AnimatorStateMachine: m_Name: SwordAttack m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 1102466317250516052} - m_Position: {x: 240, y: 120, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102861933717182418} - m_Position: {x: 240, y: 50, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102186001672383516} - m_Position: {x: 240, y: -20, z: 0} + m_State: {fileID: -6212810689603984707} + m_Position: {x: 280, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -33954,7 +33596,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 528, y: 60, z: 0} m_ParentStateMachinePosition: {x: 504, y: -36, z: 0} - m_DefaultState: {fileID: 1102466317250516052} + m_DefaultState: {fileID: -6212810689603984707} --- !u!1107 &1107517961391708756 AnimatorStateMachine: serializedVersion: 6 @@ -37423,3 +37065,103 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 1 +--- !u!1101 &4661024869372733565 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8840206 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!114 &6184924150879439133 +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: f9058122f6ec699438581f28f117350d, type: 3} + m_Name: + m_EditorClassIdentifier: + startDamage: 0.05 + endDamage: 0.9 + damageMultiplier: 1 + recoilID: 1 + reactionID: 1 + meleeAttackType: 1 + damageType: + bodyParts: + - RightLowerArm + ignoreDefense: 0 + activeRagdoll: 0 + senselessTime: 2 + resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.5 + useAttackTimeScale: 0 + slowMoActivationDistance: 3 + lowHealthTh: 10 + attackTimeScale: 0.2 + attackTimeScaleStart: -1 + attackTimeScaleEnd: -1 + rotatePlayerTowardsTarget: 0 + rotationActivationAngle: 45 + debug: 0 +--- !u!114 &6394280332537993716 +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: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 106114, guid: dfea19d1d34dd174d87195f78cb44ae7, type: 3} + sounds: + - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} + - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} + - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} + - {fileID: 8300000, guid: 08b5a5b778d6952438c6b3bedaa1e6af, type: 3} + triggerTime: 0 +--- !u!114 &9213551054618683998 +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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} + m_Name: + m_EditorClassIdentifier: + stateInfos: [] + debug: 0 + tags: + - tagName: Attack + tagType: 3 + normalizedTime: {x: 0.1, y: 0.8} + - tagName: LockRotation + tagType: 0 + normalizedTime: {x: 0.1, y: 0.7} + - tagName: LockMovement + tagType: 1 + normalizedTime: {x: 0, y: 0.7} diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller index 69d78bc81..afdde93b1 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller +++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller @@ -95,7 +95,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parameterName: Randomized - weights: 19000000190000001900000019000000 + weights: 23000000230000000f0000000f000000 --- !u!114 &-709582740070635242 MonoBehaviour: m_ObjectHideFlags: 1