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 a1b17ead authored by Jenny's avatar Jenny
Browse files

made mc not float above ground

added animation controller
parent 8d5c009c
fileFormatVersion: 2
guid: e2b166eaaeea7ff4ebf1ae4dc2faaa8b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-280233681994296944
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates: []
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: 0}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Movement
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -280233681994296944}
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}
fileFormatVersion: 2
guid: a130a7efa45a4754fb19024be22f195c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -4899,6 +4899,56 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 2911736426955009642, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3}
--- !u!1 &1498339512
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1498339513}
- component: {fileID: 1498339514}
m_Layer: 0
m_Name: MC Animations
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1498339513
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1498339512}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1527917150}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &1498339514
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1498339512}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: a130a7efa45a4754fb19024be22f195c, 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
--- !u!1 &1507200101 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -6577237425059042219, guid: f9345dcbfea81854893a2aaccb47b1d0,
......@@ -4939,6 +4989,12 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 6240159341419647114, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3}
--- !u!4 &1527917150 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1331997591070191854, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
m_PrefabInstance: {fileID: 1331997589048256817}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1539942896 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -8383124558419344257, guid: f9345dcbfea81854893a2aaccb47b1d0,
......@@ -7154,7 +7210,7 @@ PrefabInstance:
- target: {fileID: 1331997591070191855, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Height
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1331997591070191855, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
......@@ -7166,6 +7222,16 @@ PrefabInstance:
propertyPath: m_Center.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 4460012449808218763, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Height
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4460012449808218763, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4460012449808218773, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Enabled
......@@ -7174,7 +7240,7 @@ PrefabInstance:
- target: {fileID: 4460012449808218774, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.98
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4460012450091516371, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
......
......@@ -58,11 +58,15 @@ public class SCTPSController : MonoBehaviour
public float slopeLimit = 45f;
public bool onGround;
private Animator anim;
void Start()
{
characterController = GetComponent<CharacterController>();
rotation.y = transform.eulerAngles.y;
anim = GetComponentInChildren<Animator>();
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
......@@ -284,4 +288,29 @@ public class SCTPSController : MonoBehaviour
{
QiCount.text = "Qi Amount: " + qiCollected;
}
private void Walk()
{
}
private void Run()
{
}
private void Jump()
{
}
private void Glide()
{
}
private void PickUp()
{
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment