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

Merge branch 'main' into origin/main

parents db5fc788 8b135462
......@@ -859,7 +859,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: -312
value: -312.34
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -904,7 +904,7 @@ PrefabInstance:
- target: {fileID: -8633474279373035782, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.9339387
value: 3.4501314
objectReference: {fileID: 0}
- target: {fileID: -8574120244550949717, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -969,7 +969,7 @@ PrefabInstance:
- target: {fileID: -5093995023089752759, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.2498062
value: 3.7659988
objectReference: {fileID: 0}
- target: {fileID: -4932982780345470907, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -989,7 +989,7 @@ PrefabInstance:
- target: {fileID: -4699073531199927196, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.2498062
value: 3.7659988
objectReference: {fileID: 0}
- target: {fileID: -4683669308469848369, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -1009,7 +1009,7 @@ PrefabInstance:
- target: {fileID: -2762262359140785493, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.2498062
value: 3.7659988
objectReference: {fileID: 0}
- target: {fileID: -1858088320818141857, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -1054,7 +1054,7 @@ PrefabInstance:
- target: {fileID: -316598237727293225, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.2498062
value: 3.766
objectReference: {fileID: 0}
- target: {fileID: -93644311446669682, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -1094,7 +1094,7 @@ PrefabInstance:
- target: {fileID: 1341056751160186723, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.9339387
value: 3.4501314
objectReference: {fileID: 0}
- target: {fileID: 1442450553484104045, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -1134,7 +1134,7 @@ PrefabInstance:
- target: {fileID: 5371671862244809227, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.9339387
value: 3.4501314
objectReference: {fileID: 0}
- target: {fileID: 6148596154634031546, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -1144,7 +1144,7 @@ PrefabInstance:
- target: {fileID: 6490625522564147758, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.9339387
value: 3.4501314
objectReference: {fileID: 0}
- target: {fileID: 6745302439343835087, guid: f9345dcbfea81854893a2aaccb47b1d0,
type: 3}
......@@ -2227,7 +2227,7 @@ PrefabInstance:
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.764
value: -0.238
objectReference: {fileID: 0}
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
......@@ -2663,7 +2663,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &707929333
PrefabInstance:
......@@ -4024,7 +4024,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-1990
m_Name: pb_Mesh-1978
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
......@@ -5042,7 +5042,7 @@ PrefabInstance:
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.7819986
value: -0.229
objectReference: {fileID: 0}
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
......@@ -6099,7 +6099,7 @@ PrefabInstance:
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.76899856
value: -0.248
objectReference: {fileID: 0}
- target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e,
type: 3}
......@@ -6511,12 +6511,12 @@ PrefabInstance:
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.y
value: 9.080008
value: 11.37
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
propertyPath: m_LocalPosition.z
value: 105.31
value: 105.11
objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3}
......@@ -6617,7 +6617,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh-1976
m_Name: pb_Mesh-1964
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
......
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