UI passt sich der Aufloesung an

diff --git a/2DGame/Assets/Fonts.meta b/2DGame/Assets/Fonts.meta
new file mode 100644 (file)
index 0000000..c6690e3
--- /dev/null
+++ b/2DGame/Assets/Fonts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 75114f01a7071d74487bc2a130d881c5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

diff --git a/2DGame/Assets/Fonts/akaDylan Collage.ttf b/2DGame/Assets/Fonts/akaDylan Collage.ttf
new file mode 100644 (file)
index 0000000..c510bfd
Binary files /dev/null and b/2DGame/Assets/Fonts/akaDylan Collage.ttf differ

diff --git a/2DGame/Assets/Fonts/akaDylan Collage.ttf.meta b/2DGame/Assets/Fonts/akaDylan Collage.ttf.meta
new file mode 100644 (file)
index 0000000..6da24b9
--- /dev/null
+++ b/2DGame/Assets/Fonts/akaDylan Collage.ttf.meta
@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: abf6d8cf0003cbf45802ef76a19e5b2c
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - akaDylan Collage
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

diff --git a/2DGame/Assets/Fonts/akaDylan Open.ttf b/2DGame/Assets/Fonts/akaDylan Open.ttf
new file mode 100644 (file)
index 0000000..70f0c52
Binary files /dev/null and b/2DGame/Assets/Fonts/akaDylan Open.ttf differ

diff --git a/2DGame/Assets/Fonts/akaDylan Open.ttf.meta b/2DGame/Assets/Fonts/akaDylan Open.ttf.meta
new file mode 100644 (file)
index 0000000..c5132ec
--- /dev/null
+++ b/2DGame/Assets/Fonts/akaDylan Open.ttf.meta
@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 2e65e2f17eb17fc4c8b01a01a0e89000
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - akaDylan Open
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

diff --git a/2DGame/Assets/Fonts/akaDylan Plain.ttf b/2DGame/Assets/Fonts/akaDylan Plain.ttf
new file mode 100644 (file)
index 0000000..3048f48
Binary files /dev/null and b/2DGame/Assets/Fonts/akaDylan Plain.ttf differ

diff --git a/2DGame/Assets/Fonts/akaDylan Plain.ttf.meta b/2DGame/Assets/Fonts/akaDylan Plain.ttf.meta
new file mode 100644 (file)
index 0000000..deb47e2
--- /dev/null
+++ b/2DGame/Assets/Fonts/akaDylan Plain.ttf.meta
@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 599b423cf07174747b8d2ff077eab373
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - akaDylan Plain
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

diff --git a/2DGame/Assets/Fonts/akaDylan.gif b/2DGame/Assets/Fonts/akaDylan.gif
new file mode 100644 (file)
index 0000000..fe8fb6e
Binary files /dev/null and b/2DGame/Assets/Fonts/akaDylan.gif differ

diff --git a/2DGame/Assets/Fonts/akaDylan.gif.meta b/2DGame/Assets/Fonts/akaDylan.gif.meta
new file mode 100644 (file)
index 0000000..0c902dc
--- /dev/null
+++ b/2DGame/Assets/Fonts/akaDylan.gif.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 58174a72c5b4b9049956e129c013baec
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

diff --git a/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity b/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity
index c46c37ee29b7ed81bdf9f8da89edb6f6ff18fbc5..f62121488c2f5b54dedc3de45bee4947c8877b28 100644 (file)
--- a/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity
+++ b/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity
@@ -472,6 +472,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &66658440
 GameObject:
   m_ObjectHideFlags: 0
@@ -1069,12 +1070,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 11
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 559.93616, y: 448.40283}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 393.9453, y: 574.7948}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &194630536
 MonoBehaviour:
@@ -1536,7 +1537,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 3.31, y: 7}
+    oldSize: {x: 3.41, y: 7.05}
     newSize: {x: 2.36, y: 5}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -1584,7 +1585,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: 5a6911bfdef56e3438469bcb744038a5, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -2363,6 +2364,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 12
   enemyDamage: 3
