aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Bybjerg <mikkel.bybjerg@hotmail.com>2019-04-28 03:45:41 +0200
committerMikkel Bybjerg <mikkel.bybjerg@hotmail.com>2019-04-28 03:45:41 +0200
commitf28fd7ed5916af2a5a590e36635859d2a4a7cc3c (patch)
treedca755531321f276e33e466a61ddd93cd43d77fb /nGJ2019/Assets/Scenes/Marcin_sandbox.unity
parentdd492fa6f63bce29edc1945ad183704580a27112 (diff)
parenteebe04b0c81dc2660335a1e09157c7a18189ddc3 (diff)
merge
Diffstat (limited to 'nGJ2019/Assets/Scenes/Marcin_sandbox.unity')
-rw-r--r--nGJ2019/Assets/Scenes/Marcin_sandbox.unity4
1 files changed, 2 insertions, 2 deletions
diff --git a/nGJ2019/Assets/Scenes/Marcin_sandbox.unity b/nGJ2019/Assets/Scenes/Marcin_sandbox.unity
index 068ee2d..37d9bad 100644
--- a/nGJ2019/Assets/Scenes/Marcin_sandbox.unity
+++ b/nGJ2019/Assets/Scenes/Marcin_sandbox.unity
@@ -424,7 +424,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 420921107e115344ea4e97eeb2bca416, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 1e5cda52167a5f7458ef9bce7d6ad2d6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -662,7 +662,7 @@ MonoBehaviour:
type: 3}
narrowPassagePrefab: {fileID: 1998900778231223134, guid: ce339cccf24f74448af698eb997a3d95,
type: 3}
- rockJawsPrefab: {fileID: 1998900778231223134, guid: a2b1bab6b90944171a71ff986bce4ebf,
+ rockJawsPrefab: {fileID: 8765725572880811705, guid: a2b1bab6b90944171a71ff986bce4ebf,
type: 3}
netPrefab: {fileID: 5435085934957895830, guid: 459b4334249a5491ca7e8e02a92f8141,
type: 3}