saibotk/Bildschirmflausch-LD41
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Jan 2018-04-21 20:04:22 +02:00
commit 3cb311f614
3 changed files with 64 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Assets/Prefabs/Player.prefab
View file

@ -37,6 +37,7 @@ GameObject:
- component: {fileID: 50783223838863924}
- component: {fileID: 114874769993434856}
- component: {fileID: 114835806183609276}
- component: {fileID: 61988607887166464}
m_Layer: 0
m_Name: Player
m_TagString: Player
@ -121,6 +122,31 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!61 &61988607887166464
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1679161327080020}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.30773532, y: -2.1199532}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5.3082895, y: 6.402458}
m_EdgeRadius: 0
--- !u!114 &114835806183609276
MonoBehaviour:
m_ObjectHideFlags: 1

43
Assets/Prefabs/StartingRoom.prefab
View file

@ -431,14 +431,39 @@ BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1299851874008944}
m_GameObject: {fileID: 1333566648069926}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Offset: {x: -0.63960123, y: -7.9419603}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 25.94526, y: 0.8934002}
m_EdgeRadius: 0
--- !u!61 &61466659272242130
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1333566648069926}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -7.5491962, y: 9.487711}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
@ -449,7 +474,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 10, y: 10}
m_Size: {x: 12.126068, y: 1}
m_EdgeRadius: 0
--- !u!61 &61592004410715102
BoxCollider2D:
@ -538,7 +563,7 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Offset: {x: 6.907359, y: 9.487714}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@ -549,7 +574,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3, y: 1}
m_Size: {x: 10.851339, y: 1.0000019}
m_EdgeRadius: 0
--- !u!114 &114620228456935526
MonoBehaviour:
@ -560,8 +585,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b8cc30ac6e59724bba6536a17fbf027, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114795477922050694
MonoBehaviour:
m_ObjectHideFlags: 1
@ -571,8 +596,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a031ae543e3871f4da5b6e402291b6f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
width: 0
height: 0
doorsRootObject: {fileID: 1394898907781064}

8
Assets/Scenes/CodeDEV.unity
View file

@ -238,7 +238,7 @@ Prefab:
- target: {fileID: 114795477922050694, guid: 212457bb2a8fabb44b1000b6d61dde66,
type: 2}
propertyPath: spawnpointRootObject
value:
value:
objectReference: {fileID: 893869449}
- target: {fileID: 61365825193936666, guid: 212457bb2a8fabb44b1000b6d61dde66,
type: 2}
@ -564,7 +564,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2063368131}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.63088274, y: 0.10229584, z: 0.08672615}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -579,8 +579,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 87d25c2cd3eb97749b79f2cb5f7c5cea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
playerPrefab: {fileID: 1679161327080020, guid: 3d1911457c1e44f53b6b4044334db52f,
type: 2}
start: {fileID: 766094370}