Level 18+19 fertiggestellt, Level 20 angefangen

22492b55 · Christopher Benes · 44e578ec · 22492b55 · 22492b55 · 22492b55
Commit 22492b55 authored Sep 29, 2018 by Christopher Benes
20 changed files
--- a/Assets/Resources/ChallengerModus.prefab
+++ b/Assets/Resources/ChallengerModus.prefab
@@ -98,7 +98,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7e98e65d5258913459ccbd3759232399, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  waitTime: 2
+  waitTime: 2.5
  child: {fileID: 1417612902657568}
 --- !u!198 &198244601809831776
 ParticleSystem:

--- a/Assets/_Game/Prefabs/Grids/BackgroundGrid05.prefab
+++ b/Assets/_Game/Prefabs/Grids/BackgroundGrid05.prefab
--- a/Assets/_Game/Prefabs/Grids/BackgroundGrid05.prefab.meta
+++ b/Assets/_Game/Prefabs/Grids/BackgroundGrid05.prefab.meta
+fileFormatVersion: 2
+guid: 9770d698479c4ab47ba2f0581522038b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Levels/Level17.unity
+++ b/Assets/_Game/Scenes/Levels/Level17.unity
--- a/Assets/_Game/Scenes/Levels/Level18.unity
+++ b/Assets/_Game/Scenes/Levels/Level18.unity
@@ -13236,82 +13236,82 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[0].first.x
-      value: -20
+      value: -9
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[1].first.x
-      value: -19
+      value: -8
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[2].first.x
-      value: -15
+      value: -20
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[3].first.x
-      value: -14
+      value: -19
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[4].first.x
-      value: -10
+      value: -15
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[5].first.x
-      value: -9
+      value: -14
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[6].first.x
-      value: -15
+      value: -9
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[6].second.m_TileIndex
-      value: 20
+      value: 14
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[6].second.m_TileSpriteIndex
-      value: 19
+      value: 10
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[7].first.x
-      value: -14
+      value: -8
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[8].first.x
-      value: -10
+      value: -15
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[8].second.m_TileIndex
-      value: 14
+      value: 20
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[8].second.m_TileSpriteIndex
-      value: 10
+      value: 19
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[9].first.x
-      value: -9
+      value: -14
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[9].second.m_TileIndex
-      value: 22
+      value: 27
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[9].second.m_TileSpriteIndex
-      value: 17
+      value: 18
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -14421,12 +14421,12 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[7].second.m_TileIndex
-      value: 27
+      value: 22
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[7].second.m_TileSpriteIndex
-      value: 18
+      value: 17
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -15152,12 +15152,12 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[4].second.m_TileIndex
-      value: 25
+      value: 27
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[4].second.m_TileSpriteIndex
-      value: 17
+      value: 18
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -15394,22 +15394,22 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[0].second.m_TileIndex
-      value: 27
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[0].second.m_TileSpriteIndex
-      value: 18
+      value: 17
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[3].second.m_TileIndex
-      value: 28
+      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[3].second.m_TileSpriteIndex
-      value: 19
+      value: 9
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -15419,12 +15419,12 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[6].first.y
-      value: -4
+      value: -5
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[7].first.y
-      value: -4
+      value: -5
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -15609,7 +15609,7 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[9].second.m_TileMatrixIndex
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -15978,12 +15978,12 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[5].second.m_TileIndex
-      value: 24
+      value: 28
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[5].second.m_TileSpriteIndex
-      value: 17
+      value: 19
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -16062,7 +16062,7 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[1].first.y
-      value: -5
+      value: -6
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -16154,17 +16154,17 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[0].first.y
-      value: -5
+      value: -6
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[1].second.m_TileIndex
-      value: 13
+      value: 24
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[1].second.m_TileSpriteIndex
-      value: 9
+      value: 17
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -16839,7 +16839,7 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[7].second.m_TileMatrixIndex
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -16854,7 +16854,7 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[3].second.m_TileMatrixIndex
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -16864,12 +16864,12 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[0].second.m_TileMatrixIndex
-      value: 1
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[4].second.m_TileMatrixIndex
-      value: 3
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
@@ -17029,7 +17029,7 @@ Prefab:
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}
      propertyPath: m_Tiles.Array.data[1].second.m_TileMatrixIndex
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 8195094282210412246, guid: c8cf1c8d84ea8e34f97fdccc7a610e08,
        type: 2}

