diff options
| author | miakata <miakata@gmail.com> | 2019-04-27 22:51:19 +0200 |
|---|---|---|
| committer | miakata <miakata@gmail.com> | 2019-04-27 22:51:19 +0200 |
| commit | 87c702bbff7e39066c1aea6ed40c46a961a022d4 (patch) | |
| tree | 74324c7f9dcfdd75fec8f66b1df0557799f3e9d4 /nGJ2019/Assets/Scenes/Marcin_sandbox.unity | |
| parent | c34eb93d97ae8dcb51ef88dc9ddae5b40c81783e (diff) | |
| parent | 932a418c3f2251d434b67d115aaa380b51685ef7 (diff) | |
Merge branch 'master' of https://github.com/marcinzelent/ngj2019
Diffstat (limited to 'nGJ2019/Assets/Scenes/Marcin_sandbox.unity')
| -rw-r--r-- | nGJ2019/Assets/Scenes/Marcin_sandbox.unity | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nGJ2019/Assets/Scenes/Marcin_sandbox.unity b/nGJ2019/Assets/Scenes/Marcin_sandbox.unity index 42a9843..068ee2d 100644 --- a/nGJ2019/Assets/Scenes/Marcin_sandbox.unity +++ b/nGJ2019/Assets/Scenes/Marcin_sandbox.unity @@ -381,7 +381,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1342555976} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.886415, y: 0, z: 0} + m_LocalPosition: {x: 8.886415, y: 0, z: 10} m_LocalScale: {x: 1.736111, y: 1.736111, z: 1} m_Children: [] m_Father: {fileID: 202725832} @@ -404,7 +404,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 5d5aaa9c2f47c436b922e7b7869e8557, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -423,7 +423,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 420921107e115344ea4e97eeb2bca416, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -664,6 +664,8 @@ MonoBehaviour: type: 3} rockJawsPrefab: {fileID: 1998900778231223134, guid: a2b1bab6b90944171a71ff986bce4ebf, type: 3} + netPrefab: {fileID: 5435085934957895830, guid: 459b4334249a5491ca7e8e02a92f8141, + type: 3} scrolling: {fileID: 202725831} spawnLine: 13.5 --- !u!1 &1695765865 |