From 39c0636b4ac8cfe60248c493d0675e7fa8ec6984 Mon Sep 17 00:00:00 2001 From: Logic Monkey Date: Sat, 21 Apr 2018 19:28:30 -0400 Subject: [PATCH 1/2] the sprite fairy visited in your sleep --- Assets/Resources.meta | 10 + Assets/Resources/candy.png | Bin 0 -> 4926 bytes Assets/Resources/candy.png.meta | 1198 +++++++++++++++++++++++++++ Assets/Scenes/gameplay.unity | 56 +- Assets/Scripts/Player.cs | 4 +- Assets/Scripts/witchAnimate.cs | 105 +++ Assets/Scripts/witchAnimate.cs.meta | 13 + Assets/Sprites/projectiles.png | Bin 128 -> 479 bytes Assets/Sprites/temp_guy_shoot.png | Bin 128 -> 500 bytes Assets/Sprites/tiles_ip.png | Bin 128 -> 910 bytes ProjectSettings/ProjectVersion.txt | 2 +- 11 files changed, 1360 insertions(+), 28 deletions(-) create mode 100644 Assets/Resources.meta create mode 100644 Assets/Resources/candy.png create mode 100644 Assets/Resources/candy.png.meta create mode 100644 Assets/Scripts/witchAnimate.cs create mode 100644 Assets/Scripts/witchAnimate.cs.meta diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..71876df --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b66ecbf52643f1241a7a5ccf8496b3c1 +folderAsset: yes +timeCreated: 1524350017 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/candy.png b/Assets/Resources/candy.png new file mode 100644 index 0000000000000000000000000000000000000000..92749067435dc207356d13d394db2bfc870610ce GIT binary patch literal 4926 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/candy.png.meta b/Assets/Resources/candy.png.meta new file mode 100644 index 0000000..8a3ce61 --- /dev/null +++ b/Assets/Resources/candy.png.meta @@ -0,0 +1,1198 @@ +fileFormatVersion: 2 +guid: 50ce219ae8c7eb04d9fa5b539144728b +timeCreated: 1524342919 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 21300000: candy_0 + 21300002: candy_1 + 21300004: candy_2 + 21300006: candy_3 + 21300008: candy_4 + 21300010: candy_5 + 21300012: candy_6 + 21300014: candy_7 + 21300016: candy_8 + 21300018: candy_9 + 21300020: candy_10 + 21300022: candy_11 + 21300024: candy_12 + 21300026: candy_13 + 21300028: candy_14 + 21300030: candy_15 + 21300032: candy_16 + 21300034: candy_17 + 21300036: candy_18 + 21300038: candy_19 + 21300040: candy_20 + 21300042: candy_21 + 21300044: candy_22 + 21300046: candy_23 + 21300048: candy_24 + 21300050: candy_25 + 21300052: candy_26 + 21300054: candy_27 + 21300056: candy_28 + 21300058: candy_29 + 21300060: candy_30 + 21300062: candy_31 + 21300064: candy_32 + 21300066: candy_33 + 21300068: candy_34 + 21300070: candy_35 + 21300072: candy_36 + 21300074: candy_37 + 21300076: candy_38 + 21300078: candy_39 + 21300080: candy_40 + 21300082: candy_41 + 21300084: candy_42 + 21300086: candy_43 + 21300088: candy_44 + 21300090: candy_45 + 21300092: candy_46 + 21300094: candy_47 + 21300096: candy_48 + 21300098: candy_49 + 21300100: candy_50 + 21300102: candy_51 + 21300104: candy_52 + 21300106: candy_53 + 21300108: candy_54 + 21300110: candy_55 + 21300112: candy_56 + 21300114: candy_57 + 21300116: candy_58 + 21300118: candy_59 + 21300120: candy_60 + 21300122: candy_61 + 21300124: candy_62 + 21300126: candy_63 + 21300128: candy_64 + 21300130: candy_65 + 21300132: candy_66 + 21300134: candy_67 + 21300136: candy_68 + 21300138: candy_69 + 21300140: candy_70 + 21300142: candy_71 + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: candy_0 + rect: + serializedVersion: 2 + x: 0 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_1 + rect: + serializedVersion: 2 + x: 32 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_2 + rect: + serializedVersion: 2 + x: 64 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_3 + rect: + serializedVersion: 2 + x: 96 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_4 + rect: + serializedVersion: 2 + x: 128 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_5 + rect: + serializedVersion: 2 + x: 160 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_6 + rect: + serializedVersion: 2 + x: 192 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_7 + rect: + serializedVersion: 2 + x: 224 + y: 256 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_8 + rect: + serializedVersion: 2 + x: 0 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_9 + rect: + serializedVersion: 2 + x: 32 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_10 + rect: + serializedVersion: 2 + x: 64 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_11 + rect: + serializedVersion: 2 + x: 96 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_12 + rect: + serializedVersion: 2 + x: 128 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_13 + rect: + serializedVersion: 2 + x: 160 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_14 + rect: + serializedVersion: 2 + x: 192 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_15 + rect: + serializedVersion: 2 + x: 224 + y: 224 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_16 + rect: + serializedVersion: 2 + x: 0 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_17 + rect: + serializedVersion: 2 + x: 32 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_18 + rect: + serializedVersion: 2 + x: 64 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_19 + rect: + serializedVersion: 2 + x: 96 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_20 + rect: + serializedVersion: 2 + x: 128 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_21 + rect: + serializedVersion: 2 + x: 160 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_22 + rect: + serializedVersion: 2 + x: 192 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_23 + rect: + serializedVersion: 2 + x: 224 + y: 192 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_24 + rect: + serializedVersion: 2 + x: 0 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_25 + rect: + serializedVersion: 2 + x: 32 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_26 + rect: + serializedVersion: 2 + x: 64 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_27 + rect: + serializedVersion: 2 + x: 96 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_28 + rect: + serializedVersion: 2 + x: 128 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_29 + rect: + serializedVersion: 2 + x: 160 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_30 + rect: + serializedVersion: 2 + x: 192 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_31 + rect: + serializedVersion: 2 + x: 224 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_32 + rect: + serializedVersion: 2 + x: 0 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_33 + rect: + serializedVersion: 2 + x: 32 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_34 + rect: + serializedVersion: 2 + x: 64 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_35 + rect: + serializedVersion: 2 + x: 96 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_36 + rect: + serializedVersion: 2 + x: 128 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_37 + rect: + serializedVersion: 2 + x: 160 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_38 + rect: + serializedVersion: 2 + x: 192 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_39 + rect: + serializedVersion: 2 + x: 224 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_40 + rect: + serializedVersion: 2 + x: 0 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_41 + rect: + serializedVersion: 2 + x: 32 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_42 + rect: + serializedVersion: 2 + x: 64 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_43 + rect: + serializedVersion: 2 + x: 96 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_44 + rect: + serializedVersion: 2 + x: 128 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_45 + rect: + serializedVersion: 2 + x: 160 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_46 + rect: + serializedVersion: 2 + x: 192 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_47 + rect: + serializedVersion: 2 + x: 224 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_48 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_49 + rect: + serializedVersion: 2 + x: 32 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_50 + rect: + serializedVersion: 2 + x: 64 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_51 + rect: + serializedVersion: 2 + x: 96 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_52 + rect: + serializedVersion: 2 + x: 128 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_53 + rect: + serializedVersion: 2 + x: 160 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_54 + rect: + serializedVersion: 2 + x: 192 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_55 + rect: + serializedVersion: 2 + x: 224 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_56 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_57 + rect: + serializedVersion: 2 + x: 32 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_58 + rect: + serializedVersion: 2 + x: 64 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_59 + rect: + serializedVersion: 2 + x: 96 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_60 + rect: + serializedVersion: 2 + x: 128 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_61 + rect: + serializedVersion: 2 + x: 160 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_62 + rect: + serializedVersion: 2 + x: 192 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_63 + rect: + serializedVersion: 2 + x: 224 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_64 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_65 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_66 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_67 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_68 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_69 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_70 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: candy_71 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 52541d1..e421efd 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -5105,13 +5105,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 - m_TileRefreshArray: - - serializedVersion: 1 - m_DirtyIndex: 0 - - serializedVersion: 1 - m_DirtyIndex: 0 - - serializedVersion: 1 - m_DirtyIndex: 0 --- !u!4 &160874133 stripped Transform: m_PrefabParentObject: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, @@ -8769,11 +8762,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 - m_TileRefreshArray: - - serializedVersion: 1 - m_DirtyIndex: 0 - - serializedVersion: 1 - m_DirtyIndex: 0 --- !u!1 &1018239510 GameObject: m_ObjectHideFlags: 0 @@ -10333,10 +10321,11 @@ GameObject: m_Component: - component: {fileID: 1602044334} - component: {fileID: 1602044333} - - component: {fileID: 1602044332} - component: {fileID: 1602044331} - component: {fileID: 1602044330} - component: {fileID: 1602044329} + - component: {fileID: 1602044335} + - component: {fileID: 1602044332} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -10367,7 +10356,7 @@ BoxCollider2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1602044328} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 @@ -10406,23 +10395,23 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!95 &1602044332 -Animator: - serializedVersion: 3 +--- !u!114 &1602044332 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1602044328} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: cbc7ce4eb98401f49a1122a3c03e5c92, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0385578d8e685e40973de0f0d406694, type: 3} + m_Name: + m_EditorClassIdentifier: + dir: 0 + el: 0 + current: 1 + frame: 0 + walkingFrameRate: 0.1 + shootingFrameRate: 0.05 --- !u!212 &1602044333 SpriteRenderer: m_ObjectHideFlags: 0 @@ -10480,6 +10469,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1602044335 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1602044328} + 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.04} + serializedVersion: 2 + m_Radius: 0.05 --- !u!4 &1607488907 stripped Transform: m_PrefabParentObject: {fileID: 4727204445767746, guid: 05968d49eff9aa04b9087b76d2a70f50, diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index d8c70eb..66d5c40 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -39,7 +39,7 @@ public class Player : MonoBehaviour { void FixedUpdate() { Move (); Attack (); - SendAnimationInfo (); + //SendAnimationInfo (); } void HandleInput() { @@ -101,11 +101,13 @@ public class Player : MonoBehaviour { } } + /* void SendAnimationInfo() { animator.SetFloat ("xSpeed", lastDirection.x); animator.SetFloat ("ySpeed", lastDirection.y); animator.SetBool ("isShooting", isShooting); } + */ //utilities Vector2 GetShootingPoint() { diff --git a/Assets/Scripts/witchAnimate.cs b/Assets/Scripts/witchAnimate.cs new file mode 100644 index 0000000..c511045 --- /dev/null +++ b/Assets/Scripts/witchAnimate.cs @@ -0,0 +1,105 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class witchAnimate : MonoBehaviour { + + public enum Direction { down = 0, up = 8, side = 16 } + public Direction dir = Direction.down; + public enum Element { fire = 0, ice = 24, wind = 48 } + public Element el = Element.fire; + public enum Deed { idle = 0, walk = 1, shoot = 5 } + public Deed current = Deed.walk; + + Sprite[] animationSet; + SpriteRenderer spr; + + public int frame = 0; + + // Use this for initialization + void Start () { + spr = GetComponent(); + animationSet = Resources.LoadAll("Candy"); + } + + float frAccum = 0; + public float walkingFrameRate = 0.02f; + public float shootingFrameRate = 0.01f; + + bool justSwitched = false; + + // Update is called once per frame + void Update () { + + var h = Input.GetAxis("Horizontal"); + var v = Input.GetAxis("Vertical"); + + var wasShooting = current == Deed.shoot; + + if (v < 0) + { + dir = Direction.down; + spr.flipX = false; + current = Deed.walk; + } + else if (v > 0) + { + dir = Direction.up; + spr.flipX = false; + current = Deed.walk; + } + else if (h > 0) + { + dir = Direction.side; + spr.flipX = false; + current = Deed.walk; + } + else if (h < 0) + { + dir = Direction.side; + spr.flipX = true; + current = Deed.walk; + } + else current = Deed.idle; + if (wasShooting) current = Deed.shoot; + + if (Input.GetButtonDown("Switch")) + el = (el == Element.fire) ? Element.ice : ((el == Element.ice) ? Element.wind : Element.fire); + if (Input.GetButtonDown("Attack")) + { + frame = 0; + frAccum = 0; + current = Deed.shoot; + } + + frAccum += Time.deltaTime; + switch(current) + { + case Deed.idle: + frAccum = 0; + frame = 0; + break; + case Deed.walk: + if (frAccum >= walkingFrameRate) + { + frame++; + frAccum = 0; + } + frame %= 4; + break; + case Deed.shoot: + if (frAccum >= shootingFrameRate) + { + frame++; + frAccum = 0; + } + if (frame >= 3) + { + frame = 0; + current = Deed.idle; + } + break; + } + spr.sprite = animationSet[(int)dir + (int)el + (int)current + frame]; + } +} diff --git a/Assets/Scripts/witchAnimate.cs.meta b/Assets/Scripts/witchAnimate.cs.meta new file mode 100644 index 0000000..9b5db74 --- /dev/null +++ b/Assets/Scripts/witchAnimate.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a0385578d8e685e40973de0f0d406694 +timeCreated: 1524349452 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/projectiles.png b/Assets/Sprites/projectiles.png index 406d92aafeb328f55b60d9ff592063838128d5c4..8e1f567e6e85d21c4b1e647f722bc279793a44ef 100644 GIT binary patch literal 479 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy$pJngu1u_q6Q)c!eE9JH|NoVZ zq!iN~s}}d995?ol71Aycsac|Z@V~jJs)@SvQZK(Q_xWpd{Nf!t{<{D8y64J!69wUk zUOczEI^N!y79}Op#=-efQQ+}P(`19T|Jq%CpOoLcPzBnvi|xc_Af;Fm$R*>Lx4 z`zs}%5|h$yLADiqPQ3yP+}$eJ*9jX4b%?EHV024iVqJ5R)uK_)%9L~Ntq#i%5+3@` z?|*jOP}es7#9Wsr`?hY=UE-#4(PdWGKT}(lzg`RhkAfG}n`{tR>EGqUz|J-0!s@BV zV(S&1C63%K-7k|_u-U4)H99}-e`JdA*O!Sid89u~V7=Gi#d^=nWn%i7} z{t|GtIBvE=p=_?ZET>(n|Ax9SwFNx4-~VHbyP#_55n1~Q7=#R-u6{1-oD!M<>k-(i literal 128 zcmWN?NfN>!5CFhCuiyiQ2@G3)!>|ZdDk%qZ@b%i4zUrIDe96An$%j(+v2KsX+yDNd zEzhUovu1VeVvZuYCvDx4yh{e70~w~v-7~uXG~FFu5z-SGqRgK{{cU9SjM6B&&4)@d*-~KzJU3t&U{ga&+~&E zA{ozet&o1u;PK+f0{O(oPjinv&U+yBCZCZnZNhs2$$nLV`l;ROtZY5Yx1Bh#fywZs zl#2S)6PYifyd?c|E#J14J!iSy-k81NP-WTzIfbO#dvb3t=ssO%ar}*MgzNu+2aDu$ zzJ5rUBpOm5=;5^YzP9#*gnug+g#DVZcEKYiv)ILo0U2M+6WX_}7K?G1J#%~8pI*Z& zvfSSy`VBU&!Tr>#ozNa$z1i`C;a*U_kDg}<94wAx7s;DCx1;bAowSJ-)Xah V&WrmjqQG!v@O1TaS?83{1OTi}=UD&% literal 128 zcmWN?OA^8$3;@u5Pr(H&NgyfhZTJc^DjmTtJiWfnyYhRq{!(?$a~xXV+q^x>SpU~g zSYv4$c9VQf)*u;W16PO_2J?#W+q#yyfjRM=v LFQa|4Vu0lbUyvn` diff --git a/Assets/Sprites/tiles_ip.png b/Assets/Sprites/tiles_ip.png index 0579c1768861159a4632a64700484d6cc6d3e435..ffbb1b1020e529b85dff2e759dd75802940dab6c 100644 GIT binary patch literal 910 zcmV;919AL`P)y(0RsRbBjd3Q0ED$n?_qqI%L01~ z%IY5q0EnxrQe8D);~xV6kyw_X769%zdLG~J1ps>m6+9B30f^r3=ZnV^x6cp^1AvMg z8I!FZ0AiI-Pf!bhn()?`UH~uzktbjP5HdKXL+J8py2>LUx&mMc zjq6B!D+#RS15pkT33jle34kT-Dsli7TE*urBLJwqU)Dzx!(H#yu7a2Alb5#^=KvNA zH2|z!!14~f<5(ho&m2JK>+09}ngsF!wCwJSCwt>vL015Z&@D7ZA)prjy&S+2zqJl< zY$Z^)aFMZyoC8?%xklj4FG8}omT>_HeE?_3B#>9UwF_910{{pfb5L{mdvEeQ>htDt z64zP@qRk z`S1Y9>UqUmaPZjSO2Jl~*FF}X0jTczjeWi4Z4Sf_`q=}_1weNJ(duWHuj5p77CGu0 z$^-N`44T`bvh$o%MDGBn#UcP&4u!Z7#4+FcZuJd!8kony%a4P#3TS=j{%*&?yKL9H z9qWSg4Xy-$A}rhrgl1Qx_Y;5>0ia^H7$C?uxFP_~-k$9R=4(s*1Yjc`z=9$HSRnum zLA3fa1Z)6+nkPsAHV^_b2gn>CT>S~aN<%t<807*qoM6N<$f}R47Q2+n{ literal 128 zcmWN?OA^8$3;@u5Pr(H&p8%=7O-Q0JqtX%V!qe;9yi?z!^_Qu09%Hxm-sa_T8|(l2 zDJ%D<9fz_#{nDG5Q7NRnBRNPOI1)ucE*f0mfDk-Fj?7sUP&dg562!nDqPh{47)dhX LGTK+o)w|^fka#B< diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 27997c5..e3618f1 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.3.1f1 +m_EditorVersion: 2017.4.1f1 From a33cc48decf71586173a1265f152a6dcf4e06598 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 22 Apr 2018 13:47:15 +1000 Subject: [PATCH 2/2] Git is misbehaving --- Assets/Sprites/temp_guy_shoot.png | Bin 500 -> 128 bytes Assets/Sprites/tiles_ip.png | Bin 910 -> 128 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Assets/Sprites/temp_guy_shoot.png b/Assets/Sprites/temp_guy_shoot.png index 493b5dc8a2455a34e40c321bc75cad6f07f4c9ea..b58c20c90c5957dbc5809d9b7fbe8961214208dd 100644 GIT binary patch literal 128 zcmWN?OA^8$3;@u5Pr(H&NgyfhZTJc^DjmTtJiWfnyYhRq{!(?$a~xXV+q^x>SpU~g zSYv4$c9VQf)*u;W16PO_2J?#W+q#yyfjRM=v LFQa|4Vu0lbUyvn` literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3-qd{%H^gQpo{6A+AiUj1#6zIDGi<|NsA$ zjieOQ9jg}iq#QT)j}_7`5UE+Beel1zsH%y&^inUsF8BFsbo}BSI{v!<_`2uHdlLoW ziC#RnyE@+9nHD7_(#FC0QBmOWO4DS6w*T5)exH=zyif(&vy1J-W+0_l666=m0JH`# zaQou7gn@xk-qXb~B%<|gm}A~y1D@68W?eEeEM5A){%fmiNw~v-7~uXG~FFu5z-SGqRgK{{cU9SjM6B&&4)@d*-~KzJU3t&U{ga&+~&E zA{ozet&o1u;PK+f0{O(oPjinv&U+yBCZCZnZNhs2$$nLV`l;ROtZY5Yx1Bh#fywZs zl#2S)6PYifyd?c|E#J14J!iSy-k81NP-WTzIfbO#dvb3t=ssO%ar}*MgzNu+2aDu$ zzJ5rUBpOm5=;5^YzP9#*gnug+g#DVZcEKYiv)ILo0U2M+6WX_}7K?G1J#%~8pI*Z& zvfSSy`VBU&!Tr>#ozNa$z1i`C;a*U_kDg}<94wAx7s;DCx1;bAowSJ-)Xah V&WrmjqQG!v@O1TaS?83{1OTi}=UD&% diff --git a/Assets/Sprites/tiles_ip.png b/Assets/Sprites/tiles_ip.png index ffbb1b1020e529b85dff2e759dd75802940dab6c..0579c1768861159a4632a64700484d6cc6d3e435 100644 GIT binary patch literal 128 zcmWN?OA^8$3;@u5Pr(H&p8%=7O-Q0JqtX%V!qe;9yi?z!^_Qu09%Hxm-sa_T8|(l2 zDJ%D<9fz_#{nDG5Q7NRnBRNPOI1)ucE*f0mfDk-Fj?7sUP&dg562!nDqPh{47)dhX LGTK+o)w|^fka#B< literal 910 zcmV;919AL`P)y(0RsRbBjd3Q0ED$n?_qqI%L01~ z%IY5q0EnxrQe8D);~xV6kyw_X769%zdLG~J1ps>m6+9B30f^r3=ZnV^x6cp^1AvMg z8I!FZ0AiI-Pf!bhn()?`UH~uzktbjP5HdKXL+J8py2>LUx&mMc zjq6B!D+#RS15pkT33jle34kT-Dsli7TE*urBLJwqU)Dzx!(H#yu7a2Alb5#^=KvNA zH2|z!!14~f<5(ho&m2JK>+09}ngsF!wCwJSCwt>vL015Z&@D7ZA)prjy&S+2zqJl< zY$Z^)aFMZyoC8?%xklj4FG8}omT>_HeE?_3B#>9UwF_910{{pfb5L{mdvEeQ>htDt z64zP@qRk z`S1Y9>UqUmaPZjSO2Jl~*FF}X0jTczjeWi4Z4Sf_`q=}_1weNJ(duWHuj5p77CGu0 z$^-N`44T`bvh$o%MDGBn#UcP&4u!Z7#4+FcZuJd!8kony%a4P#3TS=j{%*&?yKL9H z9qWSg4Xy-$A}rhrgl1Qx_Y;5>0ia^H7$C?uxFP_~-k$9R=4(s*1Yjc`z=9$HSRnum zLA3fa1Z)6+nkPsAHV^_b2gn>CT>S~aN<%t<807*qoM6N<$f}R47Q2+n{