Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
This commit is contained in:
Jack Rus
@@ -459,7 +459,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1008122163}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!483693784 &193535122
|
||||
TilemapRenderer:
|
||||
@@ -1284,7 +1284,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 3
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222,
|
||||
type: 3}
|
||||
@@ -1415,7 +1415,6 @@ Transform:
|
||||
- {fileID: 1713017494}
|
||||
- {fileID: 1671840917}
|
||||
- {fileID: 1247097598}
|
||||
- {fileID: 1491654}
|
||||
- {fileID: 193535121}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
@@ -1509,7 +1508,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
player: {fileID: 1671840916}
|
||||
offsetY: 2
|
||||
interpolate: 0.6
|
||||
offsetZ: -10
|
||||
interpolate: 0.3
|
||||
--- !u!4 &1146013793 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11,
|
||||
@@ -1900,7 +1900,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222,
|
||||
type: 3}
|
||||
@@ -2059,6 +2059,192 @@ Tilemap:
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
--- !u!1 &1759518263
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1759518264}
|
||||
- component: {fileID: 1759518267}
|
||||
- component: {fileID: 1759518266}
|
||||
- component: {fileID: 1759518265}
|
||||
m_Layer: 0
|
||||
m_Name: Event Controls
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1759518264
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1759518263}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 827621097}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1759518265
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1759518263}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 555a3f8aa89a0e84fb6c43249a117f93, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
camera: {fileID: 1337282922}
|
||||
tile: {fileID: 11400000, guid: 1f7bfa5ee72002646806268d14bfeb3b, type: 2}
|
||||
tiles:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
successTiles:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
successTile: {fileID: 11400000, guid: ae6e7a8b9fa2433448a66da4090e310c, type: 2}
|
||||
plusTile: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2}
|
||||
framesPerControlTile: 15
|
||||
nextControlYOffset: 1
|
||||
nextControlXOffset: -1
|
||||
tileMapClearDelayInSeconds: 0.5
|
||||
--- !u!483693784 &1759518266
|
||||
TilemapRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1759518263}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 0
|
||||
m_ReflectionProbeUsage: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_ChunkSize: {x: 32, y: 32, z: 32}
|
||||
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
|
||||
m_MaxChunkCount: 16
|
||||
m_MaxFrameAge: 16
|
||||
m_SortOrder: 0
|
||||
m_Mode: 0
|
||||
m_DetectChunkCullingBounds: 0
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1839735485 &1759518267
|
||||
Tilemap:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1759518263}
|
||||
m_Enabled: 1
|
||||
m_Tiles: {}
|
||||
m_AnimatedTiles: {}
|
||||
m_TileAssetArray:
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
m_TileSpriteArray:
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 0
|
||||
m_Data:
|
||||
e00: NaN
|
||||
e01: NaN
|
||||
e02: -0.0000000555834
|
||||
e03: 0
|
||||
e10: NaN
|
||||
e11: NaN
|
||||
e12: 1.18e-43
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: -0.000000055583342
|
||||
e22: 0
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 1.18e-43
|
||||
e32: 0
|
||||
e33: 0
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 0
|
||||
m_Data: {r: 6.129018e-32, g: 6.129018e-32, b: 6.129018e-32, a: 6.129018e-32}
|
||||
m_AnimationFrameRate: 1
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Origin: {x: 0, y: 0, z: 0}
|
||||
m_Size: {x: 68, y: 6, z: 1}
|
||||
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
|
||||
m_TileOrientation: 0
|
||||
m_TileOrientationMatrix:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
--- !u!1 &1882958979
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2574,7 +2760,7 @@ CompositeCollider2D:
|
||||
Y: 310000000
|
||||
- - X: 1930000000
|
||||
Y: 320000000
|
||||
- X: 1920000000
|
||||
- X: 2000000000
|
||||
Y: 320000000
|
||||
- X: 1920000000
|
||||
Y: 300000000
|
||||
@@ -2914,7 +3100,7 @@ CompositeCollider2D:
|
||||
Y: 220000000
|
||||
- X: 1220000000
|
||||
Y: 200000000
|
||||
- X: 1430000000
|
||||
- X: 430000000
|
||||
Y: 200000000
|
||||
- - X: 2050000000
|
||||
Y: 220000000
|
||||
@@ -2932,21 +3118,15 @@ CompositeCollider2D:
|
||||
Y: 210000000
|
||||
- X: 1990000000
|
||||
Y: 210000000
|
||||
- - X: 1900000000
|
||||
Y: 200000000
|
||||
- X: 1890000000
|
||||
Y: 200000000
|
||||
- X: 1890000000
|
||||
- - X: 1920000000
|
||||
Y: 220000000
|
||||
- X: 1880000000
|
||||
- X: 1910000000
|
||||
Y: 220000000
|
||||
- X: 1880000000
|
||||
Y: 200000000
|
||||
- X: 1860000000
|
||||
Y: 200000000
|
||||
- X: 1860000000
|
||||
Y: 220000000
|
||||
- X: 1850000000
|
||||
- X: 1910000000
|
||||
Y: 210000000
|
||||
- X: 1920000000
|
||||
Y: 210000000
|
||||
- - X: 1850000000
|
||||
Y: 220000000
|
||||
- X: 1850000000
|
||||
Y: 200000000
|
||||
@@ -2956,6 +3136,28 @@ CompositeCollider2D:
|
||||
Y: 160000000
|
||||
- X: 1900000000
|
||||
Y: 160000000
|
||||
- X: 1900000000
|
||||
Y: 200000000
|
||||
- X: 1890000000
|
||||
Y: 200000000
|
||||
- X: 1890000000
|
||||
Y: 220000000
|
||||
- X: 1880000000
|
||||
Y: 220000000
|
||||
- X: 1880000000
|
||||
Y: 200000000
|
||||
- X: 1860000000
|
||||
Y: 200000000
|
||||
- X: 1860000000
|
||||
Y: 220000000
|
||||
- - X: 1990000000
|
||||
Y: 210000000
|
||||
- X: 1990000000
|
||||
Y: 200000000
|
||||
- X: 2000000000
|
||||
Y: 200000000
|
||||
- X: 2000000000
|
||||
Y: 160000000
|
||||
- - X: 430000000
|
||||
Y: 220000000
|
||||
- X: 410000000
|
||||
@@ -2990,11 +3192,13 @@ CompositeCollider2D:
|
||||
Y: 200000000
|
||||
- X: 2000000000
|
||||
Y: 210000000
|
||||
- X: 1990000000
|
||||
Y: 210000000
|
||||
- X: 1990000000
|
||||
- - X: 1430000000
|
||||
Y: 220000000
|
||||
- X: 1220000000
|
||||
Y: 220000000
|
||||
- X: 1220000000
|
||||
Y: 200000000
|
||||
- X: 2000000000
|
||||
- X: 1430000000
|
||||
Y: 200000000
|
||||
- X: 2000000000
|
||||
Y: 160000000
|
||||
@@ -3104,6 +3308,24 @@ CompositeCollider2D:
|
||||
Y: 180000000
|
||||
- X: 710000000
|
||||
Y: 180000000
|
||||
- - X: 1960000000
|
||||
Y: 190000000
|
||||
- X: 1740000000
|
||||
Y: 190000000
|
||||
- X: 1740000000
|
||||
Y: 200000000
|
||||
- X: 1760000000
|
||||
Y: 200000000
|
||||
- X: 1760000000
|
||||
Y: 190000000
|
||||
- X: 1770000000
|
||||
Y: 190000000
|
||||
- X: 1770000000
|
||||
Y: 180000000
|
||||
- X: 1760000000
|
||||
Y: 180000000
|
||||
- X: 1760000000
|
||||
Y: 160000000
|
||||
- - X: 1960000000
|
||||
Y: 190000000
|
||||
- X: 1940000000
|
||||
@@ -3168,6 +3390,18 @@ CompositeCollider2D:
|
||||
Y: 120000000
|
||||
- X: 2110000000
|
||||
Y: 120000000
|
||||
- - X: 2110000000
|
||||
Y: 140000000
|
||||
- X: 2090000000
|
||||
Y: 140000000
|
||||
- X: 2090000000
|
||||
Y: 130000000
|
||||
- X: 2080000000
|
||||
Y: 130000000
|
||||
- X: 2080000000
|
||||
Y: 120000000
|
||||
- X: 2110000000
|
||||
Y: 120000000
|
||||
- - X: 450000000
|
||||
Y: 120000000
|
||||
- X: 370000000
|
||||
@@ -3352,13 +3586,13 @@ CompositeCollider2D:
|
||||
Y: 60000000
|
||||
- X: 290000000
|
||||
Y: 60000000
|
||||
- - X: 1880000000
|
||||
- - X: 2220000000
|
||||
Y: 80000000
|
||||
- X: 2169999872
|
||||
Y: 80000000
|
||||
- X: 2169999872
|
||||
Y: 50000000
|
||||
- X: 1880000000
|
||||
Y: 70000000
|
||||
- X: 2020000000
|
||||
Y: 70000000
|
||||
- X: 2020000000
|
||||
- X: 2220000000
|
||||
Y: 50000000
|
||||
- - X: 380000000
|
||||
Y: 70000000
|
||||
@@ -3456,6 +3690,14 @@ CompositeCollider2D:
|
||||
Y: -200000000
|
||||
- X: 910000000
|
||||
Y: -200000000
|
||||
- - X: 1800000000
|
||||
Y: 60000000
|
||||
- X: 1770000000
|
||||
Y: 60000000
|
||||
- X: 1770000000
|
||||
Y: 40000000
|
||||
- X: 1800000000
|
||||
Y: 40000000
|
||||
- - X: 840000000
|
||||
Y: 50000000
|
||||
- X: 760000000
|
||||
@@ -3556,14 +3798,6 @@ CompositeCollider2D:
|
||||
Y: -60000000
|
||||
- X: 2160000000
|
||||
Y: -60000000
|
||||
- - X: 1750000000
|
||||
Y: 10000000
|
||||
- X: 1670000000
|
||||
Y: 10000000
|
||||
- X: 1670000000
|
||||
Y: -20000000
|
||||
- X: 1750000000
|
||||
Y: -20000000
|
||||
- - X: 1660000000
|
||||
Y: -40000000
|
||||
- X: 1640000000
|
||||
@@ -3672,6 +3906,14 @@ CompositeCollider2D:
|
||||
Y: -150000000
|
||||
- X: 1320000000
|
||||
Y: -150000000
|
||||
- - X: 1510000000
|
||||
Y: -130000000
|
||||
- X: 1490000000
|
||||
Y: -130000000
|
||||
- X: 1490000000
|
||||
Y: -150000000
|
||||
- X: 1510000000
|
||||
Y: -150000000
|
||||
- - X: 2270000128
|
||||
Y: -140000000
|
||||
- X: 2260000000
|
||||
@@ -3762,11 +4004,11 @@ CompositeCollider2D:
|
||||
Y: -200000000
|
||||
- - X: 1110000000
|
||||
Y: -180000000
|
||||
- X: 1020000000
|
||||
- X: 570000000
|
||||
Y: -180000000
|
||||
- X: 1020000000
|
||||
- X: 570000000
|
||||
Y: -200000000
|
||||
- X: 1110000000
|
||||
- X: 590000000
|
||||
Y: -200000000
|
||||
- - X: 790000000
|
||||
Y: -180000000
|
||||
@@ -4132,6 +4374,22 @@ CompositeCollider2D:
|
||||
- {x: 200.99997, y: 20}
|
||||
- {x: 200, y: 19.999971}
|
||||
- {x: 200.00003, y: 16}
|
||||
- - {x: 189.99997, y: 16}
|
||||
- {x: 189.99997, y: 20}
|
||||
- {x: 189, y: 20.000029}
|
||||
- {x: 188.99997, y: 22}
|
||||
- {x: 188, y: 21.999971}
|
||||
- {x: 187.99997, y: 20}
|
||||
- {x: 186, y: 19.999971}
|
||||
- {x: 186.00003, y: 16}
|
||||
- - {x: 142.99997, y: 20}
|
||||
- {x: 142.99997, y: 22}
|
||||
- {x: 122, y: 21.999971}
|
||||
- {x: 122.00003, y: 20}
|
||||
- - {x: 42.999973, y: 20}
|
||||
- {x: 42.999973, y: 22}
|
||||
- {x: 41, y: 21.999971}
|
||||
- {x: 41.00003, y: 20}
|
||||
- - {x: 185.99997, y: 20}
|
||||
- {x: 185.99997, y: 22}
|
||||
- {x: 185, y: 21.999971}
|
||||
@@ -4462,6 +4720,14 @@ CompositeCollider2D:
|
||||
- {x: 115.99998, y: -8}
|
||||
- {x: 113, y: -8.00003}
|
||||
- {x: 113.00003, y: -11}
|
||||
- - {x: 154.99997, y: -11}
|
||||
- {x: 154.99997, y: -9}
|
||||
- {x: 153, y: -9.00003}
|
||||
- {x: 153.00003, y: -11}
|
||||
- - {x: 146.99997, y: -11}
|
||||
- {x: 146.99997, y: -9}
|
||||
- {x: 145, y: -9.00003}
|
||||
- {x: 145.00003, y: -11}
|
||||
- - {x: 213.99997, y: -17}
|
||||
- {x: 214.00003, y: -11}
|
||||
- {x: 223.00002, y: -10.99997}
|
||||
@@ -43982,7 +44248,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222,
|
||||
type: 3}
|
||||
@@ -44093,11 +44359,6 @@ PrefabInstance:
|
||||
propertyPath: m_BodyType
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3827363133515929334, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a,
|
||||
type: 3}
|
||||
propertyPath: m_GravityScale
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a,
|
||||
type: 3}
|
||||
propertyPath: movementSpeed
|
||||
@@ -44122,7 +44383,7 @@ PrefabInstance:
|
||||
type: 3}
|
||||
propertyPath: eventControls
|
||||
value:
|
||||
objectReference: {fileID: 1491655}
|
||||
objectReference: {fileID: 1759518265}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3}
|
||||
--- !u!1001 &7653345758327600075
|
||||
|
||||
Reference in New Issue
Block a user