Start of character animations

This commit is contained in:
Simon Lübeß 2024-04-08 12:00:48 +02:00
parent e4841fe3fc
commit 8c1bb33bdf
83 changed files with 64508 additions and 581 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bdc4995e29f7bb44fbd84ac9a96ef5f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 06c4d8df90b02894d866a9d7d3ebbcdd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 66c4c05934d34f649b93699fd5ee66d8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 763c0761dbea2494da2b4ade997cc93a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 35b149b905f5c4645896e69ce79c884a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 530002ea215aa2a4a913e0eb4107a8b9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0794742d7d4be8242b3a0fd27cae7c13
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7c61f3f07a2933941bb654d4db478844
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a8e644329c3fb994ca3e59d4f5c20029
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1181,6 +1181,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3603909376357075794}
- {fileID: 7588121059722506457}
m_Father: {fileID: 5060876231321218156}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4907209547097802691
@ -2487,6 +2488,37 @@ Transform:
- {fileID: 9159352572297857806}
m_Father: {fileID: 1569112875850845949}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8770957046814480106
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7588121059722506457}
m_Layer: 0
m_Name: ItemHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7588121059722506457
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8770957046814480106}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5737504958030667471}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9017657623670109072
GameObject:
m_ObjectHideFlags: 0
@ -2497,8 +2529,16 @@ GameObject:
m_Component:
- component: {fileID: 958156999735417459}
- component: {fileID: 3172532130436993162}
- component: {fileID: 5522155941026358655}
- component: {fileID: 7238905383007695838}
- component: {fileID: 8480748577330701233}
- component: {fileID: 2854474547678719636}
- component: {fileID: 4818504893248395498}
- component: {fileID: 8130449438919791664}
- component: {fileID: 4312745187559847804}
- component: {fileID: 3895211860080867177}
m_Layer: 0
m_Name: Gottfried new
m_Name: Gottfried
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -2542,7 +2582,7 @@ Animator:
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: e72f76f2e07d78347bb29ae6cefa1f12, type: 3}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000, guid: d606e87912042554fa99cc851df355d0, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 1
@ -2553,3 +2593,364 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &5522155941026358655
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 740b300bbbdc1fa4f9acfc855c8670de, type: 3}
m_Name:
m_EditorClassIdentifier:
_animationController: {fileID: 3172532130436993162}
moveSpeed: 30
groundDrag: 4
speed: 5
turningRate: 600
_targetRotation: {x: 0, y: 0, z: 0, w: 1}
jumpKey: 32
jumpForce: 40
jumpCooldown: 0.5
playerHeight: 2
whatIsGround:
serializedVersion: 2
m_Bits: 8
grounded: 0
_hand: {fileID: 7588121059722506457}
_carriedItemModel: {fileID: 0}
_carriedInteractible: {fileID: 0}
_dropItemForce: 3
_data: {fileID: 11400000, guid: 503e4ea097b9faa4ba6e2ed3906714a5, type: 2}
_audioSource: {fileID: 8130449438919791664}
--- !u!114 &7238905383007695838
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ba80be7ffa6083b4ba706b603a9b812e, type: 3}
m_Name:
m_EditorClassIdentifier:
_character: {fileID: 5522155941026358655}
interactionRadius: 1
_interactionCollider: {fileID: 4818504893248395498}
_interactionsInRange: []
--- !u!54 &8480748577330701233
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
serializedVersion: 4
m_Mass: 10
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!136 &2854474547678719636
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.32
m_Height: 1.54
m_Direction: 1
m_Center: {x: 0, y: 0.71, z: 0}
--- !u!136 &4818504893248395498
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Height: 4.5
m_Direction: 1
m_Center: {x: 0, y: 0.75, z: 0}
--- !u!82 &8130449438919791664
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &4312745187559847804
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: fb2e9958e9ec8d24c836f615c25410f8, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5522155941026358655}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoJump
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 7f3b63a1-be87-41ca-ad1b-19f55d303089
m_ActionName: Player/Jump
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5522155941026358655}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoMove
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8b6b0ff-5561-4ddc-b2bd-66e2fef329a0
m_ActionName: Player/Walk
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5522155941026358655}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoDropItem
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 1fbac6ab-15a0-4a9c-ab41-f1657cfe70f6
m_ActionName: Player/Drop Item
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7238905383007695838}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoInteract
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 48a90872-b876-4bfd-b3fb-e9d66df8b6a4
m_ActionName: Player/Interact[/Keyboard/e,/XInputControllerWindows/buttonWest]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7238905383007695838}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectPreviousAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 82379c74-be3b-419a-8663-4d6235bf1585
m_ActionName: Player/Select Previous Action[/Keyboard/leftArrow,/XInputControllerWindows/dpad/left]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7238905383007695838}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectNextAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8df853a-df28-4087-8356-bb64a7a81c51
m_ActionName: Player/Select Next Action[/Keyboard/rightArrow,/XInputControllerWindows/dpad/right]
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &3895211860080867177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 2
outlineColor: {r: 1, g: 0.60691816, b: 0.60691816, a: 1}
outlineWidth: 2
precomputeOutline: 0
bakeKeys: []
bakeValues: []

View File

@ -0,0 +1,555 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-7972418770390078388
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: IsFalling
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7375345388638619963}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999996
m_TransitionOffset: 0
m_ExitTime: 0.0058072032
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-7813006098639727094
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: RunSpeed
m_EventTreshold: 0.1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 629956065568975567}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8557693
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-7762800967859291383
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: 7375345388638619963}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.13886859
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-4935187434478321354
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: 8930414756670611193}
m_Position: {x: 490, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: 629956065568975567}
m_Position: {x: 470, y: 540, z: 0}
- serializedVersion: 1
m_State: {fileID: 4235996172353028934}
m_Position: {x: 700, y: 220, z: 0}
- serializedVersion: 1
m_State: {fileID: 7375345388638619963}
m_Position: {x: 900, y: 280, z: 0}
- serializedVersion: 1
m_State: {fileID: 1609978573497266662}
m_Position: {x: 690, y: 340, z: 0}
- serializedVersion: 1
m_State: {fileID: -1881819266860015078}
m_Position: {x: 670, y: 80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 280, y: 280, z: 0}
m_ExitPosition: {x: 600, y: -110, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8930414756670611193}
--- !u!1102 &-4322844805319753077
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
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: -6206981513316247533, guid: c346a9e2503cda64ba4698db6aa5e707, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-3878110790150321560
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: IsJumping
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1609978573497266662}
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!1107 &-2502206265594802287
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hand Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -4322844805319753077}
m_Position: {x: 415.91388, y: 208.4973, 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: -4322844805319753077}
--- !u!1102 &-1881819266860015078
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Landing
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1567986783253591655}
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: 7c61f3f07a2933941bb654d4db478844, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-1567986783253591655
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: RunSpeed
m_EventTreshold: 0.1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8930414756670611193}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999997
m_TransitionOffset: 0.2597106
m_ExitTime: 0.61386096
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-85171117190282969
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsFalling
m_EventTreshold: 0
- m_ConditionMode: 4
m_ConditionEvent: RunSpeed
m_EventTreshold: 0.1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1881819266860015078}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25000003
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerAnimationController
serializedVersion: 5
m_AnimatorParameters:
- m_Name: RunSpeed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: IsFalling
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: IsJumping
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -4935187434478321354}
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}
- serializedVersion: 5
m_Name: Hand Layer
m_StateMachine: {fileID: -2502206265594802287}
m_Mask: {fileID: 31900000, guid: 7c6badb5617f0eb4fa1f1720dae1935b, type: 2}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &629956065568975567
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running
m_Speed: 0.25
m_CycleOffset: 0
m_Transitions:
- {fileID: 3764182126052445355}
- {fileID: -3878110790150321560}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 1
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 5987713911036300057, guid: 081930da5e255e348940373200bbeaca, type: 3}
m_Tag:
m_SpeedParameter: RunSpeed
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &1257973746956521888
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: 7375345388638619963}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.53125
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1609978573497266662
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running Jump Up
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -7762800967859291383}
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: 8315546878889615532, guid: 7f10f6ce81a34824a9cd2746ad0b82ff, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &2204806524291194320
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: IsJumping
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4235996172353028934}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25000003
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &3764182126052445355
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: RunSpeed
m_EventTreshold: 0.1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8930414756670611193}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999996
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &3820365744258036260
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: RunSpeed
m_EventTreshold: 0.1
- m_ConditionMode: 2
m_ConditionEvent: IsFalling
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 629956065568975567}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999993
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &4235996172353028934
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Standing Jump Up
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1257973746956521888}
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: -4936251570423720521, guid: ab54d1b34370dbe4d896efebb96535ef, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7375345388638619963
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Falling
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -85171117190282969}
- {fileID: 3820365744258036260}
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: 2010763096457517216, guid: 988fefd40c70c4243ac399fce021190a, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8930414756670611193
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -7813006098639727094}
- {fileID: 2204806524291194320}
- {fileID: -7972418770390078388}
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: -6206981513316247533, guid: c346a9e2503cda64ba4698db6aa5e707, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d606e87912042554fa99cc851df355d0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -208,13 +208,70 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 66091278}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0.17485122, y: 0, z: 0, w: 0.9845949}
m_LocalPosition: {x: 0, y: 3.17, z: -7.28}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 20.14, y: 0, z: 0}
--- !u!1001 &82843455
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5778247514781970299, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_Name
value: Pizza_Pickupable
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalPosition.x
value: 3.977866
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5000005
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalPosition.z
value: -1.1045976
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3}
--- !u!1001 &664600342
PrefabInstance:
m_ObjectHideFlags: 0
@ -241,7 +298,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b2a58bff693e940b0bd58bc12b2218be, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b2a58bff693e940b0bd58bc12b2218be, type: 3}
propertyPath: m_LocalPosition.z
@ -299,86 +356,291 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 1455964146}
m_SourcePrefab: {fileID: 100100000, guid: b2a58bff693e940b0bd58bc12b2218be, type: 3}
--- !u!1 &671506195 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
m_PrefabInstance: {fileID: 1801110579}
m_PrefabAsset: {fileID: 0}
--- !u!136 &671506196
CapsuleCollider:
--- !u!1001 &941917655
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 671506195}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Height: 1.7
m_Direction: 1
m_Center: {x: 0, y: 0.86, z: 0}
--- !u!54 &671506197
Rigidbody:
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5778247514781970299, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_Name
value: Coffee_Pickupable_Blue
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalPosition.x
value: -6.5739517
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5000005
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalPosition.z
value: 0.8629761
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 9847b3330677a894da44800d037d64a8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9847b3330677a894da44800d037d64a8, type: 3}
--- !u!1001 &993281083
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 671506195}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!114 &671506198
MonoBehaviour:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5778247514781970299, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_Name
value: Coffee_Pickupable_Yellow
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalPosition.x
value: -0.71277535
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalPosition.z
value: -2.9701006
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 00115013d00b60b4b910de00e97c8934, type: 3}
--- !u!1001 &1003703708
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 671506195}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 740b300bbbdc1fa4f9acfc855c8670de, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: 3
groundDrag: 1
speed: 5
turningRate: 600
_targetRotation: {x: 0, y: 0, z: 0, w: 1}
jumpKey: 32
jumpForce: 4
jumpCooldown: 0.5
playerHeight: 2
whatIsGround:
serializedVersion: 2
m_Bits: 8
grounded: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_Name
value: Coffee_Pickupable_Red
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalPosition.x
value: -2.9420278
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalPosition.y
value: 0.50000095
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalPosition.z
value: -2.4751236
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
--- !u!1001 &1038572353
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5778247514781970299, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_Name
value: Mate_Pickupable
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalPosition.x
value: 1.6195943
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5000005
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalPosition.z
value: -2.7694592
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3}
--- !u!1001 &1067379766
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5778247514781970299, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_Name
value: Coffee_Pickupable_Green
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalPosition.x
value: -5.322117
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5000005
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalPosition.z
value: -1.5528507
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3}
--- !u!1 &1087439537
GameObject:
m_ObjectHideFlags: 0
@ -507,14 +769,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 352303851128570419, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.176
objectReference: {fileID: 0}
- target: {fileID: 387488422078298736, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
objectReference: {fileID: 0}
- target: {fileID: 958156999735417459, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -555,76 +809,60 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2306065642603865342, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
- target: {fileID: 2854474547678719636, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_Radius
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 2826173184364318709, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
- target: {fileID: 2854474547678719636, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_Center.y
value: 0.78
objectReference: {fileID: 0}
- target: {fileID: 3172532130436993162, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: bf7c27ab323bb9a479c6c5e57b4baf6e, type: 2}
objectReference: {fileID: 9100000, guid: d606e87912042554fa99cc851df355d0, type: 2}
- target: {fileID: 3172532130436993162, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_ApplyRootMotion
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3754973126395592608, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: _animator
value:
objectReference: {fileID: 1801110580}
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: moveSpeed
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6310374117318971470, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: _animationController
value:
objectReference: {fileID: 1801110580}
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: _movementAcceleration
value: 50
objectReference: {fileID: 0}
- target: {fileID: 6899588771670185924, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: GroundLayerMask.m_Bits
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7562251618443800699, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
objectReference: {fileID: 0}
- target: {fileID: 8266234560878131848, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
objectReference: {fileID: 0}
- target: {fileID: 8501958666962668076, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
objectReference: {fileID: 0}
- target: {fileID: 8743441466872224761, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
objectReference: {fileID: 0}
- target: {fileID: 8769088793311953453, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: _groundLayerMask.m_Bits
value: 8
objectReference: {fileID: 0}
- target: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_Name
value: Gottfried new
objectReference: {fileID: 0}
- target: {fileID: 9160604238258671143, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
propertyPath: m_LocalPosition.y
value: -0.874
value: Gottfried
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 671506198}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 671506197}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 671506196}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
--- !u!95 &1801110580 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 3172532130436993162, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
m_PrefabInstance: {fileID: 1801110579}
m_PrefabAsset: {fileID: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@ -633,3 +871,9 @@ SceneRoots:
- {fileID: 1801110579}
- {fileID: 664600342}
- {fileID: 1087439539}
- {fileID: 941917655}
- {fileID: 1067379766}
- {fileID: 1003703708}
- {fileID: 993281083}
- {fileID: 1038572353}
- {fileID: 82843455}

View File

@ -41489,11 +41489,6 @@ MonoBehaviour:
toiletTransform: {fileID: 249942518}
dancePlace: {fileID: 677901836}
toiletLookAtTransform: {fileID: 2024028214}
--- !u!4 &1298233948 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5737504958030667471, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
m_PrefabInstance: {fileID: 83611174122365960}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1305990222
GameObject:
m_ObjectHideFlags: 0
@ -43075,37 +43070,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3}
m_PrefabInstance: {fileID: 1439375032}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1363209068
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1363209069}
m_Layer: 0
m_Name: ItemHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1363209069
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1363209068}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 1298233948}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1363423111
GameObject:
m_ObjectHideFlags: 0
@ -50366,371 +50330,28 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1572060562}
m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3}
--- !u!1 &1573807341 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
--- !u!114 &1573807344 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
m_PrefabInstance: {fileID: 83611174122365960}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1573807344
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 740b300bbbdc1fa4f9acfc855c8670de, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: 30
groundDrag: 4
speed: 5
turningRate: 600
_targetRotation: {x: 0, y: 0, z: 0, w: 1}
jumpKey: 32
jumpForce: 40
jumpCooldown: 0.5
playerHeight: 2
whatIsGround:
serializedVersion: 2
m_Bits: 8
grounded: 0
_hand: {fileID: 1363209069}
_carriedItemModel: {fileID: 0}
_carriedInteractible: {fileID: 0}
_dropItemForce: 3
_data: {fileID: 11400000, guid: 503e4ea097b9faa4ba6e2ed3906714a5, type: 2}
_audioSource: {fileID: 1573807353}
--- !u!54 &1573807345
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
serializedVersion: 4
m_Mass: 10
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!136 &1573807346
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.32
m_Height: 1.54
m_Direction: 1
m_Center: {x: 0, y: 0.71, z: 0}
--- !u!136 &1573807349
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Height: 4.5
m_Direction: 1
m_Center: {x: 0, y: 0.75, z: 0}
--- !u!114 &1573807350
--- !u!114 &1573807350 stripped
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 7238905383007695838, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
m_PrefabInstance: {fileID: 83611174122365960}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ba80be7ffa6083b4ba706b603a9b812e, type: 3}
m_Name:
m_EditorClassIdentifier:
_character: {fileID: 1573807344}
interactionRadius: 1
_interactionCollider: {fileID: 1573807349}
_interactionsInRange: []
--- !u!82 &1573807353
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &1573807356
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: fb2e9958e9ec8d24c836f615c25410f8, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807344}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoJump
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 7f3b63a1-be87-41ca-ad1b-19f55d303089
m_ActionName: Player/Jump
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807344}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoMove
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8b6b0ff-5561-4ddc-b2bd-66e2fef329a0
m_ActionName: Player/Walk
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807344}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoDropItem
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 1fbac6ab-15a0-4a9c-ab41-f1657cfe70f6
m_ActionName: Player/Drop Item
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807350}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoInteract
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 48a90872-b876-4bfd-b3fb-e9d66df8b6a4
m_ActionName: Player/Interact[/Keyboard/e,/XInputControllerWindows/buttonWest]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807350}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectPreviousAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 82379c74-be3b-419a-8663-4d6235bf1585
m_ActionName: Player/Select Previous Action[/Keyboard/leftArrow,/XInputControllerWindows/dpad/left]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807350}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectNextAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8df853a-df28-4087-8356-bb64a7a81c51
m_ActionName: Player/Select Next Action[/Keyboard/rightArrow,/XInputControllerWindows/dpad/right]
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &1573807357
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 2
outlineColor: {r: 1, g: 0.60691816, b: 0.60691816, a: 1}
outlineWidth: 2
precomputeOutline: 0
bakeKeys: []
bakeValues: []
--- !u!224 &1575700048 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4482679136646759840, guid: 80fef1d2de1c3284aa35f49497628a9b, type: 3}
@ -68807,35 +68428,8 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 5737504958030667471, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1363209069}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807344}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807350}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807345}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807346}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807349}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807353}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807356}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807357}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
--- !u!23 &87716553343573121
MeshRenderer:

