diff --git a/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton.controller b/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton.controller index ed411a30..5810043e 100644 --- a/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton.controller +++ b/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton.controller @@ -1,5 +1,49 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8294453107926997140 +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: -1955213380481053044, guid: 544bfc8c3d458a045bc3f6035acf485a, type: 2} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.81707317 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7942258457785861289 +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: -1955213380481053044, guid: 544bfc8c3d458a045bc3f6035acf485a, type: 2} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-5999870908191188550 AnimatorStateMachine: serializedVersion: 6 @@ -11,17 +55,68 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2563821287706019269} - m_Position: {x: 210, y: 200, z: 0} + m_Position: {x: 510, y: -60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4917200542234153593} + m_Position: {x: 270, y: -140, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -2989848850734890113} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: 50, y: -50, z: 0} + m_EntryPosition: {x: 730, y: -50, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2563821287706019269} +--- !u!1101 &-3025875431672470150 +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: -1955213380481053044, guid: 544bfc8c3d458a045bc3f6035acf485a, type: 2} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.16466653 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2989848850734890113 +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: throw + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4917200542234153593} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2563821287706019269 AnimatorState: serializedVersion: 6 @@ -63,6 +158,30 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: throw + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: cast + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: melee + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: throwingTime + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -107,3 +226,52 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1102 &4917200542234153593 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Throw + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6101974044465082460} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 2466456710523085191, guid: 8847f0093193dda41bb32a4b66a673e8, type: 3} + m_Tag: + m_SpeedParameter: throwingTime + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: throwingTime +--- !u!1101 &6101974044465082460 +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: -2563821287706019269} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/CharactersPack/Models/KayKit Animated Character_v1.2.fbx.meta b/Assets/CharactersPack/Models/KayKit Animated Character_v1.2.fbx.meta index 82a12844..da0ba0a0 100644 --- a/Assets/CharactersPack/Models/KayKit Animated Character_v1.2.fbx.meta +++ b/Assets/CharactersPack/Models/KayKit Animated Character_v1.2.fbx.meta @@ -820,7 +820,7 @@ ModelImporter: takeName: KayKit Animated Character|Throw internalID: 2466456710523085191 firstFrame: 0 - lastFrame: 34 + lastFrame: 30 wrapMode: 0 orientationOffsetY: 0 level: 0 diff --git a/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab b/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab index 41cc7bb6..48ffb084 100644 --- a/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab +++ b/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab @@ -1586,7 +1586,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4924407620164273521, guid: 2e56f69e0872f744daa6c9080ecf3040, type: 3} propertyPath: m_AnchoredPosition.y - value: 1.9 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4924407620164273521, guid: 2e56f69e0872f744daa6c9080ecf3040, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab b/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab index 78632e96..46f068ba 100644 --- a/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab +++ b/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab @@ -2356,7 +2356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4924407620164273521, guid: 2e56f69e0872f744daa6c9080ecf3040, type: 3} propertyPath: m_AnchoredPosition.y - value: 1.9 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4924407620164273521, guid: 2e56f69e0872f744daa6c9080ecf3040, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset index 3612b890..9e01ae8f 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset @@ -21,8 +21,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} abilityEffects: - {fileID: 11400000, guid: d5d94abf5b6bb7f42888d6d242067a71, type: 2} - castTime: 0 + castTime: 1 manaCost: 40 + castableWhileMoving: 0 + animationType: 1 projectilePrefab: {fileID: 482914955127851241, guid: d16d48fd289401c44980d410c522b025, type: 3} projectileSpeed: 2 lifeSpan: 5 diff --git a/Assets/Scripts/NPC/NPCBrainSystem.meta b/Assets/Scripts/NPC/NPCBrainSystem.meta new file mode 100644 index 00000000..3457065e --- /dev/null +++ b/Assets/Scripts/NPC/NPCBrainSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd518ea0ed099ff48bc1fdaf299ffc35 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NPC/NPCBrainSystem/NPCBrain.cs b/Assets/Scripts/NPC/NPCBrainSystem/NPCBrain.cs new file mode 100644 index 00000000..c4758e53 --- /dev/null +++ b/Assets/Scripts/NPC/NPCBrainSystem/NPCBrain.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NPCBrain : MonoBehaviour +{ + +} + + +// idle +// patrol +// pursuit +// recall +// attack +// block diff --git a/Assets/Scripts/NPC/NPCBrainSystem/NPCBrain.cs.meta b/Assets/Scripts/NPC/NPCBrainSystem/NPCBrain.cs.meta new file mode 100644 index 00000000..5cafde03 --- /dev/null +++ b/Assets/Scripts/NPC/NPCBrainSystem/NPCBrain.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f4e9d853fe954584b93e06043716a72b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NPC/NPCBrainSystem/NPCDecision.cs b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecision.cs new file mode 100644 index 00000000..ba9d8334 --- /dev/null +++ b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecision.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class NPCDecision : ScriptableObject +{ + public abstract void Execute(NPCController npc); +} \ No newline at end of file diff --git a/Assets/Scripts/NPC/NPCBrainSystem/NPCDecision.cs.meta b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecision.cs.meta new file mode 100644 index 00000000..d51b6240 --- /dev/null +++ b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecision.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: de91b8c4618f467458e06e8af0d9c690 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NPC/NPCBrainSystem/NPCDecisionProfile.cs b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecisionProfile.cs new file mode 100644 index 00000000..76fade0b --- /dev/null +++ b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecisionProfile.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "NPCDecisionProfile", menuName = "AI/NPCDecisionProfile")] +public class NPCDecisionProfile : ScriptableObject +{ + public List decisions = new List(); +} + +[System.Serializable] +public class NPCDecisionPriority +{ + public NPCDecision decision; + public int priority; +} \ No newline at end of file diff --git a/Assets/Scripts/NPC/NPCBrainSystem/NPCDecisionProfile.cs.meta b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecisionProfile.cs.meta new file mode 100644 index 00000000..27c973e6 --- /dev/null +++ b/Assets/Scripts/NPC/NPCBrainSystem/NPCDecisionProfile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b8eb4933db54c1342a2074ba0e8b3b06 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index 9b619648..f126a32d 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 10.869601 + - _Rotation: 11.08514 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1