working on charging system

2025-07-30 08:26:07 +02:00
parent 61a42bdf10
commit 407454555f
13 changed files with 544 additions and 497 deletions
--- a/Assets/jelycho/core/Items/item_egg.prefab
+++ b/Assets/jelycho/core/Items/item_egg.prefab
@@ -50,22 +50,35 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  <SourceActorPath>k__BackingField: 
-  <ActorID>k__BackingField: 5061208986541388439
+  <ActorStaticID>k__BackingField: 4966572228587685792
+  <ActorID>k__BackingField: 29335
  m_ActorName: Egg
  actorRigidbody: {fileID: 6762445103522978435}
  m_OverrideActorColliders: []
  m_SetKinematicOnMount: 1
  m_DisableCollidersOnMount: 1
-  transformSyncMode: 59
+  syncTransform: 1
+  syncPosition: 1
+  syncRotation: 1
+  syncScale: 0
  m_AttachmentSockets: []
  <Config>k__BackingField:
    itemType: 1
    icon: {fileID: 22319203, guid: 72d716a5a5f582f43b585b9599f6ecf2, type: 3}
    characterEquippedMountSlotName: hand_right
-    isChargeable: 0
-    chargeDuration: 0.5
+    isChargeable: 1
+    minChargeDuration: 0.1
+    maxChargeDuration: 1
    chargeCooldown: 1
+    chargeAction:
+      rid: 6725240519461962327
  m_HighlightEffect: {fileID: 3112011596488648805}
+  references:
+    version: 2
+    RefIds:
+    - rid: 6725240519461962327
+      type: {class: EggChargeAction, ns: RebootReality.jelycho.Items, asm: RebootReality.jelycho}
+      data: 
 --- !u!54 &6762445103522978435
 Rigidbody:
  m_ObjectHideFlags: 0
--- a/Assets/jelycho/core/hud/hud_inventory_slot_template.uxml
+++ b/Assets/jelycho/core/hud/hud_inventory_slot_template.uxml
@@ -1,6 +1,5 @@
 <engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
    <engine:VisualElement name="player-hud__inventory-slot" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0.7);">
-        <engine:VisualElement name="player-hud__inventory-slot-icon" style="flex-grow: 1; background-image: url(&quot;project://database/Assets/jelycho/Items/Shikashi&apos;s%20Fantasy%20Icons%20Pack%20v2/BG%2011.png?fileID=-137324388&amp;guid=72d716a5a5f582f43b585b9599f6ecf2&amp;type=3#jd_item_sword&quot;); margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px;" />
-        <engine:Label text="1" name="player-hud__inventory-slot-quantity" style="position: absolute; flex-direction: column; color: rgb(255, 255, 255); -unity-text-outline-color: rgba(0, 0, 0, 0.64); -unity-text-outline-width: 1px; -unity-font-style: bold; font-size: 20px; top: auto; left: auto; right: 0; bottom: 0; -unity-text-align: lower-right;" />
+        <engine:VisualElement name="player-hud__inventory-slot-icon" style="flex-grow: 1; background-image: url(&quot;project://database/Assets/jelycho/core/items/Shikashi&apos;s%20Fantasy%20Icons%20Pack%20v2/BG%2011.png?fileID=-137324388&amp;guid=72d716a5a5f582f43b585b9599f6ecf2&amp;type=3#jd_item_sword&quot;); margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px;" />
    </engine:VisualElement>
 </engine:UXML>
--- a/Assets/jelycho/core/player/a_player.prefab
+++ b/Assets/jelycho/core/player/a_player.prefab
@@ -762,6 +762,14 @@ MonoBehaviour:
  m_CharacterRotateSoftAngle: 75
  m_CharacterRotateSpeed: 180
  m_CharacterRotateFastSpeed: 720
