Merge pull request #37 from FloSet/little-changes

KnolleShiroi · web-flow · commit b93f8160ada5 · 2021-06-10T15:06:23.000+02:00
Updated Coin Texture
diff --git a/Assets/Script/Bullet.cs b/Assets/Script/Bullet.cs
@@ -12,7 +12,7 @@ private void OnTriggerEnter2D(Collider2D collision)
         if (collision.gameObject != null && collision.gameObject.GetComponent<Damageable>() != null)
         {
             //Schaden hinzuf�gen
-            collision.SendMessage("applyDamage", damage, SendMessageOptions.DontRequireReceiver);
+            collision.SendMessage("ApplyDamage", damage, SendMessageOptions.DontRequireReceiver);
             //und Kugel zerst�ren
             Destroy(gameObject);
         }
diff --git a/Assets/elements/coin.prefab b/Assets/elements/coin.prefab
@@ -10,7 +10,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4311465640806384}
   - component: {fileID: 212716265146471050}
-  - component: {fileID: 95766292526685324}
   - component: {fileID: 58065418673195158}
   - component: {fileID: -2141492099219575023}
   m_Layer: 0
@@ -29,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 1314156328493376}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -5.26, y: -2.46, z: 0}
-  m_LocalScale: {x: 0.22468337, y: 0.22468337, z: 0.22468337}
+  m_LocalScale: {x: 0.11227626, y: 0.11227626, z: 0.11227626}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -72,39 +71,20 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2013999209
-  m_SortingLayer: 1
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: d6112be6ddabd02468b171a41d69588e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 51b638ca0d9c13046b1a9da802b68350, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 4.94, y: 4.96}
+  m_Size: {x: 10.24, y: 10.24}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!95 &95766292526685324
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1314156328493376}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 85cb55e2972aac1499c56d8c31ffa391, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!58 &58065418673195158
 CircleCollider2D:
   m_ObjectHideFlags: 0
@@ -120,7 +100,7 @@ CircleCollider2D:
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
   serializedVersion: 2
-  m_Radius: 2.48
+  m_Radius: 5.12
 --- !u!114 &-2141492099219575023
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -133,3 +113,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 34ebfbe438ddccd458ea226611fba0cd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  checkpoint: {fileID: 0}
diff --git a/Assets/scene/Level1.unity b/Assets/scene/Level1.unity
@@ -153,7 +153,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   currentCheckpoint: {fileID: 234003045}
-  player: {fileID: 1608396264}
   scoreText: {fileID: 115450512}
 --- !u!4 &15695190
 Transform:
@@ -638,11 +637,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: -2141492099219575023, guid: dbff9f2ec6b4dca49b19af8591ee283c,
-        type: 3}
-      propertyPath: scoreText
-      value: 
-      objectReference: {fileID: 115450512}
+    - target: {fileID: 1314156328493376, guid: dbff9f2ec6b4dca49b19af8591ee283c, type: 3}
+      propertyPath: m_Name
+      value: coin
+      objectReference: {fileID: 0}
     - target: {fileID: 4311465640806384, guid: dbff9f2ec6b4dca49b19af8591ee283c, type: 3}
       propertyPath: m_RootOrder
       value: 11
@@ -675,6 +673,18 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4311465640806384, guid: dbff9f2ec6b4dca49b19af8591ee283c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4311465640806384, guid: dbff9f2ec6b4dca49b19af8591ee283c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4311465640806384, guid: dbff9f2ec6b4dca49b19af8591ee283c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dbff9f2ec6b4dca49b19af8591ee283c, type: 3}
 --- !u!4 &473880899 stripped
@@ -2347,18 +2357,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dbff9f2ec6b4dca49b19af8591ee283c, type: 3}
---- !u!114 &1608396264 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1170451056, guid: 87a2357765801c34292d6718d8b4d770,
-    type: 3}
-  m_PrefabInstance: {fileID: 1890344584}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5c292382499933c4082ee8d801663d06, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1710587517
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/Assets/scene/Level2.unity b/Assets/scene/Level2.unity
@@ -1022,7 +1022,7 @@ PrefabInstance:
     - target: {fileID: 3042131768773078288, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -10.1658
+      value: -10.1455
       objectReference: {fileID: 0}
     - target: {fileID: 3042131768773078288, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
@@ -1072,17 +1072,17 @@ PrefabInstance:
     - target: {fileID: 5823274525863832353, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_Size.x
-      value: 11.49647
+      value: 12.75525
       objectReference: {fileID: 0}
     - target: {fileID: 5823274525863832353, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_SpriteTilingProperty.newSize.x
-      value: 11.496466
+      value: 12.755245
       objectReference: {fileID: 0}
     - target: {fileID: 7633277534204805117, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_Size.x
-      value: 12.663421
+      value: 12.755245
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a169330724cc6d04094b2a681a7ffe11, type: 3}
@@ -1757,7 +1757,7 @@ PrefabInstance:
     - target: {fileID: 3042131768773078288, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 4.0349
+      value: 4.11
       objectReference: {fileID: 0}
     - target: {fileID: 3042131768773078288, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
@@ -2180,7 +2180,7 @@ PrefabInstance:
     - target: {fileID: 3042131768773078288, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.6936
+      value: -0.6415
       objectReference: {fileID: 0}
     - target: {fileID: 3042131768773078288, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
@@ -2225,17 +2225,17 @@ PrefabInstance:
     - target: {fileID: 5823274525863832353, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_Size.x
-      value: 11.82857
+      value: 16.57719
       objectReference: {fileID: 0}
     - target: {fileID: 5823274525863832353, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_SpriteTilingProperty.newSize.x
-      value: 11.828569
+      value: 16.577194
       objectReference: {fileID: 0}
     - target: {fileID: 7633277534204805117, guid: a169330724cc6d04094b2a681a7ffe11,
         type: 3}
       propertyPath: m_Size.x
-      value: 11.828569
+      value: 16.577194
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a169330724cc6d04094b2a681a7ffe11, type: 3}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -131,7 +131,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.6
+  bundleVersion: 0.7
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ private void OnTriggerEnter2D(Collider2D collision)`
`12`	`12`	`if (collision.gameObject != null && collision.gameObject.GetComponent<Damageable>() != null)`
`13`	`13`	`{`
`14`	`14`	`//Schaden hinzufügen`
`15`		`- collision.SendMessage("applyDamage", damage, SendMessageOptions.DontRequireReceiver);`
	`15`	`+ collision.SendMessage("ApplyDamage", damage, SendMessageOptions.DontRequireReceiver);`
`16`	`16`	`//und Kugel zerstören`
`17`	`17`	`Destroy(gameObject);`
`18`	`18`	`}`