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

feat: more attempted fixes for models and animations

Browse Source
This commit is contained in:
Chris
2025-12-29 12:54:07 -05:00
parent 58f1bc66bb
commit 338ff3bed4
10 changed files with 2751 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
Assets/Scenes/CombatTest.unity
View File

@@ -858,6 +858,107 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 86fe521c4bae13c4ab1ad5a357fe8d47, type: 3}
--- !u!1001 &142407168
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 29664555160089498, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalPosition.x
value: -6.3003926
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalPosition.z
value: -0.30162334
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5341383984788871445, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_Name
value: Player (3)
objectReference: {fileID: 0}
- target: {fileID: 6200870592378592354, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: GlobalObjectIdHash
value: 3679697576
objectReference: {fileID: 0}
- target: {fileID: 6200870592378592354, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: InScenePlacedSourceGlobalObjectIdHash
value: 999748856
objectReference: {fileID: 0}
- target: {fileID: 6816807748572218810, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.w
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 6816807748572218810, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6816807748572218810, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.y
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 6816807748572218810, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8884931660780664684, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.w
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 8884931660780664684, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8884931660780664684, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.y
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 8884931660780664684, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
--- !u!43 &178405908
Mesh:
m_ObjectHideFlags: 0
@@ -1487,7 +1588,7 @@ MonoBehaviour:
manualDebugFloorRoof: 0
showSearchTree: 0
unwalkableNodeDebugSize: 0.3
logPathResults: 1
logPathResults: 0
maxNearestNodeDistance: 100
scanOnStartup: 1
fullGetNearestSearch: 0
@@ -1537,7 +1638,7 @@ MonoBehaviour:
heuristic: 2
heuristicScale: 1
threadCount: 1
maxFrameTime: 1
maxFrameTime: 10
batchGraphUpdates: 0
graphUpdateBatchingInterval: 0.2
navmeshUpdates:
@@ -1804,6 +1905,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 4006923029357400803, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4090127306158292724, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 2.479017
@@ -1937,8 +2042,8 @@ PrefabInstance:
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,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"resolvedGravity":{"_value":-4.565941,"_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":{"_value":10.0,"_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]]"},"References":{"_value":{},"_name":"References","_id":"8310c018-ad9e-410a-bb01-0d2e733437f8","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
@@ -2078,7 +2183,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalPosition.x
value: -2
value: -5.35
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalPosition.y
@@ -2086,7 +2191,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalPosition.z
value: 21
value: -0.18
objectReference: {fileID: 0}
- target: {fileID: 7329826263822975762, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalRotation.w
@@ -2946,6 +3051,33 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 64aa98352a8043b489346bd369d455e9, type: 3}
--- !u!1 &457216229 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: af57850141d47244a8c7c021d10baeed, type: 3}
m_PrefabInstance: {fileID: 1331208902}
m_PrefabAsset: {fileID: 0}
--- !u!95 &457216230
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 457216229}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0bc31e0717cb9b04aa98f63222c2fa17, 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 &571255144
GameObject:
m_ObjectHideFlags: 0
@@ -3826,8 +3958,8 @@ PrefabInstance:
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,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"resolvedGravity":{"_value":-4.565941,"_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":{"_value":10.0,"_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]]"},"References":{"_value":{},"_name":"References","_id":"8310c018-ad9e-410a-bb01-0d2e733437f8","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
@@ -5705,6 +5837,66 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1331208902
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalPosition.x
value: -11.903027
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalPosition.z
value: -0.8807144
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: af57850141d47244a8c7c021d10baeed, type: 3}
propertyPath: m_Name
value: CharacterModel
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: af57850141d47244a8c7c021d10baeed, type: 3}
insertIndex: -1
addedObject: {fileID: 457216230}
m_SourcePrefab: {fileID: 100100000, guid: af57850141d47244a8c7c021d10baeed, type: 3}
--- !u!1 &1379726749
GameObject:
m_ObjectHideFlags: 0
@@ -5870,7 +6062,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31709e0224b48e24b8e5311541392a97, type: 3}
m_Name:
m_EditorClassIdentifier: Core::SessionManager
playerPrefab: {fileID: 2757828562731694833, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
playerPrefab: {fileID: 5341383984788871445, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
--- !u!4 &1412997144
Transform:
m_ObjectHideFlags: 0
@@ -7429,8 +7621,8 @@ PrefabInstance:
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,
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"resolvedGravity":{"_value":-4.565941,"_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":{"_value":10.0,"_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]]"},"References":{"_value":{},"_name":"References","_id":"8310c018-ad9e-410a-bb01-0d2e733437f8","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
@@ -9926,3 +10118,5 @@ SceneRoots:
- {fileID: 1941815220}
- {fileID: 332821856}
- {fileID: 8269163115880052268}
- {fileID: 142407168}
- {fileID: 1331208902}