working on charging and quick attacks

This commit is contained in:
2025-07-31 09:04:16 +02:00
parent 407454555f
commit a0c2a389be
34 changed files with 7683 additions and 289 deletions

View File

@@ -96,7 +96,7 @@ GameObject:
m_Component:
- component: {fileID: 6661496247832138833}
m_Layer: 7
m_Name: hand_right_slot
m_Name: hand_right_slot_egg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -110,13 +110,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348422555280504833}
serializedVersion: 2
m_LocalRotation: {x: 0.76654154, y: 0.6380169, z: -0.055969324, w: 0.04707348}
m_LocalPosition: {x: 0.0011812435, y: 0.10607701, z: 0.027564127}
m_LocalRotation: {x: 0.57864237, y: 0.40390524, z: 0.56028163, w: 0.43372583}
m_LocalPosition: {x: 0.001, y: 0.09, z: 0.0785}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5261224098978168883}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 177.172, y: -90.233, z: -72.672}
--- !u!1 &1493580190798519521
GameObject:
m_ObjectHideFlags: 0
@@ -741,10 +741,14 @@ MonoBehaviour:
syncRotation: 0
syncScale: 0
m_AttachmentSockets:
- socketName: hand_right
- socketName: egg
root: {fileID: 6661496247832138833}
localPosition: {x: 0, y: 0, z: 0}
localRotation: {x: 0, y: 0, z: 0, w: 0}
- socketName: dagger
root: {fileID: 3163379227286582809}
localPosition: {x: 0, y: 0, z: 0}
localRotation: {x: 0, y: 0, z: 0, w: 0}
m_Animator: {fileID: 134164689146528362}
m_Locomotion: {fileID: 3055557605397218987}
m_Camera: {fileID: 7282522638044830840}
@@ -763,12 +767,6 @@ MonoBehaviour:
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}
@@ -805,8 +803,12 @@ MonoBehaviour:
m_PitchMin: -80
m_PitchMax: 80
<Camera>k__BackingField: {fileID: 8557190970217331903}
m_BobbingNoiseSettings: {fileID: 11400000, guid: 8c717fcbc095df94da5c56dc723a9e04, type: 2}
m_BobbingFrequency: 1
m_BobbingAmplitude: 1
m_ShakeNoiseSettings: {fileID: 11400000, guid: b4bbf15612416ff40bd579e50fa8693c, type: 2}
m_ShakeFrequency: 1
m_ShakeAmplitude: 1
m_PickDistance: 5
m_PickLayer:
serializedVersion: 2
@@ -1092,7 +1094,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
m_Name:
m_EditorClassIdentifier:
NoiseProfile: {fileID: 11400000, guid: 8c717fcbc095df94da5c56dc723a9e04, type: 2}
NoiseProfile: {fileID: 11400000, guid: b4bbf15612416ff40bd579e50fa8693c, type: 2}
PivotOffset: {x: 0, y: 0, z: 0}
AmplitudeGain: 1
FrequencyGain: 1
@@ -1214,6 +1216,37 @@ Transform:
m_Children: []
m_Father: {fileID: 8014384043901115190}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9111957051878017424
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3163379227286582809}
m_Layer: 7
m_Name: hand_right_slot_dagger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3163379227286582809
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9111957051878017424}
serializedVersion: 2
m_LocalRotation: {x: -0.63801676, y: 0.76654166, z: -0.047073357, w: -0.055969384}
m_LocalPosition: {x: -0.001, y: 0.099, z: 0.038}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5261224098978168883}
m_LocalEulerAnglesHint: {x: 171.745, y: 1.4900055, z: -259.436}
--- !u!1001 &5815892847420407803
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1750,6 +1783,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 1852576806548013000, guid: e74130c49b009364f90d176af44766be, type: 3}
insertIndex: -1
addedObject: {fileID: 6661496247832138833}
- targetCorrespondingSourceObject: {fileID: 1852576806548013000, guid: e74130c49b009364f90d176af44766be, type: 3}
insertIndex: -1
addedObject: {fileID: 3163379227286582809}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3}
insertIndex: -1