thunderstargames/project-reset
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added: initial combat mechanics

Browse Source
This commit is contained in:
Chris
2025-10-03 13:29:46 -04:00
parent 5b911f9f47
commit d787353706
17 changed files with 910 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Player/Attacks.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0c4253322f3060d448ffccff9dff9ce5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Player/Attacks/TestMelee.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd7a3e95b4c08a349a6e22ec787019f7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

240
Assets/Player/Attacks/TestMelee/TestAttackAnimation.anim Normal file
View File

@@ -0,0 +1,240 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TestAttackAnimation
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 15.833451}
tangentMode: 0
weightedMode: 2
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.22824594}
- serializedVersion: 3
time: 0.3
value: {x: -0.22694683, y: 0, z: 2}
inSlope: {x: 0, y: 0, z: 8.869481}
outSlope: {x: 0, y: 0, z: 8.869481}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.10294038}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.2916451}
- serializedVersion: 3
time: 0.6666667
value: {x: 0.22854862, y: 0, z: 3.9023747}
inSlope: {x: 0, y: 0, z: 2.0694804}
outSlope: {x: 0, y: 0, z: 2.0694804}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.34429464}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33774966}
- serializedVersion: 3
time: 0.73333335
value: {x: 0.20423351, y: 0, z: 4}
inSlope: {x: -0.6615972, y: 0, z: 0.83029777}
outSlope: {x: -0.6615972, y: 0, z: 10.744204}
tangentMode: 0
weightedMode: 1
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.32795736}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.2730964}
- serializedVersion: 3
time: 0.95
value: {x: 0.054914713, y: 0, z: 4.9972997}
inSlope: {x: 0, y: 0, z: 0.33510503}
outSlope: {x: 0, y: 0, z: 0.33510503}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.96666664
value: {x: 0.054914713, y: 0, z: 5}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.96666664
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 1
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: -0.22694683
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 2
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0.22854862
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.95
value: 0.054914713
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: Infinity
tangentMode: 1
weightedMode: 2
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 15.833451
tangentMode: 1
weightedMode: 2
inWeight: 0.33333334
outWeight: 0.22824594
- serializedVersion: 3
time: 0.3
value: 2
inSlope: 8.869481
outSlope: 8.869481
tangentMode: 0
weightedMode: 3
inWeight: 0.10294038
outWeight: 0.2907924
- serializedVersion: 3
time: 0.73333335
value: 4
inSlope: 0.83029777
outSlope: 10.744204
tangentMode: 1
weightedMode: 0
inWeight: 0.2286407
outWeight: 0.2730964
- serializedVersion: 3
time: 0.96666664
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Player/Attacks/TestMelee/TestAttackAnimation.anim.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eeee1af4a5afe084b8ccb8129e334e39
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

41
Assets/Player/Attacks/TestMelee/TestAttackBT.asset Normal file
View File

@@ -0,0 +1,41 @@
%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: TestAttackBT
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"},{"valueA":{"_name":"_hits"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`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]]"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-790.4761,"y":-277.9589},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_action":{"waitTime":{"_value":0.1},"$type":"NodeCanvas.Tasks.Actions.Wait"},"_position":{"x":-536.0,"y":-273.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"2"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{},"ignoreLayers":{"_value":{"value":127}},"width":{},"size":{"_value":{"z":1.0}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"_hits"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-395.0,"y":-206.0},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"3"},{"targetList":{"_name":"_hits"},"current":{"_type":"System.Object","_name":"_hitCurrentElement"},"storeIndex":{"_name":""},"maxIteration":{"_value":-1},"_position":{"x":-387.0,"y":-83.0},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"4"},{"_action":{"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]]"},"_position":{"x":-469.0,"y":43.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_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"},{"valueA":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`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]]"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-178.0,"y":-272.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{},"offset":{},"ignoreLayers":{},"width":{},"size":{},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"_hits"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":44.0,"y":-210.0},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"7"},{"targetList":{"_name":"_hits"},"current":{"_type":"System.Object","_name":"_hitCurrentElement"},"storeIndex":{"_name":""},"maxIteration":{"_value":-1},"_position":{"x":51.0,"y":-89.0},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"8"},{"_action":{"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]]"},"_position":{"x":-31.0,"y":37.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"9"},{"_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"},{"valueA":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`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]]"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":254.0,"y":-279.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"10"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{},"offset":{},"ignoreLayers":{},"width":{},"size":{},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"_hits"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":492.0,"y":-214.0},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"11"},{"targetList":{"_name":"_hits"},"current":{"_type":"System.Object","_name":"_hitCurrentElement"},"storeIndex":{"_name":""},"maxIteration":{"_value":-1},"_position":{"x":499.0,"y":-93.0},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"12"},{"_action":{"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]]"},"_position":{"x":417.0,"y":33.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"13"},{"_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"},{"valueA":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`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]]"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":710.0,"y":-291.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"14"}],"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":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$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]]"}}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
_objectReferences: []
_graphSource:
_version: 3.31
_category:
_comments:
_translation: {x: 915.1353, y: 912.36}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

8
Assets/Player/Attacks/TestMelee/TestAttackBT.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 37c6c49bd4cf00b47b46dcfe8f9a6a7b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

17
Assets/Player/Graphs/PlayerBaseFSM.asset
View File

File diff suppressed because one or more lines are too long

156
Assets/Player/MainAnimationController.controller Normal file
View File

@@ -0,0 +1,156 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-6707289131890740283
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.74137926
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-3075664961769696025
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New State
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1155619037384262416}
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-1155619037384262416
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: 5446782856209714132}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MainAnimationController
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Attack
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 5102643680451129248}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &5102643680451129248
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 5446782856209714132}
m_Position: {x: 440, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -3075664961769696025}
m_Position: {x: 230, y: 190, 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: 760, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -3075664961769696025}
--- !u!1102 &5446782856209714132
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TestAttackAnimation
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -6707289131890740283}
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: 7400000, guid: eeee1af4a5afe084b8ccb8129e334e39, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

8
Assets/Player/MainAnimationController.controller.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f7630421e96f8104ab931a97746bbb7b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

29
Assets/Player/Models/MaruTestModel/MaruTestController.controller
View File

@@ -219,6 +219,32 @@ BlendTree:
m_UseAutomaticThresholds: 0
m_NormalizedBlendValues: 0
m_BlendType: 0
--- !u!1102 &-244813098107653744
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TestAttackAnimation
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 7400000, guid: eeee1af4a5afe084b8ccb8129e334e39, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -305,6 +331,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -2756226681918022522}
m_Position: {x: 50, y: 380, z: 0}
- serializedVersion: 1
m_State: {fileID: -244813098107653744}
m_Position: {x: 440, y: 30, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

222
Assets/Player/Objects/Player.prefab
View File

@@ -133,6 +133,8 @@ GameObject:
- component: {fileID: 323016802234025917}
- component: {fileID: -6606553239814530074}
- component: {fileID: 6546916578030478377}
- component: {fileID: 8583102325603564116}
- component: {fileID: 5070944620793365545}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
@@ -149,11 +151,12 @@ Transform:
m_GameObject: {fileID: 2757828562731694833}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: 0, z: -10}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2655796284435897345}
- {fileID: 4019564870895517434}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2538182172493791937
@@ -264,12 +267,12 @@ MonoBehaviour:
defaultSmoothing: 1
defaultEasing: 2
moveSpeed:
targetValue: 15
currentValue: 15
targetValue: 8
currentValue: 8
targetSmoothing: 10
targetEasing: 2
currentSmoothing: 10
defaultValue: 15
defaultValue: 8
defaultSmoothing: 10
defaultEasing: 2
gravityPower:
@@ -326,6 +329,7 @@ MonoBehaviour:
defaultValue: 5
defaultSmoothing: 1
defaultEasing: 2
specifiedRotation: {x: 0, y: 0, z: 0}
--- !u!114 &679199079481597207
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -735,8 +739,14 @@ MonoBehaviour:
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"resolvedGravity":{"_name":"resolvedGravity","_id":"7c9d4632-c537-44c4-ae35-d92fa64d5303","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"resolvedSpeed":{"_name":"resolvedSpeed","_id":"a81cae83-1fb4-4a2c-bc68-ebf1781c2037","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"resolvedRotation":{"_name":"resolvedRotation","_id":"f2ba350a-0fea-438e-9ad3-ed77db853d34","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
_objectReferences: []
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"5dbc6a46-39ce-4d74-87a2-ac8211a5a77f","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"Separator
(Double Click To Rename)":{"_value":{},"_name":"Separator (Double Click To Rename)","_id":"8310c018-ad9e-410a-bb01-0d2e733437f8","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"modelAnimator":{"_value":1,"_name":"modelAnimator","_id":"7496ae67-b0a2-4894-a203-35e011767a3a","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
_objectReferences:
- {fileID: 0}
- {fileID: 8583102325603564116}
_serializedVariables:
- _json: '{"_value":{},"_name":"Resolved Movement","_id":"58618e1a-1bf3-4346-a961-2787a78116fa","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
@@ -756,6 +766,52 @@ MonoBehaviour:
- _json: '{"_name":"resolvedRotation","_id":"f2ba350a-0fea-438e-9ad3-ed77db853d34","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
_references: []
- _json: '{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"5dbc6a46-39ce-4d74-87a2-ac8211a5a77f","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}'
_references: []
- _json: '{"_value":{},"_name":"Separator (Double Click To Rename)","_id":"8310c018-ad9e-410a-bb01-0d2e733437f8","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
_references: []
- _json: '{"_value":1,"_name":"modelAnimator","_id":"7496ae67-b0a2-4894-a203-35e011767a3a","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
_references:
- {fileID: 0}
- {fileID: 8583102325603564116}
--- !u!95 &8583102325603564116
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2757828562731694833}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: f7630421e96f8104ab931a97746bbb7b, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &5070944620793365545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2757828562731694833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7719da98d07bb4848a78904f6da4c355, type: 3}
m_Name:
m_EditorClassIdentifier: Core::UnitCombat
draggedUnits: []
--- !u!1 &9138484595871696647
GameObject:
m_ObjectHideFlags: 0
@@ -773,7 +829,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2655796284435897345
Transform:
m_ObjectHideFlags: 0
@@ -846,3 +902,155 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1001 &3477594240599513361
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7329826263822975762}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
propertyPath: m_Name
value: MaruTestMesh
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
insertIndex: -1
addedObject: {fileID: 6535719103590072454}
- targetCorrespondingSourceObject: {fileID: -4767811373846985505, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
insertIndex: -1
addedObject: {fileID: 1496504048583724107}
- targetCorrespondingSourceObject: {fileID: 1723866223041371365, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
insertIndex: -1
addedObject: {fileID: 4903646563686216737}
m_SourcePrefab: {fileID: 100100000, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
--- !u!1 &979446437205532110 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -4767811373846985505, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
m_PrefabInstance: {fileID: 3477594240599513361}
m_PrefabAsset: {fileID: 0}
--- !u!95 &1496504048583724107
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 979446437205532110}
m_Enabled: 0
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 8def683e913d7b54087d096cf3fc05b8, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &2859366553890850292 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1723866223041371365, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
m_PrefabInstance: {fileID: 3477594240599513361}
m_PrefabAsset: {fileID: 0}
--- !u!95 &4903646563686216737
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2859366553890850292}
m_Enabled: 0
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 8def683e913d7b54087d096cf3fc05b8, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!4 &4019564870895517434 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
m_PrefabInstance: {fileID: 3477594240599513361}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4360483176023188544 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
m_PrefabInstance: {fileID: 3477594240599513361}
m_PrefabAsset: {fileID: 0}
--- !u!95 &6535719103590072454
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4360483176023188544}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 8def683e913d7b54087d096cf3fc05b8, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0