+  m_HandsLayerIndex: 2
+  m_ItemTypeHandsAnimations: []
+  m_DefaultItemHandsAnimations:
+    itemType: 0
+    idle: Right_Hand_Hold_Idle
+    charging: Right_Hand_Hold_Charged
+    chargedUse: Right_Hand_Hold_Throw
+  m_HandsIdleStateName: Hands Locomotion
  m_DragGutStartPosition: {fileID: 0}
  m_PhysicsDragger: {fileID: 2402344678768307677}
  m_DragDistanceRange:
--- a/Assets/jelycho/core/player/animator_player.controller
+++ b/Assets/jelycho/core/player/animator_player.controller
@@ -60,8 +60,7 @@ AnimatorState:
  m_Name: Attack
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -8330573370938196597}
+  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -77,28 +76,6 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &-8330573370938196597
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9347826
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1101 &-7843561725900691380
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -134,8 +111,7 @@ AnimatorState:
  m_Name: Right_Hand_Hold_Idle
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -3118027288805498438}
+  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -226,31 +202,6 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &-4711396281542594421
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: Throw
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 8662526277064250497}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1107 &-4592225796506358761
 AnimatorStateMachine:
  serializedVersion: 6
@@ -310,32 +261,7 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &-3118027288805498438
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 6
-    m_ConditionEvent: Holding
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 400375029870675044}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.984985
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
--- !u!1101 &-3062724450661704150
+--- !u!1101 &-3304044052770011223
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@@ -351,7 +277,7 @@ AnimatorStateTransition:
  serializedVersion: 3
  m_TransitionDuration: 0.25
  m_TransitionOffset: 0
-  m_ExitTime: 0
+  m_ExitTime: 1
  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@@ -410,24 +336,25 @@ AnimatorStateMachine:
    m_Position: {x: 350, y: 50, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -8396421346802500550}
-    m_Position: {x: 360, y: 380, z: 0}
+    m_Position: {x: 630, y: 120, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -7519564327104386826}
-    m_Position: {x: 350, y: 270, z: 0}
+    m_Position: {x: 350, y: 120, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 8662526277064250497}
-    m_Position: {x: 360, y: 480, z: 0}
+    m_Position: {x: 350, y: 240, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 7168728000125186730}
+    m_Position: {x: 350, y: 180, z: 0}
  m_ChildStateMachines: []
-  m_AnyStateTransitions:
-  - {fileID: 1582007811057979629}
-  - {fileID: -4711396281542594421}
+  m_AnyStateTransitions: []
  m_EntryTransitions:
  - {fileID: 6343792522304449684}
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 20, y: 380, z: 0}
-  m_EntryPosition: {x: 60, y: 50, z: 0}
-  m_ExitPosition: {x: 640, y: 380, z: 0}
+  m_AnyStatePosition: {x: 60, y: 100, z: 0}
+  m_EntryPosition: {x: 60, y: 60, z: 0}
+  m_ExitPosition: {x: 370, y: 450, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 400375029870675044}
 --- !u!1102 &-1370786679102677242
@@ -613,8 +540,7 @@ AnimatorState:
  m_Name: Hands Locomotion
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 3784344539730930853}
+  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -630,31 +556,6 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &1582007811057979629
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: Attack
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -8396421346802500550}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.05
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &2851786315226548937
 AnimatorState:
  serializedVersion: 6
@@ -681,31 +582,6 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &3784344539730930853
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 6
-    m_ConditionEvent: Holding
-    m_EventTreshold: 1
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -7519564327104386826}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &5935865335456089982
 AnimatorState:
  serializedVersion: 6
@@ -747,6 +623,32 @@ AnimatorTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 1
+--- !u!1102 &7168728000125186730
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Right_Hand_Hold_Charged
+  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: -3347519175819947890, guid: e74130c49b009364f90d176af44766be, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!206 &7431716858329769754
 BlendTree:
  m_ObjectHideFlags: 1
@@ -863,7 +765,7 @@ AnimatorState:
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
-  - {fileID: -3062724450661704150}
+  - {fileID: -3304044052770011223}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0