diff --git a/Assets/Animation.meta b/Assets/Animation.meta new file mode 100644 index 0000000..587451a --- /dev/null +++ b/Assets/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db060f846b2c3784d97cadbf19550799 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Animators.meta b/Assets/Animation/Animators.meta new file mode 100644 index 0000000..4fccb5b --- /dev/null +++ b/Assets/Animation/Animators.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64e7fe990ffe04345b1922c2a025ce67 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Animators/Astronaut.controller b/Assets/Animation/Animators/Astronaut.controller new file mode 100644 index 0000000..06e3936 --- /dev/null +++ b/Assets/Animation/Animators/Astronaut.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7671929355318553802 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: freefall + 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: 4781951162920444690, guid: b4a44e219380ad24791663fabf859429, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Astronaut + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 4259102256568785523} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &4259102256568785523 +AnimatorStateMachine: + serializedVersion: 5 + 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: -7671929355318553802} + m_Position: {x: 190, y: 220, 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: -7671929355318553802} diff --git a/Assets/Animation/Animators/Astronaut.controller.meta b/Assets/Animation/Animators/Astronaut.controller.meta new file mode 100644 index 0000000..b846c9b --- /dev/null +++ b/Assets/Animation/Animators/Astronaut.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9413358cc140ddb40b9b12dbf4e78503 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/blenderAstronaut.meta b/Assets/Models/blenderAstronaut.meta new file mode 100644 index 0000000..ab2d8fd --- /dev/null +++ b/Assets/Models/blenderAstronaut.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf1ed33dbf34ab94aa891776a39dcb60 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/blenderAstronaut/astronaut.fbx b/Assets/Models/blenderAstronaut/astronaut.fbx new file mode 100644 index 0000000..e843f1a --- /dev/null +++ b/Assets/Models/blenderAstronaut/astronaut.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f50712b140b210a65b529bb716d1b63efc632b635966a3e7287d52b5570d60c +size 89788 diff --git a/Assets/Models/blenderAstronaut/astronaut.fbx.meta b/Assets/Models/blenderAstronaut/astronaut.fbx.meta new file mode 100644 index 0000000..530b8c4 --- /dev/null +++ b/Assets/Models/blenderAstronaut/astronaut.fbx.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: b4a44e219380ad24791663fabf859429 +ModelImporter: + serializedVersion: 19300 + internalIDToNameTable: + - first: + 74: 4781951162920444690 + second: Armature|ArmatureAction + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Armature|ArmatureAction + takeName: Armature|ArmatureAction + internalID: 0 + firstFrame: 0 + lastFrame: 32 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 6881dbd..84966a4 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -213,30 +213,90 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1513326986 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1147752367711628, guid: 2abf19653d633114faedf3b60dc6c39f, - type: 3} - m_PrefabInstance: {fileID: 1996846120} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1513326989 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, - type: 3} - m_PrefabInstance: {fileID: 1996846120} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1513326991 -MonoBehaviour: +--- !u!1001 &1681759393 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1513326986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fd45fa67769add84e8891ea8bd34501c, type: 3} - m_Name: - m_EditorClassIdentifier: + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.0052768 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.34627 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.070607 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalScale.x + value: 0.51276 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalScale.y + value: 0.51276 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_LocalScale.z + value: 0.51276 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: b4a44e219380ad24791663fabf859429, + type: 3} + propertyPath: m_Name + value: astronaut + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b4a44e219380ad24791663fabf859429, type: 3} --- !u!1 &1776123905 GameObject: m_ObjectHideFlags: 0 @@ -333,81 +393,45 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ecb3ade77ab8db94eb95033d99c98f02, type: 3} m_Name: m_EditorClassIdentifier: - target: {fileID: 1513326989} + target: {fileID: 0} smoothSpeed: 0.125 offset: {x: 0, y: 0.44, z: -3.77} ---- !u!1001 &1996846120 -PrefabInstance: +--- !u!1 &1803163820 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: b4a44e219380ad24791663fabf859429, + type: 3} + m_PrefabInstance: {fileID: 1681759393} + m_PrefabAsset: {fileID: 0} +--- !u!136 &1803163821 +CapsuleCollider: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1147752367711628, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_Name - value: player - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4268597916284530, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - propertyPath: m_LocalScale.z - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114551384804589004, guid: 2abf19653d633114faedf3b60dc6c39f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 114551384804589004, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 2abf19653d633114faedf3b60dc6c39f, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803163820} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.98116624 + m_Height: 3.061286 + m_Direction: 1 + m_Center: {x: -0.07956513, y: 0.6298849, z: -0.2035195} +--- !u!95 &1803163822 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803163820} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9413358cc140ddb40b9b12dbf4e78503, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index c6e423d..43ea847 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,8 +2,8 @@ "dependencies": { "com.unity.collab-proxy": "1.2.16", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.1.4", - "com.unity.test-framework": "1.1.11", + "com.unity.ide.vscode": "1.2.0", + "com.unity.test-framework": "1.1.13", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.12", "com.unity.ugui": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e51db95..beea0cc 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.5f1 -m_EditorVersionWithRevision: 2019.3.5f1 (d691e07d38ef) +m_EditorVersion: 2019.3.13f1 +m_EditorVersionWithRevision: 2019.3.13f1 (d4ddf0d95db9)