131
Assets/Scenes/CombatTest.unity
View File

@@ -1452,6 +1452,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -6606553239814530074, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 323016802234025917, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2106585328495276993, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2129000951396423518, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: _boundGraphSource._version
value: 0
@@ -1486,7 +1498,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2757828562731694833, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2842793574603981349, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: _serializedBlackboard
@@ -1517,9 +1529,50 @@ PrefabInstance:
propertyPath: _serializedVariables.Array.data[7]._references.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4712401716102697018, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6067609290387865387, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: _serializedBlackboard
value: '{"_variables":{"Resolved Movement":{"_value":{},"_name":"Resolved Movement","_id":"58618e1a-1bf3-4346-a961-2787a78116fa","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"resolvedMoveVector2":{"_name":"resolvedMoveVector2","_id":"2aee664e-07ba-4e85-9d6a-a1393398789d","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector2,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"resolvedMoveVector3":{"_name":"resolvedMoveVector3","_id":"5d907161-2896-4b95-bfd2-0ea9426145d7","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"resolvedGravity":{"_name":"resolvedGravity","_id":"7c9d4632-c537-44c4-ae35-d92fa64d5303","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"resolvedSpeed":{"_name":"resolvedSpeed","_id":"a81cae83-1fb4-4a2c-bc68-ebf1781c2037","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"resolvedRotation":{"_name":"resolvedRotation","_id":"f2ba350a-0fea-438e-9ad3-ed77db853d34","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"5dbc6a46-39ce-4d74-87a2-ac8211a5a77f","_debugBoundValue":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"Separator
(Double Click To Rename)":{"_value":{},"_name":"Separator (Double Click To
Rename)","_id":"8310c018-ad9e-410a-bb01-0d2e733437f8","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"modelAnimator":{"_name":"modelAnimator","_id":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
objectReference: {fileID: 0}
- target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: _objectReferences.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: _serializedVariables.Array.data[6]._json
value: '{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"5dbc6a46-39ce-4d74-87a2-ac8211a5a77f","_debugBoundValue":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}'
objectReference: {fileID: 0}
- target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: _serializedVariables.Array.data[8]._json
value: '{"_name":"modelAnimator","_id":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
objectReference: {fileID: 0}
- target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: _serializedVariables.Array.data[8]._references.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -2
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalPosition.y
@@ -1527,7 +1580,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 21
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalRotation.w
@@ -1557,10 +1610,50 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.size
value: 8
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[7].length
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[7].size.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[7].size.y
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[7].size.z
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[5].castType
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[6].castType
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[7].castType
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[7].direction.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[6].ignoreLayers.m_Bits
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8762428562534304046, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: observers.Array.data[7].ignoreLayers.m_Bits
value: 127
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -3558,6 +3651,37 @@ Mesh:
- serializedVersion: 1
m_IndexStart: 0
m_IndexCount: 0
--- !u!1 &1113569333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1113569334}
m_Layer: 0
m_Name: 'Debug Page: Movement'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1113569334
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1113569333}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1114636286
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6920,3 +7044,4 @@ SceneRoots:
- {fileID: 400326425}
- {fileID: 1412997144}
- {fileID: 1834179742}
- {fileID: 1113569334}

