diff --git a/Assets/Scripts/GamePlay/PlayerAnimationEnter.anim b/Assets/Animation/FadeIn.anim similarity index 53% rename from Assets/Scripts/GamePlay/PlayerAnimationEnter.anim rename to Assets/Animation/FadeIn.anim index 8858481..ddcfdbe 100644 Binary files a/Assets/Scripts/GamePlay/PlayerAnimationEnter.anim and b/Assets/Animation/FadeIn.anim differ diff --git a/Assets/Animation/FadeIn.anim.meta b/Assets/Animation/FadeIn.anim.meta new file mode 100644 index 0000000..29074e2 --- /dev/null +++ b/Assets/Animation/FadeIn.anim.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9e02c42cb851b4e17afddbe05a4df45b +timeCreated: 1502081157 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/FadeIn.controller b/Assets/Animation/FadeIn.controller new file mode 100644 index 0000000..a3008b9 Binary files /dev/null and b/Assets/Animation/FadeIn.controller differ diff --git a/Assets/Animation/FadeIn.controller.meta b/Assets/Animation/FadeIn.controller.meta new file mode 100644 index 0000000..dd41c0e --- /dev/null +++ b/Assets/Animation/FadeIn.controller.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 46957ffd8a26e4c2e8c68383d8d059ec +timeCreated: 1502081147 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/FadeInGameOver.anim b/Assets/Animation/FadeOut.anim similarity index 54% rename from Assets/Animation/FadeInGameOver.anim rename to Assets/Animation/FadeOut.anim index 5890198..6fcdf3c 100644 Binary files a/Assets/Animation/FadeInGameOver.anim and b/Assets/Animation/FadeOut.anim differ diff --git a/Assets/Animation/FadeInGameOver.anim.meta b/Assets/Animation/FadeOut.anim.meta similarity index 100% rename from Assets/Animation/FadeInGameOver.anim.meta rename to Assets/Animation/FadeOut.anim.meta diff --git a/Assets/Animation/Fade.controller b/Assets/Animation/FadeOut.controller similarity index 52% rename from Assets/Animation/Fade.controller rename to Assets/Animation/FadeOut.controller index 9be8a5c..78e3d06 100644 Binary files a/Assets/Animation/Fade.controller and b/Assets/Animation/FadeOut.controller differ diff --git a/Assets/Animation/Fade.controller.meta b/Assets/Animation/FadeOut.controller.meta similarity index 100% rename from Assets/Animation/Fade.controller.meta rename to Assets/Animation/FadeOut.controller.meta diff --git a/Assets/Animation/FastForwardPlayer.anim b/Assets/Animation/FastForwardPlayer.anim new file mode 100644 index 0000000..8f08d93 Binary files /dev/null and b/Assets/Animation/FastForwardPlayer.anim differ diff --git a/Assets/Animation/FastForwardPlayer.anim.meta b/Assets/Animation/FastForwardPlayer.anim.meta new file mode 100644 index 0000000..3c32786 --- /dev/null +++ b/Assets/Animation/FastForwardPlayer.anim.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 7d2c5cb09909e4bac90e987c5ccd2395 +timeCreated: 1503644872 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GamePlay/GameOverShake.anim b/Assets/Animation/GameOverShake.anim similarity index 100% rename from Assets/Scripts/GamePlay/GameOverShake.anim rename to Assets/Animation/GameOverShake.anim diff --git a/Assets/Scripts/GamePlay/GameOverShake.anim.meta b/Assets/Animation/GameOverShake.anim.meta similarity index 100% rename from Assets/Scripts/GamePlay/GameOverShake.anim.meta rename to Assets/Animation/GameOverShake.anim.meta diff --git a/Assets/Scripts/GamePlay/Main Camera.controller b/Assets/Animation/Main Camera.controller similarity index 100% rename from Assets/Scripts/GamePlay/Main Camera.controller rename to Assets/Animation/Main Camera.controller diff --git a/Assets/Scripts/GamePlay/Main Camera.controller.meta b/Assets/Animation/Main Camera.controller.meta similarity index 100% rename from Assets/Scripts/GamePlay/Main Camera.controller.meta rename to Assets/Animation/Main Camera.controller.meta diff --git a/Assets/Scripts/GamePlay/Player.controller b/Assets/Animation/Player.controller similarity index 57% rename from Assets/Scripts/GamePlay/Player.controller rename to Assets/Animation/Player.controller index 24243c6..ea7d5f6 100644 Binary files a/Assets/Scripts/GamePlay/Player.controller and b/Assets/Animation/Player.controller differ diff --git a/Assets/Scripts/GamePlay/Player.controller.meta b/Assets/Animation/Player.controller.meta similarity index 100% rename from Assets/Scripts/GamePlay/Player.controller.meta rename to Assets/Animation/Player.controller.meta diff --git a/Assets/Animation/PlayerAnimationEnter.anim b/Assets/Animation/PlayerAnimationEnter.anim new file mode 100644 index 0000000..aa16345 Binary files /dev/null and b/Assets/Animation/PlayerAnimationEnter.anim differ diff --git a/Assets/Scripts/GamePlay/PlayerAnimationEnter.anim.meta b/Assets/Animation/PlayerAnimationEnter.anim.meta similarity index 100% rename from Assets/Scripts/GamePlay/PlayerAnimationEnter.anim.meta rename to Assets/Animation/PlayerAnimationEnter.anim.meta diff --git a/Assets/Animation/ReplayButtonAnimationController.controller b/Assets/Animation/ReplayButtonAnimationController.controller index cf85510..5417e00 100644 Binary files a/Assets/Animation/ReplayButtonAnimationController.controller and b/Assets/Animation/ReplayButtonAnimationController.controller differ diff --git a/Assets/ButtonSoundController.cs b/Assets/ButtonSoundController.cs deleted file mode 100644 index c7274ee..0000000 --- a/Assets/ButtonSoundController.cs +++ /dev/null @@ -1,11 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class ButtonSoundController : MonoBehaviour { - - public void PlaySound() { - if (PlayerPrefs.GetInt ("Sound", 1) == 1) { - GetComponent ().Play (); - } - } -} diff --git a/Assets/Images/1.png b/Assets/Images/1.png new file mode 100644 index 0000000..439ea76 Binary files /dev/null and b/Assets/Images/1.png differ diff --git a/Assets/Images/play_button.png.meta b/Assets/Images/1.png.meta similarity index 95% rename from Assets/Images/play_button.png.meta rename to Assets/Images/1.png.meta index c8425d7..e261862 100644 --- a/Assets/Images/play_button.png.meta +++ b/Assets/Images/1.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 19215fdeffd284cfd91b3809455023f2 -timeCreated: 1484148157 +guid: d565d6a52772b458db7c53f83a960e19 +timeCreated: 1491295351 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/Images/2.png b/Assets/Images/2.png new file mode 100644 index 0000000..9b3fdbd Binary files /dev/null and b/Assets/Images/2.png differ diff --git a/Assets/Images/2.png.meta b/Assets/Images/2.png.meta new file mode 100644 index 0000000..61aced2 --- /dev/null +++ b/Assets/Images/2.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 99bab174a278a4f1cac59a982bd68310 +timeCreated: 1491295348 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/3.png b/Assets/Images/3.png new file mode 100644 index 0000000..31bdf02 Binary files /dev/null and b/Assets/Images/3.png differ diff --git a/Assets/Images/3.png.meta b/Assets/Images/3.png.meta new file mode 100644 index 0000000..e96408e --- /dev/null +++ b/Assets/Images/3.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: d260c494711d04fd69bc303074569246 +timeCreated: 1491295349 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/4.png b/Assets/Images/4.png new file mode 100644 index 0000000..74702bb Binary files /dev/null and b/Assets/Images/4.png differ diff --git a/Assets/Images/4.png.meta b/Assets/Images/4.png.meta new file mode 100644 index 0000000..3b5c12c --- /dev/null +++ b/Assets/Images/4.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 1f4770fade7fe4daaa06db052a7781d9 +timeCreated: 1491295335 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/5.png b/Assets/Images/5.png new file mode 100644 index 0000000..124a230 Binary files /dev/null and b/Assets/Images/5.png differ diff --git a/Assets/Images/5.png.meta b/Assets/Images/5.png.meta new file mode 100644 index 0000000..cae1ccf --- /dev/null +++ b/Assets/Images/5.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: dfa1e548f94fb4beeb2e33f67e27e9c6 +timeCreated: 1491295352 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/6.png b/Assets/Images/6.png new file mode 100644 index 0000000..a6a3b09 Binary files /dev/null and b/Assets/Images/6.png differ diff --git a/Assets/Images/6.png.meta b/Assets/Images/6.png.meta new file mode 100644 index 0000000..933bada --- /dev/null +++ b/Assets/Images/6.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 826b193735c4444dd92335d6ac8f24b5 +timeCreated: 1491295337 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Play screen background.png b/Assets/Images/Play screen background.png new file mode 100644 index 0000000..33f51a2 Binary files /dev/null and b/Assets/Images/Play screen background.png differ diff --git a/Assets/Images/Play screen background.png.meta b/Assets/Images/Play screen background.png.meta new file mode 100644 index 0000000..a5b1d85 --- /dev/null +++ b/Assets/Images/Play screen background.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 7c1478f24be4f4e5e93e77492f6aa8d6 +timeCreated: 1503211261 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/a2.png b/Assets/Images/a2.png new file mode 100644 index 0000000..d1bebf9 Binary files /dev/null and b/Assets/Images/a2.png differ diff --git a/Assets/Images/a2.png.meta b/Assets/Images/a2.png.meta new file mode 100644 index 0000000..39a1b4f --- /dev/null +++ b/Assets/Images/a2.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 93a5f8f7db5fc4fa098ee598859d9306 +timeCreated: 1503211450 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/a3.png b/Assets/Images/a3.png new file mode 100644 index 0000000..53b798c Binary files /dev/null and b/Assets/Images/a3.png differ diff --git a/Assets/Images/a3.png.meta b/Assets/Images/a3.png.meta new file mode 100644 index 0000000..127177d --- /dev/null +++ b/Assets/Images/a3.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 7afc33a337a274e22a5c55d0d92c7560 +timeCreated: 1503211035 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/back button.png b/Assets/Images/back button.png new file mode 100644 index 0000000..5208a45 Binary files /dev/null and b/Assets/Images/back button.png differ diff --git a/Assets/Images/back button.png.meta b/Assets/Images/back button.png.meta new file mode 100644 index 0000000..1c85954 --- /dev/null +++ b/Assets/Images/back button.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 591b353384a87457b8ff3db7d4dc4dda +timeCreated: 1503213299 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/back.png b/Assets/Images/back.png new file mode 100644 index 0000000..bf7cb2d Binary files /dev/null and b/Assets/Images/back.png differ diff --git a/Assets/Images/back.png.meta b/Assets/Images/back.png.meta new file mode 100644 index 0000000..653ca7f --- /dev/null +++ b/Assets/Images/back.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 47d3d97a8917c46a295ee84c38442821 +timeCreated: 1503220409 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/background.png b/Assets/Images/background.png new file mode 100644 index 0000000..b7caea5 Binary files /dev/null and b/Assets/Images/background.png differ diff --git a/Assets/Images/background.png.meta b/Assets/Images/background.png.meta new file mode 100644 index 0000000..8eaa7c4 --- /dev/null +++ b/Assets/Images/background.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 8dd64fedd4f4042bcb7987025af281d7 +timeCreated: 1491295346 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + 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: 16 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 48 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 48 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 48 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/blade.png b/Assets/Images/blade.png new file mode 100644 index 0000000..cb46f56 Binary files /dev/null and b/Assets/Images/blade.png differ diff --git a/Assets/Images/blade.png.meta b/Assets/Images/blade.png.meta new file mode 100644 index 0000000..c3961bf --- /dev/null +++ b/Assets/Images/blade.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: dbc995a18e18a42aeb01039ffecea5bc +timeCreated: 1503221547 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/c1.png b/Assets/Images/c1.png new file mode 100644 index 0000000..2d359ea Binary files /dev/null and b/Assets/Images/c1.png differ diff --git a/Assets/Images/c1.png.meta b/Assets/Images/c1.png.meta new file mode 100644 index 0000000..aeb41f4 --- /dev/null +++ b/Assets/Images/c1.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: c6d7edf23006d47038f5860cf17953d7 +timeCreated: 1502783688 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/c2.png b/Assets/Images/c2.png new file mode 100644 index 0000000..fe063c7 Binary files /dev/null and b/Assets/Images/c2.png differ diff --git a/Assets/Images/c2.png.meta b/Assets/Images/c2.png.meta new file mode 100644 index 0000000..e6b7855 --- /dev/null +++ b/Assets/Images/c2.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 36db2786b49f34607af74165abd892ea +timeCreated: 1502783684 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/drop.png b/Assets/Images/drop.png new file mode 100644 index 0000000..934f203 Binary files /dev/null and b/Assets/Images/drop.png differ diff --git a/Assets/Images/drop.png.meta b/Assets/Images/drop.png.meta new file mode 100644 index 0000000..d729e86 --- /dev/null +++ b/Assets/Images/drop.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: f7fd25629358e4f3c82fa90d60806c38 +timeCreated: 1500701626 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/fb logo.png b/Assets/Images/fb logo.png new file mode 100644 index 0000000..0565d52 Binary files /dev/null and b/Assets/Images/fb logo.png differ diff --git a/Assets/Images/fb logo.png.meta b/Assets/Images/fb logo.png.meta new file mode 100644 index 0000000..4cdd8eb --- /dev/null +++ b/Assets/Images/fb logo.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: b545776d6a83f498786963846ea8c8be +timeCreated: 1503213027 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/github logo.png b/Assets/Images/github logo.png new file mode 100644 index 0000000..9b843b9 Binary files /dev/null and b/Assets/Images/github logo.png differ diff --git a/Assets/Images/github logo.png.meta b/Assets/Images/github logo.png.meta new file mode 100644 index 0000000..6b2ff14 --- /dev/null +++ b/Assets/Images/github logo.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 47880ae7f57aa4c49a71b36ed86b85cc +timeCreated: 1503213026 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/google play logo.png b/Assets/Images/google play logo.png new file mode 100644 index 0000000..00f7087 Binary files /dev/null and b/Assets/Images/google play logo.png differ diff --git a/Assets/Images/google play logo.png.meta b/Assets/Images/google play logo.png.meta new file mode 100644 index 0000000..7b1b5ca --- /dev/null +++ b/Assets/Images/google play logo.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 192d544abc15b4200aee97fcaccdf30a +timeCreated: 1503213025 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/home 1.png b/Assets/Images/home 1.png new file mode 100644 index 0000000..ce3af68 Binary files /dev/null and b/Assets/Images/home 1.png differ diff --git a/Assets/Images/home 1.png.meta b/Assets/Images/home 1.png.meta new file mode 100644 index 0000000..df03922 --- /dev/null +++ b/Assets/Images/home 1.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: e0adf22a0949e4b5088f8c91ef0976df +timeCreated: 1503126762 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/info.png b/Assets/Images/info.png new file mode 100644 index 0000000..5f0f60c Binary files /dev/null and b/Assets/Images/info.png differ diff --git a/Assets/Images/info.png.meta b/Assets/Images/info.png.meta new file mode 100644 index 0000000..3d1ba2b --- /dev/null +++ b/Assets/Images/info.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: e03d70f7a956b4bc0a72be96e4ea95f0 +timeCreated: 1500787661 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/made with splash screen.png b/Assets/Images/made with splash screen.png new file mode 100644 index 0000000..356f67d Binary files /dev/null and b/Assets/Images/made with splash screen.png differ diff --git a/Assets/Images/made with splash screen.png.meta b/Assets/Images/made with splash screen.png.meta new file mode 100644 index 0000000..fee0c29 --- /dev/null +++ b/Assets/Images/made with splash screen.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 6adc37b57bf934704bb89ac7453c2665 +timeCreated: 1503223436 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/mdg logo.png b/Assets/Images/mdg logo.png new file mode 100644 index 0000000..9453ae8 Binary files /dev/null and b/Assets/Images/mdg logo.png differ diff --git a/Assets/Images/mdg logo.png.meta b/Assets/Images/mdg logo.png.meta new file mode 100644 index 0000000..26a28ee --- /dev/null +++ b/Assets/Images/mdg logo.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 4d44f5b376c5c4bfc811c5a069c6c86d +timeCreated: 1503218471 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/play button.png b/Assets/Images/play button.png new file mode 100644 index 0000000..12dae00 Binary files /dev/null and b/Assets/Images/play button.png differ diff --git a/Assets/Images/play button.png.meta b/Assets/Images/play button.png.meta new file mode 100644 index 0000000..151e7a6 --- /dev/null +++ b/Assets/Images/play button.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 980b06a7a61f24fb3babfc5ebc33ae81 +timeCreated: 1503211016 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/play_button.png b/Assets/Images/play_button.png deleted file mode 100644 index e1e1882..0000000 Binary files a/Assets/Images/play_button.png and /dev/null differ diff --git a/Assets/Images/powerup.png b/Assets/Images/powerup.png new file mode 100644 index 0000000..ffc49e4 Binary files /dev/null and b/Assets/Images/powerup.png differ diff --git a/Assets/Images/powerup.png.meta b/Assets/Images/powerup.png.meta new file mode 100644 index 0000000..066a241 --- /dev/null +++ b/Assets/Images/powerup.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 336a626c43d5f411ebd2c86ddd236d75 +timeCreated: 1503640562 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/powerupbutton.png b/Assets/Images/powerupbutton.png new file mode 100644 index 0000000..070ee77 Binary files /dev/null and b/Assets/Images/powerupbutton.png differ diff --git a/Assets/Images/powerupbutton.png.meta b/Assets/Images/powerupbutton.png.meta new file mode 100644 index 0000000..461d782 --- /dev/null +++ b/Assets/Images/powerupbutton.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 4529d50b6151f4b5098ac3f76726fe3f +timeCreated: 1503641957 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/replay.png b/Assets/Images/replay.png new file mode 100644 index 0000000..51aeaef Binary files /dev/null and b/Assets/Images/replay.png differ diff --git a/Assets/Images/replay.png.meta b/Assets/Images/replay.png.meta new file mode 100644 index 0000000..093538e --- /dev/null +++ b/Assets/Images/replay.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: a1aa73e4ebd774dc8b8802ccd7b8ea4b +timeCreated: 1503126760 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/rocket cir.png b/Assets/Images/rocket cir.png new file mode 100644 index 0000000..f9845ba Binary files /dev/null and b/Assets/Images/rocket cir.png differ diff --git a/Assets/Images/rocket cir.png.meta b/Assets/Images/rocket cir.png.meta new file mode 100644 index 0000000..aaa16c0 --- /dev/null +++ b/Assets/Images/rocket cir.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: bde34ba4ea934425b9a561ba2b081e2d +timeCreated: 1503211020 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/rocket splash screen.png b/Assets/Images/rocket splash screen.png new file mode 100644 index 0000000..1778a70 Binary files /dev/null and b/Assets/Images/rocket splash screen.png differ diff --git a/Assets/Images/rocket splash screen.png.meta b/Assets/Images/rocket splash screen.png.meta new file mode 100644 index 0000000..1fa664c --- /dev/null +++ b/Assets/Images/rocket splash screen.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 0b17ba8172cfe408f8326ef30021cd52 +timeCreated: 1503223435 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/scrore show glass pad.png b/Assets/Images/scrore show glass pad.png new file mode 100644 index 0000000..aad05ea Binary files /dev/null and b/Assets/Images/scrore show glass pad.png differ diff --git a/Assets/Images/scrore show glass pad.png.meta b/Assets/Images/scrore show glass pad.png.meta new file mode 100644 index 0000000..e094b06 --- /dev/null +++ b/Assets/Images/scrore show glass pad.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 5afbcb6a3a4d24ea7ae9ffd484d972ef +timeCreated: 1503127183 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/settings icon.png b/Assets/Images/settings icon.png new file mode 100644 index 0000000..bc9a2ce Binary files /dev/null and b/Assets/Images/settings icon.png differ diff --git a/Assets/Images/settings icon.png.meta b/Assets/Images/settings icon.png.meta new file mode 100644 index 0000000..e167a59 --- /dev/null +++ b/Assets/Images/settings icon.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: f10e21fee50c44d379b4c0f660f5e369 +timeCreated: 1503126763 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/sidebar.png b/Assets/Images/sidebar.png new file mode 100644 index 0000000..cede606 Binary files /dev/null and b/Assets/Images/sidebar.png differ diff --git a/Assets/Images/sidebar.png.meta b/Assets/Images/sidebar.png.meta new file mode 100644 index 0000000..505c908 --- /dev/null +++ b/Assets/Images/sidebar.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: e6819929ba88a406ebe1c49555abf6ae +timeCreated: 1500658739 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 1024 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 1024 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/splitter logo.png b/Assets/Images/splitter logo.png new file mode 100644 index 0000000..8b2294f Binary files /dev/null and b/Assets/Images/splitter logo.png differ diff --git a/Assets/Images/splitter logo.png.meta b/Assets/Images/splitter logo.png.meta new file mode 100644 index 0000000..64b7478 --- /dev/null +++ b/Assets/Images/splitter logo.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: fcc5384d8c6b94e1fb9e9efc2ff6d591 +timeCreated: 1503224285 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/tree.png b/Assets/Images/tree.png new file mode 100644 index 0000000..282f0be Binary files /dev/null and b/Assets/Images/tree.png differ diff --git a/Assets/Images/tree.png.meta b/Assets/Images/tree.png.meta new file mode 100644 index 0000000..63cddf7 --- /dev/null +++ b/Assets/Images/tree.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 031a7105b03574b8581c3bcba80456ea +timeCreated: 1500667776 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/tree_2.png b/Assets/Images/tree_2.png new file mode 100644 index 0000000..d43164f Binary files /dev/null and b/Assets/Images/tree_2.png differ diff --git a/Assets/Images/tree_2.png.meta b/Assets/Images/tree_2.png.meta new file mode 100644 index 0000000..7a954ba --- /dev/null +++ b/Assets/Images/tree_2.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 8339396e06175453c8493f54ae83b183 +timeCreated: 1500667978 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/KinectDemos/AvatarsDemo/KinectAvatarsDemo.unity b/Assets/KinectDemos/AvatarsDemo/KinectAvatarsDemo.unity new file mode 100644 index 0000000..80c9d25 Binary files /dev/null and b/Assets/KinectDemos/AvatarsDemo/KinectAvatarsDemo.unity differ diff --git a/Assets/KinectDemos/AvatarsDemo/KinectAvatarsDemo.unity.meta b/Assets/KinectDemos/AvatarsDemo/KinectAvatarsDemo.unity.meta new file mode 100644 index 0000000..1b380ed --- /dev/null +++ b/Assets/KinectDemos/AvatarsDemo/KinectAvatarsDemo.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ae851de45adb1a4fbcf68749943c4aa +timeCreated: 1490352594 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/blur.mat b/Assets/Materials/blur.mat new file mode 100644 index 0000000..43599bf Binary files /dev/null and b/Assets/Materials/blur.mat differ diff --git a/Assets/Materials/blur.mat.meta b/Assets/Materials/blur.mat.meta new file mode 100644 index 0000000..513cbe4 --- /dev/null +++ b/Assets/Materials/blur.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8e9c4d67a743f446bbf8ec82249629ea +timeCreated: 1503119938 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MusicController.cs b/Assets/MusicController.cs deleted file mode 100644 index 3409559..0000000 --- a/Assets/MusicController.cs +++ /dev/null @@ -1,14 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class MusicController : MonoBehaviour { - - public void OnValueChanged(bool newValue) { - if (newValue) { - PlayerPrefs.SetInt ("Music", 1); - } else { - PlayerPrefs.SetInt ("Music", 0); - } - } - -} diff --git a/Assets/MusicPlayer.cs b/Assets/MusicPlayer.cs deleted file mode 100644 index 9a0de98..0000000 --- a/Assets/MusicPlayer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class MusicPlayer : MonoBehaviour { - - //Whether it's a sound or a music - public bool isMusic = true; - public AudioClip clip; - public bool loop = true; - public float volume = 0.5f; - - private AudioSource source; - - // Use this for initialization - void Start () { - int value; - if (isMusic) { - value = PlayerPrefs.GetInt ("Music", 1); - } else { - value = PlayerPrefs.GetInt ("Sound", 1); - } - if (value == 1) { - source = GetComponent (); - source.loop = loop; - source.clip = clip; - source.volume = 0.5f; - source.Play (); - } - } - -} diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle new file mode 100644 index 0000000..e03dfd3 --- /dev/null +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -0,0 +1,54 @@ +// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:2.1.0' + } +} + +allprojects { + repositories { + flatDir { + dirs 'libs' + } + } +} + +apply plugin: 'com.android.application' + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +**DEPS**} + +android { + compileSdkVersion **APIVERSION** + buildToolsVersion '**BUILDTOOLS**' + + defaultConfig { + targetSdkVersion **TARGETSDKVERSION** + applicationId '**APPLICATIONID**' + } + + lintOptions { + abortOnError false + } +**SIGN** + buildTypes { + debug { + minifyEnabled **MINIFY_DEBUG** + useProguard **PROGUARD_DEBUG** + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-unity.txt'**USER_PROGUARD** + jniDebuggable true + } + release { + minifyEnabled **MINIFY_RELEASE** + useProguard **PROGUARD_RELEASE** + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-unity.txt'**USER_PROGUARD** + **SIGNCONFIG** + } + } + +} diff --git a/Assets/Plugins/Android/mainTemplate.gradle.meta b/Assets/Plugins/Android/mainTemplate.gradle.meta new file mode 100644 index 0000000..2ed2c07 --- /dev/null +++ b/Assets/Plugins/Android/mainTemplate.gradle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8171ba2f78d174fa6be779776c42b7ca +timeCreated: 1501933134 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/proguard-user.txt.DISABLED b/Assets/Plugins/Android/proguard-user.txt.DISABLED new file mode 100644 index 0000000..e69de29 diff --git a/Assets/Plugins/Android/proguard-user.txt.DISABLED.meta b/Assets/Plugins/Android/proguard-user.txt.DISABLED.meta new file mode 100644 index 0000000..b6263f8 --- /dev/null +++ b/Assets/Plugins/Android/proguard-user.txt.DISABLED.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e21847b52bf844463b8290b886223093 +timeCreated: 1501933138 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab b/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab index 0c67527..6d34f61 100644 Binary files a/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab and b/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab differ diff --git a/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab.meta b/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab.meta index beaeec9..2872d16 100644 --- a/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab.meta +++ b/Assets/Prefabs/ParticleSystems/BoxExplosion.prefab.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 guid: d2fee337966374923b6544396d1e186f -timeCreated: 1483282058 +timeCreated: 1503220064 licenseType: Free NativeFormatImporter: + mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/ParticleSystems/Explosion.prefab b/Assets/Prefabs/ParticleSystems/Explosion.prefab index abdbaad..0c496b4 100644 Binary files a/Assets/Prefabs/ParticleSystems/Explosion.prefab and b/Assets/Prefabs/ParticleSystems/Explosion.prefab differ diff --git a/Assets/Prefabs/Spikes/Blocks.prefab b/Assets/Prefabs/Spikes/Blocks.prefab index 10aca71..1ab0cce 100644 Binary files a/Assets/Prefabs/Spikes/Blocks.prefab and b/Assets/Prefabs/Spikes/Blocks.prefab differ diff --git a/Assets/Prefabs/Spikes/SpikeBoth.prefab b/Assets/Prefabs/Spikes/SpikeBoth.prefab index 635e5f7..d7c99e5 100644 Binary files a/Assets/Prefabs/Spikes/SpikeBoth.prefab and b/Assets/Prefabs/Spikes/SpikeBoth.prefab differ diff --git a/Assets/Prefabs/Spikes/SpikeBoth.prefab.meta b/Assets/Prefabs/Spikes/SpikeBoth.prefab.meta index 40870b7..3841e9d 100644 --- a/Assets/Prefabs/Spikes/SpikeBoth.prefab.meta +++ b/Assets/Prefabs/Spikes/SpikeBoth.prefab.meta @@ -1,8 +1,9 @@ -fileFormatVersion: 2 -guid: 568b9928b86528e4e8bee4a6a5a481fd -timeCreated: 1475668567 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 568b9928b86528e4e8bee4a6a5a481fd +timeCreated: 1503221232 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Spikes/SpikeCenter.prefab b/Assets/Prefabs/Spikes/SpikeCenter.prefab index 7561acd..28516a5 100644 Binary files a/Assets/Prefabs/Spikes/SpikeCenter.prefab and b/Assets/Prefabs/Spikes/SpikeCenter.prefab differ diff --git a/Assets/Prefabs/Spikes/SpikeCenterBig.prefab b/Assets/Prefabs/Spikes/SpikeCenterBig.prefab new file mode 100644 index 0000000..4cee5e6 Binary files /dev/null and b/Assets/Prefabs/Spikes/SpikeCenterBig.prefab differ diff --git a/Assets/Prefabs/Spikes/SpikeCenterBig.prefab.meta b/Assets/Prefabs/Spikes/SpikeCenterBig.prefab.meta new file mode 100644 index 0000000..5d0a5da --- /dev/null +++ b/Assets/Prefabs/Spikes/SpikeCenterBig.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fe70e463ffbe4e1a939e98054ad4a61 +timeCreated: 1475371742 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Spikes/SpikeLeft.prefab b/Assets/Prefabs/Spikes/SpikeLeft.prefab index 9bfe074..45e3fc7 100644 Binary files a/Assets/Prefabs/Spikes/SpikeLeft.prefab and b/Assets/Prefabs/Spikes/SpikeLeft.prefab differ diff --git a/Assets/Prefabs/Spikes/SpikeLeft.prefab.meta b/Assets/Prefabs/Spikes/SpikeLeft.prefab.meta index d0d996b..6ceb2ae 100644 --- a/Assets/Prefabs/Spikes/SpikeLeft.prefab.meta +++ b/Assets/Prefabs/Spikes/SpikeLeft.prefab.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: a22d980eca3d66e40a2d430b8342e7b4 -timeCreated: 1475281173 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: a22d980eca3d66e40a2d430b8342e7b4 +timeCreated: 1491402699 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Spikes/SpikeRight.prefab b/Assets/Prefabs/Spikes/SpikeRight.prefab index 96a430f..7bebe8f 100644 Binary files a/Assets/Prefabs/Spikes/SpikeRight.prefab and b/Assets/Prefabs/Spikes/SpikeRight.prefab differ diff --git a/Assets/Prefabs/Spikes/SpikeRight.prefab.meta b/Assets/Prefabs/Spikes/SpikeRight.prefab.meta index af4a65e..22662ff 100644 --- a/Assets/Prefabs/Spikes/SpikeRight.prefab.meta +++ b/Assets/Prefabs/Spikes/SpikeRight.prefab.meta @@ -1,8 +1,9 @@ -fileFormatVersion: 2 -guid: a6357532f32567942aea4959de134ba4 -timeCreated: 1475668163 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: a6357532f32567942aea4959de134ba4 +timeCreated: 1503221198 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raw/Fonts/neuropol x rg.ttf b/Assets/Raw/Fonts/neuropol x rg.ttf new file mode 100755 index 0000000..ddefb40 Binary files /dev/null and b/Assets/Raw/Fonts/neuropol x rg.ttf differ diff --git a/Assets/Raw/Fonts/neuropol x rg.ttf.meta b/Assets/Raw/Fonts/neuropol x rg.ttf.meta new file mode 100644 index 0000000..b728f14 --- /dev/null +++ b/Assets/Raw/Fonts/neuropol x rg.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 35930ea64f811430b85224dc2b68865c +timeCreated: 1502790973 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Neuropol X + fontNames: + - Neuropol X + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raw/Materials/SmallBox.mat b/Assets/Raw/Materials/SmallBox.mat index 29c93aa..55bc02e 100644 Binary files a/Assets/Raw/Materials/SmallBox.mat and b/Assets/Raw/Materials/SmallBox.mat differ diff --git a/Assets/Raw/Materials/SpriteDiffuse.mat b/Assets/Raw/Materials/SpriteDiffuse.mat index 2bcb888..9aa019b 100644 Binary files a/Assets/Raw/Materials/SpriteDiffuse.mat and b/Assets/Raw/Materials/SpriteDiffuse.mat differ diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity deleted file mode 100644 index 9fd7807..0000000 Binary files a/Assets/Scenes/MainScene.unity and /dev/null differ diff --git a/Assets/Scenes/PlayScene.unity b/Assets/Scenes/PlayScene.unity deleted file mode 100644 index 5ab4a56..0000000 Binary files a/Assets/Scenes/PlayScene.unity and /dev/null differ diff --git a/Assets/Scenes/main_menu.unity b/Assets/Scenes/main_menu.unity new file mode 100644 index 0000000..03d2566 Binary files /dev/null and b/Assets/Scenes/main_menu.unity differ diff --git a/Assets/Scenes/PlayScene.unity.meta b/Assets/Scenes/main_menu.unity.meta similarity index 100% rename from Assets/Scenes/PlayScene.unity.meta rename to Assets/Scenes/main_menu.unity.meta diff --git a/Assets/Scenes/scene.unity b/Assets/Scenes/scene.unity new file mode 100644 index 0000000..7afb622 Binary files /dev/null and b/Assets/Scenes/scene.unity differ diff --git a/Assets/Scenes/MainScene.unity.meta b/Assets/Scenes/scene.unity.meta similarity index 100% rename from Assets/Scenes/MainScene.unity.meta rename to Assets/Scenes/scene.unity.meta diff --git a/Assets/Scenes/scene/LightingData.asset b/Assets/Scenes/scene/LightingData.asset new file mode 100644 index 0000000..c014d05 Binary files /dev/null and b/Assets/Scenes/scene/LightingData.asset differ diff --git a/Assets/Scenes/scene/LightingData.asset.meta b/Assets/Scenes/scene/LightingData.asset.meta new file mode 100644 index 0000000..194923b --- /dev/null +++ b/Assets/Scenes/scene/LightingData.asset.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 385133ccc38494a6eb3b85feb585ddff +timeCreated: 1503223777 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 25800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/scene/ReflectionProbe-0.exr b/Assets/Scenes/scene/ReflectionProbe-0.exr new file mode 100644 index 0000000..98ea66c Binary files /dev/null and b/Assets/Scenes/scene/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/scene/ReflectionProbe-0.exr.meta b/Assets/Scenes/scene/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..bdd7b04 --- /dev/null +++ b/Assets/Scenes/scene/ReflectionProbe-0.exr.meta @@ -0,0 +1,75 @@ +fileFormatVersion: 2 +guid: dd1f654d9d8e8412f9339b0bf4bbc95e +timeCreated: 1503223777 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 8900000: generatedCubemap + 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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + 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: 2 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/splash.unity b/Assets/Scenes/splash.unity new file mode 100644 index 0000000..bc746d3 Binary files /dev/null and b/Assets/Scenes/splash.unity differ diff --git a/Assets/Scenes/splash.unity.meta b/Assets/Scenes/splash.unity.meta new file mode 100644 index 0000000..53a3f36 --- /dev/null +++ b/Assets/Scenes/splash.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dfd83f5165c9f4a72b9be7b0f7d137f2 +timeCreated: 1503223033 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/splash/LightingData.asset b/Assets/Scenes/splash/LightingData.asset new file mode 100644 index 0000000..e6f8d66 Binary files /dev/null and b/Assets/Scenes/splash/LightingData.asset differ diff --git a/Assets/Scenes/splash/LightingData.asset.meta b/Assets/Scenes/splash/LightingData.asset.meta new file mode 100644 index 0000000..e748d76 --- /dev/null +++ b/Assets/Scenes/splash/LightingData.asset.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e45919cf83c2f413e8e4b7a67317881f +timeCreated: 1503226016 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 25800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/splash/ReflectionProbe-0.exr b/Assets/Scenes/splash/ReflectionProbe-0.exr new file mode 100644 index 0000000..98ea66c Binary files /dev/null and b/Assets/Scenes/splash/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/splash/ReflectionProbe-0.exr.meta b/Assets/Scenes/splash/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..18dae1b --- /dev/null +++ b/Assets/Scenes/splash/ReflectionProbe-0.exr.meta @@ -0,0 +1,75 @@ +fileFormatVersion: 2 +guid: 2b670b2f0f0e244a280ecb4183261b9a +timeCreated: 1503226016 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 8900000: generatedCubemap + 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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + 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: 2 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/BlockController.cs b/Assets/Scripts/BlockController.cs index 1f9b5a0..7fb7e5f 100644 --- a/Assets/Scripts/BlockController.cs +++ b/Assets/Scripts/BlockController.cs @@ -18,10 +18,14 @@ void Start () { } void OnEnable() { - theta = Random.Range (0, 3.14f); + if (Random.Range (0, 1.0f) < 0.2f) { + theta = 0.5f; + } + else { + theta = 4.5f; + } } - // Update is called once per frame void FixedUpdate () { theta += Time.deltaTime * 0.7f; leftTransform.position = new Vector3 (meanX - radius * Mathf.Cos(theta), leftTransform.position.y, 0); diff --git a/Assets/Scripts/ButtonController.cs b/Assets/Scripts/ButtonController.cs deleted file mode 100644 index 288bed6..0000000 --- a/Assets/Scripts/ButtonController.cs +++ /dev/null @@ -1,20 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.SceneManagement; - -public class ButtonController : MonoBehaviour { - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - - } - - public void OnClickPlay() { - SceneManager.LoadScene ("MainScene"); - } -} diff --git a/Assets/Scripts/FallingSpeedController.cs b/Assets/Scripts/FallingSpeedController.cs new file mode 100644 index 0000000..8a9d2bf --- /dev/null +++ b/Assets/Scripts/FallingSpeedController.cs @@ -0,0 +1,38 @@ +using UnityEngine; +using System.Collections; + +public class FallingSpeedController : MonoBehaviour { + + public float multiplier = 1; + + private float Speed = 6.5f; + private bool isMoving = true; + private Vector3 tempPosition = new Vector3(0, 0); + private Rigidbody2D rigidBody; + + void Start() { + rigidBody = GetComponent (); + } + + void Update() { + if (isMoving) { + Speed = SpeedController.Speed * multiplier; + tempPosition.y = - Speed * Time.deltaTime; + transform.position = transform.position + tempPosition; + } + } + + void OnEnable() { + Events.GameOverEvent += Stop; + } + + //stop the spikes + public void Stop(){ + isMoving = false; + } + + void OnDisable() { + Events.GameOverEvent -= Stop; + } + +} diff --git a/Assets/MusicController.cs.meta b/Assets/Scripts/FallingSpeedController.cs.meta similarity index 76% rename from Assets/MusicController.cs.meta rename to Assets/Scripts/FallingSpeedController.cs.meta index a37144f..e1e7572 100644 --- a/Assets/MusicController.cs.meta +++ b/Assets/Scripts/FallingSpeedController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: bd787d23c78354d5585de8cd96d77c9b -timeCreated: 1484490933 +guid: f1a71b1d166ec49ac9e64b31d175913a +timeCreated: 1501162919 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs deleted file mode 100644 index 25f638b..0000000 --- a/Assets/Scripts/GameManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UnityEngine; -//using System.Collections; - -public class GameManager : MonoBehaviour { - - void Start () { - } - - -} diff --git a/Assets/Scripts/GameManager.cs.meta b/Assets/Scripts/GameManager.cs.meta deleted file mode 100644 index c5b332a..0000000 --- a/Assets/Scripts/GameManager.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 416b1ddaa0a70f644ae5910f321df747 -timeCreated: 1475242324 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/GamePlay/DestroySpikes.cs b/Assets/Scripts/GamePlay/DestroySpikes.cs index 7c5dc48..5c16df5 100644 --- a/Assets/Scripts/GamePlay/DestroySpikes.cs +++ b/Assets/Scripts/GamePlay/DestroySpikes.cs @@ -1,14 +1,16 @@ -using UnityEngine; - -public class DestroySpikes : MonoBehaviour { - - void OnTriggerExit2D(Collider2D other){ - - if(other.tag.Equals("SpikeBoth")){ - other.gameObject.transform.parent.gameObject.SetActive(false); - }else{ - other.gameObject.SetActive(false); - } - - } -} +using UnityEngine; + +public class DestroySpikes : MonoBehaviour { + + void OnTriggerExit2D(Collider2D other){ + + if (string.Compare(other.gameObject.name, "Left") != 0 && string.Compare(other.gameObject.name, "Right") != 0) { + if(other.tag.Equals("SpikeBoth")){ + other.gameObject.transform.parent.gameObject.SetActive(false); + }else{ + other.gameObject.SetActive(false); + } + } + + } +} diff --git a/Assets/Scripts/GamePlay/GamePlayManager.cs b/Assets/Scripts/GamePlay/GamePlayManager.cs index 752560c..60bc919 100644 --- a/Assets/Scripts/GamePlay/GamePlayManager.cs +++ b/Assets/Scripts/GamePlay/GamePlayManager.cs @@ -1,21 +1,60 @@ using UnityEngine; +using UnityEngine.UI; public class GamePlayManager : MonoBehaviour { public int Score{get {return (int)score;}} - private float score = 0; + public PlayerController playerControler; + public Text scoreText;//score text ui while gameplay + public Text highscoreText; + public GameObject gameOverDialog; + public Text gameOverScore; public bool gameStart = true; public bool gameOver = false; public Animator cameraShake; + public AudioClip background; + public AudioSource source; + public AudioClip splash; + public Text coinsText; + public GameObject PowerUp; + public ObstacleGenerator generator; + public ParticleSystem ffparticle;//particle system for fastforward + + private float score = 0; + private int coins; void Start () { + if (PlayerPrefs.GetInt ("Music", 1) == 1) { + source.loop = true; + source.clip = background; + source.Play (); + } + if (PlayerPrefs.GetInt ("Sound", 1) == 1) { + source.PlayOneShot (splash, 0.5f); + } Events.GameOverEvent += GameOver; + coins = PlayerPrefs.GetInt ("coins", 0); + coinsText.text = coins.ToString (); + if (coins < 10 && PlayerPrefs.GetInt("highscore", 0) >= 40) { + PowerUp.SetActive (false); + } } private void GameOver(){ gameOver = true; cameraShake.SetTrigger ("GameOver"); + scoreText.gameObject.SetActive (false); + if (score > PlayerPrefs.GetInt ("highscore")) { + PlayerPrefs.SetInt ("highscore", (int)score); + } + highscoreText.text = PlayerPrefs.GetInt ("highscore") + ""; + + gameOverDialog.SetActive (true); + gameOverScore.text = score + ""; + coins += (int)(score / 3); + PlayerPrefs.SetInt ("coins", coins); + coinsText.text = coins.ToString(); } void OnDisable(){ @@ -23,14 +62,48 @@ void OnDisable(){ } void OnTriggerExit2D(Collider2D other){ - if(other.tag.Equals("SpikeBoth")) { - score += 0.5f; - } else { - score++; + if (other.tag.Equals ("SpikeBoth")) { + IncreaseScore (0.5f); + } else if (other.tag.Equals ("SpikeLeft") || other.tag.Equals ("SpikeRight") || other.tag.Equals("SpikeCenter")) { + IncreaseScore (1); } - if (score > PlayerPrefs.GetInt ("highscore")) { - PlayerPrefs.SetInt ("highscore", (int)score); + //if score is an int show it + if ((int)score == score) { + scoreText.text = score.ToString(); + } + } + + void IncreaseScore(float step) { + score += step; + SpeedController.IncreaseSpeed (step); + } + + public void OnClickPowerUp() { + if (UseCoins ()) { + IncreaseScore (10); + scoreText.text = score.ToString (); + generator.ResetTimer (); + ffparticle.Play(); + playerControler.PlayFastForwardAnim (); } } + private bool UseCoins() { + if (coins >= 10) { + coins -= 10; + coinsText.text = coins.ToString (); + if (score + 10 > PlayerPrefs.GetInt ("highscore", 0) - 40 || + (coins < 10)) { + PowerUp.SetActive (false); + } + return true; + } + return false; + } + + public void DisablePowerUp() { + PowerUp.SetActive (false); + ffparticle.Stop (); + } + } diff --git a/Assets/Scripts/Player/InputManager.cs b/Assets/Scripts/GamePlay/InputManager.cs similarity index 87% rename from Assets/Scripts/Player/InputManager.cs rename to Assets/Scripts/GamePlay/InputManager.cs index db7975c..ff738c1 100644 --- a/Assets/Scripts/Player/InputManager.cs +++ b/Assets/Scripts/GamePlay/InputManager.cs @@ -29,9 +29,13 @@ void FixedUpdate () { for(int i=0;i< Input.touchCount && i<2;i++){ touchX[i] = Input.GetTouch(i).position.x; } + //close the application when back button is pressed in android + if (Input.GetKeyDown (KeyCode.Escape)) { + Application.Quit (); + } - //MapInput(); - MapKeyBoardInput(); + MapInput(); +// MapKeyBoardInput(); } private void MapInput(){ diff --git a/Assets/Scripts/Player/InputManager.cs.meta b/Assets/Scripts/GamePlay/InputManager.cs.meta similarity index 100% rename from Assets/Scripts/Player/InputManager.cs.meta rename to Assets/Scripts/GamePlay/InputManager.cs.meta diff --git a/Assets/Scripts/GamePlay/ObstacleGenerator.cs b/Assets/Scripts/GamePlay/ObstacleGenerator.cs index 2d8c86e..60cd858 100644 --- a/Assets/Scripts/GamePlay/ObstacleGenerator.cs +++ b/Assets/Scripts/GamePlay/ObstacleGenerator.cs @@ -10,38 +10,59 @@ public class Obstacles{ public GameObject spikeRight; public GameObject spikeBoth; public GameObject spikeCenter; + public GameObject spikeCenterBig; public GameObject blocks; } private enum State { - tutorial, playing + pause, start }; private State state; - private int isTutShown;//This stores whether tutorial has been shown once or not + public GamePlayManager manager; public Obstacles obstacles; private Dictionary objectPoolers; private int spikeId = 0; private bool isGameOver = false; private bool tutorialEnded = false; + + private bool isTimerRunning = false; + private float timer = 0; /* * This condition is applied so that the moving obstacles appear * after certain score, not initially */ - private int maxObstacleId = 5; - //Counts the no. of spikes generated from start - private int spikesGenerated = 0; + private int maxObstacleId = 6; //This is the no. of spikes after which the moving obstacles start appearing - public int threshold = 40; + public int threshold = 0; void Start () { Events.GameOverEvent += GameOver; - isTutShown = PlayerPrefs.GetInt ("tutorial", 1); - if (isTutShown == 0) { - state = State.playing; + + if (PlayerPrefs.GetInt ("Tutorial", 1) == 0) { + state = State.start; + isTimerRunning = true; } else { - state = State.tutorial; + state = State.pause; + } + } + + void Update() { + if(isTimerRunning) { + timer += Time.deltaTime; + if (timer > 2.0f) { + isTimerRunning = false; + StartCoroutine (GenerateObstacle ()); + timer = 0; + manager.DisablePowerUp (); + } + } + } + + public void ResetTimer() { + if (isTimerRunning) { + timer = 0; } } @@ -49,15 +70,9 @@ void OnDisable (){ Events.GameOverEvent -= GameOver; } - void Update () { - if (state == State.tutorial) { - if (!TutorialController.isTutorialRunning ()) { - state = State.playing; - } - } else if (state == State.playing && !tutorialEnded) { - StartCoroutine (GenerateObstacle ()); - tutorialEnded = true; - } + //Called by tutorial controller when tutorial is over + public void StartObstacleGeneration() { + StartCoroutine (GenerateObstacle ()); } private IEnumerator GenerateObstacle (){ @@ -69,8 +84,8 @@ private IEnumerator GenerateObstacle (){ SpecialQueue queue = new SpecialQueue (); spikeId = GetspikeId (queue); - yield return new WaitForSeconds (1.8f); - spikesGenerated = 1; + //Initial wait before the objects start falling + //yield return new WaitForSeconds (1.8f); float waitTime = 1.8f / SpeedController.Speed * 6.5f; @@ -80,18 +95,22 @@ private IEnumerator GenerateObstacle (){ //Generate the next spike id and decide its generation rate. spikeId = GetspikeId (queue); - if (queue.IsCenterSpike ()) + if (queue.IsCenterSpike ()) { + waitTime = 1.4f / SpeedController.Speed * 6.5f; + } else if (queue.IsBigCenterSpike ()) { + waitTime = 1.6f / SpeedController.Speed * 6.5f; + } else if(queue.WasBigCenterSpike()) { waitTime = 1.3f / SpeedController.Speed * 6.5f; - else + } else { waitTime = 1.1f / SpeedController.Speed * 6.5f; + } yield return new WaitForSeconds (waitTime); - spikesGenerated++; //This increases the maxObstacleId to allow moving obstacles to fall - if (spikesGenerated > threshold) { - if (maxObstacleId == 5) { - maxObstacleId = 6; + if (manager.Score > threshold) { + if (maxObstacleId == 6) { + maxObstacleId = 7; } } } @@ -103,7 +122,8 @@ private void InitObjectPools(){ objectPoolers[2] = new ObjectPooler(obstacles.spikeRight, 3); objectPoolers[3] = new ObjectPooler(obstacles.spikeBoth, 3); objectPoolers[4] = new ObjectPooler(obstacles.spikeCenter, 2); - objectPoolers[5] = new ObjectPooler (obstacles.blocks, 3); + objectPoolers [5] = new ObjectPooler (obstacles.spikeCenterBig, 2); + objectPoolers[6] = new ObjectPooler (obstacles.blocks, 3); } // Generates the new spike id that is to be instatiated. @@ -161,12 +181,25 @@ public bool IsAlert(int num){ if(array[0] == 4 && num == 4){ return true; } - return (array[0]== array[1] && array[0] == num); + return (array[0] == array[1] && array[0] == num); } - // returns true if next spike coming is 4th one after 1st or 2nd one. + // If the coming spike is the center one public bool IsCenterSpike(){ - return (array[0]==4 && array[1] <3); + return (array[0] == 4); + } + + public bool IsBigCenterSpike() { + return (array [0] == 5); + } + + public bool WasBigCenterSpike() { + return (array [1] == 5); + } + + // If the last spike was the center one + public bool WasCenterSpike() { + return (array [1] == 4 || array[1] == 5); } } } diff --git a/Assets/Scripts/GamePlay/SpikeController.cs b/Assets/Scripts/GamePlay/SpikeController.cs deleted file mode 100644 index d338070..0000000 --- a/Assets/Scripts/GamePlay/SpikeController.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UnityEngine; - -public class SpikeController : MonoBehaviour { - - void OnTriggerEnter2D(Collider2D other){ - if (other.gameObject.tag == "PlayerLeft") { - other.gameObject.transform.parent.SendMessage ("Dead", -1); - } else if (other.gameObject.tag == "PlayerRight") { - other.gameObject.transform.parent.SendMessage ("Dead", 1); - } - } - -} diff --git a/Assets/Scripts/GamePlay/SpikeController.cs.meta b/Assets/Scripts/GamePlay/SpikeController.cs.meta deleted file mode 100644 index 5cb179f..0000000 --- a/Assets/Scripts/GamePlay/SpikeController.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 9ae870c405b3bd64ea7efb816c4007ad -timeCreated: 1475319804 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/HighScoreController.cs b/Assets/Scripts/HighScoreController.cs deleted file mode 100644 index 5128be1..0000000 --- a/Assets/Scripts/HighScoreController.cs +++ /dev/null @@ -1,18 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; - -public class HighScoreController : MonoBehaviour { - - Text highscore; - - // Use this for initialization - void Start () { - highscore = GetComponent (); - } - - // Update is called once per frame - void Update () { - highscore.text = PlayerPrefs.GetInt ("highscore").ToString(); - } -} diff --git a/Assets/Scripts/HighScoreController.cs.meta b/Assets/Scripts/HighScoreController.cs.meta deleted file mode 100644 index 18dabcd..0000000 --- a/Assets/Scripts/HighScoreController.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: ba6e55ffd56a5414e85f724c05449b99 -timeCreated: 1483618383 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/LoadScene.cs b/Assets/Scripts/LoadScene.cs index 6d76b1b..d476518 100644 --- a/Assets/Scripts/LoadScene.cs +++ b/Assets/Scripts/LoadScene.cs @@ -4,9 +4,15 @@ public class LoadScene : StateMachineBehaviour { + public bool isHome = false; + // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { - SceneManager.LoadScene (1); + if (isHome) { + SceneManager.LoadScene (1); + } else { + SceneManager.LoadScene (2); + } } // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks diff --git a/Assets/Scripts/Player/PlayerScript.cs b/Assets/Scripts/Player/HalfRocketController.cs similarity index 68% rename from Assets/Scripts/Player/PlayerScript.cs rename to Assets/Scripts/Player/HalfRocketController.cs index 34440bc..d6aee7b 100644 --- a/Assets/Scripts/Player/PlayerScript.cs +++ b/Assets/Scripts/Player/HalfRocketController.cs @@ -1,10 +1,12 @@ using UnityEngine; -public class PlayerScript : MonoBehaviour { +public class HalfRocketController : MonoBehaviour { + public PlayerController playerController; public ParticleSystem sparksTop; public ParticleSystem sparksBottom; public AudioClip sawClip; + public SpriteRenderer spriteRenderer; private bool isPlaying = false; private AudioSource source; @@ -19,6 +21,15 @@ void OnDisable() { Events.GameOverEvent -= OnGameOver; } + void OnTriggerEnter2D(Collider2D col) { + if (string.Compare (col.gameObject.tag, "SpikeBoth") == 0 || + string.Compare (col.gameObject.tag, "SpikeLeft") == 0 || + string.Compare (col.gameObject.tag, "SpikeRight") == 0 || + string.Compare (col.gameObject.tag, "SpikeCenter") == 0) { + playerController.Dead (); + } + } + void OnCollisionEnter2D(Collision2D other) { if(other.transform.tag.Equals("Wall")){ sparksTop.Play(); diff --git a/Assets/MusicPlayer.cs.meta b/Assets/Scripts/Player/HalfRocketController.cs.meta similarity index 76% rename from Assets/MusicPlayer.cs.meta rename to Assets/Scripts/Player/HalfRocketController.cs.meta index 45854e5..8f97bca 100644 --- a/Assets/MusicPlayer.cs.meta +++ b/Assets/Scripts/Player/HalfRocketController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 3684632b377da4f289ec12390243558a -timeCreated: 1484499500 +guid: dc3196f197fa142659dbcacef3892aae +timeCreated: 1503643023 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 5291e13..faba6c3 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -8,27 +8,36 @@ public class PlayerController : MonoBehaviour{ public GameObject explosionPrefab; public AudioClip explosionClip; + public AudioClip swoosh; - private float Speed = 0; - private float Speed1 = 0; + private Animator animator; + //x component of speed of left part of rocket + private float SpeedXL = 0; + private float SpeedXR = 0; private Pair playerTransform; private Transform connector; private Pair scale; + private bool isGameOver = false; + private Vector2 leftUp = new Vector2 (), rightUp = new Vector2 ();//indicates the direction in which the two parts point + private Vector3 posLeft = new Vector3(), posRight = new Vector3();//temp pos of rocket left and right + private Pair prevX; private Pair currentX; private Pair targetX; private float timeToMove; private AudioSource source; void Start(){ - playerTransform = new Pair(transform.GetChild(0), transform.GetChild(1)); - connector = transform.GetChild(2); - scale = new Pair(0,1); - targetX = new Pair (0, 0); - currentX = new Pair (0, 0); + playerTransform = new Pair(transform.GetChild(0), transform.GetChild(1)); + connector = transform.GetChild(2); + scale = new Pair(0,1); + prevX = new Pair (-0.6f, 0.6f); + targetX = new Pair (-0.6f, 0.6f); + currentX = new Pair (-0.6f, 0.6f); timeToMove = 0.1f * SpeedController.Speed / 6.5f; source = GetComponent (); + animator = GetComponent (); } public void Move(InputManager.InputType input){ @@ -36,73 +45,97 @@ public void Move(InputManager.InputType input){ switch(input){ case InputManager.InputType.Left: - targetX.Left = -3.2f; - targetX.Right = -2.18f; + targetX.Left = -4.1f; + targetX.Right = -2.9f; break; case InputManager.InputType.Right: - targetX.Left = 2.18f; - targetX.Right = 3.2f; + targetX.Left = 2.9f; + targetX.Right = 4.1f; break; case InputManager.InputType.Both: - targetX.Left = -3.2f; - targetX.Right = 3.2f; + targetX.Left = -4.1f; + targetX.Right = 4.1f; break; case InputManager.InputType.None: - targetX.Left = -0.48f; - targetX.Right = 0.48f; + targetX.Left = -0.6f; + targetX.Right = 0.6f; break; } AdjustConnector(); - currentX.Left = Mathf.SmoothDamp (currentX.Left, targetX.Left, ref Speed, timeToMove); - currentX.Right = Mathf.SmoothDamp (currentX.Right, targetX.Right, ref Speed1, timeToMove); + currentX.Left = Mathf.SmoothDamp (currentX.Left, targetX.Left, ref SpeedXL, timeToMove); + currentX.Right = Mathf.SmoothDamp (currentX.Right, targetX.Right, ref SpeedXR, timeToMove); } void FixedUpdate() { - - if (playerTransform.Left != null) { - playerTransform.Left.position = new Vector3 (currentX.Left, playerTransform.Left.position.y); - } - if (playerTransform.Right != null) { - playerTransform.Right.position = new Vector3 (currentX.Right, playerTransform.Right.position.y); + if (!isGameOver) { + leftUp.x = currentX.Left - prevX.Left; + leftUp.y = 5; + + rightUp.x = currentX.Right - prevX.Right; + rightUp.y = 5; + + playerTransform.Left.up = leftUp; + playerTransform.Right.up = rightUp; + + if (playerTransform.Left != null) { + posLeft.x = currentX.Left; + posLeft.y = playerTransform.Left.position.y; + playerTransform.Left.position = posLeft; + } + if (playerTransform.Right != null) { + posRight.x = currentX.Right; + posRight.y = playerTransform.Right.position.y; + playerTransform.Right.position = posRight; + } + + prevX.Left = currentX.Left; + prevX.Right = currentX.Right; } - } private void AdjustConnector(){ float distance = playerTransform.Right.position.x - playerTransform.Left.position.x; - scale.Left = 1.13f * (distance - 0.9f); + scale.Left = 1.1f * (distance - 1.1f); scale.Right = 1f - (0.081f * distance); connector.localScale = new Vector2(scale.Left, scale.Right); connector.position = new Vector2((playerTransform.Right.position.x + playerTransform.Left.position.x)/2, playerTransform.Left.position.y); } - public void Dead(int index){ - Events.CallGameOver(); - Destroy(playerTransform.Left.gameObject); - Destroy (playerTransform.Right.gameObject); - Instantiate(explosionPrefab, playerTransform.Left.position, Quaternion.identity); - - if (PlayerPrefs.GetInt ("Sound", 1) == 1) { - source.PlayOneShot (explosionClip, 1f); + public void Dead(){ + if (!isGameOver) { + Events.CallGameOver (); + Destroy (playerTransform.Left.gameObject); + isGameOver = true; + Destroy (playerTransform.Right.gameObject); + Instantiate (explosionPrefab, playerTransform.Left.position, Quaternion.identity); + + if (PlayerPrefs.GetInt ("Sound", 1) == 1) { + source.PlayOneShot (explosionClip, 1f); + } + + if (connector != null) { + Destroy (connector.gameObject); + connector = null; + } } + } - if(connector!=null){ - Destroy(connector.gameObject); - connector = null; - } + public void PlayFastForwardAnim() { + animator.SetTrigger ("FastForward"); + source.PlayOneShot (swoosh); } } diff --git a/Assets/Scripts/Player/PlayerScript.cs.meta b/Assets/Scripts/Player/PlayerScript.cs.meta deleted file mode 100644 index ca3a1a6..0000000 --- a/Assets/Scripts/Player/PlayerScript.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: ccfc29fa6ff319c4e8bcbd5274e324ac -timeCreated: 1475404340 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PowerUpController.cs b/Assets/Scripts/PowerUpController.cs new file mode 100644 index 0000000..21eb3cb --- /dev/null +++ b/Assets/Scripts/PowerUpController.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PowerUpController : MonoBehaviour { + + public GameObject powerup; + + private float timeInterval = 12f; + private float stepChange = 2f; + private float lowerLimit = 5f; + + void Start () { + timeInterval = 12f; + powerup.SetActive (false); + Invoke ("spawnPowerUp", timeInterval); + } + + void spawnPowerUp() { + powerup.SetActive(true); + powerup.transform.position = new Vector3 ( + powerup.transform.position.x, + 12f, + powerup.transform.position.z + ); + + if (timeInterval > lowerLimit) { + Invoke ("spawnPowerUp", timeInterval); + timeInterval -= stepChange; + } else { + Invoke ("spawnPowerUp", lowerLimit); + } + } +} diff --git a/Assets/Scripts/ButtonController.cs.meta b/Assets/Scripts/PowerUpController.cs.meta similarity index 76% rename from Assets/Scripts/ButtonController.cs.meta rename to Assets/Scripts/PowerUpController.cs.meta index cbd8113..a19b515 100644 --- a/Assets/Scripts/ButtonController.cs.meta +++ b/Assets/Scripts/PowerUpController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 9b06037d7ecf64dda8040b718dd55eee -timeCreated: 1482398021 +guid: 7fa217e4490b8495f9e0f4a327bc171b +timeCreated: 1501163137 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/SpeedController.cs b/Assets/Scripts/SpeedController.cs index 0cd9a8f..963d0d4 100644 --- a/Assets/Scripts/SpeedController.cs +++ b/Assets/Scripts/SpeedController.cs @@ -4,10 +4,13 @@ public class SpeedController : MonoBehaviour { public static float Speed = 6.5f; - - // Update is called once per frame - void FixedUpdate () { - Speed += Time.deltaTime / 7; + + void Start() { + Speed = 6.5f; + } + + public static void IncreaseSpeed(float step) { + Speed += step / 6; } void OnEnable() { @@ -22,4 +25,8 @@ void OnDisable() { Events.GameOverEvent -= OnGameOver; } + public static void Reset() { + Speed = 6.5f; + } + } diff --git a/Assets/Scripts/SpikeSpeedController.cs b/Assets/Scripts/SpikeSpeedController.cs deleted file mode 100644 index ae3f005..0000000 --- a/Assets/Scripts/SpikeSpeedController.cs +++ /dev/null @@ -1,39 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class SpikeSpeedController : MonoBehaviour { - - private float Speed = 6.5f; - private Rigidbody2D rigidBody; - private bool isMoving = true; - - void Start(){ - rigidBody = transform.GetComponent(); - } - - void FixedUpdate() { - if (isMoving) { - Speed = SpeedController.Speed; - if (rigidBody == null) { - rigidBody = transform.GetComponent (); - } - rigidBody.velocity = Vector2.down * (Speed); - } else { - rigidBody.velocity = Vector2.zero; - } - } - - void OnEnable() { - Events.GameOverEvent += Stop; - } - - //stop the spikes - public void Stop(){ - isMoving = false; - } - - void OnDisable() { - Events.GameOverEvent -= Stop; - } - -} diff --git a/Assets/Scripts/SpikeSpeedController.cs.meta b/Assets/Scripts/SpikeSpeedController.cs.meta deleted file mode 100644 index f2afc74..0000000 --- a/Assets/Scripts/SpikeSpeedController.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: d9d168472eae34fc2a9d4403d12911ec -timeCreated: 1483448645 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TutorialController.cs b/Assets/Scripts/TutorialController.cs similarity index 74% rename from Assets/TutorialController.cs rename to Assets/Scripts/TutorialController.cs index 72fa926..76a4a18 100644 --- a/Assets/TutorialController.cs +++ b/Assets/Scripts/TutorialController.cs @@ -6,11 +6,12 @@ public class TutorialController : MonoBehaviour { public GameObject gamePlayManager; public GameObject scoreCounter; + public ObstacleGenerator generator; private static bool isRunning; private GameObject tutorialText; private enum Level { - left, right, both, none + left, right, both, go, none }; private InputManager input; private Level currentLevel; @@ -23,7 +24,7 @@ void OnEnable () { tutorialText = gameObject; input = gamePlayManager.GetComponent (); - if (PlayerPrefs.GetInt ("tutorial", 1) == 0) { + if (PlayerPrefs.GetInt ("Tutorial", 1) == 0) { isRunning = false; } } @@ -58,17 +59,31 @@ void Update () { if (input.MappedInput == InputManager.InputType.Both) { touchTime += Time.deltaTime; if (touchTime > holdTime) { - currentLevel = Level.none; + currentLevel = Level.go; touchTime = 0; } } else { touchTime = 0; } + } else if (currentLevel == Level.go) { + touchTime += Time.deltaTime; + if (touchTime < 1.5f * holdTime) { + tutorialText.GetComponent ().text = "You Rock!"; + } else if (touchTime > 1.5f * holdTime && touchTime < 2 * holdTime) { + tutorialText.GetComponent ().text = ""; + } else if (touchTime > 2 * holdTime) { + tutorialText.GetComponent ().text = ""; + currentLevel = Level.none; + touchTime = 0; + } } else if (currentLevel == Level.none && isRunning == true) { tutorialText.GetComponent ().text = ""; isRunning = false; scoreCounter.SetActive (true); - PlayerPrefs.SetInt ("tutorial", 0); + PlayerPrefs.SetInt ("Tutorial", 0); + SpeedController.Reset (); + print ("count me"); + generator.StartObstacleGeneration (); } } } diff --git a/Assets/TutorialController.cs.meta b/Assets/Scripts/TutorialController.cs.meta similarity index 100% rename from Assets/TutorialController.cs.meta rename to Assets/Scripts/TutorialController.cs.meta diff --git a/Assets/Scripts/UI/GameOverButtonManager.cs b/Assets/Scripts/UI/GameOverButtonManager.cs new file mode 100644 index 0000000..cbbbaaa --- /dev/null +++ b/Assets/Scripts/UI/GameOverButtonManager.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.SceneManagement; + +public class GameOverButtonManager : MonoBehaviour { + + public Animator fadeOut; + public AudioClip click; + public AudioSource source; + public GameObject settingsPanel; + public GameObject scorePanel; + + public void OpenSettings() { + settingsPanel.SetActive (true); + scorePanel.SetActive (false); + } + + public void OnClickBack() { + settingsPanel.SetActive (false); + scorePanel.SetActive (true); + } + + public void OnClickHome() { + fadeOut.SetTrigger ("Home"); + if (PlayerPrefs.GetInt ("Sound", 1) == 1) { + source.PlayOneShot (click); + } + } + + public void OnClickPlay() { + fadeOut.SetTrigger ("GameOver"); + if (PlayerPrefs.GetInt ("Sound", 1) == 1) { + source.PlayOneShot (click); + } + } + +} diff --git a/Assets/ButtonSoundController.cs.meta b/Assets/Scripts/UI/GameOverButtonManager.cs.meta similarity index 76% rename from Assets/ButtonSoundController.cs.meta rename to Assets/Scripts/UI/GameOverButtonManager.cs.meta index 5e88c5b..ff61f5c 100644 --- a/Assets/ButtonSoundController.cs.meta +++ b/Assets/Scripts/UI/GameOverButtonManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: fa9082276847c4fcca311c2da15fa454 -timeCreated: 1484501323 +guid: d476fd587951b4aa9bf247bc362fa410 +timeCreated: 1501858103 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/UI/MainMenuButtonController.cs b/Assets/Scripts/UI/MainMenuButtonController.cs new file mode 100644 index 0000000..717f8da --- /dev/null +++ b/Assets/Scripts/UI/MainMenuButtonController.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MainMenuButtonController : MonoBehaviour { + + public GameObject settingsPanel; + public GameObject mainPanel; + public GameObject settingsButton; + public GameObject aboutMDG; + + public Animator whiteFadeIn; + public AudioClip click; + public AudioSource source; + + void Update() { + //close the application when back button is pressed in android + if (Input.GetKeyDown (KeyCode.Escape)) { + Application.Quit (); + } + } + + public void OnSettingsClicked() { + settingsPanel.SetActive (true); + mainPanel.SetActive (false); + } + + public void OnClickPlay() { + whiteFadeIn.SetTrigger ("GameOver"); + if(PlayerPrefs.GetInt("Sound", 1) == 1) + source.PlayOneShot (click); + } + + public void OnClickBack() { + if (settingsPanel.activeSelf) { + settingsPanel.SetActive (false); + mainPanel.SetActive (true); + } else { + aboutMDG.SetActive (false); + mainPanel.SetActive (true); + } + } + + public void OnClickInfo() { + aboutMDG.SetActive (true); + mainPanel.SetActive (false); + } + + public void OnClickFB() { + Application.OpenURL ("https://www.facebook.com/mdgiitr/"); + } + + public void OnClickGithub() { + Application.OpenURL ("https://github.com/sdsmdg"); + } + + public void OnClickPlayStore() { + Application.OpenURL ("https://play.google.com/store/apps/developer?id=MDG,+SDS"); + } +} diff --git a/Assets/Scripts/UI/MainMenuButtonController.cs.meta b/Assets/Scripts/UI/MainMenuButtonController.cs.meta new file mode 100644 index 0000000..742b09d --- /dev/null +++ b/Assets/Scripts/UI/MainMenuButtonController.cs.meta @@ -0,0 +1,20 @@ +fileFormatVersion: 2 +guid: 93f0877f7cf164927a121ce42c84bf86 +timeCreated: 1501868164 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: + - settingsPanel: {instanceID: 0} + - playButton: {instanceID: 0} + - settingsButton: {instanceID: 0} + - settings: {instanceID: 0} + - back: {instanceID: 0} + - whiteFadeIn: {instanceID: 0} + - click: {fileID: 8300000, guid: a9a7dd96e1adc478fbea5053b91f15da, type: 3} + - source: {instanceID: 0} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/SpashScreenController.cs b/Assets/Scripts/UI/SpashScreenController.cs new file mode 100644 index 0000000..8943b66 --- /dev/null +++ b/Assets/Scripts/UI/SpashScreenController.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpashScreenController : MonoBehaviour { + + public Animator fadeOut; + + bool isTimerTicking = false; + float timer; + + void Start () { + timer = 0; + isTimerTicking = true; + } + + void Update () { + //close the application when back button is pressed in android + if (Input.GetKeyDown (KeyCode.Escape)) { + Application.Quit (); + } + if (isTimerTicking) { + timer += Time.deltaTime; + if (timer > 2f) { + isTimerTicking = false; + fadeOut.SetTrigger ("Home"); + timer = 0; + } + } + } +} diff --git a/Assets/Scripts/UI/SpashScreenController.cs.meta b/Assets/Scripts/UI/SpashScreenController.cs.meta new file mode 100644 index 0000000..0e060b5 --- /dev/null +++ b/Assets/Scripts/UI/SpashScreenController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a0384e1474e434a26abf46f2c327755f +timeCreated: 1503223107 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/ToggleStateController.cs b/Assets/Scripts/UI/ToggleStateController.cs new file mode 100644 index 0000000..bc08e7a --- /dev/null +++ b/Assets/Scripts/UI/ToggleStateController.cs @@ -0,0 +1,54 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class ToggleStateController : MonoBehaviour { + + public Toggle music; + public Toggle sound; + public Toggle tutorial; + + void Start() { + if (PlayerPrefs.GetInt ("Sound", 1) == 1) { + sound.isOn = true; + } else { + sound.isOn = false; + } + if (PlayerPrefs.GetInt ("Music", 1) == 1) { + music.isOn = true; + } else { + music.isOn = false; + } + if (PlayerPrefs.GetInt ("Tutorial", 1) == 1) { + tutorial.isOn = true; + } else { + tutorial.isOn = false; + } + } + + public void OnToggleMusic() { + if (music.isOn) { + PlayerPrefs.SetInt ("Music", 1); + } else { + PlayerPrefs.SetInt ("Music", 0); + } + } + + public void OnToggleSound() { + if (sound.isOn) { + PlayerPrefs.SetInt ("Sound", 1); + } else { + PlayerPrefs.SetInt ("Sound", 0); + } + } + + public void OnToggleTutorial() { + if (tutorial.isOn) { + PlayerPrefs.SetInt ("Tutorial", 1); + } else { + PlayerPrefs.SetInt ("Tutorial", 0); + } + } + +} diff --git a/Assets/Scripts/UI/ToggleStateController.cs.meta b/Assets/Scripts/UI/ToggleStateController.cs.meta new file mode 100644 index 0000000..ad98543 --- /dev/null +++ b/Assets/Scripts/UI/ToggleStateController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b56c90a7901704772a517cfeff223deb +timeCreated: 1501859169 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs deleted file mode 100644 index 06e1550..0000000 --- a/Assets/Scripts/UI/UIManager.cs +++ /dev/null @@ -1,38 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; -using UnityEngine.SceneManagement; - -public class UIManager : MonoBehaviour { - - public GamePlayManager gamePlayManager; - - private Text scoreText; - private int oldScore, newScore; - private bool isDialogShown = false; - - void Start () { - scoreText = transform.GetChild(0).GetComponent(); - oldScore = 0; - } - - // Update is called once per frame - void Update () { - newScore = gamePlayManager.Score; - if(oldScore!= newScore){ - scoreText.text = newScore.ToString(); - oldScore = newScore; - } - - if(gamePlayManager.gameOver && !isDialogShown){ - // hide current scoreboard - scoreText.gameObject.SetActive(false); - - //activate gameOver Dialog - GameObject gameOverDialog = transform.GetChild(1).gameObject; - gameOverDialog.SetActive(true); - gameOverDialog.GetComponentInChildren().text = string.Format("{0}", gamePlayManager.Score); - isDialogShown = true; - } - } - -} diff --git a/Assets/Scripts/UI/UIManager.cs.meta b/Assets/Scripts/UI/UIManager.cs.meta deleted file mode 100644 index bea7874..0000000 --- a/Assets/Scripts/UI/UIManager.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: efda1dd80efe6274ca14671cec855933 -timeCreated: 1475715226 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Utils/Events.cs b/Assets/Scripts/Utils/Events.cs index 7c7154a..3504921 100644 --- a/Assets/Scripts/Utils/Events.cs +++ b/Assets/Scripts/Utils/Events.cs @@ -1,11 +1,11 @@ - -public class Events{ - - public delegate void Call(); - public static event Call GameOverEvent; - - public static void CallGameOver(){ - if(GameOverEvent != null) - GameOverEvent(); - } -} + +public class Events{ + + public delegate void Call(); + public static event Call GameOverEvent; + + public static void CallGameOver(){ + if(GameOverEvent != null) + GameOverEvent(); + } +} diff --git a/Assets/Scripts/Utils/ObjectPooler.cs b/Assets/Scripts/Utils/ObjectPooler.cs index 16c75d2..d439bbb 100644 --- a/Assets/Scripts/Utils/ObjectPooler.cs +++ b/Assets/Scripts/Utils/ObjectPooler.cs @@ -1,71 +1,71 @@ -using UnityEngine; -using System.Collections.Generic; - -public class ObjectPooler{ - - public int PoolSize {get { return pooledObjects.Count; }} - public bool WillGrow {get; set;} - - private GameObject pooledObject; - private List pooledObjects; - - public ObjectPooler(){ - WillGrow = true; - } - - public ObjectPooler(GameObject pooledObject, int amount) : this(pooledObject,amount, true){} - - public ObjectPooler(GameObject pooledObject, int amount, bool willGrow){ - WillGrow = willGrow; - Init(pooledObject,amount); - } - - public void Init(GameObject pooledObject, int amount){ - - if(pooledObjects != null || pooledObject == null || amount <1){ - return; - } - - this.pooledObject = pooledObject; - - pooledObjects = new List(amount); - - for(int i=0; i pooledObjects; + + public ObjectPooler(){ + WillGrow = true; + } + + public ObjectPooler(GameObject pooledObject, int amount) : this(pooledObject,amount, true){} + + public ObjectPooler(GameObject pooledObject, int amount, bool willGrow){ + WillGrow = willGrow; + Init(pooledObject,amount); + } + + public void Init(GameObject pooledObject, int amount){ + + if(pooledObjects != null || pooledObject == null || amount <1){ + return; + } + + this.pooledObject = pooledObject; + + pooledObjects = new List(amount); + + for(int i=0; i{ - - public Pair(){} - - public Pair(T left, T right){ - this.Left = left; - this.Right = right; - } - - public T Left{get; set;} - public T Right{get; set;} - - public void Set(T left, T right){ - Left = left; - Right = right; - } -} + +public class Pair{ + + public Pair(){} + + public Pair(T left, T right){ + this.Left = left; + this.Right = right; + } + + public T Left{get; set;} + public T Right{get; set;} + + public void Set(T left, T right){ + Left = left; + Right = right; + } +} diff --git a/Assets/SettingsButtonController.cs b/Assets/SettingsButtonController.cs deleted file mode 100644 index 7b100f0..0000000 --- a/Assets/SettingsButtonController.cs +++ /dev/null @@ -1,23 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class SettingsButtonController : MonoBehaviour { - - public GameObject settingsPanel; - public GameObject scorePanel; - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - - } - - public void OpenSettings() { - settingsPanel.SetActive (true); - scorePanel.SetActive (false); - } -} diff --git a/Assets/SettingsButtonController.cs.meta b/Assets/SettingsButtonController.cs.meta deleted file mode 100644 index 722b4a1..0000000 --- a/Assets/SettingsButtonController.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 46c30decd0b1a4f0cbbd312d2cc18c21 -timeCreated: 1484484640 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/SimpleGrabPassBlur.shader b/Assets/Shaders/SimpleGrabPassBlur.shader new file mode 100644 index 0000000..4aebead --- /dev/null +++ b/Assets/Shaders/SimpleGrabPassBlur.shader @@ -0,0 +1,208 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Custom/SimpleGrabPassBlur" { + Properties { + _Color ("Main Color", Color) = (1,1,1,1) + _BumpAmt ("Distortion", Range (0,128)) = 50 + _MainTex ("Tint Color (RGB)", 2D) = "white" {} + _BumpMap ("Normalmap", 2D) = "bump" {} + _Size ("Size", Range(0, 20)) = 1 + } + + Category { + + // We must be transparent, so other objects are drawn before this one. + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Opaque" } + + + SubShader { + + // Horizontal blur + GrabPass { + Tags { "LightMode" = "Always" } + } + Pass { + Tags { "LightMode" = "Always" } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; + float2 texcoord: TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 uvgrab : TEXCOORD0; + }; + + v2f vert (appdata_t v) { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + #if UNITY_UV_STARTS_AT_TOP + float scale = -1.0; + #else + float scale = 1.0; + #endif + o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y*scale) + o.vertex.w) * 0.5; + o.uvgrab.zw = o.vertex.zw; + return o; + } + + sampler2D _GrabTexture; + float4 _GrabTexture_TexelSize; + float _Size; + + half4 frag( v2f i ) : COLOR { +// half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab)); +// return col; + + half4 sum = half4(0,0,0,0); + #define GRABPIXEL(weight,kernelx) tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(float4(i.uvgrab.x + _GrabTexture_TexelSize.x * kernelx*_Size, i.uvgrab.y, i.uvgrab.z, i.uvgrab.w))) * weight + sum += GRABPIXEL(0.05, -4.0); + sum += GRABPIXEL(0.09, -3.0); + sum += GRABPIXEL(0.12, -2.0); + sum += GRABPIXEL(0.15, -1.0); + sum += GRABPIXEL(0.18, 0.0); + sum += GRABPIXEL(0.15, +1.0); + sum += GRABPIXEL(0.12, +2.0); + sum += GRABPIXEL(0.09, +3.0); + sum += GRABPIXEL(0.05, +4.0); + + return sum; + } + ENDCG + } + // Vertical blur + GrabPass { + Tags { "LightMode" = "Always" } + } + Pass { + Tags { "LightMode" = "Always" } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; + float2 texcoord: TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 uvgrab : TEXCOORD0; + }; + + v2f vert (appdata_t v) { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + #if UNITY_UV_STARTS_AT_TOP + float scale = -1.0; + #else + float scale = 1.0; + #endif + o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y*scale) + o.vertex.w) * 0.5; + o.uvgrab.zw = o.vertex.zw; + return o; + } + + sampler2D _GrabTexture; + float4 _GrabTexture_TexelSize; + float _Size; + + half4 frag( v2f i ) : COLOR { +// half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab)); +// return col; + + half4 sum = half4(0,0,0,0); + #define GRABPIXEL(weight,kernely) tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(float4(i.uvgrab.x, i.uvgrab.y + _GrabTexture_TexelSize.y * kernely*_Size, i.uvgrab.z, i.uvgrab.w))) * weight + //G(X) = (1/(sqrt(2*PI*deviation*deviation))) * exp(-(x*x / (2*deviation*deviation))) + + sum += GRABPIXEL(0.05, -4.0); + sum += GRABPIXEL(0.09, -3.0); + sum += GRABPIXEL(0.12, -2.0); + sum += GRABPIXEL(0.15, -1.0); + sum += GRABPIXEL(0.18, 0.0); + sum += GRABPIXEL(0.15, +1.0); + sum += GRABPIXEL(0.12, +2.0); + sum += GRABPIXEL(0.09, +3.0); + sum += GRABPIXEL(0.05, +4.0); + + return sum; + } + ENDCG + } + + // Distortion + GrabPass { + Tags { "LightMode" = "Always" } + } + Pass { + Tags { "LightMode" = "Always" } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; + float2 texcoord: TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 uvgrab : TEXCOORD0; + float2 uvbump : TEXCOORD1; + float2 uvmain : TEXCOORD2; + }; + + float _BumpAmt; + float4 _BumpMap_ST; + float4 _MainTex_ST; + + v2f vert (appdata_t v) { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + #if UNITY_UV_STARTS_AT_TOP + float scale = -1.0; + #else + float scale = 1.0; + #endif + o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y*scale) + o.vertex.w) * 0.5; + o.uvgrab.zw = o.vertex.zw; + o.uvbump = TRANSFORM_TEX( v.texcoord, _BumpMap ); + o.uvmain = TRANSFORM_TEX( v.texcoord, _MainTex ); + return o; + } + + fixed4 _Color; + sampler2D _GrabTexture; + float4 _GrabTexture_TexelSize; + sampler2D _BumpMap; + sampler2D _MainTex; + + half4 frag( v2f i ) : COLOR { + // calculate perturbed coordinates + half2 bump = UnpackNormal(tex2D( _BumpMap, i.uvbump )).rg; // we could optimize this by just reading the x y without reconstructing the Z + float2 offset = bump * _BumpAmt * _GrabTexture_TexelSize.xy; + i.uvgrab.xy = offset * i.uvgrab.z + i.uvgrab.xy; + + half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab)); + half4 tint = tex2D( _MainTex, i.uvmain ) * _Color; + + return col * tint; + } + ENDCG + } + } + } +} \ No newline at end of file diff --git a/Assets/Shaders/SimpleGrabPassBlur.shader.meta b/Assets/Shaders/SimpleGrabPassBlur.shader.meta new file mode 100644 index 0000000..5db95a2 --- /dev/null +++ b/Assets/Shaders/SimpleGrabPassBlur.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: bfcb88f66a4844f09b5d290538b01db4 +timeCreated: 1503119714 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SoundController.cs b/Assets/SoundController.cs deleted file mode 100644 index 6418de6..0000000 --- a/Assets/SoundController.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class SoundController : MonoBehaviour { - - public void OnValueChanged (bool newValue) { - if (newValue) { - PlayerPrefs.SetInt ("Sound", 1); - } else { - PlayerPrefs.SetInt ("Sound", 0); - } - } -} diff --git a/Assets/SoundController.cs.meta b/Assets/SoundController.cs.meta deleted file mode 100644 index 2723f94..0000000 --- a/Assets/SoundController.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: e4e05d0f5c4f940fdbac4f3a5d50cc2f -timeCreated: 1484491049 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sounds/background.mp3 b/Assets/Sounds/background.mp3 new file mode 100644 index 0000000..de6a511 Binary files /dev/null and b/Assets/Sounds/background.mp3 differ diff --git a/Assets/Sounds/flame.wav.meta b/Assets/Sounds/background.mp3.meta similarity index 83% rename from Assets/Sounds/flame.wav.meta rename to Assets/Sounds/background.mp3.meta index 16e25bf..525f3a4 100644 --- a/Assets/Sounds/flame.wav.meta +++ b/Assets/Sounds/background.mp3.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 3f9686426944d42d2a0446be4057b94f -timeCreated: 1484239158 +guid: 85edd6096a5ca4bb1a17bae47641e571 +timeCreated: 1500793645 licenseType: Free AudioImporter: serializedVersion: 6 @@ -16,6 +16,7 @@ AudioImporter: normalize: 1 preloadAudioData: 1 loadInBackground: 0 + ambisonic: 0 3D: 1 userData: assetBundleName: diff --git a/Assets/Sounds/flame.wav b/Assets/Sounds/flame.wav deleted file mode 100644 index 7715ef6..0000000 Binary files a/Assets/Sounds/flame.wav and /dev/null differ diff --git a/Assets/Sounds/hint.wav b/Assets/Sounds/hint.wav deleted file mode 100644 index 0680605..0000000 Binary files a/Assets/Sounds/hint.wav and /dev/null differ diff --git a/Assets/Sounds/rings-of-saturn-music-loop.wav b/Assets/Sounds/rings-of-saturn-music-loop.wav deleted file mode 100644 index 5f4671e..0000000 Binary files a/Assets/Sounds/rings-of-saturn-music-loop.wav and /dev/null differ diff --git a/Assets/Sounds/saw_sound.mp3 b/Assets/Sounds/saw_sound.mp3 deleted file mode 100644 index 76c7321..0000000 Binary files a/Assets/Sounds/saw_sound.mp3 and /dev/null differ diff --git a/Assets/Sounds/splash.wav b/Assets/Sounds/splash.wav new file mode 100644 index 0000000..511ab5d Binary files /dev/null and b/Assets/Sounds/splash.wav differ diff --git a/Assets/Sounds/hint.wav.meta b/Assets/Sounds/splash.wav.meta similarity index 83% rename from Assets/Sounds/hint.wav.meta rename to Assets/Sounds/splash.wav.meta index 97df20d..7fb62f2 100644 --- a/Assets/Sounds/hint.wav.meta +++ b/Assets/Sounds/splash.wav.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 6cd7970db715f4219a2f4a7143234d16 -timeCreated: 1484235206 +guid: 325513bc746954532b7112300695098c +timeCreated: 1500795303 licenseType: Free AudioImporter: serializedVersion: 6 @@ -16,6 +16,7 @@ AudioImporter: normalize: 1 preloadAudioData: 1 loadInBackground: 0 + ambisonic: 0 3D: 1 userData: assetBundleName: diff --git a/Assets/Sounds/swoosh.wav b/Assets/Sounds/swoosh.wav new file mode 100644 index 0000000..b82f175 Binary files /dev/null and b/Assets/Sounds/swoosh.wav differ diff --git a/Assets/Sounds/rings-of-saturn-music-loop.wav.meta b/Assets/Sounds/swoosh.wav.meta similarity index 83% rename from Assets/Sounds/rings-of-saturn-music-loop.wav.meta rename to Assets/Sounds/swoosh.wav.meta index 138a699..5459bf8 100644 --- a/Assets/Sounds/rings-of-saturn-music-loop.wav.meta +++ b/Assets/Sounds/swoosh.wav.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d688e23a62ebc49719779226b8ebeb26 -timeCreated: 1484235208 +guid: 0eadbfdd45950494186a4659278ae258 +timeCreated: 1503645596 licenseType: Free AudioImporter: serializedVersion: 6 @@ -16,6 +16,7 @@ AudioImporter: normalize: 1 preloadAudioData: 1 loadInBackground: 0 + ambisonic: 0 3D: 1 userData: assetBundleName: diff --git a/Assets/Sounds/water_click.wav b/Assets/Sounds/water_click.wav new file mode 100644 index 0000000..60575f4 Binary files /dev/null and b/Assets/Sounds/water_click.wav differ diff --git a/Assets/Sounds/saw_sound.mp3.meta b/Assets/Sounds/water_click.wav.meta similarity index 83% rename from Assets/Sounds/saw_sound.mp3.meta rename to Assets/Sounds/water_click.wav.meta index 3583574..1726914 100644 --- a/Assets/Sounds/saw_sound.mp3.meta +++ b/Assets/Sounds/water_click.wav.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b0df4929292a1428695aa4efaa48f004 -timeCreated: 1484235207 +guid: a9a7dd96e1adc478fbea5053b91f15da +timeCreated: 1500792993 licenseType: Free AudioImporter: serializedVersion: 6 @@ -16,6 +16,7 @@ AudioImporter: normalize: 1 preloadAudioData: 1 loadInBackground: 0 + ambisonic: 0 3D: 1 userData: assetBundleName: diff --git a/Assets/Sounds/water_loop.wav b/Assets/Sounds/water_loop.wav new file mode 100644 index 0000000..4761b03 Binary files /dev/null and b/Assets/Sounds/water_loop.wav differ diff --git a/Assets/Sounds/water_loop.wav.meta b/Assets/Sounds/water_loop.wav.meta new file mode 100644 index 0000000..c9b8c24 --- /dev/null +++ b/Assets/Sounds/water_loop.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3d75550ae86544adeae020209eeff45c +timeCreated: 1500794136 +licenseType: Free +AudioImporter: + 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/Standard Assets/Effects/GlassRefraction/Shaders/GlassStainedBumpDistort.shader b/Assets/Standard Assets/Effects/GlassRefraction/Shaders/GlassStainedBumpDistort.shader old mode 100755 new mode 100644 index 8ac46e1..6df813e --- a/Assets/Standard Assets/Effects/GlassRefraction/Shaders/GlassStainedBumpDistort.shader +++ b/Assets/Standard Assets/Effects/GlassRefraction/Shaders/GlassStainedBumpDistort.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // Per pixel bumped refraction. // Uses a normal map to distort the image behind, and // an additional texture to tint the color. @@ -56,7 +58,7 @@ float4 _MainTex_ST; v2f vert (appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); #if UNITY_UV_STARTS_AT_TOP float scale = -1.0; #else diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlendModesOverlay.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlendModesOverlay.shader old mode 100755 new mode 100644 index 15d808d..1910244 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlendModesOverlay.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlendModesOverlay.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/BlendModesOverlay" { Properties { _MainTex ("Screen Blended", 2D) = "" {} @@ -25,7 +27,7 @@ Shader "Hidden/BlendModesOverlay" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = UnityStereoScreenSpaceUVAdjust(float2( dot(v.texcoord.xy, _UV_Transform.xy), diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlurEffectConeTaps.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlurEffectConeTaps.shader old mode 100755 new mode 100644 index f331113..743667d --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlurEffectConeTaps.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/BlurEffectConeTaps.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/BlurEffectConeTap" { Properties { _MainTex ("", any) = "" {} } CGINCLUDE @@ -13,7 +15,7 @@ Shader "Hidden/BlurEffectConeTap" { half4 _BlurOffsets; v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord - _BlurOffsets.xy * _MainTex_TexelSize.xy; // hack, see BlurEffect.cs for the reason for this. let's make a new blur effect soon #ifdef UNITY_SINGLE_PASS_STEREO diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlur.shader old mode 100755 new mode 100644 index 97e8580..c9afc63 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlur.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlur.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + /* CAMERA MOTION BLUR IMAGE EFFECTS @@ -95,7 +97,7 @@ v2f vert(appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlurDX11.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlurDX11.shader old mode 100755 new mode 100644 index c99536b..946e947 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlurDX11.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CameraMotionBlurDX11.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + /* NOTES: see CameraMotionBlur.shader */ @@ -52,7 +54,7 @@ v2f vert(appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ChromaticAberrationShader.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ChromaticAberrationShader.shader old mode 100755 new mode 100644 index 99a2734..0fec74d --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ChromaticAberrationShader.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ChromaticAberrationShader.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ChromaticAberration" { Properties { _MainTex ("Base", 2D) = "" {} @@ -24,7 +26,7 @@ Shader "Hidden/ChromaticAberration" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; return o; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrection3DLut.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrection3DLut.shader old mode 100755 new mode 100644 index af9aa0f..ae21051 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrection3DLut.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrection3DLut.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ColorCorrection3DLut" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -24,7 +26,7 @@ float _Offset; v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurves.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurves.shader old mode 100755 new mode 100644 index a924482..66dbdcb --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurves.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurves.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ColorCorrectionCurves" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -40,7 +42,7 @@ Shader "Hidden/ColorCorrectionCurves" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv2 = TRANSFORM_TEX(v.texcoord, _CameraDepthTexture); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurvesSimple.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurvesSimple.shader old mode 100755 new mode 100644 index 6094a96..9046e53 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurvesSimple.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionCurvesSimple.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ColorCorrectionCurvesSimple" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -23,7 +25,7 @@ Shader "Hidden/ColorCorrectionCurvesSimple" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionSelective.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionSelective.shader old mode 100755 new mode 100644 index 9cec50a..ff2fe84 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionSelective.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ColorCorrectionSelective.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ColorCorrectionSelective" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -20,7 +22,7 @@ Shader "Hidden/ColorCorrectionSelective" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/Apply.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/Apply.shader old mode 100755 new mode 100644 index 7eedc73..8bf6058 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/Apply.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/Apply.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // Final pass in the contrast stretch effect: apply // color stretch to the original image, based on currently // adapted to minimum/maximum luminances. @@ -30,7 +32,7 @@ half4 _MainTex_ST; v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv[0] = MultiplyUV (UNITY_MATRIX_TEXTURE0, UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST)); o.uv[1] = float2(0.5,0.5); return o; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/MinMaxReduction.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/MinMaxReduction.shader old mode 100755 new mode 100644 index d26fbdf..1f2dd75 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/MinMaxReduction.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Contrast Stretch/MinMaxReduction.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // Reduces input image (_MainTex) by 2x2. // Outputs maximum value in R, minimum in G. Shader "Hidden/Contrast Stretch Reduction" { @@ -26,7 +28,7 @@ half4 _MainTex_ST; v2f vert (appdata_img v) { v2f o; - o.position = mul (UNITY_MATRIX_MVP, v.vertex); + o.position = UnityObjectToClipPos (v.vertex); float2 uv = MultiplyUV (UNITY_MATRIX_TEXTURE0, v.texcoord); // Compute UVs to sample 2x2 pixel block. diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ContrastComposite.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ContrastComposite.shader old mode 100755 new mode 100644 index c78fb6d..378ce44 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ContrastComposite.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ContrastComposite.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ContrastComposite" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -27,7 +29,7 @@ Shader "Hidden/ContrastComposite" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTexBlurred_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ConvertDepth.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ConvertDepth.shader old mode 100755 new mode 100644 index 0c7b8ee..d0dbbd2 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ConvertDepth.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ConvertDepth.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ConvertDepth" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -21,7 +23,7 @@ Shader "Hidden/ConvertDepth" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _CameraDepthTexture_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CreaseApply.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CreaseApply.shader old mode 100755 new mode 100644 index 3d29cc7..bc61eab --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/CreaseApply.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/CreaseApply.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/CreaseApply" { @@ -34,7 +36,7 @@ struct v2f { v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv.xy = v.texcoord.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/EdgeDetectNormals.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/EdgeDetectNormals.shader old mode 100755 new mode 100644 index 7207f99..2954499 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/EdgeDetectNormals.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/EdgeDetectNormals.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/EdgeDetect" { Properties { @@ -44,7 +46,7 @@ Shader "Hidden/EdgeDetect" { v2flum vertLum (appdata_img v) { v2flum o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); float2 uv = MultiplyUV( UNITY_MATRIX_TEXTURE0, v.texcoord ); o.uv[0] = UnityStereoScreenSpaceUVAdjust(uv, _MainTex_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(uv + float2(-_MainTex_TexelSize.x, -_MainTex_TexelSize.y) * _SampleDistance, _MainTex_ST); @@ -94,7 +96,7 @@ Shader "Hidden/EdgeDetect" { v2f vertRobert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); float2 uv = v.texcoord.xy; o.uv[0] = UnityStereoScreenSpaceUVAdjust(uv, _MainTex_ST); @@ -118,7 +120,7 @@ Shader "Hidden/EdgeDetect" { v2f vertThin( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); float2 uv = v.texcoord.xy; o.uv[0] = UnityStereoScreenSpaceUVAdjust(uv, _MainTex_ST); @@ -141,7 +143,7 @@ Shader "Hidden/EdgeDetect" { v2fd vertD( appdata_img v ) { v2fd o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); float2 uv = v.texcoord.xy; o.uv[0] = uv; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/FisheyeShader.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/FisheyeShader.shader old mode 100755 new mode 100644 index d7796ce..0021042 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/FisheyeShader.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/FisheyeShader.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/FisheyeShader" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -21,7 +23,7 @@ Shader "Hidden/FisheyeShader" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/GlobalFog.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/GlobalFog.shader old mode 100755 new mode 100644 index 5f707e6..d80b6f0 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/GlobalFog.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/GlobalFog.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/GlobalFog" { Properties { _MainTex ("Base (RGB)", 2D) = "black" {} @@ -44,7 +46,7 @@ CGINCLUDE v2f o; half index = v.vertex.z; v.vertex.z = 0.1; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; o.uv_depth = v.texcoord.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlur.shader old mode 100755 new mode 100644 index e00e988..2242495 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlur.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlur.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/MotionBlur" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -36,7 +38,7 @@ Properties { v2f vert (appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); return o; } @@ -80,7 +82,7 @@ Properties { v2f vert (appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlurClear.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlurClear.shader old mode 100755 new mode 100644 index d448630..24dea58 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlurClear.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/MotionBlurClear.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/MotionBlurClear" { @@ -31,7 +33,7 @@ Pass { ps_input vert (vs_input v) { ps_input o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.screen = ComputeScreenPos(o.pos); COMPUTE_EYEDEPTH(o.screen.z); return o; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrain.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrain.shader old mode 100755 new mode 100644 index dae748b..9afe47a --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrain.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrain.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/NoiseAndGrain" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -47,7 +49,7 @@ Shader "Hidden/NoiseAndGrain" { { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); #if UNITY_UV_STARTS_AT_TOP o.uv_screen = v.vertex.xyxy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrainDX11.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrainDX11.shader old mode 100755 new mode 100644 index 85cef6e..04d277f --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrainDX11.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseAndGrainDX11.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/NoiseAndGrainDX11" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -72,7 +74,7 @@ Shader "Hidden/NoiseAndGrainDX11" { { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); #if UNITY_UV_STARTS_AT_TOP o.uv_screen = v.vertex.xyxy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderRGB.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderRGB.shader old mode 100755 new mode 100644 index 4e97021..ca35d64 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderRGB.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderRGB.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Noise Shader RGB" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -34,7 +36,7 @@ half4 _MainTex_ST; v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(MultiplyUV (UNITY_MATRIX_TEXTURE0, v.texcoord), _MainTex_ST); o.uvg = v.texcoord.xy * _GrainOffsetScale.zw + _GrainOffsetScale.xy; o.uvs = v.texcoord.xy * _ScratchOffsetScale.zw + _ScratchOffsetScale.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderYUV.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderYUV.shader old mode 100755 new mode 100644 index a9c756b..200f97a --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderYUV.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/NoiseEffectShaderYUV.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Noise Shader YUV" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -34,7 +36,7 @@ half4 _MainTex_ST; v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(MultiplyUV (UNITY_MATRIX_TEXTURE0, v.texcoord), _MainTex_ST); o.uvg = v.texcoord.xy * _GrainOffsetScale.zw + _GrainOffsetScale.xy; o.uvs = v.texcoord.xy * _ScratchOffsetScale.zw + _ScratchOffsetScale.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/PrepareSunShaftsBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/PrepareSunShaftsBlur.shader old mode 100755 new mode 100644 index 2e41821..5c8891a --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/PrepareSunShaftsBlur.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/PrepareSunShaftsBlur.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/PrepareSunShaftsBlur" { Properties { @@ -23,7 +25,7 @@ Shader "Hidden/PrepareSunShaftsBlur" { v2f vert (appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/RadialBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/RadialBlur.shader old mode 100755 new mode 100644 index f04e20b..5e0025c --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/RadialBlur.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/RadialBlur.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/RadialBlur" { Properties { @@ -24,7 +26,7 @@ Shader "Hidden/RadialBlur" v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = v.texcoord.xy; o.blurVector = (_SunPosition.xy - v.texcoord.xy) * _BlurRadius4.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/SSAOShader.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/SSAOShader.shader old mode 100755 new mode 100644 index 6fee54c..1b579fe --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/SSAOShader.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/SSAOShader.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/SSAO" { Properties { _MainTex ("", 2D) = "" {} @@ -22,7 +24,7 @@ float4 _CameraDepthNormalsTexture_ST; v2f_ao vert_ao (appdata_img v) { v2f_ao o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = TRANSFORM_TEX(v.texcoord, _CameraDepthNormalsTexture); o.uvr = v.texcoord.xy * _NoiseScale; return o; @@ -184,7 +186,7 @@ float4 _MainTex_ST; v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = TRANSFORM_TEX (v.texcoord, _CameraDepthNormalsTexture); return o; } @@ -259,7 +261,7 @@ half4 _SSAO_ST; v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv[0] = UnityStereoScreenSpaceUVAdjust(MultiplyUV (UNITY_MATRIX_TEXTURE0, v.texcoord), _MainTex_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(MultiplyUV (UNITY_MATRIX_TEXTURE1, v.texcoord), _SSAO_ST); return o; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ScreenSpaceAmbientObscurance.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ScreenSpaceAmbientObscurance.shader old mode 100755 new mode 100644 index e11814e..f6e4488 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ScreenSpaceAmbientObscurance.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ScreenSpaceAmbientObscurance.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // This Ambient Occlusion image effect is based on "Scalable Ambient Obscurance": @@ -82,7 +84,7 @@ Shader "Hidden/ScreenSpaceAmbientObscurance" v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; o.uv2 = v.texcoord.xy; #if UNITY_UV_STARTS_AT_TOP diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ShowAlphaChannel.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ShowAlphaChannel.shader old mode 100755 new mode 100644 index 69c10a2..00e0d42 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/ShowAlphaChannel.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/ShowAlphaChannel.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/ShowAlphaChannel" { @@ -31,7 +33,7 @@ struct v2f { v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = v.texcoord.xy; return o; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/SimpleClear.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/SimpleClear.shader old mode 100755 new mode 100644 index 41b134c..4d4cec9 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/SimpleClear.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/SimpleClear.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/SimpleClear" { @@ -24,7 +26,7 @@ struct v2f { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/SunShaftsComposite.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/SunShaftsComposite.shader old mode 100755 new mode 100644 index 60c8dba..6db882e --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/SunShaftsComposite.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/SunShaftsComposite.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/SunShaftsComposite" { Properties { _MainTex ("Base", 2D) = "" {} @@ -45,7 +47,7 @@ Shader "Hidden/SunShaftsComposite" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; #if UNITY_UV_STARTS_AT_TOP @@ -81,7 +83,7 @@ Shader "Hidden/SunShaftsComposite" { v2f_radial vert_radial( appdata_img v ) { v2f_radial o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = v.texcoord.xy; o.blurVector = (_SunPosition.xy - v.texcoord.xy) * _BlurRadius4.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Tonemapper.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Tonemapper.shader old mode 100755 new mode 100644 index c13dc77..fac29f1 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/Tonemapper.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/Tonemapper.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Tonemapper" { Properties { _MainTex ("", 2D) = "black" {} @@ -29,7 +31,7 @@ Shader "Hidden/Tonemapper" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/TwirlEffect.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/TwirlEffect.shader old mode 100755 new mode 100644 index a6b2ab0..555988a --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/TwirlEffect.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/TwirlEffect.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Twirt Effect Shader" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -26,7 +28,7 @@ struct v2f { v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = v.texcoord - _CenterRadius.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/VignettingShader.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/VignettingShader.shader old mode 100755 new mode 100644 index f89b084..ade5c9a --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/VignettingShader.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/VignettingShader.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Vignetting" { Properties { _MainTex ("Base", 2D) = "white" {} @@ -26,7 +28,7 @@ Shader "Hidden/Vignetting" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; o.uv2 = v.texcoord.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/VortexEffect.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/VortexEffect.shader old mode 100755 new mode 100644 index d5427c9..208d1ac --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/VortexEffect.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/VortexEffect.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Twist Effect" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -32,7 +34,7 @@ struct v2f { v2f vert (appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); float2 uv = v.texcoord.xy - _CenterRadius.xy; o.uv = TRANSFORM_TEX(uv, _MainTex); //MultiplyUV (UNITY_MATRIX_TEXTURE0, uv); o.uvOrig = uv; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/DLAA.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/DLAA.shader old mode 100755 new mode 100644 index 239f335..5c8f44b --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/DLAA.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/DLAA.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // // modified and adapted DLAA code based on Dmitry Andreev's @@ -279,7 +281,7 @@ CGINCLUDE v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); float2 uv = v.texcoord.xy; o.uv.xy = uv; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA2.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA2.shader old mode 100755 new mode 100644 index 2953242..093ea9e --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA2.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA2.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/FXAA II" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -169,7 +171,7 @@ float4 _MainTex_TexelSize; v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = FxaaVertexShader (v.texcoord.xy*2-1, _MainTex_TexelSize.xy); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA3Console.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA3Console.shader old mode 100755 new mode 100644 index cdfdc19..d0fe765 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA3Console.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAA3Console.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + /*============================================================================ @@ -65,7 +67,7 @@ Shader "Hidden/FXAA III (Console)" { v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = v.texcoord.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset2.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset2.shader old mode 100755 new mode 100644 index c66d2e3..9dd3f4d --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset2.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset2.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/FXAA Preset 2" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -808,7 +810,7 @@ struct v2f { v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = v.texcoord.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset3.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset3.shader old mode 100755 new mode 100644 index 08c3d3d..e93f454 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset3.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/FXAAPreset3.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/FXAA Preset 3" { Properties { _MainTex ("Base (RGB)", 2D) = "white" {} @@ -807,7 +809,7 @@ struct v2f { v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = v.texcoord.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/NFAA.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/NFAA.shader old mode 100755 new mode 100644 index c626405..567b33a --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/NFAA.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/NFAA.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/NFAA" { Properties { @@ -24,7 +26,7 @@ struct v2f { v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); float2 uv = v.texcoord.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/SSAA.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/SSAA.shader old mode 100755 new mode 100644 index 9730309..d4029d2 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/SSAA.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_Antialiasing/SSAA.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/SSAA" { Properties { @@ -29,7 +31,7 @@ SubShader { v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); float2 uv = v.texcoord.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/Blend.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/Blend.shader old mode 100755 new mode 100644 index 9901bc5..3505652 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/Blend.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/Blend.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Blend" { Properties { _MainTex ("Screen Blended", 2D) = "" {} @@ -28,7 +30,7 @@ Shader "Hidden/Blend" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = v.texcoord.xy; o.uv[1] = v.texcoord.xy; @@ -42,7 +44,7 @@ Shader "Hidden/Blend" { v2f_mt vertMultiTap( appdata_img v ) { v2f_mt o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = v.texcoord.xy + _MainTex_TexelSize.xy * 0.5; o.uv[1] = v.texcoord.xy - _MainTex_TexelSize.xy * 0.5; o.uv[2] = v.texcoord.xy - _MainTex_TexelSize.xy * half2(1,-1) * 0.5; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendForBloom.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendForBloom.shader old mode 100755 new mode 100644 index 3ca07de..a1b020c --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendForBloom.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendForBloom.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/BlendForBloom" { Properties { _MainTex ("Screen Blended", 2D) = "" {} @@ -28,7 +30,7 @@ Shader "Hidden/BlendForBloom" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = v.texcoord.xy; o.uv[1] = v.texcoord.xy; @@ -42,7 +44,7 @@ Shader "Hidden/BlendForBloom" { v2f_mt vertMultiTap( appdata_img v ) { v2f_mt o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[4] = v.texcoord.xy; o.uv[0] = v.texcoord.xy + _MainTex_TexelSize.xy * 0.5; o.uv[1] = v.texcoord.xy - _MainTex_TexelSize.xy * 0.5; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendOneOne.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendOneOne.shader old mode 100755 new mode 100644 index 4045803..8b4620a --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendOneOne.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlendOneOne.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/BlendOneOne" { Properties { _MainTex ("-", 2D) = "" {} @@ -18,7 +20,7 @@ Shader "Hidden/BlendOneOne" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlurAndFlares.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlurAndFlares.shader old mode 100755 new mode 100644 index 09f029f..c525eeb --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlurAndFlares.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BlurAndFlares.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/BlurAndFlares" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -42,14 +44,14 @@ Shader "Hidden/BlurAndFlares" { v2f vert (appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; return o; } v2f_blur vertWithMultiCoords2 (appdata_img v) { v2f_blur o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv01 = UnityStereoScreenSpaceUVAdjust(v.texcoord.xyxy + _Offsets.xyxy * half4(1,1, -1,-1), _MainTex_ST); o.uv23 = UnityStereoScreenSpaceUVAdjust(v.texcoord.xyxy + _Offsets.xyxy * half4(1,1, -1,-1) * 2.0, _MainTex_ST); @@ -61,7 +63,7 @@ Shader "Hidden/BlurAndFlares" { v2f_opts vertStretch (appdata_img v) { v2f_opts o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); half b = _StretchWidth; o.uv[0] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy + b * 2.0 * _Offsets.xy, _MainTex_ST); @@ -75,7 +77,7 @@ Shader "Hidden/BlurAndFlares" { v2f_opts vertWithMultiCoords (appdata_img v) { v2f_opts o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy + 0.5 * _MainTex_TexelSize.xy * _Offsets.xy, _MainTex_ST); o.uv[2] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy - 0.5 * _MainTex_TexelSize.xy * _Offsets.xy, _MainTex_ST); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter.shader old mode 100755 new mode 100644 index 659fd1b..7f0404f --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/BrightPassFilterForBloom" { Properties @@ -24,7 +26,7 @@ Shader "Hidden/BrightPassFilterForBloom" v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter2.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter2.shader old mode 100755 new mode 100644 index 2c1ff0b..b076e92 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter2.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/BrightPassFilter2.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/BrightPassFilter2" { Properties @@ -23,7 +25,7 @@ Shader "Hidden/BrightPassFilter2" v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/LensFlareCreate.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/LensFlareCreate.shader old mode 100755 new mode 100644 index 12b633f..bacc63f --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/LensFlareCreate.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/LensFlareCreate.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/LensFlareCreate" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -22,7 +24,7 @@ Shader "Hidden/LensFlareCreate" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = UnityStereoScreenSpaceUVAdjust(( ( v.texcoord.xy - 0.5 ) * -0.85 ) + 0.5, _MainTex_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(( ( v.texcoord.xy - 0.5 ) * -1.45 ) + 0.5, _MainTex_ST); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBloom.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBloom.shader old mode 100755 new mode 100644 index 05e3f64..9a99f46 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBloom.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBloom.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/FastBloom" { Properties { @@ -36,7 +38,7 @@ Shader "Hidden/FastBloom" { { v2f_simple o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST); #if UNITY_UV_STARTS_AT_TOP @@ -61,7 +63,7 @@ Shader "Hidden/FastBloom" { { v2f_tap o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv20 = UnityStereoScreenSpaceUVAdjust(v.texcoord + _MainTex_TexelSize.xy, _MainTex_ST); o.uv21 = UnityStereoScreenSpaceUVAdjust(v.texcoord + _MainTex_TexelSize.xy * half2(-0.5h,-0.5h), _MainTex_ST); o.uv22 = UnityStereoScreenSpaceUVAdjust(v.texcoord + _MainTex_TexelSize.xy * half2(0.5h,-0.5h), _MainTex_ST); @@ -118,7 +120,7 @@ Shader "Hidden/FastBloom" { v2f_withBlurCoords8 vertBlurHorizontal (appdata_img v) { v2f_withBlurCoords8 o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = half4(v.texcoord.xy,1,1); o.offs = _MainTex_TexelSize.xy * half2(1.0, 0.0) * _Parameter.x; @@ -129,7 +131,7 @@ Shader "Hidden/FastBloom" { v2f_withBlurCoords8 vertBlurVertical (appdata_img v) { v2f_withBlurCoords8 o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = half4(v.texcoord.xy,1,1); o.offs = _MainTex_TexelSize.xy * half2(0.0, 1.0) * _Parameter.x; @@ -157,7 +159,7 @@ Shader "Hidden/FastBloom" { v2f_withBlurCoordsSGX vertBlurHorizontalSGX (appdata_img v) { v2f_withBlurCoordsSGX o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = v.texcoord.xy; @@ -172,7 +174,7 @@ Shader "Hidden/FastBloom" { v2f_withBlurCoordsSGX vertBlurVerticalSGX (appdata_img v) { v2f_withBlurCoordsSGX o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = half4(v.texcoord.xy,1,1); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBlur.shader old mode 100755 new mode 100644 index 5c727dd..c9b11f4 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBlur.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MobileBlur.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/FastBlur" { Properties { @@ -34,7 +36,7 @@ Shader "Hidden/FastBlur" { { v2f_tap o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv20 = UnityStereoScreenSpaceUVAdjust(v.texcoord + _MainTex_TexelSize.xy, _MainTex_ST); o.uv21 = UnityStereoScreenSpaceUVAdjust(v.texcoord + _MainTex_TexelSize.xy * half2(-0.5h,-0.5h), _MainTex_ST); o.uv22 = UnityStereoScreenSpaceUVAdjust(v.texcoord + _MainTex_TexelSize.xy * half2(0.5h,-0.5h), _MainTex_ST); @@ -76,7 +78,7 @@ Shader "Hidden/FastBlur" { v2f_withBlurCoords8 vertBlurHorizontal (appdata_img v) { v2f_withBlurCoords8 o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = half4(v.texcoord.xy,1,1); o.offs = _MainTex_TexelSize.xy * half2(1.0, 0.0) * _Parameter.x; @@ -87,7 +89,7 @@ Shader "Hidden/FastBlur" { v2f_withBlurCoords8 vertBlurVertical (appdata_img v) { v2f_withBlurCoords8 o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = half4(v.texcoord.xy,1,1); o.offs = _MainTex_TexelSize.xy * half2(0.0, 1.0) * _Parameter.x; @@ -115,7 +117,7 @@ Shader "Hidden/FastBlur" { v2f_withBlurCoordsSGX vertBlurHorizontalSGX (appdata_img v) { v2f_withBlurCoordsSGX o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); @@ -130,7 +132,7 @@ Shader "Hidden/FastBlur" { v2f_withBlurCoordsSGX vertBlurVerticalSGX (appdata_img v) { v2f_withBlurCoordsSGX o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = half4(UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST),1,1); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MultiPassHollywoodFlares.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MultiPassHollywoodFlares.shader old mode 100755 new mode 100644 index feaa87f..1516913 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MultiPassHollywoodFlares.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/MultiPassHollywoodFlares.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/MultipassHollywoodFlares" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -32,14 +34,14 @@ Shader "Hidden/MultipassHollywoodFlares" { v2f vert (appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; return o; } v2f_opts vertStretch (appdata_img v) { v2f_opts o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); half b = stretchWidth; o.uv[0] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy + b * 2.0 * offsets.xy, _MainTex_ST); @@ -53,7 +55,7 @@ Shader "Hidden/MultipassHollywoodFlares" { v2f_opts vertVerticalCoords (appdata_img v) { v2f_opts o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv[0] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv[1] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy + 0.5 * _MainTex_TexelSize.xy * half2(0,1), _MainTex_ST); o.uv[2] = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy - 0.5 * _MainTex_TexelSize.xy * half2(0,1), _MainTex_ST); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/SeparableBlurPlus.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/SeparableBlurPlus.shader old mode 100755 new mode 100644 index dcff88e..ba3c60b --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/SeparableBlurPlus.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/SeparableBlurPlus.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/SeparableBlurPlus" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -23,7 +25,7 @@ Shader "Hidden/SeparableBlurPlus" { v2f vert (appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = v.texcoord.xy; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/VignetteShader.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/VignetteShader.shader old mode 100755 new mode 100644 index 4289b2d..cf3624f --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/VignetteShader.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_BloomAndFlares/VignetteShader.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/VignetteShader" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -19,7 +21,7 @@ Shader "Hidden/VignetteShader" { v2f vert( appdata_img v ) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv = v.texcoord.xy; return o; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfField34.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfField34.shader old mode 100755 new mode 100644 index aae6460..77efdfe --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfField34.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfField34.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Dof/DepthOfField34" { Properties { _MainTex ("Base", 2D) = "" {} @@ -51,14 +53,14 @@ v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv1.xy = v.texcoord.xy; return o; } v2fRadius vertWithRadius( appdata_img v ) { v2fRadius o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); const half2 blurOffsets[4] = { @@ -83,14 +85,14 @@ v2fDofApply vertDofApply( appdata_img v ) { v2fDofApply o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = v.texcoord.xy; return o; } v2fDown vertDownsampleWithCocConserve(appdata_img v) { v2fDown o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv0.xy = v.texcoord.xy; o.uv[0].xy = v.texcoord.xy + half2(-1.0,-1.0) * _InvRenderTargetSize; o.uv[1].xy = v.texcoord.xy + half2(1.0,-1.0) * _InvRenderTargetSize; diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldDX11.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldDX11.shader old mode 100755 new mode 100644 index 32aab7e..b62ca13 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldDX11.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldDX11.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + /* DX11 Depth Of Field @@ -161,7 +163,7 @@ Pass v2f vert (appdata v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST); o.uv_flip = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST); #if UNITY_UV_STARTS_AT_TOP diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldScatter.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldScatter.shader old mode 100755 new mode 100644 index c38a70b..6623699 --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldScatter.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/DepthOfFieldScatter.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Dof/DepthOfFieldHdr" { Properties { _MainTex ("-", 2D) = "black" {} @@ -47,7 +49,7 @@ v2f vert( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv1.xy = v.texcoord.xy; o.uv.xy = v.texcoord.xy; @@ -62,7 +64,7 @@ v2f vertFlip( appdata_img v ) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv1.xy = v.texcoord.xy; o.uv.xy = v.texcoord.xy; @@ -79,7 +81,7 @@ v2fBlur vertBlurPlusMinus (appdata_img v) { v2fBlur o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv01 = UnityStereoScreenSpaceUVAdjust(v.texcoord.xyxy + _Offsets.xyxy * float4(1,1, -1,-1) * _MainTex_TexelSize.xyxy / 6.0, _MainTex_ST); o.uv23 = UnityStereoScreenSpaceUVAdjust(v.texcoord.xyxy + _Offsets.xyxy * float4(2,2, -2,-2) * _MainTex_TexelSize.xyxy / 6.0, _MainTex_ST); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableBlur.shader old mode 100755 new mode 100644 index 8ea5863..7c8713e --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableBlur.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableBlur.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/SeparableBlur" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -23,7 +25,7 @@ Shader "Hidden/SeparableBlur" { v2f vert (appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableWeightedBlurDof34.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableWeightedBlurDof34.shader old mode 100755 new mode 100644 index abd8c27..1fe8cfb --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableWeightedBlurDof34.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/SeparableWeightedBlurDof34.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/SeparableWeightedBlurDof34" { Properties { _MainTex ("Base (RGB)", 2D) = "" {} @@ -36,7 +38,7 @@ Shader "Hidden/SeparableWeightedBlurDof34" { v2f vert (appdata_img v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST); o.uv01 = UnityStereoScreenSpaceUVAdjust(v.texcoord.xyxy + offsets.xyxy * half4(1,1, -1,-1), _MainTex_ST); o.uv23 = UnityStereoScreenSpaceUVAdjust(v.texcoord.xyxy + offsets.xyxy * half4(1,1, -1,-1) * 2.0, _MainTex_ST); @@ -47,7 +49,7 @@ Shader "Hidden/SeparableWeightedBlurDof34" { v2fSingle vertSingleTex (appdata_img v) { v2fSingle o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.uv.xy = v.texcoord.xy; return o; } diff --git a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/TiltShiftHdrLensBlur.shader b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/TiltShiftHdrLensBlur.shader old mode 100755 new mode 100644 index e79058a..972ba4e --- a/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/TiltShiftHdrLensBlur.shader +++ b/Assets/Standard Assets/Effects/ImageEffects/Shaders/_DepthOfField/TiltShiftHdrLensBlur.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Hidden/Dof/TiltShiftHdrLensBlur" { Properties { @@ -34,7 +36,7 @@ v2f vert (appdata_img v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.uv.xy = v.texcoord; o.uv1.xy = v.texcoord; diff --git a/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorLight.shader b/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorLight.shader old mode 100755 new mode 100644 index 739f810..ef1f463 --- a/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorLight.shader +++ b/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorLight.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // Upgrade NOTE: replaced '_Projector' with 'unity_Projector' // Upgrade NOTE: replaced '_ProjectorClip' with 'unity_ProjectorClip' @@ -35,7 +37,7 @@ Shader "Projector/Light" { v2f vert (float4 vertex : POSITION) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, vertex); + o.pos = UnityObjectToClipPos (vertex); o.uvShadow = mul (unity_Projector, vertex); o.uvFalloff = mul (unity_ProjectorClip, vertex); UNITY_TRANSFER_FOG(o,o.pos); diff --git a/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorMultiply.shader b/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorMultiply.shader old mode 100755 new mode 100644 index 12dc3f0..ec10320 --- a/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorMultiply.shader +++ b/Assets/Standard Assets/Effects/Projectors/Shaders/ProjectorMultiply.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + // Upgrade NOTE: replaced '_Projector' with 'unity_Projector' // Upgrade NOTE: replaced '_ProjectorClip' with 'unity_ProjectorClip' @@ -33,7 +35,7 @@ Shader "Projector/Multiply" { v2f vert (float4 vertex : POSITION) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, vertex); + o.pos = UnityObjectToClipPos (vertex); o.uvShadow = mul (unity_Projector, vertex); o.uvFalloff = mul (unity_ProjectorClip, vertex); UNITY_TRANSFER_FOG(o,o.pos); diff --git a/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLit.mat b/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLit.mat old mode 100755 new mode 100644 index 84c2369..2adb2b3 Binary files a/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLit.mat and b/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLit.mat differ diff --git a/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat b/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat old mode 100755 new mode 100644 index e8c2c41..b7f1305 Binary files a/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat and b/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat differ diff --git a/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasic.shader b/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasic.shader old mode 100755 new mode 100644 index 63f0b37..683b99f --- a/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasic.shader +++ b/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasic.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Toon/Basic" { Properties { _Color ("Main Color", Color) = (.5,.5,.5,1) @@ -40,7 +42,7 @@ Shader "Toon/Basic" { v2f vert (appdata v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); o.cubenormal = mul (UNITY_MATRIX_MV, float4(v.normal,0)); UNITY_TRANSFER_FOG(o,o.pos); diff --git a/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasicOutline.shader b/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasicOutline.shader old mode 100755 new mode 100644 index 3d62217..88776ae --- a/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasicOutline.shader +++ b/Assets/Standard Assets/Effects/ToonShading/Shaders/ToonBasicOutline.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Toon/Basic Outline" { Properties { _Color ("Main Color", Color) = (.5,.5,.5,1) @@ -26,7 +28,7 @@ Shader "Toon/Basic Outline" { v2f vert(appdata v) { v2f o; - o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); float3 norm = normalize(mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal)); float2 offset = TransformViewToProjection(norm.xy); diff --git a/Assets/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat b/Assets/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat index 015fecd..ea00627 100644 Binary files a/Assets/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat and b/Assets/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat differ diff --git a/Assets/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat b/Assets/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat index 9026c5c..5bbb694 100644 Binary files a/Assets/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat and b/Assets/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat differ diff --git a/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader b/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader index dd83c03..1feb221 100644 --- a/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader +++ b/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader @@ -1,3 +1,5 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + Shader "Particles/Priority Additive" { Properties { _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) @@ -52,7 +54,7 @@ Category { v2f vert (appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); #ifdef SOFTPARTICLES_ON o.projPos = ComputeScreenPos (o.vertex); COMPUTE_EYEDEPTH(o.projPos.z); diff --git a/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader b/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader index 8f668c7..81940d9 100644 --- a/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader +++ b/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader @@ -1,4 +1,6 @@ -Shader "Particles/Priority Additive (Soft)" { +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Particles/Priority Additive (Soft)" { Properties { _MainTex ("Particle Texture", 2D) = "white" {} _InvFade ("Soft Particles Factor", Range(0.01,3.0)) = 1.0 @@ -50,7 +52,7 @@ Category { v2f vert (appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); #ifdef SOFTPARTICLES_ON o.projPos = ComputeScreenPos (o.vertex); COMPUTE_EYEDEPTH(o.projPos.z); diff --git a/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader b/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader index ac23e5c..b98d784 100644 --- a/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader +++ b/Assets/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader @@ -1,4 +1,6 @@ -Shader "Particles/Priority Alpha Blended" { +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Particles/Priority Alpha Blended" { Properties { _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) _MainTex ("Particle Texture", 2D) = "white" {} @@ -52,7 +54,7 @@ Category { v2f vert (appdata_t v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); #ifdef SOFTPARTICLES_ON o.projPos = ComputeScreenPos (o.vertex); COMPUTE_EYEDEPTH(o.projPos.z); diff --git a/Assets/Standard Assets/Sparks/Materials/Spark.mat b/Assets/Standard Assets/Sparks/Materials/Spark.mat index bdccf71..9ae2ee4 100644 Binary files a/Assets/Standard Assets/Sparks/Materials/Spark.mat and b/Assets/Standard Assets/Sparks/Materials/Spark.mat differ diff --git a/Assets/Standard Assets/Sparks/Materials/Sparks.mat b/Assets/Standard Assets/Sparks/Materials/Sparks.mat index 6a1b56c..5c4bc3e 100644 Binary files a/Assets/Standard Assets/Sparks/Materials/Sparks.mat and b/Assets/Standard Assets/Sparks/Materials/Sparks.mat differ diff --git a/Assets/Standard Assets/Utility/ParticleSystemDestroyer.cs b/Assets/Standard Assets/Utility/ParticleSystemDestroyer.cs deleted file mode 100644 index db645bc..0000000 --- a/Assets/Standard Assets/Utility/ParticleSystemDestroyer.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections; -using UnityEngine; -using Random = UnityEngine.Random; - -namespace UnityStandardAssets.Utility -{ - public class ParticleSystemDestroyer : MonoBehaviour - { - // allows a particle system to exist for a specified duration, - // then shuts off emission, and waits for all particles to expire - // before destroying the gameObject - - public float minDuration = 8; - public float maxDuration = 10; - - private float m_MaxLifetime; - private bool m_EarlyStop; - - - private IEnumerator Start() - { - var systems = GetComponentsInChildren(); - - // find out the maximum lifetime of any particles in this effect - foreach (var system in systems) - { - m_MaxLifetime = Mathf.Max(system.startLifetime, m_MaxLifetime); - } - - // wait for random duration - - float stopTime = Time.time + Random.Range(minDuration, maxDuration); - - while (Time.time < stopTime || m_EarlyStop) - { - yield return null; - } - Debug.Log("stopping " + name); - - // turn off emission - foreach (var system in systems) - { - var emission = system.emission; - emission.enabled = false; - } - BroadcastMessage("Extinguish", SendMessageOptions.DontRequireReceiver); - - // wait for any remaining particles to expire - yield return new WaitForSeconds(m_MaxLifetime); - - Destroy(gameObject); - } - - - public void Stop() - { - // stops the particle system early - m_EarlyStop = true; - } - } -} diff --git a/Assets/Standard Assets/Utility/ParticleSystemDestroyer.cs.meta b/Assets/Standard Assets/Utility/ParticleSystemDestroyer.cs.meta deleted file mode 100644 index e317df8..0000000 --- a/Assets/Standard Assets/Utility/ParticleSystemDestroyer.cs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 29014cd42b6d273408e0ceefd336c0b3 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: diff --git a/Assets/ToggleInitialStateController.cs b/Assets/ToggleInitialStateController.cs deleted file mode 100644 index 3ec48d3..0000000 --- a/Assets/ToggleInitialStateController.cs +++ /dev/null @@ -1,25 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; - -public class ToggleInitialStateController : MonoBehaviour { - - public bool isMusic; - - private int value; - - // Use this for initialization - void Start () { - if (isMusic) { - value = PlayerPrefs.GetInt ("Music", 1); - } else { - value = PlayerPrefs.GetInt ("Sound", 1); - } - if (value == 1) { - GetComponent ().isOn = true; - } else { - GetComponent ().isOn = false; - } - } - -} diff --git a/Assets/ToggleInitialStateController.cs.meta b/Assets/ToggleInitialStateController.cs.meta deleted file mode 100644 index 0a0849a..0000000 --- a/Assets/ToggleInitialStateController.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 3c6f3841e9e0f4be3b9f236966a00e5d -timeCreated: 1484501822 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TutorialToggleController.cs b/Assets/TutorialToggleController.cs deleted file mode 100644 index 4e38051..0000000 --- a/Assets/TutorialToggleController.cs +++ /dev/null @@ -1,23 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class TutorialToggleController : MonoBehaviour { - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - - } - - public void OnValueChanged (bool newValue) { - if (newValue) { - PlayerPrefs.SetInt ("tutorial", 1); - } else { - PlayerPrefs.SetInt ("tutorial", 0); - } - } -} diff --git a/Assets/TutorialToggleController.cs.meta b/Assets/TutorialToggleController.cs.meta deleted file mode 100644 index 69a7b4c..0000000 --- a/Assets/TutorialToggleController.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 5934c65cec4d14714809c47862ffc0f5 -timeCreated: 1484489165 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5940d57..5c910c7 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index ca9d4d1..5403e07 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 222acc8..097e549 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 027070f..ca1aa05 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.4.3f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 2017.1.0f3 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index bc09532..fdd1002 100644 Binary files a/ProjectSettings/QualitySettings.asset and b/ProjectSettings/QualitySettings.asset differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index be0119f..010646d 100644 Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