From 3a6cda1a229234e1d2757559f2831ac598dec9ac Mon Sep 17 00:00:00 2001 From: Sewmina Date: Wed, 20 Apr 2022 03:12:23 +0530 Subject: [PATCH] Collectables online, Main hall Join --- .consulo/modules.xml | 31 +- .consulo/workspace.xml | 392 +++-- .../SM_Env_Asteroid_Large_01.prefab.meta | 6 +- .../SM_Env_Asteroid_Large_02.prefab.meta | 7 + .../FX_Textures/Black_Transparent.png.meta | 48 +- .../FX_Textures/Circle_Dashes.png.meta | 48 +- .../Textures/FX_Textures/Explosion.png.meta | 48 +- .../FX_Textures/ExplosionCloud.png.meta | 48 +- .../FX_Textures/Gradient_Boost.png.meta | 48 +- .../Textures/FX_Textures/LineTex 2.png.meta | 80 +- .../Textures/FX_Textures/LineTex 3.png.meta | 78 +- .../Textures/FX_Textures/LineTex 4.png.meta | 76 +- .../PolygonSciFiSpace_Flare_01.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_01_Back.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_01_Down.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_01_Front.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_01_Left.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_01_Right.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_01_Up.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_02_Back.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_02_Down.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_02_Front.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_02_Left.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_02_Right.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_02_Up.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_03_Back.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_03_Down.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_03_Front.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_03_Left.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_03_Right.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_03_Up.png.meta | 84 + .../PolygonSciFiSpace_Skybox_04_Back.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_04_Down.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_04_Front.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_04_Left.png.meta | 58 +- ...PolygonSciFiSpace_Skybox_04_Right.png.meta | 58 +- .../PolygonSciFiSpace_Skybox_04_Up.png.meta | 58 +- .../Textures/FX_Textures/SpaceDust.png.meta | 56 +- .../FX_Textures/SpaceDust_Blur.png.meta | 48 +- .../Textures/FX_Textures/SphereGlow.png.meta | 48 +- .../FX_Textures/Tansparent_Line_Full.png.meta | 48 +- .../Textures/FX_Textures/TrailLines.png.meta | 48 +- .../FX_Textures/Transparent_Flash.png.meta | 48 +- .../FX_Textures/Transparent_Line.png.meta | 48 +- .../Textures/FX_Textures/WindTrail.png.meta | 48 +- Assets/Game/Scenes/GameScene/GameScene.unity | 1389 ++++++++++++++++- .../ScriptableObjects/BuildingData/Mine.asset | 6 +- .../BuildingData/MoonMineral.asset | 3 + .../BuildingData/O2Mine.asset | 3 + Assets/Game/Scripts/Building.cs | 5 +- Assets/Game/Scripts/BuildingData.cs | 2 + Assets/Game/Scripts/BuildingManager.cs | 2 + Assets/Game/Scripts/CameraController.cs | 43 - Assets/Game/Scripts/CameraManager.cs | 79 + ...ntroller.cs.meta => CameraManager.cs.meta} | 0 Assets/Game/Scripts/CollectBtn.cs | 27 + Assets/Game/Scripts/CollectBtn.cs.meta | 11 + Assets/Game/Scripts/DBmanager.cs | 64 + Assets/Game/Scripts/SelectedItemMenu.cs | 28 + Assets/Game/Scripts/WorldItemSelector.cs | 2 + .../Planet/Planet_Land_Mask_01.png.meta | 63 +- .../Planet/PolygonSpace_Planet_01_A.png.meta | 63 +- .../Planet/PolygonSpace_Planet_01_B.png.meta | 63 +- .../Planet/PolygonSpace_Planet_01_C.png.meta | 63 +- .../Planet/PolygonSpace_Planet_01_D.png.meta | 63 +- .../Planet/PolygonSpace_Planet_01_E.png.meta | 63 +- .../Planet/PolygonSpace_Planet_01_F.png.meta | 63 +- .../PolygonSpace_Planet_Lines_01_A.png.meta | 63 +- .../PolygonSpace_Planet_Lines_01_B.png.meta | 63 +- .../PolygonSpace_Planet_Lines_01_C.png.meta | 63 +- .../PolygonSpace_Planet_Lines_01_D.png.meta | 63 +- .../PolygonSpace_Planet_Lines_01_E.png.meta | 63 +- .../PolygonSpace_Planet_Lines_01_F.png.meta | 63 +- Assets/Resources.meta | 8 + ...Newtonsoft.Json-for-Unity.Converters.asset | 153 ++ ...nsoft.Json-for-Unity.Converters.asset.meta | 8 + 76 files changed, 3798 insertions(+), 1632 deletions(-) delete mode 100644 Assets/Game/Scripts/CameraController.cs create mode 100644 Assets/Game/Scripts/CameraManager.cs rename Assets/Game/Scripts/{CameraController.cs.meta => CameraManager.cs.meta} (100%) create mode 100644 Assets/Game/Scripts/CollectBtn.cs create mode 100644 Assets/Game/Scripts/CollectBtn.cs.meta create mode 100644 Assets/Resources.meta create mode 100644 Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset create mode 100644 Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset.meta diff --git a/.consulo/modules.xml b/.consulo/modules.xml index 7468c48aa..07d4b579b 100644 --- a/.consulo/modules.xml +++ b/.consulo/modules.xml @@ -4,7 +4,7 @@ - + DEBUG ENABLE_AR ENABLE_AUDIO @@ -68,7 +68,7 @@ ENABLE_WEBSOCKET_CLIENT ENABLE_WWW INCLUDE_DYNAMIC_GI - NET_STANDARD_2_0 + NET_4_6 PLATFORM_ANDROID PLATFORM_EXTENDS_VULKAN_DEVICE PLATFORM_HAS_MULTIPLE_SWAPCHAINS @@ -91,7 +91,7 @@ UNITY_2020_1_OR_NEWER UNITY_2020_2_OR_NEWER UNITY_2020_3 - UNITY_2020_3_26 + UNITY_2020_3_33 UNITY_2020_3_OR_NEWER UNITY_5_3_OR_NEWER UNITY_5_4_OR_NEWER @@ -135,12 +135,13 @@ - + + @@ -196,12 +197,13 @@ - + + @@ -249,20 +251,32 @@ + + + + + + + + + + - - + + + + @@ -367,12 +381,13 @@ - + + diff --git a/.consulo/workspace.xml b/.consulo/workspace.xml index 9091a370b..aae17781a 100644 --- a/.consulo/workspace.xml +++ b/.consulo/workspace.xml @@ -2,28 +2,76 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -88,7 +106,7 @@ - + @@ -120,7 +138,7 @@ - + @@ -167,7 +185,7 @@ - + @@ -177,7 +195,7 @@ - + @@ -221,7 +239,7 @@ - + @@ -231,7 +249,7 @@ - + @@ -271,7 +289,7 @@ - + @@ -281,7 +299,7 @@ - + @@ -311,7 +329,7 @@ - + @@ -321,7 +339,7 @@ - + @@ -354,15 +372,6 @@ - - - - - - - - - @@ -374,16 +383,6 @@ - - - - - - - - - - @@ -401,7 +400,7 @@ - + @@ -411,7 +410,6 @@ - @@ -425,7 +423,7 @@ - + @@ -435,7 +433,7 @@ - + @@ -443,62 +441,101 @@ + + + + + + + + + - - + + - + - - + + - + - - + + - + - - - + + + + + + + + + + + + + + + - - + + - + + + + + + + + + - - + + + + + + + + + + + + @@ -506,8 +543,8 @@ - - + + @@ -515,10 +552,22 @@ + + + + + + + + + + + + - + @@ -530,18 +579,18 @@ - - + + - + - - + + @@ -549,45 +598,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + @@ -596,10 +613,22 @@ - - + + - + + + + + + + + + + + + + @@ -608,13 +637,25 @@ - - + + + + + + + + + + + + + + @@ -644,7 +685,6 @@ - @@ -684,7 +727,6 @@ - @@ -703,6 +745,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -720,6 +784,7 @@ + @@ -799,11 +864,18 @@ + + + + + + + - @@ -816,25 +888,26 @@ - + - - - - - + + + + - + + + @@ -912,10 +985,11 @@ - - + + + diff --git a/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_01.prefab.meta b/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_01.prefab.meta index e5ade26cb..3ecbe7ad2 100644 --- a/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_01.prefab.meta +++ b/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_01.prefab.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: dcd709e04d3ab2341ab8df4db98c0892 -timeCreated: 1547509927 -licenseType: Store -NativeFormatImporter: - mainObjectFileID: 100100000 +PrefabImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_02.prefab.meta b/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_02.prefab.meta index e69de29bb..507723efb 100644 --- a/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_02.prefab.meta +++ b/Assets/Assets/PolygonSciFiSpace/Prefabs/Environment/SM_Env_Asteroid_Large_02.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69362218cc27e7309a4378ea8a0ed808 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Black_Transparent.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Black_Transparent.png.meta index a43493023..e2a1a4344 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Black_Transparent.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Black_Transparent.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 5398f17d136679c4f8833e244db883bc -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Circle_Dashes.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Circle_Dashes.png.meta index d054ef4cf..794b8059a 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Circle_Dashes.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Circle_Dashes.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: ffccefe6fe078884d91a8574bfef2cda -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Explosion.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Explosion.png.meta index 5bc22968e..c8b8b009e 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Explosion.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Explosion.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: a256bf74230538b46b3de26e640cbecf -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/ExplosionCloud.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/ExplosionCloud.png.meta index 0cee7b48c..be07d7f3c 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/ExplosionCloud.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/ExplosionCloud.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: e6831fbb90816004692bf6ca4ab0f26f -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Gradient_Boost.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Gradient_Boost.png.meta index 9d4093aa9..53ff7e0f3 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Gradient_Boost.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Gradient_Boost.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 558d773a48b1faa4598f4b994d827fad -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 2.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 2.png.meta index f0ef6b03f..52c77a4e3 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 2.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 2.png.meta @@ -1,37 +1,44 @@ fileFormatVersion: 2 guid: 03a7d169469c1af41bb03241a7b7e23d -timeCreated: 1486740437 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: - mipMapMode: 1 + mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 10 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 1 - aniso: 4 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -39,46 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 2 + textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - textureFormat: 5 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - - buildTarget: WebGL + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 3.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 3.png.meta index fb6886d0c..c1702ecd9 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 3.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 3.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: c3512c25766a40245ac94c6b1722d76e -timeCreated: 1491391706 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: - mipMapMode: 1 + mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,18 +21,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: 4 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -39,46 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 2 + textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - textureFormat: 5 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - - buildTarget: WebGL + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 4.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 4.png.meta index a8c3128fd..0d16d36d2 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 4.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/LineTex 4.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: e0f922c44762291498cc62e0917609be -timeCreated: 1491397409 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: - mipMapMode: 1 + mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,18 +21,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 1 - aniso: 4 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -39,46 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 2 + textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - textureFormat: 5 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - - buildTarget: WebGL + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Flare_01.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Flare_01.png.meta index 34773bb91..0dd237cab 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Flare_01.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Flare_01.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: c13267f1211551f43bc1de0dbd46d889 -timeCreated: 1549857029 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Back.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Back.png.meta index 44db11b1c..9e4b9a07d 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Back.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Back.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: df83d08c87fd59e4b8b64f4c6551fc3d -timeCreated: 1549944149 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Down.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Down.png.meta index b07dba153..4c0080dfa 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Down.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Down.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 1475799ef5f179444a847970ce7e4b35 -timeCreated: 1549944148 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Front.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Front.png.meta index 95c1749ed..0a5bca55f 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Front.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Front.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: ed59c5e61962b934f80e3895dae6390d -timeCreated: 1549944150 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Left.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Left.png.meta index 9677d4f79..5116e90fe 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Left.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Left.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: e2a19190917582145a4fb1d33785aef1 -timeCreated: 1549944149 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Right.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Right.png.meta index 836453a01..459cd6a8d 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Right.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Right.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: f7a8f35995a2c6747a5f5bfd0cec8530 -timeCreated: 1549944150 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Up.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Up.png.meta index 790ff4c14..e00e372ea 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Up.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_01_Up.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: cadd6f730cefd1b48b4774765ee29d28 -timeCreated: 1549944148 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Back.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Back.png.meta index 358de4da5..aaa1f204b 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Back.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Back.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 9146a478c72f7944891fac13abe67024 -timeCreated: 1550025507 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Down.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Down.png.meta index ba5514afb..dba0be876 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Down.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Down.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: afcba843fd9e2de46970088ea197d604 -timeCreated: 1550025507 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Front.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Front.png.meta index 7d83d29c6..593f9537d 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Front.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Front.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: f7b6d5ccfa13da64186047da3be36c84 -timeCreated: 1550025508 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Left.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Left.png.meta index 50abf8541..72651b27c 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Left.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Left.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 096163889a32bb34f87c3c7a6e482dbb -timeCreated: 1550025506 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Right.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Right.png.meta index 415475cd9..b4ce5d4e9 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Right.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Right.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 14fd74c69cd7bc744b771bc6baaaf597 -timeCreated: 1550025506 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Up.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Up.png.meta index f5b9c7776..37b3dba48 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Up.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_02_Up.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: d52ad868dcb05c44bb88a2202283cc04 -timeCreated: 1550025507 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Back.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Back.png.meta index cba3a1bc8..90512ad3f 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Back.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Back.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: c4314708fc9dfde47a61dd1e3cfe8eaf -timeCreated: 1550025775 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Down.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Down.png.meta index 10552a79a..80bf5f4d9 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Down.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Down.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 128579b694f31944ab9df5f13269b9d4 -timeCreated: 1550025773 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Front.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Front.png.meta index c62cbed99..ce8647a2c 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Front.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Front.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 5b5f235f621d5b546ad0c9aea614f6fd -timeCreated: 1550025774 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Left.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Left.png.meta index 851c9f3d4..5d704f448 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Left.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Left.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: a5de6302d18e9cd4ca5e6c2ac93224f6 -timeCreated: 1550025774 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Right.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Right.png.meta index fdb9e3c62..b1c141248 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Right.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Right.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: d8ffafcabbae0584dbbd3e3270a94d1a -timeCreated: 1550025775 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Up.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Up.png.meta index e69de29bb..844de5350 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Up.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_03_Up.png.meta @@ -0,0 +1,84 @@ +fileFormatVersion: 2 +guid: 80c5fc685c8ed7f0ca2f675b6a40affd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Back.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Back.png.meta index 81cfae663..106be4e99 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Back.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Back.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: ae84ce89d1258e247a04ad918e96e5bb -timeCreated: 1550026001 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Down.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Down.png.meta index a771fefb9..e1c9eab7b 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Down.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Down.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 8b0e5236251cce34b8df052440f0bbee -timeCreated: 1550026001 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Front.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Front.png.meta index 724685d9d..889287ba2 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Front.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Front.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 78a97482d0091f14faf85c09875717ec -timeCreated: 1550026001 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Left.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Left.png.meta index 10542f363..93202e17b 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Left.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Left.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 0972ba05433ff934f8fe56211e13ad1f -timeCreated: 1550026000 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Right.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Right.png.meta index 3719f9eb3..76e23a29d 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Right.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Right.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 08885e6f733cc8a43b0385adf3ca065d -timeCreated: 1550026000 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Up.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Up.png.meta index a95cb1edc..b0381e966 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Up.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/PolygonSciFiSpace_Skybox_04_Up.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: ba8702646e4568d4fa1c04b34898d250 -timeCreated: 1550026001 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust.png.meta index 77e693099..db5bcbb5d 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 6ffc5d38f0238f74ea8b6ce3e1f9c34c -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,38 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust_Blur.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust_Blur.png.meta index 03f22f90c..57879cabe 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust_Blur.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SpaceDust_Blur.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 0e0fa9d5a604fa448be378195ab51078 -timeCreated: 1549833409 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SphereGlow.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SphereGlow.png.meta index 102b4eec6..8ff4382e5 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SphereGlow.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/SphereGlow.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 516a2a21b5e345f408e5be91be36ebb7 -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Tansparent_Line_Full.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Tansparent_Line_Full.png.meta index ba91bea4b..56f8a1a19 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Tansparent_Line_Full.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Tansparent_Line_Full.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 32cbeb9527524264d95c3560939d58c4 -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/TrailLines.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/TrailLines.png.meta index 97ec12771..e473bdef4 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/TrailLines.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/TrailLines.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 953e2d1db36d7cd42845f3d42c8b9c47 -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Flash.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Flash.png.meta index 3a4da2da5..b87538be1 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Flash.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Flash.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: c7a4569ca909e434e9f9ae16e15f07da -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Line.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Line.png.meta index 7a663e08f..1fb41cc4e 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Line.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/Transparent_Line.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 67eac3f431dd7c44ebd631a7c015b608 -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/WindTrail.png.meta b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/WindTrail.png.meta index 77b05a44d..ca9a24eb8 100644 --- a/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/WindTrail.png.meta +++ b/Assets/Assets/PolygonSciFiSpace/Textures/FX_Textures/WindTrail.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: b6fe504f2d1fecc4a869aea0f582b3a8 -timeCreated: 1549333968 -licenseType: Store TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,9 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +31,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -39,30 +46,51 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game/Scenes/GameScene/GameScene.unity b/Assets/Game/Scenes/GameScene/GameScene.unity index 152512009..bc0085b0b 100644 --- a/Assets/Game/Scenes/GameScene/GameScene.unity +++ b/Assets/Game/Scenes/GameScene/GameScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.45073426, g: 0.50068, b: 0.57484144, a: 1} + m_IndirectSpecularColor: {r: 0.45073473, g: 0.500681, b: 0.57484215, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -796,7 +796,7 @@ Transform: - {fileID: 755976514} - {fileID: 985810808} m_Father: {fileID: 1496275734} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &7038490 BoxCollider: @@ -1690,7 +1690,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 417.81, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!114 &16466549 @@ -19532,6 +19532,82 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5b75a75bddba4a440a7c72c6a9157623, type: 3} +--- !u!1 &187147602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 187147603} + - component: {fileID: 187147605} + - component: {fileID: 187147604} + m_Layer: 5 + m_Name: InfoBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &187147603 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187147602} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 553827866} + m_Father: {fileID: 2098386627} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &187147604 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187147602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8862745, g: 0.85490197, b: 0.80784315, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f8c8215bed96f497ead1535cee19a2a5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &187147605 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187147602} + m_CullTransparentMesh: 1 --- !u!1001 &188612619 PrefabInstance: m_ObjectHideFlags: 0 @@ -23633,6 +23709,36 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 220161861} m_CullTransparentMesh: 0 +--- !u!1 &220396508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 220396509} + m_Layer: 0 + m_Name: Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &220396509 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 220396508} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 4.816, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1783245362} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &220487695 PrefabInstance: m_ObjectHideFlags: 0 @@ -38523,6 +38629,139 @@ Transform: m_CorrespondingSourceObject: {fileID: 4715379540816738, guid: b225b6c4fbbf1f5419c8b635c434c1c4, type: 3} m_PrefabInstance: {fileID: 1123030107} m_PrefabAsset: {fileID: 0} +--- !u!1 &366405336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 366405337} + - component: {fileID: 366405340} + - component: {fileID: 366405339} + - component: {fileID: 366405338} + m_Layer: 5 + m_Name: btn_leave_mainHall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &366405337 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366405336} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1501345794} + m_Father: {fileID: 1669511118} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -320.33234} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &366405338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366405336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 366405339} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1972483758} + m_TargetAssemblyTypeName: CameraManager, Assembly-CSharp + m_MethodName: LeaveMainHall + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &366405339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366405336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.8862745} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c8e14da56adaf4081b6400262fabea15, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &366405340 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366405336} + m_CullTransparentMesh: 1 --- !u!4 &366733445 stripped Transform: m_CorrespondingSourceObject: {fileID: 4823766147398630, guid: 7f72c4f6a7c7bce4d80c9b3e2ee0aad9, type: 3} @@ -43852,7 +44091,7 @@ Transform: - {fileID: 555786627} - {fileID: 110980754} m_Father: {fileID: 1496275734} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &409818848 BoxCollider: @@ -55255,7 +55494,7 @@ RectTransform: m_Children: - {fileID: 1994277185} m_Father: {fileID: 1669511118} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -57646,6 +57885,85 @@ Transform: m_CorrespondingSourceObject: {fileID: 4757966264217168, guid: 7dfa220dea28a9d42b1e5ffc4d0ac69f, type: 3} m_PrefabInstance: {fileID: 566639913} m_PrefabAsset: {fileID: 0} +--- !u!1 &553827865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 553827866} + - component: {fileID: 553827868} + - component: {fileID: 553827867} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &553827866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553827865} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 187147603} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &553827867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553827865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 13 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: INFO +--- !u!222 &553827868 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553827865} + m_CullTransparentMesh: 1 --- !u!1001 &554192669 PrefabInstance: m_ObjectHideFlags: 0 @@ -58988,7 +59306,7 @@ RectTransform: m_Children: - {fileID: 381659750} m_Father: {fileID: 1669511118} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -73992,7 +74310,7 @@ Transform: - {fileID: 223682829} - {fileID: 1159012329} m_Father: {fileID: 1496275734} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &725079808 stripped Transform: @@ -75127,7 +75445,7 @@ Transform: - {fileID: 1332979558} - {fileID: 725309998} m_Father: {fileID: 1496275734} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &734005085 BoxCollider: @@ -80178,6 +80496,85 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da3fcaf2d8bf52f4497ab310539ece41, type: 3} +--- !u!1 &777881273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 777881274} + - component: {fileID: 777881276} + - component: {fileID: 777881275} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &777881274 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777881273} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1192659887} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &777881275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777881273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 13 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: INFO +--- !u!222 &777881276 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777881273} + m_CullTransparentMesh: 1 --- !u!4 &778554955 stripped Transform: m_CorrespondingSourceObject: {fileID: 4724672198492790, guid: 7257f7236ab9dbc418c1b294274672ed, type: 3} @@ -85517,11 +85914,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53edd1304ce7ec14fa61e457a4745d7a, type: 3} m_Name: m_EditorClassIdentifier: - Camera: {fileID: 963194227} + Camera: {fileID: 0} Rotate: 0 - DecreaseCameraPanSpeed: 0.6 - CameraUpperHeightBound: 90 - CameraLowerHeightBound: 80 + DecreaseCameraPanSpeed: 1 + CameraUpperHeightBound: 0 + CameraLowerHeightBound: 0 --- !u!4 &828023762 Transform: m_ObjectHideFlags: 0 @@ -91730,7 +92127,7 @@ Transform: - {fileID: 1108759092} - {fileID: 1495355703} m_Father: {fileID: 1496275734} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &888069989 BoxCollider: @@ -118138,7 +118535,7 @@ Transform: - {fileID: 2030431915} - {fileID: 461976023} m_Father: {fileID: 1496275734} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1134774559 BoxCollider: @@ -120291,6 +120688,139 @@ Transform: m_CorrespondingSourceObject: {fileID: 4403307496631978, guid: cde4bf179b50db24eb898abe2572a3e9, type: 3} m_PrefabInstance: {fileID: 1853531149} m_PrefabAsset: {fileID: 0} +--- !u!1 &1156655248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1156655249} + - component: {fileID: 1156655252} + - component: {fileID: 1156655251} + - component: {fileID: 1156655250} + m_Layer: 5 + m_Name: btn_join + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1156655249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1156655248} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1919901644} + m_Father: {fileID: 1259426725} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -203, y: 190} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1156655250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1156655248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1156655251} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1972483758} + m_TargetAssemblyTypeName: CameraManager, Assembly-CSharp + m_MethodName: JoinMainHall + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1156655251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1156655248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.8862745} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 938c6e5d2549a401c93fb4f43d563bb3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1156655252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1156655248} + m_CullTransparentMesh: 1 --- !u!4 &1157064997 stripped Transform: m_CorrespondingSourceObject: {fileID: 4561988940605264, guid: fd13f817b6a23c54e852836adcac80ab, type: 3} @@ -123466,6 +123996,82 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 27c86aae60a3d584689af9c8917151f6, type: 3} +--- !u!1 &1192659886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1192659887} + - component: {fileID: 1192659889} + - component: {fileID: 1192659888} + m_Layer: 5 + m_Name: InfoBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1192659887 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192659886} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 777881274} + m_Father: {fileID: 1276881590} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1192659888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192659886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8862745, g: 0.85490197, b: 0.80784315, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f8c8215bed96f497ead1535cee19a2a5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1192659889 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192659886} + m_CullTransparentMesh: 1 --- !u!4 &1193213235 stripped Transform: m_CorrespondingSourceObject: {fileID: 4132418365776832, guid: 39a77ed314659264f8de984f7e67e12c, type: 3} @@ -129995,8 +130601,11 @@ RectTransform: - {fileID: 1480392898} - {fileID: 770020520} - {fileID: 386684400} + - {fileID: 2098386627} + - {fileID: 1156655249} + - {fileID: 1276881590} m_Father: {fileID: 1669511118} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -130026,11 +130635,16 @@ MonoBehaviour: nameTxt: {fileID: 1480392899} upgradeMenuBtn: {fileID: 770020523} infoBtn: {fileID: 386684403} + collectBtn: {fileID: 2098386631} + joinHallBtn: {fileID: 1156655250} + repairRocketsBtn: {fileID: 1276881591} infoMenu: {fileID: 1994277184} descriptionTxt: {fileID: 503357262} upgradeMenu: {fileID: 381659749} upgrade_statParent: {fileID: 1524033405} upgradeBtn: {fileID: 1648598145} + mainHall: {fileID: 11400000, guid: b8064a67361de4c648b86f3642bb0317, type: 2} + rocketRepair: {fileID: 11400000, guid: bdcfae8248ea0e27fa898d27a47a42a0, type: 2} --- !u!4 &1259898503 stripped Transform: m_CorrespondingSourceObject: {fileID: 4322694313257492, guid: 5b7c91a625e35744c9263b8194bb306c, type: 3} @@ -131624,6 +132238,127 @@ Transform: m_CorrespondingSourceObject: {fileID: 4823766147398630, guid: 7f72c4f6a7c7bce4d80c9b3e2ee0aad9, type: 3} m_PrefabInstance: {fileID: 1134181005} m_PrefabAsset: {fileID: 0} +--- !u!1 &1276881589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1276881590} + - component: {fileID: 1276881593} + - component: {fileID: 1276881592} + - component: {fileID: 1276881591} + m_Layer: 5 + m_Name: btn_rocket_repair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1276881590 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276881589} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1192659887} + m_Father: {fileID: 1259426725} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 176, y: 190} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1276881591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276881589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1276881592} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1276881592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276881589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.8862745} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5a58fedd40db845f692ac131545c4fee, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1276881593 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276881589} + m_CullTransparentMesh: 1 --- !u!1001 &1277188926 PrefabInstance: m_ObjectHideFlags: 0 @@ -146739,7 +147474,7 @@ Transform: - {fileID: 175151811} - {fileID: 1161336939} m_Father: {fileID: 1496275734} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1463485148 MonoBehaviour: @@ -150023,7 +150758,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1542846718} - {fileID: 1783245362} - {fileID: 1134774558} - {fileID: 1583058844} @@ -150746,6 +151480,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 4399949004957440, guid: da3fcaf2d8bf52f4497ab310539ece41, type: 3} m_PrefabInstance: {fileID: 745441934} m_PrefabAsset: {fileID: 0} +--- !u!1 &1501345793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1501345794} + - component: {fileID: 1501345796} + - component: {fileID: 1501345795} + m_Layer: 5 + m_Name: InfoBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1501345794 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501345793} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2021302767} + m_Father: {fileID: 366405337} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1501345795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501345793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8862745, g: 0.85490197, b: 0.80784315, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f3227c3f1336b49d492a37001ad3f9ac, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1501345796 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501345793} + m_CullTransparentMesh: 1 --- !u!1001 &1501467328 PrefabInstance: m_ObjectHideFlags: 0 @@ -155057,7 +155867,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1542846717} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -30, y: 0, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 100525161} @@ -155203,8 +156013,8 @@ Transform: - {fileID: 1690256597} - {fileID: 2054981260} - {fileID: 559041986} - m_Father: {fileID: 1496275734} - m_RootOrder: 0 + m_Father: {fileID: 1783245362} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1543466012 PrefabInstance: @@ -156167,7 +156977,7 @@ Transform: - {fileID: 1108054596} - {fileID: 263969259} m_Father: {fileID: 1496275734} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1550431835 MonoBehaviour: @@ -159069,7 +159879,7 @@ Transform: m_Children: - {fileID: 929464283} m_Father: {fileID: 1496275734} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1583058845 MonoBehaviour: @@ -164440,6 +165250,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1633828781} m_CullTransparentMesh: 0 +--- !u!1 &1634726670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1634726671} + - component: {fileID: 1634726673} + - component: {fileID: 1634726672} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1634726671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1634726670} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1919901644} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1634726672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1634726670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 13 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: INFO +--- !u!222 &1634726673 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1634726670} + m_CullTransparentMesh: 1 --- !u!4 &1634931557 stripped Transform: m_CorrespondingSourceObject: {fileID: 4521360126009482, guid: aeca2980a82ca9143a228ce92921ad2e, type: 3} @@ -168298,6 +169187,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1972483756} + - {fileID: 366405337} - {fileID: 1259426725} - {fileID: 565192800} - {fileID: 528013728} @@ -171396,7 +172286,7 @@ Transform: - {fileID: 957502854} - {fileID: 1519341249} m_Father: {fileID: 1496275734} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1697685460 BoxCollider: @@ -179599,8 +180489,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 396832336} + - {fileID: 1542846718} + - {fileID: 220396509} m_Father: {fileID: 1496275734} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1783245363 MonoBehaviour: @@ -191685,7 +192577,7 @@ Transform: - {fileID: 444878122} - {fileID: 2093267664} m_Father: {fileID: 1496275734} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1903681473 BoxCollider: @@ -193297,6 +194189,82 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 9bcc6a377b6f6be42861b11a3a94bf93, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 81f151f11d249d8438a34c9e869e346b, type: 3} +--- !u!1 &1919901643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1919901644} + - component: {fileID: 1919901646} + - component: {fileID: 1919901645} + m_Layer: 5 + m_Name: InfoBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1919901644 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919901643} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1634726671} + m_Father: {fileID: 1156655249} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1919901645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919901643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8862745, g: 0.85490197, b: 0.80784315, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f973699071a614d48bb53fad08afa582, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1919901646 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919901643} + m_CullTransparentMesh: 1 --- !u!1 &1920813170 GameObject: m_ObjectHideFlags: 0 @@ -194480,7 +195448,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 788.45, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1934658493 @@ -196988,6 +197956,140 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 55ce8a3b5a66efc4195e34019198cfba, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cde4bf179b50db24eb898abe2572a3e9, type: 3} +--- !u!1 &1959732798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1959732799} + - component: {fileID: 1959732801} + - component: {fileID: 1959732800} + m_Layer: 5 + m_Name: Collectable_Quantity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1959732799 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1959732798} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2098386627} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000025749, y: -33.9} + m_SizeDelta: {x: 103.2, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1959732800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1959732798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278741242 + m_fontColor: {r: 0.9811321, g: 0.40844408, b: 0.032395888, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26.6 + m_fontSizeBase: 26.6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1959732801 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1959732798} + m_CullTransparentMesh: 1 --- !u!1001 &1960182933 PrefabInstance: m_ObjectHideFlags: 0 @@ -198283,7 +199385,7 @@ Transform: - {fileID: 1786596715} - {fileID: 516515630} m_Father: {fileID: 1496275734} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1970335796 MonoBehaviour: @@ -198695,8 +199797,8 @@ GameObject: - component: {fileID: 1972483756} - component: {fileID: 1972483760} - component: {fileID: 1972483759} - - component: {fileID: 1972483758} - component: {fileID: 1972483757} + - component: {fileID: 1972483758} - component: {fileID: 1972483761} m_Layer: 5 m_Name: CanvasInputListener @@ -198742,7 +199844,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1972483758} - m_TargetAssemblyTypeName: CameraController, Assembly-CSharp + m_TargetAssemblyTypeName: CameraManager, Assembly-CSharp m_MethodName: OnMouseDown m_Mode: 0 m_Arguments: @@ -198770,7 +199872,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1972483758} - m_TargetAssemblyTypeName: CameraController, Assembly-CSharp + m_TargetAssemblyTypeName: CameraManager, Assembly-CSharp m_MethodName: OnMouseUp m_Mode: 0 m_Arguments: @@ -198798,7 +199900,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1972483758} - m_TargetAssemblyTypeName: CameraController, Assembly-CSharp + m_TargetAssemblyTypeName: CameraManager, Assembly-CSharp m_MethodName: OnMouseMove m_Mode: 0 m_Arguments: @@ -198828,13 +199930,16 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1972483755} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cf95a4372862ef3d7b3076cf3530ac7c, type: 3} m_Name: m_EditorClassIdentifier: cam: {fileID: 963194228} sensitivity: 0.1 + camTransformSpeed: 0.1 + mainHallTarget: {fileID: 220396509} + leaveHallBtn: {fileID: 366405336} moving: 0 --- !u!114 &1972483759 MonoBehaviour: @@ -203593,7 +204698,7 @@ Transform: - {fileID: 2096774716} - {fileID: 1745321565} m_Father: {fileID: 1496275734} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2016105857 MonoBehaviour: @@ -204007,6 +205112,85 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55eff4bcaa465414dace541f5cee5562, type: 3} +--- !u!1 &2021302766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2021302767} + - component: {fileID: 2021302769} + - component: {fileID: 2021302768} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2021302767 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021302766} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1501345794} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2021302768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021302766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 13 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: INFO +--- !u!222 &2021302769 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021302766} + m_CullTransparentMesh: 1 --- !u!1001 &2022056220 PrefabInstance: m_ObjectHideFlags: 0 @@ -211325,6 +212509,145 @@ Transform: m_CorrespondingSourceObject: {fileID: 4908481620442232, guid: bd830bddacd23904181f7c23555e07dc, type: 3} m_PrefabInstance: {fileID: 821695798} m_PrefabAsset: {fileID: 0} +--- !u!1 &2098386626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2098386627} + - component: {fileID: 2098386630} + - component: {fileID: 2098386629} + - component: {fileID: 2098386628} + - component: {fileID: 2098386631} + m_Layer: 5 + m_Name: Collect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2098386627 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098386626} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 187147603} + - {fileID: 1959732799} + m_Father: {fileID: 1259426725} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 176, y: 190} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2098386628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098386626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2098386629} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2098386629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098386626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.8862745} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5a58fedd40db845f692ac131545c4fee, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2098386630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098386626} + m_CullTransparentMesh: 1 +--- !u!114 &2098386631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098386626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0780243d2e94ca4c88eafaf9c28ed56e, type: 3} + m_Name: + m_EditorClassIdentifier: + productionRate: 0 + collectableAmount: 0 + btn: {fileID: 2098386628} + txt: {fileID: 1959732800} --- !u!1001 &2098658831 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Game/ScriptableObjects/BuildingData/Mine.asset b/Assets/Game/ScriptableObjects/BuildingData/Mine.asset index 896b61472..ae970a45f 100644 --- a/Assets/Game/ScriptableObjects/BuildingData/Mine.asset +++ b/Assets/Game/ScriptableObjects/BuildingData/Mine.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3} m_Name: Mine m_EditorClassIdentifier: - buildingName: Mine + buildingName: Rocket Repair levels: - level: 1 stats: - name: Production rate value: 10% price: 8500 - description: This is a gold mine + description: This is a Rocket Repair + collectable: 0 + productinoRates: [] diff --git a/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset b/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset index 5918d9968..3587a65cc 100644 --- a/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset +++ b/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset @@ -22,3 +22,6 @@ MonoBehaviour: value: 10 price: 7900 description: This is a Moon Minerals Mine + collectable: 1 + productinoRates: + - 0.5 diff --git a/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset b/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset index 9dca463ba..19c6feb9b 100644 --- a/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset +++ b/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset @@ -22,3 +22,6 @@ MonoBehaviour: value: 2 price: 20000 description: This is an Oxygen Mine + collectable: 1 + productinoRates: + - 1 diff --git a/Assets/Game/Scripts/Building.cs b/Assets/Game/Scripts/Building.cs index 4ab0f072b..8a5c4bbf6 100644 --- a/Assets/Game/Scripts/Building.cs +++ b/Assets/Game/Scripts/Building.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System; using UnityEngine; public class Building : MonoBehaviour @@ -6,6 +6,7 @@ public class Building : MonoBehaviour public BuildingData buildingData; public int curLevel; public Outline[] outlines; + public DateTime lastCollected; void OnDrawGizmos() { Gizmos.color = Color.blue; @@ -101,10 +102,12 @@ public class BuildingState{ public string id; public int level; public Vector3 position; + public DateTime lastCollectedTimestamp; public BuildingState(string m_id, int m_level, Vector3 m_position){ id = m_id; level = m_level; position = m_position; + lastCollectedTimestamp = DBmanager.GetNetworkTime(); } } \ No newline at end of file diff --git a/Assets/Game/Scripts/BuildingData.cs b/Assets/Game/Scripts/BuildingData.cs index d5aca1121..12da139bf 100644 --- a/Assets/Game/Scripts/BuildingData.cs +++ b/Assets/Game/Scripts/BuildingData.cs @@ -11,6 +11,8 @@ public class BuildingData : ScriptableObject }; public string description; + public bool collectable; + public float[] productinoRates; } [System.Serializable] diff --git a/Assets/Game/Scripts/BuildingManager.cs b/Assets/Game/Scripts/BuildingManager.cs index 93edc8761..ff6c58cac 100644 --- a/Assets/Game/Scripts/BuildingManager.cs +++ b/Assets/Game/Scripts/BuildingManager.cs @@ -1,3 +1,4 @@ +using System; using EasyButtons; using UnityEngine; @@ -26,6 +27,7 @@ public class BuildingManager : MonoBehaviour buildingExists =true; building.curLevel = buildingState.level; building.transform.position = (buildingState.position != Vector3.zero) ? buildingState.position : building.transform.position; + building.lastCollected = buildingState.lastCollectedTimestamp; break; } } diff --git a/Assets/Game/Scripts/CameraController.cs b/Assets/Game/Scripts/CameraController.cs deleted file mode 100644 index cd4a0f6f2..000000000 --- a/Assets/Game/Scripts/CameraController.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.EventSystems; - -public class CameraManager : MonoBehaviour -{ - public Transform cam; - public float sensitivity; - - void Start() - { - - } - - void Update() - { - - } - - private Vector2 mouseStartPos = Vector2.zero; - private Vector3 cameraStartPos = Vector2.zero; - public bool moving = false; - public void OnMouseDown(BaseEventData e){ - PointerEventData ped = (PointerEventData) e as PointerEventData; - mouseStartPos = ped.position; - cameraStartPos = cam.transform.position; - moving=true; - } - public void OnMouseUp(BaseEventData e){ - PointerEventData ped = (PointerEventData) e as PointerEventData; - moving=false; - } - public void OnMouseMove(BaseEventData e){ - PointerEventData ped = (PointerEventData) e as PointerEventData; - if(moving && !Selector.isMovingBuilding){ - Vector3 offset = (mouseStartPos-ped.position) * sensitivity; - cam.transform.position = cameraStartPos + new Vector3(offset.x,0,offset.y); - } - } - - -} diff --git a/Assets/Game/Scripts/CameraManager.cs b/Assets/Game/Scripts/CameraManager.cs new file mode 100644 index 000000000..7d3fd93e7 --- /dev/null +++ b/Assets/Game/Scripts/CameraManager.cs @@ -0,0 +1,79 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +public class CameraManager : MonoBehaviour +{ + public Transform cam; + public float sensitivity; + + [Header("Main Hall")] + public float camTransformSpeed=0.1f; + public Transform mainHallTarget; + private Vector3 defaultPos; + private Quaternion defaultRot; + public GameObject leaveHallBtn; + public bool isInsideHall => leaveHallBtn.activeSelf; + + void Update() + { + + } + + private Vector2 mouseStartPos = Vector2.zero; + private Vector3 cameraStartPos = Vector2.zero; + private Vector3 mainHallCamRotationStart = Vector3.zero; + public bool moving = false; + public void OnMouseDown(BaseEventData e){ + PointerEventData ped = (PointerEventData) e as PointerEventData; + mouseStartPos = ped.position; + cameraStartPos = cam.transform.position; + mainHallCamRotationStart = cam.transform.eulerAngles; + moving=true; + } + public void OnMouseUp(BaseEventData e){ + PointerEventData ped = (PointerEventData) e as PointerEventData; + moving=false; + } + public void OnMouseMove(BaseEventData e){ + PointerEventData ped = (PointerEventData) e as PointerEventData; + + Vector3 offset = (mouseStartPos-ped.position) * sensitivity; + if(moving && !Selector.isMovingBuilding && !isInsideHall){ + cam.transform.position = cameraStartPos + new Vector3(offset.x,0,offset.y); + }else if(isInsideHall){ + cam.eulerAngles = new Vector3(mainHallCamRotationStart.x - offset.y, mainHallCamRotationStart.y + offset.x); + } + } + + + public void JoinMainHall(){ + Selector.enabled=false; + Selector.selectBuilding(null); + leaveHallBtn.SetActive(true); + defaultPos = cam.position; + defaultRot = cam.rotation; + StartCoroutine(ToggleMainHallCamera(true)); + } + + public void LeaveMainHall(){ + Selector.enabled=true; + leaveHallBtn.SetActive(false); + StartCoroutine(ToggleMainHallCamera(false)); + } + + IEnumerator ToggleMainHallCamera(bool value){ + Vector3 targetPos = (value) ? mainHallTarget.position : defaultPos; + Quaternion targetRot = (value) ? mainHallTarget.rotation : defaultRot; + + while(Vector3.Distance(cam.position, targetPos) > 2 || (cam.rotation * Quaternion.Inverse(targetRot)).eulerAngles.magnitude > 5){ + //Debug.Log("Current rot diff : " + (cam.rotation * Quaternion.Inverse(targetRot)).eulerAngles.magnitude); + cam.position = Vector3.Lerp(cam.position, targetPos,camTransformSpeed); + cam.rotation = Quaternion.Lerp(cam.rotation, targetRot, camTransformSpeed); + yield return new WaitForEndOfFrame(); + } + } + + +} diff --git a/Assets/Game/Scripts/CameraController.cs.meta b/Assets/Game/Scripts/CameraManager.cs.meta similarity index 100% rename from Assets/Game/Scripts/CameraController.cs.meta rename to Assets/Game/Scripts/CameraManager.cs.meta diff --git a/Assets/Game/Scripts/CollectBtn.cs b/Assets/Game/Scripts/CollectBtn.cs new file mode 100644 index 000000000..7e7c3bac8 --- /dev/null +++ b/Assets/Game/Scripts/CollectBtn.cs @@ -0,0 +1,27 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class CollectBtn : MonoBehaviour +{ + public DateTime lastCollected; + public float productionRate; + public double collectableAmount; + public Button btn; + public TMP_Text txt; + + + void Update() + { + collectableAmount=((DateTime.Now - lastCollected).TotalSeconds * productionRate); + txt.text = ((int)collectableAmount).ToString(); + + btn.interactable = collectableAmount > 1; + } + + public void Set(DateTime _lastCollected, float _productionRate){ + lastCollected = _lastCollected; + productionRate=_productionRate; + } +} diff --git a/Assets/Game/Scripts/CollectBtn.cs.meta b/Assets/Game/Scripts/CollectBtn.cs.meta new file mode 100644 index 000000000..9cc02f554 --- /dev/null +++ b/Assets/Game/Scripts/CollectBtn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0780243d2e94ca4c88eafaf9c28ed56e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/DBmanager.cs b/Assets/Game/Scripts/DBmanager.cs index 43f78b1a6..1cd630b71 100644 --- a/Assets/Game/Scripts/DBmanager.cs +++ b/Assets/Game/Scripts/DBmanager.cs @@ -1,10 +1,13 @@ using System; + using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; using UnityEngine; using UnityEngine.Events; using UnityEngine.Networking; +using System.Net; +using System.Net.Sockets; public class DBmanager : MonoBehaviour { public static string phpRoot = "http://38.242.232.13/upf/"; @@ -24,6 +27,67 @@ public class DBmanager : MonoBehaviour username = null; } + public static DateTime GetNetworkTime() + { + //default Windows time server + const string ntpServer = "time.windows.com"; + + // NTP message size - 16 bytes of the digest (RFC 2030) + var ntpData = new byte[48]; + + //Setting the Leap Indicator, Version Number and Mode values + ntpData[0] = 0x1B; //LI = 0 (no warning), VN = 3 (IPv4 only), Mode = 3 (Client Mode) + + var addresses = Dns.GetHostEntry(ntpServer).AddressList; + + //The UDP port number assigned to NTP is 123 + var ipEndPoint = new IPEndPoint(addresses[0], 123); + //NTP uses UDP + + using(var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)) + { + socket.Connect(ipEndPoint); + + //Stops code hang if NTP is blocked + socket.ReceiveTimeout = 3000; + + socket.Send(ntpData); + socket.Receive(ntpData); + socket.Close(); + } + + //Offset to get to the "Transmit Timestamp" field (time at which the reply + //departed the server for the client, in 64-bit timestamp format." + const byte serverReplyTime = 40; + + //Get the seconds part + ulong intPart = BitConverter.ToUInt32(ntpData, serverReplyTime); + + //Get the seconds fraction + ulong fractPart = BitConverter.ToUInt32(ntpData, serverReplyTime + 4); + + //Convert From big-endian to little-endian + intPart = SwapEndianness(intPart); + fractPart = SwapEndianness(fractPart); + + var milliseconds = (intPart * 1000) + ((fractPart * 1000) / 0x100000000L); + + //**UTC** time + var networkDateTime = (new DateTime(1900, 1, 1, 0, 0, 0, DateTimeKind.Utc)).AddMilliseconds((long)milliseconds); + + return networkDateTime.ToLocalTime(); + } + + // stackoverflow.com/a/3294698/162671 + static uint SwapEndianness(ulong x) + { + return (uint) (((x & 0x000000ff) << 24) + + ((x & 0x0000ff00) << 8) + + ((x & 0x00ff0000) >> 8) + + ((x & 0xff000000) >> 24)); + } + + public async static Task SetCoins(int newValue, bool justOffline = false){ WWWForm form = new WWWForm(); form.AddField("name", username); diff --git a/Assets/Game/Scripts/SelectedItemMenu.cs b/Assets/Game/Scripts/SelectedItemMenu.cs index 65b564db3..d3014e661 100644 --- a/Assets/Game/Scripts/SelectedItemMenu.cs +++ b/Assets/Game/Scripts/SelectedItemMenu.cs @@ -8,6 +8,9 @@ public class SelectedItemMenu : MonoBehaviour public Text nameTxt; public Button upgradeMenuBtn; public Button infoBtn; + public CollectBtn collectBtn; + public Button joinHallBtn; + public Button repairRocketsBtn; [Header("info menu")] public GameObject infoMenu; @@ -18,12 +21,17 @@ public class SelectedItemMenu : MonoBehaviour public Transform upgrade_statParent; public Button upgradeBtn; + [Header("Special buildings")] + public BuildingData mainHall; + public BuildingData rocketRepair; + void Start() { Selector.OnSelectedChanged.AddListener(OnSelectionChanged); upgradeMenuBtn.onClick.AddListener(OnUpgradeMenuClicked); infoBtn.onClick.AddListener(OnInfoClicked); upgradeBtn.onClick.AddListener(OnUpgrade); + collectBtn.btn.onClick.AddListener(OnCollect); } void OnSelectionChanged() @@ -39,11 +47,26 @@ public class SelectedItemMenu : MonoBehaviour { upgradeMenuBtn.gameObject.SetActive(true); } + + + if(Selector.selectedData.collectable){ + collectBtn.gameObject.SetActive(true); + Debug.Log("Last collected : " +Selector.selectedBuilding.lastCollected ); + collectBtn.Set(Selector.selectedBuilding.lastCollected,Selector.selectedData.productinoRates[Selector.selectedBuilding.curLevel]); + }else{ + collectBtn.gameObject.SetActive(false); + } + + joinHallBtn.gameObject.SetActive((Selector.selectedData == mainHall)); + repairRocketsBtn.gameObject.SetActive((Selector.selectedData == rocketRepair)); } else { upgradeMenuBtn.gameObject.SetActive(false); infoBtn.gameObject.SetActive(false); + collectBtn.gameObject.SetActive(false); + joinHallBtn.gameObject.SetActive(false); + repairRocketsBtn.gameObject.SetActive(false); } upgradeMenu.SetActive(false); @@ -102,4 +125,9 @@ public class SelectedItemMenu : MonoBehaviour infoMenu.SetActive(true); descriptionTxt.text = Selector.selectedBuilding.buildingData.description; } + + void OnCollect(){ + Debug.Log("Collecting from : " + Selector.selectedData.buildingName); + } + } \ No newline at end of file diff --git a/Assets/Game/Scripts/WorldItemSelector.cs b/Assets/Game/Scripts/WorldItemSelector.cs index 2f2dfb5cc..f392b59a9 100644 --- a/Assets/Game/Scripts/WorldItemSelector.cs +++ b/Assets/Game/Scripts/WorldItemSelector.cs @@ -109,6 +109,7 @@ public class WorldItemSelector : MonoBehaviour } public static class Selector{ + public static bool enabled=true; public static bool movingPointValid; public static Building movingBuilding; public static bool isMovingBuilding => movingBuilding!=null; @@ -118,6 +119,7 @@ public static class Selector{ public static void selectBuilding(Building e){ selectedBuilding = e; + if(!enabled){selectedBuilding=null;} OnSelectedChanged.Invoke(); } diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/Planet_Land_Mask_01.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/Planet_Land_Mask_01.png.meta index aa2a14ffb..a6b2a47ab 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/Planet_Land_Mask_01.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/Planet_Land_Mask_01.png.meta @@ -3,7 +3,7 @@ guid: bbc73dacab0b1e94a82571bfed7a27ad TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_A.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_A.png.meta index bbe3ad30c..887ba2ce0 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_A.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_A.png.meta @@ -3,7 +3,7 @@ guid: 7ac556960bd1dd4439598329daf108ca TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_B.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_B.png.meta index dd6e78220..aada86eb9 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_B.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_B.png.meta @@ -3,7 +3,7 @@ guid: 4e318697f312bdf469e2e2eb0d850d7a TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_C.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_C.png.meta index c16ee7df3..c7f5a7459 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_C.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_C.png.meta @@ -3,7 +3,7 @@ guid: da7a00115e8ae3b41a9b29c2b2aae1a1 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_D.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_D.png.meta index 33690c6bf..a02212a11 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_D.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_D.png.meta @@ -3,7 +3,7 @@ guid: bff9cec39e8865949bf27094ccecd125 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_E.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_E.png.meta index 4af30201e..7c1e40784 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_E.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_E.png.meta @@ -3,7 +3,7 @@ guid: 1ad8d18a28d3cfa4b9338440f0f94e4d TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_F.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_F.png.meta index f9086d38b..1bdf38079 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_F.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_01_F.png.meta @@ -3,7 +3,7 @@ guid: 3489d8f82f8dd7f44bf5d778e9d1f08c TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_A.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_A.png.meta index d6c8773b7..044ed96b8 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_A.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_A.png.meta @@ -3,7 +3,7 @@ guid: faee21986d055df4a82bcc829ea6dbd6 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_B.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_B.png.meta index 49c7b4dca..cb82a52c2 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_B.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_B.png.meta @@ -3,7 +3,7 @@ guid: a7354e2989b6938408ff718606d81be5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_C.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_C.png.meta index 7731f0510..9c17ba3ed 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_C.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_C.png.meta @@ -3,7 +3,7 @@ guid: d0ac645da9b5a4a4db4e323d58fb2c83 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_D.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_D.png.meta index 07dd6b605..b82c19826 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_D.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_D.png.meta @@ -3,7 +3,7 @@ guid: a22633082f90f1348a01ddcd1c9bc8c5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_E.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_E.png.meta index d220f4995..aed495d6f 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_E.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_E.png.meta @@ -3,7 +3,7 @@ guid: 83ac4e630776ef84ab44405d98bee31f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_F.png.meta b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_F.png.meta index 5417afa82..a75a15bdb 100644 --- a/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_F.png.meta +++ b/Assets/PolygonSciFiSpace/Textures/Planet/PolygonSpace_Planet_Lines_01_F.png.meta @@ -3,7 +3,7 @@ guid: 9f4c354f50768f74f95596a3cebb902f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,61 +55,17 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 000000000..72aa3b6ba --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00126e20dc5410b3c893e1e4010a75b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset b/Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset new file mode 100644 index 000000000..9769de827 --- /dev/null +++ b/Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset @@ -0,0 +1,153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce56e4dbb13e1644aa983b6dd170e4a7, type: 3} + m_Name: Newtonsoft.Json-for-Unity.Converters + m_EditorClassIdentifier: + useUnityContractResolver: 1 + useAllOutsideConverters: 1 + outsideConverters: [] + useAllUnityConverters: 1 + unityConverters: + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.AI.NavMesh.NavMeshQueryFilterConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.AI.NavMesh.NavMeshTriangulationConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Camera.CullingGroupEventConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Geometry.BoundsConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Geometry.BoundsIntConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Geometry.PlaneConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Geometry.RectConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Geometry.RectIntConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Geometry.RectOffsetConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Hashing.Hash128Converter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.Color32Converter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.ColorConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.Matrix4x4Converter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.QuaternionConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.SphericalHarmonicsL2Converter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.Vector2Converter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.Vector2IntConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.Vector3Converter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.Vector3IntConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Math.Vector4Converter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.NativeArray.NativeArrayConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Physics.JointDriveConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Physics.JointLimitsConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Physics.SoftJointLimitConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Physics2D.ColliderDistance2DConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Physics2D.ContactFilter2DConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Random.RandomStateConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Scripting.LayerMaskConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.UnityConverters.Scripting.RangeIntConverter + settings: [] + useAllJsonNetConverters: 0 + jsonNetConverters: + - enabled: 1 + converterName: Newtonsoft.Json.Converters.StringEnumConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.Converters.VersionConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.BinaryConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.BsonObjectIdConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.DataSetConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.DataTableConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.DiscriminatedUnionConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.EntityKeyMemberConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.ExpandoObjectConverter + settings: [] + - enabled: 1 + converterName: Newtonsoft.Json.Converters.IsoDateTimeConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.JavaScriptDateTimeConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.KeyValuePairConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.RegexConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.UnixDateTimeConverter + settings: [] + - enabled: 0 + converterName: Newtonsoft.Json.Converters.XmlNodeConverter + settings: [] diff --git a/Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset.meta b/Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset.meta new file mode 100644 index 000000000..b5ba5666f --- /dev/null +++ b/Assets/Resources/Newtonsoft.Json-for-Unity.Converters.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55e8e937990a08cdbbc9cd3c9a116fa6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: