lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added sitting animation

Browse Source
This commit is contained in:
Vladimir Koshevarov
2023-02-27 19:04:16 +02:00
parent 31eb9fb04a
commit 26bb1878c5
16 changed files with 136163 additions and 5434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Characters/Animations/Female/FemaleAnimation.controller
+110 -58
View File
@@ -1,5 +1,58 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-9088967380286558336
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Stand To Sit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8516843307360161248}
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: 9b3d6dcf88b633c4eacf1096d8f4dbf0, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-6783496623276085146
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Lying Down
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: 1b1f1cc71dc0b8c49bb1b4d3d1c40a48, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-5861846159735674552
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -65,7 +118,7 @@ AnimatorState:
m_Transitions:
- {fileID: -3086386606773898049}
- {fileID: 5315232822075019274}
- {fileID: 4186629182259084724}
- {fileID: 8743388761972550837}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -146,37 +199,37 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Fall
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: velX
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: WalkVelocity
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: SitDown
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: StandUp
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -237,13 +290,16 @@ AnimatorStateMachine:
m_Position: {x: 330, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: -2381472502613031072}
m_Position: {x: 580, y: 180, z: 0}
m_Position: {x: 600, y: 130, z: 0}
- serializedVersion: 1
m_State: {fileID: 230533520613607775}
m_Position: {x: 620, y: 320, z: 0}
m_Position: {x: 600, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 5649166609804167580}
m_Position: {x: 620, y: 430, z: 0}
m_State: {fileID: -9088967380286558336}
m_Position: {x: 635, y: 423, z: 0}
- serializedVersion: 1
m_State: {fileID: -6783496623276085146}
m_Position: {x: 620, y: 520, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -285,31 +341,6 @@ BlendTree:
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 2
--- !u!1101 &4186629182259084724
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: SitDown
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5649166609804167580}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.020365616
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &4980525857045709549
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -385,32 +416,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &5649166609804167580
AnimatorState:
serializedVersion: 6
--- !u!1101 &8516843307360161248
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sit
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: ffe0ee16486cadf48ba51980ab21dfa5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6783496623276085146}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.88805974
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8580685621360077188
AnimatorState:
serializedVersion: 6
@@ -438,3 +465,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8743388761972550837
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: SitDown
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -9088967380286558336}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9849699
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
Assets/Characters/Animations/Female/Female_Running.anim
+1682 -498
View File
File diff suppressed because it is too large Load Diff
Assets/Characters/Animations/Sitting backup.anim
+64403
View File
File diff suppressed because it is too large Load Diff
Assets/Characters/Animations/Sitting backup.anim.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6ef18909af9271a44a0690f826853670
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Characters/Animations/Sitting.anim
+59671 -3752
View File
File diff suppressed because it is too large Load Diff
Assets/Characters/Animations/Stand To Sit.anim
+9446
View File
File diff suppressed because it is too large Load Diff
Assets/Characters/Animations/Stand To Sit.anim.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9b3d6dcf88b633c4eacf1096d8f4dbf0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Characters/Lizzy.fbx.meta
+784 -8
View File
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 094143b068357224fabf0fa92fee31cb
ModelImporter:
serializedVersion: 21300
serializedVersion: 22200
internalIDToNameTable:
- first:
74: -203655887218126122
@@ -57,7 +57,7 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
@@ -100,6 +100,7 @@ ModelImporter:
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
@@ -112,8 +113,781 @@ ModelImporter:
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
human:
- boneName: mixamorig12:Hips
humanName: Hips
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftUpLeg
humanName: LeftUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightUpLeg
humanName: RightUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftLeg
humanName: LeftLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightLeg
humanName: RightLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftFoot
humanName: LeftFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightFoot
humanName: RightFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:Spine
humanName: Spine
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:Spine1
humanName: Chest
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:Neck
humanName: Neck
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:Head
humanName: Head
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftShoulder
humanName: LeftShoulder
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightShoulder
humanName: RightShoulder
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftArm
humanName: LeftUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightArm
humanName: RightUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftForeArm
humanName: LeftLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightForeArm
humanName: RightLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHand
humanName: LeftHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHand
humanName: RightHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftToeBase
humanName: LeftToes
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightToeBase
humanName: RightToes
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandThumb1
humanName: Left Thumb Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandThumb2
humanName: Left Thumb Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandThumb3
humanName: Left Thumb Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandIndex1
humanName: Left Index Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandIndex2
humanName: Left Index Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandIndex3
humanName: Left Index Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandMiddle1
humanName: Left Middle Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandMiddle2
humanName: Left Middle Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandMiddle3
humanName: Left Middle Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandRing1
humanName: Left Ring Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandRing2
humanName: Left Ring Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandRing3
humanName: Left Ring Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandPinky1
humanName: Left Little Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandPinky2
humanName: Left Little Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:LeftHandPinky3
humanName: Left Little Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandThumb1
humanName: Right Thumb Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandThumb2
humanName: Right Thumb Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandThumb3
humanName: Right Thumb Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandIndex1
humanName: Right Index Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandIndex2
humanName: Right Index Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandIndex3
humanName: Right Index Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandMiddle1
humanName: Right Middle Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandMiddle2
humanName: Right Middle Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandMiddle3
humanName: Right Middle Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandRing1
humanName: Right Ring Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandRing2
humanName: Right Ring Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandRing3
humanName: Right Ring Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandPinky1
humanName: Right Little Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandPinky2
humanName: Right Little Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:RightHandPinky3
humanName: Right Little Distal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: mixamorig12:Spine2
humanName: UpperChest
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
skeleton:
- name: Bill(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Ch01_Body
parentName: Bill(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Ch01_Shirt
parentName: Bill(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Ch01_Eyelashes
parentName: Bill(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Ch01_Sneakers
parentName: Bill(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Ch01_Pants
parentName: Bill(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:Hips
parentName: Bill(Clone)
position: {x: -0, y: 0.99163055, z: 0.026630446}
rotation: {x: -0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:Spine
parentName: mixamorig12:Hips
position: {x: -0, y: 0.10052383, z: -0.011051281}
rotation: {x: -0.054721233, y: -0, z: -0, w: 0.99850166}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:Spine1
parentName: mixamorig12:Spine
position: {x: -0, y: 0.117984414, z: 6.457284e-10}
rotation: {x: -0.000000014901161, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:Spine2
parentName: mixamorig12:Spine1
position: {x: -0, y: 0.13483936, z: -3.3376293e-10}
rotation: {x: -0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:Neck
parentName: mixamorig12:Spine2
position: {x: -0, y: 0.1516943, z: 0.000000008226084}
rotation: {x: 0.054721247, y: -0, z: -0, w: 0.99850166}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:Head
parentName: mixamorig12:Neck
position: {x: -0, y: 0.07383926, z: 0.028498584}
rotation: {x: -0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:HeadTop_End
parentName: mixamorig12:Head
position: {x: -0, y: 0.18238571, z: 0.07039256}
rotation: {x: -0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:LeftShoulder
parentName: mixamorig12:Spine2
position: {x: -0.07052545, y: 0.13015427, z: -0.0025617694}
rotation: {x: 0.5583541, y: -0.42770323, z: 0.57909536, w: 0.41226122}
scale: {x: 1, y: 1.0000005, z: 1.0000002}
- name: mixamorig12:LeftArm
parentName: mixamorig12:LeftShoulder
position: {x: -1.7116933e-10, y: 0.14673144, z: 0.0000000015394295}
rotation: {x: -0.12100537, y: -0.0015330017, z: 0.0125748515, w: 0.99257106}
scale: {x: 1.0000004, y: 1.0000006, z: 1.0000006}
- name: mixamorig12:LeftForeArm
parentName: mixamorig12:LeftArm
position: {x: -5.795279e-11, y: 0.25314656, z: 4.092621e-10}
rotation: {x: -0.04547862, y: 0.0025182776, z: -0.05523154, w: 0.9974342}
scale: {x: 1.0000005, y: 1.0000001, z: 1.0000002}
- name: mixamorig12:LeftHand
parentName: mixamorig12:LeftForeArm
position: {x: 1.8143294e-10, y: 0.23166333, z: -9.954704e-11}
rotation: {x: 0.063365065, y: -0.09899131, z: -0.01280983, w: 0.9929862}
scale: {x: 1.0000002, y: 1.0000004, z: 1.0000001}
- name: mixamorig12:LeftHandThumb1
parentName: mixamorig12:LeftHand
position: {x: 0.03017669, y: 0.032125548, z: 0.014748561}
rotation: {x: 0.046366356, y: 0.019759424, z: -0.31966612, w: 0.9461888}
scale: {x: 1.0000002, y: 1.0000001, z: 1}
- name: mixamorig12:LeftHandThumb2
parentName: mixamorig12:LeftHandThumb1
position: {x: 0.006909205, y: 0.036534835, z: 0.0000000014530374}
rotation: {x: 0.011663567, y: 0.0018197924, z: -0.07377054, w: 0.99720544}
scale: {x: 0.99999994, y: 1, z: 1.0000001}
- name: mixamorig12:LeftHandThumb3
parentName: mixamorig12:LeftHandThumb2
position: {x: -0.001083909, y: 0.03292738, z: -0.0000000011894502}
rotation: {x: -0.01587631, y: 0.0032707227, z: -0.059021395, w: 0.9981251}
scale: {x: 1, y: 1.0000002, z: 1.0000001}
- name: mixamorig12:LeftHandThumb4
parentName: mixamorig12:LeftHandThumb3
position: {x: -0.0058252984, y: 0.025852373, z: 4.405888e-10}
rotation: {x: -0, y: -0, z: 8.6042263e-16, w: 1}
scale: {x: 1, y: 0.9999998, z: 0.9999998}
- name: mixamorig12:LeftHandIndex1
parentName: mixamorig12:LeftHand
position: {x: 0.035011366, y: 0.09864431, z: 0.0021603857}
rotation: {x: 0.00079519284, y: -0.000053174783, z: -0.06690681, w: 0.997759}
scale: {x: 1, y: 1, z: 1}
- name: mixamorig12:LeftHandIndex2
parentName: mixamorig12:LeftHandIndex1
position: {x: -0.00016376359, y: 0.033051465, z: -1.888381e-10}
rotation: {x: 0.039402425, y: -0.0000055315636, z: 0.0025377478, w: 0.9992202}
scale: {x: 1.0000001, y: 1, z: 1}
- name: mixamorig12:LeftHandIndex3
parentName: mixamorig12:LeftHandIndex2
position: {x: 0.00014638231, y: 0.03109861, z: 2.3362646e-13}
rotation: {x: -0.035004035, y: 0.00000011957057, z: -0.000000015529986, w: 0.99938726}
scale: {x: 1.0000002, y: 1.0000004, z: 1.0000007}
- name: mixamorig12:LeftHandIndex4
parentName: mixamorig12:LeftHandIndex3
position: {x: 0.000017380264, y: 0.02704657, z: -1.7497796e-10}
rotation: {x: -0, y: -0, z: -8.881782e-16, w: 1}
scale: {x: 1, y: 0.99999994, z: 0.99999994}
- name: mixamorig12:LeftHandMiddle1
parentName: mixamorig12:LeftHand
position: {x: 0.010425983, y: 0.101806924, z: -0.0034058942}
rotation: {x: 0.030899763, y: -0.00014205274, z: -0.0045986963, w: 0.99951196}
scale: {x: 1, y: 0.99999994, z: 0.9999999}
- name: mixamorig12:LeftHandMiddle2
parentName: mixamorig12:LeftHandMiddle1
position: {x: -0.0000758005, y: 0.034971014, z: -3.6386694e-10}
rotation: {x: 0.040270336, y: 0.000015949705, z: 0.0010911266, w: 0.9991883}
scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
- name: mixamorig12:LeftHandMiddle3
parentName: mixamorig12:LeftHandMiddle2
position: {x: 0.000110613, y: 0.0326304, z: -5.1290044e-10}
rotation: {x: -0.0408503, y: -0.00001520867, z: -0.0005809201, w: 0.9991651}
scale: {x: 1, y: 0.99999994, z: 0.9999999}
- name: mixamorig12:LeftHandMiddle4
parentName: mixamorig12:LeftHandMiddle3
position: {x: -0.000034812747, y: 0.029078988, z: 6.4265293e-10}
rotation: {x: 0.0000000037252885, y: -0, z: 3.3306676e-15, w: 1}
scale: {x: 1.0000001, y: 1, z: 1}
- name: mixamorig12:LeftHandRing1
parentName: mixamorig12:LeftHand
position: {x: -0.010767207, y: 0.09905918, z: -0.002197754}
rotation: {x: 0.037055336, y: 0.0041456358, z: 0.009770176, w: 0.9992569}
scale: {x: 1, y: 0.99999994, z: 0.9999999}
- name: mixamorig12:LeftHandRing2
parentName: mixamorig12:LeftHandRing1
position: {x: 0.000011068347, y: 0.030122617, z: -7.930396e-11}
rotation: {x: 0.02965752, y: 0.00000004679895, z: 0.00000005992477, w: 0.9995602}
scale: {x: 0.9999998, y: 0.9999997, z: 0.9999999}
- name: mixamorig12:LeftHandRing3
parentName: mixamorig12:LeftHandRing2
position: {x: 0.000059199163, y: 0.02898948, z: 4.3223736e-12}
rotation: {x: -0.03926312, y: 0.000019346238, z: -0.0013405306, w: 0.999228}
scale: {x: 1.0000002, y: 0.9999999, z: 1.0000001}
- name: mixamorig12:LeftHandRing4
parentName: mixamorig12:LeftHandRing3
position: {x: -0.0000702673, y: 0.02463312, z: -7.38973e-11}
rotation: {x: -0, y: -0, z: -4.440891e-16, w: 1}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000001}
- name: mixamorig12:LeftHandPinky1
parentName: mixamorig12:LeftHand
position: {x: -0.03467014, y: 0.09302754, z: 0.00041371761}
rotation: {x: 0.038024027, y: 0.0018643206, z: 0.009319195, w: 0.9992317}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000001}
- name: mixamorig12:LeftHandPinky2
parentName: mixamorig12:LeftHandPinky1
position: {x: -0.00005036722, y: 0.027304854, z: -7.336552e-11}
rotation: {x: 0.039368376, y: 0.000048759255, z: 0.0015620781, w: 0.9992236}
scale: {x: 0.99999994, y: 0.9999997, z: 1}
- name: mixamorig12:LeftHandPinky3
parentName: mixamorig12:LeftHandPinky2
position: {x: 0.000085391075, y: 0.021344595, z: 6.7143444e-12}
rotation: {x: -0.039148092, y: -0.00005201212, z: -0.0016590373, w: 0.9992321}
scale: {x: 1, y: 1.0000002, z: 1}
- name: mixamorig12:LeftHandPinky4
parentName: mixamorig12:LeftHandPinky3
position: {x: -0.000035023717, y: 0.018244034, z: 1.5957624e-10}
rotation: {x: -0, y: -4.4408905e-16, z: 2.0261564e-15, w: 1}
scale: {x: 0.99999994, y: 0.99999994, z: 0.9999996}
- name: mixamorig12:RightShoulder
parentName: mixamorig12:Spine2
position: {x: 0.07052545, y: 0.13011217, z: -0.00217893}
rotation: {x: -0.5600513, y: -0.42639974, z: 0.5777024, w: -0.4132623}
scale: {x: 1.0000004, y: 1.0000004, z: 1}
- name: mixamorig12:RightArm
parentName: mixamorig12:RightShoulder
position: {x: 1.8263126e-10, y: 0.14673144, z: 0.0000000015381119}
rotation: {x: -0.122922614, y: 0.0024821758, z: -0.016826391, w: 0.9922706}
scale: {x: 1.0000001, y: 1, z: 0.9999998}
- name: mixamorig12:RightForeArm
parentName: mixamorig12:RightArm
position: {x: -2.333765e-10, y: 0.2532352, z: -4.2377676e-10}
rotation: {x: 0.04512045, y: 0.0027186042, z: -0.06008195, w: -0.9971695}
scale: {x: 0.99999994, y: 1.0000001, z: 1}
- name: mixamorig12:RightHand
parentName: mixamorig12:RightForeArm
position: {x: 2.4384494e-10, y: 0.2317074, z: -5.1636534e-10}
rotation: {x: 0.06495454, y: 0.104397826, z: 0.0096354615, w: 0.9923655}
scale: {x: 1.0000006, y: 1.0000004, z: 1.0000006}
- name: mixamorig12:RightHandThumb1
parentName: mixamorig12:RightHand
position: {x: -0.029698724, y: 0.031935215, z: 0.013654055}
rotation: {x: 0.04163671, y: -0.017134266, z: 0.32561505, w: 0.9444299}
scale: {x: 1.0000001, y: 1.0000002, z: 1.0000004}
- name: mixamorig12:RightHandThumb2
parentName: mixamorig12:RightHandThumb1
position: {x: -0.0062466864, y: 0.03602076, z: 3.345201e-10}
rotation: {x: 0.018008668, y: -0.0024707303, z: 0.06143257, w: 0.99794567}
scale: {x: 0.99999994, y: 1, z: 0.9999998}
- name: mixamorig12:RightHandThumb3
parentName: mixamorig12:RightHandThumb2
position: {x: 0.000638159, y: 0.033617206, z: 1.5182934e-10}
rotation: {x: -0.015572962, y: -0.002968463, z: 0.060284853, w: 0.99805534}
scale: {x: 1.0000001, y: 1.0000005, z: 1.0000002}
- name: mixamorig12:RightHandThumb4
parentName: mixamorig12:RightHandThumb3
position: {x: 0.0056085316, y: 0.026278399, z: -3.8697578e-10}
rotation: {x: 0.000000029802315, y: -0.000000014900564, z: 1.3252019e-10, w: 1}
scale: {x: 1.0000001, y: 1.0000005, z: 1.0000001}
- name: mixamorig12:RightHandIndex1
parentName: mixamorig12:RightHand
position: {x: -0.036416862, y: 0.09956091, z: 0.0019379945}
rotation: {x: -0.0048945285, y: -0.00018717349, z: 0.038222127, w: 0.9992573}
scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
- name: mixamorig12:RightHandIndex2
parentName: mixamorig12:RightHandIndex1
position: {x: 0.00023058233, y: 0.032779522, z: 2.311654e-10}
rotation: {x: 0.039322667, y: 0.000058840582, z: -0.0030427387, w: 0.999222}
scale: {x: 1.0000001, y: 1.0000002, z: 1}
- name: mixamorig12:RightHandIndex3
parentName: mixamorig12:RightHandIndex2
position: {x: -0.0001343906, y: 0.030515298, z: -4.873877e-10}
rotation: {x: -0.0039153015, y: -0.000000013951425, z: -0.000000043719375, w: 0.9999923}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000005}
- name: mixamorig12:RightHandIndex4
parentName: mixamorig12:RightHandIndex3
position: {x: -0.00009619189, y: 0.025791178, z: -3.3434133e-10}
rotation: {x: -0.00000006705522, y: 0.000000029049133, z: 0.000000053837983,
w: 1}
scale: {x: 0.99999994, y: 0.99999994, z: 0.9999997}
- name: mixamorig12:RightHandMiddle1
parentName: mixamorig12:RightHand
position: {x: -0.010384487, y: 0.09989252, z: -0.0024723613}
rotation: {x: 0.0065229526, y: -0.000023126599, z: -0.0035544825, w: 0.9999724}
scale: {x: 1.0000001, y: 0.9999999, z: 1.0000002}
- name: mixamorig12:RightHandMiddle2
parentName: mixamorig12:RightHandMiddle1
position: {x: 0.00013543024, y: 0.03435296, z: -5.2358473e-12}
rotation: {x: 0.03908789, y: -0.000051136823, z: -0.0027889824, w: 0.9992319}
scale: {x: 1.0000004, y: 1.0000002, z: 1.0000004}
- name: mixamorig12:RightHandMiddle3
parentName: mixamorig12:RightHandMiddle2
position: {x: -0.00020762134, y: 0.03475482, z: 2.0484804e-10}
rotation: {x: -0.039898742, y: 0.00005937499, z: 0.0019069813, w: 0.99920195}
scale: {x: 1.0000002, y: 1.0000001, z: 0.9999998}
- name: mixamorig12:RightHandMiddle4
parentName: mixamorig12:RightHandMiddle3
position: {x: 0.00007219092, y: 0.029935794, z: -3.703326e-10}
rotation: {x: -0.000000022351736, y: 0.000000074673906, z: 0.000000009954602,
w: 1}
scale: {x: 1, y: 0.99999994, z: 1.0000001}
- name: mixamorig12:RightHandRing1
parentName: mixamorig12:RightHand
position: {x: 0.012068116, y: 0.1029892, z: -0.0017840177}
rotation: {x: 0.039477427, y: -0.0018597017, z: -0.0117382845, w: 0.99914986}
scale: {x: 1.0000001, y: 1, z: 1.0000004}
- name: mixamorig12:RightHandRing2
parentName: mixamorig12:RightHandRing1
position: {x: 0.000020799293, y: 0.028453384, z: 3.8890446e-10}
rotation: {x: 0.040500335, y: -0.000048183225, z: -0.0010294096, w: 0.99917907}
scale: {x: 1.0000004, y: 1.0000004, z: 1.0000002}
- name: mixamorig12:RightHandRing3
parentName: mixamorig12:RightHandRing2
position: {x: -0.00014911639, y: 0.028114736, z: -3.897469e-10}
rotation: {x: -0.03805002, y: -0.000005733542, z: 0.0035285829, w: 0.99926966}
scale: {x: 0.99999994, y: 1.0000001, z: 0.99999994}
- name: mixamorig12:RightHandRing4
parentName: mixamorig12:RightHandRing3
position: {x: 0.00012831714, y: 0.023484929, z: 1.4860375e-10}
rotation: {x: -0, y: -7.1054257e-15, z: -0, w: 1}
scale: {x: 1.0000001, y: 0.9999998, z: 0.9999998}
- name: mixamorig12:RightHandPinky1
parentName: mixamorig12:RightHand
position: {x: 0.034733232, y: 0.09218112, z: 0.0005770641}
rotation: {x: 0.030679882, y: -0.0014722418, z: -0.016122134, w: 0.9993982}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000004}
- name: mixamorig12:RightHandPinky2
parentName: mixamorig12:RightHandPinky1
position: {x: 0.00012739787, y: 0.027446836, z: 6.8187855e-10}
rotation: {x: 0.03818278, y: -0.00004339694, z: -0.0033976452, w: 0.9992651}
scale: {x: 1.0000001, y: 1.0000005, z: 1.0000004}
- name: mixamorig12:RightHandPinky3
parentName: mixamorig12:RightHandPinky2
position: {x: -0.00013406907, y: 0.022776248, z: 9.24025e-10}
rotation: {x: -0.04038692, y: 0.0000647176, z: 0.0011422407, w: 0.9991835}
scale: {x: 1.0000004, y: 1.0000002, z: 1.0000004}
- name: mixamorig12:RightHandPinky4
parentName: mixamorig12:RightHandPinky3
position: {x: 0.00000667121, y: 0.01904086, z: 2.5196442e-10}
rotation: {x: 0.000000007450578, y: -0, z: 4.4408905e-16, w: 1}
scale: {x: 1.0000004, y: 1.0000004, z: 1.0000001}
- name: mixamorig12:LeftUpLeg
parentName: mixamorig12:Hips
position: {x: -0.098160215, y: -0.0559243, z: -0.0031067634}
rotation: {x: 0.0010837619, y: -0.03646751, z: 0.99889326, w: 0.02968566}
scale: {x: 1.0000007, y: 1.0000007, z: 1}
- name: mixamorig12:LeftLeg
parentName: mixamorig12:LeftUpLeg
position: {x: -2.9677097e-10, y: 0.42845702, z: 0.0000000015566517}
rotation: {x: -0.003060284, y: 0.0000006232876, z: -0.00020355047, w: 0.9999953}
scale: {x: 0.99999994, y: 1.0000005, z: 1}
- name: mixamorig12:LeftFoot
parentName: mixamorig12:LeftLeg
position: {x: 6.60919e-10, y: 0.3938408, z: -5.236848e-10}
rotation: {x: 0.51333416, y: 0.045378257, z: -0.027195165, w: 0.85655665}
scale: {x: 1.0000014, y: 1.0000012, z: 1.0000005}
- name: mixamorig12:LeftToeBase
parentName: mixamorig12:LeftFoot
position: {x: 3.9167347e-10, y: 0.19011593, z: -0.0000000039287062}
rotation: {x: 0.2939421, y: 0.0802138, z: -0.024763687, w: 0.95212954}
scale: {x: 1, y: 1.000001, z: 0.99999887}
- name: mixamorig12:LeftToe_End
parentName: mixamorig12:LeftToeBase
position: {x: 1.8094361e-11, y: 0.0784396, z: -2.0653047e-11}
rotation: {x: -0, y: -0.000000007450581, z: -0, w: 1}
scale: {x: 1.0000005, y: 1.0000006, z: 1}
- name: mixamorig12:RightUpLeg
parentName: mixamorig12:Hips
position: {x: 0.098160215, y: -0.0559243, z: -0.003559811}
rotation: {x: -0.0010036544, y: -0.03375912, z: 0.99898815, w: -0.029699793}
scale: {x: 1.0000002, y: 1.0000002, z: 1}
- name: mixamorig12:RightLeg
parentName: mixamorig12:RightUpLeg
position: {x: 1.4620073e-10, y: 0.4282941, z: -1.1409008e-10}
rotation: {x: -0.022857703, y: -0.0000028500797, z: 0.00012463576, w: 0.99973875}
scale: {x: 1.0000015, y: 1.0000018, z: 1}
- name: mixamorig12:RightFoot
parentName: mixamorig12:RightLeg
position: {x: -5.481713e-10, y: 0.39513722, z: 4.597605e-10}
rotation: {x: 0.543508, y: -0.0403946, z: 0.026198335, w: 0.8380221}
scale: {x: 1.0000005, y: 1.0000004, z: 0.9999998}
- name: mixamorig12:RightToeBase
parentName: mixamorig12:RightFoot
position: {x: -0.000000001179555, y: 0.20187956, z: -0.0000000017984139}
rotation: {x: 0.2770794, y: -0.09572783, z: 0.027754735, w: 0.9556636}
scale: {x: 1.0000015, y: 1.0000018, z: 0.99999994}
- name: mixamorig12:RightToe_End
parentName: mixamorig12:RightToeBase
position: {x: 1.4516897e-10, y: 0.07753454, z: -5.1183e-11}
rotation: {x: -0, y: -0.000000007450579, z: -0, w: 1}
scale: {x: 1.000001, y: 1.0000007, z: 1.0000002}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
@@ -124,14 +898,16 @@ ModelImporter:
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: c7aee9fe903ac4249bb0cb2b84bfa76b,
type: 2}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
animationType: 3
humanoidOversampling: 1
avatarSetup: 0
avatarSetup: 2
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
Assets/Prefabs/Bed.prefab
+3 -3
View File
@@ -85,7 +85,7 @@ Transform:
- {fileID: 6083021128705139609}
- {fileID: 168138392062545360}
m_Father: {fileID: 0}
m_RootOrder: -1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!65 &168138393772344588
BoxCollider:
@@ -144,8 +144,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4960435320984939974}
m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.2, y: 0, z: 0.85}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.20000544, y: 0, z: 0.8500352}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Assets/Scenes/TestOffice.unity
+5 -1051
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/TestRoom.unity
+5 -19
View File
@@ -1004,7 +1004,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 871823189}
- component: {fileID: 871823188}
- component: {fileID: 871823187}
- component: {fileID: 871823185}
- component: {fileID: 871823190}
@@ -1064,21 +1063,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &871823188
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 871823183}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c802a0d9d32b0c04b841113e87b83e4b, type: 3}
m_Name:
m_EditorClassIdentifier:
_navAgent: {fileID: 871823190}
_animator: {fileID: 1476341268}
allowMovement: 1
--- !u!4 &871823189
Transform:
m_ObjectHideFlags: 0
@@ -1087,7 +1071,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 871823183}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0.05, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -1157,7 +1141,7 @@ CharacterController:
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
m_Center: {x: 0, y: 1, z: 0}
--- !u!1001 &890616016
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1194,7 +1178,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 32790d47acc86814982f18993097a759,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.0461
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 32790d47acc86814982f18993097a759,
type: 3}
@@ -2603,6 +2587,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ae5ecbfd9a3637247b4cd539f9a57316, type: 3}
m_Name:
m_EditorClassIdentifier:
_playerArrivePoint: {fileID: 1359374191}
_particleSystem: {fileID: 1359374190}
_wayPoint: {fileID: 1183172157}
--- !u!1 &1184343256
@@ -8205,6 +8190,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 1
_camera: {fileID: 963194227}
_waypointVisual: {fileID: 1183172158}
--- !u!4 &1689632238
Transform:
m_ObjectHideFlags: 0
Assets/Scripts/InteractableObjects/Bed.cs
+3 -1
View File
@@ -5,7 +5,9 @@ public class Bed : BaseInteractableObject
{
public override void Interact(Player player)
{
Debug.Log("Interact with bed");
Debug.Log("rotate player");
player.Rotate(_playerArrivePoint.transform.forward);
Debug.Log("Sitting");
player.SetPlayerState(ActionStates.Sitting);
}
}
Assets/Scripts/MouseInputManager.cs
+5 -2
View File
@@ -10,6 +10,8 @@ public class MouseInputManager : MonoBehaviour
private LayerMask _walkableLayerMask;
[SerializeField]
private Camera _camera;
[SerializeField]
private WaypointVisual _waypointVisual;
public event EventHandler<OnSelectedObjectChangedEventArgs> OnSelectedObjectChanged;
@@ -36,7 +38,7 @@ public class MouseInputManager : MonoBehaviour
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = baseObject });
if (Input.GetMouseButtonDown(0))
{
Player.Instance.AddTask(new PlayerTasks(Tasks.Move, baseObject._playerArrivePoint.position));
_waypointVisual.SetWaypoint(baseObject._playerArrivePoint.position);
Player.Instance.AddTask(new PlayerTasks(Tasks.Interact, baseObject));
}
}
@@ -52,7 +54,8 @@ public class MouseInputManager : MonoBehaviour
{
if (Physics.Raycast(_camera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit, 100f, _walkableLayerMask))
{
Player.Instance.AddTask(new PlayerTasks(Tasks.Move, hit.point));
_waypointVisual.SetWaypoint(hit.point);
Player.Instance.AddTask(new PlayerTasks(Tasks.Move, _waypointVisual));
}
}
}
Assets/Scripts/Player.cs
+22 -15
View File
@@ -1,5 +1,4 @@
using Assets.Scripts.Actions.Interfaces;
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
@@ -9,9 +8,6 @@ public enum TaskStatus { Waiting, InProgress, Complete };
public enum ActionStates { Idle, Walking, Sleeping, Sitting };
public class Player : MonoBehaviour
{
public event EventHandler<OnPlayerMovesEventArgs> OnPlayerMoves;
public static Player Instance { get; private set; }
[SerializeField]
@@ -37,6 +33,7 @@ public class Player : MonoBehaviour
private void Awake()
{
if (Instance != null)
{
Debug.Log("There's more than one player instance");
@@ -65,15 +62,23 @@ public class Player : MonoBehaviour
}
if (_currentTask != null)
{
if (_currentTask.Status == TaskStatus.Waiting)
Debug.Log($"Current task {_currentTask.Task}");
switch (_currentTask.Task)
{
case Tasks.Move:
OnPlayerMoves?.Invoke(this, new OnPlayerMovesEventArgs() { PointToMove = _currentTask.Position });
_navAgent.SetDestination(_currentTask.Position);
_navAgent.SetDestination(_currentTask.TagretObject._playerArrivePoint.position);
_currentTask.UpdateStatus(MoveToPoint());
break;
case Tasks.Interact:
_currentTask.UpdateStatus(InteractWithObject(_currentTask.Interactable));
if (pathComplete(_currentTask.TagretObject._playerArrivePoint.position))
_currentTask.UpdateStatus(InteractWithObject(_currentTask.TagretObject));
else
{
AddTask(new PlayerTasks(Tasks.Move, _currentTask.TagretObject));
AddTask(_currentTask);
_currentTask = null;
}
break;
}
}
@@ -97,12 +102,17 @@ public class Player : MonoBehaviour
_animator.SetFloat(WALK_VELOCITY, velocity.y);
}
return pathComplete() ? TaskStatus.Complete : TaskStatus.InProgress;
return pathComplete(_navAgent.destination) ? TaskStatus.Complete : TaskStatus.InProgress;
}
private bool pathComplete()
public void Rotate(Vector3 target)
{
if (Vector3.Distance(_navAgent.destination, _navAgent.transform.position) <= _navAgent.radius)
Quaternion rotation = Quaternion.LookRotation(target);
transform.rotation = rotation;
}
private bool pathComplete(Vector3 destination)
{
if (Vector3.Distance(destination, _navAgent.transform.position) <= _navAgent.radius)
{
if (!_navAgent.hasPath || _navAgent.velocity.sqrMagnitude == 0f)
{
@@ -126,19 +136,16 @@ public class Player : MonoBehaviour
{
case ActionStates.Idle:
_animator.SetBool(WALK, false);
break;
case ActionStates.Walking when _currentState == ActionStates.Sitting:
_animator.SetBool(SIT_DOWN, false);
_animator.SetBool(SIT_DOWN, true);
_animator.SetBool(WALK, true);
break;
case ActionStates.Walking:
_animator.SetBool(WALK, true);
break;
case ActionStates.Sleeping:
break;
break;
case ActionStates.Sitting:
_animator.SetBool(SIT_DOWN, true);
break;
}
_currentState = newState;
Assets/Scripts/PlayerTask.cs
+5 -14
View File
@@ -1,25 +1,16 @@
using UnityEngine;
public class PlayerTasks
public class PlayerTasks
{
public Tasks Task { get; private set; }
public Vector3 Position { get; private set; }
public BaseInteractableObject Interactable { get; private set; }
public BaseInteractableObject TagretObject { get; private set; }
public TaskStatus Status { get; private set; }
public PlayerTasks(Tasks task, Vector3 position)
public PlayerTasks(Tasks task, BaseInteractableObject gameObject)
{
Task = task;
Position = position;
Status = TaskStatus.Waiting;
}
public PlayerTasks(Tasks task, BaseInteractableObject interactable)
{
Task = task;
Interactable = interactable;
TagretObject = gameObject;
Status = TaskStatus.Waiting;
}
public void UpdateStatus(TaskStatus status)
{
Status = status;
Assets/Scripts/WaypointVisual.cs
+3 -13
View File
@@ -1,25 +1,15 @@
using UnityEngine;
public class WaypointVisual : MonoBehaviour
public class WaypointVisual : BaseInteractableObject
{
[SerializeField]
private ParticleSystem _particleSystem;
[SerializeField]
private Transform _wayPoint;
private void Start()
public void SetWaypoint(Vector3 position)
{
Player.Instance.OnPlayerMoves += Instance_OnPlayerMoves;
}
private void Instance_OnPlayerMoves(object sender, OnPlayerMovesEventArgs e)
{
_wayPoint.position = e.PointToMove;
_wayPoint.position = position;
_particleSystem.Play();
}
private void OnDestroy()
{
Player.Instance.OnPlayerMoves -= Instance_OnPlayerMoves;
}
}