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

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

@@ -22,13 +22,13 @@ MonoBehaviour:
     mass: 0.1
     gravity: 0.5
   earthMoveState:
-    jumpForce: 10
+    jumpForce: 100
     smoothing: 0.03
     airControl: 1
     canSwim: 0
     moveSpeed: 15
     maxJumpCount: 1
-    mass: 20
+    mass: 60
     gravity: 3
   fireMoveState:
     jumpForce: 15

Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab

@@ -10,11 +10,11 @@ GameObject:
   m_Component:
   - component: {fileID: 4738352637052488}
   - component: {fileID: 50191559781069916}
-  - component: {fileID: 61920140733709488}
   - component: {fileID: 212219553255752332}
   - component: {fileID: 114326583413855364}
   - component: {fileID: 114716552753954768}
-  m_Layer: 0
+  - component: {fileID: 7710007422906786959}
+  m_Layer: 13
   m_Name: Erd-Gegner
   m_TagString: Enemy
   m_Icon: {fileID: 0}
@@ -57,32 +57,6 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 4
---- !u!61 &61920140733709488
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1634356314439590}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: -0.012068242, y: 0.0043426454}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0.35, y: 0.32}
-    newSize: {x: 0.4, y: 0.41}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.36456764, y: 0.33278835}
-  m_EdgeRadius: 0
 --- !u!212 &212219553255752332
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -143,10 +117,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f478e74f0ce26d74e9ef7a03777a0e06, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  aggroDist: 6
-  attackDist: 5
-  detectionRange: 50
-  isInCombat: 0
   desiredAction: []
 --- !u!114 &114716552753954768
 MonoBehaviour:
@@ -160,9 +130,27 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 57d175ecd2f7e53468c6c7467bdb8980, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  weight: 0
+  weight: 1
   isPerformingAction: 0
   movementSpeed: 5
+  aggroRange: 0
+  dropAggroRange: 0
+--- !u!58 &7710007422906786959
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634356314439590}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 0.175
 --- !u!1 &7480494801806484534
 GameObject:
   m_ObjectHideFlags: 0
@@ -174,7 +162,7 @@ GameObject:
   - component: {fileID: 5151316259711694663}
   - component: {fileID: 7574451920411087056}
   - component: {fileID: 5069815732207941033}
-  m_Layer: 0
+  m_Layer: 13
   m_Name: Erdangriff
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/_Game/Prefabs/Enemies/Feuer-Gegner.prefab

@@ -14,9 +14,9 @@ GameObject:
   - component: {fileID: 212219553255752332}
   - component: {fileID: 114326583413855364}
   - component: {fileID: 5627041003248903908}
-  m_Layer: 0
+  m_Layer: 13
   m_Name: Feuer-Gegner
-  m_TagString: Enemy
+  m_TagString: Fire
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -28,7 +28,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1634356314439590}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -823.3, y: -198.56, z: 0}
   m_LocalScale: {x: 4, y: 4, z: 4}
   m_Children:
@@ -143,10 +143,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f478e74f0ce26d74e9ef7a03777a0e06, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  aggroDist: 15
-  attackDist: 20
-  detectionRange: 50
-  isInCombat: 0
   desiredAction: []
 --- !u!114 &5627041003248903908
 MonoBehaviour:
@@ -160,20 +156,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8e4c71447eda4674fae6842ae29f3b31, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  weight: 0
+  weight: 3
   isPerformingAction: 0
   Cooldown: 2
   attackRange: 8
-  damage: 0
-  shot: {fileID: 1870586037468468, guid: 61411254df3161c4e81f6c0a4f2cd33c, type: 3}
-  fireSpeed: 2
+  destroyTime: 1
+  damage: 1
+  fireBall: {fileID: 1870586037468468, guid: 61411254df3161c4e81f6c0a4f2cd33c, type: 3}
   volleySize: 3
-  pooledAmount: 10
   launchPower: 10
   attackSpeed: 0.5
   shotspawn: {fileID: 2944414297440889058}
-  cluster: 0
-  ricochet: 0
 --- !u!1 &8738143122139646636
 GameObject:
   m_ObjectHideFlags: 0
@@ -183,7 +176,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2944414297440889058}
-  m_Layer: 0
+  m_Layer: 13
   m_Name: ShotSpawn
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/_Game/Prefabs/Enemies/Wasser-Gegner.prefab

@@ -10,13 +10,13 @@ GameObject:
   m_Component:
   - component: {fileID: 4738352637052488}
   - component: {fileID: 50191559781069916}
-  - component: {fileID: 61920140733709488}
   - component: {fileID: 212219553255752332}
   - component: {fileID: 114326583413855364}
   - component: {fileID: 95191711148098072}
   - component: {fileID: 7642390674257080637}
   - component: {fileID: 2887302863579586647}
-  m_Layer: 0
+  - component: {fileID: 380768153646748734}
+  m_Layer: 13
   m_Name: Wasser-Gegner
   m_TagString: Water
   m_Icon: {fileID: 0}
@@ -59,32 +59,6 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 4
---- !u!61 &61920140733709488
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1634356314439590}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0.0041066036, y: -0.01091028}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0.35, y: 0.32}
-    newSize: {x: 0.4, y: 0.41}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.2950111, y: 0.2057061}
-  m_EdgeRadius: 0
 --- !u!212 &212219553255752332
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -145,9 +119,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f478e74f0ce26d74e9ef7a03777a0e06, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  aggroDist: 15
-  detectionRange: 50
-  isInCombat: 0
   desiredAction: []
 --- !u!95 &95191711148098072
 Animator:
