diff --git a/.gitignore b/.gitignore index c7983b0c..82da7096 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.vs/ + /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ @@ -8,7 +10,6 @@ # DH added *.pdb *.txt -*.png # Autogenerated VS/MD solution and project files ExportedObj/ diff --git a/.vs/unity-game-client/v15/Server/sqlite3/db.lock b/.vs/unity-game-client/v15/Server/sqlite3/db.lock new file mode 100644 index 00000000..e69de29b diff --git a/.vs/unity-game-client/v15/Server/sqlite3/storage.ide b/.vs/unity-game-client/v15/Server/sqlite3/storage.ide new file mode 100644 index 00000000..0440c403 Binary files /dev/null and b/.vs/unity-game-client/v15/Server/sqlite3/storage.ide differ diff --git a/Assets/CWAssets/CWGame.unity b/Assets/CWAssets/CWGame.unity index 5d779497..9fabb27d 100755 Binary files a/Assets/CWAssets/CWGame.unity and b/Assets/CWAssets/CWGame.unity differ diff --git a/Assets/CWAssets/Images/Materials/attacker_overlay.mat b/Assets/CWAssets/Images/Materials/attacker_overlay.mat index f7e6fe2b..be46a9fa 100755 Binary files a/Assets/CWAssets/Images/Materials/attacker_overlay.mat and b/Assets/CWAssets/Images/Materials/attacker_overlay.mat differ diff --git a/Assets/CWAssets/Images/Materials/hex_stroke.mat b/Assets/CWAssets/Images/Materials/hex_stroke.mat new file mode 100644 index 00000000..bd46d52a Binary files /dev/null and b/Assets/CWAssets/Images/Materials/hex_stroke.mat differ diff --git a/Assets/CWAssets/Images/Materials/hex_stroke.mat.meta b/Assets/CWAssets/Images/Materials/hex_stroke.mat.meta new file mode 100644 index 00000000..76209a40 --- /dev/null +++ b/Assets/CWAssets/Images/Materials/hex_stroke.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 04cefbade0312a54b8b254f6c5487114 +timeCreated: 1524620135 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Materials/hex_stroke_5.mat b/Assets/CWAssets/Materials/hex_stroke_5.mat index 2ad5ddbc..9f1fd255 100755 Binary files a/Assets/CWAssets/Materials/hex_stroke_5.mat and b/Assets/CWAssets/Materials/hex_stroke_5.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Death.png b/Assets/CWAssets/Resources/Images/Battle/Death.png new file mode 100644 index 00000000..df8ab1fd Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Death.png differ diff --git a/Assets/Scenes/ClashOfSpecies/terrain 1- The Grasslands/Lightmap-0_comp_light.exr.meta b/Assets/CWAssets/Resources/Images/Battle/Death.png.meta similarity index 85% rename from Assets/Scenes/ClashOfSpecies/terrain 1- The Grasslands/Lightmap-0_comp_light.exr.meta rename to Assets/CWAssets/Resources/Images/Battle/Death.png.meta index b9a0fe72..b924ec8d 100644 --- a/Assets/Scenes/ClashOfSpecies/terrain 1- The Grasslands/Lightmap-0_comp_light.exr.meta +++ b/Assets/CWAssets/Resources/Images/Battle/Death.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 1d81ef3e4f7db4e8e8708278c73d7569 -timeCreated: 1460458030 +guid: 4afa675d50cee43ef83a0a1104568a20 +timeCreated: 1460878651 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -26,15 +26,15 @@ TextureImporter: cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -3 + textureFormat: -1 maxTextureSize: 2048 textureSettings: - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapMode: 1 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 - lightmap: 1 + lightmap: 0 rGBM: 0 compressionQuality: 50 allowsAlphaSplitting: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 - textureType: 6 + textureType: -1 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/CWAssets/Resources/Images/Battle/Death1.png b/Assets/CWAssets/Resources/Images/Battle/Death1.png new file mode 100644 index 00000000..8a0f137e Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Death1.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Death1.png.meta b/Assets/CWAssets/Resources/Images/Battle/Death1.png.meta new file mode 100644 index 00000000..367cd1bf --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Death1.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 56201e4e9fad08342a4738f5b67d4fc2 +timeCreated: 1524635145 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ClashOfSpecies/terrain 5 - The Warzone.meta b/Assets/CWAssets/Resources/Images/Battle/Materials.meta similarity index 60% rename from Assets/Scenes/ClashOfSpecies/terrain 5 - The Warzone.meta rename to Assets/CWAssets/Resources/Images/Battle/Materials.meta index 14a6b4d9..0e15ca75 100644 --- a/Assets/Scenes/ClashOfSpecies/terrain 5 - The Warzone.meta +++ b/Assets/CWAssets/Resources/Images/Battle/Materials.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 451e612056efa463ca77c6953af5a88e +guid: c8aabf3dcf9cac04c92c7bf31c855131 folderAsset: yes -timeCreated: 1458608826 +timeCreated: 1524616475 licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat new file mode 100644 index 00000000..f75a1cdd Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat.meta new file mode 100644 index 00000000..fb9f658c --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2edaef82a22fe454b8509a21cb656422 +timeCreated: 1524617751 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat new file mode 100644 index 00000000..56365f99 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat.meta new file mode 100644 index 00000000..c925cadd --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f4b12bc1a006bca46a657dc69bfc78b9 +timeCreated: 1524617761 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat new file mode 100644 index 00000000..168c824b Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat.meta new file mode 100644 index 00000000..3b16e8ea --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: de798dad3c602764ca6ed86c4dd3f490 +timeCreated: 1524617777 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat new file mode 100644 index 00000000..f1b57566 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat.meta new file mode 100644 index 00000000..2fa3147d --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ac6e4efd1d2c8204b9e11750734b35c1 +timeCreated: 1524630336 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat new file mode 100644 index 00000000..04726711 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat.meta new file mode 100644 index 00000000..a7807535 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0229429bdf9895e468593be50d1138fd +timeCreated: 1524621827 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat new file mode 100644 index 00000000..7d837812 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat.meta new file mode 100644 index 00000000..89fc28a1 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c45c6febb6dd54041908ad7bd41f51fc +timeCreated: 1524629967 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat new file mode 100644 index 00000000..269a494a Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat.meta new file mode 100644 index 00000000..ca529637 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a07c11fc9b38941448525028488bd84e +timeCreated: 1524617816 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat new file mode 100644 index 00000000..0e44cbd6 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat.meta new file mode 100644 index 00000000..75f9ad91 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 23e30cdf55dc1774ab6d036e3c50e601 +timeCreated: 1524620256 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat new file mode 100644 index 00000000..02e8359d Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat.meta new file mode 100644 index 00000000..1fea3bff --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3d04e2f3a52007e4d9df122f536f8c3f +timeCreated: 1524620326 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat new file mode 100644 index 00000000..d0196475 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat.meta new file mode 100644 index 00000000..ef47645a --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6076904c754574d4790f776583e5f618 +timeCreated: 1524620621 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat new file mode 100644 index 00000000..59784f2f Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat.meta new file mode 100644 index 00000000..aace5733 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 043e579617ace924692bc39f855447ac +timeCreated: 1524621262 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat new file mode 100644 index 00000000..beb66263 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat.meta new file mode 100644 index 00000000..f494dae8 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5934c3410526c1e41b25af71bc154620 +timeCreated: 1524630089 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat b/Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat new file mode 100644 index 00000000..5dba9ca7 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat differ diff --git a/Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat.meta b/Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat.meta new file mode 100644 index 00000000..f3515574 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 60f753ef2d2d19a43b81e8b66dfff56f +timeCreated: 1524629977 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/carnivore.png b/Assets/CWAssets/Resources/Images/Battle/carnivore.png new file mode 100644 index 00000000..1eb38cc5 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/carnivore.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/carnivore.png.meta b/Assets/CWAssets/Resources/Images/Battle/carnivore.png.meta new file mode 100644 index 00000000..7788531f --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/carnivore.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: a8ae7bd369388754db6828b4479dc083 +timeCreated: 1526329734 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/fire.png.meta b/Assets/CWAssets/Resources/Images/Battle/fire.png.meta index b924ec8d..60b02dcc 100644 --- a/Assets/CWAssets/Resources/Images/Battle/fire.png.meta +++ b/Assets/CWAssets/Resources/Images/Battle/fire.png.meta @@ -1,17 +1,20 @@ fileFormatVersion: 2 -guid: 4afa675d50cee43ef83a0a1104568a20 -timeCreated: 1460878651 +guid: 6641c27dd42cf2341a24ec2d87732020 +timeCreated: 1524129569 licenseType: Free TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,23 +24,22 @@ TextureImporter: normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 mipBias: -1 - wrapMode: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 @@ -45,12 +47,30 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/CWAssets/Resources/Images/Battle/grass_aura.png b/Assets/CWAssets/Resources/Images/Battle/grass_aura.png new file mode 100644 index 00000000..81ba3787 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/grass_aura.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/grass_aura.png.meta b/Assets/CWAssets/Resources/Images/Battle/grass_aura.png.meta new file mode 100644 index 00000000..c2f6e258 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/grass_aura.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 20d4dc392ddbe084d86bd887651c291d +timeCreated: 1524621755 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/herbivore.png b/Assets/CWAssets/Resources/Images/Battle/herbivore.png new file mode 100644 index 00000000..446aaa15 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/herbivore.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/herbivore.png.meta b/Assets/CWAssets/Resources/Images/Battle/herbivore.png.meta new file mode 100644 index 00000000..f8b3bc53 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/herbivore.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 0c91a81992db6d147ada6c784333b9ff +timeCreated: 1526329733 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/omnivore.png b/Assets/CWAssets/Resources/Images/Battle/omnivore.png new file mode 100644 index 00000000..f1ed791f Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/omnivore.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/omnivore.png.meta b/Assets/CWAssets/Resources/Images/Battle/omnivore.png.meta new file mode 100644 index 00000000..1435784f --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/omnivore.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 3829695fce7f46f4aa7f5c4bccb6299d +timeCreated: 1526329734 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke1.png b/Assets/CWAssets/Resources/Images/Battle/owned_stroke1.png new file mode 100644 index 00000000..92ff0b32 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/owned_stroke1.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke1.png.meta b/Assets/CWAssets/Resources/Images/Battle/owned_stroke1.png.meta new file mode 100644 index 00000000..5fcbddf8 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/owned_stroke1.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 210a3ec1cc870da4fb3031d0002fc74f +timeCreated: 1524620207 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke2.png b/Assets/CWAssets/Resources/Images/Battle/owned_stroke2.png new file mode 100644 index 00000000..bb917989 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/owned_stroke2.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke2.png.meta b/Assets/CWAssets/Resources/Images/Battle/owned_stroke2.png.meta new file mode 100644 index 00000000..b55c0f30 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/owned_stroke2.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 372d0b380afd6a84383991f0524e5da9 +timeCreated: 1524620322 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke3.png b/Assets/CWAssets/Resources/Images/Battle/owned_stroke3.png new file mode 100644 index 00000000..fe8b9e16 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/owned_stroke3.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke3.png.meta b/Assets/CWAssets/Resources/Images/Battle/owned_stroke3.png.meta new file mode 100644 index 00000000..aaf471f8 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/owned_stroke3.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 86b8413755542444481665d17e51adc6 +timeCreated: 1524620612 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke4.png b/Assets/CWAssets/Resources/Images/Battle/owned_stroke4.png new file mode 100644 index 00000000..e5c8fc73 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/owned_stroke4.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/owned_stroke4.png.meta b/Assets/CWAssets/Resources/Images/Battle/owned_stroke4.png.meta new file mode 100644 index 00000000..caae98a3 --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/owned_stroke4.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 6b64df3f301fb4446a7cf0e701b3b81b +timeCreated: 1524621260 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Images/Battle/plant.png b/Assets/CWAssets/Resources/Images/Battle/plant.png new file mode 100644 index 00000000..4897eb30 Binary files /dev/null and b/Assets/CWAssets/Resources/Images/Battle/plant.png differ diff --git a/Assets/CWAssets/Resources/Images/Battle/plant.png.meta b/Assets/CWAssets/Resources/Images/Battle/plant.png.meta new file mode 100644 index 00000000..cc65a0cc --- /dev/null +++ b/Assets/CWAssets/Resources/Images/Battle/plant.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 1315fe37e0b36934688db44197597ee3 +timeCreated: 1526329734 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Basic_pop.prefab b/Assets/CWAssets/Resources/Prefabs/Basic_pop.prefab new file mode 100644 index 00000000..9aeacd04 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Basic_pop.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Basic_pop.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Basic_pop.prefab.meta new file mode 100644 index 00000000..929d8654 --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Basic_pop.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d3f005059ff813849bac7439a5142b89 +timeCreated: 1524634307 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card n.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card n.prefab new file mode 100644 index 00000000..ab36bcb7 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/Card n.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card n.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card n.prefab.meta new file mode 100644 index 00000000..a9d43705 --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card n.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a5e64a8356e38f147808af0996a46e0d +timeCreated: 1521776659 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card original.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card original.prefab new file mode 100644 index 00000000..8de1c334 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/Card original.prefab differ diff --git a/Assets/Scenes/ClashOfSpecies/level6/NavMesh.asset.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card original.prefab.meta old mode 100755 new mode 100644 similarity index 58% rename from Assets/Scenes/ClashOfSpecies/level6/NavMesh.asset.meta rename to Assets/CWAssets/Resources/Prefabs/Battle/Card original.prefab.meta index 424b9a09..175f6ee3 --- a/Assets/Scenes/ClashOfSpecies/level6/NavMesh.asset.meta +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card original.prefab.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: 9e8444d7257c74b6a87cfaa051529c80 +guid: f41cd8d9d00a8244b88af342a6951a78 NativeFormatImporter: userData: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab index e0d593b0..4d35b778 100644 Binary files a/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab and b/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab.meta index 175f6ee3..c9a19c37 100755 --- a/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab.meta +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card.prefab.meta @@ -1,4 +1,10 @@ fileFormatVersion: 2 -guid: f41cd8d9d00a8244b88af342a6951a78 +guid: 11fef43f54b36ef42ab42bc4a6826c60 +timeCreated: 1526181671 +licenseType: Free NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/CardBack 1.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/CardBack 1.prefab new file mode 100644 index 00000000..8fb94c4f Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/CardBack 1.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/CardBack 1.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/CardBack 1.prefab.meta new file mode 100644 index 00000000..52892780 --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/CardBack 1.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 80218c6504406314aa33f0a64a66ae96 +timeCreated: 1521781558 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/CardN.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/CardN.prefab new file mode 100644 index 00000000..c44f2246 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/CardN.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/CardN.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/CardN.prefab.meta new file mode 100644 index 00000000..4167b24a --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/CardN.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2ff37608d1a416943a15bc259200377a +timeCreated: 1525339410 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_NN.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NN.prefab new file mode 100644 index 00000000..2f5ad604 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NN.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_NN.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NN.prefab.meta new file mode 100644 index 00000000..4fca52ec --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NN.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0ff740183b8f900479d9aea75cdd04ed +timeCreated: 1526132209 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_NNN.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NNN.prefab new file mode 100644 index 00000000..c8692652 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NNN.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_NNN.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NNN.prefab.meta new file mode 100644 index 00000000..d2291140 --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card_NNN.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8092b68ed2416494cb4b432a8efb8dc0 +timeCreated: 1526132209 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_PN.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card_PN.prefab new file mode 100644 index 00000000..0cf2eea7 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/Card_PN.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_PN.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card_PN.prefab.meta new file mode 100644 index 00000000..2630d81f --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card_PN.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3914bca2b61ca6a4da91d77f7582519b +timeCreated: 1525339410 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_prev.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prev.prefab new file mode 100644 index 00000000..609d19ec Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prev.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_prev.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prev.prefab.meta new file mode 100644 index 00000000..5077268f --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prev.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4b898f99bc8e2224f98aecd59fa68fe2 +timeCreated: 1523344655 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_prevN.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prevN.prefab new file mode 100644 index 00000000..dd8ab5a3 Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prevN.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Card_prevN.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prevN.prefab.meta new file mode 100644 index 00000000..2f9bdadc --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Battle/Card_prevN.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6815b4f3f99f3bf4c8f9a5be8aeb98ae +timeCreated: 1524621854 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/GameOver oringinal.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver oringinal.prefab new file mode 100644 index 00000000..4c4048cf Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver oringinal.prefab differ diff --git a/Assets/ClashOfSpecies/Grasslands.asset.meta b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver oringinal.prefab.meta old mode 100755 new mode 100644 similarity index 58% rename from Assets/ClashOfSpecies/Grasslands.asset.meta rename to Assets/CWAssets/Resources/Prefabs/Battle/GameOver oringinal.prefab.meta index 38081e3c..4ba28d0c --- a/Assets/ClashOfSpecies/Grasslands.asset.meta +++ b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver oringinal.prefab.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: f7c02ace799828e43b1ec2485ca1fd65 +guid: 77f2e808de1754013b7d4feb8826b4ff NativeFormatImporter: userData: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab index 1926de99..dc9b41d3 100644 Binary files a/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab and b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab.meta index 4ba28d0c..656b49d2 100755 --- a/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab.meta +++ b/Assets/CWAssets/Resources/Prefabs/Battle/GameOver.prefab.meta @@ -1,4 +1,10 @@ fileFormatVersion: 2 -guid: 77f2e808de1754013b7d4feb8826b4ff +guid: c497d8d7bb0aa144f9bca1dc14b56a5e +timeCreated: 1521819869 +licenseType: Free NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Materials/Font_FrontOnly.mat b/Assets/CWAssets/Resources/Prefabs/Battle/Materials/Font_FrontOnly.mat index 3c6c4095..96ddfcf2 100755 Binary files a/Assets/CWAssets/Resources/Prefabs/Battle/Materials/Font_FrontOnly.mat and b/Assets/CWAssets/Resources/Prefabs/Battle/Materials/Font_FrontOnly.mat differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_art.mat b/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_art.mat index b48c6d5c..e08860ee 100755 Binary files a/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_art.mat and b/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_art.mat differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_front.mat b/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_front.mat index b57bca85..a8f5084c 100755 Binary files a/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_front.mat and b/Assets/CWAssets/Resources/Prefabs/Battle/Materials/card_front.mat differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/cardfront0.png b/Assets/CWAssets/Resources/Prefabs/Battle/cardfront0.png deleted file mode 100755 index 02bbfc86..00000000 Binary files a/Assets/CWAssets/Resources/Prefabs/Battle/cardfront0.png and /dev/null differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/old/Card.prefab b/Assets/CWAssets/Resources/Prefabs/Battle/old/Card.prefab deleted file mode 100755 index 7a804115..00000000 Binary files a/Assets/CWAssets/Resources/Prefabs/Battle/old/Card.prefab and /dev/null differ diff --git a/Assets/CWAssets/Resources/Prefabs/Battle/old/Card.prefab.meta b/Assets/CWAssets/Resources/Prefabs/Battle/old/Card.prefab.meta deleted file mode 100755 index bf141966..00000000 --- a/Assets/CWAssets/Resources/Prefabs/Battle/old/Card.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 442a670b0ac85d34392d5f8261b500ea -NativeFormatImporter: - userData: diff --git a/Assets/CWAssets/Resources/Prefabs/Materials/Flame.mat b/Assets/CWAssets/Resources/Prefabs/Materials/Flame.mat new file mode 100644 index 00000000..1f9403fe Binary files /dev/null and b/Assets/CWAssets/Resources/Prefabs/Materials/Flame.mat differ diff --git a/Assets/CWAssets/Resources/Prefabs/Materials/Flame.mat.meta b/Assets/CWAssets/Resources/Prefabs/Materials/Flame.mat.meta new file mode 100644 index 00000000..2b1cd735 --- /dev/null +++ b/Assets/CWAssets/Resources/Prefabs/Materials/Flame.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 37dd198dba85e9b4dbf4d6be0a3ac165 +timeCreated: 1526186799 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/NewFire.wav b/Assets/CWAssets/Resources/Sounds/NewFire.wav new file mode 100644 index 00000000..72def571 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/NewFire.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/NewFire.wav.meta b/Assets/CWAssets/Resources/Sounds/NewFire.wav.meta new file mode 100644 index 00000000..5caa12fe --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/NewFire.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 4b496f3a801e0664e96ca55a8353bcfc +timeCreated: 1526183490 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/TurnStart.wav b/Assets/CWAssets/Resources/Sounds/TurnStart.wav new file mode 100644 index 00000000..f2c8498d Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/TurnStart.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/TurnStart.wav.meta b/Assets/CWAssets/Resources/Sounds/TurnStart.wav.meta new file mode 100644 index 00000000..889969e6 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/TurnStart.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 39d48c813cd84784b94d0b6488c7a85c +timeCreated: 1526273571 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/background2.wav b/Assets/CWAssets/Resources/Sounds/background2.wav new file mode 100644 index 00000000..864e959d Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/background2.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/background2.wav.meta b/Assets/CWAssets/Resources/Sounds/background2.wav.meta new file mode 100644 index 00000000..07908b66 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/background2.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: f07a902c1ec61934f96ecf910cad6320 +timeCreated: 1524961400 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/bgm2.wav b/Assets/CWAssets/Resources/Sounds/bgm2.wav new file mode 100644 index 00000000..6861907e Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/bgm2.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/bgm2.wav.meta b/Assets/CWAssets/Resources/Sounds/bgm2.wav.meta new file mode 100644 index 00000000..d845d137 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/bgm2.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: c321b469a32b86d43ac2882cff1458ea +timeCreated: 1524627457 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/card.mp3 b/Assets/CWAssets/Resources/Sounds/card.mp3 new file mode 100644 index 00000000..ccb146ae Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/card.mp3 differ diff --git a/Assets/CWAssets/Resources/Sounds/card.mp3.meta b/Assets/CWAssets/Resources/Sounds/card.mp3.meta new file mode 100644 index 00000000..0cb26458 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/card.mp3.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 4ad98e4f148a146498fcde9af4e9baab +timeCreated: 1524626435 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/card_destroyed.wav b/Assets/CWAssets/Resources/Sounds/card_destroyed.wav new file mode 100644 index 00000000..e7844be2 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/card_destroyed.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/card_destroyed.wav.meta b/Assets/CWAssets/Resources/Sounds/card_destroyed.wav.meta new file mode 100644 index 00000000..2000dbe4 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/card_destroyed.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: a32aa34148eed0746a494916ba8b78c4 +timeCreated: 1524626436 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/card_placed.wav b/Assets/CWAssets/Resources/Sounds/card_placed.wav new file mode 100644 index 00000000..dc714121 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/card_placed.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/card_placed.wav.meta b/Assets/CWAssets/Resources/Sounds/card_placed.wav.meta new file mode 100644 index 00000000..675de2a5 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/card_placed.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 2966c781331d44f4d94f12acd468c302 +timeCreated: 1524626432 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/card_shuffle.wav b/Assets/CWAssets/Resources/Sounds/card_shuffle.wav new file mode 100644 index 00000000..3255f5e0 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/card_shuffle.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/card_shuffle.wav.meta b/Assets/CWAssets/Resources/Sounds/card_shuffle.wav.meta new file mode 100644 index 00000000..5d0ab904 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/card_shuffle.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: a6303d490ea8f8e48a71cef7f5b325f4 +timeCreated: 1524626436 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/fire.wav b/Assets/CWAssets/Resources/Sounds/fire.wav new file mode 100644 index 00000000..df030eb4 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/fire.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/fire.wav.meta b/Assets/CWAssets/Resources/Sounds/fire.wav.meta new file mode 100644 index 00000000..6383d88b --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/fire.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 98f90e652e7bec148b4e6090cde3d1af +timeCreated: 1524626436 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/freeze.wav b/Assets/CWAssets/Resources/Sounds/freeze.wav new file mode 100644 index 00000000..b7def463 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/freeze.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/freeze.wav.meta b/Assets/CWAssets/Resources/Sounds/freeze.wav.meta new file mode 100644 index 00000000..964139d2 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/freeze.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 24a3f60ae5d621e4ebb0c955c14c88c7 +timeCreated: 1524626431 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/rain.wav b/Assets/CWAssets/Resources/Sounds/rain.wav new file mode 100644 index 00000000..daacdc6e Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/rain.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/rain.wav.meta b/Assets/CWAssets/Resources/Sounds/rain.wav.meta new file mode 100644 index 00000000..ef2f9c75 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/rain.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: b036bfa0717d5044390d06222711804d +timeCreated: 1524626437 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/sunny.wav b/Assets/CWAssets/Resources/Sounds/sunny.wav new file mode 100644 index 00000000..b6c39eb9 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/sunny.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/sunny.wav.meta b/Assets/CWAssets/Resources/Sounds/sunny.wav.meta new file mode 100644 index 00000000..e12a8068 --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/sunny.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: df55f62ba3d673342bf4bfde49c0442e +timeCreated: 1524626437 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Resources/Sounds/thunder.wav b/Assets/CWAssets/Resources/Sounds/thunder.wav new file mode 100644 index 00000000..93306d70 Binary files /dev/null and b/Assets/CWAssets/Resources/Sounds/thunder.wav differ diff --git a/Assets/CWAssets/Resources/Sounds/thunder.wav.meta b/Assets/CWAssets/Resources/Sounds/thunder.wav.meta new file mode 100644 index 00000000..da98f2fa --- /dev/null +++ b/Assets/CWAssets/Resources/Sounds/thunder.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: f8e0a05b07672c141966ad97fdcc0164 +timeCreated: 1524626438 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CWAssets/Scenes/CWBattle.unity b/Assets/CWAssets/Scenes/CWBattle.unity index 3b798e1b..8953aac8 100644 Binary files a/Assets/CWAssets/Scenes/CWBattle.unity and b/Assets/CWAssets/Scenes/CWBattle.unity differ diff --git a/Assets/CWAssets/Scripts/AI.cs b/Assets/CWAssets/Scripts/AI.cs index ffef4f67..14a6023f 100755 --- a/Assets/CWAssets/Scripts/AI.cs +++ b/Assets/CWAssets/Scripts/AI.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.AI; using System.Collections; namespace CW{ public class AI : MonoBehaviour { diff --git a/Assets/CWAssets/Scripts/Battle/Actions/FoodCardAction.cs b/Assets/CWAssets/Scripts/Battle/Actions/FoodCardAction.cs index 1363a31d..0296b75c 100644 --- a/Assets/CWAssets/Scripts/Battle/Actions/FoodCardAction.cs +++ b/Assets/CWAssets/Scripts/Battle/Actions/FoodCardAction.cs @@ -11,20 +11,79 @@ public FoodCardAction(int intCount, int stringCount, List intList, List (); - GameManager.player2.applyFoodBuff(target, 1, 1); + AbstractCard target = obj.GetComponent (); + + + //When Player2(Client 2) used food card, this will apply to Player 1 (Client 1) but not Client 2 + //GameManager.player2.applyFoodBuff(target, 3, 3); + //Ex p2(client) used food card on mouse 1,1 -> 2,2, p1(client) show 1,1 -> 4,4 + + int food = attackersPosition; + int species = target.cardID; + Debug.Log("food: " + food); + Debug.Log("species: " + species); + + /* + //2018 Spring semester WoB Ecosystem + //Lion (86) > Bufflao, Bush Pig + //Buffalo (7) > Grass and Herbs + //Bush Pig (83) > Decayling Material, Tree Mouse + //Tree Mouse (31) > Grass and Herbs, Decaying Materials, Cockroach + //Cockroach (19) > Decaying Materials + //Decaying Materials (89) + //Grass and Herbs (96) + */ + + //Decaying Materials < Bush Pig + if (food == 95 && species == 83) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + GameManager.player2.applyFoodBuff(target, 3, 3); + //Decaying Materials < Tree Mouse + } + else if (food == 95 && species == 31) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + GameManager.player2.applyFoodBuff(target, 3, 3); + //Decaying Materials < Cockroach + } + else if (food == 95 && species == 19) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + GameManager.player2.applyFoodBuff(target, 3, 3); + //Grass and Herbs < Tree Mouse + } + else if (food == 96 && species == 31) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + GameManager.player2.applyFoodBuff(target, 3, 3); + //Grass and Herbs < Buffalo + } + else if (food == 96 && species == 7) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + GameManager.player2.applyFoodBuff(target, 3, 3); + //Normal Food Apply + } + else + { + Debug.Log("Normal Food Apply"); + GameManager.player2.applyFoodBuff(target, 1, 1); + } GameObject cardUsed = (GameObject)GameManager.player2.hand [0]; + + GameManager.player2.hand.Remove(cardUsed); GameObject.Destroy (cardUsed); diff --git a/Assets/CWAssets/Scripts/Battle/Actions/SummonCardAction.cs b/Assets/CWAssets/Scripts/Battle/Actions/SummonCardAction.cs index 9745f2cd..44168d75 100755 --- a/Assets/CWAssets/Scripts/Battle/Actions/SummonCardAction.cs +++ b/Assets/CWAssets/Scripts/Battle/Actions/SummonCardAction.cs @@ -62,6 +62,7 @@ override public void execute(){ script.isInPlay=true; GameObject.Destroy((GameObject)GameManager.player2.hand[0]); GameManager.player2.hand.RemoveAt(0); + script.effect = true; GameManager.player2.reposition(); diff --git a/Assets/CWAssets/Scripts/Battle/BattlePlayer.cs b/Assets/CWAssets/Scripts/Battle/BattlePlayer.cs index 5ca7f2cc..6d189b86 100755 --- a/Assets/CWAssets/Scripts/Battle/BattlePlayer.cs +++ b/Assets/CWAssets/Scripts/Battle/BattlePlayer.cs @@ -23,13 +23,18 @@ public class BattlePlayer : MonoBehaviour public string playerName; public bool handCentered = false; public bool playerFrozen=false; + public bool foodwebactive = false; + public ProtocolManager getProtocolManager () { return protocols; } float showWeatherEffect=CW.Constants.ANIMATE_RATE; - + + public Transform weathereffect; + + //Initializes the player variables public void init (bool player1) { @@ -49,7 +54,27 @@ public void init (bool player1) createTree (); createMana (); } - + + //use this init to initialize player 2 + public void init2(bool player2) + { + // get protocolManager from GameManager + protocols = GameManager.protocols; + + deck = new ArrayList(); + hand = new ArrayList(); + GraveYard = new ArrayList(); + cardsInPlay = new ArrayList(); + treeID = new ArrayList(); + + //Set's player's coordinates of interest for p1 and p2 + setPlayerNum(player2); + + //Creates the player's tree and mana displayer + createTree2(); + createMana(); + } + public GameObject instantiateCard () { return (GameObject)Instantiate (Resources.Load ("Prefabs/Battle/Card")); @@ -69,7 +94,8 @@ public void setPlayerNum (bool isPlayer1) handPos = new Vector3 (550, 10, -375);//orig(150, 10, -375) FieldPos = new Vector3 (-450, 10, -150); TreePos = new Vector3 (0, 10, -375);//org(-800,10, -300) - + + //Player 1 takes first turn every time currentMana = 1; maxMana = 1; @@ -112,9 +138,23 @@ public void applyWeather(int card_id, bool currentPlayer){ isFiring=true; //by Pedro if (currentPlayer && audioSource!=null) { - audioSource.clip = Resources.Load ("Sounds/burning_fire") as AudioClip; + //audioSource.loop = false; + audioSource.clip = Resources.Load ("Sounds/NewFire") as AudioClip; //audioSource.PlayDelayed (1); audioSource.Play (); + + //stop blizzard + weathereffect = GameObject.Find("WeatherEffect").transform.Find("blizzard"); + weathereffect.gameObject.SetActive(false); + + //stop rain + weathereffect = GameObject.Find("WeatherEffect").transform.Find("rain"); + weathereffect.gameObject.SetActive(false); + + //Start Fire + weathereffect = GameObject.Find("WeatherEffect").transform.Find("Fire"); + weathereffect.gameObject.SetActive(true); + showWeatherEffect = CW.Constants.ANIMATE_RATE; } } @@ -130,12 +170,27 @@ public void applyWeather(int card_id, bool currentPlayer){ case 90: if(currentPlayer && audioSource!=null) { + //audioSource.loop = false; playerFrozen=true;// used to show frozen text isFreezing=true; //by Pedro - audioSource.clip = Resources.Load ("Sounds/ice_cracking") as AudioClip; + audioSource.clip = Resources.Load ("Sounds/freeze") as AudioClip; //audioSource.PlayDelayed (1); audioSource.Play (); + //audioSource.loop = true; + + //stop rain + weathereffect = GameObject.Find("WeatherEffect").transform.Find("rain"); + weathereffect.gameObject.SetActive(false); + + //start blizzard + weathereffect = GameObject.Find("WeatherEffect").transform.Find("blizzard"); + weathereffect.gameObject.SetActive(true); + + //Stop Fire + weathereffect = GameObject.Find("WeatherEffect").transform.Find("Fire"); + weathereffect.gameObject.SetActive(false); + showWeatherEffect=CW.Constants.ANIMATE_RATE; } @@ -151,9 +206,24 @@ public void applyWeather(int card_id, bool currentPlayer){ if (currentPlayer && audioSource!=null) { isRaining = true; //by Pedro - audioSource.clip = Resources.Load ("Sounds/rain_thunder") as AudioClip; + //audioSource.loop = false; + audioSource.clip = Resources.Load ("Sounds/rain") as AudioClip; //audioSource.PlayDelayed (1); audioSource.Play (); + //audioSource.loop = true; + + //stop blizzard + weathereffect = GameObject.Find("WeatherEffect").transform.Find("blizzard"); + weathereffect.gameObject.SetActive(false); + + //start rain + weathereffect = GameObject.Find("WeatherEffect").transform.Find("rain"); + weathereffect.gameObject.SetActive(true); + + //Stop Fire + weathereffect = GameObject.Find("WeatherEffect").transform.Find("Fire"); + weathereffect.gameObject.SetActive(false); + showWeatherEffect = CW.Constants.ANIMATE_RATE; givePlayerFoodCard (2); } @@ -243,8 +313,18 @@ public void createTree () script.init (this); treeID.Add (obj); } - - + + //use this version of createTree to make the tree for player2 + public void createTree2() + { + GameObject obj = (GameObject)Instantiate(Resources.Load("Prefabs/Battle/Tree")); + obj.AddComponent(); + Trees script = obj.GetComponent(); + script.init2(this); + treeID.Add(obj); + } + + //Creates a visual for the text that displays how much mana a player has private void createMana () { @@ -285,25 +365,28 @@ private void createMana () } public void applyFoodBuff(AbstractCard target, int deltaAttack, int deltaHealth){ - target.applyFood (target, deltaAttack, deltaHealth); } //Instantiate's the GameOver button public void createGameover () { - int gold = 100; //100 gold if won + isGameOver = true; + Debug.Log ("Battleplayer game_over"); gameOver = (GameObject)Instantiate (Resources.Load ("Prefabs/Battle/GameOver")); if (!isWon) { Debug.Log("lost the game"); - gold = 25;//25 gold if lost + //gaining CW_LOSE_CREDITS amount of credits + Game.networkManager.Send(UpdateCreditsProtocol.Prepare((short)0, Constants.CW_LOSE_CREDITS), ProcessUpdateCredits); Texture2D loseTexture = (Texture2D)Resources.Load ("Prefabs/Battle/lose", typeof(Texture2D)); gameOver.GetComponent().material.mainTexture = loseTexture; } else { Debug.Log("won the game"); + //gaining CW_WIN_CREDITS amount of credits + Game.networkManager.Send(UpdateCreditsProtocol.Prepare((short)0, Constants.CW_WIN_CREDITS), ProcessUpdateCredits); Texture2D winTexture = (Texture2D)Resources.Load ("Prefabs/Battle/win", typeof(Texture2D)); gameOver.GetComponent().material.mainTexture = winTexture; } @@ -446,10 +529,293 @@ public void attackWith (int attackerIndex, int attackedIndex) GameObject attackedObj = (GameObject)GameManager.player1.cardsInPlay [attackedIndex]; AbstractCard attackedCard = attackedObj.GetComponent (); + + /* + //2018 Spring semester WoB Ecosystem + //Lion (86) > Bufflao, Bush Pig + //Buffalo (7) > Grass and Herbs + //Bush Pig (83) > Decayling Material, Tree Mouse + //Tree Mouse (31) > Grass and Herbs, Decaying Materials, Cockroach + //Cockroach (19) > Decaying Materials + //Decaying Materials (89 or 95) + //Grass and Herbs (96) + */ + + + //Predator > Prey + //Lion > Bufflao + if (attackerCard.cardID == 86 && attackedCard.cardID == 7) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " > " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg += 3; + attackerCard.hp += 5; + Debug.Log("After Buffed"); + Debug.Log("New Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Predator (" + attackerCard.name + ") hp : " + "Predator hp (" + attackerCard.hp + ") - Prey dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Predator (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") hp : " + "prey hp (" + attackedCard.hp + ") - Predator dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Prey (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Lion > Lion + } + else if (attackerCard.cardID == 86 && attackedCard.cardID == 86) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " > " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg += 3; + attackerCard.hp += 5; + Debug.Log("After Buffed"); + Debug.Log("New Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Predator (" + attackerCard.name + ") hp : " + "Predator hp (" + attackerCard.hp + ") - Prey dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Predator (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") hp : " + "prey hp (" + attackedCard.hp + ") - Predator dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Prey (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Lion > Bush Pig + } + else if (attackerCard.cardID == 86 && attackedCard.cardID == 83) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " > " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg += 3; + attackerCard.hp += 5; + Debug.Log("After Buffed"); + Debug.Log("New Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Predator (" + attackerCard.name + ") hp : " + "Predator hp (" + attackerCard.hp + ") - Prey dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Predator (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") hp : " + "prey hp (" + attackedCard.hp + ") - Predator dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Prey (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Bush Pig > Tree Mouse + } + else if (attackerCard.cardID == 83 && attackedCard.cardID == 31) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " > " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg += 3; + attackerCard.hp += 5; + Debug.Log("After Buffed"); + Debug.Log("New Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Predator (" + attackerCard.name + ") hp : " + "Predator hp (" + attackerCard.hp + ") - Prey dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Predator (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") hp : " + "prey hp (" + attackedCard.hp + ") - Predator dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Prey (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Tree Mouse > Cockroach + } + else if (attackerCard.cardID == 31 && attackedCard.cardID == 19) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " > " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg += 3; + attackerCard.hp += 5; + Debug.Log("After Buffed"); + Debug.Log("New Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Predator (" + attackerCard.name + ") hp : " + "Predator hp (" + attackerCard.hp + ") - Prey dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Predator (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") hp : " + "prey hp (" + attackedCard.hp + ") - Predator dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Prey (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + //Tree Mouse > Tree Mouse + } + else if (attackerCard.cardID == 31 && attackedCard.cardID == 31) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " > " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg += 3; + attackerCard.hp += 5; + Debug.Log("After Buffed"); + Debug.Log("New Predator (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Predator (" + attackerCard.name + ") hp : " + "Predator hp (" + attackerCard.hp + ") - Prey dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Predator (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Prey (" + attackedCard.name + ") hp : " + "prey hp (" + attackedCard.hp + ") - Predator dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Prey (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + } + + //Prey < Predator + //Bufflao < Lion + if (attackerCard.cardID == 7 && attackedCard.cardID == 86) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " < " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg -= 3; + attackerCard.hp -= 5; + Debug.Log("After Buffed"); + Debug.Log("New Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Prey (" + attackerCard.name + ") hp : " + "prey hp (" + attackerCard.hp + ") - Predator dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Prey (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") hp : " + "Predator hp (" + attackedCard.hp + ") - Prey dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Predator (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Bush Pig < Lion + } + else if (attackerCard.cardID == 83 && attackedCard.cardID == 86) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " < " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg -= 3; + attackerCard.hp -= 5; + Debug.Log("After Buffed"); + Debug.Log("New Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Prey (" + attackerCard.name + ") hp : " + "prey hp (" + attackerCard.hp + ") - Predator dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Prey (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") hp : " + "Predator hp (" + attackedCard.hp + ") - Prey dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Predator (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Lion < Lion + } + else if (attackerCard.cardID == 86 && attackedCard.cardID == 86) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " < " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg -= 3; + attackerCard.hp -= 5; + Debug.Log("After Buffed"); + Debug.Log("New Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Prey (" + attackerCard.name + ") hp : " + "prey hp (" + attackerCard.hp + ") - Predator dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Prey (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") hp : " + "Predator hp (" + attackedCard.hp + ") - Prey dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Predator (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Tree Mouse < Bush Pig + } + else if (attackerCard.cardID == 31 && attackedCard.cardID == 83) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " < " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg -= 3; + attackerCard.hp -= 5; + Debug.Log("After Buffed"); + Debug.Log("New Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Prey (" + attackerCard.name + ") hp : " + "prey hp (" + attackerCard.hp + ") - Predator dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Prey (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") hp : " + "Predator hp (" + attackedCard.hp + ") - Prey dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Predator (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Tree Mouse < Tree Mouse + } + else if (attackerCard.cardID == 31 && attackedCard.cardID == 31) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " < " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg -= 3; + attackerCard.hp -= 5; + Debug.Log("After Buffed"); + Debug.Log("New Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Prey (" + attackerCard.name + ") hp : " + "prey hp (" + attackerCard.hp + ") - Predator dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Prey (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") hp : " + "Predator hp (" + attackedCard.hp + ") - Prey dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Predator (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + + //Cockroach < Tree Mouse + } + else if (attackerCard.cardID == 19 && attackedCard.cardID == 31) + { + Debug.Log("FOOD WEB SYSTEM ACTIVATED"); + Debug.Log("Species: " + attackerCard.name + " < " + attackedCard.name); + Debug.Log("Before Buffed"); + Debug.Log("Old Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("Old Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + attackerCard.dmg -= 3; + attackerCard.hp -= 5; + Debug.Log("After Buffed"); + Debug.Log("New Prey (" + attackerCard.name + ") - hp: " + attackerCard.hp + " dmg: " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") - hp: " + attackedCard.hp + " dmg: " + attackedCard.dmg); + Debug.Log("After Attack"); + Debug.Log("New Prey (" + attackerCard.name + ") hp : " + "prey hp (" + attackerCard.hp + ") - Predator dmg (" + attackedCard.dmg + ") = " + + (attackerCard.hp - attackedCard.dmg)); + Debug.Log("New Prey (" + attackerCard.name + ") dmg : " + attackerCard.dmg); + Debug.Log("New Predator (" + attackedCard.name + ") hp : " + "Predator hp (" + attackedCard.hp + ") - Prey dmg (" + attackerCard.dmg + ") = " + + (attackedCard.hp - attackerCard.dmg)); + Debug.Log("New Predator (" + attackedCard.name + ") dmg : " + attackedCard.dmg); + } + if (attackedCard.diet != AbstractCard.DIET.HERBIVORE) { damageBack = true; - attackerCard.receiveAttack (attackedCard.dmg); + //comment receiveAttack because it called twice: line 713 (1) and in the attack function, it also got called. This mean the species will recieved the exact damage twice from non-Herbivore + //And not sure if it's this line cause a bug that one side species is dead and other species is not dead + //turn out that the cardsInPlay got messed up (need to check) + //And I suggest to implement the cardsInPlay to check which species is at which postion so the cardsInplay won't got messed up and cause the bug + //attackerCard.receiveAttack (attackedCard.dmg); } + attackerCard.attack (attackerCard, attackedCard, damageBack); } @@ -508,6 +874,11 @@ public void addMana () // Deal new card for layer public void startTurn () { + AudioSource audioSource = gameObject.AddComponent(); + audioSource.clip = Resources.Load("Sounds/TurnStart") as AudioClip; + //audioSource.PlayDelayed (1); + audioSource.Play(); + showTurn = 120; if (hand.Count != 5) { dealCard (1); @@ -690,5 +1061,21 @@ public void cardsInPlayGlow() } } } + + public void ProcessUpdateCredits(NetworkResponse response) + { + ResponseUpdateCredits args = response as ResponseUpdateCredits; + Debug.Log("ResponseUpdateCredits: action= " + args.action); + + if (args.status == 0) + { + GameState.player.credits = args.newCredits; + Debug.Log("new credits: " + args.newCredits); + } + else + Debug.Log("failed to update credits"); + + } + } } \ No newline at end of file diff --git a/Assets/CWAssets/Scripts/Battle/Cards/AbstractCard.cs b/Assets/CWAssets/Scripts/Battle/Cards/AbstractCard.cs index d6a164c1..d0a9c0b3 100755 --- a/Assets/CWAssets/Scripts/Battle/Cards/AbstractCard.cs +++ b/Assets/CWAssets/Scripts/Battle/Cards/AbstractCard.cs @@ -1,43 +1,88 @@ using UnityEngine; using System.Collections; using UnityEngine.EventSystems; +using UnityEngine.UI; +using System.Collections.Generic; +using System; +using System.Linq; + namespace CW { - public class AbstractCard : MonoBehaviour - { - public int cardID, fieldIndex; + public class AbstractCard : MonoBehaviour + { + public int cardID, fieldIndex; public int maxHP, hp, dmg, naturalDmg, manaCost, level, dmgTimer = 0, frozenTurns = 0; - private Font font; - private BattlePlayer player; - public string name, type = " ", description = " ", dietChar= " "; - public DIET diet; - private bool canAttackNow, inMotion, moveBack; - private Vector3 oriPosition; - private Vector3 newPosition; - private bool zoomed = false; + private Font font; + private BattlePlayer player; + public string name, type = " ", description = " ", dietChar = " "; + public DIET diet; + private bool canAttackNow, inMotion, moveBack; + private Vector3 oriPosition; + private Vector3 newPosition; + private bool zoomed = false; private bool clicked = false, removeAfterDelay; public bool frozen = false; - //VELOCITY - private Vector3 targetPosition, startPosition; - private float velocity, terminalVelocity, angle, distance; - private float delayTimer, DELAY_CONSTANT = 1.5f; - //Enum for Animal Type - public enum DIET - { - OMNIVORE, - CARNIVORE, - HERBIVORE, - WEATHER, - FOOD - } + private bool receivedmg = false; + //VELOCITY + private Vector3 targetPosition, startPosition; + private float velocity, terminalVelocity, angle, distance; + private float delayTimer, DELAY_CONSTANT = 2.5f; + //Enum for Animal Type + private ParticleSystem ground; + private ParticleSystem dead; + public enum DIET + { + OMNIVORE, + CARNIVORE, + HERBIVORE, + WEATHER, + FOOD + } //byPedro private AudioSource audioSource; - public AbstractCardHandler handler; + public AbstractCardHandler handler; private float raised = 50f; public bool isInHand = true; public bool isInPlay = false; - //Initialization for a card and sets it's position to (1000, 1000, 1000) - public void init(BattlePlayer player, int cardID, string diet, int level, int attack, int health, string species_name, string type, string description) + public Vector3 temp; + + //mouse hover + private bool _mouseOver = false; + + //shaking + private bool shake = true; + + //Summon effects + public bool effect = false; + public float z = 0.1f; + + //Die Effects + public bool deffect = false; + + + //Prey Predator Button + Button pbtn; + + //x button + Button xbtn; + + /*Founded Bugs + 1. (Sometimes) When Player A species W attacked Player B species X, + and Species X is dead(take time to disappear), + and Player A species Y attacked Player B species Z, there a chance that species Y attacked species W(already dead) instead of species Z + and turn out species Z didn't lose any hp and make both game client species status is different. + 2. (Sometimes) When Player clicked the a food card, then clicked hand card(cancel the food card action), + there is a chance that create a bug that player can no longer apply that food card to species on the field + to fix it, you have to click the field species to attack, then you may able to click that food card again + 3. (Always) The rule of the game is the game will set both player win when both player didn't win or lose in some turns (maybe 10?) + After those turns and player A playing turn, the game will be terminate and set Player A win even Player A didn't beat Player B + Player A will receive that victory screen and return to lobby + Player B will idle + to fix it, when Player A received that victory screen, he has to click end the turn to let Player B know Player A won, then Player B will receive the victory screen + */ + + //Initialization for a card and sets it's position to (1000, 1000, 1000) + public void init(BattlePlayer player, int cardID, string diet, int level, int attack, int health, string species_name, string type, string description) { this.player = player; this.cardID = cardID; @@ -53,11 +98,11 @@ public void init(BattlePlayer player, int cardID, string diet, int level, int at this.dietChar = diet; this.level = level; maxHP = hp = health; + type = this.type; naturalDmg = dmg = attack; //this.type = type; //hide temporarily - //this.description = description; //hide temporarily - - + this.description = description; //hide temporarily + Texture2D cardTexture; Texture2D speciesTexture; //o-omnivore, c-carnivore, h-herbivore, f-food, w-weather @@ -72,66 +117,135 @@ public void init(BattlePlayer player, int cardID, string diet, int level, int at if (this.name.Equals("Acacia")) { speciesTexture = (Texture2D)Resources.Load("Images/Battle/fire", typeof(Texture2D)); - this.name="Fire"; + this.name = "Fire"; } - else if(this.name.Equals("Big Tree")) + else if (this.name.Equals("Big Tree")) { speciesTexture = (Texture2D)Resources.Load("Images/Battle/freez", typeof(Texture2D)); - this.name="Freez"; + this.name = "Freez"; } else { speciesTexture = (Texture2D)Resources.Load("Images/Battle/rain", typeof(Texture2D)); - this.name="Rain"; + this.name = "Rain"; } - + } + //Changing cardfront texture + GetComponent().material.mainTexture = cardTexture; + transform.Find("CardArt").GetComponent().material.mainTexture = speciesTexture; - //Changing cardfront texture - GetComponent().material.mainTexture = cardTexture; - transform.Find ("CardArt").GetComponent ().material.mainTexture = speciesTexture; + Transform child = transform.Find("Canvas/Pop/SImage/Image"); + Image i = child.GetComponent(); + Sprite s = Sprite.Create(speciesTexture, new Rect(0, 0, speciesTexture.width, speciesTexture.height), Vector2.zero); + i.sprite = s; - //Changing card text -// Color gold = new Color (209f, 234f, 50f, 255f); - transform.Find ("NameText").GetComponent ().text = TextWrap (this.name, 16); - transform.Find ("TypeText").GetComponent ().text = this.type; - transform.Find ("TypeText").GetComponent ().material.color = Color.white; - transform.Find ("DescriptionText").GetComponent ().text = TextWrap (this.description, 26); - transform.Find ("DescriptionText").GetComponent ().material.color = Color.white; - transform.Find ("LevelText").GetComponent ().text = "" + this.level; - transform.Find ("LevelText").GetComponent ().material.color = Color.white; - transform.Find ("DoneText").GetComponent ().material.color = Color.red; - transform.Find ("DamageText").GetComponent ().text = ""; - transform.Find ("DamageText").GetComponent ().material.color = Color.red; + Texture2D TypeTexture; + if (diet == "o") + { + TypeTexture = (Texture2D)Resources.Load("Images/Battle/omnivore", typeof(Texture2D)); + } + else if (diet == "c") + { + TypeTexture = (Texture2D)Resources.Load("Images/Battle/carnivore", typeof(Texture2D)); + } + else if (diet == "h") + { + TypeTexture = (Texture2D)Resources.Load("Images/Battle/herbivore", typeof(Texture2D)); + } + else if (diet == "f") + { + TypeTexture = (Texture2D)Resources.Load("Images/Battle/plant", typeof(Texture2D)); + } + else + { + TypeTexture = (Texture2D)Resources.Load("Images/Battle/plant", typeof(Texture2D)); + } + + + Transform child1 = transform.Find("Canvas/Pop/SImageType"); + + Image j = child1.GetComponent(); + Sprite r = Sprite.Create(TypeTexture, new Rect(0, 0, TypeTexture.width, TypeTexture.height), Vector2.zero); + j.sprite = r; - //Initializes off screen - transform.position = new Vector3 (9999, 9999, 9999); - //rotate facedown if player 2 - if (!player.player1 && !Constants.SINGLE_PLAYER) { - transform.rotation = new Quaternion (180, 0, 0, 0); - } + //Changing card text + // Color gold = new Color (209f, 234f, 50f, 255f); + transform.Find("NameText").GetComponent().text = TextWrap(this.name, 16); + //transform.Find ("TypeText").GetComponent ().text = this.type; + //transform.Find ("TypeText").GetComponent ().material.color = Color.white; + //transform.Find ("DescriptionText").GetComponent ().text = TextWrap (this.description, 26); + //transform.Find ("DescriptionText").GetComponent ().material.color = Color.white; + transform.Find("LevelText").GetComponent().text = "" + this.level; + transform.Find("LevelText").GetComponent().material.color = Color.white; + transform.Find("DoneText").GetComponent().material.color = Color.red; + transform.Find("DamageText").GetComponent().text = ""; + transform.Find("DamageText").GetComponent().material.color = Color.red; + ground = transform.Find("Basic_aura/Ground_pulse").GetComponent(); + ground.Stop(); + //dead = transform.Find("Basic_pop/DeathPop").GetComponent(); + //dead.Stop(); + + + //Initializes off screen + transform.position = new Vector3(9999, 9999, 9999); + + //rotate facedown if player 2 + if (!player.player1 && !Constants.SINGLE_PLAYER) + { + transform.rotation = new Quaternion(180, 0, 0, 0); + } //by Pedro - audioSource = gameObject.AddComponent (); - } - - //Returns the enum for the animal's diet. Herbivore, Omnivore, Carnivore - DIET getDietType (string diet) - { - if (diet == "o") { - return DIET.OMNIVORE; - } else if (diet == "c") { - return DIET.CARNIVORE; - } else if (diet == "h") { - return DIET.HERBIVORE; - } else if (diet == "f") { - return DIET.FOOD; - } else - return DIET.WEATHER; - //else diet == 2 - } - + audioSource = gameObject.AddComponent(); + + //PreyPreadatorButton + int[] foodweb = { 86, 7, 83, 31, 19, 95, 96 }; + pbtn = transform.Find("Canvas/Pop/pbutton").GetComponent