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

Merge branch 'main' into origin/main

parents 15331ac0 c90c303c
......@@ -217,7 +217,7 @@ NavMeshAgent:
m_Enabled: 1
m_AgentTypeID: 0
m_Radius: 3
m_Speed: 8
m_Speed: 5
m_Acceleration: 4
avoidancePriority: 50
m_AngularSpeed: 120
......@@ -252,11 +252,11 @@ Rigidbody:
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_AngularDrag: 0.5
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_Constraints: 126
m_CollisionDetection: 1
--- !u!1 &8290180865069353648
GameObject:
......
......@@ -700,6 +700,7 @@ Transform:
- {fileID: 1719282225}
- {fileID: 2100558566}
- {fileID: 561595812}
- {fileID: 1122512875}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -901,6 +902,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8633474279373035782, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.730259
objectReference: {fileID: 0}
- target: {fileID: -8633474279373035782, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -966,6 +972,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2}
- target: {fileID: -5093995023089752759, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.56201
objectReference: {fileID: 0}
- target: {fileID: -5093995023089752759, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -986,6 +997,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2}
- target: {fileID: -4699073531199927196, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.5487459
objectReference: {fileID: 0}
- target: {fileID: -4699073531199927196, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -1006,6 +1022,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2}
- target: {fileID: -2762262359140785493, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.5461547
objectReference: {fileID: 0}
- target: {fileID: -2762262359140785493, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -1051,6 +1072,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2}
- target: {fileID: -316598237727293225, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.5471525
objectReference: {fileID: 0}
- target: {fileID: -316598237727293225, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -1091,6 +1117,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2}
- target: {fileID: 1341056751160186723, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.7154014
objectReference: {fileID: 0}
- target: {fileID: 1341056751160186723, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -1131,6 +1162,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2}
- target: {fileID: 5371671862244809227, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.7286656
objectReference: {fileID: 0}
- target: {fileID: 5371671862244809227, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -1141,6 +1177,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2}
- target: {fileID: 6490625522564147758, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.7312567
objectReference: {fileID: 0}
- target: {fileID: 6490625522564147758, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -2222,7 +2263,7 @@ PrefabInstance:
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.704
value: 0.894
objectReference: {fileID: 0}
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
......@@ -3931,6 +3972,131 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1581564273}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1122512874
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: 7.27
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.36
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.z
value: 26.93
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!4 &1122512875 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
m_PrefabInstance: {fileID: 1122512874}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1143309577
GameObject:
m_ObjectHideFlags: 0
......@@ -5037,7 +5203,7 @@ PrefabInstance:
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.705
value: 0.971
objectReference: {fileID: 0}
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
......@@ -6094,7 +6260,7 @@ PrefabInstance:
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.66
value: 0.97
objectReference: {fileID: 0}
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
......@@ -6506,7 +6672,7 @@ PrefabInstance:
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.x
value: 8.83
value: 10.32
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
......
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