diff --git a/Assets/Items/Weapons/Common.meta b/Assets/Items/Weapons/Common.meta new file mode 100644 index 0000000..4e7b7d3 --- /dev/null +++ b/Assets/Items/Weapons/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e8c9a9fec6a405489d9829d445bc914 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Weapons/Common/Materials.meta b/Assets/Items/Weapons/Common/Materials.meta new file mode 100644 index 0000000..aafb1bd --- /dev/null +++ b/Assets/Items/Weapons/Common/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 476e11bd1b6d92641867d9cb10565992 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Weapons/Common/Materials/WeaponMat.mat b/Assets/Items/Weapons/Common/Materials/WeaponMat.mat new file mode 100644 index 0000000..3cb75bb --- /dev/null +++ b/Assets/Items/Weapons/Common/Materials/WeaponMat.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4357068035131237370 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + 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: WeaponMat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Items/Weapons/Common/Materials/WeaponMat.mat.meta b/Assets/Items/Weapons/Common/Materials/WeaponMat.mat.meta new file mode 100644 index 0000000..f4d4aef --- /dev/null +++ b/Assets/Items/Weapons/Common/Materials/WeaponMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b623c7e598affa24d85636c38d9535c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Weapons/TestShuikenGraph.asset b/Assets/Items/Weapons/TestShuikenGraph.asset new file mode 100644 index 0000000..d09fd17 --- /dev/null +++ b/Assets/Items/Weapons/TestShuikenGraph.asset @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f945e777233a59f4aba40aeca29093a6, type: 3} + m_Name: TestShuikenGraph + m_EditorClassIdentifier: NodeCanvas::NodeCanvas.StateMachines.FSM + _serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_name":"ENTRY","_position":{"x":499.0,"y":476.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"0"},{"_actionList":{"executionMode":1,"actions":[{"boolVariable":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"setTo":0,"$type":"NodeCanvas.Tasks.Actions.SetBoolean"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":567.4302,"y":581.6329},"$type":"NodeCanvas.StateMachines.ActionState","$id":"1"},{"_name":"ATTACK + SWITCH","_position":{"x":809.8719,"y":712.0375},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"2"},{"_nestedBT":{"_value":1},"executionMode":0,"_position":{"x":998.8945,"y":361.9592},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"3"},{"_onEnterList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"valueB":{"_value":4},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[System.Int32, + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},{"newGravity":{"_value":-0.03},"absolute":{"_value":true},"relativity":{"_value":1.0},"deltaTime":{},"decayRate":{},"$type":"Reset.Units.SetNewGravity"},{"moveSpeed":{"label":"Move + Speed","changeValue":{"_value":2},"value":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{"_value":2},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{"_value":2},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"fieldOfView":{"label":"FOV","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitTargetOffset":{"label":"Target + Offset","value":{},"changeX":{},"changeY":{},"changeZ":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitPositionDamping":{"label":"Position + Damping","value":{},"changeX":{},"changeY":{},"changeZ":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitFollowTop":{"label":"Top","changeHeight":{"_value":2},"height":{},"changeRadius":{"_value":2},"radius":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"orbitFollowCenter":{"label":"Center","changeHeight":{"_value":2},"height":{},"changeRadius":{"_value":2},"radius":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"orbitFollowBottom":{"label":"Bottom","changeHeight":{"_value":2},"height":{},"changeRadius":{"_value":2},"radius":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"enableXAxis":{"label":"Input + Axis X Enabled","value":{"_value":true},"changeValue":{}},"enableYAxis":{"label":"Input + Axis Y Enabled","value":{"_value":true},"changeValue":{}},"axisLookXGain":{"label":"Look + Orbit X Gain","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"axisLookYGain":{"label":"Look + Orbit Y Gain","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"screenPosition":{"label":"Screen + Position","value":{},"changeX":{},"changeY":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"cameraOffset":{"label":"Offset","value":{},"changeX":{},"changeY":{},"changeZ":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"},{"facingDirection":{"label":"Facing + Direction","value":{"_value":{"$content":0,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":2}},"rotationSpeed":{"label":"Rotation + Speed","changeValue":{"_value":2},"value":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"directionChangingSoftness":{"label":"Direction + Changing Softness","changeValue":{"_value":2},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"directionSpinningHardness":{"label":"Direction + Spinning Hardness","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"directionSpinningSpeed":{"label":"Direction + Spinning Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeDirectionSettings"}]},"_onUpdateList":{"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Melee + Grounded","_position":{"x":1295.94,"y":612.8193},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_position":{"x":1521.823,"y":876.7599},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"5"},{"_nestedBT":{"_value":2},"executionMode":0,"successEvent":"","_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"}],"_position":{"x":996.6152,"y":886.4272},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"6"},{"_actionList":{"executionMode":1,"actions":[{"eventName":{"_value":"Exit + Combat"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1785.615,"y":517.4272},"$type":"NodeCanvas.StateMachines.ActionState"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"parameter":{"_value":"In + Combat"},"parameterHashID":{},"setTo":{"_value":true},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"},{"valueA":{"_name":"combatType","_targetVariableID":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293"},"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Core.CombatType, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"trigger":{"_value":"Ranged + Combat"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_position":{"x":485.5682,"y":264.9219},"$type":"NodeCanvas.StateMachines.OnFSMEnter"}],"connections":[{"_condition":{"valueA":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":10.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Holster + Weapon"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Ranged + Attack"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}}}' + _objectReferences: + - {fileID: 0} + - {fileID: 11400000, guid: 7c6c0968e94af5b449f1d79e163abb34, type: 2} + - {fileID: 11400000, guid: 37c6c49bd4cf00b47b46dcfe8f9a6a7b, type: 2} + _graphSource: + _version: 3.31 + _category: + _comments: + _translation: {x: -283, y: -18} + _zoomFactor: 1 + _haltSerialization: 0 + _externalSerializationFile: {fileID: 0} diff --git a/Assets/Items/Weapons/TestShuikenGraph.asset.meta b/Assets/Items/Weapons/TestShuikenGraph.asset.meta new file mode 100644 index 0000000..f96fe36 --- /dev/null +++ b/Assets/Items/Weapons/TestShuikenGraph.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92113617971aa4b46a62d8444a22a268 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Weapons/TestShuriken.asset b/Assets/Items/Weapons/TestShuriken.asset new file mode 100644 index 0000000..317bf41 --- /dev/null +++ b/Assets/Items/Weapons/TestShuriken.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: b7f2c6caae048f64f91b54ae1442694c, type: 3} + m_Name: TestShuriken + m_EditorClassIdentifier: Assembly-CSharp::Reset.Items.Weapon + itemName: Test Sword + permanency: 0 + essenceRequiredForPermanency: 0 + combatType: 1 + weaponModel: {fileID: 919132149155446097, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} + weaponFSM: {fileID: 0} + handPositionOffset: {x: 0.061, y: 0.089, z: 0.01} + handRotationOffset: {x: 36.154, y: 4.561, z: -29.413} + actorScriptName: ShurikenActor diff --git a/Assets/Items/Weapons/TestShuriken.asset.meta b/Assets/Items/Weapons/TestShuriken.asset.meta new file mode 100644 index 0000000..0a8077e --- /dev/null +++ b/Assets/Items/Weapons/TestShuriken.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f04acfb543d2d634781b55c9081fcffa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Weapons/TestShuriken.fbx b/Assets/Items/Weapons/TestShuriken.fbx index 1f98755..1e3afec 100644 Binary files a/Assets/Items/Weapons/TestShuriken.fbx and b/Assets/Items/Weapons/TestShuriken.fbx differ diff --git a/Assets/Items/Weapons/TestSwordForward.asset b/Assets/Items/Weapons/TestSword.asset similarity index 96% rename from Assets/Items/Weapons/TestSwordForward.asset rename to Assets/Items/Weapons/TestSword.asset index e89a5d3..cd38d36 100644 --- a/Assets/Items/Weapons/TestSwordForward.asset +++ b/Assets/Items/Weapons/TestSword.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7f2c6caae048f64f91b54ae1442694c, type: 3} - m_Name: TestSwordForward + m_Name: TestSword m_EditorClassIdentifier: Assembly-CSharp::Reset.Items.Weapon itemName: Test Sword permanency: 0 diff --git a/Assets/Items/Weapons/TestSwordForward.asset.meta b/Assets/Items/Weapons/TestSword.asset.meta similarity index 100% rename from Assets/Items/Weapons/TestSwordForward.asset.meta rename to Assets/Items/Weapons/TestSword.asset.meta diff --git a/Assets/Items/Weapons/TestSwordGraph.asset b/Assets/Items/Weapons/TestSwordGraph.asset index 1f3430f..1d83189 100644 --- a/Assets/Items/Weapons/TestSwordGraph.asset +++ b/Assets/Items/Weapons/TestSwordGraph.asset @@ -30,7 +30,9 @@ MonoBehaviour: Spinning Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeDirectionSettings"}]},"_onUpdateList":{"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Combat Grounded","_position":{"x":465.325,"y":71.39201},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_position":{"x":691.2083,"y":335.3326},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"5"},{"_nestedBT":{"_value":2},"executionMode":0,"successEvent":"","_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"}],"_position":{"x":166.0,"y":345.0},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"6"},{"_actionList":{"executionMode":1,"actions":[{"eventName":{"_value":"Exit Combat"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":955.0,"y":-24.0},"$type":"NodeCanvas.StateMachines.ActionState"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"parameter":{"_value":"In - Combat"},"parameterHashID":{},"setTo":{"_value":true},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"}]},"_position":{"x":-394.047,"y":-203.5053},"$type":"NodeCanvas.StateMachines.OnFSMEnter"}],"connections":[{"_condition":{"valueA":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":10.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Melee"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"enteredFromAttack":{"_name":"enteredFromAttack","_id":"2946480c-7213-4bc1-af44-c4dd1f5bf309","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean, + Combat"},"parameterHashID":{},"setTo":{"_value":true},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"},{"valueA":{"_name":"combatType","_targetVariableID":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Core.CombatType, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_position":{"x":-378.047,"y":-258.5053},"$type":"NodeCanvas.StateMachines.OnFSMEnter"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[]},"_position":{"x":878.0,"y":245.0},"$type":"NodeCanvas.StateMachines.OnFSMExit"}],"connections":[{"_condition":{"valueA":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":10.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Holster + Weapon"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Melee"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"enteredFromAttack":{"_name":"enteredFromAttack","_id":"2946480c-7213-4bc1-af44-c4dd1f5bf309","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}}}' _objectReferences: - {fileID: 0} @@ -40,7 +42,7 @@ MonoBehaviour: _version: 3.31 _category: _comments: - _translation: {x: 762, y: 486} - _zoomFactor: 0.9446223 + _translation: {x: 332, y: 433} + _zoomFactor: 1 _haltSerialization: 0 _externalSerializationFile: {fileID: 0} diff --git a/Assets/Player/Attacks/TestMelee/TestAttackBT.asset b/Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset similarity index 99% rename from Assets/Player/Attacks/TestMelee/TestAttackBT.asset rename to Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset index 4a4ea4c..8db9c26 100644 --- a/Assets/Player/Attacks/TestMelee/TestAttackBT.asset +++ b/Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3} - m_Name: TestAttackBT + m_Name: TestMeleeAttack m_EditorClassIdentifier: NodeCanvas::NodeCanvas.BehaviourTrees.BehaviourTree _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":-215.9104,"y":-492.4742},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_action":{"actions":[{"facingDirection":{"label":"Facing Direction","value":{"_value":{"$content":3,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation diff --git a/Assets/Player/Attacks/TestMelee/TestAttackBT.asset.meta b/Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset.meta similarity index 100% rename from Assets/Player/Attacks/TestMelee/TestAttackBT.asset.meta rename to Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset.meta diff --git a/Assets/Player/Attacks/TestMelee/TestShurikenAttack.asset b/Assets/Player/Attacks/TestMelee/TestShurikenAttack.asset new file mode 100644 index 0000000..622c832 --- /dev/null +++ b/Assets/Player/Attacks/TestMelee/TestShurikenAttack.asset @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3} + m_Name: TestShurikenAttack + m_EditorClassIdentifier: NodeCanvas::NodeCanvas.BehaviourTrees.BehaviourTree + _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":-215.9104,"y":-492.4742},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_action":{"actions":[{"facingDirection":{"label":"Facing + Direction","value":{"_value":{"$content":3,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation + Speed","changeValue":{"_value":1},"value":{"_value":0.5},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"moveSpeed":{"label":"Move + Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"parameter":{"_value":"Attack"},"parameterHashID":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"saveAs":{"_name":"_self"},"$type":"NodeCanvas.Tasks.Actions.GetSelf"},{"damage":{"_value":10.0},"source":{"_name":"_self"},"outputDamageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.CreateDamageSource"},{"method":{"_baseInfo":"Reset.Units.PlayerInventory|OnDrawWeapon|System.Void","_paramsInfo":""},"parameters":[],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-742.4763,"y":-265.9589},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_condition":{"eventName":{"_value":"Throw + Weapon"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_position":{"x":-275.0,"y":-230.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"2"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-288.0766,"y":-110.9978},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"3"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-282.1451,"y":1.985321},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"4"},{"_condition":{"eventName":{"_value":"Catch + Weapon"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_position":{"x":28.0,"y":-230.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"5"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":15.9234,"y":-110.9978},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"6"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":21.85489,"y":1.985321},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"7"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":-740.0711,"y":35.02289},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"8"},{"_action":{"actions":[{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"targetElement":{"_name":"_hitCurrentElement"},"$type":"NodeCanvas.Tasks.Actions.AddElementToList`1[[UnityEngine.Collider, + UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-812.0646,"y":149.0206},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"9"},{"_position":{"x":-1697.86,"y":1169.414},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"10"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-1774.285,"y":1622.241},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"11"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1768.353,"y":1735.225},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"12"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1553.285,"y":1576.241},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"13"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-1326.285,"y":1618.241},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"14"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1320.353,"y":1731.225},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"15"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1104.285,"y":1567.241},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"16"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-881.2848,"y":1609.241},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"17"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-875.3533,"y":1723.225},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"18"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-667.2848,"y":1567.241},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"19"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-916.1649,"y":2047.202},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"20"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":-880.1649,"y":2167.202},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"21"},{"_action":{"actions":[{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"targetElement":{"_name":"_hitCurrentElement"},"$type":"NodeCanvas.Tasks.Actions.AddElementToList`1[[UnityEngine.Collider, + UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1018.165,"y":2293.202},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"22"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-1382.271,"y":2063.197},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"23"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":-1346.271,"y":2183.197},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"24"},{"_action":{"actions":[{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"targetElement":{"_name":"_hitCurrentElement"},"$type":"NodeCanvas.Tasks.Actions.AddElementToList`1[[UnityEngine.Collider, + UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1484.271,"y":2308.194},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"25"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"16"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"19"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"18"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"21"},"_targetNode":{"$ref":"22"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"draggedEnemies":{"_propertyPath":"UnitCombat.draggedUnits","_name":"draggedEnemies","_id":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Collider, + UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"modelAnimator":{"_name":"modelAnimator","_id":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator, + UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"hitTargets":{"_value":[],"_name":"hitTargets","_id":"0e35b4ec-628d-4911-9e92-0c05d0b928ec","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Collider, + UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"attackDamageSource":{"_name":"attackDamageSource","_id":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08","$type":"NodeCanvas.Framework.Variable`1[[Reset.Core.DamageSource, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"dragTime":{"_value":1.0,"_name":"dragTime","_id":"3955e75d-5905-4d99-ae5b-4feb671ac8bb","$type":"NodeCanvas.Framework.Variable`1[[System.Single, + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}' + _objectReferences: [] + _graphSource: + _version: 3.31 + _category: + _comments: + _translation: {x: 920, y: 466} + _zoomFactor: 1 + _haltSerialization: 0 + _externalSerializationFile: {fileID: 0} diff --git a/Assets/Player/Attacks/TestMelee/TestShurikenAttack.asset.meta b/Assets/Player/Attacks/TestMelee/TestShurikenAttack.asset.meta new file mode 100644 index 0000000..d556022 --- /dev/null +++ b/Assets/Player/Attacks/TestMelee/TestShurikenAttack.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 541517c63627087419778c30f1ed2102 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/Graphs/PlayerBaseFSM.asset b/Assets/Player/Graphs/PlayerBaseFSM.asset index fdc4124..d9f3fd0 100644 --- a/Assets/Player/Graphs/PlayerBaseFSM.asset +++ b/Assets/Player/Graphs/PlayerBaseFSM.asset @@ -27,7 +27,7 @@ MonoBehaviour: Changing Softness","changeValue":{"_value":2},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"directionSpinningHardness":{"label":"Direction Spinning Hardness","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"directionSpinningSpeed":{"label":"Direction Spinning Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeDirectionSettings"},{"parameter":{"_value":"In - Combat"},"parameterHashID":{},"setTo":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"},{"method":{"_baseInfo":"Reset.Units.PlayerInventory|OnHolsterWeapon|System.Void","_paramsInfo":""},"parameters":[],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}]},"_onUpdateList":{"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Grounded","_position":{"x":452.5244,"y":372.785},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"0"},{"_position":{"x":345.3644,"y":163.8602},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"1"},{"_actionList":{"actions":[{"valueA":{"_name":"newAirMoveSmoothing"},"valueB":{"_value":1.0},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"eventName":{"_value":"Air + Combat"},"parameterHashID":{},"setTo":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"},{"method":{"_baseInfo":"Reset.Units.PlayerInventory|OnHolsterWeapon|System.Void","_paramsInfo":""},"parameters":[],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}]},"_onUpdateList":{"actions":[{"newGravity":{"_value":-0.03},"absolute":{"_value":true},"relativity":{"_value":1.0},"deltaTime":{},"decayRate":{},"$type":"Reset.Units.SetNewGravity"}]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Grounded","_position":{"x":452.5244,"y":372.785},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"0"},{"_position":{"x":345.3644,"y":163.8602},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"1"},{"_actionList":{"actions":[{"valueA":{"_name":"newAirMoveSmoothing"},"valueB":{"_value":1.0},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"eventName":{"_value":"Air Reset Received"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"},{"airDirectionDecay":{"label":"Air Direction Decay","changeValue":{"_value":2},"value":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"gravityMax":{"label":"Gravity Max","changeValue":{"_value":2},"value":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"gravityAcceleration":{"label":"Gravity @@ -97,7 +97,7 @@ MonoBehaviour: Spinning Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeDirectionSettings"},{"facingDirection":{"label":"Facing Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation Speed","changeValue":{"_value":1},"value":{"_value":6.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"moveSpeed":{"label":"Move - Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"}]},"_onUpdateList":{"executionMode":1,"actions":[{"newGravity":{"_value":2.0},"absolute":{},"relativity":{"_value":0.86},"deltaTime":{"_value":true},"decayRate":{"_value":0.3},"$type":"Reset.Units.SetNewGravity"}]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":0.4117647,"g":0.945098,"b":0.254902,"a":1.0},"_name":"Standard + Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"parameter":{"_value":"Jump"},"parameterHashID":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_onUpdateList":{"executionMode":1,"actions":[{"newGravity":{"_value":2.0},"absolute":{},"relativity":{"_value":0.86},"deltaTime":{"_value":true},"decayRate":{"_value":0.3},"$type":"Reset.Units.SetNewGravity"}]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":0.4117647,"g":0.945098,"b":0.254902,"a":1.0},"_name":"Standard Jump","_position":{"x":704.7966,"y":246.1201},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"21"},{"_actionList":{"actions":[{"valueA":{"_name":"newAirMoveSmoothing"},"valueB":{"_value":1.0},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"eventName":{"_value":"Air Reset Received"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":0.3647059,"g":0.3215686,"b":1.0,"a":1.0},"_name":"Airborne Standard Movement","_position":{"x":227.1761,"y":27.24033},"$type":"NodeCanvas.StateMachines.ActionState","$id":"22"},{"_name":"INTERACT @@ -143,23 +143,26 @@ MonoBehaviour: Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation Speed","changeValue":{"_value":1},"value":{"_value":6.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"moveSpeed":{"label":"Move Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"newDirection":{"_value":{"y":1.0}},"absolute":{},"relativity":{},"setRawAsWell":{},"relativeTo":{},"$type":"Reset.Units.SetNewDirection"},{"newSpeed":{"_value":22.0},"absolute":{},"relativity":{},"$type":"Reset.Units.SetNewSpeed"}]},"_onUpdateList":{"executionMode":1,"actions":[{"newGravity":{"_value":2.0},"absolute":{},"relativity":{"_value":0.86},"deltaTime":{"_value":true},"decayRate":{"_value":0.3},"$type":"Reset.Units.SetNewGravity"}]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":0.4117647,"g":0.945098,"b":0.254902,"a":1.0},"_name":"Run - Jump","_position":{"x":1043.577,"y":32.57642},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"33"},{"_actionList":{"executionMode":1,"actions":[{"boolVariable":{"_name":"_enteredFromAttack"},"$type":"NodeCanvas.Tasks.Actions.SetBoolean"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_position":{"x":159.2464,"y":641.9268},"$type":"NodeCanvas.StateMachines.ActionState","$id":"34"},{"_nestedFSM":{"_value":1},"_variablesMap":[{"_targetSubGraphVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309","_canRead":true,"_canWrite":true,"_type":"System.Boolean","_value":{"$content":false,"$type":"System.Boolean"},"_name":"_enteredFromAttack"}],"_name":"Melee - Graph","_position":{"x":24.14069,"y":768.1068},"$type":"NodeCanvas.StateMachines.NestedFSMState","$id":"35"},{"_position":{"x":182.0,"y":860.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"36"},{"_subTree":{"_value":2},"_variablesMap":[{"_targetSubGraphVariableID":"e1cfd0be-7f55-420d-bdd8-e72531fc61ba","_canWrite":true,"_type":"UnityEngine.Transform","_name":"mainCamera"},{"_targetSubGraphVariableID":"c4e68b75-5129-428c-8177-abb7b38986f5","_canWrite":true,"_type":"Reset.Units.PlayerFacingDirection","_value":{"$content":0,"$type":"Reset.Units.PlayerFacingDirection"}}],"_position":{"x":-538.2321,"y":214.793},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subTree":{"_value":3},"_tag":"","_position":{"x":117.8862,"y":296.6888},"_comment":"","$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"resolvedVector2":{"_name":"resolvedMoveVector2","_targetVariableID":"2aee664e-07ba-4e85-9d6a-a1393398789d"},"resolvedVector3":{"_name":"resolvedMoveVector3","_targetVariableID":"5d907161-2896-4b95-bfd2-0ea9426145d7"},"resolvedGravity":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"resolvedSpeed":{"_name":"resolvedSpeed","_targetVariableID":"a81cae83-1fb4-4a2c-bc68-ebf1781c2037"},"resolvedRotation":{"_name":"resolvedRotation","_targetVariableID":"f2ba350a-0fea-438e-9ad3-ed77db853d34"},"$type":"Reset.Units.GetResolvedMovementData"}]},"_position":{"x":70.41211,"y":177.3668},"$type":"NodeCanvas.StateMachines.OnFSMUpdate"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"_color":{"r":0.4980392,"g":1.0,"b":0.9803922,"a":1.0},"_name":"Airborne - Standby","_position":{"x":1509.989,"y":-548.8954},"$type":"NodeCanvas.StateMachines.SuperActionState"},{"_subTree":{"_value":4},"_position":{"x":1126.753,"y":-309.6837},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subFSM":{"_value":5},"_position":{"x":-303.2629,"y":608.6644},"$type":"NodeCanvas.StateMachines.ConcurrentSubFSM"},{"_position":{"x":1205.416,"y":1652.661},"$type":"NodeCanvas.StateMachines.AnyState","$id":"43"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move + Jump","_position":{"x":1043.577,"y":32.57642},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"33"},{"_actionList":{"executionMode":1,"actions":[{"boolVariable":{"_name":"_enteredPrimed"},"$type":"NodeCanvas.Tasks.Actions.SetBoolean"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Enter + State Primed","_position":{"x":200.2543,"y":812.3885},"_comment":"To automatically + attack, cast spell, aim down sights, etc.","$type":"NodeCanvas.StateMachines.ActionState","$id":"34"},{"_nestedFSM":{"_value":1},"_variablesMap":[{"_targetSubGraphVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309","_canRead":true,"_canWrite":true,"_type":"System.Boolean","_value":{"$content":false,"$type":"System.Boolean"},"_name":"_enteredPrimed"}],"_name":"Melee + Graph","_position":{"x":-84.08038,"y":1087.218},"$type":"NodeCanvas.StateMachines.NestedFSMState","$id":"35"},{"_position":{"x":267.7789,"y":999.1106},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"36"},{"_name":"Draw + Weapon","_position":{"x":103.7789,"y":691.1105},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"37"},{"_nestedFSM":{"_value":2},"_position":{"x":-288.2211,"y":885.1105},"$type":"NodeCanvas.StateMachines.NestedFSMState","$id":"38"},{"_subTree":{"_value":3},"_variablesMap":[{"_targetSubGraphVariableID":"e1cfd0be-7f55-420d-bdd8-e72531fc61ba","_canWrite":true,"_type":"UnityEngine.Transform","_name":"mainCamera"},{"_targetSubGraphVariableID":"c4e68b75-5129-428c-8177-abb7b38986f5","_canWrite":true,"_type":"Reset.Units.PlayerFacingDirection","_value":{"$content":0,"$type":"Reset.Units.PlayerFacingDirection"}}],"_position":{"x":-538.2321,"y":214.793},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subTree":{"_value":4},"_tag":"","_position":{"x":117.8862,"y":296.6888},"_comment":"","$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"resolvedVector2":{"_name":"resolvedMoveVector2","_targetVariableID":"2aee664e-07ba-4e85-9d6a-a1393398789d"},"resolvedVector3":{"_name":"resolvedMoveVector3","_targetVariableID":"5d907161-2896-4b95-bfd2-0ea9426145d7"},"resolvedGravity":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"resolvedSpeed":{"_name":"resolvedSpeed","_targetVariableID":"a81cae83-1fb4-4a2c-bc68-ebf1781c2037"},"resolvedRotation":{"_name":"resolvedRotation","_targetVariableID":"f2ba350a-0fea-438e-9ad3-ed77db853d34"},"$type":"Reset.Units.GetResolvedMovementData"}]},"_position":{"x":70.41211,"y":177.3668},"$type":"NodeCanvas.StateMachines.OnFSMUpdate"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"_color":{"r":0.4980392,"g":1.0,"b":0.9803922,"a":1.0},"_name":"Airborne + Standby","_position":{"x":1509.989,"y":-548.8954},"$type":"NodeCanvas.StateMachines.SuperActionState"},{"_subTree":{"_value":5},"_position":{"x":1126.753,"y":-309.6837},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subFSM":{"_value":6},"_position":{"x":-413.2629,"y":548.6644},"$type":"NodeCanvas.StateMachines.ConcurrentSubFSM"},{"_position":{"x":1205.416,"y":1652.661},"$type":"NodeCanvas.StateMachines.AnyState","$id":"45"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation - Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"trigger":{"_value":"Downed"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Downed","_position":{"x":1104.305,"y":1898.447},"$type":"NodeCanvas.StateMachines.ActionState","$id":"44"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move + Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"trigger":{"_value":"Downed"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Downed","_position":{"x":1104.305,"y":1898.447},"$type":"NodeCanvas.StateMachines.ActionState","$id":"46"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation - Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Die","_position":{"x":1291.808,"y":1341.489},"$type":"NodeCanvas.StateMachines.ActionState","$id":"45"},{"_actionList":{"executionMode":1,"actions":[{"position":{},"$type":"Reset.Units.MoveUnit"},{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Respawn","_position":{"x":979.0699,"y":1436.477},"$type":"NodeCanvas.StateMachines.ActionState","$id":"46"},{"_actionList":{"executionMode":1,"actions":[{"$type":"NodeCanvas.Tasks.Actions.DrawReviveBar"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Getting - Picked Up","_position":{"x":951.3801,"y":1772.435},"$type":"NodeCanvas.StateMachines.ActionState","$id":"47"},{"_actionList":{"executionMode":1,"actions":[{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Picked - Up","_position":{"x":770.2754,"y":1594.876},"$type":"NodeCanvas.StateMachines.ActionState","$id":"48"},{"_position":{"x":197.1307,"y":1547.992},"$type":"NodeCanvas.StateMachines.AnyState","$id":"49"},{"_actionList":{"executionMode":1,"actions":[{"control":1,"$type":"NodeCanvas.Tasks.Actions.GraphOwnerControl"}]},"_color":{"r":0.2358491,"g":0.2358491,"b":0.2358491,"a":1.0},"_name":"Not - Owned","_position":{"x":161.1117,"y":1649.867},"$type":"NodeCanvas.StateMachines.ActionState","$id":"50"}],"connections":[{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"23"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"observerLabel":{"_value":"itemdrop"},"outputHitTo":{},"deactivateOnFinish":false,"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple + Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Die","_position":{"x":1291.808,"y":1341.489},"$type":"NodeCanvas.StateMachines.ActionState","$id":"47"},{"_actionList":{"executionMode":1,"actions":[{"position":{},"$type":"Reset.Units.MoveUnit"},{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Respawn","_position":{"x":979.0699,"y":1436.477},"$type":"NodeCanvas.StateMachines.ActionState","$id":"48"},{"_actionList":{"executionMode":1,"actions":[{"$type":"NodeCanvas.Tasks.Actions.DrawReviveBar"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Getting + Picked Up","_position":{"x":951.3801,"y":1772.435},"$type":"NodeCanvas.StateMachines.ActionState","$id":"49"},{"_actionList":{"executionMode":1,"actions":[{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Picked + Up","_position":{"x":770.2754,"y":1594.876},"$type":"NodeCanvas.StateMachines.ActionState","$id":"50"},{"_position":{"x":197.1307,"y":1547.992},"$type":"NodeCanvas.StateMachines.AnyState","$id":"51"},{"_actionList":{"executionMode":1,"actions":[{"control":1,"$type":"NodeCanvas.Tasks.Actions.GraphOwnerControl"}]},"_color":{"r":0.2358491,"g":0.2358491,"b":0.2358491,"a":1.0},"_name":"Not + Owned","_position":{"x":161.1117,"y":1649.867},"$type":"NodeCanvas.StateMachines.ActionState","$id":"52"}],"connections":[{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"23"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"observerLabel":{"_value":"itemdrop"},"outputHitTo":{},"deactivateOnFinish":false,"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple Launch"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple Pull"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"31"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Melee"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"34"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Draw - Weapon"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"35"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.2},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"left-walljump"},"outputHitTo":{"_name":"_wallJumpHit"},"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"checkType":4,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInt"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"left-wallstick"},"outputHitTo":{"_name":"_wallStickHit"},"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"actionName":{"_value":"Stick"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"right-wallstick"},"outputHitTo":{"_name":"_wallStickHit"},"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"actionName":{"_value":"Stick"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"16"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple + Weapon"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"37"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.2},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"left-walljump"},"outputHitTo":{"_name":"_wallJumpHit"},"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"checkType":4,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInt"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"left-wallstick"},"outputHitTo":{"_name":"_wallStickHit"},"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"actionName":{"_value":"Stick"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"right-wallstick"},"outputHitTo":{"_name":"_wallStickHit"},"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"actionName":{"_value":"Stick"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"16"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple Launch"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple Pull"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, @@ -171,16 +174,18 @@ MonoBehaviour: Pull"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"timeout":{"_value":0.2},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"13"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":2.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"18"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkAgainst":2,"checkAgainstValue":{"_name":"_wallJumpHitNormal"},"desiredValue":{"_value":1.0},"tolerance":{"_value":0.5},"considerCameraRotation":{"_value":true},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"valueA":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"checkType":2,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckFloat"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"21"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"22"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"player"},"outputHitTo":{"_name":"_hit"},"deactivateOnFinish":false,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[UnityEngine.GameObject, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[Reset.Units.Player, - Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"Reset.Core.IsInteractable"},"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"27"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":5.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"30"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"27"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"28"},"_targetNode":{"$ref":"29"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"29"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"30"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"31"},"_targetNode":{"$ref":"32"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"33"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"valueA":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"checkType":2,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckFloat"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"33"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"34"},"_targetNode":{"$ref":"35"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Holster - Weapon"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"35"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"35"},"_targetNode":{"$ref":"36"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"36"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Downed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Killed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick - Up Start"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"47"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"45"},"_targetNode":{"$ref":"46"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"46"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick - Up Success"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"47"},"_targetNode":{"$ref":"48"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick - Up Failed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"47"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"48"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"method":{"_baseInfo":"Reset.Units.Player|UnitIsLocal|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":false,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_sourceNode":{"$ref":"49"},"_targetNode":{"$ref":"50"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGroundedOld":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGroundedOld","_id":"619300a4-be8b-4ad4-ba2a-978468094ba2","_debugBoundValue":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"Reset.Core.IsInteractable"},"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"27"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":5.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"30"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"27"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"28"},"_targetNode":{"$ref":"29"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"29"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"30"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"31"},"_targetNode":{"$ref":"32"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"33"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"valueA":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"checkType":2,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckFloat"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"33"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"34"},"_targetNode":{"$ref":"35"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"35"},"_targetNode":{"$ref":"36"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"36"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"combatType","_targetVariableID":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[Reset.Core.CombatType, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"37"},"_targetNode":{"$ref":"35"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"combatType","_targetVariableID":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293"},"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[Reset.Core.CombatType, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"37"},"_targetNode":{"$ref":"38"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"38"},"_targetNode":{"$ref":"36"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Downed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"45"},"_targetNode":{"$ref":"46"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Killed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"45"},"_targetNode":{"$ref":"47"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"46"},"_targetNode":{"$ref":"47"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick + Up Start"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"46"},"_targetNode":{"$ref":"49"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"47"},"_targetNode":{"$ref":"48"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"48"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick + Up Success"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"49"},"_targetNode":{"$ref":"50"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick + Up Failed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"49"},"_targetNode":{"$ref":"46"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"50"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"method":{"_baseInfo":"Reset.Units.Player|UnitIsLocal|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":false,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_sourceNode":{"$ref":"51"},"_targetNode":{"$ref":"52"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGroundedOld":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGroundedOld","_id":"619300a4-be8b-4ad4-ba2a-978468094ba2","_debugBoundValue":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"airJumpsRemaining":{"_name":"airJumpsRemaining","_id":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d","$type":"NodeCanvas.Framework.Variable`1[[System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}}}' _objectReferences: - {fileID: 0} - {fileID: 11400000, guid: 90f9a3d11d7593b42bef44bc1a1bcfd9, type: 2} + - {fileID: 11400000, guid: 92113617971aa4b46a62d8444a22a268, type: 2} - {fileID: 11400000, guid: beebc26815c062d4c80362506bb8ad84, type: 2} - {fileID: 11400000, guid: 40971083372a2534babfd95df6867650, type: 2} - {fileID: 11400000, guid: a15c6b1054c8b5b40ae430307e706008, type: 2} @@ -189,7 +194,7 @@ MonoBehaviour: _version: 3.31 _category: _comments: - _translation: {x: 632, y: -203} + _translation: {x: 103, y: 291} _zoomFactor: 1 _haltSerialization: 0 _externalSerializationFile: {fileID: 0} diff --git a/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx b/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx index bb64650..03b07c0 100644 Binary files a/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx and b/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx differ diff --git a/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx.meta b/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx.meta index 5cf9b20..7d55df1 100644 --- a/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx.meta +++ b/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx.meta @@ -22,6 +22,9 @@ ModelImporter: retargeting quality.\n\t'shoulder.L' has translation animation that will be discarded.\n\t'arm.L' has translation animation that will be discarded.\n\t'shoulder.R' has translation animation that will be discarded.\n\t'arm.R' has translation + animation that will be discarded.\n\nClip 'SwordAttack1' has import animation + warnings that might lower retargeting quality:\nNote: Activate translation + DOF on avatar to improve retargeting quality.\n\t'shoulder.R' has translation animation that will be discarded.\n\nClip 'ShurikenAttack1' has import animation warnings that might lower retargeting quality:\nNote: Activate translation DOF on avatar to improve retargeting quality.\n\t'shoulder.R' has translation @@ -30,23 +33,37 @@ ModelImporter: DOF on avatar to improve retargeting quality.\n\t'shoulder.L' has translation animation that will be discarded.\n\t'arm.L' has translation animation that will be discarded.\n\t'arm.R' has translation animation that will be discarded.\n\nClip - 'PlayerArmature|Run' has import animation warnings that might lower retargeting - quality:\nNote: Activate translation DOF on avatar to improve retargeting quality.\n\t'shoulder.L' - has translation animation that will be discarded.\n\t'arm.L' has translation - animation that will be discarded.\n\t'shoulder.R' has translation animation - that will be discarded.\n\t'arm.R' has translation animation that will be discarded.\n\nClip - 'PlayerArmature|ShurikenAttack1' has import animation warnings that might lower - retargeting quality:\nNote: Activate translation DOF on avatar to improve retargeting - quality.\n\t'shoulder.R' has translation animation that will be discarded.\n\nClip - 'PlayerArmature|ShurikenRun' has import animation warnings that might lower - retargeting quality:\nNote: Activate translation DOF on avatar to improve retargeting - quality.\n\t'shoulder.L' has translation animation that will be discarded.\n\t'arm.L' + 'JumpTakeoff' has import animation warnings that might lower retargeting quality:\nNote: + Activate translation DOF on avatar to improve retargeting quality.\n\t'shoulder.R' has translation animation that will be discarded.\n\t'arm.R' has translation - animation that will be discarded.\n\nClip 'PlayerArmature|TestAnimation' has + animation that will be discarded.\n\nClip 'JumpLand' has import animation warnings + that might lower retargeting quality:\nNote: Activate translation DOF on avatar + to improve retargeting quality.\n\t'shoulder.R' has translation animation that + will be discarded.\n\t'arm.R' has translation animation that will be discarded.\n\nClip + 'PlayerArmature|JumpLand' has import animation warnings that might lower retargeting + quality:\nNote: Activate translation DOF on avatar to improve retargeting quality.\n\t'shoulder.R' + has translation animation that will be discarded.\n\t'arm.R' has translation + animation that will be discarded.\n\nClip 'PlayerArmature|JumpTakeoff' has import animation warnings that might lower retargeting quality:\nNote: Activate - translation DOF on avatar to improve retargeting quality.\n\t'shoulder.L' has - translation animation that will be discarded.\n\t'arm.L' has translation animation - that will be discarded.\n\t'arm.R' has translation animation that will be discarded.\n" + translation DOF on avatar to improve retargeting quality.\n\t'shoulder.R' has + translation animation that will be discarded.\n\t'arm.R' has translation animation + that will be discarded.\n\nClip 'PlayerArmature|Run' has import animation warnings + that might lower retargeting quality:\nNote: Activate translation DOF on avatar + to improve retargeting quality.\n\t'shoulder.L' has translation animation that + will be discarded.\n\t'arm.L' has translation animation that will be discarded.\n\t'shoulder.R' + has translation animation that will be discarded.\n\t'arm.R' has translation + animation that will be discarded.\n\nClip 'PlayerArmature|ShurikenAttack1' + has import animation warnings that might lower retargeting quality:\nNote: + Activate translation DOF on avatar to improve retargeting quality.\n\t'shoulder.R' + has translation animation that will be discarded.\n\nClip 'PlayerArmature|ShurikenRun' + has import animation warnings that might lower retargeting quality:\nNote: + Activate translation DOF on avatar to improve retargeting quality.\n\t'shoulder.L' + has translation animation that will be discarded.\n\t'arm.L' has translation + animation that will be discarded.\n\t'arm.R' has translation animation that + will be discarded.\n\nClip 'PlayerArmature|SwordAttack1' has import animation + warnings that might lower retargeting quality:\nNote: Activate translation + DOF on avatar to improve retargeting quality.\n\t'shoulder.R' has translation + animation that will be discarded.\n" animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 @@ -276,41 +293,12 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: PlayerArmature|RandomAnimation - takeName: PlayerArmature|RandomAnimation - internalID: 2332012969634944138 - firstFrame: 0 - lastFrame: 28 - 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: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - serializedVersion: 16 name: PlayerArmature|Run takeName: PlayerArmature|Run internalID: 199366884485362299 firstFrame: 0 - lastFrame: 23 + lastFrame: 59 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -339,36 +327,7 @@ ModelImporter: takeName: PlayerArmature|SwordAttack1 internalID: 6027101442698526453 firstFrame: 0 - lastFrame: 19 - 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: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: PlayerArmature|TestAnimation - takeName: PlayerArmature|TestAnimation - internalID: -1159425392147737724 - firstFrame: 0 - lastFrame: 23 + lastFrame: 119 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -426,7 +385,7 @@ ModelImporter: takeName: PlayerArmature|ShurikenAttack1 internalID: -8421144322236093334 firstFrame: 0 - lastFrame: 71 + lastFrame: 118 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -455,7 +414,7 @@ ModelImporter: takeName: PlayerArmature|ShurikenRun internalID: -9063138054437102302 firstFrame: 0 - lastFrame: 23 + lastFrame: 59 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -484,7 +443,7 @@ ModelImporter: takeName: PlayerArmature|ShurkenIdle internalID: 1615686163547640338 firstFrame: 0 - lastFrame: 0 + lastFrame: 59 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -509,11 +468,11 @@ ModelImporter: maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 - serializedVersion: 16 - name: Idle - takeName: Idle - internalID: -8215664320783465972 + name: PlayerArmature|Idle + takeName: PlayerArmature|Idle + internalID: 1469903858603054580 firstFrame: 0 - lastFrame: 5 + lastFrame: 239 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -537,6 +496,122 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: PlayerArmature|SwordIdle + takeName: PlayerArmature|SwordIdle + internalID: -2942889290892704011 + firstFrame: 0 + lastFrame: 59 + 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: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: PlayerArmature|JumpLand + takeName: PlayerArmature|JumpLand + internalID: -1562877158926512194 + firstFrame: 0 + lastFrame: 101 + 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: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: PlayerArmature|JumpMidair + takeName: PlayerArmature|JumpMidair + internalID: -4775482579810956447 + firstFrame: 0 + lastFrame: 119 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: PlayerArmature|JumpTakeoff + takeName: PlayerArmature|JumpTakeoff + internalID: -6378134520009971463 + firstFrame: 0 + lastFrame: 19 + 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: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller b/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller index 7f6edcc..f2f9e85 100644 --- a/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller +++ b/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller @@ -9,15 +9,15 @@ BlendTree: m_Name: Blend Tree m_Childs: - serializedVersion: 2 - m_Motion: {fileID: 4646074752401857823, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Motion: {fileID: 1615686163547640338, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} m_Threshold: 0 m_Position: {x: 0, y: 0} - m_TimeScale: 0.001 + m_TimeScale: 1 m_CycleOffset: 0 m_DirectBlendParameter: Move Direction X m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 5522812681064789136, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Motion: {fileID: 199366884485362299, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} m_Threshold: 0.5155598 m_Position: {x: 0, y: 0} m_TimeScale: 0.5 @@ -25,10 +25,10 @@ BlendTree: m_DirectBlendParameter: Move Direction X m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 5522812681064789136, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Motion: {fileID: 199366884485362299, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} m_Threshold: 1 m_Position: {x: 0, y: 0} - m_TimeScale: 1.3 + m_TimeScale: 1.8 m_CycleOffset: 0 m_DirectBlendParameter: Move Direction X m_Mirror: 0 @@ -39,6 +39,31 @@ BlendTree: m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1101 &-9011342763023408979 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3231053178844433393} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.29035226 + m_TransitionOffset: 0.030595282 + m_ExitTime: 0.0000000057048606 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 1 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-7831893988088785558 AnimatorStateMachine: serializedVersion: 6 @@ -50,40 +75,49 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -5807180696605908168} - m_Position: {x: 380, y: 240, z: 0} - - serializedVersion: 1 - m_State: {fileID: -3460776153395501506} - m_Position: {x: 240, y: -10, z: 0} - - serializedVersion: 1 - m_State: {fileID: -7139813020054202934} - m_Position: {x: 500, y: -10, z: 0} + m_Position: {x: 280, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -5118064861454726822} m_Position: {x: 380, y: 110, z: 0} - m_ChildStateMachines: [] + - serializedVersion: 1 + m_State: {fileID: 6805044894854728404} + m_Position: {x: 380, y: 370, z: 0} + m_ChildStateMachines: + - serializedVersion: 1 + m_StateMachine: {fileID: -2639459127390133419} + m_Position: {x: 670, y: 110, z: 0} + - serializedVersion: 1 + m_StateMachine: {fileID: -1683434005185618408} + m_Position: {x: 670, y: 370, z: 0} + - serializedVersion: 1 + m_StateMachine: {fileID: 3643258136328604056} + m_Position: {x: 550, y: 240, z: 0} m_AnyStateTransitions: - - {fileID: 2256285109070000650} - - {fileID: -754458811588506750} + - {fileID: -568376608702641341} + - {fileID: -2924008851715793263} m_EntryTransitions: [] - m_StateMachineTransitions: {} + m_StateMachineTransitions: + - first: {fileID: -1683434005185618408} + second: [] m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 390, y: -130, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_AnyStatePosition: {x: 790, y: 240, z: 0} + m_EntryPosition: {x: 30, y: 250, z: 0} + m_ExitPosition: {x: 1000, y: 380, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -5807180696605908168} ---- !u!1102 &-7139813020054202934 +--- !u!1102 &-7517949062573905506 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AttackSword2 - m_Speed: 1 + m_Name: PlayerArmature|JumpTakeoff + m_Speed: 1.5 m_CycleOffset: 0 m_Transitions: - - {fileID: -2656076906570638267} + - {fileID: 1464555850770191113} + - {fileID: 1003839303391055649} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -93,7 +127,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 317640415490248476, guid: af57850141d47244a8c7c021d10baeed, type: 3} + m_Motion: {fileID: -6378134520009971463, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -106,11 +140,14 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle / Run + m_Name: Standard Locomotion m_Speed: 1 m_CycleOffset: 0 m_Transitions: - {fileID: -5380831712939141202} + - {fileID: 8381557632365045786} + - {fileID: 383982764081638418} + - {fileID: -9011342763023408979} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -137,6 +174,9 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: In Combat m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: Melee Combat + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5118064861454726822} m_Solo: 0 @@ -158,11 +198,12 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle / Run with Sword + m_Name: Melee Locomotion m_Speed: 1 m_CycleOffset: 0 m_Transitions: - {fileID: -3039493824836840586} + - {fileID: -2657416407466679892} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -178,18 +219,18 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-3460776153395501506 +--- !u!1102 &-5036211848913027711 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AttackSword1 + m_Name: Melee Attack 1 m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 8384401300724406585} + - {fileID: 5964194081600354834} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -199,7 +240,133 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7656224139910124122, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Motion: {fileID: 6027101442698526453, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-4127415286275366694 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8285867021611363252} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9481268 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3672400458932457120 +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: Grounded + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3303347849624952746} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.0786407 + m_TransitionOffset: 0.0042103813 + m_ExitTime: 0.87394965 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 3 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3578693359707166933 +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.91549295 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-3303347849624952746 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerArmature|JumpLand + m_Speed: 5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5432475786206138401} + m_StateMachineBehaviours: [] + 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: -1562877158926512194, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3231053178844433393 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerArmature|JumpMidair + m_Speed: 1.5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3672400458932457120} + m_StateMachineBehaviours: [] + 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: -4775482579810956447, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -219,7 +386,7 @@ AnimatorStateTransition: m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5807180696605908168} m_Solo: 0 - m_Mute: 0 + m_Mute: 1 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.43 @@ -230,29 +397,7 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-2656076906570638267 -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: -5118064861454726822} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.89830506 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-754458811588506750 +--- !u!1101 &-2924008851715793263 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -263,11 +408,108 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: Attack m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: RandomCombatNumber - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7139813020054202934} + - m_ConditionMode: 1 + m_ConditionEvent: Ranged Combat + m_EventTreshold: 0 + m_DstStateMachine: {fileID: -1683434005185618408} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 1 + 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!1101 &-2657416407466679892 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: -2639459127390133419} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9481268 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-2639459127390133419 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Melee Attacks + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5036211848913027711} + m_Position: {x: 410, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 1070, y: 70, z: 0} + m_ParentStateMachinePosition: {x: 770, y: 120, z: 0} + m_DefaultState: {fileID: -5036211848913027711} +--- !u!1107 &-1683434005185618408 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ranged Attacks + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8285867021611363252} + m_Position: {x: 390, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8285867021611363252} +--- !u!1101 &-568376608702641341 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Attack + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: Melee Combat + m_EventTreshold: 0 + m_DstStateMachine: {fileID: -2639459127390133419} + m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -319,6 +561,36 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Melee Combat + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Ranged Combat + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Gravity + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Jump + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Grounded + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -332,7 +604,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &2256285109070000650 +--- !u!1101 &383982764081638418 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -341,25 +613,207 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Attack - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: RandomCombatNumber + m_ConditionEvent: Jump m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -3460776153395501506} + m_DstState: {fileID: -7517949062573905506} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.09 + m_TransitionDuration: 0.26 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0.8558567 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 - m_OrderedInterruption: 0 + m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1003839303391055649 +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: Grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3303347849624952746} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.033032164 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1464555850770191113 +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: -3231053178844433393} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &3643258136328604056 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New StateMachine + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3303347849624952746} + m_Position: {x: 670, y: 30, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3231053178844433393} + m_Position: {x: 390, y: -30, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7517949062573905506} + m_Position: {x: 110, y: 30, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 20, y: -80, z: 0} + m_EntryPosition: {x: 610, y: 210, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 360, y: -150, z: 0} + m_DefaultState: {fileID: -3303347849624952746} +--- !u!206 &4305200882559291722 +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: 1615686163547640338, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Move Direction X + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -9063138054437102302, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Threshold: 0.49468693 + m_Position: {x: 0, y: 0} + m_TimeScale: 0.5 + m_CycleOffset: 0 + m_DirectBlendParameter: Move Direction X + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -9063138054437102302, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1.3 + m_CycleOffset: 0 + m_DirectBlendParameter: Move Direction X + m_Mirror: 0 + m_BlendParameter: Move Direction X + m_BlendParameterY: Move Direction X + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 0 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1101 &5432475786206138401 +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: -5807180696605908168} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.08 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5964194081600354834 +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: -5118064861454726822} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.68421054 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6805044894854728404 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ranged Locomotion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4127415286275366694} + m_StateMachineBehaviours: [] + 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: 4305200882559291722} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!206 &7068036982611019673 BlendTree: m_ObjectHideFlags: 1 @@ -369,10 +823,10 @@ BlendTree: m_Name: Blend Tree m_Childs: - serializedVersion: 2 - m_Motion: {fileID: -8215664320783465972, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Motion: {fileID: 1469903858603054580, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} m_Threshold: 0 m_Position: {x: 0, y: 0} - m_TimeScale: 0.01 + m_TimeScale: 1 m_CycleOffset: 0 m_DirectBlendParameter: Move Direction X m_Mirror: 0 @@ -399,25 +853,58 @@ BlendTree: m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 0 ---- !u!1101 &8384401300724406585 +--- !u!1102 &8285867021611363252 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerArmature|ShurikenAttack1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3578693359707166933} + m_StateMachineBehaviours: [] + 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: -8421144322236093334, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8381557632365045786 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: In Combat + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: Ranged Combat + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -5118064861454726822} + m_DstState: {fileID: 6805044894854728404} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.5332681 - m_TransitionOffset: 0.09979316 - m_ExitTime: 1.2094368 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.64705884 m_HasExitTime: 1 m_HasFixedDuration: 1 - m_InterruptionSource: 2 + m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 diff --git a/Assets/Player/Objects/Player.prefab b/Assets/Player/Objects/Player.prefab index d1ed28e..1045485 100644 --- a/Assets/Player/Objects/Player.prefab +++ b/Assets/Player/Objects/Player.prefab @@ -106,9 +106,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} insertIndex: -1 addedObject: {fileID: 2240486157433394837} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} - insertIndex: -1 - addedObject: {fileID: 7979218792257437996} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} insertIndex: -1 addedObject: {fileID: 6981901914719128507} @@ -118,6 +115,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} insertIndex: -1 addedObject: {fileID: 8174809639718565000} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} + insertIndex: -1 + addedObject: {fileID: -1822725660344134137} m_SourcePrefab: {fileID: 100100000, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} --- !u!1 &2370652034083115105 stripped GameObject: @@ -726,7 +726,8 @@ MonoBehaviour: Information":{"_value":{},"_name":"Combat Information","_id":"a15396c3-5ba0-4789-b5c5-39a6cfea1943","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator, ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"inGoHard":{"_propertyPath":"PlayerMeter.inGoHard","_name":"inGoHard","_id":"dc9f60c8-856e-4970-bf11-25745eff1201","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"pickupTarget":{"_name":"pickupTarget","_id":"45e90651-1912-40ef-b4fc-6c27d00d0ef0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject, - UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}' + UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"combatType":{"_propertyPath":"Reset.Units.PlayerCombat.currentCombatType","_name":"combatType","_id":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293","$type":"NodeCanvas.Framework.Variable`1[[Reset.Core.CombatType, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}' _objectReferences: - {fileID: 0} - {fileID: 8505492416078151957, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3} @@ -769,6 +770,9 @@ MonoBehaviour: - _json: '{"_name":"pickupTarget","_id":"45e90651-1912-40ef-b4fc-6c27d00d0ef0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}' _references: [] + - _json: '{"_propertyPath":"Reset.Units.PlayerCombat.currentCombatType","_name":"combatType","_id":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293","$type":"NodeCanvas.Framework.Variable`1[[Reset.Core.CombatType, + Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}' + _references: [] --- !u!114 &7789251368961845429 MonoBehaviour: m_ObjectHideFlags: 0 @@ -892,19 +896,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &7979218792257437996 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2370652034083115105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7719da98d07bb4848a78904f6da4c355, type: 3} - m_Name: - m_EditorClassIdentifier: Core::UnitCombat - ShowTopMostFoldoutHeaderGroup: 1 --- !u!114 &6981901914719128507 MonoBehaviour: m_ObjectHideFlags: 0 @@ -952,8 +943,23 @@ MonoBehaviour: headRotOffset: {x: 0, y: 0, z: 0} neckRotOffset: {x: 0, y: 0, z: 0} rotationLimit: {x: 0, y: 0, z: 0} + moveSpeed: 0 rightHand: {fileID: 3240225853279553900} leftHand: {fileID: 9074315924083793253} +--- !u!114 &-1822725660344134137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2370652034083115105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e2b74fc5d4eb483bb4e637c3be6353b2, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Reset.Units.PlayerCombat + ShowTopMostFoldoutHeaderGroup: 1 + currentCombatType: 0 --- !u!4 &3240225853279553900 stripped Transform: m_CorrespondingSourceObject: {fileID: 58773947878614108, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3} diff --git a/Assets/Scenes/CombatTest.unity b/Assets/Scenes/CombatTest.unity index 7f05378..9d3b8a0 100644 --- a/Assets/Scenes/CombatTest.unity +++ b/Assets/Scenes/CombatTest.unity @@ -14294,25 +14294,13 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} - propertyPath: m_LocalScale.x - value: 0.43432 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} - propertyPath: m_LocalScale.y - value: 0.43432 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} - propertyPath: m_LocalScale.z - value: 0.43432 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalPosition.x - value: -42.425 + value: -43.151516 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalPosition.y - value: 2.1383 + value: 4.768547 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalPosition.z @@ -14320,19 +14308,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.9639052 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0.26624578 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14344,12 +14332,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -329.118 objectReference: {fileID: 0} + - target: {fileID: -1461304994638716399, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: b623c7e598affa24d85636c38d9535c0, type: 2} - target: {fileID: 919132149155446097, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} propertyPath: m_Name value: TestShuriken objectReference: {fileID: 0} + - target: {fileID: 3219882101630006985, guid: 5d707e1afa9e06a4cbcd1c860d0cfa37, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: b623c7e598affa24d85636c38d9535c0, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -19666,6 +19662,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1725580269} m_CullTransparentMesh: 1 +--- !u!1001 &1729521885 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalPosition.x + value: -45.786617 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalPosition.y + value: 0.18939297 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalPosition.z + value: 37.008987 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: b623c7e598affa24d85636c38d9535c0, type: 2} + - target: {fileID: 919132149155446097, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} + propertyPath: m_Name + value: TestSword + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3} --- !u!43 &1748470146 Mesh: m_ObjectHideFlags: 0 @@ -20404,6 +20461,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -1822725660344134137, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3} + propertyPath: currentCombatType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1984557078135320917, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3} + propertyPath: meleeWeapon + value: + objectReference: {fileID: 11400000, guid: 18020bf6266740d4dab9dbcae8073424, type: 2} - target: {fileID: 2370652034083115105, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3} propertyPath: m_Name value: Player @@ -24384,3 +24449,4 @@ SceneRoots: - {fileID: 8269163115880052268} - {fileID: 1821824113} - {fileID: 1290093098} + - {fileID: 1729521885} diff --git a/Assets/Scripts/Items/Weapon.cs b/Assets/Scripts/Items/Weapon.cs index 007d6bd..476fc3b 100644 --- a/Assets/Scripts/Items/Weapon.cs +++ b/Assets/Scripts/Items/Weapon.cs @@ -1,30 +1,45 @@ using System; using Drawing; using NodeCanvas.StateMachines; +using Reset.Core; using Reset.Units; using UnityEngine; namespace Reset.Items{ [CreateAssetMenu(menuName = "Reset/Weapon", fileName = "New Weapon")] public class Weapon : Item, IEquipable{ + public CombatType combatType; + public GameObject weaponModel; public NodeCanvas.Framework.Graph weaponFSM; public Vector3 handPositionOffset; public Vector3 handRotationOffset; - void Awake(){ - - } + public string actorScriptName; + public void AddActorScript(){ + // Type actorScript = Type.GetType("ShurikenActor"); + // + // if (actorScript == null) { + // Debug.LogError($"The WeaponActor supplied was not found for {itemName}. Does script named '{actorScriptName + ",Assembly-UnityScript"}' exist?"); + // return; + // } + + WeaponActor weaponActor = PlayerManager.Player.AddComponent() as WeaponActor; + + weaponActor.relatedObject = PlayerManager.Player.GetComponent().GetCurrentWeaponItem(); + weaponActor.relatedWeapon = this; + } + public override void DrawItemInfo(Vector3 position){ - Debug.Log("hiuh"); Draw.ingame.Label2D(position + Vector3.up * 1.6f, "Damage goes here"); Draw.ingame.Label2D(position + Vector3.up * 1.35f, "Speed goes here"); } public GameObject PlaceInHand(){ return GameObject.Instantiate(weaponModel); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Items/WeaponActor.cs b/Assets/Scripts/Items/WeaponActor.cs new file mode 100644 index 0000000..5ed06ea --- /dev/null +++ b/Assets/Scripts/Items/WeaponActor.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Reset.Items{ + public abstract class WeaponActor : MonoBehaviour{ + public Dictionary weaponEvents = new Dictionary(); + + public Weapon relatedWeapon; + public GameObject relatedObject; + + public void RegisterWeaponEvent(string calledName, Action action){ + weaponEvents.Add(calledName, action); + } + + public void DoWeaponEvent(string eventName){ + if (weaponEvents.ContainsKey(eventName)) { + weaponEvents[eventName].Invoke(); + + return; + } + + Debug.LogError($"There is no event by name of {eventName} in {name}"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Items/WeaponActor.cs.meta b/Assets/Scripts/Items/WeaponActor.cs.meta new file mode 100644 index 0000000..ed5285e --- /dev/null +++ b/Assets/Scripts/Items/WeaponActor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7db5375a3b8f4212b407f4f8f41a8870 +timeCreated: 1768000398 \ No newline at end of file diff --git a/Assets/Scripts/Items/Weapons.meta b/Assets/Scripts/Items/Weapons.meta new file mode 100644 index 0000000..5523fbd --- /dev/null +++ b/Assets/Scripts/Items/Weapons.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 70ef6ecafdc149559e4cb6e19787e719 +timeCreated: 1768000824 \ No newline at end of file diff --git a/Assets/Scripts/Items/Weapons/ShurikenActor.cs b/Assets/Scripts/Items/Weapons/ShurikenActor.cs new file mode 100644 index 0000000..06d04bc --- /dev/null +++ b/Assets/Scripts/Items/Weapons/ShurikenActor.cs @@ -0,0 +1,17 @@ + +using UnityEngine; + +namespace Reset.Items{ + public class ShurikenActor : WeaponActor{ + public GameObject bladeRing; + + void Start(){ + Debug.Log(GetType()); + bladeRing = relatedObject.transform.GetChild(0).gameObject; + } + + void Update(){ + bladeRing.transform.Rotate(Vector3.up * (180f * Time.deltaTime)); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Items/Weapons/ShurikenActor.cs.meta b/Assets/Scripts/Items/Weapons/ShurikenActor.cs.meta new file mode 100644 index 0000000..abe648c --- /dev/null +++ b/Assets/Scripts/Items/Weapons/ShurikenActor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7d1d2a1a617247459542ec29b4f50785 +timeCreated: 1768002409 \ No newline at end of file diff --git a/Assets/Scripts/Units/Combat/CombatType.cs b/Assets/Scripts/Units/Combat/CombatType.cs new file mode 100644 index 0000000..0e563d9 --- /dev/null +++ b/Assets/Scripts/Units/Combat/CombatType.cs @@ -0,0 +1,6 @@ +namespace Reset.Core{ + public enum CombatType{ + Melee = 0, + Ranged = 1 + } +} \ No newline at end of file diff --git a/Assets/Scripts/Units/Combat/CombatType.cs.meta b/Assets/Scripts/Units/Combat/CombatType.cs.meta new file mode 100644 index 0000000..f62488d --- /dev/null +++ b/Assets/Scripts/Units/Combat/CombatType.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: eb3157c88aaa41f8b0b20d4690bb1459 +timeCreated: 1767997846 \ No newline at end of file diff --git a/Assets/Scripts/Units/PlayerCombat.cs b/Assets/Scripts/Units/PlayerCombat.cs new file mode 100644 index 0000000..28bd619 --- /dev/null +++ b/Assets/Scripts/Units/PlayerCombat.cs @@ -0,0 +1,7 @@ +using Reset.Core; + +namespace Reset.Units{ + public class PlayerCombat : UnitCombat{ + public CombatType currentCombatType; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Units/PlayerCombat.cs.meta b/Assets/Scripts/Units/PlayerCombat.cs.meta new file mode 100644 index 0000000..5a3b3e9 --- /dev/null +++ b/Assets/Scripts/Units/PlayerCombat.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e2b74fc5d4eb483bb4e637c3be6353b2 +timeCreated: 1767998040 \ No newline at end of file diff --git a/Assets/Scripts/Units/PlayerInventory.cs b/Assets/Scripts/Units/PlayerInventory.cs index 664f6ea..54fdb4d 100644 --- a/Assets/Scripts/Units/PlayerInventory.cs +++ b/Assets/Scripts/Units/PlayerInventory.cs @@ -36,10 +36,18 @@ namespace Reset.Units{ currentWeaponItem.transform.rotation = (Unit.Animation as PlayerAnimation).rightHand.rotation * Quaternion.Euler(meleeWeapon.handRotationOffset); Debug.Log(currentWeapon); + + // + (currentWeapon as Weapon).AddActorScript(); + // // Unit.Graph.SendEvent("Draw Weapon"); } + public GameObject GetCurrentWeaponItem(){ + return currentWeaponItem; + } + public void OnHolsterWeapon(){ Destroy(currentWeaponItem); currentWeaponItem = null; diff --git a/Assets/Scripts/Units/UnitAnimation.cs b/Assets/Scripts/Units/UnitAnimation.cs index 366f5e4..22f9e49 100644 --- a/Assets/Scripts/Units/UnitAnimation.cs +++ b/Assets/Scripts/Units/UnitAnimation.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using UnityEngine.Rendering; namespace Reset.Units{ public class UnitAnimation : UnitComponent{ @@ -30,6 +31,11 @@ namespace Reset.Units{ // } modelAnimator.SetFloat("Move Direction X", moveSpeed); + modelAnimator.SetFloat("Gravity", Unit.Movement.resolvedMovement.gravity); + + modelAnimator.SetBool("Grounded", Physics.Raycast(transform.position, Vector3.down, .2f)); + + Debug.Log(Unit.Movement.GetGrounded()); } private void LateUpdate(){ diff --git a/Assets/Scripts/Units/UnitMovementHandler.cs b/Assets/Scripts/Units/UnitMovementHandler.cs index 544b55b..131d873 100644 --- a/Assets/Scripts/Units/UnitMovementHandler.cs +++ b/Assets/Scripts/Units/UnitMovementHandler.cs @@ -359,6 +359,10 @@ namespace Reset.Units{ public Quaternion GetResolvedRotation(){ return resolvedMovement.rotation; } + + public bool GetGrounded(){ + return controller.isGrounded; + } [Button("Initialize Settings", ButtonHeight = 30), PropertySpace(10,5 )] void InitAllSettings(){ diff --git a/Documents/Characters/CharacterModelSimplified.blend b/Documents/Characters/CharacterModelSimplified.blend index 90419a6..8f386cd 100644 Binary files a/Documents/Characters/CharacterModelSimplified.blend and b/Documents/Characters/CharacterModelSimplified.blend differ diff --git a/Documents/Characters/CharacterModelSimplified.blend1 b/Documents/Characters/CharacterModelSimplified.blend1 index d1ec467..56f7414 100644 Binary files a/Documents/Characters/CharacterModelSimplified.blend1 and b/Documents/Characters/CharacterModelSimplified.blend1 differ diff --git a/Documents/Weapons/TestShuriken.blend b/Documents/Weapons/TestShuriken.blend index bac817a..daefd34 100644 Binary files a/Documents/Weapons/TestShuriken.blend and b/Documents/Weapons/TestShuriken.blend differ diff --git a/Documents/Weapons/TestShuriken.blend1 b/Documents/Weapons/TestShuriken.blend1 index 6791db7..5580320 100644 Binary files a/Documents/Weapons/TestShuriken.blend1 and b/Documents/Weapons/TestShuriken.blend1 differ diff --git a/Documents/Weapons/TestShuriken.fbx b/Documents/Weapons/TestShuriken.fbx index 1f98755..1e3afec 100644 Binary files a/Documents/Weapons/TestShuriken.fbx and b/Documents/Weapons/TestShuriken.fbx differ