View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Data;
using Interaction;
using TMPro.Examples;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
@ -12,31 +13,30 @@ using Utility;
public class Character : MonoBehaviour
{
[Header("Movement")]
public float moveSpeed = 2f;
[SerializeField] private Animator _animator;
[FormerlySerializedAs("moveSpeed")] [Header("Movement")]
public float _movementAcceleration = 2f;
public float groundDrag = 1f;
private float horizontalInput, verticalInput;
private Vector3 moveDirection;
private Rigidbody rb;
public float speed = 2f;
[FormerlySerializedAs("speed")] public float _maxVelocity = 2f;
[Header("Turning")]
public float turningRate = 30f;
public Quaternion _targetRotation = Quaternion.identity;
[Header("Keybindings")]
public KeyCode jumpKey = KeyCode.Space;
[Header("Jumping")]
public float jumpForce;
public float jumpCooldown;
bool readyToJump = true;
private bool _readyToJump = true;
[Header("Groud Check")]
public float playerHeight;
public LayerMask whatIsGround;
public bool grounded;
[SerializeField]private float _groundedTolerance = 0.2f;
[SerializeField]private LayerMask _groundLayerMask;
private bool _grounded;
[Header("Hold item")]
[SerializeField] private Transform _hand;
@ -51,6 +51,10 @@ public class Character : MonoBehaviour
[SerializeField]
private AudioSource _audioSource;
private static readonly int RunSpeed = Animator.StringToHash("RunSpeed");
private static readonly int IsFalling = Animator.StringToHash("IsFalling");
private static readonly int IsJumping = Animator.StringToHash("IsJumping");
public bool CarriesItem => _carriedInteractible;
public PickupInteractible CarriedItem => _carriedInteractible;
@ -64,13 +68,13 @@ public class Character : MonoBehaviour
// Update is called once per frame
void Update()
{
grounded = Physics.Raycast(transform.position, Vector3.down, playerHeight * 0.5f + 0.2f, whatIsGround);
_grounded = Physics.Raycast(transform.position + new Vector3(0, _groundedTolerance / 2.0f, 0), Vector3.down, _groundedTolerance, _groundLayerMask);
SpeedControl();
transform.rotation = Quaternion.RotateTowards(transform.rotation, _targetRotation, turningRate * Time.deltaTime);
if (grounded)
if (_grounded)
{
rb.drag = groundDrag;
}
@ -79,6 +83,24 @@ public class Character : MonoBehaviour
rb.drag = 0.3f;
}
UpdateAnimator();
}
private void UpdateAnimator()
{
//if (_grounded)
{
Vector3 velocity = rb.velocity;
velocity.y = 0.0f;
_animator.SetFloat(RunSpeed, velocity.magnitude);
}
//else
{
//_animator.SetFloat(RunSpeed, 0);
}
_animator.SetBool(IsFalling, !_grounded);
}
public void PickupItem(PickupInteractible itemToPickup)
@ -122,18 +144,17 @@ public class Character : MonoBehaviour
{
Vector2 movement = context.ReadValue<Vector2>();
horizontalInput = movement.x;
verticalInput = movement.y;
moveDirection = new Vector3(movement.x, 0, movement.y);
if(horizontalInput != 0f || verticalInput != 0f)
if(moveDirection.x != 0f || moveDirection.z != 0f)
{
_targetRotation = Quaternion.Euler(new Vector3(0f, Mathf.Atan2(horizontalInput, verticalInput) * Mathf.Rad2Deg, 0f));
_targetRotation = Quaternion.Euler(new Vector3(0f, Mathf.Atan2(moveDirection.x, moveDirection.z) * Mathf.Rad2Deg, 0f));
}
}
public void DoJump(InputAction.CallbackContext context)
{
if (!context.performed || !readyToJump || !grounded)
if (!context.performed || !_readyToJump || !_grounded)
return;
Jump();
@ -151,24 +172,24 @@ public class Character : MonoBehaviour
private void MovePlayer()
{
moveDirection = new Vector3(0, 0, verticalInput) + new Vector3(horizontalInput, 0, 0);
rb.AddForce(moveDirection.normalized * moveSpeed * 10f, ForceMode.Force);
rb.AddForce(moveDirection.normalized * _movementAcceleration, ForceMode.Acceleration);
}
private void SpeedControl()
{
Vector3 flatVel = new Vector3(rb.velocity.x, 0f, rb.velocity.z);
if (flatVel.magnitude > moveSpeed)
if (flatVel.magnitude > _maxVelocity)
{
Vector3 limitedVel = flatVel.normalized * moveSpeed;
Vector3 limitedVel = flatVel.normalized * _maxVelocity;
rb.velocity = new Vector3(limitedVel.x, rb.velocity.y, limitedVel.z);
}
}
private void Jump()
{
_animator.SetTrigger(IsJumping);
rb.velocity = new Vector3(rb.velocity.x, 0f, rb.velocity.z);
rb.AddForce(transform.up * jumpForce, ForceMode.Impulse);
@ -176,7 +197,7 @@ public class Character : MonoBehaviour
private void ResetJump()
{
readyToJump = true;
_readyToJump = true;
}
public void GiveItemTo(Developer developer)