crayonix/fatal-exception
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

Browse Source
This commit is contained in:
Jack Rus
2020-02-02 13:39:17 -05:00
parent e4802efeb0 e0f425fed2
commit e4a151be7e
13 changed files with 518 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

236
Assets/Scenes/LevelOne.unity
View File

@@ -1487,6 +1487,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3}
--- !u!4 &851631687 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a,
type: 3}
m_PrefabInstance: {fileID: 1879087608}
m_PrefabAsset: {fileID: 0}
--- !u!1 &925144586
GameObject:
m_ObjectHideFlags: 0
@@ -1767,12 +1773,21 @@ Transform:
- {fileID: 1491654}
- {fileID: 193535121}
- {fileID: 1247097598}
- {fileID: 851631687}
- {fileID: 1934521842}
- {fileID: 8021909}
- {fileID: 951888605}
- {fileID: 1200440357}
- {fileID: 1028395223}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1028395223 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
m_PrefabInstance: {fileID: 8942784746345332693}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1028911173
PrefabInstance:
m_ObjectHideFlags: 0
@@ -46887,6 +46902,111 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!1001 &1200440356
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1008122163}
m_Modifications:
- target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: playerCollider
value:
objectReference: {fileID: 1671840919}
- target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: eventControls
value:
objectReference: {fileID: 1491655}
- target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: player
value:
objectReference: {fileID: 1671840921}
- target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: movementSpeed
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201377, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 6200000, guid: 8bbf95d8d23ff94449785e66e0ae11ec, type: 2}
- target: {fileID: 4815066122311201378, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_Name
value: KatBug
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalPosition.x
value: 14
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalPosition.y
value: -13
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c98830a6bebcdc24b91c550a26c9b621, type: 3}
--- !u!4 &1200440357 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621,
type: 3}
m_PrefabInstance: {fileID: 1200440356}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1220663790
GameObject:
m_ObjectHideFlags: 0
@@ -47258,7 +47378,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1671840916}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -10.5, y: 10, z: 0}
m_LocalPosition: {x: 62.5, y: 4.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1008122163}
@@ -48364,3 +48484,117 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3}
--- !u!1001 &8942784746345332693
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1008122163}
m_Modifications:
- target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_Offset.y
value: -0.031505585
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_Size.y
value: 4.7140064
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_Offset.x
value: 0.037693024
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_Size.x
value: 3.5875473
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalPosition.x
value: 60
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalPosition.y
value: -11.5
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721725, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_Name
value: JackBug
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721726, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_GravityScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721726, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: m_Constraints
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8989126000173721727, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: playerCollider
value:
objectReference: {fileID: 1671840919}
- target: {fileID: 8989126000173721727, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: eventControls
value:
objectReference: {fileID: 1491655}
- target: {fileID: 8989126000173721727, guid: cc74a3ff6f657d842b5731190a6074d7,
type: 3}
propertyPath: player
value:
objectReference: {fileID: 1671840921}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cc74a3ff6f657d842b5731190a6074d7, type: 3}