@@ -198,6 +169,27 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_MaxLife: 1
+  LostLife:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!58 &380768153646748734
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634356314439590}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.008957936, y: -0.019715749}
+  serializedVersion: 2
+  m_Radius: 0.11049381
 --- !u!1 &8757578769013443562
 GameObject:
   m_ObjectHideFlags: 0
@@ -209,7 +201,7 @@ GameObject:
   - component: {fileID: 4632333845714261479}
   - component: {fileID: 630870635}
   - component: {fileID: 630870634}
-  m_Layer: 0
+  m_Layer: 13
   m_Name: GroundCheck
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab

@@ -16,7 +16,7 @@ GameObject:
   - component: {fileID: 114716552753954768}
   - component: {fileID: 8582909611794385439}
   - component: {fileID: 879798643589630551}
-  m_Layer: 0
+  m_Layer: 13
   m_Name: Wind-Gegner
   m_TagString: Enemy
   m_Icon: {fileID: 0}
@@ -33,7 +33,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -822.9, y: -198.59, z: 0}
   m_LocalScale: {x: 2.6, y: 2.6, z: 2.6}
-  m_Children: []
+  m_Children:
+  - {fileID: 1344694553418298308}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -144,9 +145,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f478e74f0ce26d74e9ef7a03777a0e06, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  aggroDist: 6
-  detectionRange: 10
-  isInCombat: 0
   desiredAction: []
 --- !u!114 &114716552753954768
 MonoBehaviour:
@@ -163,6 +161,8 @@ MonoBehaviour:
   weight: 2
   isPerformingAction: 0
   movementSpeed: 3
+  aggroRange: 5
+  dropAggroRange: 7
 --- !u!114 &8582909611794385439
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -175,7 +175,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dc36894bc57123a46b6aff239612cfda, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  weight: 6
+  weight: 1
   isPerformingAction: 0
   patrolRange: 5
   targetPos: {fileID: 0}
@@ -193,9 +193,42 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7f52887a9ca8e98419e0fa123a56c1f0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  weight: 4
+  weight: 3
   isPerformingAction: 0
   windAttack: {fileID: 1870586037468468, guid: 933b1befd6720dd4da76308e96bf977c, type: 3}
   Cooldown: 0.5
   attackRange: 3
   firePower: 5
+  damage: 1
+  destroyTime: 1
+  thrust: 20
+--- !u!1 &3664861546676776734
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1344694553418298308}
+  m_Layer: 13
+  m_Name: Patrolspot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1344694553418298308
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3664861546676776734}
+  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: 4738352637052488}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/_Game/Prefabs/Enemy Attacks/EnemyFireAttack.prefab

@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: 212152556601460820}
   - component: {fileID: 1090173842203658878}
   m_Layer: 0
-  m_Name: Pre_FireAttack
+  m_Name: EnemyFireAttack
   m_TagString: EnemyShot
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -46,7 +46,7 @@ Rigidbody2D:
   m_Simulated: 1
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 0
-  m_Mass: 1
+  m_Mass: 0.0001
   m_LinearDrag: 0
   m_AngularDrag: 0.05
   m_GravityScale: 5
@@ -131,6 +131,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ee14ca5ce55a64141aba6d8091d3ecb7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  destroyTime: 0
   damage: 0
-  nearestPlayer: {fileID: 0}
-  destroyTime: 1

Assets/_Game/Prefabs/HUD.prefab

@@ -92,80 +92,6 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 29e7aad6473c65b42b22d0009d5a4bbc, type: 3}
   - {fileID: 21300000, guid: f0cb49470b5ef344389c5a541674a527, type: 3}
   - {fileID: 21300000, guid: 29aca8c735f1bb142bab56d0137f486e, type: 3}
---- !u!1 &114817957
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 114817958}
-  - component: {fileID: 114817960}
-  - component: {fileID: 114817959}
-  m_Layer: 5
-  m_Name: FeuerAnzeige
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &114817958
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 114817957}
-  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: 388107564}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 600, y: 193}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &114817960
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 114817957}
-  m_CullTransparentMesh: 0
---- !u!114 &114817959
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 114817957}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 706d34e52b620a34abdffce7a27726a1, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
 --- !u!1 &388107563
 GameObject:
   m_ObjectHideFlags: 0
@@ -197,8 +123,7 @@ 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:
-  - {fileID: 114817958}
+  m_Children: []
   m_Father: {fileID: 2888112478438871478}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -258,7 +183,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   state: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639, type: 2}
   empty: {fileID: 21300000, guid: 706d34e52b620a34abdffce7a27726a1, type: 3}
-  ElementBox: {fileID: 114817957}
+  ElementBox: {fileID: 0}
   FeuerSprites:
   - {fileID: 21300000, guid: 6e6a2dbe86a52c14ca5c0c6e101be7d4, type: 3}
   - {fileID: 21300000, guid: 5547c8b590eaba74dafb65ab1b8c0fb1, type: 3}

Assets/_Game/Prefabs/Player/Player.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2139239322
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2139239323}
+  m_Layer: 10
+  m_Name: ProjectileSpawn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2139239323
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2139239322}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.38, y: -0.08, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 52145075018362285}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &52145075018362288
 GameObject:
   m_ObjectHideFlags: 0
@@ -36,7 +66,8 @@ Transform:
   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: 2139239323}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -74,8 +105,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1206248169
+  m_SortingLayer: 3
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: c8a742c1f2ebb43b9afe34a47304c051, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -179,6 +210,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   state: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639, type: 2}
   onElementInfused: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
+  onChargeChange: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6, type: 2}
 --- !u!114 &352228603
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -191,12 +223,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: adc21094da13d8649a490855a137565f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cooldown: 0
-  volleySize: 0