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

Assets/_Game/Data/Game Events/Element Game Events.meta

+fileFormatVersion: 2
+guid: d08078c315d7ac545834bfee9dc018a5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Data/Game Events/OnAirInfused.asset → Assets/_Game/Data/Game Events/Element Game Events/InfusedElementGameEvent.asset

@@ -9,6 +9,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ea24d0e4eff9b514184d2081be52c833, type: 3}
-  m_Name: OnAirInfused
+  m_Script: {fileID: 11500000, guid: 9c49b9c852d102f46917ed068a87a1df, type: 3}
+  m_Name: InfusedElementGameEvent
   m_EditorClassIdentifier: 

Assets/_Game/Data/Game Events/OnFireInfused.asset.meta → Assets/_Game/Data/Game Events/Element Game Events/InfusedElementGameEvent.asset.meta

 fileFormatVersion: 2
-guid: f553df1a50d464e48837fbb6cb99b7e5
+guid: 7e5b80a8353af1846a878c3a997bdb4a
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/_Game/Data/Level Data.meta

+fileFormatVersion: 2
+guid: 7e01962f987334e4fb04e2687bb24485
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Data/Game Events/OnEarthInfused.asset → Assets/_Game/Data/Level Data/Level1SavePoints.asset

@@ -9,6 +9,15 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ea24d0e4eff9b514184d2081be52c833, type: 3}
-  m_Name: OnEarthInfused
+  m_Script: {fileID: 11500000, guid: d1544a4ab12f8b84f8f4f5c7a826cb02, type: 3}
+  m_Name: Level1SavePoints
   m_EditorClassIdentifier: 
+  TestWithArray:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}

Assets/_Game/Data/Game Events/OnAirInfused.asset.meta → Assets/_Game/Data/Level Data/Level1SavePoints.asset.meta

 fileFormatVersion: 2
-guid: b0928121a3619584c9612f68610a97a5
+guid: 42bfd5430f16efc4884a04384bfadc16
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/_Game/Data/Game Events/OnFireInfused.asset → Assets/_Game/Data/Level Data/Level1StartPoint.asset

@@ -9,6 +9,8 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ea24d0e4eff9b514184d2081be52c833, type: 3}
-  m_Name: OnFireInfused
+  m_Script: {fileID: 11500000, guid: 0916ffc5184f394459b34094edef0965, type: 3}
+  m_Name: Level1StartPoint
   m_EditorClassIdentifier: 
+  startPoint: {fileID: 6649025744541164928, guid: 612c05bc8661c2146947c42effb20f77,
+    type: 3}

Assets/_Game/Data/Game Events/OnWaterInfused.asset.meta → Assets/_Game/Data/Level Data/Level1StartPoint.asset.meta

 fileFormatVersion: 2
-guid: ca31b08da78cb134086d7688bbb50628
+guid: 54e03e86b8009b54f8d532f93b1f4339
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/_Game/Data/Player Data.meta

-fileFormatVersion: 2
-guid: 08f59aba687367b48b0635e52116d8f5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 08f59aba687367b48b0635e52116d8f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Data/Player Data/Movement Data/AirMoveState.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
-  m_Name: AirMoveState
-  m_EditorClassIdentifier: 
-  jumpForce: 0
-  smoothing: 0
-  airControl: 0
-  moveSpeed: 0
-  maxJumpCount: 0
-  mass: 0
-  gravity: 0

Assets/_Game/Data/Player Data/Movement Data/AirMoveState.asset.meta

-fileFormatVersion: 2
-guid: d8ddf6924a883e94583c59a55fd11f8d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Game/Data/Player Data/Movement Data/DefaultMoveState.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
-  m_Name: DefaultMoveState
-  m_EditorClassIdentifier: 
-  jumpForce: 0
-  smoothing: 0
-  airControl: 0
-  moveSpeed: 0
-  maxJumpCount: 0
-  mass: 0
-  gravity: 0

Assets/_Game/Data/Player Data/Movement Data/DefaultMoveState.asset.meta

-fileFormatVersion: 2
-guid: 11203796b90159848b6c5f4217eed3ec
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Game/Data/Player Data/Movement Data/EarthMoveState.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
-  m_Name: EarthMoveState
-  m_EditorClassIdentifier: 
-  jumpForce: 0
-  smoothing: 0
-  airControl: 0
-  moveSpeed: 0
-  maxJumpCount: 0
-  mass: 0
-  gravity: 0

Assets/_Game/Data/Player Data/Movement Data/EarthMoveState.asset.meta

-fileFormatVersion: 2
-guid: 92286a125406f3643b98aa3f886d53b1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Game/Data/Player Data/Movement Data/FireMoveState.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
-  m_Name: FireMoveState
-  m_EditorClassIdentifier: 
-  jumpForce: 0
-  smoothing: 0
-  airControl: 0
-  moveSpeed: 0
-  maxJumpCount: 0
-  mass: 0
-  gravity: 0

Assets/_Game/Data/Player Data/Movement Data/FireMoveState.asset.meta

-fileFormatVersion: 2
-guid: 805f35d42b113b841b2c8f64adf50f4a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Game/Data/Player Data/Movement Data/Movement States.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Movement States
+  m_EditorClassIdentifier: Assembly-CSharp:_Game.Scripts.Scriptable_Object:MovementStates
+  airMoveState:
+    jumpForce: 0
+    smoothing: 0
+    airControl: 0
+    moveSpeed: 0
+    maxJumpCount: 0
+    mass: 0
+    gravity: 0
+  earthMoveState:
+    jumpForce: 0
+    smoothing: 0
+    airControl: 0
+    moveSpeed: 0
+    maxJumpCount: 0
+    mass: 0
+    gravity: 0
+  fireMoveState:
+    jumpForce: 0
+    smoothing: 0
+    airControl: 0
+    moveSpeed: 0
+    maxJumpCount: 0
+    mass: 0
+    gravity: 0
+  waterMoveState:
+    jumpForce: 0
+    smoothing: 0
+    airControl: 0
+    moveSpeed: 0
+    maxJumpCount: 0
+    mass: 0
+    gravity: 0
+  defaultMoveState:
+    jumpForce: 0
+    smoothing: 0
+    airControl: 0
+    moveSpeed: 0
+    maxJumpCount: 0
+    mass: 0
+    gravity: 0

Assets/_Game/Data/Game Events/OnEarthInfused.asset.meta → Assets/_Game/Data/Player Data/Movement Data/Movement States.asset.meta

 fileFormatVersion: 2
-guid: 59d96edea2ecb434999c09413da7449a
+guid: c757aad6925b37a46b916f609fa9012b
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/_Game/Data/Player Data/Movement Data/WaterMoveState.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
-  m_Name: WaterMoveState
-  m_EditorClassIdentifier: 
-  jumpForce: 0
-  smoothing: 0
-  airControl: 0
-  moveSpeed: 0
-  maxJumpCount: 0
-  mass: 0
-  gravity: 0