44
Assets/Scripts/Player/Combat/UnitCombat.cs Normal file
View File

@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using Reset.Units;
using UnityEngine;
public class UnitCombat : MonoBehaviour{
public List<Collider> draggedUnits = new List<Collider>();
private UnitMovementHandler movement;
private Vector3 lastPosition;
private Vector3 positionDelta;
private float lastSpeed;
private float speedDelta;
void Awake(){
movement = GetComponent<UnitMovementHandler>();
}
void Start(){
lastPosition = transform.position;
}
// Update is called once per frame
void Update(){
positionDelta = lastPosition.DirectionTo(transform.position);
speedDelta = Vector3.Distance(lastPosition, transform.position);
lastPosition = transform.position;
foreach (Collider draggedUnit in draggedUnits) {
UnitMovementHandler draggedUnitMovement = draggedUnit.GetComponent<UnitMovementHandler>();
if (!draggedUnitMovement) {
Debug.LogError($"No available UnitMovement on {draggedUnit.name}. Aborting drag on this unit.");
continue;
}
draggedUnitMovement.SetNewDirection((transform.rotation* positionDelta).ToVector2(), 1f, true);
draggedUnitMovement.SetNewSpeed(speedDelta, 1f, true);
draggedUnitMovement.SetNewRotation(Quaternion.LookRotation(transform.position.DirectionTo(draggedUnit.transform.position)), 1f, true);
}
}
}

2
Assets/Scripts/Player/Combat/UnitCombat.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 7719da98d07bb4848a78904f6da4c355

3
Assets/Scripts/Player/ResolvedMovement.cs
View File

@@ -1,4 +1,5 @@
using Reset.Core.Tools;
using System;
using Reset.Core.Tools;
using Sirenix.OdinInspector;
using UnityEngine;

6
Assets/Scripts/Player/UnitMovementHandler.cs
View File

@@ -25,7 +25,7 @@ namespace Reset.Units{
[ShowInInspector, PropertyOrder(2), FoldoutGroup("Movement Data", expanded: true), InlineProperty, HideLabel] public UnitMovementData data = new();
// Other
private Quaternion specifiedRotation; // Used for locking a specific direction
public Vector3 specifiedRotation; // Used for locking a specific direction
void Awake(){
controller = GetComponent<CharacterController>();
@@ -51,7 +51,7 @@ namespace Reset.Units{
// Apply movement
DoMovement(resolvedMovement.moveDirection.World, resolvedMovement.gravity, resolvedMovement.moveSpeed, data.gravityScale.Value);
Debug.Log(controller.isGrounded);
DebugOverlayDrawer.ChangeValue("Movement", "Move Direction (Local)", resolvedMovement.moveDirection.Local);
DebugOverlayDrawer.ChangeValue("Movement", "Move Direction (World)", resolvedMovement.moveDirection.World);
}
@@ -256,7 +256,7 @@ namespace Reset.Units{
}
}
public void SetSpecifiedRotation(Quaternion inputRotation){
public void SetSpecifiedRotation(Vector3 inputRotation){
specifiedRotation = inputRotation;
}

2
Assets/Scripts/Player/UnitMovementHandler.cs.meta
View File

@@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 98
executionOrder: 50
icon: {instanceID: 0}
userData:
assetBundleName: