feat: more combat tweaks

shuriken can now be thrown jumping animtions jumping animations timing state machine changes start of online integration
2026-01-15 14:42:25 -05:00
parent a06784f7b6
commit 25b7fae339
45 changed files with 28662 additions and 250 deletions
--- a/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx.meta
+++ b/Assets/Player/Models/BlankTestPlayer/CharacterModelSimplified.fbx.meta
@@ -34,25 +34,31 @@ ModelImporter:
      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
      '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
+      Activate translation DOF on avatar to improve retargeting quality.\n\t'shoulder.L'
+      has translation animation that will be discarded.\n\t'shoulder.R' has translation
      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'
+      'JumpDoubleJump' has import animation warnings that might lower retargeting
+      quality:\nNote: Activate translation DOF on avatar to improve retargeting quality.\n\t'arm.R'
+      has translation animation that will be discarded.\n\nClip 'PlayerArmature|JumpDoubleJump'
+      has import animation warnings that might lower retargeting quality:\nNote:
+      Activate translation DOF on avatar to improve retargeting quality.\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.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'
+      translation DOF on avatar to improve retargeting quality.\n\t'shoulder.L' has
+      translation animation that will be discarded.\n\t'shoulder.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'
@@ -346,7 +352,21 @@ ModelImporter:
      mirror: 0
      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
      curves: []
-      events: []
+      events:
+      - time: 0.12714477
+        functionName: CallAttack
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.15166813
+        functionName: CallAttack
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
      transformMask: []
      maskType: 3
      maskSource: {instanceID: 0}
@@ -404,7 +424,21 @@ ModelImporter:
      mirror: 0
      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
      curves: []
-      events: []
+      events:
+      - time: 0.16943319
+        functionName: WeaponRelease
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.41526407
+        functionName: WeaponCatch
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
      transformMask: []
      maskType: 3
      maskSource: {instanceID: 0}
@@ -612,6 +646,64 @@ ModelImporter:
      maskType: 3
      maskSource: {instanceID: 0}
      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: TPose (1)
+      takeName: TPose
+      internalID: -6019907512202015147
+      firstFrame: 0
+      lastFrame: 1
+      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: JumpDoubleJump
+      takeName: JumpDoubleJump
+      internalID: -228057056772693152
+      firstFrame: 0
+      lastFrame: 82
+      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: []