Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

72ba8af6 · Christopher Benes · 0ab92a60 · 354f3ba1 · 72ba8af6
Commit 72ba8af6 authored Mar 31, 2019 by Christopher Benes
Hide whitespace changes
Inline Side-by-side

Showing with 81 additions and 81 deletions

Assets/_Game/Scenes/Max-Level.unity Assets/_Game/Scenes/Max-Level.unity +81 -81

No files found.
--- a/Assets/_Game/Scenes/Max-Level.unity
+++ b/Assets/_Game/Scenes/Max-Level.unity
@@ -32640,12 +32640,12 @@ PrefabInstance:
    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -117.4
+      value: -168.11
      objectReference: {fileID: 0}
    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 89.2
+      value: 90.2
      objectReference: {fileID: 0}
    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
        type: 3}
@@ -32738,79 +32738,11 @@ PrefabInstance:
      propertyPath: m_UseAutoMass
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_SortingLayerID
-      value: 1206248169
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_SortingLayer
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_SpriteTilingProperty.oldSize.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_SpriteTilingProperty.oldSize.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Size.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Offset.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: shotSpawn
-      value: 
-      objectReference: {fileID: 2139239323}
-    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: elementalAttack
-      value: 
-      objectReference: {fileID: 7588789901055592565, guid: c916ffaff3c476b448f67d9d827b3e7e,
-        type: 3}
-    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: cooldown
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: volleySize
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: launchPower
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: attackSpeed
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 352228605, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 352228602, guid: 2e3528907311e438dab0d393127aa332, type: 3}
      propertyPath: onChargeChange
      value: 
      objectReference: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6,
        type: 2}
-    - target: {fileID: 2139239323, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
    - target: {fileID: 5703659376326297473, guid: 2e3528907311e438dab0d393127aa332,
        type: 3}
      propertyPath: savePointList.Array.size
@@ -32831,15 +32763,6 @@ PrefabInstance:
      propertyPath: savePointList.Array.data[2]
      value: 
      objectReference: {fileID: 702508322}
-    - target: {fileID: 8997061578198512906, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 352228607, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: m_SizePerCharge
-      value: 0.11
-      objectReference: {fileID: 0}
    - target: {fileID: 1141687779, guid: 2e3528907311e438dab0d393127aa332, type: 3}
      propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.size
      value: 1
@@ -32864,15 +32787,92 @@ PrefabInstance:
      propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
      value: UnityEngine.Object, UnityEngine
      objectReference: {fileID: 0}
-    - target: {fileID: 130221827, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+    - target: {fileID: 352228607, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: m_SizePerCharge
+      value: 0.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 2139239323, guid: 2e3528907311e438dab0d393127aa332, type: 3}
      propertyPath: m_RootOrder
-      value: 3
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 4604151598474065536, guid: 2e3528907311e438dab0d393127aa332,
        type: 3}
      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 130221827, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: m_RootOrder
      value: 4
      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_SortingLayerID
+      value: 1206248169
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_SortingLayer
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: shotSpawn
+      value: 
+      objectReference: {fileID: 2139239323}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: elementalAttack
+      value: 
+      objectReference: {fileID: 7588789901055592565, guid: c916ffaff3c476b448f67d9d827b3e7e,
+        type: 3}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: cooldown
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: volleySize
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: launchPower
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: attackSpeed
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228605, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_Size.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362287, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_Offset.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8997061578198512906, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
 --- !u!4 &1741470320 stripped