--- a/Assets/_Game/Scenes/Levels/Level19.unity
+++ b/Assets/_Game/Scenes/Levels/Level19.unity
--- a/Assets/_Game/Scenes/Levels/Level20.unity
+++ b/Assets/_Game/Scenes/Levels/Level20.unity
--- a/Assets/_Game/Scenes/Levels/Level20.unity.meta
+++ b/Assets/_Game/Scenes/Levels/Level20.unity.meta
+fileFormatVersion: 2
+guid: 081c189e0d3e45548ab3cf652e10f027
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Palettes/GroundPalette05.prefab
+++ b/Assets/_Game/Scenes/Palettes/GroundPalette05.prefab
--- a/Assets/_Game/Sprites/Set05/Background.meta
+++ b/Assets/_Game/Sprites/Set05/Background.meta
 fileFormatVersion: 2
-guid: ccfe9bf63a9f2214db0028dccb6b6e2b
+guid: a5aa4e4065df03147aef4098927bc32b
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}

--- a/Assets/_Game/Scenes/Tilesets/Set05/01.meta
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01.meta
+fileFormatVersion: 2
+guid: 421c3ec6f6e96cb4e8a2f3f5e00cc63b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/Block.Asset
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/Block.Asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85c106dd6ad68a043a95570cbdd83ca7, type: 3}
+  m_Name: Block
+  m_EditorClassIdentifier: 
+  sprite: {fileID: 21300000, guid: d9d8e4b7bc63a0548ae4f52fd46f7366, type: 3}
+  rotation: 0
+  top:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  left:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  right:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  bottom:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/Block.Asset.meta
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/Block.Asset.meta
+fileFormatVersion: 2
+guid: ec3e911013c24964b9d408ef5a982dbd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave0.Asset
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave0.Asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85c106dd6ad68a043a95570cbdd83ca7, type: 3}
+  m_Name: SlopeConcave0
+  m_EditorClassIdentifier: 
+  sprite: {fileID: 21300000, guid: 737ddc5f8ff056544b1ba963cc0a92a5, type: 3}
+  rotation: 0
+  top:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  left:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  right:
+    left: 0
+    right: 0
+    enter: 1
+    land: 2
+  bottom:
+    left: 0
+    right: 0
+    enter: 2
+    land: 1
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave0.Asset.meta
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave0.Asset.meta
+fileFormatVersion: 2
+guid: 3733c49936ad92b4e83fcbe74e4ba811
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave180.Asset
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave180.Asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85c106dd6ad68a043a95570cbdd83ca7, type: 3}
+  m_Name: SlopeConcave180
+  m_EditorClassIdentifier: 
+  sprite: {fileID: 21300000, guid: 737ddc5f8ff056544b1ba963cc0a92a5, type: 3}
+  rotation: 2
+  top:
+    left: 0
+    right: 0
+    enter: 2
+    land: 1
+  left:
+    left: 0
+    right: 0
+    enter: 1
+    land: 2
+  right:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  bottom:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave180.Asset.meta
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave180.Asset.meta
+fileFormatVersion: 2
+guid: d3faa784a8bb091468a93ac29394277a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave270.Asset
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave270.Asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85c106dd6ad68a043a95570cbdd83ca7, type: 3}
+  m_Name: SlopeConcave270
+  m_EditorClassIdentifier: 
+  sprite: {fileID: 21300000, guid: 737ddc5f8ff056544b1ba963cc0a92a5, type: 3}
+  rotation: 3
+  top:
+    left: 2
+    right: 1
+    enter: 0
+    land: 0
+  left:
+    left: 0
+    right: 0
+    enter: 2
+    land: 1
+  right:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  bottom:
+    left: 0
+    right: 0
+    enter: 1
+    land: 2
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave270.Asset.meta
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave270.Asset.meta
+fileFormatVersion: 2
+guid: b00bd51832ac2664ca7eb46c2bb78e59
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave90.Asset
+++ b/Assets/_Game/Scenes/Tilesets/Set05/01/SlopeConcave90.Asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85c106dd6ad68a043a95570cbdd83ca7, type: 3}
+  m_Name: SlopeConcave90
+  m_EditorClassIdentifier: 
+  sprite: {fileID: 21300000, guid: 737ddc5f8ff056544b1ba963cc0a92a5, type: 3}
+  rotation: 1
+  top:
+    left: 0
+    right: 0
+    enter: 1
+    land: 2
+  left:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0
+  right:
+    left: 0
+    right: 0
+    enter: 2
+    land: 1
+  bottom:
+    left: 1
+    right: 1
+    enter: 0
+    land: 0