Merge branch 'character' of git.gmu.edu:gadig/four into character

2ee663c1 · tmorga18 · ecc210d7 · c0f97470 · 2ee663c1 · 2ee663c1
Commit 2ee663c1 authored Oct 27, 2016 by tmorga18
47 changed files
--- a/Assets/Prefabs.meta
+++ b/Assets/Prefabs.meta
+fileFormatVersion: 2
+guid: 6d6525803f9c2de4e8233fc51322fdc5
+folderAsset: yes
+timeCreated: 1476403153
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Environment.meta
+++ b/Assets/Prefabs/Environment.meta
+fileFormatVersion: 2
+guid: fdbf72d4ce210a1429dd9df6dc03dafc
+folderAsset: yes
+timeCreated: 1476403235
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Environment/Tree1Prefab.prefab
+++ b/Assets/Prefabs/Environment/Tree1Prefab.prefab
--- a/Assets/Prefabs/Environment/Tree1Prefab.prefab.meta
+++ b/Assets/Prefabs/Environment/Tree1Prefab.prefab.meta
+fileFormatVersion: 2
+guid: 531e32ee5325d9b42bb4ec6a1dff629a
+timeCreated: 1476404837
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Environment/Tree3Prefab.prefab
+++ b/Assets/Prefabs/Environment/Tree3Prefab.prefab
--- a/Assets/Prefabs/Environment/Tree3Prefab.prefab.meta
+++ b/Assets/Prefabs/Environment/Tree3Prefab.prefab.meta
+fileFormatVersion: 2
+guid: 3a68a9d48e0026946b2b84e18fcf793e
+timeCreated: 1476404883
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Environment/WaterTileplaceholder.prefab
+++ b/Assets/Prefabs/Environment/WaterTileplaceholder.prefab
--- a/Assets/Prefabs/Environment/WaterTileplaceholder.prefab.meta
+++ b/Assets/Prefabs/Environment/WaterTileplaceholder.prefab.meta
+fileFormatVersion: 2
+guid: c0ac508780ce38c4fa9f213da519f5d3
+timeCreated: 1476403159
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs.meta
+++ b/Assets/prefabs.meta
+fileFormatVersion: 2
+guid: 3fd9c01e8800fc54681146f720a0d04b
+folderAsset: yes
+timeCreated: 1477008945
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs/Crate.prefab
+++ b/Assets/prefabs/Crate.prefab
--- a/Assets/prefabs/Crate.prefab.meta
+++ b/Assets/prefabs/Crate.prefab.meta
+fileFormatVersion: 2
+guid: 1e017f03500f8e6488ddf22b93a4fc64
+timeCreated: 1477008948
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/resource/Prefab.meta
+++ b/Assets/resource/Prefab.meta
+fileFormatVersion: 2
+guid: 23488e1df8bc4dc4a9f405df41ec5fb3
+folderAsset: yes
+timeCreated: 1476402444
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/resource/Prefab/crate_16.prefab
+++ b/Assets/resource/Prefab/crate_16.prefab
--- a/Assets/resource/Prefab/crate_16.prefab.meta
+++ b/Assets/resource/Prefab/crate_16.prefab.meta
+fileFormatVersion: 2
+guid: 991cd4abf4f00e44b8d6bb62b0c51e3f
+timeCreated: 1476402447
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/scene/player_animation_test.unity
+++ b/Assets/scene/player_animation_test.unity
--- a/Assets/scene/player_animation_test.unity.meta
+++ b/Assets/scene/player_animation_test.unity.meta
+fileFormatVersion: 2
+guid: 67353cb7d3506f644a7bba4b5823d726
+timeCreated: 1475801963
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/script/HeroAttackController.cs
+++ b/Assets/script/HeroAttackController.cs
+using UnityEngine;
+using System.Collections;
+
+public class HeroAttackController : MonoBehaviour {
+
+    enum ability {fireball, water, others };
+
+    private ability currentAbility = ability.fireball;
+
+	// Use this for initialization
+	void Start () {
+       
+	}
+
+    // Update is called once per frame
+    void Update(){
+        if (Input.GetButtonDown("Fire1")){
+            switch (currentAbility)
+            {
+                case ability.fireball:
+                    Debug.Log("fireball");
+                    break;
+                default:
+                    Debug.Log("default");
+                    break;
+            }
+
+        }
+        if (Input.GetButtonDown("Fire2")){
+                Debug.Log("melee");
+        }
+    }
+       
+}
+
--- a/Assets/script/HeroAttackController.cs.meta
+++ b/Assets/script/HeroAttackController.cs.meta
+fileFormatVersion: 2
+guid: 9d62da0ef0f1b3d4a830a1a99cdb161d
+timeCreated: 1477008563
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/script/HeroMobility.cs.meta
+++ b/Assets/script/HeroMobility.cs.meta
+fileFormatVersion: 2
+guid: e247c9d5f5c5cd6468589367fbee44ef
+timeCreated: 1477008563
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/script/PlayerAnimation.cs
+++ b/Assets/script/PlayerAnimation.cs
+using UnityEngine;
+using System.Collections;
+
+public class PlayerAnimation : MonoBehaviour {
+
+    private Animator animator;
+    private Vector2 lastInput = new Vector2(1, 1);
+    private int horizontalDir = 1;
+
+	// Use this for initialization
+	void Start () {
+        animator = GetComponent<Animator>();
+    }
+	
+	// Update is called once per frame
+	void Update () {
+        AminateMovement();
+    }
+
+    void AminateMovement() {
+        Vector2 input = new Vector2(Input.GetAxisRaw("Horizontal"), Input.GetAxisRaw("Vertical"));
+        if (Mathf.Abs(input.x) > 0 || Mathf.Abs(input.y) > 0) {
+            lastInput.x = input.x;
+            lastInput.y = input.y;
+        }
+        if(lastInput.x < 0 && input.y == 0) {
+            horizontalDir = -1;
+        }else {
+            horizontalDir = 1;
+        }
+
+        animator.SetFloat("X", Mathf.Abs(lastInput.x));
+        animator.SetFloat("Y", lastInput.y);
+        Vector2 scale = transform.localScale;
+        scale.x = horizontalDir;
+        transform.localScale = scale;
+    }
+}
--- a/Assets/script/PlayerAnimation.cs.meta
+++ b/Assets/script/PlayerAnimation.cs.meta
+fileFormatVersion: 2
+guid: 3609f8378d24dab4bacd67285731b97a
+timeCreated: 1475802984
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/1_front.png
+++ b/Assets/sprite/1_front.png
--- a/Assets/sprite/1_front.png.meta
+++ b/Assets/sprite/1_front.png.meta
+fileFormatVersion: 2
+guid: 5b9c12fe7f68b5545adc41aae6f68d4e
+timeCreated: 1477007537
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: 0
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 16
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/3_right.png
+++ b/Assets/sprite/3_right.png
--- a/Assets/sprite/3_right.png.meta
+++ b/Assets/sprite/3_right.png.meta
+fileFormatVersion: 2
+guid: 0a69ba62eeef7ba4cb36bdce415247e4
+timeCreated: 1477007537
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: 0
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 16
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/5_back.png
+++ b/Assets/sprite/5_back.png
--- a/Assets/sprite/5_back.png.meta
+++ b/Assets/sprite/5_back.png.meta
+fileFormatVersion: 2
+guid: 2dfb4b84621bbb146a6307f8f097f567
+timeCreated: 1477007537
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: 0
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 16
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/Tree_01.png
+++ b/Assets/sprite/Tree_01.png
--- a/Assets/sprite/Tree_01.png.meta
+++ b/Assets/sprite/Tree_01.png.meta
+fileFormatVersion: 2
+guid: 789587a95688793499a105b83b0ebac4
+timeCreated: 1476402906
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  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
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/Tree_03.png
+++ b/Assets/sprite/Tree_03.png
--- a/Assets/sprite/Tree_03.png.meta
+++ b/Assets/sprite/Tree_03.png.meta
+fileFormatVersion: 2
+guid: ecea036f89dd7284ab9de59bf5f84cd4
+timeCreated: 1476402906
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  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
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/WaterTileplaceholder.png
+++ b/Assets/sprite/WaterTileplaceholder.png
--- a/Assets/sprite/WaterTileplaceholder.png.meta
+++ b/Assets/sprite/WaterTileplaceholder.png.meta
+fileFormatVersion: 2
+guid: 1051eacbc265595429f006c434a13726
+timeCreated: 1476402686
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  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
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/animation.meta
+++ b/Assets/sprite/animation.meta
+fileFormatVersion: 2
+guid: b5c8349c3dcc74544a2c657ffc029ae9
+folderAsset: yes
+timeCreated: 1475801899
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/animation/Player.meta
+++ b/Assets/sprite/animation/Player.meta
+fileFormatVersion: 2
+guid: 682407675e213fe43b48bcc2b4884eee
+folderAsset: yes
+timeCreated: 1475802422
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/animation/Player/Player.controller
+++ b/Assets/sprite/animation/Player/Player.controller
--- a/Assets/sprite/animation/Player/Player.controller.meta
+++ b/Assets/sprite/animation/Player/Player.controller.meta
+fileFormatVersion: 2
+guid: 2db7b42c28f0d9041a3cde7edd02e518
+timeCreated: 1475801918
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/animation/Player/down.anim
+++ b/Assets/sprite/animation/Player/down.anim
--- a/Assets/sprite/animation/Player/down.anim.meta
+++ b/Assets/sprite/animation/Player/down.anim.meta
+fileFormatVersion: 2
+guid: ed5a94819a8e0d549afbec0dfddf7ebf
+timeCreated: 1475802095
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/animation/Player/right.anim
+++ b/Assets/sprite/animation/Player/right.anim
--- a/Assets/sprite/animation/Player/right.anim.meta
+++ b/Assets/sprite/animation/Player/right.anim.meta
+fileFormatVersion: 2
+guid: 77f53e8beee59004491d566997b69ce1
+timeCreated: 1475802383
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/animation/Player/up.anim
+++ b/Assets/sprite/animation/Player/up.anim
--- a/Assets/sprite/animation/Player/up.anim.meta
+++ b/Assets/sprite/animation/Player/up.anim.meta
+fileFormatVersion: 2
+guid: 62b4f2912b3967943920cc1660c1634b
+timeCreated: 1475802353
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sprite/crate_16.png
+++ b/Assets/sprite/crate_16.png
--- a/Assets/sprite/crate_16.png.meta
+++ b/Assets/sprite/crate_16.png.meta
+fileFormatVersion: 2
+guid: 37282add7b55267488434bf72f538bbb
+timeCreated: 1475802603
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0