Merge remote-tracking branch 'origin/Syntriax' into Over
This commit is contained in:
		@@ -15,7 +15,7 @@ GameObject:
 | 
			
		||||
  - component: {fileID: 6151226926209823380}
 | 
			
		||||
  - component: {fileID: 4209054098996045085}
 | 
			
		||||
  m_Layer: 0
 | 
			
		||||
  m_Name: Level End
 | 
			
		||||
  m_Name: End Point
 | 
			
		||||
  m_TagString: Untagged
 | 
			
		||||
  m_Icon: {fileID: 0}
 | 
			
		||||
  m_NavMeshLayer: 0
 | 
			
		||||
@@ -103,12 +103,15 @@ GameObject:
 | 
			
		||||
  - component: {fileID: 1096076352219241078}
 | 
			
		||||
  - component: {fileID: 1793469087448140271}
 | 
			
		||||
  - component: {fileID: 4587471789353598112}
 | 
			
		||||
  m_Layer: 0
 | 
			
		||||
  - component: {fileID: 6384582748203284648}
 | 
			
		||||
  - component: {fileID: 3874654197920067409}
 | 
			
		||||
  - component: {fileID: 5503933993752751422}
 | 
			
		||||
  m_Layer: 3
 | 
			
		||||
  m_Name: Tilemap
 | 
			
		||||
  m_TagString: Untagged
 | 
			
		||||
  m_Icon: {fileID: 0}
 | 
			
		||||
  m_NavMeshLayer: 0
 | 
			
		||||
  m_StaticEditorFlags: 0
 | 
			
		||||
  m_StaticEditorFlags: 2147483647
 | 
			
		||||
  m_IsActive: 1
 | 
			
		||||
--- !u!4 &1096076352219241078
 | 
			
		||||
Transform:
 | 
			
		||||
@@ -212,6 +215,67 @@ TilemapRenderer:
 | 
			
		||||
  m_Mode: 0
 | 
			
		||||
  m_DetectChunkCullingBounds: 0
 | 
			
		||||
  m_MaskInteraction: 0
 | 
			
		||||
--- !u!50 &6384582748203284648
 | 
			
		||||
Rigidbody2D:
 | 
			
		||||
  serializedVersion: 4
 | 
			
		||||
  m_ObjectHideFlags: 0
 | 
			
		||||
  m_CorrespondingSourceObject: {fileID: 0}
 | 
			
		||||
  m_PrefabInstance: {fileID: 0}
 | 
			
		||||
  m_PrefabAsset: {fileID: 0}
 | 
			
		||||
  m_GameObject: {fileID: 3569026224574540515}
 | 
			
		||||
  m_BodyType: 2
 | 
			
		||||
  m_Simulated: 1
 | 
			
		||||
  m_UseFullKinematicContacts: 0
 | 
			
		||||
  m_UseAutoMass: 0
 | 
			
		||||
  m_Mass: 1
 | 
			
		||||
  m_LinearDrag: 0
 | 
			
		||||
  m_AngularDrag: 0.05
 | 
			
		||||
  m_GravityScale: 1
 | 
			
		||||
  m_Material: {fileID: 0}
 | 
			
		||||
  m_Interpolate: 0
 | 
			
		||||
  m_SleepingMode: 1
 | 
			
		||||
  m_CollisionDetection: 0
 | 
			
		||||
  m_Constraints: 0
 | 
			
		||||
--- !u!66 &3874654197920067409
 | 
			
		||||
CompositeCollider2D:
 | 
			
		||||
  m_ObjectHideFlags: 0
 | 
			
		||||
  m_CorrespondingSourceObject: {fileID: 0}
 | 
			
		||||
  m_PrefabInstance: {fileID: 0}
 | 
			
		||||
  m_PrefabAsset: {fileID: 0}
 | 
			
		||||
  m_GameObject: {fileID: 3569026224574540515}
 | 
			
		||||
  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_GeometryType: 0
 | 
			
		||||
  m_GenerationType: 0
 | 
			
		||||
  m_EdgeRadius: 0
 | 
			
		||||
  m_ColliderPaths:
 | 
			
		||||
  - m_Collider: {fileID: 5503933993752751422}
 | 
			
		||||
    m_ColliderPaths: []
 | 
			
		||||
  m_CompositePaths:
 | 
			
		||||
    m_Paths: []
 | 
			
		||||
  m_VertexDistance: 0.0005
 | 
			
		||||
  m_OffsetDistance: 0.00005
 | 
			
		||||
--- !u!19719996 &5503933993752751422
 | 
			
		||||