+  spiky: 0
 --- !u!114 &243225414
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2556,12 +2558,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 20
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 496.53815, y: 327.78723}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 330.54724, y: 454.1792}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &270560371
 MonoBehaviour:
@@ -2705,12 +2707,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 6
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -508.578, y: 448.403}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 293.84, y: -56.725006}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &311476190
 MonoBehaviour:
@@ -2946,6 +2948,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &397286148
 GameObject:
   m_ObjectHideFlags: 0
@@ -2976,12 +2979,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 7
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -442.082, y: 448.403}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 345.38, y: -56.725006}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &397286150
 MonoBehaviour:
@@ -3286,11 +3289,11 @@ RectTransform:
   m_LocalScale: {x: 4.3488417, y: 4.3488417, z: 0.2174421}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 8
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1756, y: 112}
+  m_AnchoredPosition: {x: 2187, y: 1056}
   m_SizeDelta: {x: 1149.72, y: 121.3}
   m_Pivot: {x: 0.86371845, y: -0.16961707}
 --- !u!114 &423319633
@@ -3831,6 +3834,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &461211818
 GameObject:
   m_ObjectHideFlags: 0
@@ -3997,6 +4001,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &464558388
 GameObject:
   m_ObjectHideFlags: 0
@@ -4163,6 +4168,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &471674077
 GameObject:
   m_ObjectHideFlags: 0
@@ -4191,14 +4197,16 @@ RectTransform:
   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_Children:
+  - {fileID: 1283337207}
+  - {fileID: 1206416086}
   m_Father: {fileID: 1107270362}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -874.54, y: 448.403}
-  m_SizeDelta: {x: 113.449, y: 113.449}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 56.725006, y: -56.725006}
+  m_SizeDelta: {x: 113.449005, y: 113.449005}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &471674079
 MonoBehaviour:
@@ -4268,12 +4276,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 19
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 749.61646, y: 388.60803}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 583.6256, y: 515}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &506468296
 MonoBehaviour:
@@ -4845,6 +4853,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &583615246
 GameObject:
   m_ObjectHideFlags: 0
@@ -5196,6 +5205,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &695689559
 GameObject:
   m_ObjectHideFlags: 0
@@ -5687,6 +5697,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 0
 --- !u!114 &717537044
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10671,12 +10682,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 16
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 559.93585, y: 388.60803}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 393.94495, y: 515}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &726379607
 MonoBehaviour:
@@ -10882,6 +10893,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &763684425
 GameObject:
   m_ObjectHideFlags: 0
@@ -11305,7 +11317,7 @@ Transform:
   m_GameObject: {fileID: 799096931}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 10}
-  m_LocalScale: {x: 2.8076, y: 2.8076, z: 2.8076}
+  m_LocalScale: {x: 3, y: 3, z: 1}
   m_Children: []
   m_Father: {fileID: 519420032}
   m_RootOrder: 0
@@ -11391,12 +11403,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 15
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 494.9909, y: 388.60803}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 329, y: 515}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &816615896
 MonoBehaviour:
@@ -11749,12 +11761,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 14
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 747.55646, y: 448.40283}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 581.56555, y: 574.7948}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &867838451
 MonoBehaviour:
@@ -11978,12 +11990,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -651.8669, y: 448.40283}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 190.76001, y: -56.725006}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &896600233
 MonoBehaviour:
@@ -12829,6 +12841,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 972365582}
+  - component: {fileID: 972365583}
+  - component: {fileID: 972365584}
   m_Layer: 0
   m_Name: GroundCheck
   m_TagString: Untagged
@@ -12850,6 +12864,34 @@ Transform:
   m_Father: {fileID: 936765971}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!58 &972365583
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 972365581}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 0.5
+--- !u!114 &972365584
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 972365581}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7de0136e8f7b5d943beace14be2d4deb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &973671302
 GameObject:
   m_ObjectHideFlags: 0
