Commit 641f1bb2 authored by radow's avatar radow
Browse files

bunch of non VR fixes

parent b120caf6
This diff is collapsed.
......@@ -926,7 +926,7 @@ Transform:
- {fileID: 201675247}
- {fileID: 509227169}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &23277053
PrefabInstance:
......@@ -5092,7 +5092,7 @@ Transform:
- {fileID: 446766832}
- {fileID: 4521048158307690193}
m_Father: {fileID: 0}
m_RootOrder: 17
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &146012691
GameObject:
......@@ -9260,7 +9260,7 @@ Transform:
- {fileID: 778488607}
- {fileID: 664252158}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &273892457
GameObject:
......@@ -16543,7 +16543,7 @@ Transform:
- {fileID: 1197026542}
- {fileID: 372204087}
m_Father: {fileID: 0}
m_RootOrder: 22
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &532270143
GameObject:
......@@ -22232,7 +22232,7 @@ Transform:
- {fileID: 926710063}
- {fileID: 357089496}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &677778978 stripped
Transform:
......@@ -23170,7 +23170,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 91.53, y: -0.000015258789, z: -0.000015258789}
--- !u!4 &700841979 stripped
Transform:
......@@ -32711,7 +32711,7 @@ Transform:
- {fileID: 1987579059}
- {fileID: 1079474778}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &959141522
GameObject:
......@@ -37160,6 +37160,80 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1098360587}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1098609258
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1318081317761960746, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: keyIcon
value:
objectReference: {fileID: 689491476}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalPosition.x
value: 436.33832
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalPosition.z
value: 479.08
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.008930655
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalRotation.z
value: -4.6566134e-10
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9999601
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -1.023
objectReference: {fileID: 0}
- target: {fileID: 5270556170465045441, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9187236799722363346, guid: d2dedffe6c3f1d34eaf77f48fdfc3349,
type: 3}
propertyPath: m_Name
value: Gate (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d2dedffe6c3f1d34eaf77f48fdfc3349, type: 3}
--- !u!1001 &1098693836
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -46130,6 +46204,11 @@ PrefabInstance:
propertyPath: m_Name
value: Gate (1)
objectReference: {fileID: 0}
- target: {fileID: 7869297941436253532, guid: 649c24de1e0ee3b4fa819c393be75824,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 649c24de1e0ee3b4fa819c393be75824, type: 3}
--- !u!114 &1354450819 stripped
......@@ -58353,7 +58432,7 @@ Transform:
- {fileID: 52645196}
- {fileID: 1986296678}
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1726518503 stripped
Transform:
......@@ -67326,7 +67405,7 @@ Transform:
- {fileID: 1550227071}
- {fileID: 1584151307}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2006692112
PrefabInstance:
......@@ -72680,6 +72759,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2527146880317863153}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2527146880317863155 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7379304653938194475, guid: e65e4c9fe780f0f47b89f8e2147a516a,
type: 3}
m_PrefabInstance: {fileID: 2527146880317863153}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3141669573268447494
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -73038,6 +73123,11 @@ PrefabInstance:
propertyPath: m_Name
value: Mausoleum Deco
objectReference: {fileID: 0}
- target: {fileID: 4824472381381504297, guid: 000f826fc87ee334ab05beb29d96f20b,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 000f826fc87ee334ab05beb29d96f20b, type: 3}
--- !u!1001 &3701023826036315489
......@@ -73544,7 +73634,7 @@ Transform:
- {fileID: 1115569570}
- {fileID: 787276080}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: -1.5560001}
--- !u!1 &5232223814201938416
GameObject:
......@@ -73974,13 +74064,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7064579960905172047}
m_LocalRotation: {x: 0.6989235, y: -0.00000009005395, z: 0.000000014577645, w: 0.7151965}
m_LocalRotation: {x: 0.69892347, y: -0.00000011920929, z: -0, w: 0.7151965}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3740451442927495348}
m_Father: {fileID: 2527146880317863154}
m_RootOrder: 2
m_Father: {fileID: 2527146880317863155}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 88.68201, y: 0, z: 0}
--- !u!23 &6347244113397736089
MeshRenderer:
This diff is collapsed.
......@@ -442,7 +442,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5867993603336212717}
m_Enabled: 0
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
......@@ -521,7 +521,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5867993603592465228}
m_Enabled: 0
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
......@@ -600,7 +600,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5867993604267180224}
m_Enabled: 0
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
......@@ -719,7 +719,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5867993604516221449}
m_Enabled: 0
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
......
This diff is collapsed.
fileFormatVersion: 2
guid: d2dedffe6c3f1d34eaf77f48fdfc3349
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -297,7 +297,7 @@ HingeJoint:
m_Anchor: {x: 0, y: 0.5, z: 0}
m_Axis: {x: 1, y: 0, z: 0}
m_AutoConfigureConnectedAnchor: 1
m_ConnectedAnchor: {x: 0, y: -2.4575922, z: 0}
m_ConnectedAnchor: {x: 475.36, y: 2.6699994, z: 482.12}
m_UseSpring: 1
m_Spring:
spring: 0.01
......@@ -766,6 +766,16 @@ PrefabInstance:
propertyPath: EmissionModule.enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3078323620609381109, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3078323620609381109, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 3868061936063897601, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: m_Layer
......@@ -776,6 +786,16 @@ PrefabInstance:
propertyPath: EmissionModule.enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3882100195108702144, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 1.8
objectReference: {fileID: 0}
- target: {fileID: 3882100195108702144, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4175557493494689670, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -871,6 +891,16 @@ PrefabInstance:
propertyPath: EmissionModule.enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6499597725801646750, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6499597725801646750, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6563531930907822553, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: EmissionModule.enabled
......@@ -881,6 +911,16 @@ PrefabInstance:
propertyPath: EmissionModule.enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8696591505404967050, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8696591505404967050, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8761391486093444055, guid: 604083bafb59cdc4998e472fc4bf1579,
type: 3}
propertyPath: m_Layer
......
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
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