zoriya/Prototype-Magnifique
1
0
Fork 0
mirror of https://github.com/zoriya/Prototype-Magnifique.git synced 2026-06-01 18:16:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AnonymusRaccoon/Prototype-Magnifique

Browse Source
This commit is contained in:
Anonymous Raccoon
2018-03-05 14:59:25 +01:00
parent 8d4f4c27e6 0529ce87fa
commit 5678b9768a
1 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Test.unity
+42 -2
View File
@@ -317,6 +317,18 @@ Prefab:
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 136123792039155002, guid: 1e59ce4d0aab18f44a51b286de5259c4,
type: 2}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 3f67cbc34e2adef4e808c3445e69a63d,
type: 2}
- target: {fileID: 65416904971122956, guid: 1e59ce4d0aab18f44a51b286de5259c4,
type: 2}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 3f67cbc34e2adef4e808c3445e69a63d,
type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 1e59ce4d0aab18f44a51b286de5259c4, type: 2}
m_IsPrefabParent: 0
@@ -337,7 +349,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4061937932440146, guid: b21e2e91c2466fa4ba8c38be7831894c, type: 2}
propertyPath: m_LocalPosition.z
value: 0.174
value: 0.176
objectReference: {fileID: 0}
- target: {fileID: 4061937932440146, guid: b21e2e91c2466fa4ba8c38be7831894c, type: 2}
propertyPath: m_LocalRotation.x
@@ -359,6 +371,22 @@ Prefab:
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4061937932440146, guid: b21e2e91c2466fa4ba8c38be7831894c, type: 2}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 65008393815429252, guid: b21e2e91c2466fa4ba8c38be7831894c,
type: 2}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 3f67cbc34e2adef4e808c3445e69a63d,
type: 2}
- target: {fileID: 136665385331263236, guid: b21e2e91c2466fa4ba8c38be7831894c,
type: 2}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 3f67cbc34e2adef4e808c3445e69a63d,
type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: b21e2e91c2466fa4ba8c38be7831894c, type: 2}
m_IsPrefabParent: 0
@@ -379,7 +407,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4928226377463138, guid: bebad6dbaee6f9440afb6cfabba013d3, type: 2}
propertyPath: m_LocalPosition.z
value: -0.266
value: -0.285
objectReference: {fileID: 0}
- target: {fileID: 4928226377463138, guid: bebad6dbaee6f9440afb6cfabba013d3, type: 2}
propertyPath: m_LocalRotation.x
@@ -401,6 +429,18 @@ Prefab:
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4928226377463138, guid: bebad6dbaee6f9440afb6cfabba013d3, type: 2}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4928226377463138, guid: bebad6dbaee6f9440afb6cfabba013d3, type: 2}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4928226377463138, guid: bebad6dbaee6f9440afb6cfabba013d3, type: 2}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: bebad6dbaee6f9440afb6cfabba013d3, type: 2}
m_IsPrefabParent: 0