diff --git a/Zookeepers Trial/Assets/Art/animations/character.controller b/Zookeepers Trial/Assets/Art/animations/character.controller index fb2fb21a7530997797bc052f8ef8b705819549c3..6a2956ccef14cbdb164221a98035bc35e36a70bf 100644 Binary files a/Zookeepers Trial/Assets/Art/animations/character.controller and b/Zookeepers Trial/Assets/Art/animations/character.controller differ diff --git a/Zookeepers Trial/Assets/Art/animations/drink.anim b/Zookeepers Trial/Assets/Art/animations/drink.anim new file mode 100644 index 0000000000000000000000000000000000000000..ee161d7335d2cc8043baf0fd016debda6e442bbe Binary files /dev/null and b/Zookeepers Trial/Assets/Art/animations/drink.anim differ diff --git a/Zookeepers Trial/Assets/Art/animations/drink.anim.meta b/Zookeepers Trial/Assets/Art/animations/drink.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..9390949d4b889e4f23f3a59b893ab92a3b29a512 --- /dev/null +++ b/Zookeepers Trial/Assets/Art/animations/drink.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea4099334592f9b438b00b490fca1868 +timeCreated: 1479180346 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zookeepers Trial/Assets/Art/animations/kick.anim b/Zookeepers Trial/Assets/Art/animations/kick.anim new file mode 100644 index 0000000000000000000000000000000000000000..a2c9a4804c59a9e80eef1c060c58b60eacc37eac Binary files /dev/null and b/Zookeepers Trial/Assets/Art/animations/kick.anim differ diff --git a/Zookeepers Trial/Assets/Art/animations/kick.anim.meta b/Zookeepers Trial/Assets/Art/animations/kick.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..ab772e475c21f3bbb96931f9dbf4338163771da7 --- /dev/null +++ b/Zookeepers Trial/Assets/Art/animations/kick.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8985ddadf7639b64bb7bd2f1140e9447 +timeCreated: 1479179777 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zookeepers Trial/Assets/Art/potions-1.png b/Zookeepers Trial/Assets/Art/potions.png similarity index 62% rename from Zookeepers Trial/Assets/Art/potions-1.png rename to Zookeepers Trial/Assets/Art/potions.png index eb1025c9d1bddd9108b914f7ba642ee755975739..5ce98f900bf2cdde0d7b79c72870f5b0277075a0 100644 Binary files a/Zookeepers Trial/Assets/Art/potions-1.png and b/Zookeepers Trial/Assets/Art/potions.png differ diff --git a/Zookeepers Trial/Assets/Art/potions-1.png.meta b/Zookeepers Trial/Assets/Art/potions.png.meta similarity index 79% rename from Zookeepers Trial/Assets/Art/potions-1.png.meta rename to Zookeepers Trial/Assets/Art/potions.png.meta index c35026cae396b6bc327b9ea3b3e588259e9cfcd7..8f7c46cb162bb8164c3e8659617bf1ca53a1f6d0 100644 --- a/Zookeepers Trial/Assets/Art/potions-1.png.meta +++ b/Zookeepers Trial/Assets/Art/potions.png.meta @@ -1,12 +1,13 @@ fileFormatVersion: 2 -guid: 183aac3cb7b9cce40938a4081d217e6c -timeCreated: 1478726775 +guid: 001cf4af9d97a8d4d99d3d1d2e5fdf2f +timeCreated: 1479180332 licenseType: Free TextureImporter: fileIDToRecycleName: - 21300000: potions-1_0 - 21300002: potions-1_1 - 21300004: potions-1_2 + 21300000: potions_0 + 21300002: potions_1 + 21300004: potions_2 + 21300006: potions_3 serializedVersion: 2 mipmaps: mipMapMode: 0 @@ -56,7 +57,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: potions-1_0 + name: potions_0 rect: serializedVersion: 2 x: 27 @@ -69,7 +70,7 @@ TextureImporter: outline: [] tessellationDetail: 0 - serializedVersion: 2 - name: potions-1_1 + name: potions_1 rect: serializedVersion: 2 x: 230 @@ -82,7 +83,20 @@ TextureImporter: outline: [] tessellationDetail: 0 - serializedVersion: 2 - name: potions-1_2 + name: potions_2 + rect: + serializedVersion: 2 + x: 11 + y: 40 + width: 147 + height: 212 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: potions_3 rect: serializedVersion: 2 x: 230 diff --git a/Zookeepers Trial/Assets/Scenes/Start.unity b/Zookeepers Trial/Assets/Scenes/Start.unity index 465f4abcdc1b1307277fdd14d6a24dd16185e91b..d65a3c733643cb86662e5106f2ed60e13bf9b914 100644 Binary files a/Zookeepers Trial/Assets/Scenes/Start.unity and b/Zookeepers Trial/Assets/Scenes/Start.unity differ diff --git a/Zookeepers Trial/Assets/Scenes/arena.unity b/Zookeepers Trial/Assets/Scenes/arena.unity index dcc1f3a705039b31ea23a09db5919be8fe32fd5b..0e94657e7fb63fa081dd5a988938382c0be35a73 100644 Binary files a/Zookeepers Trial/Assets/Scenes/arena.unity and b/Zookeepers Trial/Assets/Scenes/arena.unity differ