Skip to content
Snippets Groups Projects
Commit affbc266 authored by Erno Lokkila's avatar Erno Lokkila
Browse files

clouds now visible in scene

parent 7dc338db
No related branches found
No related tags found
No related merge requests found
......@@ -9,11 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2388334960364419616}
<<<<<<< HEAD
- component: {fileID: 506448308499323742}
=======
- component: {fileID: 3814219544740361507}
>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
m_Layer: 0
m_Name: GameWin
m_TagString: Untagged
......@@ -35,11 +31,8 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
<<<<<<< HEAD
--- !u!114 &506448308499323742
=======
--- !u!114 &3814219544740361507
>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -51,12 +44,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d3674a5cdecf6e14abe5d88e6f0f7618, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
housePrefab: {fileID: 0}
workerPrefab: {fileID: 0}
=======
housePrefab: {fileID: 7607310651946833762, guid: 118ed7528555d45418acb5a87b330000,
type: 3}
workerPrefab: {fileID: 548039319383633024, guid: 7dc194a2047a39340a91ca7636a56290,
type: 3}
>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
......@@ -207,6 +207,75 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1d269887e77657841a2e967e56313d5a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &308048585
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2273889863124468236, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_Name
value: CloudSpawner
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalPosition.x
value: 4.5898275
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.887589
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.94433594
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415748420902447954, guid: a9cea436032f3c1418588f10288f7d7c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a9cea436032f3c1418588f10288f7d7c, type: 3}
--- !u!1 &427384613
GameObject:
m_ObjectHideFlags: 0
......
fileFormatVersion: 2
<<<<<<< HEAD
guid: b754cd30190a6fc499757bf23c86995c
=======
<<<<<<< HEAD
guid: da2fdc4d65b035247a30af613a6d2912
=======
guid: 038ab914524b2d64a93a0e9c7e9ca39f
>>>>>>> f671c3e28cd26c667fb91d7dd0a7069ea183ba1b
>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......@@ -83,15 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
<<<<<<< HEAD
spriteID: a0d8becf91accf843bdb2d0a480a8ad7
=======
<<<<<<< HEAD
spriteID: 235b5f67a33d4d84ba767361f3abdaa3
=======
spriteID: 54d1cffd83aa8054d820d7fd4a638695
>>>>>>> f671c3e28cd26c667fb91d7dd0a7069ea183ba1b
>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
vertices: []
indices:
edges: []
......
fileFormatVersion: 2
<<<<<<< HEAD
guid: 05962d86b53bb0f4c850f5c9acc074ce
=======
<<<<<<< HEAD
guid: cc3fda645f53128429f61de79b1fcea8
=======
guid: 5bc9a60b2f7a5b64cb1fc21d50461158
>>>>>>> f671c3e28cd26c667fb91d7dd0a7069ea183ba1b
>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......@@ -83,15 +75,8 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
<<<<<<< HEAD
spriteID: 95e37da347917444c897c6b0dbe3efcb
=======
<<<<<<< HEAD
spriteID: fa90c29f4d4f2264c8a3bd45097be72b
=======
spriteID: b03e8f4f2e4e47f4eac90d76c774a40e
>>>>>>> f671c3e28cd26c667fb91d7dd0a7069ea183ba1b
>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
vertices: []
indices:
edges: []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment