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

feat: more combat tweaks

Browse Source 
shuriken can now be thrown
jumping animtions
jumping animations timing
state machine changes
start of online integration
This commit is contained in:
Chris
2026-01-15 14:42:25 -05:00
parent a06784f7b6
commit 25b7fae339
45 changed files with 28662 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Assets/Scenes/CombatTest.unity
View File

@@ -2590,7 +2590,7 @@ MonoBehaviour:
m_EditorClassIdentifier: AstarPathfindingProject::AstarPath
version: 1073741824
data:
dataString: UEsDBBQAAAgIAACYn+tQ30BBNAAAAD0AAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz0TPRUVBKL0osyCgGChiAOKWZKSB2dCyQU1JZkOqXmJsKEagFAFBLAQItABQAAAgIAACYn+tQ30BBNAAAAD0AAAAJACQAAAAAAAAAAAAAAAAAAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAEAAQBbAAAAfwAAAAAA
dataString: UEsDBBQAAAgIAACYn+sc99biNAAAAD0AAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz0TPVUVBKL0osyCgGChiAOKWZKSB2dCyQU1JZkOqXmJsKEagFAFBLAQItABQAAAgIAACYn+sc99biNAAAAD0AAAAJACQAAAAAAAAAAAAAAAAAAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAEAAQBbAAAAfwAAAAAA
file_cachedStartup: {fileID: 0}
cacheStartup: 0
showNavGraphs: 1
@@ -7887,6 +7887,50 @@ RectTransform:
m_AnchoredPosition: {x: 814, y: -365.5}
m_SizeDelta: {x: 300, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &849233030
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 849233032}
- component: {fileID: 849233031}
m_Layer: 0
m_Name: WidgetEventDispatcher
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &849233031
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 849233030}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 318dc804b7b04630a9ed534a2243e51f, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Multiplayer.Widgets.Core::Unity.Multiplayer.Widgets.WidgetEventDispatcher
--- !u!4 &849233032
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 849233030}
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 &870221777
PrefabInstance:
m_ObjectHideFlags: 0
@@ -19668,19 +19712,19 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_TransformParent: {fileID: 1821824114}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
propertyPath: m_LocalPosition.x
value: -45.786617
value: -40.286625
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
propertyPath: m_LocalPosition.y
value: 0.18939297
value: 0.18939298
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
propertyPath: m_LocalPosition.z
value: 37.008987
value: 24.701027
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
propertyPath: m_LocalRotation.w
@@ -19692,7 +19736,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
propertyPath: m_LocalRotation.z
@@ -19723,6 +19767,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
--- !u!4 &1729521886 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
m_PrefabInstance: {fileID: 1729521885}
m_PrefabAsset: {fileID: 0}
--- !u!43 &1748470146
Mesh:
m_ObjectHideFlags: 0
@@ -20461,18 +20510,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
objectReference: {fileID: 0}
- target: {fileID: 2370652034083115105, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3147435435847092955, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3}
propertyPath: m_LocalPosition.x
value: -5.499994
@@ -20519,9 +20564,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3147435435847092955, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3}
insertIndex: -1
addedObject: {fileID: 1729521886}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3}
--- !u!4 &1821824114 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3147435435847092955, guid: e68a5c4ff9ba2a94aadaeff2dfd56cee, type: 3}
m_PrefabInstance: {fileID: 1821824113}
m_PrefabAsset: {fileID: 0}
--- !u!43 &1829708284
Mesh:
m_ObjectHideFlags: 0
@@ -24449,4 +24502,4 @@ SceneRoots:
- {fileID: 8269163115880052268}
- {fileID: 1821824113}
- {fileID: 1290093098}
- {fileID: 1729521885}
- {fileID: 849233032}