diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml index 7941cfd63..6c4efcc1d 100644 --- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml +++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml @@ -1936,6 +1936,7 @@ + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 424203d6e..95ce3cfd7 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -676,6 +676,7 @@ + diff --git a/Assets/Materials/UI/Panel Blur.mat b/Assets/Materials/UI/Panel Blur.mat index 42cb5b606..2da2fda6e 100644 --- a/Assets/Materials/UI/Panel Blur.mat +++ b/Assets/Materials/UI/Panel Blur.mat @@ -74,8 +74,8 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _AdditiveColor: {r: 0.01530794, g: 0.036446206, b: 0.0754717, a: 0} + - _AdditiveColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _MultiplyColor: {r: 0.86774653, g: 0.89065343, b: 0.9433962, a: 1} + - _MultiplyColor: {r: 0.7008722, g: 0.7432107, b: 0.8490566, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Flat UI/DotRight.png.meta b/Assets/Resources/Sprites/Flat UI/DotRight.png.meta index 995fed29a..83f83796a 100644 --- a/Assets/Resources/Sprites/Flat UI/DotRight.png.meta +++ b/Assets/Resources/Sprites/Flat UI/DotRight.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 7b21eb9dd8a2f07468305b1e3fd4497f TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -57,8 +58,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,6 +72,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: [] @@ -76,10 +104,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 437c59f5a03717844a1c0b681279dd2b + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Flat UI/Node.psd b/Assets/Resources/Sprites/Flat UI/Node.psd deleted file mode 100644 index 818a6cfb0..000000000 --- a/Assets/Resources/Sprites/Flat UI/Node.psd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc268066a0ab49d6d79262b80b225b16a5759c64aa15e32f84b50a5e60eaa240 -size 20696 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes.meta b/Assets/Resources/Sprites/Flat UI/Nodes.meta new file mode 100644 index 000000000..4dec35611 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9430390b391327546960fd1b0303f494 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderBottom.png b/Assets/Resources/Sprites/Flat UI/Nodes/BorderBottom.png new file mode 100644 index 000000000..4f12af47b --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderBottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3ab8fab9a3cfb3ee54b8730593d0aee39e7a9e61e9b84b51a02e3b3d7b61ea5 +size 2496 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderBottom.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/BorderBottom.png.meta new file mode 100644 index 000000000..a0b975f0d --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderBottom.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 3997e2b87b8931f4a94668a6a0cd8ed7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderLeft.png b/Assets/Resources/Sprites/Flat UI/Nodes/BorderLeft.png new file mode 100644 index 000000000..5d2aecded --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderLeft.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:162ded3574c61ba382e607f6c4401a759f0dfbc6d2f9f17806b44e9bb87fbca1 +size 2492 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderLeft.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/BorderLeft.png.meta new file mode 100644 index 000000000..507b10741 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderLeft.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 407bb39b89c7e5744925063ba99e1a0c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderRight.png b/Assets/Resources/Sprites/Flat UI/Nodes/BorderRight.png new file mode 100644 index 000000000..5ddaef7f9 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderRight.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:105918e89a462ef800d9394098bd54457575c52ab9e85b72b8fad0e425ca2684 +size 2492 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderRight.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/BorderRight.png.meta new file mode 100644 index 000000000..c8d5974ae --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderRight.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 0efeb1ca800344a4f973c0dcbbf0080c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderTop.png b/Assets/Resources/Sprites/Flat UI/Nodes/BorderTop.png new file mode 100644 index 000000000..6b9be1aef --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderTop.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8e4b6f60a713bbd6caa7d639f96f048b25e45bef82a3e9372e02fb01c49b0b7 +size 2496 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/BorderTop.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/BorderTop.png.meta new file mode 100644 index 000000000..66c0085a4 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/BorderTop.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 05aabe3e66febe040b916fb556af3c2d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomLeft.png b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomLeft.png new file mode 100644 index 000000000..927ab2967 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomLeft.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71f81857d7279f8369c4f84a2292c9671df09844144c1d011d6b4435c6b1e1d9 +size 2523 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomLeft.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomLeft.png.meta new file mode 100644 index 000000000..ca4db4a34 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomLeft.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 79dab51cfc49cbe4d89082cf70885eaf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomRight.png b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomRight.png new file mode 100644 index 000000000..322d74b7b --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomRight.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dd40816f1355e9d04ba57e1116d0ac91d2e6148ea42e65780ed7db4fb13a36f +size 2523 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomRight.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomRight.png.meta new file mode 100644 index 000000000..5898bde8d --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerBottomRight.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 368b26c578eaec540bc51dfca9e09620 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopLeft.png b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopLeft.png new file mode 100644 index 000000000..57458f484 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopLeft.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a37f1ea1ad5abf1497c62c88f062da6c734f4602afb8e9b3a12c13655e05d7ba +size 2507 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopLeft.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopLeft.png.meta new file mode 100644 index 000000000..ac29d2d23 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopLeft.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 6f4fc1998ba1d0a4c96ab0c825baec2f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopRight.png b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopRight.png new file mode 100644 index 000000000..6f9538396 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopRight.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:052bce5e55bb3755d74645802c06903ef9be0cf7bde1d97f6fe63f185620ff47 +size 2516 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopRight.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopRight.png.meta new file mode 100644 index 000000000..a52626f6c --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/CornerTopRight.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: d11373d0fc3154a409073bfd9b5851dc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndBottom.png b/Assets/Resources/Sprites/Flat UI/Nodes/EndBottom.png new file mode 100644 index 000000000..6db416621 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndBottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acb669d264a03341a71817de19fe1f52e085ef5a4342f1cbd5550f070b2fa637 +size 2537 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndBottom.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/EndBottom.png.meta new file mode 100644 index 000000000..99dbe8497 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndBottom.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: a95dded84e209374a83374cc99ccff09 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndLeft.png b/Assets/Resources/Sprites/Flat UI/Nodes/EndLeft.png new file mode 100644 index 000000000..01e888971 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndLeft.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90c1a7e49d74ec6aa188dd00fa3ae5eafae7c9e5a255e7b2a8dcd41068c9b207 +size 2535 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndLeft.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/EndLeft.png.meta new file mode 100644 index 000000000..bc10cf03c --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndLeft.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 45f0e5e2648ab8a40ba0d8e384188776 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndRight.png b/Assets/Resources/Sprites/Flat UI/Nodes/EndRight.png new file mode 100644 index 000000000..c30d467ab --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndRight.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be5fb1b7721f011920524fd733a057ae3400a8d729de23259d14f36c9e7b6c7 +size 2540 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndRight.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/EndRight.png.meta new file mode 100644 index 000000000..4d5208ea6 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndRight.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: a73282f92bb42f34e88a6e3296f71e9c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndTop.png b/Assets/Resources/Sprites/Flat UI/Nodes/EndTop.png new file mode 100644 index 000000000..247449349 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndTop.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f5f436c9cac0a6e7145b48d637d81a68aad681ac21bfd44f187136f3e424c71 +size 2521 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/EndTop.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/EndTop.png.meta new file mode 100644 index 000000000..5408baba9 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/EndTop.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: fde9e02fdfa01be4b97ad7b45b166360 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/Node.psd b/Assets/Resources/Sprites/Flat UI/Nodes/Node.psd new file mode 100644 index 000000000..6d6ffb16f --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/Node.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3af507be4381e88149b320b36a2d268203d2966cd559ef3aab8ac8b109f1227 +size 22682 diff --git a/Assets/Resources/Sprites/Flat UI/Node.psd.meta b/Assets/Resources/Sprites/Flat UI/Nodes/Node.psd.meta similarity index 98% rename from Assets/Resources/Sprites/Flat UI/Node.psd.meta rename to Assets/Resources/Sprites/Flat UI/Nodes/Node.psd.meta index 286694b15..460c3c28c 100644 --- a/Assets/Resources/Sprites/Flat UI/Node.psd.meta +++ b/Assets/Resources/Sprites/Flat UI/Nodes/Node.psd.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 6, y: 6, z: 6, w: 6} + spriteBorder: {x: 8, y: 8, z: 8, w: 8} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/ThroughHorizontal.png b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughHorizontal.png new file mode 100644 index 000000000..b0543dbac --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughHorizontal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e129a393390c19e92bda91ad5496bf5cb1ec84455b6279316839c3f6d8b2ece +size 2498 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/ThroughHorizontal.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughHorizontal.png.meta new file mode 100644 index 000000000..02e029539 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughHorizontal.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: a805925aee905444cb50ca67b8e31074 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/ThroughVertical.png b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughVertical.png new file mode 100644 index 000000000..062c239f7 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughVertical.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fe9fead89199f3f259d9413c67afd395c3470a3a02c29a7e6a82359d937c50f +size 2498 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/ThroughVertical.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughVertical.png.meta new file mode 100644 index 000000000..904f8ae51 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/Nodes/ThroughVertical.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 4903bfae607ca83468a5b74ccf5ed827 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + 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: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 2334183c7..959f77a7e 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -3804,7 +3804,7 @@ RectTransform: 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: -50} + m_AnchoredPosition: {x: 0, y: -49.99994} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &249703112 @@ -4761,7 +4761,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &346000247 RectTransform: m_ObjectHideFlags: 0 @@ -5273,7 +5273,7 @@ RectTransform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} @@ -5319,8 +5319,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1863852358} m_HandleRect: {fileID: 1863852357} m_Direction: 2 - m_Value: 0 - m_Size: 1 + m_Value: 1 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -5372,6 +5372,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 456626302} + - component: {fileID: 456626303} m_Layer: 5 m_Name: Inventory Cell m_TagString: Untagged @@ -5394,11 +5395,23 @@ RectTransform: m_Father: {fileID: 710974995} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 220, y: -247} - m_SizeDelta: {x: 32, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &456626303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 456626301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &459052957 GameObject: m_ObjectHideFlags: 0 @@ -6986,13 +6999,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 568539021} + - component: {fileID: 568539022} m_Layer: 5 m_Name: Inventory m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &568539021 RectTransform: m_ObjectHideFlags: 0 @@ -7006,6 +7020,8 @@ RectTransform: m_Children: - {fileID: 30325823} - {fileID: 1736632659} + - {fileID: 744201243} + - {fileID: 1339197097} - {fileID: 1580606745} m_Father: {fileID: 761574181} m_RootOrder: 5 @@ -7015,6 +7031,37 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &568539022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568539020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78aa0b8ec7594a7438f13757228e3500, type: 3} + m_Name: + m_EditorClassIdentifier: + Title: {fileID: 744201244} + Grid: {fileID: 710974996} + NodeTextures: + - {fileID: 21300000, guid: 31f38e71d656fb141b1a8242a15e308c, type: 3} + - {fileID: 21300000, guid: a95dded84e209374a83374cc99ccff09, type: 3} + - {fileID: 21300000, guid: 45f0e5e2648ab8a40ba0d8e384188776, type: 3} + - {fileID: 21300000, guid: 79dab51cfc49cbe4d89082cf70885eaf, type: 3} + - {fileID: 21300000, guid: fde9e02fdfa01be4b97ad7b45b166360, type: 3} + - {fileID: 21300000, guid: 4903bfae607ca83468a5b74ccf5ed827, type: 3} + - {fileID: 21300000, guid: 6f4fc1998ba1d0a4c96ab0c825baec2f, type: 3} + - {fileID: 21300000, guid: 407bb39b89c7e5744925063ba99e1a0c, type: 3} + - {fileID: 21300000, guid: a73282f92bb42f34e88a6e3296f71e9c, type: 3} + - {fileID: 21300000, guid: 368b26c578eaec540bc51dfca9e09620, type: 3} + - {fileID: 21300000, guid: a805925aee905444cb50ca67b8e31074, type: 3} + - {fileID: 21300000, guid: 3997e2b87b8931f4a94668a6a0cd8ed7, type: 3} + - {fileID: 21300000, guid: d11373d0fc3154a409073bfd9b5851dc, type: 3} + - {fileID: 21300000, guid: 0efeb1ca800344a4f973c0dcbbf0080c, type: 3} + - {fileID: 21300000, guid: 05aabe3e66febe040b916fb556af3c2d, type: 3} + NodePrototype: {fileID: 456626303} --- !u!1 &569895571 GameObject: m_ObjectHideFlags: 0 @@ -8467,6 +8514,7 @@ GameObject: m_Component: - component: {fileID: 710974995} - component: {fileID: 710974996} + - component: {fileID: 710974997} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -8486,14 +8534,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 456626302} - - {fileID: 1387443815} m_Father: {fileID: 1505156505} 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.000015258789, y: 0} - m_SizeDelta: {x: -4, y: -2} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &710974996 MonoBehaviour: @@ -8515,10 +8562,24 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 2 m_StartAxis: 0 - m_CellSize: {x: 32, y: 32} + m_CellSize: {x: 24, y: 24} m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 4 +--- !u!114 &710974997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 710974994} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &713373301 GameObject: m_ObjectHideFlags: 0 @@ -9699,6 +9760,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 738229275} m_CullTransparentMesh: 0 +--- !u!1 &744201242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744201243} + - component: {fileID: 744201245} + - component: {fileID: 744201244} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &744201243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744201242} + 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: 568539021} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 16, y: -8} + m_SizeDelta: {x: -52, y: 50.2} + m_Pivot: {x: 0, y: 1} +--- !u!114 &744201244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744201242} + 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: Djinni Bay 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 42 + m_fontSizeBase: 42 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 1024 + 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: 1 + 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 &744201245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744201242} + m_CullTransparentMesh: 0 --- !u!1 &745574482 GameObject: m_ObjectHideFlags: 0 @@ -10980,14 +11176,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 887677621} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0.9228971, z: -0, w: 0.3850468} m_LocalPosition: {x: 0, y: 0, z: -2.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1319157835} m_Father: {fileID: 1665127616} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -134.707, z: 0} --- !u!1 &887755819 GameObject: m_ObjectHideFlags: 0 @@ -12289,6 +12485,7 @@ MonoBehaviour: TopDownCamera: {fileID: 887677622} FollowCamera: {fileID: 887677622} GameplayUI: {fileID: 346000246} + InventoryPanel: {fileID: 568539022} --- !u!4 &1009503730 Transform: m_ObjectHideFlags: 0 @@ -13271,7 +13468,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 31f38e71d656fb141b1a8242a15e308c, type: 3} + m_Sprite: {fileID: 21300000, guid: 45f0e5e2648ab8a40ba0d8e384188776, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13812,9 +14009,9 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &1187465194 MonoBehaviour: @@ -13858,8 +14055,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1511218668} m_HandleRect: {fileID: 1511218667} m_Direction: 0 - m_Value: 0 - m_Size: 1 + m_Value: 1 + m_Size: 0.9999999 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -14730,6 +14927,102 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1327101800} m_CullTransparentMesh: 0 +--- !u!1 &1339197096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1339197097} + - component: {fileID: 1339197100} + - component: {fileID: 1339197099} + - component: {fileID: 1339197098} + m_Layer: 5 + m_Name: Divider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1339197097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339197096} + 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: 568539021} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 1, y: -64} + m_SizeDelta: {x: -2, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1339197098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339197096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 4 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1339197099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339197096} + 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.8, g: 0.9333333, 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_Sprite: {fileID: 21300000, guid: 7b21eb9dd8a2f07468305b1e3fd4497f, 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 &1339197100 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339197096} + m_CullTransparentMesh: 0 --- !u!1 &1350808569 GameObject: m_ObjectHideFlags: 0 @@ -15262,42 +15555,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1384745566} m_CullTransparentMesh: 0 ---- !u!1 &1387443814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1387443815} - m_Layer: 5 - m_Name: Inventory Cell (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1387443815 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387443814} - 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: 1973463310} - m_Father: {fileID: 710974995} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 252, y: -247} - m_SizeDelta: {x: 32, y: 32} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1390575962 GameObject: m_ObjectHideFlags: 0 @@ -16559,9 +16816,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1505156506 MonoBehaviour: @@ -16744,7 +17001,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.9999999, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -18340,12 +18597,12 @@ RectTransform: - {fileID: 1187465193} - {fileID: 454123651} m_Father: {fileID: 568539021} - m_RootOrder: 2 + m_RootOrder: 4 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: -16.000006, y: -16} + m_AnchoredPosition: {x: 0, y: -28.000008} + m_SizeDelta: {x: -16.000006, y: -71.999985} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1580606746 MonoBehaviour: @@ -18370,9 +18627,9 @@ MonoBehaviour: m_Viewport: {fileID: 1505156505} m_HorizontalScrollbar: {fileID: 1187465194} m_VerticalScrollbar: {fileID: 454123652} - m_HorizontalScrollbarVisibility: 1 + m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 + m_HorizontalScrollbarSpacing: 0 m_VerticalScrollbarSpacing: 0 m_OnValueChanged: m_PersistentCalls: @@ -20818,7 +21075,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -21188,7 +21445,7 @@ RectTransform: 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: -50} + m_AnchoredPosition: {x: 0, y: -49.99994} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1754532904 @@ -21758,7 +22015,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -23004,81 +23261,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3} m_ActionId: 766f9151-3f3d-4e12-8ade-ce5aacd3940f ---- !u!1 &1973463309 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1973463310} - - component: {fileID: 1973463312} - - component: {fileID: 1973463311} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1973463310 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1973463309} - 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: 1387443815} - 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 &1973463311 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1973463309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 1cb3b89320b91bf4986d2333eebadbbd, type: 2} - 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_Sprite: {fileID: 21300000, guid: 31f38e71d656fb141b1a8242a15e308c, type: 3} - m_Type: 1 - 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 &1973463312 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1973463309} - m_CullTransparentMesh: 0 --- !u!1 &1973552680 GameObject: m_ObjectHideFlags: 0 @@ -24631,7 +24813,7 @@ RectTransform: 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: -31.999878} + m_AnchoredPosition: {x: 0, y: -31.999939} m_SizeDelta: {x: 0, y: -64} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2115559087 @@ -24713,7 +24895,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2115559087} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0.9228971, z: -0, w: 0.3850468} m_LocalPosition: {x: 0, y: 0, z: -2.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] diff --git a/Assets/Scripts/ActionGameManager.cs b/Assets/Scripts/ActionGameManager.cs index f85ee9286..9102f4470 100644 --- a/Assets/Scripts/ActionGameManager.cs +++ b/Assets/Scripts/ActionGameManager.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.IO; +using System.Linq; using Cinemachine; using MessagePack; using UniRx; @@ -19,6 +20,7 @@ public class ActionGameManager : MonoBehaviour public CinemachineVirtualCamera TopDownCamera; public CinemachineVirtualCamera FollowCamera; public GameObject GameplayUI; + public InventoryPanel InventoryPanel; //public PlayerInput Input; private DirectoryInfo _filePath; @@ -27,23 +29,23 @@ public class ActionGameManager : MonoBehaviour private AetheriaInput _input; private int _zoomLevelIndex; - public DatabaseCache Cache { get; private set; } - public ItemManager Context { get; private set; } + public DatabaseCache ItemData { get; private set; } + public ItemManager ItemManager { get; private set; } public Zone Zone { get; private set; } void Start() { ConsoleController.MessageReceiver = this; _filePath = new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData"); - Cache = new DatabaseCache(); - Cache.Load(_filePath.FullName); - Context = new ItemManager(Cache, Settings.GameplaySettings, Debug.Log); + ItemData = new DatabaseCache(); + ItemData.Load(_filePath.FullName); + ItemManager = new ItemManager(ItemData, Settings.GameplaySettings, Debug.Log); var zoneFile = Path.Combine(_filePath.FullName, "Home.zone"); // If the game has already been run, there will be a Home file containing a ZonePack; if not, generate one var zonePack = File.Exists(zoneFile) ? - MessagePackSerializer.Deserialize(File.ReadAllBytes(zoneFile)) : + MessagePackSerializer.Deserialize(File.ReadAllBytes(zoneFile)): ZoneGenerator.GenerateZone( settings: Settings.ZoneSettings, // mapLayers: Context.MapLayers, @@ -91,6 +93,11 @@ public class ActionGameManager : MonoBehaviour Zone.Data.Name = args[0]; SaveZone(); }); + + var hullType = ItemData.GetAll().First(x=>x.HullType==HullType.Ship); + var hull = ItemManager.CreateInstance(hullType, 0, 1) as EquippableItem; + var entity = new Ship(ItemManager, Zone, hull); + InventoryPanel.Display(ItemManager, entity); } public void SaveZone() => File.WriteAllBytes( @@ -108,7 +115,7 @@ public class ActionGameManager : MonoBehaviour if(!_editMode) { _time += Time.deltaTime; - Context.Time = Time.time; + ItemManager.Time = Time.time; } Zone.Update(_time, Time.deltaTime); SectorRenderer.Time = _time; diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index a80bfe98e..8344e45a5 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -44,9 +44,9 @@ public abstract class Entity private bool _active; - private EquippedItem[,] _gearOccupancy; - private EquippedItem[,] _thermalOccupancy; - private HardpointData[,] _hardpoints; + public EquippedItem[,] GearOccupancy; + public EquippedItem[,] ThermalOccupancy; + public HardpointData[,] Hardpoints; public ItemManager ItemManager { get; } public int AssignedPopulation => PopulationAssignments.Sum(pa => pa.AssignedPopulation); @@ -77,20 +77,21 @@ public abstract class Entity ItemManager = itemManager; Zone = zone; Hull = hull; + MapShip(); } private void MapShip() { var hullData = ItemManager.GetData(Hull) as HullData; - _gearOccupancy = new EquippedItem[hullData.Shape.Width, hullData.Shape.Height]; - _thermalOccupancy = new EquippedItem[hullData.Shape.Width, hullData.Shape.Height]; - _hardpoints = new HardpointData[hullData.Shape.Width, hullData.Shape.Height]; + GearOccupancy = new EquippedItem[hullData.Shape.Width, hullData.Shape.Height]; + ThermalOccupancy = new EquippedItem[hullData.Shape.Width, hullData.Shape.Height]; + Hardpoints = new HardpointData[hullData.Shape.Width, hullData.Shape.Height]; foreach (var hardpoint in hullData.Hardpoints) { foreach (var hardpointCoord in hardpoint.Shape.Coordinates) { var hullCoord = hardpoint.Position + hardpointCoord; - _hardpoints[hullCoord.x, hullCoord.y] = hardpoint; + Hardpoints[hullCoord.x, hullCoord.y] = hardpoint; } } } @@ -193,7 +194,7 @@ public abstract class Entity foreach (var i in itemData.Shape.Coordinates) { var itemCoord = item.Position + itemData.Shape.Rotate(i, item.EquippableItem.Rotation); - (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[itemCoord.x, itemCoord.y] = null; + (itemData.HardpointType == HardpointType.Thermal ? ThermalOccupancy : GearOccupancy)[itemCoord.x, itemCoord.y] = null; } return item.EquippableItem; @@ -211,12 +212,12 @@ public abstract class Entity // If there is any gear already occupying that space, it won't fit // Thermal items have their own layer and do not collide with gear var itemCoord = hullCoord + itemData.Shape.Rotate(i, item.Rotation); - if (!hullData.InteriorCells[itemCoord] || (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[itemCoord.x, itemCoord.y] != null) return false; + if (!hullData.InteriorCells[itemCoord] || (itemData.HardpointType == HardpointType.Thermal ? ThermalOccupancy : GearOccupancy)[itemCoord.x, itemCoord.y] != null) return false; } } else { - var hardpoint = _hardpoints[hullCoord.x, hullCoord.y]; + var hardpoint = Hardpoints[hullCoord.x, hullCoord.y]; // If there's no hardpoint there, it won't fit if (hardpoint == null) return false; @@ -233,7 +234,7 @@ public abstract class Entity // If there is any gear already occupying that space, it won't fit // Items placed in hardpoints are automatically aligned to hardpoint rotation var itemCoord = hardpoint.Position + itemData.Shape.Rotate(i, hardpoint.Rotation); - if (_gearOccupancy[itemCoord.x, itemCoord.y] != null) return false; + if (GearOccupancy[itemCoord.x, itemCoord.y] != null) return false; } } @@ -320,7 +321,7 @@ public abstract class Entity foreach (var i in itemData.Shape.Coordinates) { var occupiedCoord = hullCoord + itemData.Shape.Rotate(i, item.Rotation); - (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[occupiedCoord.x, occupiedCoord.y] = equippedItem; + (itemData.HardpointType == HardpointType.Thermal ? ThermalOccupancy : GearOccupancy)[occupiedCoord.x, occupiedCoord.y] = equippedItem; } Hydrate(equippedItem); @@ -334,7 +335,7 @@ public abstract class Entity foreach (var i in itemData.Shape.Coordinates) { var occupiedCoord = hullCoord + i; - (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[occupiedCoord.x, occupiedCoord.y] = equippedItem; + (itemData.HardpointType == HardpointType.Thermal ? ThermalOccupancy : GearOccupancy)[occupiedCoord.x, occupiedCoord.y] = equippedItem; } Hydrate(equippedItem); diff --git a/Assets/Scripts/ServerShared/Enums.cs b/Assets/Scripts/ServerShared/Enums.cs index d8c665fc2..7d94dc79f 100644 --- a/Assets/Scripts/ServerShared/Enums.cs +++ b/Assets/Scripts/ServerShared/Enums.cs @@ -18,19 +18,17 @@ public enum LauncherCaliber public enum HardpointType { Hull, + Tool, Thermal, Thruster, WarpThruster, Reactor, Radiator, Shield, - Cooler, Sensors, - Tool, Energy, Ballistic, Launcher, - Infrastructure, ControlModule } diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs index d5880e137..9e7176a94 100644 --- a/Assets/Scripts/ServerShared/ItemData.cs +++ b/Assets/Scripts/ServerShared/ItemData.cs @@ -90,15 +90,31 @@ public class Shape private IEnumerable EnumerateShapeCoordinates() { - for(int x = 0; x < Width; x++) + for (int y = 0; y < Height; y++) { - for (int y = 0; y < Height; y++) + for(int x = 0; x < Width; x++) { if(Cells[x,y]) yield return int2(x, y); } } } + private int2[] _cachedAllShapeCoordinates; + + [IgnoreMember] + public int2[] AllCoordinates => _cachedAllShapeCoordinates ?? (_cachedAllShapeCoordinates = EnumerateAllShapeCoordinates().ToArray()); + + private IEnumerable EnumerateAllShapeCoordinates() + { + for (int y = 0; y < Height; y++) + { + for(int x = 0; x < Width; x++) + { + yield return int2(x, y); + } + } + } + public bool this[int2 pos] { get { return pos.x >= 0 && pos.y >= 0 && pos.x < Cells.GetLength(0) && pos.y < Cells.GetLength(1) && Cells[pos.x, pos.y]; } set @@ -306,7 +322,7 @@ public class HardpointData : ITintInspector x => ColorMath.HsvToRgb(float3((float)(int)x/hardpointTypes.Length, 1, 1))); } - return _tintColors[Type]; + return _tintColors.ContainsKey(Type) ? _tintColors[Type] : _tintColors[HardpointType.Hull]; } } private static Dictionary _tintColors; diff --git a/Assets/Scripts/ServerShared/ItemManager.cs b/Assets/Scripts/ServerShared/ItemManager.cs index 220254473..f155004ae 100644 --- a/Assets/Scripts/ServerShared/ItemManager.cs +++ b/Assets/Scripts/ServerShared/ItemManager.cs @@ -411,14 +411,13 @@ public class ItemManager // return ship; // } - public SimpleCommodity CreateInstance(Guid data, int count) + public SimpleCommodity CreateInstance(SimpleCommodityData item, int count) { - var item = ItemData.Get(data); if (item != null) { var newItem = new SimpleCommodity { - Data = data, + Data = item.ID, Quantity = count }; //ItemData.Add(newItem); @@ -429,16 +428,15 @@ public class ItemManager return null; } - public CraftedItemInstance CreateInstance(Guid data, float qualityMin, float qualityMax) + public CraftedItemInstance CreateInstance(CraftedItemData item, float qualityMin, float qualityMax) { - var item = ItemData.Get(data); if (item == null) { _logger("Attempted to create crafted item instance using missing or incorrect item id!"); return null; } - var blueprint = ItemData.GetAll().FirstOrDefault(b => b.Item == data); + var blueprint = ItemData.GetAll().FirstOrDefault(b => b.Item == item.ID); if (blueprint == null) { _logger("Attempted to create crafted item instance which has no blueprint!"); @@ -451,9 +449,9 @@ public class ItemManager foreach (var ingredient in blueprint.Ingredients) { var itemData = ItemData.Get(ingredient.Key); - if (itemData is SimpleCommodityData) + if (itemData is SimpleCommodityData simpleIngredientData) { - var itemInstance = CreateInstance(ingredient.Key, ingredient.Value); + var itemInstance = CreateInstance(simpleIngredientData, ingredient.Value); if(itemInstance == null) { invalidIngredientFound = true; @@ -463,9 +461,10 @@ public class ItemManager } else { + var craftedIngredientData = ItemData.Get(ingredient.Key); for (int i = 0; i < ingredient.Value; i++) { - var itemInstance = CreateInstance(ingredient.Key, qualityMin, qualityMax); + var itemInstance = CreateInstance(craftedIngredientData, qualityMin, qualityMax); if (itemInstance == null) { invalidIngredientFound = true; @@ -488,7 +487,7 @@ public class ItemManager { var newGear = new EquippableItem { - Data = data, + Data = item.ID, Ingredients = ingredients, Quality = Random.NextFloat(qualityMin, qualityMax), Blueprint = blueprint.ID, @@ -500,7 +499,7 @@ public class ItemManager var newCommodity = new CompoundCommodity { - Data = data, + Data = item.ID, Ingredients = ingredients, Quality = Random.NextFloat(qualityMin, qualityMax), Blueprint = blueprint.ID, diff --git a/Assets/Scripts/UI/InventoryPanel.cs b/Assets/Scripts/UI/InventoryPanel.cs new file mode 100644 index 000000000..541d649e1 --- /dev/null +++ b/Assets/Scripts/UI/InventoryPanel.cs @@ -0,0 +1,91 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using TMPro; +using Unity.Mathematics; +using UnityEngine; +using UnityEngine.UI; +using static Unity.Mathematics.math; + +public class InventoryPanel : MonoBehaviour +{ + public TextMeshProUGUI Title; + public GridLayoutGroup Grid; + public Sprite[] NodeTextures; + public Prototype NodePrototype; + + private Dictionary _nodeInstances; + + public void Display(ItemManager manager, Entity entity) + { + var hullData = manager.GetData(entity.Hull) as HullData; + Grid.constraintCount = hullData.Shape.Width; + _nodeInstances = hullData.Shape.AllCoordinates + .ToDictionary(v => v, + v => + { + if (!hullData.Shape[v]) + { + var empty = new GameObject("Empty Node", typeof(RectTransform)); + empty.transform.SetParent(Grid.transform); + return empty; + } + + var spriteIndex = 0; + var interior = hullData.InteriorCells[v]; + var item = entity.GearOccupancy[v.x, v.y]; + var hardpoint = entity.Hardpoints[v.x, v.y]; + if (hardpoint != null) + { + if (hullData.Shape[v + int2(0, 1)] && + entity.Hardpoints[v.x, v.y + 1] == hardpoint && + entity.GearOccupancy[v.x, v.y + 1] == item) + spriteIndex += 1; + if (hullData.Shape[v + int2(1, 0)] && + entity.Hardpoints[v.x + 1, v.y] == hardpoint && + entity.GearOccupancy[v.x + 1, v.y] == item) + spriteIndex += 2; + if (hullData.Shape[v + int2(0, -1)] && + entity.Hardpoints[v.x, v.y - 1] == hardpoint && + entity.GearOccupancy[v.x, v.y - 1] == item) + spriteIndex += 4; + if (hullData.Shape[v + int2(-1, 0)] && + entity.Hardpoints[v.x - 1, v.y] == hardpoint && + entity.GearOccupancy[v.x - 1, v.y] == item) + spriteIndex += 8; + } + else + { + if (hullData.Shape[v + int2(0, 1)] && ( + !interior && !hullData.InteriorCells[v + int2(0, 1)] && entity.Hardpoints[v.x, v.y + 1] == null || + interior && item != null && entity.GearOccupancy[v.x, v.y + 1] == item)) + spriteIndex += 1; + if (hullData.Shape[v + int2(1, 0)] && ( + !interior && !hullData.InteriorCells[v + int2(1, 0)] && entity.Hardpoints[v.x + 1, v.y] == null || + interior && item != null && entity.GearOccupancy[v.x + 1, v.y] == item)) + spriteIndex += 2; + if (hullData.Shape[v + int2(0, -1)] && ( + !interior && !hullData.InteriorCells[v + int2(0, -1)] && entity.Hardpoints[v.x, v.y - 1] == null || + interior && item != null && entity.GearOccupancy[v.x, v.y - 1] == item)) + spriteIndex += 4; + if (hullData.Shape[v + int2(-1, 0)] && ( + !interior && !hullData.InteriorCells[v + int2(-1, 0)] && entity.Hardpoints[v.x - 1, v.y] == null || + interior && item != null && entity.GearOccupancy[v.x - 1, v.y] == item)) + spriteIndex += 8; + } + + if (spriteIndex == 15) + { + var empty = new GameObject("Empty Node", typeof(RectTransform)); + empty.transform.SetParent(Grid.transform); + return empty; + } + + var node = NodePrototype.Instantiate().gameObject; + var image = node.GetComponentInChildren(); + image.sprite = NodeTextures[spriteIndex]; + image.color = hardpoint != null ? hardpoint.TintColor.ToColor() : interior ? Color.white * .5f : Color.white; + return node; + }); + } +} diff --git a/Assets/Scripts/UI/InventoryPanel.cs.meta b/Assets/Scripts/UI/InventoryPanel.cs.meta new file mode 100644 index 000000000..51c89b4fa --- /dev/null +++ b/Assets/Scripts/UI/InventoryPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 78aa0b8ec7594a7438f13757228e3500 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: