working on animations

2025-08-08 23:38:03 +02:00
parent c17ce42700
commit f6a4db7b4d
11 changed files with 423 additions and 111 deletions
--- a/Assets/jelycho/core/Items/item_dagger.prefab
+++ b/Assets/jelycho/core/Items/item_dagger.prefab
@@ -63,7 +63,15 @@ MonoBehaviour:
  m_AttachmentSockets: []
  <Config>k__BackingField:
    icon: {fileID: -137324388, guid: 72d716a5a5f582f43b585b9599f6ecf2, type: 3}
-    characterEquippedMountSlotName: dagger
+    characterEquippedMountSlotName: dagger_right
+    additionalActorsToMount:
+    - actor:
+        m_AssetGUID: 50a5e87baaedf5b46ba52646e8e88b74
+        m_SubObjectName: 
+        m_SubObjectGUID: 
+        m_SubObjectType: 
+        m_EditorAssetChanged: 0
+      slotName: dagger_left
    handsAnimationClipsSets:
      idle: {fileID: 5159132439250656024, guid: e74130c49b009364f90d176af44766be, type: 3}
      charging: {fileID: -8851864934835179381, guid: e74130c49b009364f90d176af44766be, type: 3}
--- a/Assets/jelycho/core/player/Character_Player.controller
+++ b/Assets/jelycho/core/player/Character_Player.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-776089389026906333
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Daggers_Light_Attack_3_tet
+  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: 68589e37be012ac43a11906a2ae93338, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Character_Player
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 2891799681140177310}
+    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 &2891799681140177310
+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: -776089389026906333}
+    m_Position: {x: 200, y: 0, 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: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -776089389026906333}
--- a/Assets/jelycho/core/player/Character_Player.controller.meta
+++ b/Assets/jelycho/core/player/Character_Player.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9079de55fa2742d4b9a583c8acdc36bd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/jelycho/core/player/Character_Player.fbx
+++ b/Assets/jelycho/core/player/Character_Player.fbx
--- a/Assets/jelycho/core/player/a_player.prefab
+++ b/Assets/jelycho/core/player/a_player.prefab
@@ -1,5 +1,36 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &105949052783897139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7950042186224496601}
+  m_Layer: 7
+  m_Name: hand_left_slot_dagger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7950042186224496601
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 105949052783897139}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.050292086, y: 0.048715312, z: -0.6940488, w: -0.71651495}
+  m_LocalPosition: {x: 0.0142, y: 0.0923, z: 0.0251}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 759515611252976184}
+  m_LocalEulerAnglesHint: {x: 171.97, y: 180, z: -91.82501}
 --- !u!1 &981148959851682200
 GameObject:
  m_ObjectHideFlags: 0
@@ -659,10 +690,14 @@ MonoBehaviour:
    root: {fileID: 6661496247832138833}
    localPosition: {x: 0, y: 0, z: 0}
    localRotation: {x: 0, y: 0, z: 0, w: 0}
-  - socketName: dagger
+  - socketName: dagger_right
    root: {fileID: 3163379227286582809}
    localPosition: {x: 0, y: 0, z: 0}
    localRotation: {x: 0, y: 0, z: 0, w: 0}
+  - socketName: dagger_left
+    root: {fileID: 7950042186224496601}
+    localPosition: {x: 0, y: 0, z: 0}
+    localRotation: {x: 0, y: 0, z: 0, w: 0}
  m_PlayerAnimator: {fileID: 4018164798333520760}
  m_Locomotion: {fileID: 3055557605397218987}
  m_Camera: {fileID: 7282522638044830840}
@@ -740,6 +775,9 @@ MonoBehaviour:
  onQuickAttackFinished:
    m_PersistentCalls:
      m_Calls: []
+  onChargeReady:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!114 &3871962590503854066
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -776,7 +814,7 @@ MonoBehaviour:
        m_TransitionSpeed: 5
        m_Inputs:
        - node:
-            rid: 8982226128795598939
+            rid: 8982226198962110573
          targetWeight: 1
        - node:
            rid: 8982226128795598938
@@ -786,36 +824,23 @@ MonoBehaviour:
      data:
        <Name>k__BackingField: locomotion_air
        Clip: {fileID: -203655887218126122, guid: 9c384b0c7d362af4c9743bfcba1938ad, type: 3}
-    - rid: 8982226128795598939
-      type: {class: BlendTree2DNode, ns: RebootKit.Engine.Animations, asm: RebootKit.Engine}
-      data:
-        <Name>k__BackingField: locomotion_ground
-        m_Entries:
-        - clip: {fileID: -3100369314251171874, guid: e74130c49b009364f90d176af44766be, type: 3}
-          direction:
-            x: 0
-            y: 0
-        - clip: {fileID: 5522812681064789136, guid: e74130c49b009364f90d176af44766be, type: 3}
-          direction:
-            x: 0
-            y: 1
-        - clip: {fileID: -203655887218126122, guid: b3866b602d1016147b919bcff3918f1b, type: 3}
-          direction:
-            x: 0
-            y: -1
-        - clip: {fileID: -203655887218126122, guid: fba537a9366240d4fa665a7a77add245, type: 3}
-          direction:
-            x: 1
-            y: 0
-        - clip: {fileID: -203655887218126122, guid: adb18eaaff5216c47a5ae86f43e54f58, type: 3}
-          direction:
-            x: -1
-            y: 0
-        m_TransitionSpeed: 5
    - rid: 8982226128795598943
      type: {class: CharacterHandsReAnimatorNode, ns: RebootReality.jelycho.Player, asm: RebootReality.jelycho}
      data:
        <Name>k__BackingField: hands
+    - rid: 8982226198962110573
+      type: {class: BasicCharacterLocomotionReAnimatorNode, ns: RebootReality.jelycho.Player, asm: RebootReality.jelycho}
+      data:
+        <Name>k__BackingField: locomotion_ground
+        m_IdleClip: {fileID: -3100369314251171874, guid: e74130c49b009364f90d176af44766be, type: 3}
+        m_RunForwardClip: {fileID: 5522812681064789136, guid: e74130c49b009364f90d176af44766be, type: 3}
+        m_RunBackwardsClip: {fileID: -203655887218126122, guid: b3866b602d1016147b919bcff3918f1b, type: 3}
+        m_StrafeRightClip: {fileID: -203655887218126122, guid: fba537a9366240d4fa665a7a77add245, type: 3}
+        m_StrafeLeftClip: {fileID: -203655887218126122, guid: adb18eaaff5216c47a5ae86f43e54f58, type: 3}
+        m_TurnRightClip: {fileID: -203655887218126122, guid: 0b2b6f967b2d3d448834061fa68b6443, type: 3}
+        m_TurnLeftClip: {fileID: -203655887218126122, guid: 8954af6e64f1f224b842ff9d924e3764, type: 3}
+        m_TransitionSpeed: 6
+        m_ForceIdleMagnitudeThreshold: 0.05
 --- !u!54 &3351589437949293952
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -1739,7 +1764,7 @@ PrefabInstance:
    - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3}
      propertyPath: m_Controller
      value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 9100000, guid: 9079de55fa2742d4b9a583c8acdc36bd, type: 2}
    - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3}
      propertyPath: m_CullingMode
      value: 0
@@ -1862,6 +1887,9 @@ PrefabInstance:
    - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3}
      insertIndex: -1
      addedObject: {fileID: 5180453452427343145}
+    - targetCorrespondingSourceObject: {fileID: 6502182839619065283, guid: e74130c49b009364f90d176af44766be, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7950042186224496601}
    - targetCorrespondingSourceObject: {fileID: -3321919801592875672, guid: e74130c49b009364f90d176af44766be, type: 3}
      insertIndex: -1
      addedObject: {fileID: 9181414832138245197}