@@ -13219,12 +13261,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -574.55255, y: 448.40283}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 242.29999, y: -56.725006}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &995274837
 MonoBehaviour:
@@ -13314,7 +13356,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 3.31, y: 7}
+    oldSize: {x: 3.41, y: 7.05}
     newSize: {x: 2.36, y: 5}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -13362,7 +13404,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: 5a6911bfdef56e3438469bcb744038a5, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -13482,6 +13524,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 0
 --- !u!114 &1006420616
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -13857,12 +13900,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 17
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 623.8507, y: 388.60803}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 457.85986, y: 515}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1029742219
 MonoBehaviour:
@@ -13952,7 +13995,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 3.31, y: 7}
+    oldSize: {x: 3.41, y: 7.05}
     newSize: {x: 2.36, y: 5}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -14000,7 +14043,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: 5a6911bfdef56e3438469bcb744038a5, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -14149,8 +14192,6 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 471674078}
-  - {fileID: 1283337207}
-  - {fileID: 1206416086}
   - {fileID: 1488509465}
   - {fileID: 896600232}
   - {fileID: 995274836}
@@ -14332,12 +14373,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 18
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 685.70154, y: 388.60803}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 519.7107, y: 515}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1120992168
 MonoBehaviour:
@@ -14450,7 +14491,7 @@ TilemapRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: -1
+  m_SortingOrder: 0
   m_ChunkSize: {x: 32, y: 32, z: 32}
   m_ChunkCullingBounds: {x: 3, y: 3, z: 0}
   m_MaxChunkCount: 16
@@ -24211,13 +24252,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children: []
-  m_Father: {fileID: 1107270362}
-  m_RootOrder: 2
+  m_Father: {fileID: 471674078}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 890.849, y: 458.70718}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 436.85046, y: -56.724483}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1206416087
 MonoBehaviour:
@@ -24365,7 +24406,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 3.31, y: 7}
+    oldSize: {x: 3.41, y: 7.05}
     newSize: {x: 2.36, y: 5}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -24413,7 +24454,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: 5a6911bfdef56e3438469bcb744038a5, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -24433,7 +24474,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1230926686}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 103.6, y: 10, z: 0}
+  m_LocalPosition: {x: 103.64, y: 10.31, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -24744,17 +24785,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1283337206}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 1107270362}
-  m_RootOrder: 1
+  m_Father: {fileID: 471674078}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -874.54, y: 448.403}
-  m_SizeDelta: {x: 134.223, y: 93.87}
+  m_AnchoredPosition: {x: 0.0049438477, y: -0.0049819946}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1283337208
 MonoBehaviour:
@@ -24777,9 +24818,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 50
-    m_FontStyle: 3
+    m_Font: {fileID: 12800000, guid: 599b423cf07174747b8d2ff077eab373, type: 3}
+    m_FontSize: 60
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 100
@@ -25148,11 +25189,11 @@ RectTransform:
   m_LocalScale: {x: 4.4645, y: 4.4645, z: 4.4645}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 9
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 655.293, y: 483.969}
+  m_AnchoredPosition: {x: 831.3022, y: 774.36096}
   m_SizeDelta: {x: 82.468, y: 15.463}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1359769958
@@ -25273,12 +25314,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 10
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 494.9912, y: 448.40283}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 329.00037, y: 574.7948}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1400477798
 MonoBehaviour:
@@ -25583,6 +25624,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 0
 --- !u!114 &1423339817
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -26140,6 +26182,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &1452174928
 GameObject:
   m_ObjectHideFlags: 0
@@ -26380,12 +26423,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -726.094, y: 448.403}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 139.22, y: -56.725006}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1488509466
 MonoBehaviour:
@@ -26855,6 +26898,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 0
 --- !u!114 &1554536750
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -27253,12 +27297,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 21
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 559.419, y: 327.787}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 393.4281, y: 454.17896}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1605026745
 MonoBehaviour:
