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

changed mc, obstacle course, talismans, etc.

made character controller bigger, changed obstacle course to make it suitable for bigger guardian, moved talisman to archive and retagged it as candle, made statue the same size as guardian
parent 3835f531
......@@ -30,7 +30,6 @@ Transform:
m_LocalPosition: {x: 0, y: 1.99, z: 0}
m_LocalScale: {x: 22.94349, y: 33.04362, z: 12.552623}
m_Children:
- {fileID: 6869259590398635928}
- {fileID: 8388541015277769129}
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -126,7 +125,7 @@ Transform:
m_LocalScale: {x: 0.17364845, y: 0.11768117, z: 0.3097848}
m_Children: []
m_Father: {fileID: 8388541013764238855}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8388541015277769131
MeshFilter:
......@@ -178,98 +177,3 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1001 &8388541014209397844
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8388541013764238855}
m_Modifications:
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalScale.x
value: 0.008281217
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalScale.y
value: 0.005749975
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalScale.z
value: 0.01513628
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.056312285
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.006324973
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.0015136332
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.000000021855694
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642063, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_Name
value: Destination
objectReference: {fileID: 0}
- target: {fileID: 3116093642567642063, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bc271370cbd058d469e5f06f640871a5, type: 3}
--- !u!4 &6869259590398635928 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3116093642567642060, guid: bc271370cbd058d469e5f06f640871a5,
type: 3}
m_PrefabInstance: {fileID: 8388541014209397844}
m_PrefabAsset: {fileID: 0}
This diff is collapsed.
......@@ -22,6 +22,8 @@ public class GuardianScript : MonoBehaviour
private void FixedUpdate()
{
/*
if (canFollow)
{
RaycastHit hit;
......@@ -36,6 +38,7 @@ public class GuardianScript : MonoBehaviour
}
}
}
*/
}
private void OnTriggerEnter(Collider other)
......
......@@ -39,7 +39,6 @@ public class PlayerPickUp : MonoBehaviour
{
ObjectIWantToPickUp.GetComponent<Rigidbody>().velocity = Vector3.zero;
ObjectIWantToPickUp.GetComponent<Rigidbody>().constraints = RigidbodyConstraints.FreezeRotation;
ObjectIWantToPickUp.GetComponent<Rigidbody>().constraints = RigidbodyConstraints.FreezePosition;
if (ObjectIWantToPickUp.tag == "Throwable")
{
......
......@@ -10,7 +10,7 @@ public class StatueScript : MonoBehaviour
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.tag == "Talisman")
if (other.gameObject.tag == "Candle")
{
canSpawn = true;
}
......
......@@ -12,6 +12,7 @@ TagManager:
- Talisman
- Lure
- Cave
- Candle
layers:
- Default
- TransparentFX
......
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