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 205f8346 authored by ap2x07's avatar ap2x07
Browse files

Merge remote-tracking branch 'origin/YilinEdit' into main

parents 3444b1ae d95362c2
......@@ -121,6 +121,117 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 23800000, guid: cab876e171503d54c8318bc94d20ed99, type: 2}
--- !u!1001 &21438628
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 180372361}
m_Modifications:
- 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.y
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.x
value: 16.55
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.47
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.z
value: 3.72
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: Object (2)
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: Throwable
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: 544816e55505ff74c854951a8d685142, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3}
--- !u!4 &21438629 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
m_PrefabInstance: {fileID: 21438628}
m_PrefabAsset: {fileID: 0}
--- !u!4 &40919620 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
m_PrefabInstance: {fileID: 1096870770}
m_PrefabAsset: {fileID: 0}
--- !u!1 &51949626 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -4636300777304409883, guid: f9345dcbfea81854893a2aaccb47b1d0,
......@@ -685,7 +796,7 @@ Transform:
- {fileID: 1719282225}
- {fileID: 2100558566}
- {fileID: 561595812}
- {fileID: 664158574}
- {fileID: 21438629}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -7020,26 +7131,11 @@ PrefabInstance:
propertyPath: m_Height
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1331997591070191855, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Radius
value: 1.25
objectReference: {fileID: 0}
- target: {fileID: 1331997591070191855, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Center.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 1647107010154582252, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.73
objectReference: {fileID: 0}
- target: {fileID: 1647107010154582252, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_LocalPosition.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4460012449808218773, guid: 2342577add2bab844a55e25cc4fea601,
type: 3}
propertyPath: m_Enabled
......
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