Commit 5bf2448d authored by Jenny's avatar Jenny
Browse files

changed guardian, navmesh, player

altered character controller size, changed some settings in navmesh agent, made guardian smaller because it found it difficult to move through the terrain
parent 12c3e75c
......@@ -125,7 +125,7 @@ Transform:
m_GameObject: {fileID: 8290180863757099523}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.67, y: -0.14, z: 0.6469784}
m_LocalScale: {x: 10, y: 15, z: 10}
m_LocalScale: {x: 5, y: 7.5, z: 5}
m_Children:
- {fileID: 8290180865829253146}
- {fileID: 8290180865069353615}
......@@ -216,12 +216,12 @@ NavMeshAgent:
m_GameObject: {fileID: 8290180863757099523}
m_Enabled: 1
m_AgentTypeID: 0
m_Radius: 1
m_Speed: 6
m_Radius: 3
m_Speed: 8
m_Acceleration: 4
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 8
m_StoppingDistance: 5
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
......@@ -254,10 +254,10 @@ Rigidbody:
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
m_CollisionDetection: 1
--- !u!1 &8290180865069353648
GameObject:
m_ObjectHideFlags: 0
......
......@@ -108,7 +108,7 @@ NavMeshSettings:
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 50
agentSlope: 40
agentClimb: 0.4
ledgeDropHeight: 6
maxJumpAcrossDistance: 2
......@@ -548,125 +548,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 160788130}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &160811730
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 180372361}
m_Modifications:
- target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Size.x
value: 9
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
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.x
value: 55.7
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.2
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.z
value: 21.9
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Name
value: Candle (1)
objectReference: {fileID: 0}
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_TagString
value: Candle
objectReference: {fileID: 0}
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_NavMeshLayer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_StaticEditorFlags
value: 8
objectReference: {fileID: 0}
- target: {fileID: 8374587950931898382, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: ae0bfd19e9a2b6043844b23723990014, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3}
--- !u!1001 &163319218
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -804,7 +685,6 @@ Transform:
- {fileID: 1719282225}
- {fileID: 2100558566}
- {fileID: 561595812}
- {fileID: 1955424750}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -838,7 +718,7 @@ PrefabInstance:
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
propertyPath: m_LocalScale.z
value: 10
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
......@@ -3315,7 +3195,7 @@ CapsuleCollider:
m_GameObject: {fileID: 904994740}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Enabled: 0
m_Radius: 0.5000001
m_Height: 2
m_Direction: 1
......@@ -3741,6 +3621,11 @@ PrefabInstance:
propertyPath: spawner
value:
objectReference: {fileID: 316925537}
- target: {fileID: 4458490627964580066, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
propertyPath: spawnpoint
value:
objectReference: {fileID: 904994740}
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
propertyPath: m_RootOrder
......@@ -3764,7 +3649,7 @@ PrefabInstance:
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
propertyPath: m_LocalPosition.x
value: 62.8
value: 29.3
objectReference: {fileID: 0}
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
......@@ -3774,7 +3659,7 @@ PrefabInstance:
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
propertyPath: m_LocalPosition.z
value: 41.7
value: 8.3
objectReference: {fileID: 0}
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
......@@ -4124,7 +4009,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-17254
m_Name: pb_Mesh-1990
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
......@@ -4586,7 +4471,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1357844767}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 59.22998, y: -0.85, z: 41.69998}
m_LocalPosition: {x: 25.72998, y: -0.85, z: 8.299988}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 904994741}
......@@ -5027,7 +4912,7 @@ PrefabInstance:
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.z
value: 7.200012
value: 19.68
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
......@@ -5591,7 +5476,7 @@ PrefabInstance:
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.z
value: -2.169983
value: 18.63
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
......@@ -6079,12 +5964,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -153830957423991239, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3}
--- !u!4 &1955424750 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
m_PrefabInstance: {fileID: 160811730}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1975519961 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2800250516343163423, guid: f9345dcbfea81854893a2aaccb47b1d0,
......@@ -6384,7 +6263,7 @@ PrefabInstance:
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
propertyPath: m_LocalScale.z
value: 10
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
......@@ -6485,7 +6364,7 @@ PrefabInstance:
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
propertyPath: m_LocalScale.z
value: 10
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7656825943587747004, guid: 4d14c61cba0e5914980f872639cea161,
type: 3}
......@@ -6707,7 +6586,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-17240
m_Name: pb_Mesh-1976
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
......@@ -6894,17 +6773,17 @@ PrefabInstance:
- target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed,
type: 3}
propertyPath: m_LocalPosition.x
value: 35.94
value: 22.55
objectReference: {fileID: 0}
- target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.45
value: -1.6
objectReference: {fileID: 0}
- target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed,
type: 3}
propertyPath: m_LocalPosition.z
value: 7.58
value: 17.8
objectReference: {fileID: 0}
- target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed,
type: 3}
......@@ -7038,7 +6917,7 @@ PrefabInstance:
- target: {fileID: 1331997591070191855, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Radius
value: 1.4
value: 1.25
objectReference: {fileID: 0}
- target: {fileID: 1331997591070191855, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
......@@ -7154,6 +7033,21 @@ PrefabInstance:
propertyPath: m_Name
value: Cave
objectReference: {fileID: 0}
- target: {fileID: 1837626735706945503, guid: d00c56a8551811a4693168c821149f14,
type: 3}
propertyPath: m_Size.x
value: 45
objectReference: {fileID: 0}
- target: {fileID: 1837626735706945503, guid: d00c56a8551811a4693168c821149f14,
type: 3}
propertyPath: m_Size.y
value: 35
objectReference: {fileID: 0}
- target: {fileID: 1837626735706945503, guid: d00c56a8551811a4693168c821149f14,
type: 3}
propertyPath: m_Size.z
value: 45
objectReference: {fileID: 0}
- target: {fileID: 1837626735884029873, guid: d00c56a8551811a4693168c821149f14,
type: 3}
propertyPath: m_Mesh
......
......@@ -22,8 +22,6 @@ public class GuardianScript : MonoBehaviour
private void FixedUpdate()
{
/*
if (canFollow)
{
RaycastHit hit;
......@@ -38,7 +36,6 @@ public class GuardianScript : MonoBehaviour
}
}
}
*/
}
private void OnTriggerEnter(Collider other)
......
......@@ -6,6 +6,7 @@ public class StatueScript : MonoBehaviour
{
public bool canSpawn;
public GameObject guardian;
public GameObject spawnpoint;
public Transform spawner;
private void OnTriggerEnter(Collider other)
......@@ -20,6 +21,7 @@ public class StatueScript : MonoBehaviour
Destroy(gameObject);
Quaternion spawnRotation = Quaternion.Euler(0, 90, 0);
Instantiate(guardian, spawner.transform.position, spawnRotation);
}
}
}
Supports Markdown
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