@@ -27328,12 +27372,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 13
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 684.67145, y: 448.40283}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 518.68054, y: 574.7948}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1625269337
 MonoBehaviour:
@@ -27431,7 +27475,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: 5a6911bfdef56e3438469bcb744038a5, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -27474,7 +27518,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 3.31, y: 7}
+    oldSize: {x: 3.41, y: 7.05}
     newSize: {x: 2.36, y: 5}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -28409,6 +28453,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &1790915303
 GameObject:
   m_ObjectHideFlags: 0
@@ -28716,6 +28761,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &1809534809
 GameObject:
   m_ObjectHideFlags: 0
@@ -29103,6 +29149,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyHealth: 1
   enemyDamage: 1
+  spiky: 1
 --- !u!1 &1858170491
 GameObject:
   m_ObjectHideFlags: 0
@@ -29257,12 +29304,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1107270362}
-  m_RootOrder: 12
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 622.817, y: 448.403}
-  m_SizeDelta: {x: 51.542, y: 51.542}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 456.82617, y: 574.7949}
+  m_SizeDelta: {x: 51.541992, y: 51.541992}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1864406220
 MonoBehaviour:

diff --git a/2DGame/Assets/Scripts/Audio/AudioManager.cs b/2DGame/Assets/Scripts/Audio/AudioManager.cs
index 070d4d11f54137cc12fc2468d250ae80747e68ea..be320bb6e1b0bd09f4489ec37d65b92fc2caa472 100644 (file)
--- a/2DGame/Assets/Scripts/Audio/AudioManager.cs
+++ b/2DGame/Assets/Scripts/Audio/AudioManager.cs
@@ -29,7 +29,7 @@ public class AudioManager : MonoBehaviour
         s.source.Play();
     }
 
-    public void Stop(string name)
+    public void Stop(string name) 
     {
         Sound s = Array.Find(sounds, sound => sound.name == name);
         s.source.Stop();

diff --git a/2DGame/Assets/Scripts/Gegner/EnemyCollision.cs b/2DGame/Assets/Scripts/Gegner/EnemyCollision.cs
index 16a5ac55b1b38242cf5b1026f3a346695aba6376..afb9d2aa9e6b63868ac30c34e53ed9326e83e605 100644 (file)
--- a/2DGame/Assets/Scripts/Gegner/EnemyCollision.cs
+++ b/2DGame/Assets/Scripts/Gegner/EnemyCollision.cs
@@ -43,7 +43,7 @@ public class EnemyCollision : MonoBehaviour
 
             Vector2 knockback = mousePos - enemyPos;
             knockback.Normalize();
-            knockback *= eS.enemyDamage * 100;
+            knockback *= eS.enemyDamage * 36;
 
             collision.gameObject.GetComponent<Rigidbody2D>().velocity += knockback;
 

diff --git a/2DGame/Assets/Scripts/Gegner/EnemyScript.cs b/2DGame/Assets/Scripts/Gegner/EnemyScript.cs
index 2964747c52af12959cc785708454bef9c2fcba2c..84935f1d2ee8cd9c970551b5810f71c661d29f61 100644 (file)
--- a/2DGame/Assets/Scripts/Gegner/EnemyScript.cs
+++ b/2DGame/Assets/Scripts/Gegner/EnemyScript.cs
@@ -7,6 +7,8 @@ public class EnemyScript : MonoBehaviour
     public int enemyHealth;
     public int enemyDamage;
 
+    public bool spiky;
+
     // Update is called once per frame
     void Update()
     {
@@ -15,13 +17,4 @@ public class EnemyScript : MonoBehaviour
             gameObject.SetActive(false);
         }
     }
-
-    private void OnTriggerEnter2D(Collider2D collision)
-    {
-        if (collision.gameObject.CompareTag("Bullet"))
-        {
-            enemyHealth--;
-            Destroy(collision.gameObject);
-        }
-    }
 }

diff --git a/2DGame/Assets/Scripts/Maus/GlowRotation.cs b/2DGame/Assets/Scripts/Maus/GlowRotation.cs
index 97a880a8a184f6725441fb2e23a8c78ba75abac7..509646bc653cd5b0de02b0306c3fc19f66e93e3f 100644 (file)
--- a/2DGame/Assets/Scripts/Maus/GlowRotation.cs
+++ b/2DGame/Assets/Scripts/Maus/GlowRotation.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+  using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 

diff --git a/2DGame/Assets/Scripts/Maus/JumpOnEnemies.cs b/2DGame/Assets/Scripts/Maus/JumpOnEnemies.cs
new file mode 100644 (file)
index 0000000..a034c66
--- /dev/null
+++ b/2DGame/Assets/Scripts/Maus/JumpOnEnemies.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class JumpOnEnemies : MonoBehaviour
+{
+    EnemyScript enemyScript;
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        if (collision.gameObject.CompareTag("Enemy"))
+        {
+            enemyScript = collision.gameObject.GetComponent<EnemyScript>();
+
+            if(!enemyScript.spiky)
+            {
+                enemyScript.enemyHealth -= 1;
+            }
+        }
+    }
+}

diff --git a/2DGame/Assets/Scripts/Maus/JumpOnEnemies.cs.meta b/2DGame/Assets/Scripts/Maus/JumpOnEnemies.cs.meta
new file mode 100644 (file)
index 0000000..cda8b4f
--- /dev/null
+++ b/2DGame/Assets/Scripts/Maus/JumpOnEnemies.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7de0136e8f7b5d943beace14be2d4deb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

diff --git a/2DGame/Assets/Scripts/Maus/Scissors.cs b/2DGame/Assets/Scripts/Maus/Scissors.cs
index 0044202017c8abcb6607649baf705b8a058170c5..96bdc78a4e3f873e36741d302f1c6006269b2604 100644 (file)
--- a/2DGame/Assets/Scripts/Maus/Scissors.cs
+++ b/2DGame/Assets/Scripts/Maus/Scissors.cs
@@ -9,7 +9,7 @@ public class Scissors : MonoBehaviour
     float speed;
 
     [SerializeField]
-    float lifeTime = 10;
+    float lifeTime;
 
     public void StartShoot(bool isFacingLeft, Vector2 velocity)
     {

diff --git a/2DGame/Assets/Sprites/checkpoint_0.png b/2DGame/Assets/Sprites/checkpoint_0.png
index 2bab2fe94424856bd18ff6dc4bba279cbde0c525..26273407a463e3ee0097457ef551e663ffe16a3b 100644 (file)
Binary files a/2DGame/Assets/Sprites/checkpoint_0.png and b/2DGame/Assets/Sprites/checkpoint_0.png differ

diff --git a/2DGame/Assets/Sprites/checkpoint_1.png b/2DGame/Assets/Sprites/checkpoint_1.png
index 9eb5a6cdcd926b498ad7fad4adb897c012cc6898..94a2b78961a6f6f8feae0090694e7ded8f9bcd2a 100644 (file)
Binary files a/2DGame/Assets/Sprites/checkpoint_1.png and b/2DGame/Assets/Sprites/checkpoint_1.png differ

diff --git a/2DGame/Assets/Sprites/earth.png b/2DGame/Assets/Sprites/earth.png
deleted file mode 100644 (file)
index f759a01..0000000
Binary files a/2DGame/Assets/Sprites/earth.png and /dev/null differ

diff --git a/2DGame/Assets/Sprites/earth.png.meta b/2DGame/Assets/Sprites/earth.png.meta
deleted file mode 100644 (file)
index 9106748..0000000
--- a/2DGame/Assets/Sprites/earth.png.meta
+++ /dev/null
@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: bc623e548bedf844a8eb013b95c80eb2
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: