Changes from email - glow, timers, floor texture

This commit is contained in:
Mediha Zukic
2017-05-23 19:39:06 +03:00
parent dd09c6f72f
commit 40cedaf5bf
58 changed files with 4679 additions and 1465 deletions

View File

@@ -544,6 +544,64 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 636545792}
--- !u!1001 &670144480
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalPosition.x
value: -10
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalPosition.z
value: -5
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalScale.x
value: 0.15
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalScale.y
value: 0.15
objectReference: {fileID: 0}
- target: {fileID: 4253288724776120, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_LocalScale.z
value: 0.15
objectReference: {fileID: 0}
- target: {fileID: 1380793160973020, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 4bb5c6013c5836f448c455504e5050e0, type: 2}
m_IsPrefabParent: 0
--- !u!1 &730165368
GameObject:
m_ObjectHideFlags: 0
@@ -840,7 +898,7 @@ MonoBehaviour:
- {fileID: 1300040564320660, guid: e6ccb8aba69569f4cadf68b15c30ed54, type: 2}
- {fileID: 1026694739055258, guid: 5a0acbd669e6d6d4d8942983855dccc4, type: 2}
- {fileID: 1343720796373084, guid: 20709c16e0a493345a8307d9f7eb3671, type: 2}
- {fileID: 1140733798093226, guid: 1603e54ab8360574ea7417074fd1ff01, type: 2}
- {fileID: 1809381679713564, guid: 1603e54ab8360574ea7417074fd1ff01, type: 2}
- {fileID: 1029524213012502, guid: 3998251d464483147bf8336ab8cc1cbe, type: 2}
- {fileID: 1155783428829640, guid: 4454b74f07f2b314885bc47fe71e3cb8, type: 2}
- {fileID: 1991315256034376, guid: e41d25c9e548d2f4ba1fe2e1a45962b9, type: 2}
@@ -876,7 +934,10 @@ MonoBehaviour:
- {fileID: 1326664960808868, guid: 29eeb6bf5cef40942abd867490425eb6, type: 2}
- {fileID: 1476576601628434, guid: f30480f046aa8234a8645f8bf4663891, type: 2}
- {fileID: 1283141416758514, guid: e4cb59c48e25ba84a945d869e623f641, type: 2}
haloEffect: {fileID: 1264499954100932, guid: 6ead2541b42799549a0f85e8d7a8305f, type: 2}
haloEffectRed: {fileID: 1730800724306822, guid: b26c1b682c52b4d43828f601881e1cc9,
type: 2}
haloEffectGreen: {fileID: 1563201937033788, guid: 198c5591475ed0940beb32c065f9bcab,
type: 2}
--- !u!1001 &1451760075
Prefab:
m_ObjectHideFlags: 0
@@ -886,7 +947,7 @@ Prefab:
m_Modifications:
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalPosition.x
value: -15
value: -15.5
objectReference: {fileID: 0}
- target: {fileID: 400036, guid: 153c7c3363d51a9439069414442f515c, type: 3}
propertyPath: m_LocalPosition.y
@@ -1018,3 +1079,57 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1001 &1855279492
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalPosition.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalPosition.z
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalScale.x
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalScale.y
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4520463289456954, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
propertyPath: m_LocalScale.z
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: c81250ac87834d44b9e38c271d829d82, type: 2}
m_IsPrefabParent: 0