added: initial combat mechanics

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

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