Merge remote-tracking branch 'refs/remotes/origin/master' into Neue-L…

…evel
pklaschka · May 24, 2017 · 0c28355 · 0c28355
2 parents 10340f4 + 18abac1
commit 0c28355
Show file tree

Hide file tree

Showing 20 changed files with 1,873 additions and 21 deletions.
diff --git a/Platformer_001/Assets/Prefabs/Enemys/Schleim.prefab b/Platformer_001/Assets/Prefabs/Enemys/Schleim.prefab
@@ -103,6 +103,7 @@ GameObject:
   - component: {fileID: 50861755151374014}
   - component: {fileID: 114799338532626626}
   - component: {fileID: 95437354869880092}
+  - component: {fileID: 114689621667916028}
   - component: {fileID: 68332099468644012}
   - component: {fileID: 61453681127268766}
   m_Layer: 2
@@ -305,6 +306,30 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!114 &114689621667916028
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1660809210920558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2145912209ceed54a836f55a6431ad43, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  hp: 30
+  maxHP: 30
+  schadenEvent:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  todEvent:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  hpAnzeige: {fileID: 0}
 --- !u!114 &114799338532626626
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Platformer_001/Assets/RGW_Logo.jpg b/Platformer_001/Assets/RGW_Logo.jpg
diff --git a/Platformer_001/Assets/RGW_Logo.jpg.meta b/Platformer_001/Assets/RGW_Logo.jpg.meta
diff --git a/Platformer_001/Assets/Scenes (Level)/Endlosmodus.unity b/Platformer_001/Assets/Scenes (Level)/Endlosmodus.unity
@@ -413,7 +413,8 @@ Prefab:
         type: 2}
       propertyPath: anfangsItem
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 1091001140902924, guid: 28922d20731747949b66a7fa8c27aad8,
+        type: 2}
     - target: {fileID: 1519671532131534, guid: 1b2499aef91c52844b533d1587e0fa93, type: 2}
       propertyPath: m_IsActive
       value: 1