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

09287cb2 · Isa · 9e758973 · f9ebabbd · 09287cb2 · 09287cb2
Commit 09287cb2 authored Mar 30, 2019 by Isa
--- a/Assets/_Game/Animations/Player.meta
+++ b/Assets/_Game/Animations/Player.meta
+fileFormatVersion: 2
+guid: 921db1157e28c3f41af62db986551851
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Animations/Player/Player Attacks.meta
+++ b/Assets/_Game/Animations/Player/Player Attacks.meta
+fileFormatVersion: 2
+guid: 6fdbfb79a12729b47a89b47d9b73fa30
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller
+++ b/Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FireAttack
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107852839093913212}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &1102194014626289192
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Player FireAttack
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: a33b68292e39fc041a68b9f3e3b47abe, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107852839093913212
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102194014626289192}
+    m_Position: {x: 235, y: 65, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102194014626289192}
--- a/Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller.meta
+++ b/Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller.meta
+fileFormatVersion: 2
+guid: 1cbe907e97f79644fbed8435ba9c0931
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Graphics/Sprite/Player Animation/Player_Fall_Test.anim
+++ b/Assets/_Game/Graphics/Sprite/Player Animation/Player_Fall_Test.anim
@@ -6,7 +6,7 @@ AnimationClip:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Player_Fall_Test
+  m_Name: Player FireAttack
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0
@@ -20,14 +20,16 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: 21300000, guid: e2976d09b53264ffbbb9210a1ae1dcc0, type: 3}
-    - time: 0.5
-      value: {fileID: 21300000, guid: 598fb1767626f42e992bb9c2769d86ea, type: 3}
+      value: {fileID: 21300000, guid: 0161ef6db3b4e8e42875f5a25535bd75, type: 3}
+    - time: 0.1
+      value: {fileID: 21300000, guid: 39b655e3ac188eb45b030b7e81d5bd4b, type: 3}
+    - time: 0.2
+      value: {fileID: 21300000, guid: 112f864ed0a24b047840780d00ce5ef1, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
    script: {fileID: 0}
-  m_SampleRate: 2
+  m_SampleRate: 10
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
@@ -42,14 +44,15 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
-    - {fileID: 21300000, guid: e2976d09b53264ffbbb9210a1ae1dcc0, type: 3}
-    - {fileID: 21300000, guid: 598fb1767626f42e992bb9c2769d86ea, type: 3}
+    - {fileID: 21300000, guid: 0161ef6db3b4e8e42875f5a25535bd75, type: 3}
+    - {fileID: 21300000, guid: 39b655e3ac188eb45b030b7e81d5bd4b, type: 3}
+    - {fileID: 21300000, guid: 112f864ed0a24b047840780d00ce5ef1, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.3
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0

--- a/Assets/_Game/Graphics/Sprite/Player Animation/Player_Fall_Test.anim.meta
+++ b/Assets/_Game/Graphics/Sprite/Player Animation/Player_Fall_Test.anim.meta
 fileFormatVersion: 2
-guid: b1e6f956e15cf4eeeb1ebc32e9af4879
+guid: a33b68292e39fc041a68b9f3e3b47abe
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 7400000

--- a/Assets/_Game/Graphics/Sprite/Player Animation/Player_Jump_Test.anim
+++ b/Assets/_Game/Graphics/Sprite/Player Animation/Player_Jump_Test.anim
@@ -6,7 +6,7 @@ AnimationClip:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Player_Jump_Test
+  m_Name: Player WaterAttack
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0
@@ -20,14 +20,16 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: 21300000, guid: e2976d09b53264ffbbb9210a1ae1dcc0, type: 3}
-    - time: 0.5
-      value: {fileID: 21300000, guid: 598fb1767626f42e992bb9c2769d86ea, type: 3}
+      value: {fileID: 21300000, guid: dc92df69ab762f6429dbc7390caa5856, type: 3}
+    - time: 0.11111111
+      value: {fileID: 21300000, guid: 03343fe9c932ad146b875ae02df25c8b, type: 3}
+    - time: 0.22222222
+      value: {fileID: 21300000, guid: e821c22ca988aef4594235a381c621b3, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
    script: {fileID: 0}
-  m_SampleRate: 2
+  m_SampleRate: 9
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
@@ -42,14 +44,15 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
-    - {fileID: 21300000, guid: e2976d09b53264ffbbb9210a1ae1dcc0, type: 3}
-    - {fileID: 21300000, guid: 598fb1767626f42e992bb9c2769d86ea, type: 3}
+    - {fileID: 21300000, guid: dc92df69ab762f6429dbc7390caa5856, type: 3}
+    - {fileID: 21300000, guid: 03343fe9c932ad146b875ae02df25c8b, type: 3}
+    - {fileID: 21300000, guid: e821c22ca988aef4594235a381c621b3, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.33333334
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0

--- a/Assets/_Game/Graphics/Sprite/Player Animation/Player_Jump_Test.anim.meta
+++ b/Assets/_Game/Graphics/Sprite/Player Animation/Player_Jump_Test.anim.meta
 fileFormatVersion: 2
-guid: 5c579b168d0eb42c493f5226b501d78c
+guid: 558c7d11a418f254cb60a3beb85fc3e3
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 7400000

--- a/Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller
+++ b/Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: WaterAttack
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107446294595744916}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &1102565034964050300
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Player WaterAttack
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 558c7d11a418f254cb60a3beb85fc3e3, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107446294595744916
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102565034964050300}
+    m_Position: {x: 288, y: 108, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102565034964050300}
--- a/Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller.meta
+++ b/Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller.meta
+fileFormatVersion: 2
+guid: 58870b5662ee7614dafb40c42a55cdd5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
+++ b/Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
@@ -19,41 +19,41 @@ MonoBehaviour:
    canSwim: 1
    moveSpeed: 30
    maxJumpCount: 5
-    mass: 0.1
-    gravity: 0.5
+    mass: 1
+    gravity: 3
  earthMoveState:
-    jumpForce: 100
+    jumpForce: 10
    smoothing: 0.03
    airControl: 1
    canSwim: 0
    moveSpeed: 15
-    maxJumpCount: 1
-    mass: 60
-    gravity: 3
+    maxJumpCount: 0
+    mass: 10
+    gravity: 5
  fireMoveState:
    jumpForce: 15
    smoothing: 0.03
    airControl: 1
    canSwim: 1
-    moveSpeed: 20
-    maxJumpCount: 2
+    moveSpeed: 30
+    maxJumpCount: 0
    mass: 1
    gravity: 3
  waterMoveState:
-    jumpForce: 10
+    jumpForce: 15
    smoothing: 0.03
    airControl: 1
    canSwim: 1
    moveSpeed: 20
-    maxJumpCount: 1
-    mass: 1
-    gravity: 3
+    maxJumpCount: 0
+    mass: 1.5
+    gravity: 5
  defaultMoveState:
    jumpForce: 15
    smoothing: 0.03
    airControl: 1
    canSwim: 1
    moveSpeed: 30
-    maxJumpCount: 1
+    maxJumpCount: 0
    mass: 1
-    gravity: 3
+    gravity: 5
--- a/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png
+++ b/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png
--- a/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png.meta
+++ b/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png.meta
+fileFormatVersion: 2
+guid: 0161ef6db3b4e8e42875f5a25535bd75
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 1024
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: fd43232caea90fd4ea2fc6f95b69256f
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png
+++ b/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png
--- a/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png.meta
+++ b/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png.meta
+fileFormatVersion: 2
+guid: 39b655e3ac188eb45b030b7e81d5bd4b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 1024
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: b0f54c007f6ca96419994686f1e42fdf
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png
+++ b/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png
--- a/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png.meta
+++ b/Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png.meta
+fileFormatVersion: 2
+guid: 112f864ed0a24b047840780d00ce5ef1
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0