addded dash effect when a player hits another one with a dash.

f52b8ce4 · Tim Reiter · 37a7a601 · f52b8ce4 · f52b8ce4 · f52b8ce4
Commit f52b8ce4 authored Jun 05, 2015 by Tim Reiter
28 changed files
--- a/Assets/Resources/Prefabs/Effects/DashHitEffect.prefab
+++ b/Assets/Resources/Prefabs/Effects/DashHitEffect.prefab
--- a/Assets/Resources/Prefabs/Effects/DashHitEffect.prefab.meta
+++ b/Assets/Resources/Prefabs/Effects/DashHitEffect.prefab.meta
+fileFormatVersion: 2
+guid: 1543077eb2ebf26468ddc33e009a2829
+timeCreated: 1433526600
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Prefabs/Player Four.prefab
+++ b/Assets/Resources/Prefabs/Player Four.prefab
--- a/Assets/Resources/Prefabs/Player One.prefab
+++ b/Assets/Resources/Prefabs/Player One.prefab
--- a/Assets/Resources/Prefabs/Player Three.prefab
+++ b/Assets/Resources/Prefabs/Player Three.prefab
--- a/Assets/Resources/Prefabs/Player Two.prefab
+++ b/Assets/Resources/Prefabs/Player Two.prefab
--- a/Assets/Scripts/PlayerControl.cs
+++ b/Assets/Scripts/PlayerControl.cs
@@ -52,6 +52,8 @@ public class PlayerControl : MonoBehaviour
    public int playerNumber = 1; //gibt an, ob es sich um player one, player two, etc. handelt. sollte nicht 0 sein;
    public PlayerInputMapping inputMapping;
+    public Animator dashAnimator;
    void Start()
    {
        body2D = GetComponent<Rigidbody2D>();
@@ -75,6 +77,9 @@ public class PlayerControl : MonoBehaviour
        other.setPushSpeed(currentDashDirection * pushForce);
        lastDashStart = Time.time - dashCompletionTime;
        currentDashCoolDown = dashCollisionCoolDown;
+        //dash effect:
+        dashAnimator.SetTrigger("play");
    }
    private void setPushSpeed(Vector2 pushSpeed)
@@ -113,10 +118,15 @@ public class PlayerControl : MonoBehaviour
            velocity = body2D.velocity;
            if (inputMapping.isRightPressed())
            {
+                if (transform.localScale.x > 0f)
+                    transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z);
                velocity.x = runSpeed;
            }
            else if (inputMapping.isLeftPressed())
            {
+                if (transform.localScale.x < 0f)
+                    transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z);
                velocity.x = -runSpeed;
            }

--- a/Assets/Sprites/Effects/flash_b.meta
+++ b/Assets/Sprites/Effects/flash_b.meta
+fileFormatVersion: 2
+guid: dc99c4aa24fac0747bb9179b3204a153
+folderAsset: yes
+timeCreated: 1433459937
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flashAnim.anim
+++ b/Assets/Sprites/Effects/flash_b/flashAnim.anim
--- a/Assets/Sprites/Effects/flash_b/flashAnim.anim.meta
+++ b/Assets/Sprites/Effects/flash_b/flashAnim.anim.meta
+fileFormatVersion: 2
+guid: e177b1499b589684a8ce0a1ff722851b
+timeCreated: 1433462267
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0001.png
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0001.png
--- a/Assets/Sprites/Effects/flash_b/flash_b_0001.png.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0001.png.meta
+fileFormatVersion: 2
+guid: 7e48f2f22efc99e48a82cbb6e12f93ab
+timeCreated: 1433459988
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0002.controller
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0002.controller
--- a/Assets/Sprites/Effects/flash_b/flash_b_0002.controller.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0002.controller.meta
+fileFormatVersion: 2
+guid: c0f3137f912ae924f87e36cb82e070fa
+timeCreated: 1433462267
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0002.png
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0002.png
--- a/Assets/Sprites/Effects/flash_b/flash_b_0002.png.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0002.png.meta
+fileFormatVersion: 2
+guid: 49338053e2bb3ef4da639400f9fa420f
+timeCreated: 1433459960
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0003.png
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0003.png
--- a/Assets/Sprites/Effects/flash_b/flash_b_0003.png.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0003.png.meta
+fileFormatVersion: 2
+guid: 50d7ca6193b02dc47a27b495bc3b1ff2
+timeCreated: 1433459961
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0004.png
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0004.png
--- a/Assets/Sprites/Effects/flash_b/flash_b_0004.png.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0004.png.meta
+fileFormatVersion: 2
+guid: efbda0ffda6769942aab15db605753f1
+timeCreated: 1433460023
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0005.png
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0005.png
--- a/Assets/Sprites/Effects/flash_b/flash_b_0005.png.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0005.png.meta
+fileFormatVersion: 2
+guid: a9943c6fc5d18b940b92a777d52bce8e
+timeCreated: 1433460002
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0006.png
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0006.png
--- a/Assets/Sprites/Effects/flash_b/flash_b_0006.png.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0006.png.meta
+fileFormatVersion: 2
+guid: 61b1bed38c3f7c747bd3244dcacd0c54
+timeCreated: 1433459974
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/flash_b_0007.png
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0007.png
--- a/Assets/Sprites/Effects/flash_b/flash_b_0007.png.meta
+++ b/Assets/Sprites/Effects/flash_b/flash_b_0007.png.meta
+fileFormatVersion: 2
+guid: 8fa0d7959d896b7439b2a4f9aeb76e6d
+timeCreated: 1433462255
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Effects/flash_b/idle.anim
+++ b/Assets/Sprites/Effects/flash_b/idle.anim
--- a/Assets/Sprites/Effects/flash_b/idle.anim.meta
+++ b/Assets/Sprites/Effects/flash_b/idle.anim.meta
+fileFormatVersion: 2
+guid: 888863b0bedb4a843bea3b88bab05953
+timeCreated: 1433462290
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: