diff --git a/Assets/Art/Logomakr_13fv0q.png.meta b/Assets/Art/Logomakr_13fv0q.png.meta index 6fd6833..61fb7d8 100644 --- a/Assets/Art/Logomakr_13fv0q.png.meta +++ b/Assets/Art/Logomakr_13fv0q.png.meta @@ -58,7 +58,7 @@ TextureImporter: - buildTarget: DefaultTexturePlatform maxTextureSize: 32 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -66,7 +66,7 @@ TextureImporter: - buildTarget: Standalone maxTextureSize: 32 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Art/game art/Logomakr_8uVkWL.png b/Assets/Art/game art/Logomakr_8uVkWL.png new file mode 100644 index 0000000..e4c559b Binary files /dev/null and b/Assets/Art/game art/Logomakr_8uVkWL.png differ diff --git a/Assets/Art/game art/Logomakr_8uVkWL.png.meta b/Assets/Art/game art/Logomakr_8uVkWL.png.meta new file mode 100644 index 0000000..21b2fec --- /dev/null +++ b/Assets/Art/game art/Logomakr_8uVkWL.png.meta @@ -0,0 +1,172 @@ +fileFormatVersion: 2 +guid: 510c9ee25b3ab7a4db2c8cf4ac952cb5 +timeCreated: 1508384047 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 21300000: Logomakr_8uVkWL_0 + 21300002: Logomakr_8uVkWL_1 + 21300004: Logomakr_8uVkWL_2 + 21300006: Logomakr_8uVkWL_3 + 21300008: Logomakr_8uVkWL_4 + 21300010: Logomakr_8uVkWL_5 + 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: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 400 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 128 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Logomakr_8uVkWL_0 + rect: + serializedVersion: 2 + x: 0 + y: 459 + width: 453 + height: 453 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: Logomakr_8uVkWL_1 + rect: + serializedVersion: 2 + x: 474 + y: 463 + width: 454 + height: 453 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: Logomakr_8uVkWL_2 + rect: + serializedVersion: 2 + x: 947 + y: 463 + width: 453 + height: 453 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: Logomakr_8uVkWL_3 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 453 + height: 453 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: Logomakr_8uVkWL_4 + rect: + serializedVersion: 2 + x: 474 + y: 4 + width: 454 + height: 453 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: Logomakr_8uVkWL_5 + rect: + serializedVersion: 2 + x: 947 + y: 4 + width: 453 + height: 453 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old.meta b/Assets/Art/game art/Old.meta new file mode 100644 index 0000000..0522671 --- /dev/null +++ b/Assets/Art/game art/Old.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d184941aaf7ad924584ccf5c946c6ba6 +folderAsset: yes +timeCreated: 1508383972 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_0He9hd.png b/Assets/Art/game art/Old/Logomakr_0He9hd.png new file mode 100644 index 0000000..446294b Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_0He9hd.png differ diff --git a/Assets/Art/game art/Old/Logomakr_0He9hd.png.meta b/Assets/Art/game art/Old/Logomakr_0He9hd.png.meta new file mode 100644 index 0000000..62781c2 --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_0He9hd.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: cd9d42fd10bccc94f9aca3be25ba5fbf +timeCreated: 1508383588 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_0fn6I5.png b/Assets/Art/game art/Old/Logomakr_0fn6I5.png new file mode 100644 index 0000000..d819fd0 Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_0fn6I5.png differ diff --git a/Assets/Art/game art/Old/Logomakr_0fn6I5.png.meta b/Assets/Art/game art/Old/Logomakr_0fn6I5.png.meta new file mode 100644 index 0000000..734157c --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_0fn6I5.png.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 6f68ab55442249340833eb8d67b2bdab +timeCreated: 1508379604 +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: 32 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 32 + 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/Art/game art/Old/Logomakr_0mcA0W.png b/Assets/Art/game art/Old/Logomakr_0mcA0W.png new file mode 100644 index 0000000..8fdc541 Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_0mcA0W.png differ diff --git a/Assets/Art/game art/Old/Logomakr_0mcA0W.png.meta b/Assets/Art/game art/Old/Logomakr_0mcA0W.png.meta new file mode 100644 index 0000000..ae35134 --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_0mcA0W.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: a69d7625be3104c4593d4ac7cae4dc5e +timeCreated: 1508383587 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_1NnjhA.png b/Assets/Art/game art/Old/Logomakr_1NnjhA.png new file mode 100644 index 0000000..f9bb1a0 Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_1NnjhA.png differ diff --git a/Assets/Art/game art/Old/Logomakr_1NnjhA.png.meta b/Assets/Art/game art/Old/Logomakr_1NnjhA.png.meta new file mode 100644 index 0000000..4ee0e18 --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_1NnjhA.png.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 7187425945de3e240a48fe3bbdd35270 +timeCreated: 1508379605 +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: 32 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 32 + 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/Art/game art/Old/Logomakr_25hlG8.png b/Assets/Art/game art/Old/Logomakr_25hlG8.png new file mode 100644 index 0000000..38c43bd Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_25hlG8.png differ diff --git a/Assets/Art/game art/Old/Logomakr_25hlG8.png.meta b/Assets/Art/game art/Old/Logomakr_25hlG8.png.meta new file mode 100644 index 0000000..ea29dc4 --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_25hlG8.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: d3f952558a2c43048a7e292dd513db48 +timeCreated: 1508383588 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_3WLNFb.png b/Assets/Art/game art/Old/Logomakr_3WLNFb.png new file mode 100644 index 0000000..4288acd Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_3WLNFb.png differ diff --git a/Assets/Art/game art/Old/Logomakr_3WLNFb.png.meta b/Assets/Art/game art/Old/Logomakr_3WLNFb.png.meta new file mode 100644 index 0000000..7593a7d --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_3WLNFb.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 87b583ea9b9c3964da964bc10bf6123b +timeCreated: 1508379606 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_4gce6p.png b/Assets/Art/game art/Old/Logomakr_4gce6p.png new file mode 100644 index 0000000..769fb50 Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_4gce6p.png differ diff --git a/Assets/Art/game art/Old/Logomakr_4gce6p.png.meta b/Assets/Art/game art/Old/Logomakr_4gce6p.png.meta new file mode 100644 index 0000000..5dfeba3 --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_4gce6p.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 7075053f6c9ec904e802101292cbb10e +timeCreated: 1508383587 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_7SeuB0.png b/Assets/Art/game art/Old/Logomakr_7SeuB0.png new file mode 100644 index 0000000..b290e76 Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_7SeuB0.png differ diff --git a/Assets/Art/game art/Old/Logomakr_7SeuB0.png.meta b/Assets/Art/game art/Old/Logomakr_7SeuB0.png.meta new file mode 100644 index 0000000..e641abf --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_7SeuB0.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 84ca842dbe374eb4fa7c59a9604d06c8 +timeCreated: 1508383587 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_84adKA.png b/Assets/Art/game art/Old/Logomakr_84adKA.png new file mode 100644 index 0000000..063849a Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_84adKA.png differ diff --git a/Assets/Art/game art/Old/Logomakr_84adKA.png.meta b/Assets/Art/game art/Old/Logomakr_84adKA.png.meta new file mode 100644 index 0000000..a96835d --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_84adKA.png.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: fe75fdca6081362458dbe896a78f6c0c +timeCreated: 1508383682 +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: 284, z: 1014, w: 0} + spritePixelsToUnits: 50 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 128 + 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/Art/game art/Old/Logomakr_8m4gHU.png b/Assets/Art/game art/Old/Logomakr_8m4gHU.png new file mode 100644 index 0000000..f8fd2a4 Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_8m4gHU.png differ diff --git a/Assets/Art/game art/Old/Logomakr_8m4gHU.png.meta b/Assets/Art/game art/Old/Logomakr_8m4gHU.png.meta new file mode 100644 index 0000000..cbd4e70 --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_8m4gHU.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: a5e9ff245983ef44b8918cd399bf8816 +timeCreated: 1508379607 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/game art/Old/Logomakr_96m7A8.png b/Assets/Art/game art/Old/Logomakr_96m7A8.png new file mode 100644 index 0000000..2ee07c3 Binary files /dev/null and b/Assets/Art/game art/Old/Logomakr_96m7A8.png differ diff --git a/Assets/Art/game art/Old/Logomakr_96m7A8.png.meta b/Assets/Art/game art/Old/Logomakr_96m7A8.png.meta new file mode 100644 index 0000000..7f710ce --- /dev/null +++ b/Assets/Art/game art/Old/Logomakr_96m7A8.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 89dcb66acac097549956f5c586bb8e5f +timeCreated: 1508379606 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Gizmos/ConveyorGizmo.prefab b/Assets/Prefabs/Gizmos/ConveyorGizmo.prefab index b979136..bbcf16c 100644 --- a/Assets/Prefabs/Gizmos/ConveyorGizmo.prefab +++ b/Assets/Prefabs/Gizmos/ConveyorGizmo.prefab @@ -76,7 +76,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &1254356039972270 GameObject: m_ObjectHideFlags: 0 @@ -92,7 +92,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &1358596202425160 GameObject: m_ObjectHideFlags: 1 @@ -227,7 +227,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1211253907497376} - m_LocalRotation: {x: 0, y: 0, z: -0.87288547, w: 0.48792526} + m_LocalRotation: {x: 0, y: 0, z: -0.9967857, w: -0.080114596} m_LocalPosition: {x: 0.7, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -240,7 +240,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1155444506240496} - m_LocalRotation: {x: 0, y: 0, z: -0.87288547, w: 0.48792526} + m_LocalRotation: {x: 0, y: 0, z: -0.9967857, w: -0.080114596} m_LocalPosition: {x: -0.7, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -253,7 +253,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1453861502233460} - m_LocalRotation: {x: 0, y: 0, z: -0.87288547, w: 0.48792526} + m_LocalRotation: {x: 0, y: 0, z: -0.9967857, w: -0.080114596} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -266,7 +266,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1954633248200272} - m_LocalRotation: {x: 0, y: 0, z: -0.87288547, w: 0.48792526} + m_LocalRotation: {x: 0, y: 0, z: -0.9967857, w: -0.080114596} m_LocalPosition: {x: 1.4, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -311,7 +311,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1358596202425160} - m_LocalRotation: {x: 0, y: 0, z: -0.87288547, w: 0.48792526} + m_LocalRotation: {x: 0, y: 0, z: -0.9967857, w: -0.080114596} m_LocalPosition: {x: -1.4, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -338,7 +338,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1692976957675764} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.11, y: -0.85, z: 0} + m_LocalPosition: {x: -5.81, y: 1.11, z: 0} m_LocalScale: {x: 0.520661, y: 0.7224861, z: 1} m_Children: - {fileID: 4774802319903046} diff --git a/Assets/Prefabs/balls/BallBounce.physicsMaterial2D b/Assets/Prefabs/balls/BallBounce.physicsMaterial2D index cf25102..b1f3b76 100644 --- a/Assets/Prefabs/balls/BallBounce.physicsMaterial2D +++ b/Assets/Prefabs/balls/BallBounce.physicsMaterial2D @@ -6,5 +6,5 @@ PhysicsMaterial2D: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: BallBounce - friction: 0.6 + friction: 1 bounciness: 0.2 diff --git a/Assets/Prefabs/balls/GreenBall.prefab b/Assets/Prefabs/balls/GreenBall.prefab new file mode 100644 index 0000000..5da6c82 --- /dev/null +++ b/Assets/Prefabs/balls/GreenBall.prefab @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1743798012550768} + m_IsPrefabParent: 1 +--- !u!1 &1743798012550768 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4799168568244138} + - component: {fileID: 212951391944248036} + - component: {fileID: 50300547889970954} + - component: {fileID: 114856406163422654} + - component: {fileID: 61795682242879282} + - component: {fileID: 58724480628618474} + m_Layer: 0 + m_Name: GreenBall + m_TagString: Ball + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4799168568244138 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1743798012550768} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.93, y: 2.34, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.5} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &50300547889970954 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1743798012550768} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 50 + m_GravityScale: 1 + m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &58724480628618474 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1743798012550768} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.55 +--- !u!61 &61795682242879282 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1743798012550768} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 6c0e483e449473842846ec8c4b441b8c, type: 2} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.1350001, y: 1.1325} + newSize: {x: 1.36, y: 1.36} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &114856406163422654 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1743798012550768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!212 &212951391944248036 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1743798012550768} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300002, guid: 510c9ee25b3ab7a4db2c8cf4ac952cb5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.36, y: 1.36} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/Assets/Prefabs/balls/GreenBall.prefab.meta b/Assets/Prefabs/balls/GreenBall.prefab.meta new file mode 100644 index 0000000..778b7b3 --- /dev/null +++ b/Assets/Prefabs/balls/GreenBall.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c1270abe3786b2c4993cabe7ecbc6ad5 +timeCreated: 1508379728 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/balls/NewBall.physicsMaterial2D b/Assets/Prefabs/balls/NewBall.physicsMaterial2D new file mode 100644 index 0000000..7ef460d --- /dev/null +++ b/Assets/Prefabs/balls/NewBall.physicsMaterial2D @@ -0,0 +1,10 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: NewBall + friction: 0.4 + bounciness: 0 diff --git a/Assets/Prefabs/balls/NewBall.physicsMaterial2D.meta b/Assets/Prefabs/balls/NewBall.physicsMaterial2D.meta new file mode 100644 index 0000000..f5ca7ba --- /dev/null +++ b/Assets/Prefabs/balls/NewBall.physicsMaterial2D.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 139f793bc49838445ad588e0a8c84ff3 +timeCreated: 1508384000 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/balls/WhiteBall.prefab b/Assets/Prefabs/balls/WhiteBall.prefab index 51616fe..6577119 100644 --- a/Assets/Prefabs/balls/WhiteBall.prefab +++ b/Assets/Prefabs/balls/WhiteBall.prefab @@ -58,7 +58,7 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 50 + m_AngularDrag: 100 m_GravityScale: 1 m_Material: {fileID: 0} m_Interpolate: 0 diff --git a/Assets/Scenes/level0.unity b/Assets/Scenes/level0.unity index 0478e09..3acb9a8 100644 --- a/Assets/Scenes/level0.unity +++ b/Assets/Scenes/level0.unity @@ -300,7 +300,7 @@ Transform: m_LocalScale: {x: 18.007347, y: 10.104942, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &578051945 Prefab: @@ -618,7 +618,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4960614154651808, guid: 101aa4ded2b02194b8f30cf57a1693b6, type: 2} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 1692976957675764, guid: 101aa4ded2b02194b8f30cf57a1693b6, type: 2} propertyPath: m_Name @@ -930,7 +930,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -47.899994, y: 0.000061035156} + m_AnchoredPosition: {x: -47.900024, y: 0.000061035156} m_SizeDelta: {x: 84.599976, y: 0.000061035156} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1182704974 @@ -981,6 +981,48 @@ MonoBehaviour: conveyerBelt: {fileID: 1692976957675764, guid: 101aa4ded2b02194b8f30cf57a1693b6, type: 2} conveyerBeltTxt: {fileID: 1303979215} +--- !u!1001 &1183844032 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalPosition.x + value: -2.93 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalPosition.y + value: 2.34 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1194691717 GameObject: m_ObjectHideFlags: 0 @@ -1129,7 +1171,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4960614154651808, guid: 101aa4ded2b02194b8f30cf57a1693b6, type: 2} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1692976957675764, guid: 101aa4ded2b02194b8f30cf57a1693b6, type: 2} propertyPath: m_Name @@ -1212,6 +1254,52 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1303979213} +--- !u!1001 &1589957113 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalPosition.x + value: -2.232 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalPosition.y + value: 2.34 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4799168568244138, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1743798012550768, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + propertyPath: m_Name + value: GreenBall (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c1270abe3786b2c4993cabe7ecbc6ad5, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1696711924 GameObject: m_ObjectHideFlags: 0 @@ -1250,7 +1338,7 @@ Transform: m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1717014566 Prefab: @@ -1291,6 +1379,12 @@ Prefab: propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} + - target: {fileID: 114285646664625160, guid: 3306f917e9bd84aba9be9cca93ae7d8b, + type: 2} + propertyPath: ballObject + value: + objectReference: {fileID: 1743798012550768, guid: c1270abe3786b2c4993cabe7ecbc6ad5, + type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 3306f917e9bd84aba9be9cca93ae7d8b, type: 2} m_IsPrefabParent: 0 @@ -1326,7 +1420,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 12.4, y: -80.21001} + m_AnchoredPosition: {x: 12.4, y: -80.21002} m_SizeDelta: {x: 26.4, y: 26.300003} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1777659596 diff --git a/Assets/Scripts/Conveyor.cs b/Assets/Scripts/Conveyor.cs index 266cb45..6430f5b 100644 --- a/Assets/Scripts/Conveyor.cs +++ b/Assets/Scripts/Conveyor.cs @@ -17,6 +17,9 @@ void Start () { rotateArrow = gameObject.transform.GetChild (1).gameObject; directionArrow = gameObject.transform.GetChild (2).gameObject; + rotateArrow.SetActive(true); + directionArrow.SetActive(true); + Button playBtn = GameObject.Find ("Play").GetComponent