TilemapCollider2D:
 | 
			
		||||
  m_ObjectHideFlags: 0
 | 
			
		||||
  m_CorrespondingSourceObject: {fileID: 0}
 | 
			
		||||
  m_PrefabInstance: {fileID: 0}
 | 
			
		||||
  m_PrefabAsset: {fileID: 0}
 | 
			
		||||
  m_GameObject: {fileID: 3569026224574540515}
 | 
			
		||||
  m_Enabled: 1
 | 
			
		||||
  m_Density: 1
 | 
			
		||||
  m_Material: {fileID: 0}
 | 
			
		||||
  m_IsTrigger: 0
 | 
			
		||||
  m_UsedByEffector: 0
 | 
			
		||||
  m_UsedByComposite: 1
 | 
			
		||||
  m_Offset: {x: 0, y: 0}
 | 
			
		||||
  m_MaximumTileChangeCount: 1000
 | 
			
		||||
  m_ExtrusionFactor: 0.00001
 | 
			
		||||
--- !u!1001 &1736243607391024486
 | 
			
		||||
PrefabInstance:
 | 
			
		||||
  m_ObjectHideFlags: 0
 | 
			
		||||
 
 | 
			
		||||
@@ -29,6 +29,7 @@ Transform:
 | 
			
		||||
  m_ConstrainProportionsScale: 0
 | 
			
		||||
  m_Children:
 | 
			
		||||
  - {fileID: 7303924638498732051}
 | 
			
		||||
  - {fileID: 2533930338963943380}
 | 
			
		||||
  m_Father: {fileID: 1356359347258250021}
 | 
			
		||||
  m_RootOrder: 4
 | 
			
		||||
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
			
		||||
@@ -70,6 +71,68 @@ Transform:
 | 
			
		||||
  m_Father: {fileID: 1356359347258250021}
 | 
			
		||||
  m_RootOrder: 3
 | 
			
		||||
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
			
		||||
--- !u!1001 &820835654464323790
 | 
			
		||||
PrefabInstance:
 | 
			
		||||
  m_ObjectHideFlags: 0
 | 
			
		||||
  serializedVersion: 2
 | 
			
		||||
  m_Modification:
 | 
			
		||||
    m_TransformParent: {fileID: 4113497873755004013}
 | 
			
		||||
    m_Modifications:
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_RootOrder
 | 
			
		||||
      value: 1
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalPosition.x
 | 
			
		||||
      value: -15.220001
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalPosition.y
 | 
			
		||||
      value: 5.5
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalPosition.z
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalRotation.w
 | 
			
		||||
      value: 1
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalRotation.x
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalRotation.y
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalRotation.z
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalEulerAnglesHint.x
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalEulerAnglesHint.y
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_LocalEulerAnglesHint.z
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2904370521948139292, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
      propertyPath: m_Name
 | 
			
		||||
      value: Collapsing_Platform_Medium
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    m_RemovedComponents: []
 | 
			
		||||
  m_SourcePrefab: {fileID: 100100000, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
--- !u!4 &2533930338963943380 stripped
 | 
			
		||||
Transform:
 | 
			
		||||
  m_CorrespondingSourceObject: {fileID: 2904370521948139290, guid: 3334927e739bc324cb5cd87c6a37215c, type: 3}
 | 
			
		||||
  m_PrefabInstance: {fileID: 820835654464323790}
 | 
			
		||||
  m_PrefabAsset: {fileID: 0}
 | 
			
		||||
--- !u!1001 &2520264655673106953
 | 
			
		||||
PrefabInstance:
 | 
			
		||||
  m_ObjectHideFlags: 0
 | 
			
		||||
@@ -2535,6 +2598,10 @@ PrefabInstance:
 | 
			
		||||
      propertyPath: m_LocalEulerAnglesHint.z
 | 
			
		||||
      value: 0
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8798736930962170907, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
 | 
			
		||||
      propertyPath: m_Name
 | 
			
		||||
      value: End Point
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    m_RemovedComponents: []
 | 
			
		||||
  m_SourcePrefab: {fileID: 100100000, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
 | 
			
		||||
--- !u!4 &1356359347258250021 stripped
 | 
			
		||||
@@ -2588,54 +2655,30 @@ CompositeCollider2D:
 | 
			
		||||
  m_ColliderPaths:
 | 
			
		||||
  - m_Collider: {fileID: 3994801273973500526}
 | 
			
		||||
    m_ColliderPaths:
 | 
			
		||||
    - - X: 80000100
 | 
			
		||||
        Y: 39999959
 | 
			
		||||
      - X: 80000100
 | 
			
		||||
        Y: 100000041
 | 
			
		||||
      - X: 80000041
 | 
			
		||||
        Y: 100000100
 | 
			
		||||
      - X: 59999959
 | 
			
		||||
        Y: 100000100
 | 
			
		||||
      - X: 59999900
 | 
			
		||||
        Y: 100000041
 | 
			
		||||
      - X: 59999900
 | 
			
		||||
        Y: 39999959
 | 
			
		||||
      - X: 59999959
 | 
			
		||||
        Y: 39999900
 | 
			
		||||
      - X: 80000041
 | 
			
		||||
        Y: 39999900
 | 
			
		||||
    - - X: -39999900
 | 
			
		||||
        Y: 60000041
 | 
			
		||||
      - X: -39999959
 | 
			
		||||
        Y: 60000100
 | 
			
		||||
      - X: -110000041
 | 
			
		||||
        Y: 60000100
 | 
			
		||||
      - X: -110000100
 | 
			
		||||
        Y: 60000041
 | 
			
		||||
      - X: -110000100
 | 
			
		||||
        Y: 40000041
 | 
			
		||||
      - X: -110000041
 | 
			
		||||
        Y: 40000100
 | 
			
		||||
      - X: -39999959
 | 
			
		||||
        Y: 40000100
 | 
			
		||||
      - X: -39999900
 | 
			
		||||
        Y: 40000041
 | 
			
		||||
    - - X: 40000100
 | 
			
		||||
        Y: 19999959
 | 
			
		||||
      - X: 40000100
 | 
			
		||||
        Y: 30000041
 | 
			
		||||
      - X: 40000041
 | 
			
		||||
        Y: 30000100
 | 
			
		||||
      - X: -10000041
 | 
			
		||||
        Y: 30000100
 | 
			
		||||
      - X: -10000100
 | 
			
		||||
        Y: 30000041
 | 
			
		||||
      - X: -10000100
 | 
			
		||||
        Y: 19999959
 | 
			
		||||
      - X: -10000041
 | 
			
		||||
        Y: 19999900
 | 
			
		||||
      - X: 40000041
 | 
			
		||||
        Y: 19999900
 | 
			
		||||
    - - X: 80000000
 | 
			
		||||
        Y: 100000000
 | 
			
		||||
      - X: 60000000
 | 
			
		||||
        Y: 100000000
 | 
			
		||||
      - X: 60000000
 | 
			
		||||
        Y: 40000000
 | 
			
		||||
      - X: 80000000
 | 
			
		||||
        Y: 40000000
 | 
			
		||||
    - - X: -40000000
 | 
			
		||||
        Y: 60000000
 | 
			
		||||
      - X: -110000000
 | 
			
		||||
        Y: 60000000
 | 
			
		||||
      - X: -110000000
 | 
			
		||||
        Y: 40000000
 | 
			
		||||
      - X: -40000000
 | 
			
		||||
        Y: 40000000
 | 
			
		||||
    - - X: 40000000
 | 
			
		||||
        Y: 30000000
 | 
			
		||||
      - X: -10000000
 | 
			
		||||
        Y: 30000000
 | 
			
		||||
      - X: -10000000
 | 
			
		||||
        Y: 20000000
 | 
			
		||||
      - X: 40000000
 | 
			
		||||
        Y: 20000000
 | 
			
		||||
    - - X: 110000000
 | 
			
		||||
        Y: 0
 | 
			
		||||
      - X: -110000000
 | 
			
		||||
@@ -2646,18 +2689,18 @@ CompositeCollider2D:
 | 
			
		||||
        Y: -20000000
 | 
			
		||||
  m_CompositePaths:
 | 
			
		||||
    m_Paths:
 | 
			
		||||
    - - {x: 7.9999747, y: 3.99999}
 | 
			
		||||
      - {x: 7.9999747, y: 10.00001}
 | 
			
		||||
      - {x: 5.99999, y: 9.999974}
 | 
			
		||||
      - {x: 6.0000253, y: 3.99999}
 | 
			
		||||
    - - {x: -4.0000253, y: 4.00001}
 | 
			
		||||
      - {x: -4.0000253, y: 6.00001}
 | 
			
		||||
      - {x: -11.00001, y: 5.9999747}
 | 
			
		||||
      - {x: -10.999974, y: 4.00001}
 | 
			
		||||
    - - {x: 3.9999747, y: 1.99999}
 | 
			
		||||
      - {x: 3.9999747, y: 3.00001}
 | 
			
		||||
      - {x: -1.00001, y: 2.9999747}
 | 
			
		||||
      - {x: -0.9999748, y: 1.99999}
 | 
			
		||||
    - - {x: 7.9999704, y: 4}
 | 
			
		||||
      - {x: 7.9999704, y: 10}
 | 
			
		||||
      - {x: 6, y: 9.99997}
 | 
			
		||||
      - {x: 6.000029, y: 4}
 | 
			
		||||
    - - {x: -4.000029, y: 4}
 | 
			
		||||
      - {x: -4.000029, y: 6}
 | 
			
		||||
      - {x: -11, y: 5.999971}
 | 
			
		||||
      - {x: -10.99997, y: 4}
 | 
			
		||||
    - - {x: 3.999971, y: 2}
 | 
			
		||||
      - {x: 3.999971, y: 3}
 | 
			
		||||
      - {x: -1, y: 2.999971}
 | 
			
		||||
      - {x: -0.99997073, y: 2}
 | 
			
		||||
    - - {x: 10.99997, y: -2}
 | 
			
		||||
      - {x: 10.99997, y: 0}
 | 
			
		||||
      - {x: -11, y: -0.000029300001}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user