Administrator approval is now required for registering new accounts. If you are registering a new account, and are external to the University, please ask the repository owner to contact ServiceLine to request your account be approved. Repository owners must include the newly registered email address, and specific repository in the request for approval.

Commit b2518659 authored by Jenny's avatar Jenny
Browse files

implemented all basic animations

except activate guardian cos not sure we need it - could have it be part of a larger awakening animation/cut scene
parent 78227f00
......@@ -26,7 +26,7 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
......@@ -91,13 +91,13 @@ ModelImporter:
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
animationType: 3
humanoidOversampling: 1
avatarSetup: 0
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
......
fileFormatVersion: 2
guid: b63853c2a526b2642b9e0330cd389f6d
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
74: -203655887218126122
second: mixamo.com
externalObjects: {}
materials:
materialImportMode: 2
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: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
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
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -26,7 +26,7 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
......@@ -91,13 +91,13 @@ ModelImporter:
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
animationType: 3
humanoidOversampling: 1
avatarSetup: 0
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
......
This diff is collapsed.
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-3711777729671264661
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: PickUp
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1738909679716458128}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.903537
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3623236038910904520
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: PickUp
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1194338768271148849}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-3440396586697471135
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump
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: -203655887218126122, guid: b63853c2a526b2642b9e0330cd389f6d,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-1738909679716458128
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Picking
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3623236038910904520}
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: -203655887218126122, guid: 6e87e845d8792fb46af3db43bf045a5b,
type: 3}
m_Tag:
m_SpeedParameter: AnimSpeed
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-1194338768271148849
AnimatorState:
serializedVersion: 6
......@@ -10,7 +115,9 @@ AnimatorState:
m_Name: Movement
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: 5949650201554861832}
- {fileID: -3711777729671264661}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -59,7 +166,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Movement
m_Name: Walk&Run Movement
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Speed
......@@ -68,6 +175,24 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Jump
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: AnimSpeed
m_Type: 1
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: PickUp
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
......@@ -90,23 +215,41 @@ BlendTree:
m_Name: Blend Tree
m_Childs:
- serializedVersion: 2
m_Motion: {fileID: -203655887218126122, guid: a241555694cc7dd479079987f1bc0709,
m_Motion: {fileID: -203655887218126122, guid: 1623875f3821aaf45b2ac750bd9c417c,
type: 3}
m_Threshold: 0
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: Speed
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: -203655887218126122, guid: a241555694cc7dd479079987f1bc0709,
type: 3}
m_Threshold: 0.33333334
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: Blend
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: -203655887218126122, guid: 577610a62f20f6f4fa2e54c3e6ae8201,
type: 3}
m_Threshold: 1
m_Threshold: 0.6666667
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: Blend
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: -203655887218126122, guid: 1760928a173bf91459ce945e14bbb44d,
type: 3}
m_Threshold: 1
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: Speed
m_Mirror: 0
m_BlendParameter: Speed
m_BlendParameterY: Blend
m_MinThreshold: 0
......@@ -126,6 +269,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -1194338768271148849}
m_Position: {x: 378.02396, y: 165.14769, z: 0}
- serializedVersion: 1
m_State: {fileID: 6424911460868658083}
m_Position: {x: 540, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -1738909679716458128}
m_Position: {x: 270, y: 60, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......@@ -136,3 +285,103 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1194338768271148849}
--- !u!1101 &5276141037687623862
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: Jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1194338768271148849}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.70000005
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5949650201554861832
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: Jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6424911460868658083}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.903537
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &6424911460868658083
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jumping
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions:
- {fileID: 5276141037687623862}
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: -203655887218126122, guid: b63853c2a526b2642b9e0330cd389f6d,
type: 3}
m_Tag:
m_SpeedParameter: AnimSpeed
m_MirrorParameter:
m_CycleOffsetParameter: Speed
m_TimeParameter: Speed
--- !u!1101 &6964413758257151049
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: -3440396586697471135}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.903537
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
......@@ -5336,7 +5336,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-74200
m_Name: pb_Mesh-7834
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
......@@ -6077,7 +6077,7 @@ PrefabInstance:
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.x
value: 9
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
......@@ -6087,7 +6087,7 @@ PrefabInstance:
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.z
value: 3
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
......@@ -6494,6 +6494,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 180372361}
m_Modifications:
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.z
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_RootOrder
......@@ -7278,6 +7293,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 180372361}
m_Modifications:
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.z
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_RootOrder
......@@ -9272,7 +9302,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-74188
m_Name: pb_Mesh-7822
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
......@@ -9437,6 +9467,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 180372361}
m_Modifications:
- target: {fileID: 3752708378666022456, guid: 191e7f512cc777648a8866ec5318a7d8,
type: 3}
propertyPath: m_Size.x
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3752708378666022456, guid: 191e7f512cc777648a8866ec5318a7d8,
type: 3}
propertyPath: m_Size.z
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8,
type: 3}
propertyPath: m_RootOrder
......@@ -9556,6 +9596,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1331997591070191852, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: pushPower
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1331997591070191852, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: glideForward
......
......@@ -14,11 +14,15 @@ public class PlayerPickUp : MonoBehaviour
public bool canThrow;
private Animator anim;
void Start()
{
interactiveobjects = new List<GameObject>();
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
anim = GetComponentInChildren<Animator>();
}
void Update()
{
......@@ -26,7 +30,9 @@ public class PlayerPickUp : MonoBehaviour
{
if (!hasItem && interactiveobjects.Count > 0)
{
PickUpObject();
PlayPickUpAnim();
//PickUpObject();
Invoke("PickUpObject", 1);