diff --git a/.gitignore b/.gitignore index 0c70a87915f27b4be5a57b887cad14238e75e77b..b07286e3273e1a04ddd68a97737b420a2016bcd4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ # ProBuilder/ProGrid files [Aa]ssets/ProCore/ +[Pp]rojectSettings/Packages/com.unity.probuilder/Settings.json # Autogenerated Jetbrains Rider plugin [Aa]ssets/Plugins/Editor/JetBrains* diff --git a/Assets/Images/Arrow_down.png b/Assets/Images/Arrow_down.png new file mode 100644 index 0000000000000000000000000000000000000000..6049debb56ebf86678a88a3094f477fda056a3cd --- /dev/null +++ b/Assets/Images/Arrow_down.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa2f9c6f2c5e5005720aec2ab6fd503e607cd14bd8e60043d0d3732178eddb59 +size 1294 diff --git a/Assets/Images/Arrow_down.png.meta b/Assets/Images/Arrow_down.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..8a721b42dcebc89c24f75a21e5d733e8dac1dedb --- /dev/null +++ b/Assets/Images/Arrow_down.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 0dd96be67678e2f47a77a0528b8e0073 +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 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 128 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + 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: Server + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/ScreenCapture_1024x500.png.meta b/Assets/Images/ScreenCapture_1024x500.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..ecc3f67fcf3f62542ed172d912acaeb1812c042b --- /dev/null +++ b/Assets/Images/ScreenCapture_1024x500.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: c096e221b5bfbeb43ab515c047274b82 +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 + ignoreMasterTextureLimit: 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: + - 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Star.png b/Assets/Images/Star.png new file mode 100644 index 0000000000000000000000000000000000000000..b06e209770bb01e4f7450f2203a3c9410f216c4f --- /dev/null +++ b/Assets/Images/Star.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57a99e41bec29fa8b0546fd92d9776f2672c23c627ff6b221f4cb505e3f160a0 +size 2468 diff --git a/Assets/Images/Star.png.meta b/Assets/Images/Star.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..8a57dbaa40fb2f25b99cf95886b6925fc2a8a6c7 --- /dev/null +++ b/Assets/Images/Star.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 01aa7de3d8ed63949bbf69e3b492abfa +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 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 128 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + 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: Server + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Triangle.png b/Assets/Images/Triangle.png new file mode 100644 index 0000000000000000000000000000000000000000..9052861c773f27264a64c475760cf960530a6923 --- /dev/null +++ b/Assets/Images/Triangle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb765faf74cf104e6bb6341be6f2e47206e5d0648b79024ed7d88b53491f1b8b +size 1586 diff --git a/Assets/Images/Triangle.png.meta b/Assets/Images/Triangle.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..babd948f2778ba69743aa13d21fa660f8d68c5ef --- /dev/null +++ b/Assets/Images/Triangle.png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: c18c9993be7216f4da0c3f1f5b1f4b2f +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 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + 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: Server + 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: Android + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/frameit_logo_512x512.png.meta b/Assets/Images/frameit_logo_512x512.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..c247271b733f9a6031d39ab8be5f4266ae887a6c --- /dev/null +++ b/Assets/Images/frameit_logo_512x512.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: f9c7a85535e5dbe45aacbbcc5e4df5e1 +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 + ignoreMasterTextureLimit: 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: + - 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/NaturePackLite/Prefabs/Tree_01.prefab b/Assets/Plugins/NaturePackLite/Prefabs/Tree_01.prefab index 3b451c095ea711349cecebb6aae90ef05f2d3806..11836679adc83bbdf6260537b078254ab0909bd7 100644 --- a/Assets/Plugins/NaturePackLite/Prefabs/Tree_01.prefab +++ b/Assets/Plugins/NaturePackLite/Prefabs/Tree_01.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2222111361403691372} - component: {fileID: 2222111361402594220} - component: {fileID: 6601886996393371248} - m_Layer: 15 + m_Layer: 19 m_Name: Tree_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -29,6 +29,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3984837096562236602} m_Father: {fileID: 0} @@ -53,6 +54,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -126,6 +128,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.078, y: 5.557, z: 0.682} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2222111361405018444} m_RootOrder: 0 @@ -162,6 +165,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Plugins/NaturePackLite/Prefabs/Tree_02.prefab b/Assets/Plugins/NaturePackLite/Prefabs/Tree_02.prefab index 2054885dd03534178d5b988d579b223922a6dfef..1f814d64bab763afe72be9720ffbbcc0c497dc6b 100644 --- a/Assets/Plugins/NaturePackLite/Prefabs/Tree_02.prefab +++ b/Assets/Plugins/NaturePackLite/Prefabs/Tree_02.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 4661435515761518820} - component: {fileID: 4661435515760519716} - component: {fileID: 1232560684170311422} - m_Layer: 15 + m_Layer: 19 m_Name: Tree_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -29,6 +29,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 945775986148446862} m_Father: {fileID: 0} @@ -53,6 +54,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -110,7 +112,7 @@ GameObject: - component: {fileID: 4646352123586789184} - component: {fileID: 6011793418505273338} - component: {fileID: 5015158088123139087} - m_Layer: 16 + m_Layer: 19 m_Name: TopSnapZone m_TagString: SnapZone m_Icon: {fileID: 0} @@ -127,6 +129,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.043, y: 4.199, z: 0.012} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4661435515762813124} m_RootOrder: 0 @@ -163,6 +166,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab index efd2e63377ac59f1c8ce33ec71d3cb0c830385e5..4172763d3939f2591f8342de3eab683a43bdf1e7 100644 --- a/Assets/Resources/Prefabs/Stage_Default.prefab +++ b/Assets/Resources/Prefabs/Stage_Default.prefab @@ -138,6 +138,82 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4759014320482245552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3351256321594382437} + - component: {fileID: 9091113729331777899} + - component: {fileID: 2282555796035280519} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3351256321594382437 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4759014320482245552} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3601710781356316471} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9091113729331777899 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4759014320482245552} + m_CullTransparentMesh: 1 +--- !u!114 &2282555796035280519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4759014320482245552} + 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.7735849, g: 0.7735849, b: 0.7735849, 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: c18c9993be7216f4da0c3f1f5b1f4b2f, 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!1 &5271626897556190298 GameObject: m_ObjectHideFlags: 0 @@ -472,7 +548,7 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6341032511684407557} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} @@ -508,6 +584,158 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &6415516954892544643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3601710781356316471} + - component: {fileID: 6924270970807637233} + - component: {fileID: 1755233973806084716} + - component: {fileID: 3683008829118992766} + - component: {fileID: 19084044747743094} + m_Layer: 5 + m_Name: ToggleFactscreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3601710781356316471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3351256321594382437} + m_Father: {fileID: 3231672575207917310} + m_RootOrder: 8 + 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: -59.9, y: 244.5} + m_SizeDelta: {x: 23.7241, y: 591.02} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6924270970807637233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + m_CullTransparentMesh: 1 +--- !u!114 &1755233973806084716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + 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.9622642, g: 0.9622642, b: 0.9622642, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &3683008829118992766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 0, g: 0, b: 0, a: 0.27450982} + m_HighlightedColor: {r: 0, g: 0, b: 0, a: 0.39215687} + m_PressedColor: {r: 0, g: 0, b: 0, a: 0.50980395} + m_SelectedColor: {r: 0, g: 0, b: 0, a: 0.27450982} + 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: 5419392060038334562} + toggleTransition: 0 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 444088929240414686} + m_TargetAssemblyTypeName: ToggleFactscreen, Assembly-CSharp + m_MethodName: ToggleActive + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 3683008829118992766} + m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 +--- !u!114 &19084044747743094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7206e8172594200478e26a3e33882072, type: 3} + m_Name: + m_EditorClassIdentifier: + targetGraphic: {fileID: 3351256321594382437} --- !u!1001 &442227395851957050 PrefabInstance: m_ObjectHideFlags: 0 @@ -1733,12 +1961,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1331047304808510126} m_PrefabAsset: {fileID: 0} ---- !u!20 &729594253173990396 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 1754396572260503890, guid: 1a0e8fc4bd33d48489e21d111c3a57e4, - type: 3} - m_PrefabInstance: {fileID: 1331047304808510126} - m_PrefabAsset: {fileID: 0} --- !u!1 &1279275608347844781 stripped GameObject: m_CorrespondingSourceObject: {fileID: 268019273589264899, guid: 1a0e8fc4bd33d48489e21d111c3a57e4, @@ -1751,6 +1973,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1331047304808510126} m_PrefabAsset: {fileID: 0} +--- !u!114 &4266248851377668361 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2975778479411491751, guid: 1a0e8fc4bd33d48489e21d111c3a57e4, + type: 3} + m_PrefabInstance: {fileID: 1331047304808510126} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9f5830f10fd93c499033f416ccf504e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6501516846063548396 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5206956559746188610, guid: 1a0e8fc4bd33d48489e21d111c3a57e4, @@ -1924,6 +2158,116 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[44].m_ActionName value: Actionmap1/Run[/Keyboard/leftShift] objectReference: {fileID: 0} + - target: {fileID: 582414341799141726, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 582414341799141726, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 582414341799141726, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 582414341799141726, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 582414342066943740, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 582414342066943740, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 582414342066943740, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 582414343370059608, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 722122376462753113, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 722122376462753113, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.00048828125 + objectReference: {fileID: 0} + - target: {fileID: 861183261329167868, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 861183261329167868, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 540 + objectReference: {fileID: 0} + - target: {fileID: 861183262247596663, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 861183262247596663, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 861183262247596663, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 861183262295209870, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 861183262417667852, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 861183262417667852, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 861183262417667854, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 861183262442243445, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 861183262442243445, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 861183262442243445, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 947958301574655299, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_IsActive @@ -2069,6 +2413,31 @@ PrefabInstance: propertyPath: cursor value: objectReference: {fileID: 9064903938289346084} + - target: {fileID: 1063267680994324452, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1063267681001813619, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMax.y @@ -2124,6 +2493,11 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1063267681976544645, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1063267681976544647, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_Size @@ -2344,6 +2718,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1826169665482517540, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1867232307010943140, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_IsActive @@ -2354,6 +2733,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 70 objectReference: {fileID: 0} + - target: {fileID: 2900011465618118542, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2900011465618118542, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.00030517578 + objectReference: {fileID: 0} + - target: {fileID: 3128576041734964161, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3128576041734964161, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.0005493164 + objectReference: {fileID: 0} - target: {fileID: 3994617728676202523, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_Enabled @@ -2369,29 +2768,59 @@ PrefabInstance: propertyPath: m_OverrideSorting value: 0 objectReference: {fileID: 0} - - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + - target: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + - target: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + - target: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84, type: 3} - propertyPath: m_AnchoredPosition.x + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84, @@ -2404,15 +2833,55 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5279394910857840864, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 5279394910857840864, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30.000008 + objectReference: {fileID: 0} + - target: {fileID: 5880767994834397926, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880767994834397926, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880767994834397926, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880767994834397926, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880767994834397926, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880767994834397926, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} @@ -2427,13 +2896,73 @@ PrefabInstance: - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchoredPosition.x - value: 940 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6301686887416939111, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119475, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6580710286566362471, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMax.y @@ -2454,6 +2983,71 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7386542239557707631, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7386542239557707631, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7386542239557707631, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7386542239557707631, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7386542239557707631, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7386542239557707631, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7897743737149705849, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_FlexibleHeight + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440417, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440420, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.x + value: 890 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 580 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1353 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -295.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b996060e27da25c498842defc1996d84, type: 3} --- !u!114 &3020720018354060034 stripped @@ -2480,6 +3074,76 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2822275412857346440} m_PrefabAsset: {fileID: 0} +--- !u!1 &3231672575207917305 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 861183262000521073, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4705772093382662422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3231672575207917305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc18334af0ab5ac4c9487f0675dbd439, type: 3} + m_Name: + m_EditorClassIdentifier: + factLayerMask: + serializedVersion: 2 + m_Bits: 64512 + HidingCanvas: {fileID: 3231672575207917310} +--- !u!224 &3231672575207917310 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 861183262000521078, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5419392060038334562 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7790999573849575914, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6898471569945669420 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8689405068913440420, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} +--- !u!225 &8486908058320627190 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6898471569945669420} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!114 &444088929240414686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6898471569945669420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 686d83dd60fa23f4d8b9610c69b02992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4633513391531001248 PrefabInstance: m_ObjectHideFlags: 0 @@ -2491,6 +3155,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 46571147959259406, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 40 + objectReference: {fileID: 0} - target: {fileID: 140740148844084842, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2511,6 +3180,21 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 712664738254972820, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 712664738254972820, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 712664738254972820, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 120 + objectReference: {fileID: 0} - target: {fileID: 883562610317082921, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2536,11 +3220,56 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1288332713478340093, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 1288332713478340093, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 42.5 + objectReference: {fileID: 0} - target: {fileID: 1319643632073573343, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4266248851377668361} + - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: changePosition + objectReference: {fileID: 0} + - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: PointAndClick_changeCam, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1611472016343752370, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FlexibleHeight + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1829459189653575846, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1829459189653575846, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} - target: {fileID: 1831671680050863756, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2641,6 +3370,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 3500129622877184076, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FlexibleHeight + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3502153650081912715, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_DefaultActionMap @@ -2661,6 +3395,26 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[44].m_ActionName value: Actionmap1/Run[/Keyboard/leftShift] objectReference: {fileID: 0} + - target: {fileID: 3828945693395908685, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 3828945693395908685, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 3860972096132670217, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FlexibleHeight + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4545877116474182818, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 4549626014426059054, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_AnchorMax.x @@ -2861,6 +3615,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4926730115625812497, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5106811703022426982, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_Pivot.x @@ -2896,6 +3655,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6037608698931376944, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6037608698984363721, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_AnchorMax.x @@ -2936,6 +3700,16 @@ PrefabInstance: propertyPath: m_Name value: HidingCanvas_2 objectReference: {fileID: 0} + - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 220 + objectReference: {fileID: 0} + - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 720 + objectReference: {fileID: 0} - target: {fileID: 6396408984958246870, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_IsActive @@ -2946,6 +3720,16 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 6965625904789863175, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6965625904789863175, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} - target: {fileID: 7273377425215222267, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2971,6 +3755,31 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7797007860072191052, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_Spacing.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7797007860072191052, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_CellSize.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 7797007860072191052, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_CellSize.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 7797007860072191052, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_Padding.m_Top + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7797007860072191052, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_Padding.m_Left + value: 10 + objectReference: {fileID: 0} - target: {fileID: 8060062692808547041, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2991,6 +3800,16 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 8858798501607791799, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8858798501607791799, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} - target: {fileID: 9044766020949755674, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -3030,6 +3849,34 @@ MonoBehaviour: m_EditorClassIdentifier: m_MovementRange: 50 m_ControlPath: <Gamepad>/leftStick +--- !u!224 &1734510802335769907 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6368005777045954707, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + m_PrefabInstance: {fileID: 4633513391531001248} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4584836137803151881 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9218050178699362217, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + m_PrefabInstance: {fileID: 4633513391531001248} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2258042202925325658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4584836137803151881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc18334af0ab5ac4c9487f0675dbd439, type: 3} + m_Name: + m_EditorClassIdentifier: + factLayerMask: + serializedVersion: 2 + m_Bits: 64512 + HidingCanvas: {fileID: 1734510802335769907} --- !u!1 &4982402009794970575 stripped GameObject: m_CorrespondingSourceObject: {fileID: 389710745492588143, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, @@ -3110,7 +3957,7 @@ PrefabInstance: type: 3} propertyPath: Cam1 value: - objectReference: {fileID: 729594253173990396} + objectReference: {fileID: 7088713184437111127} - target: {fileID: 6999573640440716764, guid: 8590393c51194934a95cdc2075fc4dec, type: 3} propertyPath: Cam2 @@ -3151,11 +3998,6 @@ PrefabInstance: propertyPath: walkAroundObject value: objectReference: {fileID: 0} - - target: {fileID: 6999573641170124239, guid: 8590393c51194934a95cdc2075fc4dec, - type: 3} - propertyPath: radiusAroundObject - value: 10 - objectReference: {fileID: 0} - target: {fileID: 6999573641170124239, guid: 8590393c51194934a95cdc2075fc4dec, type: 3} propertyPath: talkingZoneDistance diff --git a/Assets/Resources/Prefabs/TalkingZone.prefab b/Assets/Resources/Prefabs/TalkingZone.prefab index d4be00c83d297daaaa8a9fce2af34ad203908b01..f594c5927845ef821b388c7b9466678dbe0f14ef 100644 --- a/Assets/Resources/Prefabs/TalkingZone.prefab +++ b/Assets/Resources/Prefabs/TalkingZone.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3052661700889384477} - component: {fileID: 1857627222594380158} - component: {fileID: 2600518978420199386} - m_Layer: 14 + m_Layer: 18 m_Name: TalkingZone m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Task-Character.prefab b/Assets/Resources/Prefabs/Task-Character.prefab index 6b5c3974d7b24680c4ea5a6f31a844e36aa1e9e8..ab58c3476b77ccbe31c90fff8d851004c0de3018 100644 --- a/Assets/Resources/Prefabs/Task-Character.prefab +++ b/Assets/Resources/Prefabs/Task-Character.prefab @@ -833,7 +833,7 @@ GameObject: m_Component: - component: {fileID: 6999573642475966541} - component: {fileID: 6999573642475966542} - m_Layer: 0 + m_Layer: 5 m_Name: DialogManager m_TagString: Untagged m_Icon: {fileID: 0} @@ -1046,9 +1046,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1548220cdff39434da0c355ae7ade121, type: 3} m_Name: m_EditorClassIdentifier: - walkAroundObject: {fileID: 0} + startingPosition: {x: 0, y: 0, z: 0} playerDefault: {fileID: 0} - radiusAroundObject: 10 + radiusAroundObject: 2 talkingZoneDistance: 0 --- !u!1 &7000046267743680389 GameObject: @@ -3138,6 +3138,6 @@ CapsuleCollider: m_IsTrigger: 1 m_Enabled: 1 m_Radius: 0.5000001 - m_Height: 2 + m_Height: 400 m_Direction: 1 - m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab index 0494b2ea998e37dff2266983f35dde494b80c044..11d5e17d1d85c212f29a1de3290b1042202aadd7 100644 --- a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab +++ b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab @@ -1,5 +1,502 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1447414525858596195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 173290219472098764} + - component: {fileID: 8314331323416511131} + - component: {fileID: 3047157218582908072} + m_Layer: 5 + m_Name: MMTMessage (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &173290219472098764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447414525858596195} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.37, y: 1.115714, z: 0.74} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3853195430673864773} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!222 &8314331323416511131 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447414525858596195} + m_CullTransparentMesh: 1 +--- !u!114 &3047157218582908072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447414525858596195} + 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: Hello World + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150, type: 2} + m_sharedMaterial: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278253055 + m_fontColor: {r: 1, g: 0.95904064, b: 0, 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: 141.4 + m_fontSizeBase: 141.4 + 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: -849.3793, y: 0, z: -892.58386, 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!1 &3625441216435933673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3853195430673864773} + - component: {fileID: 911570484790407906} + - component: {fileID: 5352905769564476691} + - component: {fileID: 539865474863423590} + - component: {fileID: 9172041136735592230} + m_Layer: 5 + m_Name: MMTMessagePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3853195430673864773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3625441216435933673} + 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_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 173290219472098764} + m_Father: {fileID: 3716020922907832516} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!222 &911570484790407906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3625441216435933673} + m_CullTransparentMesh: 1 +--- !u!114 &5352905769564476691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3625441216435933673} + 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.6313726} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &539865474863423590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3625441216435933673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 20 + m_Top: 100 + m_Bottom: 100 + m_ChildAlignment: 7 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &9172041136735592230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3625441216435933673} + 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: 5352905769564476691} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &6618856106128302243 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7767858306924037183} + - component: {fileID: 7288012865992981481} + - component: {fileID: 573039479540912931} + - component: {fileID: 1794663792524160627} + - component: {fileID: 7890422615657294216} + m_Layer: 5 + m_Name: MMtMessagePopUpCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7767858306924037183 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6618856106128302243} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.702208, y: 0.2520808, z: 2.080925} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3716020922907832516} + m_Father: {fileID: 8004702057798297439} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 848.2852, y: 62} + m_SizeDelta: {x: 1156.834, y: 1018.225} + m_Pivot: {x: 1, y: 0} +--- !u!223 &7288012865992981481 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6618856106128302243} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &573039479540912931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6618856106128302243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &1794663792524160627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6618856106128302243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &7890422615657294216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6618856106128302243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a2421aa4aa06234393141eca951efb9, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 6618856106128302243} + CloseButton: {fileID: 9172041136735592230} + message: {fileID: 3047157218582908072} + ServerErrorMessage: unknown server error + NonTotalMessage: Scroll application not complete + UnknownErrorMessage: Unkown error - did you apply all facts? + InvalidAssignmentMessage: Invalid Assignment +--- !u!1 &7701132575279143832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3716020922907832516} + - component: {fileID: 6505282139119622248} + - component: {fileID: 2732696853560371238} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3716020922907832516 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7701132575279143832} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3853195430673864773} + m_Father: {fileID: 7767858306924037183} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -0.008544922, y: 0.0002421254} + m_SizeDelta: {x: 1156.8, y: 0} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &6505282139119622248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7701132575279143832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 7 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &2732696853560371238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7701132575279143832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &8004702056306368600 GameObject: m_ObjectHideFlags: 0 @@ -668,7 +1165,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000030517578} + m_AnchoredPosition: {x: -0.000030517578, y: 0.000030517578} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8004702056565720367 @@ -1530,112 +2027,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8004702057366635392 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8004702057366635395} - - component: {fileID: 8004702057366635396} - - component: {fileID: 8004702057366635397} - - component: {fileID: 8004702057366635394} - m_Layer: 5 - m_Name: Factscreen - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8004702057366635395 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8004702057366635392} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8004702057932254677} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -225} - m_SizeDelta: {x: 900, y: 450} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8004702057366635396 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8004702057366635392} - m_CullTransparentMesh: 0 ---- !u!114 &8004702057366635397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8004702057366635392} - 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.392} - 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: 0} - 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!114 &8004702057366635394 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8004702057366635392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3} - m_Name: - m_EditorClassIdentifier: - prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec, - type: 3} - prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67, - type: 3} - prefab_Angle: {fileID: 6643637775379894484, guid: 30fcd362f34a9844fba66065924c6143, - type: 3} - prefab_Default: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec, - type: 3} - prefab_OnLine: {fileID: 6050914136827205310, guid: 496d04605465c7f4dba7638cc6e2dc6e, - type: 3} - prefab_Line: {fileID: 7510387096843212865, guid: d6ee990520a44954fb494468665d19e9, - type: 3} - x_Start: -125 - y_Start: 475 - X_Pacece_Between_Items: 110 - y_Pacece_Between_Items: 110 - number_of_Column: 3 --- !u!1 &8004702057423300231 GameObject: m_ObjectHideFlags: 0 @@ -1963,6 +2354,7 @@ RectTransform: m_Children: - {fileID: 8004702057653070421} - {fileID: 8004702058139290459} + - {fileID: 7767858306924037183} m_Father: {fileID: 8004702057540368335} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1994,6 +2386,7 @@ MonoBehaviour: cursor: {fileID: 0} parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93, type: 3} + mmtAnswerPopUp: {fileID: 6618856106128302243} currentMmtAnswer: dynamicScrollDescriptionsActive: 1 automaticHintGenerationActive: 1 @@ -2383,7 +2776,7 @@ RectTransform: - {fileID: 8004702057423300230} - {fileID: 8004702058016740899} - {fileID: 8004702057540368335} - - {fileID: 8004702057366635395} + - {fileID: 2050004651490542596} - {fileID: 8004702056853212489} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2549,6 +2942,7 @@ MonoBehaviour: ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261, type: 3} DetailScreen: {fileID: 8004702057798297436} + scrollscreenContent: {fileID: 0} x_Start: -240 y_Start: 200 X_Pacece_Between_Items: 105 @@ -2887,6 +3281,156 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &3298748675541104415 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8004702057932254677} + m_Modifications: + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482904, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Name + value: Factscreen + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.x + value: 900 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.y + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000030517578 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} +--- !u!224 &2050004651490542596 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + m_PrefabInstance: {fileID: 3298748675541104415} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8525488698361073026 PrefabInstance: m_ObjectHideFlags: 0 @@ -3024,11 +3568,6 @@ PrefabInstance: propertyPath: m_Name value: ModeSlider objectReference: {fileID: 0} - - target: {fileID: 1918634107828435177, guid: 2b1b97ec7dcf75b4396f3da783732f82, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1918634107828435177, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_TagString diff --git a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab.meta b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab.meta index 870d727b57643b6d8bfab85fa52ba135ed12adf3..1d59a86a983bd092b386e69895c510420b307328 100644 --- a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab.meta +++ b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 292834880e6f0e54186b873acc62d3f2 +guid: 109570394c4c8f240a47dab707dafa7e PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefabs/UI/Facts.meta b/Assets/Resources/Prefabs/UI/Facts.meta new file mode 100644 index 0000000000000000000000000000000000000000..083dde953bda95900ccc9a779e43f94ca6834e8e --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6841a8ca06c22ca43a95bc676eabe75d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Facts/FactExplorer.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer.meta new file mode 100644 index 0000000000000000000000000000000000000000..631c8c9c407df2f324c10127b5ec77c96a39d29a --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactExplorer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e5fb0597e5dd8f4fb544bd891a58d25 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab new file mode 100644 index 0000000000000000000000000000000000000000..f61c17ed533c45e1d3e8a49d424988592ad37dff --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab @@ -0,0 +1,503 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &88742477166944048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1922303121985957924} + - component: {fileID: 3640990131242893537} + - component: {fileID: 9026517263373289086} + m_Layer: 5 + m_Name: FactParents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1922303121985957924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88742477166944048} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3406631590813364790} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3640990131242893537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88742477166944048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &9026517263373289086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88742477166944048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &196909836272952088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 294307632257003305} + - component: {fileID: 3259288062294702885} + - component: {fileID: 5601304647299485279} + - component: {fileID: 2468798738105667105} + m_Layer: 5 + m_Name: Highlight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &294307632257003305 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196909836272952088} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2636669742664082113} + 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: 110, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3259288062294702885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196909836272952088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &5601304647299485279 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196909836272952088} + m_CullTransparentMesh: 1 +--- !u!114 &2468798738105667105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196909836272952088} + 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: 0.49803922, b: 0, 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: 10911, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &2146237966352740759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2636669742664082113} + - component: {fileID: 8821645608645168199} + m_Layer: 5 + m_Name: MainFact + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2636669742664082113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146237966352740759} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 294307632257003305} + m_Father: {fileID: 3406631590813364790} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8821645608645168199 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146237966352740759} + m_CullTransparentMesh: 1 +--- !u!1 &5592893003942163674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3406631590813364790} + - component: {fileID: 3395920202856463226} + - component: {fileID: 5712507090492513276} + - component: {fileID: 2117595904752085810} + - component: {fileID: 1017489668606288636} + - component: {fileID: 871613573032911794} + m_Layer: 5 + m_Name: FactExplorerUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3406631590813364790 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8009565381998387591} + - {fileID: 1922303121985957924} + - {fileID: 2636669742664082113} + - {fileID: 9153153668998730241} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3395920202856463226 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_CullTransparentMesh: 1 +--- !u!114 &5712507090492513276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + 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, g: 0, b: 0, a: 0.19607843} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &2117595904752085810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 4 + m_Spacing: 30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1017489668606288636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &871613573032911794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 795998cb72dae4043beaf3c3bb6b1b16, type: 3} + m_Name: + m_EditorClassIdentifier: + factParentsUI: {fileID: 1922303121985957924} + mainFactUI: {fileID: 2636669742664082113} + factChildrenUI: {fileID: 9153153668998730241} + linesUI: {fileID: 8009565381998387591} + factSpotPrefab: {fileID: 7124463502404826001, guid: 04d12e0a0a5aa884c8c7dff56f4963f6, + type: 3} + parentLine: {fileID: 602666608487228118, guid: 6cdb6cc4d5af8db409745afbc201068b, + type: 3} + childLine: {fileID: 4903779976374899580, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} +--- !u!1 &7302347448387664938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9153153668998730241} + - component: {fileID: 7740801215330722997} + - component: {fileID: 334048272176286206} + m_Layer: 5 + m_Name: FactChildren + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9153153668998730241 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7302347448387664938} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3406631590813364790} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7740801215330722997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7302347448387664938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &334048272176286206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7302347448387664938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &7418920549591013849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8009565381998387591} + - component: {fileID: 835707716098452998} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8009565381998387591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7418920549591013849} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3406631590813364790} + 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 &835707716098452998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7418920549591013849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..aaf163b376b67b58bc59a80e564a73994f3bd7c4 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff7415df1aac19c41a7855516a108a8a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab new file mode 100644 index 0000000000000000000000000000000000000000..bb48d9e20f42ef543e0260f8d94140fc6a7efb66 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4903779976374899580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 911949952148793464} + - component: {fileID: -137166815004959870} + - component: {fileID: 2132054669896436896} + - component: {fileID: 4832178158615009880} + m_Layer: 0 + m_Name: FactExplorer_Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &911949952148793464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4903779976374899580} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &-137166815004959870 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4903779976374899580} + m_CullTransparentMesh: 1 +--- !u!114 &2132054669896436896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4903779976374899580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &4832178158615009880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4903779976374899580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed745d97410d6740921398c899d9ec0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3137255, g: 0.3137255, b: 0.3137255, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + points: [] + width: 4 + roundCorners: 1 + roundStart: 1 + roundEnd: 1 + dashed: 0 + dashLength: 10 + dashSpacing: 5 diff --git a/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..a597efb2d92cfd29cfd09245223a4f3f2e99b1cf --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7f47b2a4ac81f444eb5e18b8efabc644 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab new file mode 100644 index 0000000000000000000000000000000000000000..092bb44b0a62cb76643d46682825cc4b5e9d7988 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab @@ -0,0 +1,141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5499075457957573034 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 911949952148793464, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832178158615009880, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: dashed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4903779976374899580, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_Name + value: FactExplorer_Line_Dashed + objectReference: {fileID: 0} + - target: {fileID: 8455242915356568467, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8455242915356568467, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_Positions.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8455242915356568467, guid: 7f47b2a4ac81f444eb5e18b8efabc644, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 3be144593ef3bac42812ba90847c1cff, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7f47b2a4ac81f444eb5e18b8efabc644, type: 3} diff --git a/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..3ef635f893ebc17fe25e3a9d038956dc00659607 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6cdb6cc4d5af8db409745afbc201068b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab b/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1e76da5dcf6a3ec453a3b0c309f7b7e71c3515c6 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7124463502404826001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2492119118187225485} + - component: {fileID: 3183854850668897353} + - component: {fileID: 2474205050366502828} + m_Layer: 0 + m_Name: FactSpot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2492119118187225485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7124463502404826001} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + 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!222 &3183854850668897353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7124463502404826001} + m_CullTransparentMesh: 1 +--- !u!114 &2474205050366502828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7124463502404826001} + 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, g: 0, b: 0, a: 0.15686275} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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 diff --git a/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..585fd90f2a17b978f2f319b35aec15edd54ff752 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04d12e0a0a5aa884c8c7dff56f4963f6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab new file mode 100644 index 0000000000000000000000000000000000000000..fbc5fb7ed8a76d029d5fb7fcbbb5de53343aac64 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab @@ -0,0 +1,1224 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1576901888187395370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6245319588001950992} + - component: {fileID: 8718951295134447114} + - component: {fileID: 63324559029012984} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6245319588001950992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576901888187395370} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7986558048061193259} + m_Father: {fileID: 5743690260981541286} + 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!222 &8718951295134447114 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576901888187395370} + m_CullTransparentMesh: 1 +--- !u!114 &63324559029012984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576901888187395370} + 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: 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: 01aa7de3d8ed63949bbf69e3b492abfa, 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!1 &2979354555938402983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7432823498290307782} + - component: {fileID: 3074710513750764627} + - component: {fileID: 2683390173571617878} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7432823498290307782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2979354555938402983} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2908476680003779928} + m_Father: {fileID: 3181479646584942007} + 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!222 &3074710513750764627 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2979354555938402983} + m_CullTransparentMesh: 1 +--- !u!114 &2683390173571617878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2979354555938402983} + 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: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &3076546450216322697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7986558048061193259} + - component: {fileID: 5946123737274163871} + - component: {fileID: 4542985603233388216} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7986558048061193259 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076546450216322697} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6245319588001950992} + 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!222 &5946123737274163871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076546450216322697} + m_CullTransparentMesh: 1 +--- !u!114 &4542985603233388216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076546450216322697} + 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.98039216, g: 0.8627451, b: 0, 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: 01aa7de3d8ed63949bbf69e3b492abfa, 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!1 &3581652732795482904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3581652732795482907} + - component: {fileID: 3581652732795482908} + - component: {fileID: 3581652732795482909} + - component: {fileID: 3581652732795482906} + m_Layer: 5 + m_Name: Factscreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3581652732795482907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3581652732795482904} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 744038102396434867} + - {fileID: 28794298399673692} + m_Father: {fileID: 0} + 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: 450, y: -225} + m_SizeDelta: {x: 900, y: 450} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3581652732795482908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3581652732795482904} + m_CullTransparentMesh: 0 +--- !u!114 &3581652732795482909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3581652732795482904} + 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.392} + 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: 0} + 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!114 &3581652732795482906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3581652732795482904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3} + m_Name: + m_EditorClassIdentifier: + factscreenContent: {fileID: 4838871000058222821} + factSpotPrefab: {fileID: 7124463502404826001, guid: 04d12e0a0a5aa884c8c7dff56f4963f6, + type: 3} + prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec, + type: 3} + prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67, + type: 3} + prefab_Angle: {fileID: 6643637775379894484, guid: 30fcd362f34a9844fba66065924c6143, + type: 3} + prefab_Default: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec, + type: 3} + prefab_OnLine: {fileID: 6050914136827205310, guid: 496d04605465c7f4dba7638cc6e2dc6e, + type: 3} + prefab_Line: {fileID: 7510387096843212865, guid: d6ee990520a44954fb494468665d19e9, + type: 3} + prefab_ParallelLineFact: {fileID: 7510387096843212865, guid: 9f086cfbfeb0dfd46af67395aa17aafa, + type: 3} + prefab_RectangleFact: {fileID: 8156936215466465834, guid: b6f35afcaff5d8a40bf8f792eb3299e6, + type: 3} + prefab_RadiusFact: {fileID: 2513701074329712390, guid: 5b54aca5b2f2bfa48968656ed3bea181, + type: 3} + prefab_AreaCircle: {fileID: 7016901710118546043, guid: 210f1e1acf16abf40a39587074c4d25a, + type: 3} + prefab_ConeVolume: {fileID: 2523593828849809055, guid: 992edeb4264d0fa49b0f9b35b9ab85ce, + type: 3} + prefab_OrthogonalCircleLine: {fileID: 8554350198830106250, guid: 9ce7444f588cd054989126eaff75c5f3, + type: 3} + prefab_TruncatedConeVolume: {fileID: 4123133807278660472, guid: 9d0019fa4b5725a49bdfc78c4d67661e, + type: 3} + prefab_RightAngle: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4, + type: 3} + prefab_CylinderVolume: {fileID: 5287418535931939099, guid: 30d09e8685950994893b3b6388a8906c, + type: 3} + prefab_EqualFact: {fileID: 7523305359074541435, guid: 5f461930be2eb074193dc12eb60e10b2, + type: 3} + prefab_UnEqualFact: {fileID: 5769925203401971992, guid: 047cd3a517f781846a1f983394b4bb7b, + type: 3} + prefab_CircleFact: {fileID: 6636443472981757786, guid: 9d08fd45bc83c7c42a9be42f5309c6c2, + type: 3} + prefab_OnCircleFact: {fileID: 2115817999818309900, guid: df93bd4d977e4ab42a626f7bd06596d6, + type: 3} + prefab_AngleCircleLineFact: {fileID: 4902928549420802332, guid: 62cec72d28de59d4c8ae782957cc10a1, + type: 3} + prefab_TestFact: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + type: 3} +--- !u!1 &4600560360496770457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2908476680003779928} + - component: {fileID: 706978178464878509} + - component: {fileID: 1740725454024321523} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2908476680003779928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4600560360496770457} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7432823498290307782} + 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: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &706978178464878509 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4600560360496770457} + m_CullTransparentMesh: 1 +--- !u!114 &1740725454024321523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4600560360496770457} + 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.31132078, g: 0.31132078, b: 0.31132078, 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: 0dd96be67678e2f47a77a0528b8e0073, 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!1 &5020678014906925761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4838871000058222821} + - component: {fileID: 8823539307371861913} + - component: {fileID: 8739701541209514273} + m_Layer: 5 + m_Name: Facts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4838871000058222821 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5020678014906925761} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 28794298399673692} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &8823539307371861913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5020678014906925761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 100, y: 100} + m_Spacing: {x: 10, y: 10} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &8739701541209514273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5020678014906925761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &6084644584492075089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744038102396434867} + - component: {fileID: 101450778274151004} + - component: {fileID: 2041160127919243566} + m_Layer: 5 + m_Name: Filter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &744038102396434867 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6084644584492075089} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3181479646584942007} + - {fileID: 4370335918965838469} + - {fileID: 5743690260981541286} + m_Father: {fileID: 3581652732795482907} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 60} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &101450778274151004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6084644584492075089} + m_CullTransparentMesh: 1 +--- !u!114 &2041160127919243566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6084644584492075089} + 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, g: 0, b: 0, a: 0.039215688} + 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: 0} + 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!1 &6265161390968992564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4370335918965838469} + - component: {fileID: 4267244877370467227} + m_Layer: 5 + m_Name: GroupingToggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4370335918965838469 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6265161390968992564} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6192368448412487190} + - {fileID: 2640369798375049452} + m_Father: {fileID: 744038102396434867} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 60, y: 0} + m_SizeDelta: {x: 150, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &4267244877370467227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6265161390968992564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 3457710782490082420} + toggleTransition: 1 + graphic: {fileID: 7260617437653652778} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3581652732795482906} + m_TargetAssemblyTypeName: DisplayFacts, Assembly-CSharp + m_MethodName: GroupingChanged + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 4267244877370467227} + m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 +--- !u!1 &6430644988760938474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2640369798375049452} + - component: {fileID: 840532075702497120} + - component: {fileID: 3882135482197369887} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2640369798375049452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6430644988760938474} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4370335918965838469} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 21.5, y: -0.5} + m_SizeDelta: {x: -53, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &840532075702497120 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6430644988760938474} + m_CullTransparentMesh: 1 +--- !u!114 &3882135482197369887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6430644988760938474} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 25 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Group +--- !u!1 &7026486612705267797 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7235434697382200608} + - component: {fileID: 5492150744115625130} + - component: {fileID: 7260617437653652778} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7235434697382200608 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7026486612705267797} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6192368448412487190} + 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!222 &5492150744115625130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7026486612705267797} + m_CullTransparentMesh: 1 +--- !u!114 &7260617437653652778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7026486612705267797} + 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: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &7278114976970730461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6192368448412487190} + - component: {fileID: 8674771489830593255} + - component: {fileID: 3457710782490082420} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6192368448412487190 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7278114976970730461} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7235434697382200608} + m_Father: {fileID: 4370335918965838469} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8674771489830593255 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7278114976970730461} + m_CullTransparentMesh: 1 +--- !u!114 &3457710782490082420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7278114976970730461} + 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: 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &8554441590530137953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3181479646584942007} + - component: {fileID: 3455615182660834939} + - component: {fileID: 7247437569943128573} + m_Layer: 5 + m_Name: AscDescToggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3181479646584942007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8554441590530137953} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7432823498290307782} + m_Father: {fileID: 744038102396434867} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &3455615182660834939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8554441590530137953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 0, g: 0, b: 0, a: 0.27450982} + m_HighlightedColor: {r: 0, g: 0, b: 0, a: 0.39215687} + m_PressedColor: {r: 0, g: 0, b: 0, a: 0.50980395} + m_SelectedColor: {r: 0, g: 0, b: 0, a: 0.27450982} + 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: 2683390173571617878} + toggleTransition: 0 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3581652732795482906} + m_TargetAssemblyTypeName: DisplayFacts, Assembly-CSharp + m_MethodName: AscDescChanged + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 3455615182660834939} + m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 +--- !u!114 &7247437569943128573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8554441590530137953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7206e8172594200478e26a3e33882072, type: 3} + m_Name: + m_EditorClassIdentifier: + targetGraphic: {fileID: 2908476680003779928} +--- !u!1 &8566369655810908591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5743690260981541286} + - component: {fileID: 1291266562888293779} + m_Layer: 5 + m_Name: FavoriteToggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5743690260981541286 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8566369655810908591} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6245319588001950992} + m_Father: {fileID: 744038102396434867} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -10, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1291266562888293779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8566369655810908591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + 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: 0, g: 0, b: 0, a: 0.27450982} + m_HighlightedColor: {r: 0, g: 0, b: 0, a: 0.39215687} + m_PressedColor: {r: 0, g: 0, b: 0, a: 0.50980395} + m_SelectedColor: {r: 0, g: 0, b: 0, a: 0.27450982} + 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: 63324559029012984} + toggleTransition: 1 + graphic: {fileID: 4542985603233388216} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3581652732795482906} + m_TargetAssemblyTypeName: DisplayFacts, Assembly-CSharp + m_MethodName: FavoritesFilterChanged + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1291266562888293779} + m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 +--- !u!1 &9200394337360800321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 28794298399673692} + - component: {fileID: 785712294914047956} + - component: {fileID: 8690182484269861222} + m_Layer: 5 + m_Name: ScrollArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &28794298399673692 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9200394337360800321} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4838871000058222821} + m_Father: {fileID: 3581652732795482907} + m_RootOrder: 1 + 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: -30} + m_SizeDelta: {x: 0, y: -60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &785712294914047956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9200394337360800321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 4838871000058222821} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0 + m_Inertia: 0 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 5 + m_Viewport: {fileID: 28794298399673692} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8690182484269861222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9200394337360800321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} diff --git a/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..8ae2db5dd04d7facebdfa10339765bda58a578c8 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 49deb83b881477047bfac0ee629a7ae9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Facts/FavoriteStar.prefab b/Assets/Resources/Prefabs/UI/Facts/FavoriteStar.prefab new file mode 100644 index 0000000000000000000000000000000000000000..4e60f7595ef9f141fdb0d2071bdaee56f0be334e --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FavoriteStar.prefab @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2810062559722195091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1682989479718840691} + - component: {fileID: 7513145796292958282} + - component: {fileID: 8269486105486065185} + m_Layer: 0 + m_Name: FavoriteStar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1682989479718840691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2810062559722195091} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 10, y: 10} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 1, y: 1} +--- !u!222 &7513145796292958282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2810062559722195091} + m_CullTransparentMesh: 1 +--- !u!114 &8269486105486065185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2810062559722195091} + 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.98039216, g: 0.8608746, b: 0, 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: 01aa7de3d8ed63949bbf69e3b492abfa, 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 diff --git a/Assets/Resources/Prefabs/UI/Facts/FavoriteStar.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FavoriteStar.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..91edf0b008294835791b834666df367dd3ad2ec8 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/FavoriteStar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0b34469213856774980670de85a7d4a0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/FrameITUI.prefab b/Assets/Resources/Prefabs/UI/FrameITUI.prefab index 6503fe1b7e39d8eb71e9786c4cb571470b9cc286..f3218c9618bf35306764487e3f295ad51e2bb4d6 100644 --- a/Assets/Resources/Prefabs/UI/FrameITUI.prefab +++ b/Assets/Resources/Prefabs/UI/FrameITUI.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1063267681848407549} + - {fileID: 861183262000521078} - {fileID: 2115861043885878842} m_Father: {fileID: 0} m_RootOrder: 0 @@ -466,239 +466,250 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2311632687171194303} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8144861996915600559 +--- !u!1001 &7270467318091510435 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1063267682327585421} m_Modifications: - - target: {fileID: 7980265689495374730, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 4335843193789688460, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_SizeDelta.y - value: 0 + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 8689405068913440422} + - target: {fileID: 4335843193789688460, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: FavoritesFilterChanged objectReference: {fileID: 0} - - target: {fileID: 8198534008265597435, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991042685492731, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_PresetInfoIsWorld + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8281826834792549902, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8281826834792549902, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8281826834792549902, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8281826834792549902, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9158835315409376864, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9158835315409376864, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9158835315409376864, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7989559431199338490, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7989559431199338490, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.00047302246 + objectReference: {fileID: 0} + - target: {fileID: 8004702056544321748, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8004702056544321748, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9158835315409376864, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056544321748, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9158835315409376864, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056565720365, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.x - value: 940 + value: 0.0009765625 objectReference: {fileID: 0} - - target: {fileID: 9158835315409376864, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056618112982, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_AnchoredPosition.y + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501328, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056618112982, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_PresetInfoIsWorld + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8004702056618112982, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8004702056709666223, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8004702056709666223, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_Value value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254674, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_Name + value: HidingCanvas + objectReference: {fileID: 0} + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501333, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_Name - value: HidingCanvas - objectReference: {fileID: 0} - - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_Size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_Value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681519240275, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681519240275, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254679, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681519240275, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926681532248490, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 5128.3374 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 9207926679892754397, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} ---- !u!224 &1063267681848407549 stripped + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} +--- !u!224 &861183262000521078 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + m_CorrespondingSourceObject: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - m_PrefabInstance: {fileID: 8144861996915600559} + m_PrefabInstance: {fileID: 7270467318091510435} m_PrefabAsset: {fileID: 0} +--- !u!114 &8689405068913440422 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2050004651490542597, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + m_PrefabInstance: {fileID: 7270467318091510435} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons.meta new file mode 100644 index 0000000000000000000000000000000000000000..f6f9d382b1a88407725aa0c00ca9a3e3959536be --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27c5ee9b1ba023643ad2fa6b2ed311b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab similarity index 87% rename from Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab index 5d753a6a25880733d5b05f1519884b35a921e3a0..e96d0eac3e5cfb770fabccdfede4488672434d4d 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6643637775379894485} m_RootOrder: 1 @@ -60,6 +61,7 @@ MonoBehaviour: 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: @@ -85,13 +87,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -99,6 +100,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -109,10 +112,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -120,40 +121,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 6643637774014364123} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6643637774878492038 @@ -184,6 +163,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6643637775379894485} m_RootOrder: 0 @@ -216,6 +196,7 @@ MonoBehaviour: 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: @@ -241,13 +222,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -255,6 +235,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -265,10 +247,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -276,40 +256,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 6643637774878492040} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6643637775318367256 @@ -340,6 +298,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6643637775379894485} m_RootOrder: 2 @@ -372,6 +331,7 @@ MonoBehaviour: 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: @@ -397,13 +357,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -411,6 +370,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -421,10 +382,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -432,40 +391,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 6643637775318367258} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6643637775379894484 @@ -479,12 +416,14 @@ GameObject: - component: {fileID: 6643637775379894485} - component: {fileID: 6643637775379894487} - component: {fileID: 6643637775379894486} + - component: {fileID: -3161002223909736641} - component: {fileID: 5040239873163969181} - - component: {fileID: 225831940989964384} - component: {fileID: 114522817932931646} - component: {fileID: 3011926265969909947} + - component: {fileID: 3573135846559875297} + - component: {fileID: -6877371120973083636} m_Layer: 5 - m_Name: AngleDisplay + m_Name: DisplayAngle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -500,6 +439,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6643637774878492039} - {fileID: 6643637774014364122} @@ -535,6 +475,7 @@ MonoBehaviour: 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: @@ -549,6 +490,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-3161002223909736641 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6643637775379894484} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &5040239873163969181 MonoBehaviour: m_ObjectHideFlags: 0 @@ -562,23 +515,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 6643637775379894486} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 ---- !u!225 &225831940989964384 -CanvasGroup: +--- !u!114 &114522817932931646 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6643637775379894484} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &114522817932931646 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} + m_Name: + m_EditorClassIdentifier: + dragged: 0 +--- !u!114 &3011926265969909947 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -587,10 +537,10 @@ MonoBehaviour: m_GameObject: {fileID: 6643637775379894484} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3011926265969909947 +--- !u!114 &3573135846559875297 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -599,6 +549,23 @@ MonoBehaviour: m_GameObject: {fileID: 6643637775379894484} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-6877371120973083636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6643637775379894484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab similarity index 89% rename from Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab index b95c492474d8201a9b3c96800315a19a161ce9d6..3e06c02ae8faf1212c581150b9caebbf3558140f 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3869010688581027450} m_RootOrder: 0 @@ -145,12 +146,14 @@ GameObject: - component: {fileID: 3869010688581027450} - component: {fileID: 4197087563868549049} - component: {fileID: 2609551024752603468} + - component: {fileID: 5452397979381543940} - component: {fileID: 4177212962186602924} - component: {fileID: 7571158064837864710} - - component: {fileID: 5331562473041691776} - component: {fileID: 5437783688132341522} - m_Layer: 0 - m_Name: AngleCircleLine + - component: {fileID: 7217286308176857857} + - component: {fileID: -1727938665847958892} + m_Layer: 5 + m_Name: DisplayAngleCircleLine m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -166,6 +169,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1617200358099008032} - {fileID: 1321826948182935295} @@ -184,7 +188,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4902928549420802332} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2609551024752603468 MonoBehaviour: m_ObjectHideFlags: 0 @@ -215,6 +219,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &5452397979381543940 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4902928549420802332} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &4177212962186602924 MonoBehaviour: m_ObjectHideFlags: 0 @@ -227,7 +243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2609551024752603468} --- !u!114 &7571158064837864710 MonoBehaviour: m_ObjectHideFlags: 0 @@ -240,19 +256,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &5331562473041691776 -CanvasGroup: + dragged: 0 +--- !u!114 &5437783688132341522 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4902928549420802332} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &5437783688132341522 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7217286308176857857 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -261,9 +278,26 @@ MonoBehaviour: m_GameObject: {fileID: 4902928549420802332} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-1727938665847958892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4902928549420802332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &7854085605173747270 GameObject: m_ObjectHideFlags: 0 @@ -292,6 +326,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.4} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3869010688581027450} m_RootOrder: 1 diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab similarity index 84% rename from Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab index 807e63f91fe8a7f4b25e50d3f1c4c0dd393c007d..786ac03bba81c7f65a3f30139aad8a565c552a28 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 17.8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7235558123707866364} m_RootOrder: 0 @@ -145,12 +146,14 @@ GameObject: - component: {fileID: 7235558123707866364} - component: {fileID: 7075624231482420700} - component: {fileID: 4086712909713098893} + - component: {fileID: -5329652376929928150} - component: {fileID: 4474082756159207727} - component: {fileID: 6928182635216917115} - - component: {fileID: 8310254113192487485} - component: {fileID: 6811931286641226162} - m_Layer: 0 - m_Name: AreaCircle_perfab + - component: {fileID: 4444078412922319222} + - component: {fileID: 3337022138894200663} + m_Layer: 5 + m_Name: DisplayAreaCircle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -166,6 +169,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4555626192197843171} m_Father: {fileID: 0} @@ -183,7 +187,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7016901710118546043} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &4086712909713098893 MonoBehaviour: m_ObjectHideFlags: 0 @@ -205,7 +209,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: d03f90cb79e6fba4fb25edaf74ffeadd, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -214,6 +218,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-5329652376929928150 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016901710118546043} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &4474082756159207727 MonoBehaviour: m_ObjectHideFlags: 0 @@ -226,7 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 4086712909713098893} --- !u!114 &6928182635216917115 MonoBehaviour: m_ObjectHideFlags: 0 @@ -239,19 +255,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &8310254113192487485 -CanvasGroup: + dragged: 0 +--- !u!114 &6811931286641226162 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7016901710118546043} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &6811931286641226162 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4444078412922319222 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -260,6 +277,23 @@ MonoBehaviour: m_GameObject: {fileID: 7016901710118546043} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &3337022138894200663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016901710118546043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab similarity index 85% rename from Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab index a1c024a4d683e1ab20c22465a7397451174ca59c..06f6962d8c0abc383f728d149f21748f65be67b3 100644 --- a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8780569031657450116} m_RootOrder: 0 @@ -145,12 +146,14 @@ GameObject: - component: {fileID: 8780569031657450116} - component: {fileID: 6436200217209768079} - component: {fileID: 1894013120851118185} + - component: {fileID: 2562591540153244817} - component: {fileID: 5132214578572184594} - component: {fileID: 3896398116007953758} - - component: {fileID: 6482343618895123747} - component: {fileID: 1602337205070616824} + - component: {fileID: -8545268462245846538} + - component: {fileID: 9193188298529412557} m_Layer: 5 - m_Name: CircleFact + m_Name: DisplayCircle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -166,6 +169,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8695166600416321831} m_Father: {fileID: 0} @@ -173,7 +177,7 @@ RectTransform: 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: 4.4, y: 4.6} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6436200217209768079 @@ -183,7 +187,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6636443472981757786} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &1894013120851118185 MonoBehaviour: m_ObjectHideFlags: 0 @@ -214,6 +218,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &2562591540153244817 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6636443472981757786} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &5132214578572184594 MonoBehaviour: m_ObjectHideFlags: 0 @@ -239,19 +255,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &6482343618895123747 -CanvasGroup: + dragged: 0 +--- !u!114 &1602337205070616824 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6636443472981757786} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1602337205070616824 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-8545268462245846538 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -260,6 +277,23 @@ MonoBehaviour: m_GameObject: {fileID: 6636443472981757786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &9193188298529412557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6636443472981757786} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab similarity index 84% rename from Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab index 9ec0e4efc010015a1c41ea8e03f4e02657d0ac1f..6badc3374e4e2e736aa71e4f229977a7d8e9b3f7 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 17.8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1359998811365411408} m_RootOrder: 0 @@ -145,12 +146,14 @@ GameObject: - component: {fileID: 1359998811365411408} - component: {fileID: 7028084461172378176} - component: {fileID: 3047192119255630295} + - component: {fileID: 6900707867866902161} - component: {fileID: 4076526528120032799} - component: {fileID: 4263320076605886561} - - component: {fileID: 3829202662460982349} - component: {fileID: 2650353447837694094} - m_Layer: 0 - m_Name: ConeVolume_prefab + - component: {fileID: -1328819392998620038} + - component: {fileID: -6663813448318375771} + m_Layer: 5 + m_Name: DisplayConeVolume m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -166,6 +169,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4986007063741953014} m_Father: {fileID: 0} @@ -183,7 +187,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2523593828849809055} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &3047192119255630295 MonoBehaviour: m_ObjectHideFlags: 0 @@ -205,7 +209,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f580ba9d4e3825d49a5a7907d2a3f0c1, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -214,6 +218,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &6900707867866902161 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2523593828849809055} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &4076526528120032799 MonoBehaviour: m_ObjectHideFlags: 0 @@ -226,7 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 3047192119255630295} --- !u!114 &4263320076605886561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -239,19 +255,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &3829202662460982349 -CanvasGroup: + dragged: 0 +--- !u!114 &2650353447837694094 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2523593828849809055} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &2650353447837694094 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-1328819392998620038 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -260,6 +277,23 @@ MonoBehaviour: m_GameObject: {fileID: 2523593828849809055} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-6663813448318375771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2523593828849809055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab similarity index 85% rename from Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab index acc7ce9132a356878d519405fa4cdb390a900160..5c52bc9c186a825bd6cfddb8f5a3bf46bef37e80 100644 --- a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab @@ -146,12 +146,14 @@ GameObject: - component: {fileID: 7509137162853395042} - component: {fileID: 4650902899377139768} - component: {fileID: 8448132399530171869} + - component: {fileID: -5483544856802568736} - component: {fileID: 4549857745383475350} - component: {fileID: -7338472263132780475} - - component: {fileID: 7240967210820331247} - component: {fileID: 2130710490396271644} - m_Layer: 0 - m_Name: CylinderVolume + - component: {fileID: 8056345640559627384} + - component: {fileID: 4871256835944773533} + m_Layer: 5 + m_Name: DisplayCylinderVolume m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -185,7 +187,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5287418535931939099} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &8448132399530171869 MonoBehaviour: m_ObjectHideFlags: 0 @@ -207,7 +209,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 352d7dd2edb65f542aba25be27d20d98, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -216,6 +218,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-5483544856802568736 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5287418535931939099} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &4549857745383475350 MonoBehaviour: m_ObjectHideFlags: 0 @@ -228,7 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 8448132399530171869} --- !u!114 &-7338472263132780475 MonoBehaviour: m_ObjectHideFlags: 0 @@ -241,19 +255,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &7240967210820331247 -CanvasGroup: + dragged: 0 +--- !u!114 &2130710490396271644 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5287418535931939099} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &2130710490396271644 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8056345640559627384 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -262,6 +277,23 @@ MonoBehaviour: m_GameObject: {fileID: 5287418535931939099} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &4871256835944773533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5287418535931939099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab similarity index 86% rename from Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab index 879b216fa2f33f86642c7777848be85a2b7be20c..770ef54480b67c25cf3dc76c2e8c7f25256eebeb 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab @@ -11,12 +11,14 @@ GameObject: - component: {fileID: 7299404996771626324} - component: {fileID: 2318968178306689515} - component: {fileID: 1241458608524046696} + - component: {fileID: -321840373872169248} - component: {fileID: 506299453989990893} - component: {fileID: 2785940634305866798} - - component: {fileID: 9035428711241438515} - component: {fileID: 114476148939060428} + - component: {fileID: 6775995842619458444} + - component: {fileID: 6595881491766313357} m_Layer: 5 - m_Name: DistanceDisplay + m_Name: DisplayDistance m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32,6 +34,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 46295265100678663} - {fileID: 1552400999978466847} @@ -40,7 +43,7 @@ RectTransform: 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: -10.1, y: 94.9} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2318968178306689515 @@ -66,6 +69,7 @@ MonoBehaviour: 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: @@ -80,6 +84,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-321840373872169248 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4221381813544557775} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &506299453989990893 MonoBehaviour: m_ObjectHideFlags: 0 @@ -93,10 +109,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 1241458608524046696} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 --- !u!114 &2785940634305866798 MonoBehaviour: m_ObjectHideFlags: 0 @@ -109,19 +121,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &9035428711241438515 -CanvasGroup: + dragged: 0 +--- !u!114 &114476148939060428 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4221381813544557775} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &114476148939060428 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6775995842619458444 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -130,9 +143,26 @@ MonoBehaviour: m_GameObject: {fileID: 4221381813544557775} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &6595881491766313357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4221381813544557775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &6379254425133528592 GameObject: m_ObjectHideFlags: 0 @@ -161,6 +191,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7299404996771626324} m_RootOrder: 0 @@ -193,6 +224,7 @@ MonoBehaviour: 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: @@ -219,13 +251,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 37.3 m_fontSizeBase: 36 m_fontWeight: 400 @@ -233,6 +264,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -243,10 +276,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -254,40 +285,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 3246237648589042601} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6753951534025985804 @@ -318,6 +327,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7299404996771626324} m_RootOrder: 1 @@ -350,6 +360,7 @@ MonoBehaviour: 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: @@ -376,13 +387,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 37.3 m_fontSizeBase: 36 m_fontWeight: 400 @@ -390,6 +400,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -400,10 +412,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -411,39 +421,17 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 469060305737786517} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab similarity index 89% rename from Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab index 053fe1f2e24bf110865cf3b7b7a9e2b3a1574135..ecd96e00de9ea7c96b0faa7532d516d79be6c1ba 100644 --- a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2057578581648752616} m_RootOrder: 1 @@ -162,6 +163,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2057578581648752616} m_RootOrder: 0 @@ -279,12 +281,14 @@ GameObject: - component: {fileID: 2057578581648752616} - component: {fileID: 7719973282818826063} - component: {fileID: 2180110340788369784} + - component: {fileID: -6361459908606634220} - component: {fileID: 1285080900581311433} - component: {fileID: 6805943141472748426} - - component: {fileID: 3549802384644774303} - component: {fileID: 4430445033801091530} - m_Layer: 0 - m_Name: EqualCirclesPrefab + - component: {fileID: -8548468547709009186} + - component: {fileID: -6007190389148885436} + m_Layer: 5 + m_Name: DisplayEqualCircles m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -300,6 +304,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1916022202853548340} - {fileID: 3366796833421112245} @@ -318,7 +323,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7523305359074541435} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2180110340788369784 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +345,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: ad920a8c90fd4c74ba95809d3e14e6b7, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -349,6 +354,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-6361459908606634220 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7523305359074541435} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &1285080900581311433 MonoBehaviour: m_ObjectHideFlags: 0 @@ -361,7 +378,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2180110340788369784} --- !u!114 &6805943141472748426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -374,19 +391,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &3549802384644774303 -CanvasGroup: + dragged: 0 +--- !u!114 &4430445033801091530 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7523305359074541435} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &4430445033801091530 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-8548468547709009186 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -395,6 +413,23 @@ MonoBehaviour: m_GameObject: {fileID: 7523305359074541435} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-6007190389148885436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7523305359074541435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab similarity index 86% rename from Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab index a1da5a375d1bdf0fd056aee3479e0f34648ac6ca..ccdbabf5fc0da3a3c3c261c8dbf5b0943a7eed85 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab @@ -146,10 +146,12 @@ GameObject: - component: {fileID: 8643015897288315615} - component: {fileID: 4856785638153472691} - component: {fileID: 6811289727063397518} + - component: {fileID: -8616053750771812173} - component: {fileID: 6586968856821406842} - component: {fileID: 3914868910838030883} - - component: {fileID: 4479822174921760807} - component: {fileID: 7215917396402112958} + - component: {fileID: 7981125183230312854} + - component: {fileID: -4205691289957159684} m_Layer: 5 m_Name: DisplayLine m_TagString: Untagged @@ -216,6 +218,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-8616053750771812173 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510387096843212865} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &6586968856821406842 MonoBehaviour: m_ObjectHideFlags: 0 @@ -241,19 +255,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &4479822174921760807 -CanvasGroup: + dragged: 0 +--- !u!114 &7215917396402112958 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7510387096843212865} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &7215917396402112958 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7981125183230312854 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -262,6 +277,23 @@ MonoBehaviour: m_GameObject: {fileID: 7510387096843212865} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-4205691289957159684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510387096843212865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab similarity index 85% rename from Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab index 7eadc8e56a03027f296920261db1134e5f73075b..f44981935bb3f9fd756ae9181a7994f1438e7918 100644 --- a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab @@ -11,12 +11,14 @@ GameObject: - component: {fileID: 8464853153116416756} - component: {fileID: 6773971219611625873} - component: {fileID: 2122753052771730408} + - component: {fileID: -3993157698965855989} - component: {fileID: 639140626255626101} - component: {fileID: 6441113378387087702} - - component: {fileID: -8964638906401905625} - component: {fileID: 9073127243885313005} + - component: {fileID: -5954085419867829670} + - component: {fileID: 5980699288881757793} m_Layer: 5 - m_Name: OnCirclePreFab + m_Name: DisplayOnCircle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32,6 +34,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7483112472360205916} m_Father: {fileID: 0} @@ -49,7 +52,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2115817999818309900} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2122753052771730408 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81,6 +84,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-3993157698965855989 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115817999818309900} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &639140626255626101 MonoBehaviour: m_ObjectHideFlags: 0 @@ -93,7 +108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2122753052771730408} --- !u!114 &6441113378387087702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -106,19 +121,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &-8964638906401905625 -CanvasGroup: + dragged: 0 +--- !u!114 &9073127243885313005 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2115817999818309900} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &9073127243885313005 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-5954085419867829670 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -127,9 +143,26 @@ MonoBehaviour: m_GameObject: {fileID: 2115817999818309900} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &5980699288881757793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115817999818309900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &5265014618439724607 GameObject: m_ObjectHideFlags: 0 @@ -158,6 +191,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8464853153116416756} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab similarity index 86% rename from Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab index 7da811c09c291c368344df51748140e56e8524e3..d716e01f047f02bc70ecd3cb0101211e5adb255d 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5490242222770183200} m_RootOrder: 1 @@ -60,6 +61,7 @@ MonoBehaviour: 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: @@ -85,13 +87,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -99,6 +100,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -109,10 +112,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -120,40 +121,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 6.839691, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 3599574990072972372} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3216314843116350079 @@ -184,6 +163,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5490242222770183200} m_RootOrder: 0 @@ -216,6 +196,7 @@ MonoBehaviour: 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: @@ -241,13 +222,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -255,6 +235,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -265,10 +247,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -276,40 +256,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 9.470367} - m_textInfo: - textComponent: {fileID: 8416932638320714506} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6050914136827205310 @@ -323,10 +281,12 @@ GameObject: - component: {fileID: 5490242222770183200} - component: {fileID: 8693547975586513996} - component: {fileID: 7297490523703237233} + - component: {fileID: -8795514373464730087} - component: {fileID: 96998878642029046} - component: {fileID: 979255380955983068} - - component: {fileID: 425851386909748952} - component: {fileID: 6910630412647778113} + - component: {fileID: -4875952770271437981} + - component: {fileID: 3281836877418813895} m_Layer: 5 m_Name: DisplayOnLine m_TagString: Untagged @@ -344,6 +304,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1166166042567054607} - {fileID: 2026273491173073505} @@ -378,6 +339,7 @@ MonoBehaviour: 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: @@ -392,6 +354,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-8795514373464730087 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050914136827205310} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &96998878642029046 MonoBehaviour: m_ObjectHideFlags: 0 @@ -405,10 +379,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 7297490523703237233} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 --- !u!114 &979255380955983068 MonoBehaviour: m_ObjectHideFlags: 0 @@ -421,19 +391,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &425851386909748952 -CanvasGroup: + dragged: 0 +--- !u!114 &6910630412647778113 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6050914136827205310} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &6910630412647778113 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-4875952770271437981 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -442,6 +413,23 @@ MonoBehaviour: m_GameObject: {fileID: 6050914136827205310} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &3281836877418813895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050914136827205310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab similarity index 89% rename from Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab index 1c49b3ea90ae025a96fb8325e1ec12f3fcfebc5d..249206c5ed91b5ed81288e563037fa31391843fc 100644 --- a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 313608976654385155} m_RootOrder: 0 @@ -162,6 +163,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2.1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 313608976654385155} m_RootOrder: 1 @@ -279,12 +281,14 @@ GameObject: - component: {fileID: 313608976654385155} - component: {fileID: 7453695026461963725} - component: {fileID: 3070659305120604608} + - component: {fileID: 6700141036727457433} - component: {fileID: 7705752672375263960} - component: {fileID: 8593937097866258120} - - component: {fileID: 8996773866579933820} - component: {fileID: 930378118197085978} - m_Layer: 0 - m_Name: OrthogonalCircleAnglePrefab + - component: {fileID: -4766878545130701298} + - component: {fileID: 4466550412761522739} + m_Layer: 5 + m_Name: DisplayOrthogonalCircleLine m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -300,6 +304,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5933166921333861473} - {fileID: 7894779467777820317} @@ -318,7 +323,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8554350198830106250} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &3070659305120604608 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +345,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 66ba1c16426bcaf49baab37f47c67b47, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -349,6 +354,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &6700141036727457433 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8554350198830106250} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &7705752672375263960 MonoBehaviour: m_ObjectHideFlags: 0 @@ -361,7 +378,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 3070659305120604608} --- !u!114 &8593937097866258120 MonoBehaviour: m_ObjectHideFlags: 0 @@ -374,19 +391,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &8996773866579933820 -CanvasGroup: + dragged: 0 +--- !u!114 &930378118197085978 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8554350198830106250} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &930378118197085978 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-4766878545130701298 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -395,6 +413,23 @@ MonoBehaviour: m_GameObject: {fileID: 8554350198830106250} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &4466550412761522739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8554350198830106250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab similarity index 89% rename from Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab index 8b9fe1f0e8d0ea58b7f98af0700015d3e45e54dc..d8f691b1f9cbb2d86721f3b70c062068f4a8a4a1 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8643015897288315615} m_RootOrder: 0 @@ -145,12 +146,14 @@ GameObject: - component: {fileID: 8643015897288315615} - component: {fileID: 4856785638153472691} - component: {fileID: 6811289727063397518} + - component: {fileID: -5306579992832972806} - component: {fileID: 6586968856821406842} - component: {fileID: 3914868910838030883} - - component: {fileID: 4479822174921760807} - component: {fileID: 7215917396402112958} + - component: {fileID: 41121149337675280} + - component: {fileID: -8573552533908309515} m_Layer: 5 - m_Name: ParallelLinePrefab + m_Name: DisplayParallelLine m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -166,6 +169,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3165017659102780400} - {fileID: 3726921479501637083} @@ -215,6 +219,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-5306579992832972806 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510387096843212865} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &6586968856821406842 MonoBehaviour: m_ObjectHideFlags: 0 @@ -240,19 +256,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &4479822174921760807 -CanvasGroup: + dragged: 0 +--- !u!114 &7215917396402112958 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7510387096843212865} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &7215917396402112958 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &41121149337675280 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -261,9 +278,26 @@ MonoBehaviour: m_GameObject: {fileID: 7510387096843212865} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-8573552533908309515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510387096843212865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &7693994637337906468 GameObject: m_ObjectHideFlags: 0 @@ -292,6 +326,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8643015897288315615} m_RootOrder: 1 diff --git a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab similarity index 86% rename from Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab index e554c44ae42aac66d62b551dd4eb82e5017aaa74..c96d9e2a61804ed88a145a20bf02aeffead1ede8 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab @@ -11,10 +11,12 @@ GameObject: - component: {fileID: 858001163752551618} - component: {fileID: 858001163752551616} - component: {fileID: 858001163752551617} + - component: {fileID: 6453378001758524415} - component: {fileID: 8408536798623030161} - component: {fileID: 114132791164475416} - - component: {fileID: 225408562469983378} - component: {fileID: 114984628052382182} + - component: {fileID: -6287292158833946431} + - component: {fileID: -7957010930568868188} m_Layer: 5 m_Name: DisplayPoint m_TagString: Untagged @@ -81,6 +83,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &6453378001758524415 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858001163752551619} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &8408536798623030161 MonoBehaviour: m_ObjectHideFlags: 0 @@ -106,19 +120,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &225408562469983378 -CanvasGroup: + dragged: 0 +--- !u!114 &114984628052382182 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 858001163752551619} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &114984628052382182 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-6287292158833946431 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -127,9 +142,26 @@ MonoBehaviour: m_GameObject: {fileID: 858001163752551619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-7957010930568868188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858001163752551619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &858001164857725565 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab similarity index 84% rename from Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab index 3e64a454c956f94d834121f880cc94beaf2a7b11..8e4329173adb48938750e35ddd46b552146f85b8 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab @@ -11,12 +11,14 @@ GameObject: - component: {fileID: 5635985299619511840} - component: {fileID: 9014721336959090042} - component: {fileID: 6545787433352254111} + - component: {fileID: -3951124718391435523} - component: {fileID: 7450556920702625537} - component: {fileID: 173279308733449335} - - component: {fileID: 6544775749910269078} - component: {fileID: 3955180868949107883} - m_Layer: 0 - m_Name: RadiusPrefab + - component: {fileID: -497146227597533108} + - component: {fileID: -2247250977338064909} + m_Layer: 5 + m_Name: DisplayRadius m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32,6 +34,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7905377173249376416} m_Father: {fileID: 0} @@ -49,7 +52,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2513701074329712390} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &6545787433352254111 MonoBehaviour: m_ObjectHideFlags: 0 @@ -71,7 +74,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: b85e914ced337ad4bbc40ad74c37da14, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -80,6 +83,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-3951124718391435523 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2513701074329712390} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &7450556920702625537 MonoBehaviour: m_ObjectHideFlags: 0 @@ -92,7 +107,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 6545787433352254111} --- !u!114 &173279308733449335 MonoBehaviour: m_ObjectHideFlags: 0 @@ -105,19 +120,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &6544775749910269078 -CanvasGroup: + dragged: 0 +--- !u!114 &3955180868949107883 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2513701074329712390} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &3955180868949107883 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-497146227597533108 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -126,9 +142,26 @@ MonoBehaviour: m_GameObject: {fileID: 2513701074329712390} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-2247250977338064909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2513701074329712390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &8185219527703794732 GameObject: m_ObjectHideFlags: 0 @@ -157,6 +190,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 8.6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5635985299619511840} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab similarity index 93% rename from Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab index ea9b3af77454a62dadd7e6c43ddf7101cb2613d8..99368671ea20c7fc5797d4a113efaf8e00228410 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 1 @@ -162,6 +163,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 0 @@ -296,6 +298,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 3 @@ -430,6 +433,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 2 @@ -547,12 +551,14 @@ GameObject: - component: {fileID: 2351056462585403637} - component: {fileID: 7822135884913080422} - component: {fileID: 3266031038391391049} + - component: {fileID: -3856313481121579632} - component: {fileID: 7956205528156386179} - component: {fileID: 2163234623969663275} - - component: {fileID: 8026609014010234375} - component: {fileID: 4558040300745642744} + - component: {fileID: -1221418573146676442} + - component: {fileID: -4240360816424112390} m_Layer: 5 - m_Name: RectangleFactPrefab + m_Name: DisplayRectangleFact m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -568,6 +574,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6853670326260023163} - {fileID: 4437548300139704302} @@ -588,7 +595,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8156936215466465834} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &3266031038391391049 MonoBehaviour: m_ObjectHideFlags: 0 @@ -619,6 +626,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-3856313481121579632 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8156936215466465834} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &7956205528156386179 MonoBehaviour: m_ObjectHideFlags: 0 @@ -631,7 +650,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 3266031038391391049} --- !u!114 &2163234623969663275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -644,19 +663,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &8026609014010234375 -CanvasGroup: + dragged: 0 +--- !u!114 &4558040300745642744 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8156936215466465834} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &4558040300745642744 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-1221418573146676442 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -665,6 +685,23 @@ MonoBehaviour: m_GameObject: {fileID: 8156936215466465834} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-4240360816424112390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8156936215466465834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab similarity index 91% rename from Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab index dd99580a47cab66ec6e90e4d122d2f4e008e04b3..ee4bf0104f3cb9f320e325d3bbd502ba1724d948 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3558427588790173337} m_RootOrder: 2 @@ -145,12 +146,14 @@ GameObject: - component: {fileID: 3558427588790173337} - component: {fileID: 661520793940439990} - component: {fileID: 5767345106027831726} + - component: {fileID: -579110386671252163} - component: {fileID: 5822687220706391381} - component: {fileID: 3794236076833855767} - - component: {fileID: 8245241791380942728} - component: {fileID: 8661743446683420805} - m_Layer: 0 - m_Name: RightAnglePrefab + - component: {fileID: 4176151758276728228} + - component: {fileID: 493413251982980403} + m_Layer: 5 + m_Name: DisplayRightAngle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -166,6 +169,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8820573273228334392} - {fileID: 6929334133930288485} @@ -185,7 +189,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3080888058940174091} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &5767345106027831726 MonoBehaviour: m_ObjectHideFlags: 0 @@ -207,7 +211,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 2f972a9b017f79a43a7e95eeddebd66b, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -216,6 +220,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-579110386671252163 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3080888058940174091} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &5822687220706391381 MonoBehaviour: m_ObjectHideFlags: 0 @@ -228,7 +244,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 5767345106027831726} --- !u!114 &3794236076833855767 MonoBehaviour: m_ObjectHideFlags: 0 @@ -241,19 +257,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &8245241791380942728 -CanvasGroup: + dragged: 0 +--- !u!114 &8661743446683420805 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3080888058940174091} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &8661743446683420805 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4176151758276728228 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -262,9 +279,26 @@ MonoBehaviour: m_GameObject: {fileID: 3080888058940174091} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &493413251982980403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3080888058940174091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &7613847065484003782 GameObject: m_ObjectHideFlags: 0 @@ -293,6 +327,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3558427588790173337} m_RootOrder: 0 @@ -427,6 +462,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3558427588790173337} m_RootOrder: 1 diff --git a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab similarity index 73% rename from Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab index 3a43cec84139fba4bf648e2e8060af2170ba2246..996ad40446fd0d0dc143ce872f3924147882b374 100644 --- a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab @@ -11,12 +11,14 @@ GameObject: - component: {fileID: 6755804354927699367} - component: {fileID: 3779590155575851460} - component: {fileID: 5078315713010028456} + - component: {fileID: 6592776107266831046} + - component: {fileID: -5313503588223420466} - component: {fileID: 2785454548719711828} - - component: {fileID: 156028697059819196} - component: {fileID: 1224931104090066081} - - component: {fileID: -5313503588223420466} - m_Layer: 0 - m_Name: TestFactPrefab + - component: {fileID: 7299521122061085080} + - component: {fileID: -7305694658926121836} + m_Layer: 5 + m_Name: DisplayTestFact m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32,6 +34,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -48,7 +51,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2846439484187545958} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &5078315713010028456 MonoBehaviour: m_ObjectHideFlags: 0 @@ -79,7 +82,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2785454548719711828 +--- !u!225 &6592776107266831046 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2846439484187545958} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &-5313503588223420466 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -88,21 +103,23 @@ MonoBehaviour: m_GameObject: {fileID: 2846439484187545958} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} + m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &156028697059819196 -CanvasGroup: + imageToChange: {fileID: 5078315713010028456} +--- !u!114 &2785454548719711828 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2846439484187545958} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} + m_Name: + m_EditorClassIdentifier: + dragged: 0 --- !u!114 &1224931104090066081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -115,7 +132,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &-5313503588223420466 +--- !u!114 &7299521122061085080 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -124,7 +141,23 @@ MonoBehaviour: m_GameObject: {fileID: 2846439484187545958} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &-7305694658926121836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2846439484187545958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab similarity index 84% rename from Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab index e8d5b381b9578cdec396da23f1770554a8061ada..369fc8b4132d483f222f901184717133ebe12480 100644 --- a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab @@ -11,12 +11,14 @@ GameObject: - component: {fileID: 4304353889690954113} - component: {fileID: 1286697532791835095} - component: {fileID: 2999154800373574638} + - component: {fileID: -7731941237985852692} - component: {fileID: 5477813449890952819} - component: {fileID: 6431159876548220859} - - component: {fileID: 5268227492380838391} - component: {fileID: 4468595272332714251} - m_Layer: 0 - m_Name: TruncatedConeVolumePrefab + - component: {fileID: 3888340986020047728} + - component: {fileID: 4076898894668230875} + m_Layer: 5 + m_Name: DisplayTruncatedConeVolume m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32,6 +34,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7937755305675264209} m_Father: {fileID: 0} @@ -49,7 +52,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4123133807278660472} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2999154800373574638 MonoBehaviour: m_ObjectHideFlags: 0 @@ -71,7 +74,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: fde0a14086151274a9d464a3d51c5e0f, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -80,6 +83,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-7731941237985852692 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4123133807278660472} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &5477813449890952819 MonoBehaviour: m_ObjectHideFlags: 0 @@ -92,7 +107,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2999154800373574638} --- !u!114 &6431159876548220859 MonoBehaviour: m_ObjectHideFlags: 0 @@ -105,19 +120,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &5268227492380838391 -CanvasGroup: + dragged: 0 +--- !u!114 &4468595272332714251 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4123133807278660472} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &4468595272332714251 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3888340986020047728 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -126,9 +142,26 @@ MonoBehaviour: m_GameObject: {fileID: 4123133807278660472} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &4076898894668230875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4123133807278660472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &6234169056530260467 GameObject: m_ObjectHideFlags: 0 @@ -157,6 +190,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 16.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4304353889690954113} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab similarity index 89% rename from Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab index 99761cdd546673a6f5774bb5c31faf6a91c793f2..9ddddce91ae67b8c2e1a3876cfaff65b83868a4e 100644 --- a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1329885387404967602} m_RootOrder: 1 @@ -145,12 +146,14 @@ GameObject: - component: {fileID: 1329885387404967602} - component: {fileID: 8848431339215720241} - component: {fileID: 7403282225673375912} + - component: {fileID: -6208543061779266716} - component: {fileID: 3225367128346546047} - component: {fileID: 4056140006323214235} - - component: {fileID: 8957209247582476496} - component: {fileID: -6417425987847613228} - m_Layer: 0 - m_Name: UnequalCirclesPrefab + - component: {fileID: -6842305447839815895} + - component: {fileID: 638044177452029688} + m_Layer: 5 + m_Name: DisplayUnequalCircles m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -166,6 +169,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5090358772929881988} - {fileID: 6656328133969465038} @@ -184,7 +188,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5769925203401971992} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &7403282225673375912 MonoBehaviour: m_ObjectHideFlags: 0 @@ -206,7 +210,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 269651011d5ec79458964edbef59ae70, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -215,6 +219,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &-6208543061779266716 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5769925203401971992} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!114 &3225367128346546047 MonoBehaviour: m_ObjectHideFlags: 0 @@ -227,7 +243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 7403282225673375912} --- !u!114 &4056140006323214235 MonoBehaviour: m_ObjectHideFlags: 0 @@ -240,19 +256,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!225 &8957209247582476496 -CanvasGroup: + dragged: 0 +--- !u!114 &-6417425987847613228 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5769925203401971992} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &-6417425987847613228 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-6842305447839815895 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -261,9 +278,26 @@ MonoBehaviour: m_GameObject: {fileID: 5769925203401971992} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} +--- !u!114 &638044177452029688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5769925203401971992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3} m_Name: m_EditorClassIdentifier: + isFavourite: 0 + favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} --- !u!1 &5984757243279669606 GameObject: m_ObjectHideFlags: 0 @@ -292,6 +326,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1329885387404967602} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab b/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab index 7261b306f21d02bcaf1a01c34fc6da19caefe918..207d926eddfd9f574e779df061c965d21d5dde89 100644 --- a/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab @@ -28,6 +28,7 @@ RectTransform: 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: 0.4166666} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab b/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab index 5c78bf8fda220c7d0912e5a7ca3b644ece34f888..502f249b7914ccad2920db9dc09163e454de2e1e 100644 --- a/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 4469453702329312233} - component: {fileID: 565795937736748943} - component: {fileID: 6315983451093957514} + - component: {fileID: 6972799681139387453} + - component: {fileID: 1550777745310495707} m_Layer: 5 m_Name: GadgetButton m_TagString: Untagged @@ -121,3 +123,29 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6972799681139387453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5345241908758045532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1550777745310495707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5345241908758045532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab index 34ebc875bb0fec2fc5bfafbdc4171a38386b52b6..d104923e692d92265307bbe06302c8cb19ccd8cc 100644 --- a/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 3034026415523795643} - component: {fileID: 1128051559874898766} - component: {fileID: 4377593509458917284} + - component: {fileID: -5845435364745367903} + - component: {fileID: 8919255525270428308} m_Layer: 5 m_Name: PythagorasDisplay m_TagString: Untagged @@ -28,6 +30,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.2170901, y: 2.2170901, z: 2.2170901} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -54,12 +57,14 @@ MonoBehaviour: m_GameObject: {fileID: 1096499547874235316} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -72,3 +77,30 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &-5845435364745367903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096499547874235316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8919255525270428308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096499547874235316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab index d83591a380658b6e74a310645ebd4db4d5c722cf..8079072e8bf1cd1cd5f01daa7177ea268ef96ac8 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab @@ -29,6 +29,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5295466371659185427} m_Father: {fileID: 0} @@ -118,6 +119,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 659044494318708747} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab index 28fd821d425901039f4c41850e1acd095bda0b18..f854ea39e6e3c5aed1e2861d12145fc6cb11026b 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab @@ -70,8 +70,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -99,7 +99,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 2 + 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} @@ -288,7 +288,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &327874510602248635 MonoBehaviour: m_ObjectHideFlags: 0 @@ -385,6 +385,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1312545848644489742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2019108164860055462} + - component: {fileID: 812070716982326087} + - component: {fileID: 867180513878542349} + - component: {fileID: 1605864924523844710} + m_Layer: 5 + m_Name: SwitchCamera_Bttn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2019108164860055462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312545848644489742} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9170108318488324908} + m_Father: {fileID: 2252479989828166401} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.8463106, y: 0.4064447} + m_AnchorMax: {x: 1, y: 0.5222793} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &812070716982326087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312545848644489742} + m_CullTransparentMesh: 1 +--- !u!114 &867180513878542349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312545848644489742} + 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: 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: 30e6e468ea9441348abbb90112b7807d, 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!114 &1605864924523844710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312545848644489742} + 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: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3} + 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: 867180513878542349} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1709323068994073905 GameObject: m_ObjectHideFlags: 0 @@ -602,7 +737,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0.85} m_AnchorMax: {x: 0.6, y: 0.99} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 130, y: 0} m_SizeDelta: {x: -0.00005531311, y: -0.0000038146973} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4901663823968045019 @@ -783,7 +918,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &7622515375801632008 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1025,10 +1160,10 @@ RectTransform: m_Father: {fileID: 6568398865745599628} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.8631062, y: 0.60644466} - m_AnchorMax: {x: 1, y: 0.72279274} - m_AnchoredPosition: {x: -0.029541016, y: 9.69751} - m_SizeDelta: {x: 0.060447693, y: 19.394993} + m_AnchorMin: {x: 0.8631062, y: 0.6064447} + m_AnchorMax: {x: 1, y: 0.7222793} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &512621555080822324 CanvasRenderer: @@ -1058,8 +1193,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1087,7 +1222,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 2 + 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} @@ -1263,8 +1398,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1292,7 +1427,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 2 + 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} @@ -1706,7 +1841,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6037608700817923016} + - {fileID: 6368005777045954707} - {fileID: 3129303587586972547} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2073,6 +2208,107 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Button +--- !u!1 &5064961923267230209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2252479989828166401} + - component: {fileID: 5610515614069067121} + - component: {fileID: 3153660507764185559} + - component: {fileID: 5400571071174051820} + m_Layer: 5 + m_Name: SwitchCamera_bttn_onoff_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2252479989828166401 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5064961923267230209} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2019108164860055462} + m_Father: {fileID: 118299968777129975} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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, y: 0} +--- !u!223 &5610515614069067121 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5064961923267230209} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3153660507764185559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5064961923267230209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &5400571071174051820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5064961923267230209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &5169543494579483684 GameObject: m_ObjectHideFlags: 0 @@ -2210,7 +2446,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 8 m_MaxSize: 80 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2219,6 +2455,59 @@ MonoBehaviour: m_Text: 'Pause ' +--- !u!1 &5594427878834005957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 118299968777129975} + - component: {fileID: 695663164670639176} + m_Layer: 0 + m_Name: MathMenue1_Bttn_onoff_"19" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &118299968777129975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5594427878834005957} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2252479989828166401} + m_Father: {fileID: 7108271756006176728} + 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: -162.86841, y: -202.24045} + m_SizeDelta: {x: -1920, y: -1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &695663164670639176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5594427878834005957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e3281ba7462a8a4dad1ea188ed30a8a, type: 3} + m_Name: + m_EditorClassIdentifier: + myself_GObj: {fileID: 5594427878834005957} + myUI_ID: 19 + default_value: 1 --- !u!1 &6449084213387415065 GameObject: m_ObjectHideFlags: 0 @@ -2302,7 +2591,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &7298780208311908334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2393,7 +2682,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 8 m_MaxSize: 80 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2614,8 +2903,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2643,7 +2932,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 2 + 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} @@ -2844,6 +3133,7 @@ RectTransform: - {fileID: 1072986785082259522} - {fileID: 1124259054666192576} - {fileID: 3510664950835701341} + - {fileID: 118299968777129975} m_Father: {fileID: 3129303587586972547} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3052,9 +3342,9 @@ RectTransform: m_Father: {fileID: 5885436440134337640} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.86200005, y: 0.59713477} - m_AnchorMax: {x: 1, y: 0.73800004} - m_AnchoredPosition: {x: 0, y: 0.000015258789} + m_AnchorMin: {x: 0.86200005, y: 0.1971348} + m_AnchorMax: {x: 1, y: 0.338} + m_AnchoredPosition: {x: 0, y: 0.000030517578} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4153346424924443774 @@ -3085,8 +3375,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3114,7 +3404,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 2 + 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} @@ -3349,10 +3639,10 @@ RectTransform: m_Father: {fileID: 1801135202064309160} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4, y: 0.85} - m_AnchorMax: {x: 0.6, y: 0.99} + m_AnchorMin: {x: 0.05, y: 0.85} + m_AnchorMax: {x: 0.25, y: 0.99} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.00005531311, y: -0.0000038146973} + m_SizeDelta: {x: 0, y: -0.0000038146973} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4491262259019493989 CanvasRenderer: @@ -3396,6 +3686,86 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Toolmode +--- !u!1 &8667786625271979614 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9170108318488324908} + - component: {fileID: 210198543683894619} + - component: {fileID: 5843960459232639639} + m_Layer: 5 + m_Name: TextUPress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9170108318488324908 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667786625271979614} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2019108164860055462} + 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!222 &210198543683894619 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667786625271979614} + m_CullTransparentMesh: 1 +--- !u!114 &5843960459232639639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667786625271979614} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 80 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Camera --- !u!1 &8841243489745293715 GameObject: m_ObjectHideFlags: 0 @@ -3469,7 +3839,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 8 m_MaxSize: 80 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3549,7 +3919,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 8 m_MaxSize: 80 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3631,7 +4001,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 8 m_MaxSize: 80 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3972,296 +4342,422 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1057245782326959912} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3170751396342317722 +--- !u!1001 &3983954625456131398 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4842294571495540312} m_Modifications: - - target: {fileID: 4623092116721457026, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 135495637574507176, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 135495637574507176, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4623092116721457026, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4623092116721457026, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4623092116721457026, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4623092116721457026, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4623092116721457026, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5171782508373878537, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 676657214403543027, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.x + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 676657214403543027, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 42.5 + objectReference: {fileID: 0} + - target: {fileID: 1252298860017755546, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 1252298860017755546, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1252298860017755546, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 110 + objectReference: {fileID: 0} + - target: {fileID: 1740535524398633728, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 1740535524398633728, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 2852142813919514284, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3288135918833220163, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 3288135918833220163, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 3716020922907832516, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6417303587324338980, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6417303587324338980, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6417303587324338980, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6417303587324338980, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6417303587324338980, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6417303587324338980, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4335843193789688460, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3115028324387670339} + - target: {fileID: 4335843193789688460, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: FavoritesFilterChanged + objectReference: {fileID: 0} + - target: {fileID: 6500467619489830996, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6500467619489830996, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6573826504273724345, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7093782584270134969, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7093782584270134969, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7849991042685492731, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6573826504273724345, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6573826504273724345, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7989559431199338490, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7989559431199338490, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000045776367 + objectReference: {fileID: 0} + - target: {fileID: 8004702056544321748, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6573826504273724345, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056544321748, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8004702056544321748, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6573826504273724345, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056565720365, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6573826504273724345, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056618112982, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_AnchoredPosition.y + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679512206244, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056618112982, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_IsActive + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501328, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056618112982, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_PresetInfoIsWorld + propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702056709666223, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8004702056709666223, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_Value + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8004702057932254674, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + propertyPath: m_Name + value: HidingCanvas + objectReference: {fileID: 0} + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926679660501333, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702057932254679, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_Name - value: HidingCanvas - objectReference: {fileID: 0} - - target: {fileID: 9207926680194070279, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_IsActive + propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} - - target: {fileID: 9207926680489444171, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_Size - value: 0.4705884 - objectReference: {fileID: 0} - - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702058016740899, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_Value + propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702058016740899, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 9207926681519240275, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8004702058016740899, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_AnchorMax.x - value: 0 + propertyPath: m_AnchorMin.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 9207926681519240275, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8658227711444809993, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - propertyPath: m_AnchorMax.y - value: 0 + propertyPath: m_SizeDelta.x + value: 80 objectReference: {fileID: 0} - - target: {fileID: 9207926681519240275, guid: b162218cc487f1242bd5ac7b4315a051, + - target: {fileID: 8658227711444809993, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 80 objectReference: {fileID: 0} - - target: {fileID: 9207926681531587063, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9207926681532248490, guid: b162218cc487f1242bd5ac7b4315a051, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 27560.613 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 9207926679892754397, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} ---- !u!224 &6037608700817923016 stripped + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} +--- !u!114 &3115028324387670339 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2050004651490542597, guid: 292834880e6f0e54186b873acc62d3f2, + type: 3} + m_PrefabInstance: {fileID: 3983954625456131398} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &6368005777045954707 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + m_CorrespondingSourceObject: {fileID: 8004702057932254677, guid: 292834880e6f0e54186b873acc62d3f2, type: 3} - m_PrefabInstance: {fileID: 3170751396342317722} + m_PrefabInstance: {fileID: 3983954625456131398} m_PrefabAsset: {fileID: 0} --- !u!1001 &6125392335914277922 PrefabInstance: @@ -4380,6 +4876,26 @@ PrefabInstance: propertyPath: m_Name value: GadgetCanvas objectReference: {fileID: 0} + - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1, type: 3} propertyPath: m_SizeDelta.x @@ -4390,15 +4906,25 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -620 + objectReference: {fileID: 0} + - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -190 + objectReference: {fileID: 0} - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} @@ -4650,6 +5176,11 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2368791980465913659, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3134360799033672926, guid: 6a36259218adf9c4d82396fcaa06650d, type: 3} propertyPath: m_Enabled @@ -4765,6 +5296,26 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 5326558049661044244, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: DPAD_subID_2 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5678210953895042949, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: DPAD_ID + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5678210953895042949, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: DPAD_ID_2 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5678210953895042949, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: DPAD_subID_2 + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6141706914604419468, guid: 6a36259218adf9c4d82396fcaa06650d, type: 3} propertyPath: m_Enabled @@ -4775,6 +5326,16 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 7664050507038371539, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8298271169650038834, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8364050863120939096, guid: 6a36259218adf9c4d82396fcaa06650d, type: 3} propertyPath: m_Enabled @@ -4790,6 +5351,11 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8505524874228820094, guid: 6a36259218adf9c4d82396fcaa06650d, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8718522871135096508, guid: 6a36259218adf9c4d82396fcaa06650d, type: 3} propertyPath: m_Name diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab index d311e78e1c61b4d0c00afb388abd0250e5785a8e..5002055b548c8384dc2eac67ce0c51ac895978e0 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2520747930949992628 +--- !u!1 &961080257836305183 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4623092116721457026} - - component: {fileID: 5540056071855297645} - - component: {fileID: 1345623822099313452} + - component: {fileID: 6500467619489830996} + - component: {fileID: 6592514254180342026} + - component: {fileID: 3111733877815237892} + m_Layer: 5 + m_Name: Scrolls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6500467619489830996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961080257836305183} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8004702058016740899} + 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: 9720} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &6592514254180342026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961080257836305183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 0 + m_Top: 5 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 100, y: 100} + m_Spacing: {x: 0, y: 5} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &3111733877815237892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961080257836305183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &1447414525858596195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 173290219472098764} + - component: {fileID: 8314331323416511131} + - component: {fileID: 3047157218582908072} m_Layer: 5 m_Name: MMTMessage (TMP) m_TagString: Untagged @@ -18,19 +94,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4623092116721457026 +--- !u!224 &173290219472098764 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2520747930949992628} + m_GameObject: {fileID: 1447414525858596195} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.37, y: 1.115714, z: 0.74} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6417303587324338980} + m_Father: {fileID: 3853195430673864773} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -38,21 +114,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5540056071855297645 +--- !u!222 &8314331323416511131 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2520747930949992628} + m_GameObject: {fileID: 1447414525858596195} m_CullTransparentMesh: 1 ---- !u!114 &1345623822099313452 +--- !u!114 &3047157218582908072 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2520747930949992628} + m_GameObject: {fileID: 1447414525858596195} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -136,7 +212,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2900303399007800751 +--- !u!1 &3625441216435933673 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -144,44 +220,84 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5171782508373878537} - - component: {fileID: 6759994692384693062} - - component: {fileID: 1835936846547433619} + - component: {fileID: 3853195430673864773} + - component: {fileID: 911570484790407906} + - component: {fileID: 5352905769564476691} + - component: {fileID: 539865474863423590} + - component: {fileID: 9172041136735592230} m_Layer: 5 - m_Name: Container + m_Name: MMTMessagePanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5171782508373878537 +--- !u!224 &3853195430673864773 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2900303399007800751} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 3625441216435933673} + 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_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 6417303587324338980} - m_Father: {fileID: 6217514410212639169} + - {fileID: 173290219472098764} + m_Father: {fileID: 3716020922907832516} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.008544922, y: 0.0002421254} - m_SizeDelta: {x: 1156.8, y: 0} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &6759994692384693062 + 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!222 &911570484790407906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3625441216435933673} + m_CullTransparentMesh: 1 +--- !u!114 &5352905769564476691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3625441216435933673} + 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.6313726} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &539865474863423590 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2900303399007800751} + m_GameObject: {fileID: 3625441216435933673} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} @@ -189,9 +305,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 + m_Right: 20 + m_Top: 100 + m_Bottom: 100 m_ChildAlignment: 7 m_Spacing: 0 m_ChildForceExpandWidth: 1 @@ -201,21 +317,63 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!114 &1835936846547433619 +--- !u!114 &9172041136735592230 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2900303399007800751} + m_GameObject: {fileID: 3625441216435933673} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!1 &4629804878839556774 + 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: 5352905769564476691} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &6618856106128302243 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -223,11 +381,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6217514410212639169} - - component: {fileID: 5540042464801514340} - - component: {fileID: 7865126838152513948} - - component: {fileID: 8664180732195803096} - - component: {fileID: 2091663869036845425} + - component: {fileID: 7767858306924037183} + - component: {fileID: 7288012865992981481} + - component: {fileID: 573039479540912931} + - component: {fileID: 1794663792524160627} + - component: {fileID: 7890422615657294216} m_Layer: 5 m_Name: MMtMessagePopUpCanvas m_TagString: Untagged @@ -235,34 +393,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6217514410212639169 +--- !u!224 &7767858306924037183 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4629804878839556774} + m_GameObject: {fileID: 6618856106128302243} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.702208, y: 0.25208077, z: 2.0809245} + m_LocalScale: {x: 0.702208, y: 0.2520808, z: 2.080925} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 5171782508373878537} - m_Father: {fileID: 9207926680331850712} + - {fileID: 3716020922907832516} + m_Father: {fileID: 8004702057798297439} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 848.28516, y: 62} + m_AnchoredPosition: {x: 848.2852, y: 62} m_SizeDelta: {x: 1156.834, y: 1018.225} m_Pivot: {x: 1, y: 0} ---- !u!223 &5540042464801514340 +--- !u!223 &7288012865992981481 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4629804878839556774} + m_GameObject: {fileID: 6618856106128302243} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -277,13 +435,13 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &7865126838152513948 +--- !u!114 &573039479540912931 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4629804878839556774} + m_GameObject: {fileID: 6618856106128302243} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} @@ -300,13 +458,13 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 0 ---- !u!114 &8664180732195803096 +--- !u!114 &1794663792524160627 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4629804878839556774} + m_GameObject: {fileID: 6618856106128302243} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} @@ -317,26 +475,26 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &2091663869036845425 +--- !u!114 &7890422615657294216 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4629804878839556774} + m_GameObject: {fileID: 6618856106128302243} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3a2421aa4aa06234393141eca951efb9, type: 3} m_Name: m_EditorClassIdentifier: - canvas: {fileID: 4629804878839556774} - CloseButton: {fileID: 9081536650750380978} - message: {fileID: 1345623822099313452} + canvas: {fileID: 6618856106128302243} + CloseButton: {fileID: 9172041136735592230} + message: {fileID: 3047157218582908072} ServerErrorMessage: unknown server error NonTotalMessage: Scroll application not complete UnknownErrorMessage: Unkown error - did you apply all facts? InvalidAssignmentMessage: Invalid Assignment ---- !u!1 &9199969215333656634 +--- !u!1 &7701132575279143832 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -344,84 +502,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6417303587324338980} - - component: {fileID: 6566537308893485442} - - component: {fileID: 6337417588299490976} - - component: {fileID: 2183010594879739666} - - component: {fileID: 9081536650750380978} + - component: {fileID: 3716020922907832516} + - component: {fileID: 6505282139119622248} + - component: {fileID: 2732696853560371238} m_Layer: 5 - m_Name: MMTMessagePanel + m_Name: Container m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6417303587324338980 +--- !u!224 &3716020922907832516 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9199969215333656634} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 7701132575279143832} + 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_ConstrainProportionsScale: 1 + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4623092116721457026} - m_Father: {fileID: 5171782508373878537} + - {fileID: 3853195430673864773} + m_Father: {fileID: 7767858306924037183} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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!222 &6566537308893485442 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9199969215333656634} - m_CullTransparentMesh: 1 ---- !u!114 &6337417588299490976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9199969215333656634} - 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.6313726} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!114 &2183010594879739666 + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -0.008544922, y: 0.0002421254} + m_SizeDelta: {x: 1156.8, y: 0} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &6505282139119622248 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9199969215333656634} + m_GameObject: {fileID: 7701132575279143832} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} @@ -429,9 +547,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 0 - m_Right: 20 - m_Top: 100 - m_Bottom: 100 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 7 m_Spacing: 0 m_ChildForceExpandWidth: 1 @@ -441,63 +559,21 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!114 &9081536650750380978 +--- !u!114 &2732696853560371238 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9199969215333656634} + m_GameObject: {fileID: 7701132575279143832} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, 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: 6337417588299490976} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!1 &9207926679476855463 + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &8004702056306368600 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -505,100 +581,135 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926679476855460} - - component: {fileID: 9207926679476855459} - - component: {fileID: 9207926679476855458} - - component: {fileID: 9207926679476855461} + - component: {fileID: 8004702056306368603} + - component: {fileID: 8004702056306368605} + - component: {fileID: 8004702056306368602} m_Layer: 5 - m_Name: Scrollscreen + m_Name: Scrolls m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926679476855460 +--- !u!224 &8004702056306368603 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679476855463} + m_GameObject: {fileID: 8004702056306368600} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926679660501330} - m_RootOrder: 4 + m_Father: {fileID: 8004702057423300230} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -53, y: -540} - m_SizeDelta: {x: 105, y: 1080} + m_AnchoredPosition: {x: -275, y: -100} + m_SizeDelta: {x: 275, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926679476855459 +--- !u!222 &8004702056306368605 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679476855463} + m_GameObject: {fileID: 8004702056306368600} m_CullTransparentMesh: 0 ---- !u!114 &9207926679476855458 +--- !u!114 &8004702056306368602 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679476855463} + m_GameObject: {fileID: 8004702056306368600} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + 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: 0.392} + 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: 0} - 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!114 &9207926679476855461 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679476855463} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 66df8f5d2fa2cc140aa2d3eca570e8dd, type: 3} - m_Name: - m_EditorClassIdentifier: - preferredStartScrollName: OppositeLen - tryScrollListTimes: 2 - ScrollButtons: [] - ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261, - type: 3} - DetailScreen: {fileID: 9207926680331850715} - scrollscreenContent: {fileID: 0} - x_Start: -240 - y_Start: 200 - X_Pacece_Between_Items: 105 - y_Pacece_Between_Items: 105 - number_of_Column: 3 ---- !u!1 &9207926679512206244 + m_text: You can select a different scroll but you only need the 'OppositeLen' for + this example + 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + 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!1 &8004702056412215061 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -606,68 +717,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926679512206245} - - component: {fileID: 9207926679512206241} - - component: {fileID: 9207926679512206240} - - component: {fileID: 9207926679512206243} - - component: {fileID: 9207926679512206242} + - component: {fileID: 8004702056412215060} + - component: {fileID: 8004702056412215064} + - component: {fileID: 8004702056412215065} + - component: {fileID: 8004702056412215062} + - component: {fileID: 8004702056412215063} m_Layer: 5 - m_Name: Main Menue + m_Name: Scroll View m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926679512206245 +--- !u!224 &8004702056412215060 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679512206244} + m_GameObject: {fileID: 8004702056412215061} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9207926679764137508} - m_Father: {fileID: 9207926679660501330} + - {fileID: 8004702056544321748} + - {fileID: 8004702056709666220} + m_Father: {fileID: 8004702058139290459} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -214, y: 70} - m_SizeDelta: {x: 160, y: 30} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -90} + m_SizeDelta: {x: 850, y: 250} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926679512206241 +--- !u!222 &8004702056412215064 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679512206244} + m_GameObject: {fileID: 8004702056412215061} m_CullTransparentMesh: 0 ---- !u!114 &9207926679512206240 +--- !u!114 &8004702056412215065 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679512206244} + m_GameObject: {fileID: 8004702056412215061} 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: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -677,75 +789,50 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9207926679512206243 +--- !u!114 &8004702056412215062 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679512206244} + m_GameObject: {fileID: 8004702056412215061} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, 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: Highlighted - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 9207926679512206240} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 9207926679512206242} - m_TargetAssemblyTypeName: Restart, Assembly-CSharp - m_MethodName: LoadMainMenue - 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 &9207926679512206242 + m_ShowMaskGraphic: 1 +--- !u!114 &8004702056412215063 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679512206244} + m_GameObject: {fileID: 8004702056412215061} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0a64b1b6e1e2374f9061d920f106dfb, type: 3} + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &9207926679628625399 + m_Content: {fileID: 8004702056565720365} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 8004702056544321748} + m_HorizontalScrollbar: {fileID: 8004702056709666223} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8004702056426230571 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -753,53 +840,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926679628625396} - - component: {fileID: 9207926679628625394} - - component: {fileID: 9207926679628625397} + - component: {fileID: 8004702056426230570} + - component: {fileID: 8004702056426230572} + - component: {fileID: 8004702056426230573} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Gadgets m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926679628625396 +--- !u!224 &8004702056426230570 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679628625399} + m_GameObject: {fileID: 8004702056426230571} 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9207926680522215219} - - {fileID: 9207926679716571142} - m_Father: {fileID: 9207926679892754396} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 8004702057423300230} + 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: 183} - m_SizeDelta: {x: 800, y: 145.2} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 137.5, y: 400} + m_SizeDelta: {x: 275, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926679628625394 +--- !u!222 &8004702056426230572 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679628625399} + m_GameObject: {fileID: 8004702056426230571} m_CullTransparentMesh: 0 ---- !u!114 &9207926679628625397 +--- !u!114 &8004702056426230573 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679628625399} + m_GameObject: {fileID: 8004702056426230571} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -813,12 +898,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Hier kommt der Scroll Beschreibungstext hin ( \u22BE \u22A5 \u2220 \u221F - \u25B3 )" + m_text: You can scroll through gadgets in Interaction Mode using the T-key or click + on them m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150, type: 2} - m_sharedMaterial: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -842,15 +926,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -878,13 +962,13 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 1 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 18, y: 24, z: 21.1, w: 12} + 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!1 &9207926679660501333 +--- !u!1 &8004702056544321749 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -892,107 +976,237 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926679660501330} - - component: {fileID: 9207926679660501329} - - component: {fileID: 9207926679660501328} - - component: {fileID: 9207926679660501331} + - component: {fileID: 8004702056544321748} + - component: {fileID: 8004702056544321753} + - component: {fileID: 8004702056544321750} + - component: {fileID: 8004702056544321751} m_Layer: 5 - m_Name: HidingCanvas + m_Name: Viewport m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926679660501330 +--- !u!224 &8004702056544321748 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679660501333} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8004702056544321749} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8948529145529680365} - - {fileID: 9207926679512206245} - - {fileID: 9207926681531587060} - - {fileID: 9207926680103916033} - - {fileID: 9207926679476855460} - - {fileID: 9207926680489444168} - - {fileID: 9207926680194070276} - - {fileID: 9207926680741575118} - m_Father: {fileID: 0} + - {fileID: 8004702056565720365} + m_Father: {fileID: 8004702056412215060} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 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, y: 0} ---- !u!223 &9207926679660501329 -Canvas: + m_Pivot: {x: 0, y: 1} +--- !u!114 &8004702056544321753 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679660501333} + m_GameObject: {fileID: 8004702056544321749} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 1 - m_TargetDisplay: 0 ---- !u!114 &9207926679660501328 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &8004702056544321750 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056544321749} + m_CullTransparentMesh: 0 +--- !u!114 &8004702056544321751 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679660501333} + m_GameObject: {fileID: 8004702056544321749} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 1 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &9207926679660501331 + 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &8004702056565337456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004702056565337459} + - component: {fileID: 8004702056565337463} + - component: {fileID: 8004702056565337460} + - component: {fileID: 8004702056565337461} + - component: {fileID: 8004702056565337458} + m_Layer: 5 + m_Name: 'Restart ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8004702056565337459 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056565337456} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8004702056604812097} + m_Father: {fileID: 8004702057932254677} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -214, y: 35} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8004702056565337463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056565337456} + m_CullTransparentMesh: 0 +--- !u!114 &8004702056565337460 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679660501333} + m_GameObject: {fileID: 8004702056565337456} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!1 &9207926679716571161 + 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &8004702056565337461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056565337456} + 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8004702056565337460} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8004702056565337458} + m_TargetAssemblyTypeName: Restart, Assembly-CSharp + m_MethodName: LevelReset + 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 &8004702056565337458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056565337456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0a64b1b6e1e2374f9061d920f106dfb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8004702056565720362 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1000,44 +1214,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926679716571142} - - component: {fileID: 9207926679716571143} + - component: {fileID: 8004702056565720365} + - component: {fileID: 8004702056565720367} + - component: {fileID: 8004702056565720364} m_Layer: 5 - m_Name: TMP SubMeshUI [LiberationSans SDF Material + LiberationSans SDF Atlas] + m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926679716571142 +--- !u!224 &8004702056565720365 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679716571161} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8004702056565720362} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926679628625396} - m_RootOrder: 1 + m_Father: {fileID: 8004702056544321748} + 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_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 3639.5742, y: 0.000030517578} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926679716571143 -CanvasRenderer: + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &8004702056565720367 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679716571161} - m_CullTransparentMesh: 0 ---- !u!1 &9207926679725856118 + m_GameObject: {fileID: 8004702056565720362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &8004702056565720364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056565720362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &8004702056604812126 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1045,51 +1292,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926679725856119} - - component: {fileID: 9207926679725856117} - - component: {fileID: 9207926679725856116} + - component: {fileID: 8004702056604812097} + - component: {fileID: 8004702056604812099} + - component: {fileID: 8004702056604812096} m_Layer: 5 - m_Name: Gadgets Example + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926679725856119 +--- !u!224 &8004702056604812097 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679725856118} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 8004702056604812126} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926680103916033} - m_RootOrder: 3 + m_Father: {fileID: 8004702056565337459} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -275, y: 400} - m_SizeDelta: {x: 275, y: 50} + 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!222 &9207926679725856117 +--- !u!222 &8004702056604812099 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679725856118} + m_GameObject: {fileID: 8004702056604812126} m_CullTransparentMesh: 0 ---- !u!114 &9207926679725856116 +--- !u!114 &8004702056604812096 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679725856118} + m_GameObject: {fileID: 8004702056604812126} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1103,7 +1350,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Use Gadgets by pointing with the mouse and pressing the left mouse button + m_text: Restart Level m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1112,8 +1359,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1130,15 +1377,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1172,7 +1419,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9207926679764137511 +--- !u!1 &8004702056618112983 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1180,54 +1427,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926679764137508} - - component: {fileID: 9207926679764137506} - - component: {fileID: 9207926679764137509} + - component: {fileID: 8004702056618112982} + - component: {fileID: 8004702056618112984} + - component: {fileID: 8004702056618112985} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926679764137508 +--- !u!224 &8004702056618112982 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679764137511} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8004702056618112983} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926679512206245} + m_Father: {fileID: 8004702057674230243} 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: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926679764137506 +--- !u!222 &8004702056618112984 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679764137511} + m_GameObject: {fileID: 8004702056618112983} m_CullTransparentMesh: 0 ---- !u!114 &9207926679764137509 +--- !u!114 &8004702056618112985 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679764137511} + m_GameObject: {fileID: 8004702056618112983} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1238,235 +1485,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Main Menue - 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: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 - m_fontSizeBase: 24 - 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: 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!1 &9207926679892754399 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926679892754396} - - component: {fileID: 9207926679892754394} - m_Layer: 5 - m_Name: Scroll - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9207926679892754396 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679892754399} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9207926679628625396} - - {fileID: 9207926681114477459} - m_Father: {fileID: 9207926680331850712} - 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.00012207031, y: -13.043518} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &9207926679892754394 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679892754399} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &9207926680103916032 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926680103916033} - m_Layer: 5 - m_Name: Tooltips - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9207926680103916033 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680103916032} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9207926680777540234} - - {fileID: 9207926681136637869} - - {fileID: 9207926681255843036} - - {fileID: 9207926679725856119} - - {fileID: 9207926680789128895} - m_Father: {fileID: 9207926679660501330} - m_RootOrder: 3 - 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!1 &9207926680194070279 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926680194070276} - - component: {fileID: 9207926680194070275} - - component: {fileID: 9207926680194070274} - - component: {fileID: 9207926680194070277} - m_Layer: 5 - m_Name: Factscreen - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9207926680194070276 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680194070279} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9207926679660501330} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -225} - m_SizeDelta: {x: 900, y: 450} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926680194070275 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680194070279} - m_CullTransparentMesh: 0 ---- !u!114 &9207926680194070274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680194070279} - 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.392} - 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: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1476,151 +1495,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9207926680194070277 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680194070279} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3} - m_Name: - m_EditorClassIdentifier: - factscreenContent: {fileID: 0} - prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec, - type: 3} - prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67, - type: 3} - prefab_Angle: {fileID: 6643637775379894484, guid: 30fcd362f34a9844fba66065924c6143, - type: 3} - prefab_Default: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec, - type: 3} - prefab_OnLine: {fileID: 6050914136827205310, guid: 496d04605465c7f4dba7638cc6e2dc6e, - type: 3} - prefab_Line: {fileID: 7510387096843212865, guid: d6ee990520a44954fb494468665d19e9, - type: 3} - prefab_ParallelLineFact: {fileID: 0} - prefab_RectangleFact: {fileID: 0} - prefab_RadiusFact: {fileID: 0} - prefab_AreaCircle: {fileID: 0} - prefab_ConeVolume: {fileID: 0} - prefab_OrthogonalCircleLine: {fileID: 0} - prefab_TruncatedConeVolume: {fileID: 0} - prefab_RightAngle: {fileID: 0} - prefab_CylinderVolume: {fileID: 0} - prefab_EqualFact: {fileID: 0} - prefab_UnEqualFact: {fileID: 0} - prefab_TestFact: {fileID: 0} - prefab_CircleFact: {fileID: 0} - prefab_OnCircleFact: {fileID: 0} - prefab_AngleCircleLineFact: {fileID: 0} - x_Start: -125 - y_Start: 475 - X_Pacece_Between_Items: 110 - y_Pacece_Between_Items: 110 - number_of_Column: 3 ---- !u!1 &9207926680331850715 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926680331850712} - - component: {fileID: 9207926680331850695} - - component: {fileID: 9207926680331850713} - - component: {fileID: 9207926680331850694} - m_Layer: 5 - m_Name: ScrollPrefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9207926680331850712 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680331850715} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9207926680480227026} - - {fileID: 9207926679892754396} - - {fileID: 6217514410212639169} - m_Father: {fileID: 9207926680489444168} - 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: 450, y: 321} - m_SizeDelta: {x: 900, y: 640} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926680331850695 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680331850715} - m_CullTransparentMesh: 0 ---- !u!114 &9207926680331850713 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680331850715} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 92f58ba8e8c7bf243bfde7e6656c9064, type: 3} - m_Name: - m_EditorClassIdentifier: - cursor: {fileID: 0} - parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93, - type: 3} - mmtAnswerPopUp: {fileID: 4629804878839556774} - currentMmtAnswer: - dynamicScrollDescriptionsActive: 1 - automaticHintGenerationActive: 1 ---- !u!114 &9207926680331850694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680331850715} - 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: 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: 0} - 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!1 &9207926680354602343 +--- !u!1 &8004702056709666221 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1628,90 +1503,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926680354602340} + - component: {fileID: 8004702056709666220} + - component: {fileID: 8004702056709666193} + - component: {fileID: 8004702056709666222} + - component: {fileID: 8004702056709666223} m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9207926680354602340 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680354602343} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9207926681445974865} - m_Father: {fileID: 9207926681420349739} - 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: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &9207926680480227029 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926680480227026} - - component: {fileID: 9207926680480227025} - - component: {fileID: 9207926680480227024} - - component: {fileID: 9207926680480227027} - m_Layer: 5 - m_Name: MagicButton + m_Name: Scrollbar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926680480227026 +--- !u!224 &8004702056709666220 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680480227029} + m_GameObject: {fileID: 8004702056709666221} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9207926680838069162} - m_Father: {fileID: 9207926680331850712} - m_RootOrder: 0 + - {fileID: 8004702057674230243} + m_Father: {fileID: 8004702056412215060} + 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.000015258789, y: -283} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 0, y: -112} + m_SizeDelta: {x: 500, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926680480227025 +--- !u!222 &8004702056709666193 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680480227029} + m_GameObject: {fileID: 8004702056709666221} m_CullTransparentMesh: 0 ---- !u!114 &9207926680480227024 +--- !u!114 &8004702056709666222 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680480227029} + m_GameObject: {fileID: 8004702056709666221} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1725,7 +1563,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1735,16 +1573,16 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9207926680480227027 +--- !u!114 &8004702056709666223 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680480227029} + m_GameObject: {fileID: 8004702056709666221} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1762,194 +1600,29 @@ MonoBehaviour: 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: Highlighted - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 9207926680480227024} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 9207926680331850713} - m_TargetAssemblyTypeName: - m_MethodName: magicButtonTrigger - 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!1 &9207926680489444171 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926680489444168} - m_Layer: 5 - m_Name: Scrolls-Show - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9207926680489444168 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680489444171} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9207926680331850712} - m_Father: {fileID: 9207926679660501330} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 600} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &9207926680522215218 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926680522215219} - - component: {fileID: 9207926680522215216} - m_Layer: 5 - m_Name: TMP SubMeshUI [LiberationSans SDF Material + LiberationSans SDF Atlas] - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9207926680522215219 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680522215218} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9207926679628625396} - 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!222 &9207926680522215216 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680522215218} - m_CullTransparentMesh: 0 ---- !u!1 &9207926680741575105 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9207926680741575118} - - component: {fileID: 9207926680741575116} - - component: {fileID: 9207926680741575119} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9207926680741575118 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680741575105} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9207926679660501330} - m_RootOrder: 7 - 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: -65, y: 0} - m_SizeDelta: {x: 10, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926680741575116 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680741575105} - m_CullTransparentMesh: 0 ---- !u!114 &9207926680741575119 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680741575105} - 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.3161302, g: 0.6792453, b: 0.2979708, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: + 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: 8004702056618112985} + m_HandleRect: {fileID: 8004702056618112982} + m_Direction: 0 + m_Value: 1 + m_Size: 0.4705884 + m_NumberOfSteps: 0 + m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - 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!1 &9207926680777540237 +--- !u!1 &8004702056750528010 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1957,9 +1630,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926680777540234} - - component: {fileID: 9207926680777540232} - - component: {fileID: 9207926680777540235} + - component: {fileID: 8004702056750528013} + - component: {fileID: 8004702056750528015} + - component: {fileID: 8004702056750528012} m_Layer: 5 m_Name: General m_TagString: Untagged @@ -1967,19 +1640,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926680777540234 +--- !u!224 &8004702056750528013 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680777540237} + m_GameObject: {fileID: 8004702056750528010} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926680103916033} + m_Father: {fileID: 8004702057423300230} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -1987,21 +1660,21 @@ RectTransform: m_AnchoredPosition: {x: 137.5, y: -50} m_SizeDelta: {x: 275, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926680777540232 +--- !u!222 &8004702056750528015 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680777540237} + m_GameObject: {fileID: 8004702056750528010} m_CullTransparentMesh: 0 ---- !u!114 &9207926680777540235 +--- !u!114 &8004702056750528012 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680777540237} + m_GameObject: {fileID: 8004702056750528010} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2084,7 +1757,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9207926680789128894 +--- !u!1 &8004702056770527801 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2092,9 +1765,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926680789128895} - - component: {fileID: 9207926680789128893} - - component: {fileID: 9207926680789128892} + - component: {fileID: 8004702056770527800} + - component: {fileID: 8004702056770527802} + - component: {fileID: 8004702056770527803} m_Layer: 5 m_Name: Facts m_TagString: Untagged @@ -2102,19 +1775,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926680789128895 +--- !u!224 &8004702056770527800 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680789128894} + m_GameObject: {fileID: 8004702056770527801} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926680103916033} + m_Father: {fileID: 8004702057423300230} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2122,21 +1795,21 @@ RectTransform: m_AnchoredPosition: {x: 137.5, y: 175} m_SizeDelta: {x: 275, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926680789128893 +--- !u!222 &8004702056770527802 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680789128894} + m_GameObject: {fileID: 8004702056770527801} m_CullTransparentMesh: 0 ---- !u!114 &9207926680789128892 +--- !u!114 &8004702056770527803 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680789128894} + m_GameObject: {fileID: 8004702056770527801} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2219,7 +1892,83 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9207926680838069165 +--- !u!1 &8004702056853212486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004702056853212489} + - component: {fileID: 8004702056853212491} + - component: {fileID: 8004702056853212488} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8004702056853212489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056853212486} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8004702057932254677} + m_RootOrder: 7 + 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: -65, y: 0} + m_SizeDelta: {x: 10, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8004702056853212491 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056853212486} + m_CullTransparentMesh: 0 +--- !u!114 &8004702056853212488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702056853212486} + 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.3161302, g: 0.6792453, b: 0.2979708, 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: 0} + 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!1 &8004702057226546986 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2227,9 +1976,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926680838069162} - - component: {fileID: 9207926680838069160} - - component: {fileID: 9207926680838069163} + - component: {fileID: 8004702057226546989} + - component: {fileID: 8004702057226546991} + - component: {fileID: 8004702057226546988} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -2237,19 +1986,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926680838069162 +--- !u!224 &8004702057226546989 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680838069165} + m_GameObject: {fileID: 8004702057226546986} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926680480227026} + m_Father: {fileID: 8004702057653070421} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2257,21 +2006,21 @@ RectTransform: m_AnchoredPosition: {x: 0.000011444, y: 2.4} m_SizeDelta: {x: 200, y: 45} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926680838069160 +--- !u!222 &8004702057226546991 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680838069165} + m_GameObject: {fileID: 8004702057226546986} m_CullTransparentMesh: 0 ---- !u!114 &9207926680838069163 +--- !u!114 &8004702057226546988 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926680838069165} + m_GameObject: {fileID: 8004702057226546986} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2354,7 +2103,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9207926681114477458 +--- !u!1 &8004702057423300231 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2362,69 +2111,190 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681114477459} - - component: {fileID: 9207926681114477471} - - component: {fileID: 9207926681114477470} - - component: {fileID: 9207926681114477457} - - component: {fileID: 9207926681114477456} + - component: {fileID: 8004702057423300230} m_Layer: 5 - m_Name: Scroll View + m_Name: Tooltips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8004702057423300230 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702057423300231} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8004702056750528013} + - {fileID: 8004702056426230570} + - {fileID: 8004702056306368603} + - {fileID: 8004702057833734640} + - {fileID: 8004702056770527800} + m_Father: {fileID: 8004702057932254677} + m_RootOrder: 3 + 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!1 &8004702057540368332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004702057540368335} + m_Layer: 5 + m_Name: Scrolls-Show m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681114477459 +--- !u!224 &8004702057540368335 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681114477458} + m_GameObject: {fileID: 8004702057540368332} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9207926681519240275} - - {fileID: 9207926681420349739} - m_Father: {fileID: 9207926679892754396} - m_RootOrder: 1 + - {fileID: 8004702057798297439} + m_Father: {fileID: 8004702057932254677} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8004702057577331637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004702057577331636} + - component: {fileID: 8004702057577331639} + m_Layer: 5 + m_Name: TMP SubMeshUI [LiberationSans SDF Material + LiberationSans SDF Atlas] + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8004702057577331636 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702057577331637} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8004702057900097907} + 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!222 &8004702057577331639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702057577331637} + m_CullTransparentMesh: 0 +--- !u!1 &8004702057653070418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004702057653070421} + - component: {fileID: 8004702057653070422} + - component: {fileID: 8004702057653070423} + - component: {fileID: 8004702057653070420} + m_Layer: 5 + m_Name: MagicButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8004702057653070421 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702057653070418} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8004702057226546989} + m_Father: {fileID: 8004702057798297439} + 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: -90} - m_SizeDelta: {x: 850, y: 250} + m_AnchoredPosition: {x: -0.000015259, y: -283} + m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926681114477471 +--- !u!222 &8004702057653070422 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681114477458} + m_GameObject: {fileID: 8004702057653070418} m_CullTransparentMesh: 0 ---- !u!114 &9207926681114477470 +--- !u!114 &8004702057653070423 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681114477458} + m_GameObject: {fileID: 8004702057653070418} 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.392} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2434,50 +2304,100 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9207926681114477457 +--- !u!114 &8004702057653070420 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681114477458} + m_GameObject: {fileID: 8004702057653070418} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 ---- !u!114 &9207926681114477456 -MonoBehaviour: + 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8004702057653070423} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8004702057798297438} + m_TargetAssemblyTypeName: + m_MethodName: magicButtonTrigger + 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!1 &8004702057674230240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004702057674230243} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8004702057674230243 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681114477458} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 9207926681532248490} - m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 9207926681519240275} - m_HorizontalScrollbar: {fileID: 9207926681420349736} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &9207926681136637868 + m_GameObject: {fileID: 8004702057674230240} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8004702056618112982} + m_Father: {fileID: 8004702056709666220} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8004702057798297436 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2485,54 +2405,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681136637869} - - component: {fileID: 9207926681136637867} - - component: {fileID: 9207926681136637866} + - component: {fileID: 8004702057798297439} + - component: {fileID: 8004702057798297408} + - component: {fileID: 8004702057798297438} + - component: {fileID: 8004702057798297409} m_Layer: 5 - m_Name: Gadgets + m_Name: ScrollPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681136637869 +--- !u!224 &8004702057798297439 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681136637868} + m_GameObject: {fileID: 8004702057798297436} 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9207926680103916033} - m_RootOrder: 1 + m_Children: + - {fileID: 8004702057653070421} + - {fileID: 8004702058139290459} + - {fileID: 7767858306924037183} + m_Father: {fileID: 8004702057540368335} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 137.5, y: 400} - m_SizeDelta: {x: 275, y: 50} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 450, y: 321} + m_SizeDelta: {x: 900, y: 640} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926681136637867 +--- !u!222 &8004702057798297408 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681136637868} + m_GameObject: {fileID: 8004702057798297436} m_CullTransparentMesh: 0 ---- !u!114 &9207926681136637866 +--- !u!114 &8004702057798297438 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681136637868} + m_GameObject: {fileID: 8004702057798297436} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 92f58ba8e8c7bf243bfde7e6656c9064, type: 3} + m_Name: + m_EditorClassIdentifier: + cursor: {fileID: 0} + parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93, + type: 3} + mmtAnswerPopUp: {fileID: 6618856106128302243} + currentMmtAnswer: + dynamicScrollDescriptionsActive: 1 + automaticHintGenerationActive: 1 +--- !u!114 &8004702057798297409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702057798297436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2543,77 +2486,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: You can scroll through gadgets in Interaction Mode using the T-key or click - on them - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - 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!1 &9207926681255843039 + m_Sprite: {fileID: 0} + 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!1 &8004702057833734641 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2621,51 +2504,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681255843036} - - component: {fileID: 9207926681255843034} - - component: {fileID: 9207926681255843037} + - component: {fileID: 8004702057833734640} + - component: {fileID: 8004702057833734642} + - component: {fileID: 8004702057833734643} m_Layer: 5 - m_Name: Scrolls + m_Name: Gadgets Example m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681255843036 +--- !u!224 &8004702057833734640 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681255843039} + m_GameObject: {fileID: 8004702057833734641} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926680103916033} - m_RootOrder: 2 + m_Father: {fileID: 8004702057423300230} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -275, y: -100} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -275, y: 400} m_SizeDelta: {x: 275, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926681255843034 +--- !u!222 &8004702057833734642 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681255843039} + m_GameObject: {fileID: 8004702057833734641} m_CullTransparentMesh: 0 ---- !u!114 &9207926681255843037 +--- !u!114 &8004702057833734643 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681255843039} + m_GameObject: {fileID: 8004702057833734641} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2679,8 +2562,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: You can select a different scroll but you only need the 'OppositeLen' for - this example + m_text: Use Gadgets by pointing with the mouse and pressing the left mouse button m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2749,7 +2631,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9207926681420349738 +--- !u!1 &8004702057845709982 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2757,126 +2639,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681420349739} - - component: {fileID: 9207926681420349718} - - component: {fileID: 9207926681420349737} - - component: {fileID: 9207926681420349736} + - component: {fileID: 8004702057845709953} + - component: {fileID: 8004702057845709952} m_Layer: 5 - m_Name: Scrollbar + m_Name: TMP SubMeshUI [LiberationSans SDF Material + LiberationSans SDF Atlas] m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681420349739 +--- !u!224 &8004702057845709953 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681420349738} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9207926680354602340} - m_Father: {fileID: 9207926681114477459} - 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: -112} - m_SizeDelta: {x: 500, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926681420349718 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681420349738} - m_CullTransparentMesh: 0 ---- !u!114 &9207926681420349737 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681420349738} - 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: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!114 &9207926681420349736 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681420349738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 9207926681445974878} - m_HandleRect: {fileID: 9207926681445974865} - m_Direction: 0 - m_Value: 1 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &9207926681424541657 + m_GameObject: {fileID: 8004702057845709982} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8004702057900097907} + m_RootOrder: 1 + 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!222 &8004702057845709952 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702057845709982} + m_CullTransparentMesh: 0 +--- !u!1 &8004702057900097904 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2884,9 +2684,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681424541638} - - component: {fileID: 9207926681424541636} - - component: {fileID: 9207926681424541639} + - component: {fileID: 8004702057900097907} + - component: {fileID: 8004702057900097909} + - component: {fileID: 8004702057900097906} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -2894,41 +2694,43 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681424541638 +--- !u!224 &8004702057900097907 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681424541657} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8004702057900097904} + 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9207926681531587060} + m_Children: + - {fileID: 8004702057577331636} + - {fileID: 8004702057845709953} + m_Father: {fileID: 8004702058139290459} 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 183} + m_SizeDelta: {x: 800, y: 145.2} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926681424541636 +--- !u!222 &8004702057900097909 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681424541657} + m_GameObject: {fileID: 8004702057900097904} m_CullTransparentMesh: 0 ---- !u!114 &9207926681424541639 +--- !u!114 &8004702057900097906 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681424541657} + m_GameObject: {fileID: 8004702057900097904} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2942,17 +2744,19 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Restart Level + m_text: "Hier kommt der Scroll Beschreibungstext hin ( \u22BE \u22A5 \u2220 \u221F + \u25B3 )" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150, type: 2} + m_sharedMaterial: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2969,8 +2773,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3005,13 +2809,13 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 1 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 18, y: 24, z: 21.1, w: 12} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9207926681445974864 +--- !u!1 &8004702057932254674 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3019,75 +2823,107 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681445974865} - - component: {fileID: 9207926681445974879} - - component: {fileID: 9207926681445974878} + - component: {fileID: 8004702057932254677} + - component: {fileID: 8004702057932254678} + - component: {fileID: 8004702057932254679} + - component: {fileID: 8004702057932254676} m_Layer: 5 - m_Name: Handle + m_Name: HidingCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681445974865 +--- !u!224 &8004702057932254677 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681445974864} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 8004702057932254674} + 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_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9207926680354602340} + m_Children: + - {fileID: 7849991043560027498} + - {fileID: 8004702058047913762} + - {fileID: 8004702056565337459} + - {fileID: 8004702057423300230} + - {fileID: 8004702058016740899} + - {fileID: 8004702057540368335} + - {fileID: 2050004651490542596} + - {fileID: 8004702056853212489} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} 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} ---- !u!222 &9207926681445974879 -CanvasRenderer: + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &8004702057932254678 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681445974864} - m_CullTransparentMesh: 0 ---- !u!114 &9207926681445974878 + m_GameObject: {fileID: 8004702057932254674} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 4 + m_TargetDisplay: 0 +--- !u!114 &8004702057932254679 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681445974864} + m_GameObject: {fileID: 8004702057932254674} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - 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!1 &9207926681519240274 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 1 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &8004702057932254676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702057932254674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &8004702058016740896 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3095,80 +2931,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681519240275} - - component: {fileID: 9207926681519240286} - - component: {fileID: 9207926681519240273} - - component: {fileID: 9207926681519240272} + - component: {fileID: 8004702058016740899} + - component: {fileID: 8004702058016740900} + - component: {fileID: 8004702058016740901} + - component: {fileID: 8004702058016740898} + - component: {fileID: 3490402746730127523} + - component: {fileID: 1726153531829963807} m_Layer: 5 - m_Name: Viewport + m_Name: Scrollscreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681519240275 +--- !u!224 &8004702058016740899 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681519240274} + m_GameObject: {fileID: 8004702058016740896} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9207926681532248490} - m_Father: {fileID: 9207926681114477459} - m_RootOrder: 0 + - {fileID: 6500467619489830996} + m_Father: {fileID: 8004702057932254677} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &9207926681519240286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681519240274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &9207926681519240273 + m_SizeDelta: {x: 110, y: 1080} + m_Pivot: {x: 1, y: 0} +--- !u!222 &8004702058016740900 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681519240274} + m_GameObject: {fileID: 8004702058016740896} m_CullTransparentMesh: 0 ---- !u!114 &9207926681519240272 +--- !u!114 &8004702058016740901 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681519240274} + m_GameObject: {fileID: 8004702058016740896} 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: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3178,7 +3003,74 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9207926681531587063 +--- !u!114 &8004702058016740898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702058016740896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66df8f5d2fa2cc140aa2d3eca570e8dd, type: 3} + m_Name: + m_EditorClassIdentifier: + preferredStartScrollName: OppositeLen + tryScrollListTimes: 2 + ScrollButtons: [] + ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261, + type: 3} + DetailScreen: {fileID: 8004702057798297436} + scrollscreenContent: {fileID: 6500467619489830996} + x_Start: -240 + y_Start: 200 + X_Pacece_Between_Items: 105 + y_Pacece_Between_Items: 105 + number_of_Column: 3 +--- !u!114 &3490402746730127523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702058016740896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 6500467619489830996} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 10 + m_Viewport: {fileID: 8004702058016740899} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1726153531829963807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702058016740896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &8004702058047913763 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3186,54 +3078,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681531587060} - - component: {fileID: 9207926681531587056} - - component: {fileID: 9207926681531587059} - - component: {fileID: 9207926681531587058} - - component: {fileID: 9207926681531587061} + - component: {fileID: 8004702058047913762} + - component: {fileID: 8004702058047913766} + - component: {fileID: 8004702058047913767} + - component: {fileID: 8004702058047913764} + - component: {fileID: 8004702058047913765} m_Layer: 5 - m_Name: 'Restart ' + m_Name: Main Menue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9207926681531587060 + m_IsActive: 0 +--- !u!224 &8004702058047913762 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681531587063} + m_GameObject: {fileID: 8004702058047913763} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9207926681424541638} - m_Father: {fileID: 9207926679660501330} - m_RootOrder: 2 + - {fileID: 8004702058299818659} + m_Father: {fileID: 8004702057932254677} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -214, y: 35} + m_AnchoredPosition: {x: -214, y: 70} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9207926681531587056 +--- !u!222 &8004702058047913766 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681531587063} + m_GameObject: {fileID: 8004702058047913763} m_CullTransparentMesh: 0 ---- !u!114 &9207926681531587059 +--- !u!114 &8004702058047913767 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681531587063} + m_GameObject: {fileID: 8004702058047913763} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -3257,13 +3149,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9207926681531587058 +--- !u!114 &8004702058047913764 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681531587063} + m_GameObject: {fileID: 8004702058047913763} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -3297,13 +3189,13 @@ MonoBehaviour: m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 9207926681531587059} + m_TargetGraphic: {fileID: 8004702058047913767} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 9207926681531587061} + - m_Target: {fileID: 8004702058047913765} m_TargetAssemblyTypeName: Restart, Assembly-CSharp - m_MethodName: LevelReset + m_MethodName: LoadMainMenue m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -3313,19 +3205,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &9207926681531587061 +--- !u!114 &8004702058047913765 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681531587063} + m_GameObject: {fileID: 8004702058047913763} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c0a64b1b6e1e2374f9061d920f106dfb, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &9207926681532248493 +--- !u!1 &8004702058139290456 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3333,92 +3225,350 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9207926681532248490} - - component: {fileID: 9207926681532248488} - - component: {fileID: 9207926681532248491} + - component: {fileID: 8004702058139290459} + - component: {fileID: 8004702058139290461} m_Layer: 5 - m_Name: Content + m_Name: Scroll m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9207926681532248490 +--- !u!224 &8004702058139290459 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681532248493} + m_GameObject: {fileID: 8004702058139290456} 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8004702057900097907} + - {fileID: 8004702056412215060} + m_Father: {fileID: 8004702057798297439} + 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.00012207031, y: -13.043518} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &8004702058139290461 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702058139290456} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1 &8004702058299818656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004702058299818659} + - component: {fileID: 8004702058299818661} + - component: {fileID: 8004702058299818658} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8004702058299818659 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004702058299818656} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9207926681519240275} + m_Father: {fileID: 8004702058047913762} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.000030517578, y: 0.000030517578} + 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: 1} ---- !u!114 &9207926681532248488 -MonoBehaviour: + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8004702058299818661 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681532248493} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &9207926681532248491 + m_GameObject: {fileID: 8004702058299818656} + m_CullTransparentMesh: 0 +--- !u!114 &8004702058299818658 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926681532248493} + m_GameObject: {fileID: 8004702058299818656} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!1001 &7390358983506737413 + 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: Main Menue + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + 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: 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!1001 &3298748675541104415 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9207926679660501330} + m_TransformParent: {fileID: 8004702057932254677} m_Modifications: - - target: {fileID: 1918634107078788590, guid: 2b1b97ec7dcf75b4396f3da783732f82, + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482904, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Name + value: Factscreen + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.x + value: 900 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.y + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -540 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} +--- !u!224 &2050004651490542596 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + m_PrefabInstance: {fileID: 3298748675541104415} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8525488698361073026 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8004702057932254677} + m_Modifications: + - target: {fileID: 1918634107078788590, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1918634107763363961, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1918634107828435176, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} @@ -3542,8 +3692,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1918634107828435177, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_TagString + value: DevelopingMode objectReference: {fileID: 0} - target: {fileID: 1918634108255395453, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} @@ -3553,22 +3703,22 @@ PrefabInstance: - target: {fileID: 1918634108255395455, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1918634108255395455, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1918634108255395455, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchoredPosition.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1918634108255395455, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchoredPosition.y - value: -18.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1918634108540094939, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} @@ -3578,17 +3728,72 @@ PrefabInstance: - target: {fileID: 1918634108540094941, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1918634108540094941, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1918634108540094941, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} propertyPath: m_AnchoredPosition.y - value: -18.5 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetMode + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetMode + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: StageBehaviour, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: StageBehaviour, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1918634108692536557, guid: 2b1b97ec7dcf75b4396f3da783732f82, + type: 3} + propertyPath: FieldActions.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - target: {fileID: 1918634108692536559, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} @@ -3597,9 +3802,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} ---- !u!224 &8948529145529680365 stripped +--- !u!224 &7849991043560027498 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1918634107828435176, guid: 2b1b97ec7dcf75b4396f3da783732f82, type: 3} - m_PrefabInstance: {fileID: 7390358983506737413} + m_PrefabInstance: {fileID: 8525488698361073026} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab.meta b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab.meta index f24b9fca317c5f6c9660daf073e5b24a36b4a04f..870d727b57643b6d8bfab85fa52ba135ed12adf3 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab.meta +++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b162218cc487f1242bd5ac7b4315a051 +guid: 292834880e6f0e54186b873acc62d3f2 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab b/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab index 8664a786210f2b88fc6d73476a7016996c8c9709..5b4cc033bf34175f402526254af4d61525fc3af9 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab @@ -3421,14 +3421,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4384881478717095523} - m_LocalRotation: {x: 0.077691905, y: -0.88292736, z: 0.15754357, w: 0.43541166} + m_LocalRotation: {x: 0.04494348, y: -0.95125127, z: 0.25488704, w: 0.16773133} m_LocalPosition: {x: 1, y: 8, z: 1.16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6806963106110361545} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 20.234, y: -127.5, z: 0} + m_LocalEulerAnglesHint: {x: 30, y: -160, z: 0} --- !u!1 &4513941255093480006 GameObject: m_ObjectHideFlags: 0 @@ -3556,6 +3556,37 @@ MonoBehaviour: m_BiasX: 0 m_BiasY: 0 m_CenterOnActivate: 1 +--- !u!1 &4596250131129813448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1410994708477547899} + m_Layer: 0 + m_Name: PositionMarker_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1410994708477547899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4596250131129813448} + m_LocalRotation: {x: -0.02980903, y: -0.9361168, z: 0.08189964, w: -0.3407186} + m_LocalPosition: {x: -1, y: 3, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6806963106110361545} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 10, y: -220, z: 0} --- !u!1 &5033669807516141706 GameObject: m_ObjectHideFlags: 0 @@ -4948,6 +4979,7 @@ Transform: - {fileID: 2988050584347158257} - {fileID: 3358465699572459204} - {fileID: 1224194708071738779} + - {fileID: 1410994708477547899} m_Father: {fileID: 788784678299909003} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5331,6 +5363,7 @@ MonoBehaviour: myCamera_GObj: {fileID: 7545078084332931977} Position1_GObj: {fileID: 9090466938236267057} Position2_GObj: {fileID: 4384881478717095523} + Position3_GObj: {fileID: 4596250131129813448} --- !u!1 &7609179632986660383 GameObject: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab index 6fdb947b012b2ba3da88869286770b25433e8606..89475aa2d81f7ff55df1c819a613cea3e5b2f392 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab @@ -29,6 +29,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8364745804310811655} - {fileID: 7606309274667423286} @@ -134,6 +135,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3340609296292226240} m_Father: {fileID: 5366996316036003392} @@ -296,6 +298,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6414721950609079101} - {fileID: 1662363385475346736} @@ -412,6 +415,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5380988606775679791} m_Father: {fileID: 8794831640224097889} @@ -558,6 +562,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5541203706653034537} m_RootOrder: 0 @@ -637,6 +642,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8842023094143837814} m_RootOrder: 0 @@ -717,6 +723,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7997862165762406823} m_Father: {fileID: 20385689445018545} @@ -818,6 +825,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 20385689445018545} m_Father: {fileID: 2702231935465192995} @@ -932,6 +940,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5541203706653034537} m_Father: {fileID: 6414721950609079101} @@ -1034,6 +1043,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 524790553523465715} m_Father: {fileID: 6414721950609079101} @@ -1195,6 +1205,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8309989884186066314} m_Father: {fileID: 7313150218793148332} @@ -1294,6 +1305,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6123604322396426829} m_Father: {fileID: 20385689445018545} @@ -1370,6 +1382,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6414721950609079101} m_RootOrder: 0 @@ -1449,6 +1462,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3217975589398024768} m_RootOrder: 0 @@ -1530,6 +1544,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7313150218793148332} - {fileID: 6846632430007306933} @@ -1646,6 +1661,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8462614897342313128} m_RootOrder: 0 @@ -1737,6 +1753,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4754993413332535665} m_Father: {fileID: 7606309274667423286} @@ -1885,6 +1902,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8822103366894982862} m_Father: {fileID: 7313150218793148332} @@ -2032,6 +2050,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3415527872007802782} m_RootOrder: 0 @@ -2121,6 +2140,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 20385689445018545} m_RootOrder: 4 @@ -2201,6 +2221,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7313150218793148332} m_RootOrder: 2 @@ -2280,6 +2301,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7997862165762406823} m_RootOrder: 0 @@ -2360,6 +2382,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3730808201342460051} m_Father: {fileID: 20385689445018545} @@ -2450,6 +2473,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4831921658429584611} m_RootOrder: 0 @@ -2531,6 +2555,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5366996316744835545} m_Father: {fileID: 5366996316036003392} @@ -2677,6 +2702,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5366996315724472123} m_RootOrder: 0 @@ -2758,6 +2784,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5366996316036003392} - {fileID: 5366996315080589335} @@ -2845,14 +2872,6 @@ MonoBehaviour: m_EditorClassIdentifier: myself_GObj: {fileID: 5366996315580957714} child1_GObj: {fileID: 5366996316036003404} - cursorArrow_35: {fileID: 2800000, guid: 5220430f15bc26f44a1d67083ad70598, type: 3} - cursorArrow_50: {fileID: 2800000, guid: e3f1dc3678ee47d4a9e81418681873f6, type: 3} - cursorArrow_60: {fileID: 2800000, guid: b21244787efeae346bf3456d012ef399, type: 3} - cursorArrow_70: {fileID: 2800000, guid: ac543c6f7533f124784c485329d8bf2e, type: 3} - cursorArrow_100: {fileID: 2800000, guid: 4aa214d7cd5f9b64a926d718a8128ca2, type: 3} - cursorArrow_140: {fileID: 2800000, guid: 9c635f241de5cfd4faaf30bad0dfa811, type: 3} - cursorArrow_200: {fileID: 2800000, guid: 98be7b3657f5ba04bb0fc92694813a27, type: 3} - cursorArrow_300: {fileID: 2800000, guid: c1f9f512debcbc7468cdaff818f96d2f, type: 3} GObj_text: {fileID: 0} --- !u!1 &5366996315724472122 GameObject: @@ -2884,6 +2903,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5366996315062296220} m_Father: {fileID: 5366996316036003392} @@ -3031,6 +3051,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1117501623706235904} - {fileID: 1117501622783544332} @@ -3132,6 +3153,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5366996316448052461} - {fileID: 5366996315033671829} @@ -3238,11 +3260,12 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5366996316036003392} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5964376, y: 0} + m_AnchorMin: {x: 0.0964376, y: 0} m_AnchorMax: {x: 0.8964585, y: 0.095370375} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -3317,6 +3340,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5366996315033671829} m_RootOrder: 0 @@ -3396,6 +3420,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8309989884186066314} m_RootOrder: 0 @@ -3475,6 +3500,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9028122124670701192} m_RootOrder: 0 @@ -3554,6 +3580,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 20385689445018545} m_RootOrder: 0 @@ -3633,6 +3660,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 20385689445018545} m_RootOrder: 6 @@ -3712,6 +3740,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 20385689445018545} m_RootOrder: 5 @@ -3771,6 +3800,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4410487900111096460} m_Father: {fileID: 2088235654811755430} @@ -3919,6 +3949,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 478754545032124513} m_Father: {fileID: 7313150218793148332} @@ -4066,6 +4097,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8794831640224097889} - {fileID: 3217975589398024768} @@ -4170,6 +4202,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4828946832798184929} m_Father: {fileID: 5366996316036003392} @@ -4303,6 +4336,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8045247565867104083} - {fileID: 2088235654811755430} @@ -4410,6 +4444,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1804196008367291200} m_Father: {fileID: 6414721950609079101} @@ -4556,6 +4591,7 @@ RectTransform: 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: 0.4166666} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5366996316036003392} m_RootOrder: 4 @@ -4631,6 +4667,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6914020161757597414} m_RootOrder: 0 @@ -4710,6 +4747,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6564702747072136793} m_RootOrder: 0 @@ -5370,18 +5408,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c2cf35f8e593ea44b2050d129ee23a4, type: 3} ---- !u!1 &1662363385475346737 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6804933134010575747, guid: 2c2cf35f8e593ea44b2050d129ee23a4, - type: 3} - m_PrefabInstance: {fileID: 5295701069465377458} - m_PrefabAsset: {fileID: 0} --- !u!224 &1662363385475346736 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6804933134010575746, guid: 2c2cf35f8e593ea44b2050d129ee23a4, type: 3} m_PrefabInstance: {fileID: 5295701069465377458} m_PrefabAsset: {fileID: 0} +--- !u!1 &1662363385475346737 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6804933134010575747, guid: 2c2cf35f8e593ea44b2050d129ee23a4, + type: 3} + m_PrefabInstance: {fileID: 5295701069465377458} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5316996106540909910 PrefabInstance: m_ObjectHideFlags: 0 @@ -5956,18 +5994,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2b1781fb05a3d0478a9fb36c9db98b9, type: 3} ---- !u!224 &5366996315080589335 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 266457294151353665, guid: c2b1781fb05a3d0478a9fb36c9db98b9, - type: 3} - m_PrefabInstance: {fileID: 5316996106540909910} - m_PrefabAsset: {fileID: 0} --- !u!1 &5366996315080589334 stripped GameObject: m_CorrespondingSourceObject: {fileID: 266457294151353664, guid: c2b1781fb05a3d0478a9fb36c9db98b9, type: 3} m_PrefabInstance: {fileID: 5316996106540909910} m_PrefabAsset: {fileID: 0} +--- !u!224 &5366996315080589335 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 266457294151353665, guid: c2b1781fb05a3d0478a9fb36c9db98b9, + type: 3} + m_PrefabInstance: {fileID: 5316996106540909910} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5366996315100264232 PrefabInstance: m_ObjectHideFlags: 0 @@ -6107,15 +6145,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c26d76bda684f064780f256b396630c8, type: 3} ---- !u!224 &1117501622783544332 stripped +--- !u!224 &754083156188744073 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5042148637141777188, guid: c26d76bda684f064780f256b396630c8, + m_CorrespondingSourceObject: {fileID: 4615182551703486113, guid: c26d76bda684f064780f256b396630c8, type: 3} m_PrefabInstance: {fileID: 5366996315100264232} m_PrefabAsset: {fileID: 0} ---- !u!224 &754083156188744073 stripped +--- !u!224 &1117501622783544332 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 4615182551703486113, guid: c26d76bda684f064780f256b396630c8, + m_CorrespondingSourceObject: {fileID: 5042148637141777188, guid: c26d76bda684f064780f256b396630c8, type: 3} m_PrefabInstance: {fileID: 5366996315100264232} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab index 5d2e203bd89c9161c72edfc7f950507c78ee9518..438111da0d17a7fc1357aae746a1ad77120555d0 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab @@ -6100,6 +6100,8 @@ MonoBehaviour: Opsys_ButtonUT: {fileID: 9018472344697824337} FrameITUI_ButtonT: {fileID: 5861497761551979794} FrameITUI_ButtonUT: {fileID: 4867843466607851529} + AutoSettingsAdap_Button: {fileID: 0} + AutoSettingsAdap_ButtonUT: {fileID: 0} --- !u!114 &1986695175098610074 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8160,6 +8162,87 @@ MonoBehaviour: m_EditorClassIdentifier: backTo_GObj: {fileID: 3680199913404635203} parentM_GObj: {fileID: 220600721669129657} +--- !u!1 &2314625511950152017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3843860648220887044} + - component: {fileID: 1014641858770768143} + - component: {fileID: 8862342039482492242} + m_Layer: 5 + m_Name: TextSlotTOOsetting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3843860648220887044 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2314625511950152017} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5822541630066150013} + m_Father: {fileID: 8282056207990590973} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.8} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -0.0000076294} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1014641858770768143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2314625511950152017} + m_CullTransparentMesh: 1 +--- !u!114 &8862342039482492242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2314625511950152017} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Touchcontrols ON --- !u!1 &2402478635372571321 GameObject: m_ObjectHideFlags: 0 @@ -9273,6 +9356,8 @@ MonoBehaviour: Opsys_ButtonUT: {fileID: 4515047496373876988} FrameITUI_ButtonT: {fileID: 5861497761551979794} FrameITUI_ButtonUT: {fileID: 4867843466607851529} + AutoSettingsAdap_Button: {fileID: 0} + AutoSettingsAdap_ButtonUT: {fileID: 0} --- !u!1 &3425580818276207209 GameObject: m_ObjectHideFlags: 0 @@ -10731,6 +10816,8 @@ MonoBehaviour: Opsys_ButtonUT: {fileID: 7635230150363548799} FrameITUI_ButtonT: {fileID: 4058364548222253969} FrameITUI_ButtonUT: {fileID: 1363689793225369312} + AutoSettingsAdap_Button: {fileID: 2314625511950152017} + AutoSettingsAdap_ButtonUT: {fileID: 9095357065203387310} --- !u!1 &4016450546580129681 GameObject: m_ObjectHideFlags: 0 @@ -12736,6 +12823,7 @@ RectTransform: - {fileID: 7249704526189622164} - {fileID: 7184855062139488493} - {fileID: 4349135317353766966} + - {fileID: 8282056207990590973} m_Father: {fileID: 7890457196579690101} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14735,6 +14823,140 @@ MonoBehaviour: m_EditorClassIdentifier: backTo_GObj: {fileID: 99907273253604842} parentM_GObj: {fileID: 266457293881304185} +--- !u!1 &7858714513584545460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8282056207990590973} + - component: {fileID: 4331474773829978130} + - component: {fileID: 279621163145034387} + - component: {fileID: 4276631784943864210} + m_Layer: 5 + m_Name: AutoSettingsOnOff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8282056207990590973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858714513584545460} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3843860648220887044} + m_Father: {fileID: 8924899338328608077} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.6, y: 0.48689857} + m_AnchorMax: {x: 1, y: 0.6101997} + m_AnchoredPosition: {x: 0.000015258789, y: 0} + m_SizeDelta: {x: -0.000030517578, y: 0.00054932} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4331474773829978130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858714513584545460} + m_CullTransparentMesh: 1 +--- !u!114 &279621163145034387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858714513584545460} + 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: 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: e4f1fee3de32377429fd1348fae62b10, 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!114 &4276631784943864210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858714513584545460} + 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: 279621163145034387} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7320806596421241701} + m_TargetAssemblyTypeName: SystemOptionsMenue_mobile, Assembly-CSharp + m_MethodName: ChangeAutoSettingsAdaption + 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!1 &7865027569057119928 GameObject: m_ObjectHideFlags: 0 @@ -15028,6 +15250,8 @@ MonoBehaviour: Opsys_ButtonUT: {fileID: 4515047496373876988} FrameITUI_ButtonT: {fileID: 5861497761551979794} FrameITUI_ButtonUT: {fileID: 4867843466607851529} + AutoSettingsAdap_Button: {fileID: 0} + AutoSettingsAdap_ButtonUT: {fileID: 0} --- !u!1 &8156409310062843141 GameObject: m_ObjectHideFlags: 0 @@ -16818,6 +17042,86 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9095357065203387310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5822541630066150013} + - component: {fileID: 6454412504516446622} + - component: {fileID: 7741479016111323796} + m_Layer: 5 + m_Name: TextSlotTOO2settings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5822541630066150013 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095357065203387310} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3843860648220887044} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.083000004} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0.000022888} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6454412504516446622 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095357065203387310} + m_CullTransparentMesh: 1 +--- !u!114 &7741479016111323796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095357065203387310} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 25 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Press for deactivating --- !u!1 &9098370179205817362 GameObject: m_ObjectHideFlags: 0 @@ -17367,10 +17671,10 @@ PrefabInstance: propertyPath: parentM_GObj value: objectReference: {fileID: 220600721669129657} - - target: {fileID: 6999102527998034399, guid: 386732dae91d6c546ac0f02745d283dc, + - target: {fileID: 5924704485175712605, guid: 386732dae91d6c546ac0f02745d283dc, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000030517578 + propertyPath: m_Text + value: Z objectReference: {fileID: 0} - target: {fileID: 9012457569728381634, guid: 386732dae91d6c546ac0f02745d283dc, type: 3} diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity index 56c385385e43ed494e388d7ae9083b7c4165bb60..aeaad04ffc37bae80f83eda9e5067a345cd7c93f 100644 --- a/Assets/Scenes/Menues/LaunchMenue.unity +++ b/Assets/Scenes/Menues/LaunchMenue.unity @@ -2143,6 +2143,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4262100644587407531, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4297685603710056612, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Scenes/Menues/MainMenue.unity b/Assets/Scenes/Menues/MainMenue.unity index 5f6c52ec01082e7f84f02c803581404bc74c8824..a71f8fd0ea2cf2c1929c3ab9d7ff12693b225097 100644 --- a/Assets/Scenes/Menues/MainMenue.unity +++ b/Assets/Scenes/Menues/MainMenue.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3730807, g: 0.380755, b: 0.35876408, a: 1} + m_IndirectSpecularColor: {r: 0.37294164, g: 0.38055754, b: 0.35860202, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity index 1951b6c5d0a299a4eab807827d8ab944d52710fd..767d80559b5aea2d7e14b0cbc8c0692094fec628 100644 --- a/Assets/Scenes/Worlds/RiverWorld.unity +++ b/Assets/Scenes/Worlds/RiverWorld.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4410664, g: 0.4898227, b: 0.5699191, a: 1} + m_IndirectSpecularColor: {r: 0.4410865, g: 0.48984045, b: 0.5699203, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -3870,7 +3870,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh202416 + m_Name: pb_Mesh79004 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3879,7 +3879,7 @@ Mesh: topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 392 + vertexCount: 300 localAABB: m_Center: {x: 39.8593, y: 6.238891, z: -5.2606735} m_Extent: {x: 40.476585, y: 6.238891, z: 9.593055} @@ -3899,10 +3899,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600180019001a0019001b001a001c001d001e001d001f001e00200021002200210023002200240025002600250027002600280029002a0029002b002a002c002d002e002d002f002e00300031003200310033003200340035003600350037003600380039003a0039003b003a003c003d003e003d003f003e00400041004200410043004200440045004600450047004600480049004a0049004b004a004c004d004e004d004f004e00500051005200510053005200540055005600550057005600580059005a0059005b005a005c005d005e005d005f005e00600061006200610063006200640065006600650067006600680069006a0069006b006a006c006d006e006d006f006e00700071007200710073007200740075007600750077007600780079007a0079007b007a007c007d007e007d007f007e00800081008200810083008200840085008600850087008600880089008a0089008b008a008c008d008e008d008f008e00900091009200910093009200940095009600950097009600980099009a0099009b009a009c009d009e009d009f009e00a000a100a200a100a300a200a400a500a600a500a700a600a800a900aa00a900ab00aa00ac00ad00ae00ad00af00ae00b000b100b200b100b300b200b400b500b600b500b700b600b800b900ba00b900bb00ba00bc00bd00be00bd00bf00be00c000c100c200c100c300c200c400c500c600c500c700c600c800c900ca00c900cb00ca00cc00cd00ce00cd00cf00ce00d000d100d200d100d300d200d400d500d600d500d700d600d800d900da00d900db00da00dc00dd00de00dd00df00de00e000e100e200e100e300e200e400e500e600e500e700e600e800e900ea00e900eb00ea00ec00ed00ee00ed00ef00ee00f000f100f200f100f300f200f400f500f600f500f700f600f800f900fa00f900fb00fa00fc00fd00fe00fd00ff00fe00000101010201010103010201040105010601050107010601080109010a0109010b010a010c010d010e010d010f010e01100111011201110113011201140115011601150117011601180119011a0119011b011a011c011d011e011d011f011e01200121012201210123012201240125012601250127012601280129012a0129012b012a012c012d012e012d012f012e01300131013201310133013201340135013601350137013601380139013a0139013b013a013c013d013e013d013f013e01400141014201410143014201440145014601450147014601480149014a0149014b014a014c014d014e014d014f014e01500151015201510153015201540155015601550157015601580159015a0159015b015a015c015d015e015d015f015e01600161016201610163016201640165016601650167016601680169016a0169016b016a016c016d016e016d016f016e01700171017201710173017201740175017601750177017601780179017a0179017b017a017c017d017e017d017f017e01800181018201810183018201840185018601850187018601 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e001000110012001100130012001400150016001500170016001700150018001500190018001a001b001c001b001d001c001e001f0020001f00210020001300110022001100230022001800190024001900250024002600270028002700290028002a002b002c002b002d002c00220023002e0023002f002e002400250030002500310030003200330034003300350034003600370038003700390038002e002f003a002f003b003a00300031003c0031003d003c003e003f0040003f00410040004200430044004300450044003a003b0046003b00470046003c003d0048003d00490048004a004b004c004b004d004c004e004f0050004f00510050004600470052004700530052004800490054004900550054005600570058005700590058005a005b005c005b005d005c00520053005e0053005f005e005400550060005500610060006200630064006300650064006600670068006700690068005e005f006a005f006b006a00600061006c0061006d006c006e006f0070006f00710070007200730074007300750074006a006b0076006b00770076006c006d0078006d00790078007a007b007c007b007d007c007e007f0080007f00810080007600770082007700830082007800790084007900850084008600870088008700890088008a008b008c008b008d008c00820083008e0083008f008e008400850090008500910090009200930094009300950094009600970098009700990098008e008f009a008f009b009a00900091009c0091009d009c009e009f00a0009f00a100a000a200a300a400a300a500a4009a009b00a6009b00a700a6009c009d00a8009d00a900a800aa00ab00ac00ab00ad00ac00ae00af00b000af00b100b000a600a700b200a700b300b200a800a900b400a900b500b400b600b700b800b700b900b800ba00bb00bc00bb00bd00bc00b200b300be00b300bf00be00b400b500c000b500c100c000c200c300c400c300c500c400c600c700c800c700c900c800be00bf00ca00bf00cb00ca00c000c100cc00c100cd00cc00ce00cf00d000cf00d100d000d200d300d400d300d500d400ca00cb00d600cb00d700d600cc00cd00d800cd00d900d800da00db00dc00db00dd00dc00de00df00e000df00e100e000d600d700e200d700e300e200d800d900e400d900e500e400e600e700e800e700e900e800ea00eb00ec00eb00ed00ec00e200e300ee00e300ef00ee00e400e500f000e500f100f000f200f300f400f300f500f400f600f700f800f700f900f800ee00ef00fa00ef00fb00fa00f000f100fc00f100fd00fc00fe00ff000001ff0001010001020103010401030105010401fa00fb000601fb0007010601fc00fd000801fd00090108010a010b010c010b010d010c010e010f0110010f01110110010601070112010701130112010801090114010901150114011601170118011701190118011a011b011c011b011d011c01120113011e0113011f011e01140016002001160021012001220123012401230125012401260127012801270129012801100012002a0112002b012a01 m_VertexData: serializedVersion: 3 - m_VertexCount: 392 + m_VertexCount: 300 m_Channels: - stream: 0 offset: 0 @@ -3960,8 +3960,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 18816 - _typelessdata: 00d097bd00000000000000004951433d0000000073b57f3f73b57fbf000000004951433d000080bfcaa3973d000000005862cb400000000090299dbe4951433d0000000073b57f3f73b57fbf000000004951433d000080bf069fcbc00000000000d097bdffa44741000000004951433d0000000073b57f3f73b57fbf000000004951433d000080bfcaa3973dffa447415862cb40ffa4474190299dbe4951433d0000000073b57f3f73b57fbf000000004951433d000080bf069fcbc0ffa44741f9aba04200000000fc4abec080fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf85d3a7c0000000002184a04200000000dfa86dc180fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf886e62c100000000f9aba042ffa44741fc4abec080fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf85d3a7c0ffa447412184a042ffa44741dfa86dc180fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf886e62c1ffa447415862cb40000000007c0281c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bfe317d4400000000000d097bd00000000388064c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bf6ede393e000000005862cb40ffa447417c0281c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bfe317d440ffa4474100d097bdffa44741388064c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bf6ede393effa4474140061ebf00000000388064c0000080bf00000000000000000000000000000000000080bf000080bf388064400000000040061ebf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf000000000000000040061ebfffa44741388064c0000080bf00000000000000000000000000000000000080bf000080bf38806440ffa4474140061ebfffa4474100000000000080bf00000000000000000000000000000000000080bf000080bf00000000ffa4474100d097bdffa4474100000000000000000000803f000000000000803f0000000000000000000080bf00d097bd000000005862cb40ffa4474190299dbe000000000000803f000000000000803f0000000000000000000080bf5862cb4090299dbe00d097bdffa44741388064c0000000000000803f000000000000803f0000000000000000000080bf00d097bd388064c05862cb40ffa447417c0281c0000000000000803f000000000000803f0000000000000000000080bf5862cb407c0281c000d097bd00000000388064c000000000000080bf00000000000080bf0000000000000000000080bf00d0973d388064c05862cb40000000007c0281c000000000000080bf00000000000080bf0000000000000000000080bf5862cbc07c0281c000d097bd000000000000000000000000000080bf00000000000080bf0000000000000000000080bf00d0973d000000005862cb400000000090299dbe00000000000080bf00000000000080bf0000000000000000000080bf5862cbc090299dbe5862cb400000000090299dbe00000000000080bf00000000000080bf0000000000000000000080bf5862cbc090299dbe5862cb40000000007c0281c000000000000080bf00000000000080bf0000000000000000000080bf5862cbc07c0281c07a19744100000000dea28a4000000000000080bf00000000000080bf0000000000000000000080bf7a1974c1dea28a407a19744100000000b007063f00000000000080bf00000000000080bf0000000000000000000080bf7a1974c1b007063f5862cb40ffa4474190299dbe77a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bf3fd0afc0ffa447415862cb400000000090299dbe77a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bf3fd0afc0000000007a197441ffa44741dea28a4077a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bfc07f78c1ffa447417a19744100000000dea28a4077a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bfc07f78c1000000005862cb40000000007c0281c07b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bf568d7440000000005862cb40ffa447417c0281c07b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bf568d7440ffa447417a19744100000000b007063f7b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bfa31c5d41000000007a197441ffa44741b007063f7b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bfa31c5d41ffa447415862cb40ffa447417c0281c0000000000000803f000000000000803f0000000000000000000080bf5862cb407c0281c05862cb40ffa4474190299dbe000000000000803f000000000000803f0000000000000000000080bf5862cb4090299dbe7a197441ffa44741b007063f000000000000803f000000000000803f0000000000000000000080bf7a197441b007063f7a197441ffa44741dea28a40000000000000803f000000000000803f0000000000000000000080bf7a197441dea28a407a19744100000000dea28a4000000000000080bf00000000000080bf0000000000000000000080bf7a1974c1dea28a407a19744100000000b007063f00000000000080bf00000000000080bf0000000000000000000080bf7a1974c1b007063f2657964100000000fad7674000000000000080bf00000000000080bf0000000000000000000080bf265796c1fad7674026579641000000005003cabe00000000000080bf00000000000080bf0000000000000000000080bf265796c15003cabe7a197441ffa44741dea28a406b85493e0000000062fe7a3f62fe7abf000000006b85493e000080bf2caf61c1ffa447417a19744100000000dea28a406685493e07eca03262fe7a3f62fe7abf000000006685493e000080bf2caf61c10000000026579641ffa44741f8d767406685493e07eca03262fe7a3f62fe7abf000000006685493e000080bf74b28dc1ffa447412657964100000000fad767406185493e07ec203363fe7a3f63fe7abf08eca0a66185493e000080bf74b28dc1000000007a19744100000000b007063f48a980be000000000bc977bf0cc9773f0000000049a980be000080bf63296a41000000007a197441ffa44741b007063f48a980be000000000bc977bf0cc9773f0000000049a980be000080bf63296a41ffa4474126579641000000005003cabe48a980be000000000bc977bf0cc9773f0000000049a980be000080bf354f92410000000026579641ffa447415003cabe48a980be000000000bc977bf0cc9773f0000000049a980be000080bf354f9241ffa447417a197441ffa44741b007063f000000000000803f000000000000803f0000000000000000000080bf7a197441b007063f7a197441ffa44741dea28a40000000000000803f000000000000803f0000000000000000000080bf7a197441dea28a4026579641ffa447415003cabe000000000000803f000000000000803f0000000000000000000080bf265796415003cabe26579641ffa44741f8d76740000000000000803f000000000000803f0000000000000000000080bf26579641f8d767402657964100000000fad7674000000000000080bf00000000000080bf0000000000000000000080bf265796c1fad7674026579641000000005003cabe00000000000080bf00000000000080bf0000000000000000000080bf265796c15003cabe0801ac4100000000fe211d4000000000000080bf00000000000080bf0000000000000000000080bf0801acc1fe211d400801ac41000000000869dabf00000000000080bf00000000000080bf0000000000000000000080bf0801acc10869dabf26579641ffa44741f8d7674046afca3e2eb916332f166b3f2f166bbf33b996a646afca3e000080bf292c7dc100a547412657964100000000fad7674048afca3e2eb996322e166b3f2e166bbf32b916a649afca3e000080bf292c7dc100951a350801ac41ffa44741fe211d4048afca3e2eb996322e166b3f2e166bbf32b916a649afca3e000080bf542d96c100a547410801ac4100000000fe211d404bafca3e000000002e166b3f2e166bbf000000004bafca3e000080bf542d96c100951a3526579641000000005003cabee535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bf70ad88410000000026579641ffa447415003cabee535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bf70ad8841ffa447410801ac41000000000869dabfe535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bfc2bfa041000000000801ac41ffa447410869dabfe535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bfc2bfa041ffa4474126579641ffa447415003cabe000000000000803f000000000000803f0000000000000000000080bf265796415003cabe26579641ffa44741f8d76740000000000000803f000000000000803f0000000000000000000080bf26579641f8d767400801ac41ffa447410869dabf000000000000803f000000000000803f0000000000000000000080bf0801ac410869dabf0801ac41ffa44741fe211d40000000000000803f000000000000803f0000000000000000000080bf0801ac41fe211d400801ac4100000000fe211d4000000000000080bf00000000000080bf0000000000000000000080bf0801acc1fe211d400801ac41000000000869dabf00000000000080bf00000000000080bf0000000000000000000080bf0801acc10869dabff130cd410000000028eb1ebf00000000000080bf00000000000080bf0000000000000000000080bff130cdc128eb1ebff130cd4100000000105188c000000000000080bf00000000000080bf0000000000000000000080bff130cdc1105188c00801ac41ffa44741fe211d40297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf1bef7cc1ffa447410801ac4100000000fe211d40297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf1bef7cc100000000f130cd41ffa4474128eb1ebf297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf33c8a7c1ffa44741f130cd410000000028eb1ebf297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf33c8a7c1000000000801ac41000000000869dabf273206bf0000000008025abf08025a3f00000000273206bf000080bf1aa29941000000000801ac41ffa447410869dabf273206bf0000000008025abf08025a3f00000000273206bf000080bf1aa29941ffa44741f130cd4100000000105188c0273206bf0000000008025abf08025a3f00000000273206bf000080bf979ac04100000000f130cd41ffa44741105188c0273206bf0000000008025abf08025a3f00000000273206bf000080bf979ac041ffa447410801ac41ffa447410869dabf000000000000803f000000000000803f0000000000000000000080bf0801ac410869dabf0801ac41ffa44741fe211d40000000000000803f000000000000803f0000000000000000000080bf0801ac41fe211d40f130cd41ffa44741105188c0000000000000803f000000000000803f0000000000000000000080bff130cd41105188c0f130cd41ffa4474128eb1ebf000000000000803f000000000000803f0000000000000000000080bff130cd4128eb1ebff130cd410000000028eb1ebf00000000000080bf00000000000080bf0000000000000000000080bff130cdc128eb1ebff130cd4100000000105188c000000000000080bf00000000000080bf0000000000000000000080bff130cdc1105188c0ac85124200000000e20d11c000000000000080bf00000000000080bf0000000000000000000080bfac8512c2e20d11c0ac851242000000009cfabcc000000000000080bf00000000000080bf0000000000000000000080bfac8512c29cfabcc0f130cd41ffa4474128eb1ebfc8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf46a9cbc1ffa44741f130cd410000000028eb1ebfc8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf46a9cbc100000000ac851242ffa44741e20d11c0c8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf683f12c2ffa44741ac85124200000000e20d11c0c8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf683f12c200000000f130cd4100000000105188c0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfd3f9cf4100000000f130cd41ffa44741105188c0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfd3f9cf41ffa44741ac851242000000009cfabcc0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfaf67144200000000ac851242ffa447419cfabcc0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfaf671442ffa44741f130cd41ffa44741105188c0000000000000803f000000000000803f0000000000000000000080bff130cd41105188c0f130cd41ffa4474128eb1ebf000000000000803f000000000000803f0000000000000000000080bff130cd4128eb1ebfac851242ffa447419cfabcc0000000000000803f000000000000803f0000000000000000000080bfac8512429cfabcc0ac851242ffa44741e20d11c0000000000000803f000000000000803f0000000000000000000080bfac851242e20d11c0ac85124200000000e20d11c000000000000080bf00000000000080bf0000000000000000000080bfac8512c2e20d11c0ac851242000000009cfabcc000000000000080bf00000000000080bf0000000000000000000080bfac8512c29cfabcc0d66e324200000000b8ffcbc000000000000080bf00000000000080bf0000000000000000000080bfd66e32c2b8ffcbc0d66e324200000000b23920c100000000000080bf00000000000080bf0000000000000000000080bfd66e32c2b23920c1ac851242ffa44741e20d11c0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfd86906c2ffa44741ac85124200000000e20d11c0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfd86906c200000000d66e3242ffa44741b8ffcbc0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfb14e2ac2ffa44741d66e324200000000b8ffcbc0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfb14e2ac200000000ac851242000000009cfabcc0176beabe000000007e9763bf7f97633f00000000186beabe000080bffe130d4200000000ac851242ffa447419cfabcc0176beabe000000007e9763bf7f97633f00000000186beabe000080bffe130d42ffa44741d66e324200000000b23920c1176beabe000000007e9763bf7f97633f00000000186beabe000080bfd7f8304200000000d66e3242ffa44741b23920c1176beabe000000007e9763bf7f97633f00000000186beabe000080bfd7f83042ffa44741ac851242ffa447419cfabcc0000000000000803f000000000000803f0000000000000000000080bfac8512429cfabcc0ac851242ffa44741e20d11c0000000000000803f000000000000803f0000000000000000000080bfac851242e20d11c0d66e3242ffa44741b23920c1000000000000803f000000000000803f0000000000000000000080bfd66e3242b23920c1d66e3242ffa44741b8ffcbc0000000000000803f000000000000803f0000000000000000000080bfd66e3242b8ffcbc0d66e324200000000b8ffcbc000000000000080bf00000000000080bf0000000000000000000080bfd66e32c2b8ffcbc0d66e324200000000b23920c100000000000080bf00000000000080bf0000000000000000000080bfd66e32c2b23920c105db3742000000003cf8d9c000000000000080bf00000000000080bf0000000000000000000080bf05db37c23cf8d9c005db374200000000f43527c100000000000080bf00000000000080bf0000000000000000000080bf05db37c2f43527c1d66e3242ffa44741b8ffcbc07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bfcba831c2ffa44741d66e324200000000b8ffcbc07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bfcba831c20000000005db3742ffa447413cf8d9c07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bf315b37c2ffa4474105db3742000000003cf8d9c07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bf315b37c200000000d66e324200000000b23920c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf1f1f364200000000d66e3242ffa44741b23920c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf1f1f3642ffa4474105db374200000000f43527c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf85d13b420000000005db3742ffa44741f43527c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf85d13b42ffa44741d66e3242ffa44741b23920c1000000000000803f000000000000803f0000000000000000000080bfd66e3242b23920c1d66e3242ffa44741b8ffcbc0000000000000803f000000000000803f0000000000000000000080bfd66e3242b8ffcbc005db3742ffa44741f43527c1000000000000803f000000000000803f0000000000000000000080bf05db3742f43527c105db3742ffa447413cf8d9c0000000000000803f000000000000803f0000000000000000000080bf05db37423cf8d9c005db3742000000003cf8d9c000000000000080bf00000000000080bf0000000000000000000080bf05db37c23cf8d9c005db374200000000f43527c100000000000080bf00000000000080bf0000000000000000000080bf05db37c2f43527c104cd454200000000781baac000000000000080bf00000000000080bf0000000000000000000080bf04cd45c2781baac004cd45420000000092470fc100000000000080bf00000000000080bf0000000000000000000080bf04cd45c292470fc105db3742ffa447413cf8d9c053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf63381ec2ffa4474105db3742000000003cf8d9c053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf63381ec20000000004cd4542ffa44741781baac053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf0e652dc2ffa4474104cd454200000000781baac053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf0e652dc20000000005db374200000000f43527c153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bf2b7b18420000000005db3742ffa44741f43527c153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bf2b7b1842ffa4474104cd45420000000092470fc153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bfd6a727420000000004cd4542ffa4474192470fc153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bfd6a72742ffa4474105db3742ffa44741f43527c1000000000000803f000000000000803f0000000000000000000080bf05db3742f43527c105db3742ffa447413cf8d9c0000000000000803f000000000000803f0000000000000000000080bf05db37423cf8d9c004cd4542ffa4474192470fc1000000000000803f000000000000803f0000000000000000000080bf04cd454292470fc104cd4542ffa44741781baac0000000000000803f000000000000803f0000000000000000000080bf04cd4542781baac004cd454200000000781baac000000000000080bf00000000000080bf0000000000000000000080bf04cd45c2781baac004cd45420000000092470fc100000000000080bf00000000000080bf0000000000000000000080bf04cd45c292470fc1321a5042000000004cbf69c000000000000080bf00000000000080bf0000000000000000000080bf321a50c24cbf69c0321a5042000000005253e9c000000000000080bf00000000000080bf0000000000000000000080bf321a50c25253e9c004cd4542ffa44741781baac05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bf539d1ac2ffa4474104cd454200000000781baac05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bf539d1ac200000000321a5042ffa447414cbf69c05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bfd6e026c2ffa44741321a5042000000004cbf69c05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bfd6e026c20000000004cd45420000000092470fc15ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bf60b712420000000004cd4542ffa4474192470fc15ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bf60b71242ffa44741321a5042000000005253e9c05ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bfe3fa1e4200000000321a5042ffa447415253e9c05ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bfe3fa1e42ffa4474104cd4542ffa4474192470fc1000000000000803f000000000000803f0000000000000000000080bf04cd454292470fc104cd4542ffa44741781baac0000000000000803f000000000000803f0000000000000000000080bf04cd4542781baac0321a5042ffa447415253e9c0000000000000803f000000000000803f0000000000000000000080bf321a50425253e9c0321a5042ffa447414cbf69c0000000000000803f000000000000803f0000000000000000000080bf321a50424cbf69c0321a5042000000004cbf69c000000000000080bf00000000000080bf0000000000000000000080bf321a50c24cbf69c0321a5042000000005253e9c000000000000080bf00000000000080bf0000000000000000000080bf321a50c25253e9c05b35594200000000183d73c000000000000080bf00000000000080bf0000000000000000000080bf5b3559c2183d73c05b355942000000003812eec000000000000080bf00000000000080bf0000000000000000000080bf5b3559c23812eec0321a5042ffa447414cbf69c03f22853d0000000061757f3f62757fbf000000004122853d000080bfa29c50c2ffa44741321a5042000000004cbf69c03f22853d0000000061757f3f62757fbf000000004122853d000080bfa29c50c2000000005b355942ffa44741183d73c03f22853d0000000061757f3f62757fbf000000004122853d000080bfbcbc59c2ffa447415b35594200000000183d73c03f22853d0000000061757f3f62757fbf000000004122853d000080bfbcbc59c200000000321a5042000000005253e9c03f2285bd0000000061757fbf62757f3f00000000412285bd000080bfe18e514200000000321a5042ffa447415253e9c03f2285bd0000000061757fbf62757f3f00000000412285bd000080bfe18e5142ffa447415b355942000000003812eec03f2285bd0000000061757fbf62757f3f00000000412285bd000080bffbae5a42000000005b355942ffa447413812eec03f2285bd0000000061757fbf62757f3f00000000412285bd000080bffbae5a42ffa44741321a5042ffa447415253e9c0000000000000803f000000000000803f0000000000000000000080bf321a50425253e9c0321a5042ffa447414cbf69c0000000000000803f000000000000803f0000000000000000000080bf321a50424cbf69c05b355942ffa447413812eec0000000000000803f000000000000803f0000000000000000000080bf5b3559423812eec05b355942ffa44741183d73c0000000000000803f000000000000803f0000000000000000000080bf5b355942183d73c05b35594200000000183d73c000000000000080bf00000000000080bf0000000000000000000080bf5b3559c2183d73c05b355942000000003812eec000000000000080bf00000000000080bf0000000000000000000080bf5b3559c23812eec02352684200000000329eb8c000000000000080bf00000000000080bf0000000000000000000080bf235268c2329eb8c02352684200000000ef8816c100000000000080bf00000000000080bf0000000000000000000080bf235268c2ef8816c15b355942ffa44741183d73c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf93a647c2ffa447415b35594200000000183d73c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf93a647c20000000023526842ffa44741329eb8c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf17b158c2ffa447412352684200000000329eb8c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf17b158c2000000005b355942000000003812eec07f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf9a604e42000000005b355942ffa447413812eec07f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf9a604e42ffa447412352684200000000ef8816c17f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf1e6b5f420000000023526842ffa44741ef8816c17f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf1e6b5f42ffa447415b355942ffa447413812eec0000000000000803f000000000000803f0000000000000000000080bf5b3559423812eec05b355942ffa44741183d73c0000000000000803f000000000000803f0000000000000000000080bf5b355942183d73c023526842ffa44741ef8816c1000000000000803f000000000000803f0000000000000000000080bf23526842ef8816c123526842ffa44741329eb8c0000000000000803f000000000000803f0000000000000000000080bf23526842329eb8c02352684200000000329eb8c000000000000080bf00000000000080bf0000000000000000000080bf235268c2329eb8c02352684200000000ef8816c100000000000080bf00000000000080bf0000000000000000000080bf235268c2ef8816c1fd6f6e4200000000fc16b4c000000000000080bf00000000000080bf0000000000000000000080bffd6f6ec2fc16b4c0e04b6e4200000000ef8816c100000000000080bf00000000000080bf0000000000000000000080bfe04b6ec2ef8816c123526842ffa44741329eb8c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bfbe3465c2ffa447412352684200000000329eb8c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bfbe3465c200000000fd6f6e42ffa44741fc16b4c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bf49596bc2ffa44741fd6f6e4200000000fc16b4c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bf49596bc2000000002352684200000000ef8816c10000000000000000000080bf0000803f0000000000000000000080bf235268420000000023526842ffa44741ef8816c10000000000000000000080bf0000803f0000000000000000000080bf23526842ffa44741e04b6e4200000000ef8816c10000000000000000000080bf0000803f0000000000000000000080bfe04b6e4200000000e04b6e42ffa44741ef8816c10000000000000000000080bf0000803f0000000000000000000080bfe04b6e42ffa4474123526842ffa44741ef8816c1000000000000803f000000000000803f0000000000000000000080bf23526842ef8816c123526842ffa44741329eb8c0000000000000803f000000000000803f0000000000000000000080bf23526842329eb8c0e04b6e42ffa44741ef8816c1000000000000803f000000000000803f0000000000000000000080bfe04b6e42ef8816c1fd6f6e42ffa44741fc16b4c0000000000000803f000000000000803f0000000000000000000080bffd6f6e42fc16b4c0fd6f6e4200000000fc16b4c000000000000080bf00000000000080bf0000000000000000000080bffd6f6ec2fc16b4c0e04b6e4200000000ef8816c100000000000080bf00000000000080bf0000000000000000000080bfe04b6ec2ef8816c1f87e764200000000b27b86c000000000000080bf00000000000080bf0000000000000000000080bff87e76c2b27b86c085ae764200000000576900c100000000000080bf00000000000080bf0000000000000000000080bf85ae76c2576900c1fd6f6e42ffa44741fc16b4c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf2ea735c2ffa44741fd6f6e4200000000fc16b4c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf2ea735c200000000f87e7642ffa44741b27b86c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf30863fc2ffa44741f87e764200000000b27b86c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf30863fc200000000e04b6e4200000000ef8816c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf7433324200000000e04b6e42ffa44741ef8816c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf74333242ffa4474185ae764200000000576900c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf003f3c420000000085ae7642ffa44741576900c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf003f3c42ffa44741e04b6e42ffa44741ef8816c1000000000000803f000000000000803f0000000000000000000080bfe04b6e42ef8816c1fd6f6e42ffa44741fc16b4c0000000000000803f000000000000803f0000000000000000000080bffd6f6e42fc16b4c085ae7642ffa44741576900c1000000000000803f000000000000803f0000000000000000000080bf85ae7642576900c1f87e7642ffa44741b27b86c0000000000000803f000000000000803f0000000000000000000080bff87e7642b27b86c0f87e764200000000b27b86c000000000000080bf00000000000080bf0000000000000000000080bff87e76c2b27b86c085ae764200000000576900c100000000000080bf00000000000080bf0000000000000000000080bf85ae76c2576900c13916804200000000202aaebf00000000000080bf00000000000080bf0000000000000000000080bf391680c2202aaebfa4f3804200000000b06fbac000000000000080bf00000000000080bf0000000000000000000080bfa4f380c2b06fbac0f87e7642ffa44741b27b86c0d7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bfa0fc12c2ffa44741f87e764200000000b27b86c0d7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bfa0fc12c20000000039168042ffa44741202aaebfd7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bf84ea21c2ffa447413916804200000000202aaebfd7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bf84ea21c20000000085ae764200000000576900c14cf41d3f00000000f57549bff575493f000000004df41d3f000080bfe7512e420000000085ae7642ffa44741576900c14cf41d3f00000000f57549bff575493f000000004df41d3f000080bfe7512e42ffa44741a4f3804200000000b06fbac04cf41d3f00000000f57549bff575493f000000004df41d3f000080bf60943c4200000000a4f38042ffa44741b06fbac04cf41d3f00000000f57549bff575493f000000004df41d3f000080bf60943c42ffa4474185ae7642ffa44741576900c1000000000000803f000000000000803f0000000000000000000080bf85ae7642576900c1f87e7642ffa44741b27b86c0000000000000803f000000000000803f0000000000000000000080bff87e7642b27b86c0a4f38042ffa44741b06fbac0000000000000803f000000000000803f0000000000000000000080bfa4f38042b06fbac039168042ffa44741202aaebf000000000000803f000000000000803f0000000000000000000080bf39168042202aaebf3916804200000000202aaebf00000000000080bf00000000000080bf0000000000000000000080bf391680c2202aaebfa4f3804200000000b06fbac000000000000080bf00000000000080bf0000000000000000000080bfa4f380c2b06fbac05e07844200000000a0655ebf00000000000080bf00000000000080bf0000000000000000000080bf5e0784c2a0655ebfebc28442000000003a1680c000000000000080bf00000000000080bf0000000000000000000080bfebc284c23a1680c039168042ffa44741202aaebf2ef777be000000008361783f836178bf000000002ef777be000080bf3d3b77c2ffa447413916804200000000202aaebf2ef777be000000008361783f836178bf000000002ef777be000080bf3d3b77c2000000005e078442ffa44741a0655ebf2ef777be000000008361783f836178bf000000002ef777be000080bf705b7fc2ffa447415e07844200000000a0655ebf2ef777be000000008361783f836178bf000000002ef777be000080bf705b7fc200000000a4f3804200000000b06fbac02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf33302a4200000000a4f38042ffa44741b06fbac02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf33302a42ffa44741ebc28442000000003a1680c02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf64bc344200000000ebc28442ffa447413a1680c02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf64bc3442ffa44741a4f38042ffa44741b06fbac0000000000000803f000000000000803f0000000000000000000080bfa4f38042b06fbac039168042ffa44741202aaebf000000000000803f000000000000803f0000000000000000000080bf39168042202aaebfebc28442ffa447413a1680c0000000000000803f000000000000803f0000000000000000000080bfebc284423a1680c05e078442ffa44741a0655ebf000000000000803f000000000000803f0000000000000000000080bf5e078442a0655ebf5e07844200000000a0655ebf00000000000080bf00000000000080bf0000000000000000000080bf5e0784c2a0655ebfebc28442000000003a1680c000000000000080bf00000000000080bf0000000000000000000080bfebc284c23a1680c0eaa4874200000000a8a3a9bf00000000000080bf00000000000080bf0000000000000000000080bfeaa487c2a8a3a9bfa41f884200000000ea29a0c000000000000080bf00000000000080bf0000000000000000000080bfa41f88c2ea29a0c05e078442ffa44741a0655ebf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bf3b6f80c2ffa447415e07844200000000a0655ebf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bf3b6f80c200000000eaa48742ffa44741a8a3a9bf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bfd72984c2ffa44741eaa4874200000000a8a3a9bf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bfd72984c200000000ebc28442000000003a1680c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bfe2416c4200000000ebc28442ffa447413a1680c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bfe2416c42ffa44741a41f884200000000ea29a0c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bf2116744200000000a41f8842ffa44741ea29a0c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bf21167442ffa44741ebc28442ffa447413a1680c0000000000000803f000000000000803f0000000000000000000080bfebc284423a1680c05e078442ffa44741a0655ebf000000000000803f000000000000803f0000000000000000000080bf5e078442a0655ebfa41f8842ffa44741ea29a0c0000000000000803f000000000000803f0000000000000000000080bfa41f8842ea29a0c0eaa48742ffa44741a8a3a9bf000000000000803f000000000000803f0000000000000000000080bfeaa48742a8a3a9bfeaa4874200000000a8a3a9bf00000000000080bf00000000000080bf0000000000000000000080bfeaa487c2a8a3a9bfa41f884200000000ea29a0c000000000000080bf00000000000080bf0000000000000000000080bfa41f88c2ea29a0c009858f420000000078972dc000000000000080bf00000000000080bf0000000000000000000080bf09858fc278972dc073ea8f4200000000c638c2c000000000000080bf00000000000080bf0000000000000000000080bf73ea8fc2c638c2c0eaa48742ffa44741a8a3a9bf461baa3e000000003c75713f3c7571bf00000000471baa3e000080bfd0d180c2ffa44741eaa4874200000000a8a3a9bf461baa3e000000003c75713f3c7571bf00000000471baa3e000080bfd0d180c20000000009858f42ffa4474178972dc0461baa3e000000003c75713f3c7571bf00000000471baa3e000080bf5b2b89c2ffa4474109858f420000000078972dc0461baa3e000000003c75713f3c7571bf00000000471baa3e000080bf5b2b89c200000000a41f884200000000ea29a0c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf3bf3854200000000a41f8842ffa44741ea29a0c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf3bf38542ffa4474173ea8f4200000000c638c2c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf21078e420000000073ea8f42ffa44741c638c2c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf21078e42ffa44741a41f8842ffa44741ea29a0c0000000000000803f000000000000803f0000000000000000000080bfa41f8842ea29a0c0eaa48742ffa44741a8a3a9bf000000000000803f000000000000803f0000000000000000000080bfeaa48742a8a3a9bf73ea8f42ffa44741c638c2c0000000000000803f000000000000803f0000000000000000000080bf73ea8f42c638c2c009858f42ffa4474178972dc0000000000000803f000000000000803f0000000000000000000080bf09858f4278972dc009858f420000000078972dc000000000000080bf00000000000080bf0000000000000000000080bf09858fc278972dc073ea8f4200000000c638c2c000000000000080bf00000000000080bf0000000000000000000080bf73ea8fc2c638c2c01838924200000000b4ae46c000000000000080bf00000000000080bf0000000000000000000080bf183892c2b4ae46c0ab7a924200000000ae8cccc000000000000080bf00000000000080bf0000000000000000000080bfab7a92c2ae8cccc009858f42ffa4474178972dc05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bf2a568bc2ffa4474109858f420000000078972dc05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bf2a568bc20000000018389242ffa44741b4ae46c05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bfc9258ec2ffa447411838924200000000b4ae46c05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bfc9258ec20000000073ea8f4200000000c638c2c0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bff8858e420000000073ea8f42ffa44741c638c2c0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bff8858e42ffa44741ab7a924200000000ae8cccc0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bfac2a914200000000ab7a9242ffa44741ae8cccc0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bfac2a9142ffa4474173ea8f42ffa44741c638c2c0000000000000803f000000000000803f0000000000000000000080bf73ea8f42c638c2c009858f42ffa4474178972dc0000000000000803f000000000000803f0000000000000000000080bf09858f4278972dc0ab7a9242ffa44741ae8cccc0000000000000803f000000000000803f0000000000000000000080bfab7a9242ae8cccc018389242ffa44741b4ae46c0000000000000803f000000000000803f0000000000000000000080bf18389242b4ae46c01838924200000000b4ae46c000000000000080bf00000000000080bf0000000000000000000080bf183892c2b4ae46c0ab7a924200000000ae8cccc000000000000080bf00000000000080bf0000000000000000000080bfab7a92c2ae8cccc09bda9742000000002ab784c000000000000080bf00000000000080bf0000000000000000000080bf9bda97c22ab784c07e4799420000000035e012c100000000000080bf00000000000080bf0000000000000000000080bf7e4799c235e012c118389242ffa44741b4ae46c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bfe0478bc2ffa447411838924200000000b4ae46c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bfe0478bc2000000009bda9742ffa447412ab784c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bf0d4a91c2ffa447419bda9742000000002ab784c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bf0d4a91c200000000ab7a924200000000ae8cccc0d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bffdc2724200000000ab7a9242ffa44741ae8cccc0d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bffdc27242ffa447417e4799420000000035e012c1d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bf992c8242000000007e479942ffa4474135e012c1d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bf992c8242ffa44741ab7a9242ffa44741ae8cccc0000000000000803f000000000000803f0000000000000000000080bfab7a9242ae8cccc018389242ffa44741b4ae46c0000000000000803f000000000000803f0000000000000000000080bf18389242b4ae46c07e479942ffa4474135e012c1000000000000803f000000000000803f0000000000000000000080bf7e47994235e012c19bda9742ffa447412ab784c0000000000000803f000000000000803f0000000000000000000080bf9bda97422ab784c09bda9742000000002ab784c000000000000080bf00000000000080bf0000000000000000000080bf9bda97c22ab784c07e4799420000000035e012c100000000000080bf00000000000080bf0000000000000000000080bf7e4799c235e012c1f5b99e420000000062c7dcc000000000000080bf00000000000080bf0000000000000000000080bff5b99ec262c7dcc06c2d9e4200000000a59431c100000000000080bf00000000000080bf0000000000000000000080bf6c2d9ec2a59431c19bda9742ffa447412ab784c02d07203f0000000047d1473f47d147bf000000002e07203f000080bfea6c77c2ffa447419bda9742000000002ab784c02d07203f0000000047d1473f47d147bf000000002e07203f000080bfea6c77c200000000f5b99e42ffa4474162c7dcc02d07203f0000000047d1473f47d147bf000000002e07203f000080bf7c8484c2ffa44741f5b99e420000000062c7dcc02d07203f0000000047d1473f47d147bf000000002e07203f000080bf7c8484c2000000007e4799420000000035e012c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bf9ff98342000000007e479942ffa4474135e012c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bf9ff98342ffa447416c2d9e4200000000a59431c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bfa7328a42000000006c2d9e42ffa44741a59431c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bfa7328a42ffa447417e479942ffa4474135e012c1000000000000803f000000000000803f0000000000000000000080bf7e47994235e012c19bda9742ffa447412ab784c0000000000000803f000000000000803f0000000000000000000080bf9bda97422ab784c06c2d9e42ffa44741a59431c1000000000000803f000000000000803f0000000000000000000080bf6c2d9e42a59431c1f5b99e42ffa4474162c7dcc0000000000000803f000000000000803f0000000000000000000080bff5b99e4262c7dcc0f5b99e420000000062c7dcc000000000000080bf00000000000080bf0000000000000000000080bff5b99ec262c7dcc06c2d9e4200000000a59431c100000000000080bf00000000000080bf0000000000000000000080bf6c2d9ec2a59431c188f59f4200000000fa4abec000000000000080bf00000000000080bf0000000000000000000080bf88f59fc2fa4abec0b0cd9f4200000000dda86dc100000000000080bf00000000000080bf0000000000000000000080bfb0cd9fc2dda86dc1f5b99e42ffa4474162c7dcc064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bfb34415c2ffa44741f5b99e420000000062c7dcc064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bfb34415c20000000088f59f42ffa44741fa4abec064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bf9dce19c2ffa4474188f59f4200000000fa4abec064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bf9dce19c2000000006c2d9e4200000000a59431c1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bfd7abdc41000000006c2d9e42ffa44741a59431c1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bfd7abdc41ffa44741b0cd9f4200000000dda86dc1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bf2568fb4100000000b0cd9f42ffa44741dda86dc1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bf2568fb41ffa447416c2d9e42ffa44741a59431c1000000000000803f000000000000803f0000000000000000000080bf6c2d9e42a59431c1f5b99e42ffa4474162c7dcc0000000000000803f000000000000803f0000000000000000000080bff5b99e4262c7dcc0b0cd9f42ffa44741dda86dc1000000000000803f000000000000803f0000000000000000000080bfb0cd9f42dda86dc188f59f42ffa44741fa4abec0000000000000803f000000000000803f0000000000000000000080bf88f59f42fa4abec088f59f4200000000fa4abec000000000000080bf00000000000080bf0000000000000000000080bf88f59fc2fa4abec0b0cd9f4200000000dda86dc100000000000080bf00000000000080bf0000000000000000000080bfb0cd9fc2dda86dc1f9aba04200000000fc4abec000000000000080bf00000000000080bf0000000000000000000080bff9aba0c2fc4abec02184a04200000000dfa86dc100000000000080bf00000000000080bf0000000000000000000080bf2184a0c2dfa86dc188f59f42ffa44741fa4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bf8af59fc2ffa4474188f59f4200000000fa4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bf8af59fc200000000f9aba042ffa44741fc4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bffbaba0c2ffa44741f9aba04200000000fc4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bffbaba0c200000000b0cd9f4200000000dda86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bfbacd9f4200000000b0cd9f42ffa44741dda86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bfbacd9f42ffa447412184a04200000000dfa86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bf2b84a042000000002184a042ffa44741dfa86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bf2b84a042ffa44741b0cd9f42ffa44741dda86dc1000000000000803f000000000000803f0000000000000000000080bfb0cd9f42dda86dc188f59f42ffa44741fa4abec0000000000000803f000000000000803f0000000000000000000080bf88f59f42fa4abec02184a042ffa44741dfa86dc1000000000000803f000000000000803f0000000000000000000080bf2184a042dfa86dc1f9aba042ffa44741fc4abec0000000000000803f000000000000803f0000000000000000000080bff9aba042fc4abec000d097bd00000000388064c000000000000080bf00000000000080bf0000000000000000000080bf00d0973d388064c000d097bd000000000000000000000000000080bf00000000000080bf0000000000000000000080bf00d0973d0000000040061ebf00000000388064c000000000000080bf00000000000080bf0000000000000000000080bf40061e3f388064c040061ebf000000000000000000000000000080bf00000000000080bf0000000000000000000080bf40061e3f0000000000d097bdffa44741388064c00000000000000000000080bf0000803f0000000000000000000080bf00d097bdffa4474100d097bd00000000388064c00000000000000000000080bf0000803f0000000000000000000080bf00d097bd0000000040061ebfffa44741388064c00000000000000000000080bf0000803f0000000000000000000080bf40061ebfffa4474140061ebf00000000388064c00000000000000000000080bf0000803f0000000000000000000080bf40061ebf0000000000d097bd000000000000000000000000000000000000803f000080bf0000000000000000000080bf00d0973d0000000000d097bdffa447410000000000000000000000000000803f000080bf0000000000000000000080bf00d0973dffa4474140061ebf000000000000000000000000000000000000803f000080bf0000000000000000000080bf40061e3f0000000040061ebfffa447410000000000000000000000000000803f000080bf0000000000000000000080bf40061e3fffa4474100d097bdffa4474100000000000000000000803f000000000000803f0000000000000000000080bf00d097bd0000000000d097bdffa44741388064c0000000000000803f000000000000803f0000000000000000000080bf00d097bd388064c040061ebfffa4474100000000000000000000803f000000000000803f0000000000000000000080bf40061ebf0000000040061ebfffa44741388064c0000000000000803f000000000000803f0000000000000000000080bf40061ebf388064c0 + m_DataSize: 14400 + _typelessdata: 00d097bd00000000000000004951433d0000000073b57f3f73b57fbf000000004951433d000080bfcaa3973d000000005862cb400000000090299dbe4951433d0000000073b57f3f73b57fbf000000004951433d000080bf069fcbc00000000000d097bdffa44741000000004951433d0000000073b57f3f73b57fbf000000004951433d000080bfcaa3973dffa447415862cb40ffa4474190299dbe4951433d0000000073b57f3f73b57fbf000000004951433d000080bf069fcbc0ffa44741f9aba04200000000fc4abec080fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf85d3a7c0000000002184a04200000000dfa86dc180fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf886e62c100000000f9aba042ffa44741fc4abec080fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf85d3a7c0ffa447412184a042ffa44741dfa86dc180fd7f3f00000000a1230fbca1230f3c0000000080fd7f3f000080bf886e62c1ffa447415862cb40000000007c0281c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bfe317d4400000000000d097bd00000000388064c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bf6ede393e000000005862cb40ffa447417c0281c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bfe317d440ffa4474100d097bdffa44741388064c0c68792bd000000000b587fbf0b587f3f00000000c78792bd000080bf6ede393effa4474140061ebf00000000388064c0000080bf00000000000000000000000000000000000080bf000080bf388064400000000040061ebf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf000000000000000040061ebfffa44741388064c0000080bf00000000000000000000000000000000000080bf000080bf38806440ffa4474140061ebfffa4474100000000000080bf00000000000000000000000000000000000080bf000080bf00000000ffa4474100d097bdffa4474100000000000000000000803f000000000000803f0000000000000000000080bf00d097bd000000005862cb40ffa4474190299dbe000000000000803f000000000000803f0000000000000000000080bf5862cb4090299dbe00d097bdffa44741388064c0000000000000803f000000000000803f0000000000000000000080bf00d097bd388064c05862cb40ffa447417c0281c0000000000000803f000000000000803f0000000000000000000080bf5862cb407c0281c000d097bd00000000388064c000000000000080bf00000000000080bf0000000000000000000080bf00d0973d388064c05862cb40000000007c0281c000000000000080bf00000000000080bf0000000000000000000080bf5862cbc07c0281c000d097bd000000000000000000000000000080bf00000000000080bf0000000000000000000080bf00d0973d000000005862cb400000000090299dbe00000000000080bf00000000000080bf0000000000000000000080bf5862cbc090299dbe7a19744100000000dea28a4000000000000080bf00000000000080bf0000000000000000000080bf7a1974c1dea28a407a19744100000000b007063f00000000000080bf00000000000080bf0000000000000000000080bf7a1974c1b007063f5862cb40ffa4474190299dbe77a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bf3fd0afc0ffa447415862cb400000000090299dbe77a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bf3fd0afc0000000007a197441ffa44741dea28a4077a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bfc07f78c1ffa447417a19744100000000dea28a4077a8ecbe00000000f402633ff50263bf0000000078a8ecbe000080bfc07f78c1000000005862cb40000000007c0281c07b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bf568d7440000000005862cb40ffa447417c0281c07b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bf568d7440ffa447417a19744100000000b007063f7b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bfa31c5d41000000007a197441ffa44741b007063f7b42e93e00000000a2e363bfa2e3633f000000007b42e93e000080bfa31c5d41ffa447417a197441ffa44741b007063f000000000000803f000000000000803f0000000000000000000080bf7a197441b007063f7a197441ffa44741dea28a40000000000000803f000000000000803f0000000000000000000080bf7a197441dea28a402657964100000000fad7674000000000000080bf00000000000080bf0000000000000000000080bf265796c1fad7674026579641000000005003cabe00000000000080bf00000000000080bf0000000000000000000080bf265796c15003cabe7a197441ffa44741dea28a406b85493e0000000062fe7a3f62fe7abf000000006b85493e000080bf2caf61c1ffa447417a19744100000000dea28a406685493e07eca03262fe7a3f62fe7abf000000006685493e000080bf2caf61c10000000026579641ffa44741f8d767406685493e07eca03262fe7a3f62fe7abf000000006685493e000080bf74b28dc1ffa447412657964100000000fad767406185493e07ec203363fe7a3f63fe7abf08eca0a66185493e000080bf74b28dc1000000007a19744100000000b007063f48a980be000000000bc977bf0cc9773f0000000049a980be000080bf63296a41000000007a197441ffa44741b007063f48a980be000000000bc977bf0cc9773f0000000049a980be000080bf63296a41ffa4474126579641000000005003cabe48a980be000000000bc977bf0cc9773f0000000049a980be000080bf354f92410000000026579641ffa447415003cabe48a980be000000000bc977bf0cc9773f0000000049a980be000080bf354f9241ffa4474126579641ffa447415003cabe000000000000803f000000000000803f0000000000000000000080bf265796415003cabe26579641ffa44741f8d76740000000000000803f000000000000803f0000000000000000000080bf26579641f8d767400801ac4100000000fe211d4000000000000080bf00000000000080bf0000000000000000000080bf0801acc1fe211d400801ac41000000000869dabf00000000000080bf00000000000080bf0000000000000000000080bf0801acc10869dabf26579641ffa44741f8d7674046afca3e2eb916332f166b3f2f166bbf33b996a646afca3e000080bf292c7dc100a547412657964100000000fad7674048afca3e2eb996322e166b3f2e166bbf32b916a649afca3e000080bf292c7dc100951a350801ac41ffa44741fe211d4048afca3e2eb996322e166b3f2e166bbf32b916a649afca3e000080bf542d96c100a547410801ac4100000000fe211d404bafca3e000000002e166b3f2e166bbf000000004bafca3e000080bf542d96c100951a3526579641000000005003cabee535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bf70ad88410000000026579641ffa447415003cabee535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bf70ad8841ffa447410801ac41000000000869dabfe535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bfc2bfa041000000000801ac41ffa447410869dabfe535dfbe000000003c6466bf3c64663f00000000e635dfbe000080bfc2bfa041ffa447410801ac41ffa447410869dabf000000000000803f000000000000803f0000000000000000000080bf0801ac410869dabf0801ac41ffa44741fe211d40000000000000803f000000000000803f0000000000000000000080bf0801ac41fe211d40f130cd410000000028eb1ebf00000000000080bf00000000000080bf0000000000000000000080bff130cdc128eb1ebff130cd4100000000105188c000000000000080bf00000000000080bf0000000000000000000080bff130cdc1105188c00801ac41ffa44741fe211d40297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf1bef7cc1ffa447410801ac4100000000fe211d40297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf1bef7cc100000000f130cd41ffa4474128eb1ebf297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf33c8a7c1ffa44741f130cd410000000028eb1ebf297a183f0000000028a34d3f28a34dbf00000000287a183f000080bf33c8a7c1000000000801ac41000000000869dabf273206bf0000000008025abf08025a3f00000000273206bf000080bf1aa29941000000000801ac41ffa447410869dabf273206bf0000000008025abf08025a3f00000000273206bf000080bf1aa29941ffa44741f130cd4100000000105188c0273206bf0000000008025abf08025a3f00000000273206bf000080bf979ac04100000000f130cd41ffa44741105188c0273206bf0000000008025abf08025a3f00000000273206bf000080bf979ac041ffa44741f130cd41ffa44741105188c0000000000000803f000000000000803f0000000000000000000080bff130cd41105188c0f130cd41ffa4474128eb1ebf000000000000803f000000000000803f0000000000000000000080bff130cd4128eb1ebfac85124200000000e20d11c000000000000080bf00000000000080bf0000000000000000000080bfac8512c2e20d11c0ac851242000000009cfabcc000000000000080bf00000000000080bf0000000000000000000080bfac8512c29cfabcc0f130cd41ffa4474128eb1ebfc8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf46a9cbc1ffa44741f130cd410000000028eb1ebfc8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf46a9cbc100000000ac851242ffa44741e20d11c0c8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf683f12c2ffa44741ac85124200000000e20d11c0c8c2173e00000000462c7d3f462c7dbf00000000c8c2173e000080bf683f12c200000000f130cd4100000000105188c0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfd3f9cf4100000000f130cd41ffa44741105188c0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfd3f9cf41ffa44741ac851242000000009cfabcc0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfaf67144200000000ac851242ffa447419cfabcc0c8c217be00000000462c7dbf462c7d3f00000000c8c217be000080bfaf671442ffa44741ac851242ffa447419cfabcc0000000000000803f000000000000803f0000000000000000000080bfac8512429cfabcc0ac851242ffa44741e20d11c0000000000000803f000000000000803f0000000000000000000080bfac851242e20d11c0d66e324200000000b8ffcbc000000000000080bf00000000000080bf0000000000000000000080bfd66e32c2b8ffcbc0d66e324200000000b23920c100000000000080bf00000000000080bf0000000000000000000080bfd66e32c2b23920c1ac851242ffa44741e20d11c0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfd86906c2ffa44741ac85124200000000e20d11c0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfd86906c200000000d66e3242ffa44741b8ffcbc0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfb14e2ac2ffa44741d66e324200000000b8ffcbc0166bea3e000000007f97633f7f9763bf00000000166bea3e000080bfb14e2ac200000000ac851242000000009cfabcc0176beabe000000007e9763bf7f97633f00000000186beabe000080bffe130d4200000000ac851242ffa447419cfabcc0176beabe000000007e9763bf7f97633f00000000186beabe000080bffe130d42ffa44741d66e324200000000b23920c1176beabe000000007e9763bf7f97633f00000000186beabe000080bfd7f8304200000000d66e3242ffa44741b23920c1176beabe000000007e9763bf7f97633f00000000186beabe000080bfd7f83042ffa44741d66e3242ffa44741b23920c1000000000000803f000000000000803f0000000000000000000080bfd66e3242b23920c1d66e3242ffa44741b8ffcbc0000000000000803f000000000000803f0000000000000000000080bfd66e3242b8ffcbc005db3742000000003cf8d9c000000000000080bf00000000000080bf0000000000000000000080bf05db37c23cf8d9c005db374200000000f43527c100000000000080bf00000000000080bf0000000000000000000080bf05db37c2f43527c1d66e3242ffa44741b8ffcbc07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bfcba831c2ffa44741d66e324200000000b8ffcbc07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bfcba831c20000000005db3742ffa447413cf8d9c07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bf315b37c2ffa4474105db3742000000003cf8d9c07ef39c3e00000000d7ac733fd8ac73bf000000007ff39c3e000080bf315b37c200000000d66e324200000000b23920c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf1f1f364200000000d66e3242ffa44741b23920c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf1f1f3642ffa4474105db374200000000f43527c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf85d13b420000000005db3742ffa44741f43527c17ef39cbe00000000d7ac73bfd8ac733f000000007ff39cbe000080bf85d13b42ffa4474105db3742ffa44741f43527c1000000000000803f000000000000803f0000000000000000000080bf05db3742f43527c105db3742ffa447413cf8d9c0000000000000803f000000000000803f0000000000000000000080bf05db37423cf8d9c004cd454200000000781baac000000000000080bf00000000000080bf0000000000000000000080bf04cd45c2781baac004cd45420000000092470fc100000000000080bf00000000000080bf0000000000000000000080bf04cd45c292470fc105db3742ffa447413cf8d9c053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf63381ec2ffa4474105db3742000000003cf8d9c053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf63381ec20000000004cd4542ffa44741781baac053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf0e652dc2ffa4474104cd454200000000781baac053ddc9be0000000054436b3f54436bbf0000000053ddc9be000080bf0e652dc20000000005db374200000000f43527c153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bf2b7b18420000000005db3742ffa44741f43527c153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bf2b7b1842ffa4474104cd45420000000092470fc153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bfd6a727420000000004cd4542ffa4474192470fc153ddc93e0000000054436bbf54436b3f0000000053ddc93e000080bfd6a72742ffa4474104cd4542ffa4474192470fc1000000000000803f000000000000803f0000000000000000000080bf04cd454292470fc104cd4542ffa44741781baac0000000000000803f000000000000803f0000000000000000000080bf04cd4542781baac0321a5042000000004cbf69c000000000000080bf00000000000080bf0000000000000000000080bf321a50c24cbf69c0321a5042000000005253e9c000000000000080bf00000000000080bf0000000000000000000080bf321a50c25253e9c004cd4542ffa44741781baac05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bf539d1ac2ffa4474104cd454200000000781baac05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bf539d1ac200000000321a5042ffa447414cbf69c05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bfd6e026c2ffa44741321a5042000000004cbf69c05ae70abf00000000fa09573ffb0957bf000000005ae70abf000080bfd6e026c20000000004cd45420000000092470fc15ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bf60b712420000000004cd4542ffa4474192470fc15ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bf60b71242ffa44741321a5042000000005253e9c05ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bfe3fa1e4200000000321a5042ffa447415253e9c05ae70a3f00000000fa0957bffb09573f000000005ae70a3f000080bfe3fa1e42ffa44741321a5042ffa447415253e9c0000000000000803f000000000000803f0000000000000000000080bf321a50425253e9c0321a5042ffa447414cbf69c0000000000000803f000000000000803f0000000000000000000080bf321a50424cbf69c05b35594200000000183d73c000000000000080bf00000000000080bf0000000000000000000080bf5b3559c2183d73c05b355942000000003812eec000000000000080bf00000000000080bf0000000000000000000080bf5b3559c23812eec0321a5042ffa447414cbf69c03f22853d0000000061757f3f62757fbf000000004122853d000080bfa29c50c2ffa44741321a5042000000004cbf69c03f22853d0000000061757f3f62757fbf000000004122853d000080bfa29c50c2000000005b355942ffa44741183d73c03f22853d0000000061757f3f62757fbf000000004122853d000080bfbcbc59c2ffa447415b35594200000000183d73c03f22853d0000000061757f3f62757fbf000000004122853d000080bfbcbc59c200000000321a5042000000005253e9c03f2285bd0000000061757fbf62757f3f00000000412285bd000080bfe18e514200000000321a5042ffa447415253e9c03f2285bd0000000061757fbf62757f3f00000000412285bd000080bfe18e5142ffa447415b355942000000003812eec03f2285bd0000000061757fbf62757f3f00000000412285bd000080bffbae5a42000000005b355942ffa447413812eec03f2285bd0000000061757fbf62757f3f00000000412285bd000080bffbae5a42ffa447415b355942ffa447413812eec0000000000000803f000000000000803f0000000000000000000080bf5b3559423812eec05b355942ffa44741183d73c0000000000000803f000000000000803f0000000000000000000080bf5b355942183d73c02352684200000000329eb8c000000000000080bf00000000000080bf0000000000000000000080bf235268c2329eb8c02352684200000000ef8816c100000000000080bf00000000000080bf0000000000000000000080bf235268c2ef8816c15b355942ffa44741183d73c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf93a647c2ffa447415b35594200000000183d73c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf93a647c20000000023526842ffa44741329eb8c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf17b158c2ffa447412352684200000000329eb8c07f99ec3e00000000dc06633fdb0663bf000000007e99ec3e000080bf17b158c2000000005b355942000000003812eec07f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf9a604e42000000005b355942ffa447413812eec07f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf9a604e42ffa447412352684200000000ef8816c17f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf1e6b5f420000000023526842ffa44741ef8816c17f99ecbe00000000dc0663bfdb06633f000000007e99ecbe000080bf1e6b5f42ffa4474123526842ffa44741ef8816c1000000000000803f000000000000803f0000000000000000000080bf23526842ef8816c123526842ffa44741329eb8c0000000000000803f000000000000803f0000000000000000000080bf23526842329eb8c0fd6f6e4200000000fc16b4c000000000000080bf00000000000080bf0000000000000000000080bffd6f6ec2fc16b4c0e04b6e4200000000ef8816c100000000000080bf00000000000080bf0000000000000000000080bfe04b6ec2ef8816c123526842ffa44741329eb8c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bfbe3465c2ffa447412352684200000000329eb8c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bfbe3465c200000000fd6f6e42ffa44741fc16b4c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bf49596bc2ffa44741fd6f6e4200000000fc16b4c05ab6bcbd0000000030e97e3f30e97ebf0000000059b6bcbd000080bf49596bc2000000002352684200000000ef8816c10000000000000000000080bf0000803f0000000000000000000080bf235268420000000023526842ffa44741ef8816c10000000000000000000080bf0000803f0000000000000000000080bf23526842ffa44741e04b6e4200000000ef8816c10000000000000000000080bf0000803f0000000000000000000080bfe04b6e4200000000e04b6e42ffa44741ef8816c10000000000000000000080bf0000803f0000000000000000000080bfe04b6e42ffa44741e04b6e42ffa44741ef8816c1000000000000803f000000000000803f0000000000000000000080bfe04b6e42ef8816c1fd6f6e42ffa44741fc16b4c0000000000000803f000000000000803f0000000000000000000080bffd6f6e42fc16b4c0f87e764200000000b27b86c000000000000080bf00000000000080bf0000000000000000000080bff87e76c2b27b86c085ae764200000000576900c100000000000080bf00000000000080bf0000000000000000000080bf85ae76c2576900c1fd6f6e42ffa44741fc16b4c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf2ea735c2ffa44741fd6f6e4200000000fc16b4c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf2ea735c200000000f87e7642ffa44741b27b86c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf30863fc2ffa44741f87e764200000000b27b86c0b3d813bf00000000cefd503fcffd50bf00000000b4d813bf000080bf30863fc200000000e04b6e4200000000ef8816c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf7433324200000000e04b6e42ffa44741ef8816c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf74333242ffa4474185ae764200000000576900c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf003f3c420000000085ae7642ffa44741576900c13ff40c3f000000005ab355bf5bb3553f0000000040f40c3f000080bf003f3c42ffa4474185ae7642ffa44741576900c1000000000000803f000000000000803f0000000000000000000080bf85ae7642576900c1f87e7642ffa44741b27b86c0000000000000803f000000000000803f0000000000000000000080bff87e7642b27b86c03916804200000000202aaebf00000000000080bf00000000000080bf0000000000000000000080bf391680c2202aaebfa4f3804200000000b06fbac000000000000080bf00000000000080bf0000000000000000000080bfa4f380c2b06fbac0f87e7642ffa44741b27b86c0d7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bfa0fc12c2ffa44741f87e764200000000b27b86c0d7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bfa0fc12c20000000039168042ffa44741202aaebfd7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bf84ea21c2ffa447413916804200000000202aaebfd7ed42bf00000000a2f2253fa2f225bf00000000d6ed42bf000080bf84ea21c20000000085ae764200000000576900c14cf41d3f00000000f57549bff575493f000000004df41d3f000080bfe7512e420000000085ae7642ffa44741576900c14cf41d3f00000000f57549bff575493f000000004df41d3f000080bfe7512e42ffa44741a4f3804200000000b06fbac04cf41d3f00000000f57549bff575493f000000004df41d3f000080bf60943c4200000000a4f38042ffa44741b06fbac04cf41d3f00000000f57549bff575493f000000004df41d3f000080bf60943c42ffa44741a4f38042ffa44741b06fbac0000000000000803f000000000000803f0000000000000000000080bfa4f38042b06fbac039168042ffa44741202aaebf000000000000803f000000000000803f0000000000000000000080bf39168042202aaebf5e07844200000000a0655ebf00000000000080bf00000000000080bf0000000000000000000080bf5e0784c2a0655ebfebc28442000000003a1680c000000000000080bf00000000000080bf0000000000000000000080bfebc284c23a1680c039168042ffa44741202aaebf2ef777be000000008361783f836178bf000000002ef777be000080bf3d3b77c2ffa447413916804200000000202aaebf2ef777be000000008361783f836178bf000000002ef777be000080bf3d3b77c2000000005e078442ffa44741a0655ebf2ef777be000000008361783f836178bf000000002ef777be000080bf705b7fc2ffa447415e07844200000000a0655ebf2ef777be000000008361783f836178bf000000002ef777be000080bf705b7fc200000000a4f3804200000000b06fbac02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf33302a4200000000a4f38042ffa44741b06fbac02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf33302a42ffa44741ebc28442000000003a1680c02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf64bc344200000000ebc28442ffa447413a1680c02606313f00000000a9ed38bfa9ed383f000000002606313f000080bf64bc3442ffa44741ebc28442ffa447413a1680c0000000000000803f000000000000803f0000000000000000000080bfebc284423a1680c05e078442ffa44741a0655ebf000000000000803f000000000000803f0000000000000000000080bf5e078442a0655ebfeaa4874200000000a8a3a9bf00000000000080bf00000000000080bf0000000000000000000080bfeaa487c2a8a3a9bfa41f884200000000ea29a0c000000000000080bf00000000000080bf0000000000000000000080bfa41f88c2ea29a0c05e078442ffa44741a0655ebf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bf3b6f80c2ffa447415e07844200000000a0655ebf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bf3b6f80c200000000eaa48742ffa44741a8a3a9bf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bfd72984c2ffa44741eaa4874200000000a8a3a9bf49c17a3e00000000b034783fb13478bf000000004bc17a3e000080bfd72984c200000000ebc28442000000003a1680c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bfe2416c4200000000ebc28442ffa447413a1680c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bfe2416c42ffa44741a41f884200000000ea29a0c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bf2116744200000000a41f8842ffa44741ea29a0c0d81b03bf00000000dde05bbfdce05b3f00000000d81b03bf000080bf21167442ffa44741a41f8842ffa44741ea29a0c0000000000000803f000000000000803f0000000000000000000080bfa41f8842ea29a0c0eaa48742ffa44741a8a3a9bf000000000000803f000000000000803f0000000000000000000080bfeaa48742a8a3a9bf09858f420000000078972dc000000000000080bf00000000000080bf0000000000000000000080bf09858fc278972dc073ea8f4200000000c638c2c000000000000080bf00000000000080bf0000000000000000000080bf73ea8fc2c638c2c0eaa48742ffa44741a8a3a9bf461baa3e000000003c75713f3c7571bf00000000471baa3e000080bfd0d180c2ffa44741eaa4874200000000a8a3a9bf461baa3e000000003c75713f3c7571bf00000000471baa3e000080bfd0d180c20000000009858f42ffa4474178972dc0461baa3e000000003c75713f3c7571bf00000000471baa3e000080bf5b2b89c2ffa4474109858f420000000078972dc0461baa3e000000003c75713f3c7571bf00000000471baa3e000080bf5b2b89c200000000a41f884200000000ea29a0c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf3bf3854200000000a41f8842ffa44741ea29a0c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf3bf38542ffa4474173ea8f4200000000c638c2c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf21078e420000000073ea8f42ffa44741c638c2c0d5eb86be0000000099f376bf98f3763f00000000d5eb86be000080bf21078e42ffa4474173ea8f42ffa44741c638c2c0000000000000803f000000000000803f0000000000000000000080bf73ea8f42c638c2c009858f42ffa4474178972dc0000000000000803f000000000000803f0000000000000000000080bf09858f4278972dc01838924200000000b4ae46c000000000000080bf00000000000080bf0000000000000000000080bf183892c2b4ae46c0ab7a924200000000ae8cccc000000000000080bf00000000000080bf0000000000000000000080bfab7a92c2ae8cccc009858f42ffa4474178972dc05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bf2a568bc2ffa4474109858f420000000078972dc05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bf2a568bc20000000018389242ffa44741b4ae46c05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bfc9258ec2ffa447411838924200000000b4ae46c05dd08e3e00000000e8d6753fe8d675bf000000005ed08e3e000080bfc9258ec20000000073ea8f4200000000c638c2c0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bff8858e420000000073ea8f42ffa44741c638c2c0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bff8858e42ffa44741ab7a924200000000ae8cccc0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bfac2a914200000000ab7a9242ffa44741ae8cccc0d60c7abe00000000104078bf1140783f00000000d70c7abe000080bfac2a9142ffa44741ab7a9242ffa44741ae8cccc0000000000000803f000000000000803f0000000000000000000080bfab7a9242ae8cccc018389242ffa44741b4ae46c0000000000000803f000000000000803f0000000000000000000080bf18389242b4ae46c09bda9742000000002ab784c000000000000080bf00000000000080bf0000000000000000000080bf9bda97c22ab784c07e4799420000000035e012c100000000000080bf00000000000080bf0000000000000000000080bf7e4799c235e012c118389242ffa44741b4ae46c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bfe0478bc2ffa447411838924200000000b4ae46c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bfe0478bc2000000009bda9742ffa447412ab784c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bf0d4a91c2ffa447419bda9742000000002ab784c08ebeb13e000000002014703f201470bf000000008ebeb13e000080bf0d4a91c200000000ab7a924200000000ae8cccc0d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bffdc2724200000000ab7a9242ffa44741ae8cccc0d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bffdc27242ffa447417e4799420000000035e012c1d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bf992c8242000000007e479942ffa4474135e012c1d24e22bf0000000057f845bf57f8453f00000000d24e22bf000080bf992c8242ffa447417e479942ffa4474135e012c1000000000000803f000000000000803f0000000000000000000080bf7e47994235e012c19bda9742ffa447412ab784c0000000000000803f000000000000803f0000000000000000000080bf9bda97422ab784c0f5b99e420000000062c7dcc000000000000080bf00000000000080bf0000000000000000000080bff5b99ec262c7dcc06c2d9e4200000000a59431c100000000000080bf00000000000080bf0000000000000000000080bf6c2d9ec2a59431c19bda9742ffa447412ab784c02d07203f0000000047d1473f47d147bf000000002e07203f000080bfea6c77c2ffa447419bda9742000000002ab784c02d07203f0000000047d1473f47d147bf000000002e07203f000080bfea6c77c200000000f5b99e42ffa4474162c7dcc02d07203f0000000047d1473f47d147bf000000002e07203f000080bf7c8484c2ffa44741f5b99e420000000062c7dcc02d07203f0000000047d1473f47d147bf000000002e07203f000080bf7c8484c2000000007e4799420000000035e012c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bf9ff98342000000007e479942ffa4474135e012c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bf9ff98342ffa447416c2d9e4200000000a59431c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bfa7328a42000000006c2d9e42ffa44741a59431c175e51dbf00000000988149bf9781493f0000000075e51dbf000080bfa7328a42ffa447416c2d9e42ffa44741a59431c1000000000000803f000000000000803f0000000000000000000080bf6c2d9e42a59431c1f5b99e42ffa4474162c7dcc0000000000000803f000000000000803f0000000000000000000080bff5b99e4262c7dcc088f59f4200000000fa4abec000000000000080bf00000000000080bf0000000000000000000080bf88f59fc2fa4abec0b0cd9f4200000000dda86dc100000000000080bf00000000000080bf0000000000000000000080bfb0cd9fc2dda86dc1f5b99e42ffa4474162c7dcc064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bfb34415c2ffa44741f5b99e420000000062c7dcc064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bfb34415c20000000088f59f42ffa44741fa4abec064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bf9dce19c2ffa4474188f59f4200000000fa4abec064f056bf00000000ed0e0b3fed0e0bbf0000000065f056bf000080bf9dce19c2000000006c2d9e4200000000a59431c1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bfd7abdc41000000006c2d9e42ffa44741a59431c1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bfd7abdc41ffa44741b0cd9f4200000000dda86dc1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bf2568fb4100000000b0cd9f42ffa44741dda86dc1cb337abf00000000fbb158befbb1583e00000000cb337abf000080bf2568fb41ffa44741b0cd9f42ffa44741dda86dc1000000000000803f000000000000803f0000000000000000000080bfb0cd9f42dda86dc188f59f42ffa44741fa4abec0000000000000803f000000000000803f0000000000000000000080bf88f59f42fa4abec0f9aba04200000000fc4abec000000000000080bf00000000000080bf0000000000000000000080bff9aba0c2fc4abec02184a04200000000dfa86dc100000000000080bf00000000000080bf0000000000000000000080bf2184a0c2dfa86dc188f59f42ffa44741fa4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bf8af59fc2ffa4474188f59f4200000000fa4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bf8af59fc200000000f9aba042ffa44741fc4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bffbaba0c2ffa44741f9aba04200000000fc4abec0bd9b3336000000000000803f000080bf00000000bd9b3336000080bffbaba0c200000000b0cd9f4200000000dda86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bfbacd9f4200000000b0cd9f42ffa44741dda86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bfbacd9f42ffa447412184a04200000000dfa86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bf2b84a042000000002184a042ffa44741dfa86dc1bd9bb3b600000000000080bf0000803f00000000bd9bb3b6000080bf2b84a042ffa447412184a042ffa44741dfa86dc1000000000000803f000000000000803f0000000000000000000080bf2184a042dfa86dc1f9aba042ffa44741fc4abec0000000000000803f000000000000803f0000000000000000000080bff9aba042fc4abec040061ebf00000000388064c000000000000080bf00000000000080bf0000000000000000000080bf40061e3f388064c040061ebf000000000000000000000000000080bf00000000000080bf0000000000000000000080bf40061e3f0000000000d097bdffa44741388064c00000000000000000000080bf0000803f0000000000000000000080bf00d097bdffa4474100d097bd00000000388064c00000000000000000000080bf0000803f0000000000000000000080bf00d097bd0000000040061ebfffa44741388064c00000000000000000000080bf0000803f0000000000000000000080bf40061ebfffa4474140061ebf00000000388064c00000000000000000000080bf0000803f0000000000000000000080bf40061ebf0000000000d097bd000000000000000000000000000000000000803f000080bf0000000000000000000080bf00d0973d0000000000d097bdffa447410000000000000000000000000000803f000080bf0000000000000000000080bf00d0973dffa4474140061ebf000000000000000000000000000000000000803f000080bf0000000000000000000080bf40061e3f0000000040061ebfffa447410000000000000000000000000000803f000080bf0000000000000000000080bf40061e3fffa4474140061ebfffa4474100000000000000000000803f000000000000803f0000000000000000000080bf40061ebf0000000040061ebfffa44741388064c0000000000000803f000000000000803f0000000000000000000080bf40061ebf388064c0 m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -16482,42 +16482,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 687223937} m_PrefabAsset: {fileID: 0} ---- !u!1 &688753520 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1406371023770166685, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!114 &688753523 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 688753520} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 718677368} - m_Horizontal: 1 - m_Vertical: 1 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 10 - m_Viewport: {fileID: 3020720018843181012} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] --- !u!1001 &689509338 PrefabInstance: m_ObjectHideFlags: 0 @@ -17178,82 +17142,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 715240475} m_PrefabAsset: {fileID: 0} ---- !u!1 &718677367 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 718677368} - - component: {fileID: 718677370} - - component: {fileID: 718677369} - m_Layer: 5 - m_Name: Scrolls - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &718677368 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 718677367} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3020720018843181012} - 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: 55.5, y: 540} - m_SizeDelta: {x: 110, y: 5} - m_Pivot: {x: 1, y: 1} ---- !u!114 &718677369 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 718677367} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 ---- !u!114 &718677370 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 718677367} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 5, y: 5} - m_Constraint: 0 - m_ConstraintCount: 2 --- !u!1001 &726181197 PrefabInstance: m_ObjectHideFlags: 0 @@ -19171,12 +19059,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 800121727} m_PrefabAsset: {fileID: 0} ---- !u!1 &801094196 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1406371023078125629, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} --- !u!1 &802019337 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4661435515762455780, guid: e289bf5debb17f6459818c207d781953, @@ -19317,55 +19199,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 804686550} m_PrefabAsset: {fileID: 0} ---- !u!224 &808018390 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1406371023078125630, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!114 &808018391 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 801094196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 ---- !u!114 &808018392 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 801094196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 1969066178} - m_Horizontal: 1 - m_Vertical: 1 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 808018390} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] --- !u!1001 &809222157 PrefabInstance: m_ObjectHideFlags: 0 @@ -33533,42 +33366,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1588357549} m_PrefabAsset: {fileID: 0} ---- !u!1 &1591009305 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1591009306} - m_Layer: 5 - m_Name: Facts - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1591009306 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1591009305} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3020720018843181013} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} - m_Pivot: {x: 0.5, y: 1} --- !u!1001 &1592731989 PrefabInstance: m_ObjectHideFlags: 0 @@ -39884,6 +39681,11 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1258196667482719520, guid: caf448c160a07214f8cf74da91506980, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.000030517578 + objectReference: {fileID: 0} - target: {fileID: 1518354053009218582, guid: caf448c160a07214f8cf74da91506980, type: 3} propertyPath: m_AnchoredPosition.y @@ -39904,6 +39706,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1884886062868963456, guid: caf448c160a07214f8cf74da91506980, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.999939 + objectReference: {fileID: 0} + - target: {fileID: 1898191558618400828, guid: caf448c160a07214f8cf74da91506980, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1933676565815785523, guid: caf448c160a07214f8cf74da91506980, type: 3} propertyPath: m_AnchorMax.y @@ -40359,6 +40171,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6990104356646364506, guid: caf448c160a07214f8cf74da91506980, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7216169563200149950, guid: caf448c160a07214f8cf74da91506980, type: 3} propertyPath: m_AnchorMax.y @@ -40394,6 +40211,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 7647234183557425222, guid: caf448c160a07214f8cf74da91506980, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.000030517578 + objectReference: {fileID: 0} - target: {fileID: 7702767795185280971, guid: caf448c160a07214f8cf74da91506980, type: 3} propertyPath: m_IsActive @@ -55626,42 +55448,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1967470652} m_PrefabAsset: {fileID: 0} ---- !u!1 &1969066177 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1969066178} - m_Layer: 5 - m_Name: Facts - m_TagString: Untagged - m_Icon: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1969066178 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969066177} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 808018390} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} - m_Pivot: {x: 0.5, y: 1} --- !u!1001 &1970241703 PrefabInstance: m_ObjectHideFlags: 0 @@ -59542,7 +59328,7 @@ PrefabInstance: type: 3} propertyPath: factscreenContent value: - objectReference: {fileID: 1969066178} + objectReference: {fileID: 0} - target: {fileID: 1406371023078125631, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: prefab_AreaCircle @@ -59650,7 +59436,7 @@ PrefabInstance: type: 3} propertyPath: scrollscreenContent value: - objectReference: {fileID: 718677368} + objectReference: {fileID: 0} - target: {fileID: 1406371024527393899, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.x @@ -59821,6 +59607,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1734510802251275973, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_SizeDelta.y + value: 690 + objectReference: {fileID: 0} + - target: {fileID: 1734510802251275974, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Name + value: "Scrollscreen - npf\xDC" + objectReference: {fileID: 0} - target: {fileID: 1823131411472254337, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -60338,6 +60134,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2922756910265347783, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2927467717156712422, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -60418,6 +60219,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3018693875623148968, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.7 + objectReference: {fileID: 0} + - target: {fileID: 3018693875623148968, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.73 + objectReference: {fileID: 0} - target: {fileID: 3020720017683626808, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_RootOrder @@ -60478,6 +60289,11 @@ PrefabInstance: propertyPath: m_Name value: Stage_Default objectReference: {fileID: 0} + - target: {fileID: 3020720018014008391, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3020720018354060035, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_IsActive @@ -60522,12 +60338,17 @@ PrefabInstance: type: 3} propertyPath: scrollscreenContent value: - objectReference: {fileID: 3020720018843181011} + objectReference: {fileID: 0} - target: {fileID: 3020720018893859959, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 3020720019019083059, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3020720019048698010, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: walkAroundObject @@ -60549,7 +60370,7 @@ PrefabInstance: type: 3} propertyPath: factscreenContent value: - objectReference: {fileID: 3020720018843181010} + objectReference: {fileID: 0} - target: {fileID: 3020720019460506146, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: prefab_AreaCircle @@ -60713,6 +60534,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3056603077265773707, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3060216605866299851, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -60863,6 +60689,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3256699174731649202, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3256699174731649202, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 690 + objectReference: {fileID: 0} - target: {fileID: 3282753201910983826, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -61078,6 +60914,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3800846218600177375, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3880727195338854050, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -61333,6 +61174,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4467612396593514728, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Name + value: "GadgetBackground - N.Pf.\xDC.!" + objectReference: {fileID: 0} - target: {fileID: 4474961685855124046, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -61383,6 +61229,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4517512635491800811, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4531387228611741292, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -61863,6 +61714,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5664405441459887119, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5688016967540468862, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -62153,6 +62009,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6310624404615752746, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6467638319553815892, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6568854318450501685, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -62188,6 +62054,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6674138263813566047, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674138263813566047, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674138263813566047, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674138263813566047, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674138263813566047, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -220 + objectReference: {fileID: 0} + - target: {fileID: 6674138263813566047, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -230 + objectReference: {fileID: 0} - target: {fileID: 6716680220403242463, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -62303,6 +62199,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6849629549808862850, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6879937767831435659, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -62698,6 +62599,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7486688211159863925, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7499374438244155108, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -62718,6 +62624,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7523122168512463278, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7668172506670744135, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -62758,6 +62669,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7719520560471814958, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7748114935345543003, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -63078,6 +62994,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8453247782535831454, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8468172704577445214, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -63355,82 +63276,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b07552db700124a4680401e6fb94c186, type: 3} ---- !u!224 &3020720018843181010 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1406371024612708741, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!224 &3020720018843181011 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3020720018373304827, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!224 &3020720018843181012 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1406371023770166686, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!224 &3020720018843181013 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3020720019460506147, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3020720018843181014 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3020720019460506144, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!224 &3020720018843181015 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3020720017773880216, guid: b07552db700124a4680401e6fb94c186, - type: 3} - m_PrefabInstance: {fileID: 3020720018843181009} - m_PrefabAsset: {fileID: 0} ---- !u!114 &3020720018843181016 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3020720018843181014} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &3020720018843181017 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3020720018843181014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 3020720018843181015} - m_Horizontal: 1 - m_Vertical: 1 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 10 - m_Viewport: {fileID: 3020720018843181013} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] diff --git a/Assets/ScriptableObjects/Gadgets.meta b/Assets/ScriptableObjects/Gadgets.meta new file mode 100644 index 0000000000000000000000000000000000000000..834fcbf54bccfe53ce19965a42ddab784914b7ab --- /dev/null +++ b/Assets/ScriptableObjects/Gadgets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9569280deca8a744e83a8c624f863b51 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ScriptableObjects/AngleToolDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/AngleToolDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/AngleToolDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/AngleToolDataContainerGadgetInit.asset index ba228eaea6ffa1632f60e43aac77f1742651a946..8e7625f9b4070d75ee0d5733acbe9351d6e90e6f 100644 --- a/Assets/ScriptableObjects/AngleToolDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/AngleToolDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 3 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 129538 + m_Bits: 391718 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/AngleToolDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/AngleToolDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/AngleToolDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/AngleToolDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/DataContainerGadgetCollection.cs b/Assets/ScriptableObjects/Gadgets/DataContainerGadgetCollection.cs similarity index 100% rename from Assets/ScriptableObjects/DataContainerGadgetCollection.cs rename to Assets/ScriptableObjects/Gadgets/DataContainerGadgetCollection.cs diff --git a/Assets/ScriptableObjects/DataContainerGadgetCollection.cs.meta b/Assets/ScriptableObjects/Gadgets/DataContainerGadgetCollection.cs.meta similarity index 100% rename from Assets/ScriptableObjects/DataContainerGadgetCollection.cs.meta rename to Assets/ScriptableObjects/Gadgets/DataContainerGadgetCollection.cs.meta diff --git a/Assets/ScriptableObjects/DataContainerGadgetInit.cs b/Assets/ScriptableObjects/Gadgets/DataContainerGadgetInit.cs similarity index 100% rename from Assets/ScriptableObjects/DataContainerGadgetInit.cs rename to Assets/ScriptableObjects/Gadgets/DataContainerGadgetInit.cs diff --git a/Assets/ScriptableObjects/DataContainerGadgetInit.cs.meta b/Assets/ScriptableObjects/Gadgets/DataContainerGadgetInit.cs.meta similarity index 100% rename from Assets/ScriptableObjects/DataContainerGadgetInit.cs.meta rename to Assets/ScriptableObjects/Gadgets/DataContainerGadgetInit.cs.meta diff --git a/Assets/ScriptableObjects/DefaultDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/DefaultDataContainerGadgetInit.asset similarity index 100% rename from Assets/ScriptableObjects/DefaultDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/DefaultDataContainerGadgetInit.asset diff --git a/Assets/ScriptableObjects/DefaultDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/DefaultDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/DefaultDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/DefaultDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/EqualCirclesDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/EqualCirclesDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/EqualCirclesDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/EqualCirclesDataContainerGadgetInit.asset index 5a66bd62c427e6313bfa74dbf1547a6ffed71212..846d7797a10b12f51799199daef826777bf32c59 100644 --- a/Assets/ScriptableObjects/EqualCirclesDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/EqualCirclesDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 9 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 802342 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/EqualCirclesDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/EqualCirclesDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/EqualCirclesDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/EqualCirclesDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/GadgetDataContainerGadgetCollection.asset b/Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset similarity index 100% rename from Assets/ScriptableObjects/GadgetDataContainerGadgetCollection.asset rename to Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset diff --git a/Assets/ScriptableObjects/GadgetDataContainerGadgetCollection.asset.meta b/Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset.meta similarity index 100% rename from Assets/ScriptableObjects/GadgetDataContainerGadgetCollection.asset.meta rename to Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset.meta diff --git a/Assets/ScriptableObjects/LineDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/LineDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/LineDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/LineDataContainerGadgetInit.asset index 39b1c774169da8bd60e382a0fe3f6bcc7dbba21c..c7988ab9ec0d528124c57466e1624db4e4e6ecf9 100644 --- a/Assets/ScriptableObjects/LineDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/LineDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 4 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 129538 + m_Bits: 391714 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/LineDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/LineDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/LineDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/LineDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/LotToolDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/LotToolDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/LotToolDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/LotToolDataContainerGadgetInit.asset index 003608a759c95dd5e5fac853c2d5f8f48c8c2170..7bd31f3833602fe65bea7383087d3f8dcc49878d 100644 --- a/Assets/ScriptableObjects/LotToolDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/LotToolDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 5 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 102914 + m_Bits: 365090 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/LotToolDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/LotToolDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/LotToolDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/LotToolDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/MiddlePointDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/MiddlePointDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset index e0a620a3daf315c234bc76b46a8f51c3762c7d69..5f5febfe0eae2b8ff5a9da816630cf6d94459041 100644 --- a/Assets/ScriptableObjects/MiddlePointDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 10 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 64002 + m_Bits: 326178 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/MiddlePointDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/MiddlePointDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/PendulumDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/PendulumDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/PendulumDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/PendulumDataContainerGadgetInit.asset index 44909e7f88b4c13c0facc35d5626cfd3f34285c6..d01896a96c03595fe33b5c076868a456b78a426f 100644 --- a/Assets/ScriptableObjects/PendulumDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/PendulumDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 6 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 129538 + m_Bits: 391714 SecondaryLayerMask: serializedVersion: 2 m_Bits: 1 diff --git a/Assets/ScriptableObjects/PendulumDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/PendulumDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/PendulumDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/PendulumDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/PointerDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/PointerDataContainerGadgetInit.asset index 4c7c37fb1bd43df95fe76bc3628eaa9c2d05ddab..62e031ed4499ce2627422b7e87ac05b857fec5ff 100644 --- a/Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/PointerDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 1 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 7682 + m_Bits: 269858 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/PointerDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/PointerDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/PoleDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/PoleDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/PoleDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/PoleDataContainerGadgetInit.asset index e3c29ca82c831f8244961f5a15eb3de5c966dedc..dbd7fdc0e535d15350b84d1fa0f00be546cab838 100644 --- a/Assets/ScriptableObjects/PoleDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/PoleDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 7 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 129538 + m_Bits: 391714 SecondaryLayerMask: serializedVersion: 2 m_Bits: 32769 diff --git a/Assets/ScriptableObjects/PoleDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/PoleDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/PoleDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/PoleDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/RemoverDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/RemoverDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/RemoverDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/RemoverDataContainerGadgetInit.asset index f400052df4867e3a91b01e28808ec1056789245a..67d8f1cdeae4f9a01c0f619ea91011912df7ec47 100644 --- a/Assets/ScriptableObjects/RemoverDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/RemoverDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 8 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 66067 + m_Bits: 328243 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/RemoverDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/RemoverDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/RemoverDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/RemoverDataContainerGadgetInit.asset.meta diff --git a/Assets/ScriptableObjects/TapeDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/TapeDataContainerGadgetInit.asset similarity index 97% rename from Assets/ScriptableObjects/TapeDataContainerGadgetInit.asset rename to Assets/ScriptableObjects/Gadgets/TapeDataContainerGadgetInit.asset index 06ef0892d1a99b81f55b2575a3e73d709632d699..92855818116d0ed98b9a227183c8b027f40cb5e1 100644 --- a/Assets/ScriptableObjects/TapeDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/Gadgets/TapeDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 2 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 129538 + m_Bits: 391714 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/ScriptableObjects/TapeDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/TapeDataContainerGadgetInit.asset.meta similarity index 100% rename from Assets/ScriptableObjects/TapeDataContainerGadgetInit.asset.meta rename to Assets/ScriptableObjects/Gadgets/TapeDataContainerGadgetInit.asset.meta diff --git a/Assets/Scripts/CheckServer.cs b/Assets/Scripts/CheckServer.cs index f203639dd6f028b53b4c7939e911f659cf31befd..f45baafa338ff38deb66db6eed75ea177f923579 100644 --- a/Assets/Scripts/CheckServer.cs +++ b/Assets/Scripts/CheckServer.cs @@ -76,8 +76,8 @@ IEnumerator waiter(String NetwAddress, int NA_id, double ics) else { StartCheck(NetwAddress, NA_id, ics); - //Wait for 0,5 seconds - yield return new WaitForSecondsRealtime(0.5f); + //Wait for 1,5 seconds + yield return new WaitForSecondsRealtime(1.5f); if (CommunicationEvents.IPcheckGeneration <= ics || (NA_id != 6))// && NA_id != 2)) { //if (CommunicationEvents.IPcheckGeneration < ics) { break; } @@ -89,22 +89,20 @@ IEnumerator waiter(String NetwAddress, int NA_id, double ics) { CommunicationEvents.ServerRunningA[NA_id] = 0; } - //Wait for 0,5 seconds - yield return new WaitForSecondsRealtime(0.5f); } else { + CommunicationEvents.IPcheckGeneration--; - CommunicationEvents.IPcheckGeneration--; - - if (NA_id == 2) - { - CommunicationEvents.ServerRunningA[NA_id] = 1; - //Wait for 0,5 seconds - yield return new WaitForSecondsRealtime(0.5f); - } - + if (NA_id == 2) + { + CommunicationEvents.ServerRunningA[NA_id] = 1; + } + } + + //Wait for 0,5 seconds + yield return new WaitForSecondsRealtime(0.5f); } } } diff --git a/Assets/Scripts/GenerateDemoFiles.cs b/Assets/Scripts/GenerateDemoFiles.cs index dec387e7efc4d6231ee15d642216ca248fe5dc06..7e2bdd0ee7cc91b6b26a464ac3fe04a0b3d35434 100644 --- a/Assets/Scripts/GenerateDemoFiles.cs +++ b/Assets/Scripts/GenerateDemoFiles.cs @@ -68,7 +68,7 @@ public static void GenerateTreeStage() // Save StageStatic.SetMode(StageStatic.Mode.Create); - StageStatic.stage.store(); + StageStatic.stage.store(false, true); } public static void GenerateRiverStage() @@ -116,11 +116,11 @@ public static void GenerateRiverStage() }; // Set Gadgets/ Scrolls - StageStatic.stage.AllowedGadgets = new() { new Pointer(), new Tape(), new AngleTool(), new LineTool(), new LotTool(), new Pendulum(), new Remover(), new EqualCircleGadget(), new TestMiddlePoint() }; - StageStatic.stage.AllowedScrolls = new() { "OppositeLen", "AngleSum", "Pythagoras", "CircleScroll", "CircleAreaScroll", "ConeVolumeScroll", "TruncatedConeVolumeScroll", "CylinderVolumeScroll", "MidPoint", "CircleLineAngleScroll", "CircleLineAngleToAngle", "SupplementaryAngles" }; + StageStatic.stage.AllowedGadgets = new() { new Pointer(), new Tape(), new AngleTool(), new LineTool(), new LotTool(), new Pendulum(), new Remover() }; //, new EqualCircleGadget(), new TestMiddlePoint() }; + StageStatic.stage.AllowedScrolls = new() { "OppositeLen" };//, "AngleSum", "Pythagoras", "CircleScroll", "CircleAreaScroll", "ConeVolumeScroll", "TruncatedConeVolumeScroll", "CylinderVolumeScroll", "MidPoint", "CircleLineAngleScroll", "CircleLineAngleToAngle", "SupplementaryAngles" }; // Save StageStatic.SetMode(StageStatic.Mode.Create); - StageStatic.stage.store(); + StageStatic.stage.store(false, true); } } diff --git a/Assets/Scripts/InteractionEngine/Character_Animations/TaskCharakterAnimation.cs b/Assets/Scripts/InteractionEngine/Character_Animations/TaskCharakterAnimation.cs index b56c56b0b022f587446ca4a19349de9ca9319a55..3bbff355a87cb6c30c781e3b32ce8ec808979305 100644 --- a/Assets/Scripts/InteractionEngine/Character_Animations/TaskCharakterAnimation.cs +++ b/Assets/Scripts/InteractionEngine/Character_Animations/TaskCharakterAnimation.cs @@ -6,7 +6,7 @@ public class TaskCharakterAnimation : MonoBehaviour { - public GameObject walkAroundObject; + public Vector3 startingPosition; public GameObject playerDefault; public float radiusAroundObject; @@ -49,6 +49,8 @@ void Start() anim = GetComponent<Animator>(); currentTransform = GetComponent<Transform>(); talkingZoneCapsule = gameObject.GetComponentInChildren<CapsuleCollider>(); + startingPosition = transform.position; + player = playerDefault; } @@ -155,7 +157,7 @@ void Update() //Calculate distance from tree, so that the TaskCharacter only walks in a specific radius around the tree //so that the player always knows where he is - currentDistance = (currentTransform.position - walkAroundObject.transform.position).magnitude; + currentDistance = (currentTransform.position - startingPosition).magnitude; //Turn on the radius-edges around the radiusAroundObject if (hitInvWall || currentDistance > radiusAroundObject) { @@ -164,7 +166,7 @@ void Update() int temp = Random.Range(0, 5); int positive = (int)Random.Range(0, 2); //Calculate NextRotation towards radiusAroundObject - nextRotation = Vector3.Angle(currentTransform.forward, (walkAroundObject.transform.position-currentTransform.position).normalized); + nextRotation = Vector3.Angle(currentTransform.forward, (startingPosition-currentTransform.position).normalized); if (positive == 0) nextRotation -= temp; diff --git a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs index 3d9bfd74f9c9214ae2de286698a8c00df93404eb..710cf70c7fcae49e4a0adfd9104bdf93dccaf72d 100644 --- a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs +++ b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs @@ -24,6 +24,7 @@ public static class CommunicationEvents public static UnityEvent<GameObject, string> ScrollFactHintEvent = new(); public static UnityEvent<Fact, FactObject.FactMaterials> AnimateExistingFactEvent = new(); + public static UnityEvent<Fact, FactObject.FactMaterials> AnimateExistingAsSolutionEvent = new(); public static UnityEvent<Fact> AnimateNonExistingFactEvent = new(); public static UnityEvent<List<string>> HintAvailableEvent = new(); diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs index 097eef5cee8d4b31a1e8ed51edc90e10d25439a1..b810524624a293cd5ff31d3600a1d53881ee24c1 100644 --- a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs +++ b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs @@ -72,6 +72,7 @@ public enum GadgetIDs /// <remarks>Set in Inspector or <see cref="Awake"/></remarks> public float MaxRange = float.NegativeInfinity; public float MaxHeight = float.NegativeInfinity; + private float NewMaxRange = float.NegativeInfinity; /// <summary>Which sprite to use</summary> public int ButtonIndx = -1; @@ -165,8 +166,7 @@ public void Awake() public void Enable() { GadgetBehaviour.Cursor.setLayerMask(~IgnoreLayerMask.value); - GadgetBehaviour.Cursor.MaxRange = MaxRange; - + _Update_Range(); ResetGadget(); _Enable(); } @@ -186,7 +186,8 @@ public void Update() UpdateLineDrawing(); _Update(); - } + +} public void Hit(RaycastHit[] hit) { @@ -250,5 +251,7 @@ public void ResetGadget() protected virtual void _ResetGadget() { } + protected virtual void _Update_Range() { NewMaxRange = MaxRange; GadgetBehaviour.Cursor.MaxRange = NewMaxRange; } + public class UndefinedGadget : Gadget { } } diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs index 9e3495458eaf6b8e9dc5f4df463d172cdfe01860..b2746c71c60476ce6ecd0d6187168b3ea75a37d4 100644 --- a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs +++ b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs @@ -54,4 +54,19 @@ protected override void _UpdateLineDrawing() { SetPosition(1, GadgetBehaviour.Cursor.transform.position); } + + + + protected override void _Update_Range() + { + float NewMaxRange = UIconfig.interactingRangeMode switch + { + UIconfig.InteractingRangeMode.fromObserverView => + UIconfig.cursorMaxRange_fromObeserverView, + UIconfig.InteractingRangeMode.fromCharacterView or _ => + MaxRange, + }; + GadgetBehaviour.Cursor.MaxRange = NewMaxRange; + Debug.Log("MaxRange :" + NewMaxRange); + } } \ No newline at end of file diff --git a/Assets/Scripts/InteractionEngine/ShinyThings.cs b/Assets/Scripts/InteractionEngine/ShinyThings.cs index 6266f018da1ddf6bcb1f8ed0af40001a128fee56..ed070155c08a647b3b04c8f60de8785ac03bd94f 100644 --- a/Assets/Scripts/InteractionEngine/ShinyThings.cs +++ b/Assets/Scripts/InteractionEngine/ShinyThings.cs @@ -28,10 +28,9 @@ public GameObject private void Awake() { CommunicationEvents.PushoutFactEvent.AddListener(HighlightFact); - CommunicationEvents.PushoutFactEvent.AddListener(HighlightWithFireworks); CommunicationEvents.AnimateExistingFactEvent.AddListener(HighlightFact); CommunicationEvents.PushoutFactFailEvent.AddListener(LetItRain); - //CommunicationEvents.AnimateExistingAsSolutionEvent.AddListener(HighlightWithFireworks); + CommunicationEvents.AnimateExistingAsSolutionEvent.AddListener(HighlightWithFireworks); rain = rain_wait = 0f.LerpInTime(0, 0, -1); // yield return break } diff --git a/Assets/Scripts/InteractionEngine/WorldCursor.cs b/Assets/Scripts/InteractionEngine/WorldCursor.cs index 0a2e1c9d4b55a6f6e03d5b4b14a84e70eb4fb5f2..069beae959f5c829208109bcd2803ebdc372d136 100644 --- a/Assets/Scripts/InteractionEngine/WorldCursor.cs +++ b/Assets/Scripts/InteractionEngine/WorldCursor.cs @@ -254,7 +254,7 @@ void Update() //Link to CheckMouseButtonHandler if (whichCheckMouseButton == 0) { CheckMouseButtons(); } if (whichCheckMouseButton == 1) { CheckMouseButtons1(); } - + } @@ -283,6 +283,8 @@ void updateMaxRange() MaxRange, }; + Debug.Log("WorldCursorMaxRange :" + MaxRange_); + } diff --git a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs new file mode 100644 index 0000000000000000000000000000000000000000..7517a9196e19da9be30c731b5f275a0f6479d5bb --- /dev/null +++ b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs @@ -0,0 +1,104 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +/// <summary> +/// This class handles displaying Fact tooltips, when hovering over a fact in the Gameworld +/// </summary> +public class WorldFactInteraction : MonoBehaviour +{ + [SerializeField] private LayerMask factLayerMask; + [SerializeField] private Transform HidingCanvas; + + private GameObject currentDisplay; + private Transform lastHit = null; + private bool canRun = false; + private void Update() + { + // disable this script if HidingCanvas does not render + canRun = HidingCanvas.GetComponent<Canvas>().enabled; + } + void LateUpdate() + { + if (!canRun) + return; + + if (currentDisplay != null && currentDisplay.GetComponent<DragHandling>().dragged) + { + // currently dragging -> remove transparency to indicate dragging and let DragHandling.cs take over + currentDisplay.GetComponent<CanvasGroup>().alpha = 1; + return; + } + + UpdateDisplay(); + } + + private void UpdateDisplay() + { + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + // if no fact was hit or pointer was over other UI + if (!Physics.Raycast(ray, out RaycastHit hit, Mathf.Infinity, factLayerMask) || WasOtherUIHit()) + { + // destroy currentDisplay if it exists + lastHit = null; + Destroy(currentDisplay); + return; + } + + FactObject factObj = hit.transform.gameObject.GetComponentInChildren<FactObject>(); + + if (factObj == null) + { + // should never happen, if the layerMask is set up correctly + Debug.LogError("WorldFactInteraction Raycast collided with object in factLayerMask, that did not contain a FactObject script: " + hit.transform.gameObject.name); + lastHit = null; + Destroy(currentDisplay); + return; + } + + if (hit.transform != lastHit) // a fact has been hit for the first time -> delete old display and instantiate new one + { + InstantiateNewDisplay(factObj); + } + + currentDisplay.transform.position = Input.mousePosition; // move currentDisplay to mousePosition + currentDisplay.GetComponent<CanvasGroup>().alpha = 0.5f; // ensure that image alpha is correct, since it could have changed due to dragging + + lastHit = hit.transform; + } + + private void InstantiateNewDisplay(FactObject factObj) + { + if (currentDisplay) + Destroy(currentDisplay); + Fact fact = StageStatic.stage.factState[factObj.URI]; + // TODO: this link to DisplayFacts is not ideal: maybe refactor to SciptableObject or such + currentDisplay = fact.instantiateDisplay(DisplayFacts.prefabDictionary[fact.GetType()], HidingCanvas); + } + + #region Helper + /// <summary> + /// Returns true if any UI other than currentDisplay was hit + /// </summary> + /// <returns></returns> + private bool WasOtherUIHit() + { + PointerEventData pointerData = new(EventSystem.current) + { + position = Input.mousePosition + }; + + List<RaycastResult> results = new(); + EventSystem.current.RaycastAll(pointerData, results); + + foreach (var res in results) + if (currentDisplay == null || !res.gameObject.transform.IsChildOf(currentDisplay.transform)) + return true; + + return false; + } + #endregion Helper +} + diff --git a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs.meta b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..b5cbae1444a1985f120072c25b62251c25df3ac2 --- /dev/null +++ b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fc18334af0ab5ac4c9487f0675dbd439 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/InventoryStuff/DisplayFacts.cs b/Assets/Scripts/InventoryStuff/DisplayFacts.cs index f8fbf04fde89851d153ce2012af9f25ef1da01fc..28febc41b265f5e6d86870faa9f7b6a419593e14 100644 --- a/Assets/Scripts/InventoryStuff/DisplayFacts.cs +++ b/Assets/Scripts/InventoryStuff/DisplayFacts.cs @@ -3,14 +3,21 @@ using TMPro; using System; using static CommunicationEvents; +using System.Linq; +using UnityEngine.UI; +using System.Collections; public class DisplayFacts : MonoBehaviour { - public Dictionary<Type, GameObject> prefabDictionary; + public static Dictionary<Type, GameObject> prefabDictionary; + public static Dictionary<string, GameObject> displayedFacts = new(); - public Dictionary<string, GameObject> displayedFacts = new(); + [SerializeField] private Transform factscreenContent; + [SerializeField] private GameObject factSpotPrefab; - public Transform factscreenContent; + private bool sortDescending = false; + private bool showGrouped = false; + private bool showOnlyFavorites = false; [Header("FactPrefabs")] public GameObject prefab_Point; @@ -31,23 +38,13 @@ public class DisplayFacts : MonoBehaviour public GameObject prefab_EqualFact; public GameObject prefab_UnEqualFact; - public GameObject prefab_TestFact; - - - - - public GameObject prefab_CircleFact; public GameObject prefab_OnCircleFact; public GameObject prefab_AngleCircleLineFact; - [Header("Visualisation")] - public int x_Start; - public int y_Start; - public int X_Pacece_Between_Items; - public int y_Pacece_Between_Items; - public int number_of_Column; + public GameObject prefab_TestFact; + #region UnityMethods //Start is called before the first frame update void Start() { @@ -73,45 +70,54 @@ void Start() {typeof(UnEqualCirclesFact), prefab_UnEqualFact }, {typeof(TestFact), prefab_TestFact }, - - - }; - var rect = GetComponent<RectTransform>(); - x_Start = (int)(rect.rect.x + X_Pacece_Between_Items * .5f); - y_Start = (int)(- y_Pacece_Between_Items * .5f); - number_of_Column = Mathf.Max(1, (int)(rect.rect.width / prefab_Point.GetComponent<RectTransform>().rect.width) - 1); - AddFactEvent.AddListener(AddFact); RemoveFactEvent.AddListener(RemoveFact); //AnimateExistingFactEvent.AddListener(AnimateFact); + FactFavorisation.ChangeFavoriteEvent.AddListener(OnFavoriteChange); } + #endregion UnityMethods + #region Implementation public void AddFact(Fact fact) { - Debug.Log("EYYYYY we are adding a fact: " + fact.Label); - var obj = CreateDisplay(transform, fact); - var rect = obj.GetComponent<RectTransform>(); - rect.anchorMin = new Vector2(0.5f, 1); - rect.anchorMax = new Vector2(0.5f, 1); - rect.localPosition = GetPosition(displayedFacts.Count); - displayedFacts.Add(fact.Id, obj); - AdjustFactscreenContentHeight(); + // index where the new display will be inserted + int siblingIdx = sortDescending ? 0 : factscreenContent.childCount; + if (showGrouped) + { + var facts = GetChildObjects(factscreenContent.transform).Select(c => c.GetComponentInChildren<FactWrapper>().fact).ToList(); + if (!sortDescending) + siblingIdx = GetIndexInSortedList(fact, facts); + else + { + facts.Reverse(); + var _siblingIdx = GetIndexInSortedList(fact, facts); + siblingIdx = factscreenContent.childCount - _siblingIdx; + } + } + + // create display + var display = CreateDisplay(transform, fact); + display.transform.localPosition = Vector3.zero; + displayedFacts.Add(fact.Id, display); + + // disable if showOnlyFavorites is true and fact is no favorite + display.transform.parent.gameObject.SetActive(!(showOnlyFavorites && !display.GetComponent<FactFavorisation>().IsFavorite)); + + display.transform.parent.transform.SetSiblingIndex(siblingIdx); } - public void RemoveFact(Fact fact) + private GameObject CreateDisplay(Transform transform, Fact fact) { - GameObject.Destroy(displayedFacts[fact.Id]); - displayedFacts.Remove(fact.Id); - UpdatePositions(); - AdjustFactscreenContentHeight(); + var spot = Instantiate(factSpotPrefab, factscreenContent); + return fact.instantiateDisplay(prefabDictionary[fact.GetType()], spot.transform); } - public void UpdatePositions() + public void RemoveFact(Fact fact) { - int i = 0; - foreach (var element in displayedFacts) - element.Value.GetComponent<RectTransform>().localPosition = GetPosition(i++); + // destroy factSpot (parent of displayed fact) and the fact display with it + Destroy(displayedFacts[fact.Id].transform.parent.gameObject); + displayedFacts.Remove(fact.Id); } public void AnimateFact(Fact fact) { @@ -119,20 +125,101 @@ public void AnimateFact(Fact fact) { factIcon.GetComponentInChildren<ImageHintAnimation>().AnimationTrigger(); } - private GameObject CreateDisplay(Transform transform, Fact fact) + #region Sorting + #region AscDesc + public void AscDescChanged(Toggle t) + { + sortDescending = !sortDescending; + + // revert current order + var children = GetChildObjects(factscreenContent.transform); + foreach (var child in children) + { + child.SetAsFirstSibling(); + } + } + #endregion AscDesc + + #region Grouping + public void GroupingChanged(Toggle t) + { + showGrouped = t.isOn; + + List<Transform> vals = GetChildObjects(factscreenContent.transform); + List<Transform> ordered = new(); + if (showGrouped) + { + var comparer = new FactTypeComparer(); + ordered = vals.OrderBy(tr => tr.GetComponentInChildren<FactWrapper>().fact, comparer).ToList(); + } + else + ordered = vals.OrderBy(tr => displayedFacts.Keys.ToList().IndexOf(tr.GetComponentInChildren<FactWrapper>().fact.Id)).ToList(); + + if (sortDescending) + ordered.Reverse(); + + for (int i = 0; i < ordered.Count; i++) + ordered[i].transform.SetSiblingIndex(i); + } + private int GetIndexInSortedList(Fact f, List<Fact> toCheck) { - return fact.instantiateDisplay(prefabDictionary[fact.GetType()], factscreenContent); + var index = toCheck.BinarySearch(f, new FactTypeComparer()); + if (index < 0) index = ~index; + return index; } - public Vector3 GetPosition(int i) + internal class FactTypeComparer : IComparer<Fact> { - return new Vector3(x_Start + (X_Pacece_Between_Items * (i % number_of_Column)), y_Start + (-y_Pacece_Between_Items * (i / number_of_Column)), 0f); + /// <summary> + /// Compare two facts by type and label + /// </summary> + /// <param name="x"></param> + /// <param name="y"></param> + /// <returns></returns> + public int Compare(Fact x, Fact y) + { + if (x.GetType() == y.GetType()) // same type: compare labels + return string.Compare(x.Label, y.Label); + else // different types: compare type + return string.Compare(x.GetType().ToString(), y.GetType().ToString()); + } + } + #endregion Grouping + #endregion Sorting + + #region Favorites + public void FavoritesFilterChanged(Toggle t) + { + showOnlyFavorites = t.isOn; + if (!showOnlyFavorites) // show all + displayedFacts.Values.ToList().ForEach(nFav => nFav.transform.parent.gameObject.SetActive(!showOnlyFavorites)); + else + { + // hide not favorites + var notFavorites = displayedFacts.Values.Where(go => !go.GetComponent<FactFavorisation>().IsFavorite).ToList(); + notFavorites.ForEach(nFav => nFav.transform.parent.gameObject.SetActive(false)); + } + } + + private void OnFavoriteChange(Fact changedFact, bool isFavourite) + { + if (!showOnlyFavorites) + return; + + var id = changedFact.Id; + if (displayedFacts.ContainsKey(id)) + displayedFacts[id].transform.parent.gameObject.SetActive(isFavourite); } + #endregion Favorites - private void AdjustFactscreenContentHeight() + #region Helper + private static List<Transform> GetChildObjects(Transform parent) { - var rect = factscreenContent.GetComponent<RectTransform>(); - var height = (float)(y_Pacece_Between_Items * Math.Ceiling(((float)displayedFacts.Count / number_of_Column))); - rect.sizeDelta = new Vector2(rect.sizeDelta.x, height); + List<Transform> children = new(); + foreach (Transform val in parent) + children.Add(val); + return children; } + #endregion Helper + #endregion Implementation } diff --git a/Assets/Scripts/InventoryStuff/DragHandling.cs b/Assets/Scripts/InventoryStuff/DragHandling.cs index 8b51c3751be844dceefc13090ebd7cdd47b7dab6..f3ab2cafd5094206254eb1de144db2919fea412f 100644 --- a/Assets/Scripts/InventoryStuff/DragHandling.cs +++ b/Assets/Scripts/InventoryStuff/DragHandling.cs @@ -5,7 +5,7 @@ public class DragHandling : MonoBehaviour, IDragHandler, IEndDragHandler { private Vector3 StartingPosition; private Transform StartingParent; - private bool dragged = false; + [HideInInspector] public bool dragged = false; public void OnDrag(PointerEventData eventData) { if (!dragged) @@ -15,11 +15,11 @@ public void OnDrag(PointerEventData eventData) GetComponent<CanvasGroup>().blocksRaycasts = false; dragged = true; } - transform.position = Input.mousePosition; - // display dragged object in front of all other ui transform.SetParent(GetComponentInParent<Canvas>().transform, false); transform.SetAsLastSibling(); + + transform.position = Input.mousePosition; } public void OnEndDrag(PointerEventData eventData) diff --git a/Assets/Scripts/InventoryStuff/DropHandling.cs b/Assets/Scripts/InventoryStuff/DropHandling.cs index e912243aa183b6682d4353fe2dfa49bb3482e737..d93622e69e9217a0f8e072dcd780d5a979100cc2 100644 --- a/Assets/Scripts/InventoryStuff/DropHandling.cs +++ b/Assets/Scripts/InventoryStuff/DropHandling.cs @@ -29,6 +29,7 @@ public void OnDrop(PointerEventData eventData) rect.anchorMax = new Vector2(0.5f, 0.5f); currentFact = eventData.pointerDrag.GetComponent<FactWrapper>().fact; + current.GetComponent<FactWrapper>().fact = currentFact; Debug.Log("recieved Fact: " + currentFact.Id); CommunicationEvents.NewAssignmentEvent.Invoke(); diff --git a/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs new file mode 100644 index 0000000000000000000000000000000000000000..adc378141e3fe9aa1efbe63689dae4619f7aa2ae --- /dev/null +++ b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent(typeof(CanvasGroup))] +public class ToggleFactscreen : MonoBehaviour +{ + CanvasGroup cg; + void Start() + { + cg = transform.GetComponent<CanvasGroup>(); + } + + public void ToggleActive(Toggle t) + { + bool isActive = t.isOn; + cg.alpha = isActive ? 1 : 0; + cg.interactable = isActive; + cg.blocksRaycasts = isActive; + } +} diff --git a/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs.meta b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..41651de65487b0135dffbcebd4ffa76635faf4dd --- /dev/null +++ b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 686d83dd60fa23f4d8b9610c69b02992 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/InventoryStuff/ToggleRotateImage.cs b/Assets/Scripts/InventoryStuff/ToggleRotateImage.cs new file mode 100644 index 0000000000000000000000000000000000000000..84a91bdd19ec5b2bb3ca82f63cbef986d78c1c88 --- /dev/null +++ b/Assets/Scripts/InventoryStuff/ToggleRotateImage.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using UnityEngine.UI; + +//[ExecuteInEditMode] +public class ToggleRotateImage : MonoBehaviour { + [SerializeField] Transform targetGraphic; + + Toggle _toggle; + Toggle toggle + { + get { return _toggle ?? (_toggle = GetComponent<Toggle>()); } + } + + void Awake() + { + toggle.onValueChanged.AddListener(OnTargetToggleValueChanged); + } + + void OnTargetToggleValueChanged(bool on) + { + targetGraphic.rotation = on ? Quaternion.Euler(0, 0, 180) : Quaternion.identity; + } +} \ No newline at end of file diff --git a/Assets/Scripts/InventoryStuff/ToggleRotateImage.cs.meta b/Assets/Scripts/InventoryStuff/ToggleRotateImage.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..a0a4a44a05a1eb375ffec85a2db02bdb2875930f --- /dev/null +++ b/Assets/Scripts/InventoryStuff/ToggleRotateImage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7206e8172594200478e26a3e33882072 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Loading/Stage.cs b/Assets/Scripts/Loading/Stage.cs index 76713274249490dafb15fcc19373ae5064ae4b2c..7ddb020319a021bdf1b4443cd063e465172f957a 100644 --- a/Assets/Scripts/Loading/Stage.cs +++ b/Assets/Scripts/Loading/Stage.cs @@ -438,7 +438,7 @@ public bool CheckSolved() { foreach (var hitlist in hits) foreach (var hit in hitlist) - AnimateExistingFactEvent.Invoke(factState[hit], FactObject.FactMaterials.Solution); + AnimateExistingAsSolutionEvent.Invoke(factState[hit], FactObject.FactMaterials.Solution); player_record.solved = true; push_record(time_s); diff --git a/Assets/Scripts/Loading/StreamingAssetLoader.cs b/Assets/Scripts/Loading/StreamingAssetLoader.cs index f733a2da261e88ffd4b38249a443cabedb4d8a32..209ba364dee8c866f1550507255a4fbda9aed2c8 100644 --- a/Assets/Scripts/Loading/StreamingAssetLoader.cs +++ b/Assets/Scripts/Loading/StreamingAssetLoader.cs @@ -27,6 +27,61 @@ public static class StreamingAssetLoader public static string ConfigDir = "Config"; public static string ConfigFile_Network = "Network.JSON"; + //For Android, Everything in StreamingAssets must be registered! + public static string StreamToPersistentDataPath_FILE_1 = "scrolls.json"; + public static string Stage_Folder = "Stages"; + public static string Stage_1 = "TechDemo A.JSON"; + public static string Stage_2 = "TechDemo B.JSON"; + + public static void ResetPlayerConfig() + { + string sourcePath = Path.Combine(Application.streamingAssetsPath, StreamToPersistentDataPath_Folder, ConfigDir); + string targetFolder = Application.persistentDataPath; + + RereadFileWithUnityWebRequest(sourcePath, ConfigDir, ConfigFile_Network, targetFolder); + NetworkJSON_Load(); + } + + public static bool ReloadManualy_StreamToPers() + { + ResetPlayerConfig(); + string sourcePath = Path.Combine(Application.streamingAssetsPath, StreamToPersistentDataPath_Folder); + string targetFolder = Application.persistentDataPath; + RereadFileWithUnityWebRequest(sourcePath, "", StreamToPersistentDataPath_Folder_Cookie, targetFolder); + RereadFileWithUnityWebRequest(sourcePath, "", StreamToPersistentDataPath_FILE_1, targetFolder); + NetworkJSON_Load(); + //Debug.Log("Reloaded_PP"); + return true; + } + public static bool ReloadManualy_StreamToDataPath() + { + string sourcePath = Path.Combine(Application.streamingAssetsPath, StreamToDataPath_Folder); + string targetFolder = Application.dataPath; + RereadFileWithUnityWebRequest(sourcePath, "", StreamToDataPath_Folder_Cookie, targetFolder); + + NetworkJSON_Load(); + //Debug.Log("Reloaded_DP"); + return true; + } + public static bool ReloadManualy_StreamToDataPathWithHandler(string TargetDir_1) + { + string sourcePath = Path.Combine(Application.streamingAssetsPath, StreamToDataPath_withHandler_Folder); + string targetFolder_dpwh = TargetDir_1 ; + //Debug.Log(targetFolder_dpwh); + + string sourcePath2 = Path.Combine(Application.streamingAssetsPath, StreamToDataPath_withHandler_Folder, Stage_Folder); + RereadFileWithUnityWebRequest(sourcePath2, Stage_Folder, Stage_1, targetFolder_dpwh); + RereadFileWithUnityWebRequest(sourcePath2, Stage_Folder, Stage_2, targetFolder_dpwh); + + NetworkJSON_Load(); + //Debug.Log("Reloaded_DPwH"); + return true; + } + //--------------------------------------------------------------------------------------- + + + + //public static ID_toPath toPath = ID_toPath.DataPath; public enum ID_toPath { @@ -78,6 +133,7 @@ public static void NetworkJSON_Save() myObject.TouchMode = UIconfig.touchControlMode; myObject.TAvisibility = UIconfig.TAvisibility; myObject.autoOSrecognition = CommunicationEvents.autoOSrecognition; + myObject.autoSettingsAdaption = UIconfig.autoSettingsAdaption; myObject.Opsys = CommunicationEvents.Opsys.ToString(); myObject.FrameITUIversion = UIconfig.FrameITUIversion; myObject.InputManagerVersion = UIconfig.InputManagerVersion; @@ -155,63 +211,74 @@ public static void deleteADirectoryAndSubDir(string path) } } } - public static void ResetPlayerConfig() - { - string sourcePath = Path.Combine(Application.streamingAssetsPath, StreamToPersistentDataPath_Folder, ConfigDir); - string targetFolder = Application.persistentDataPath; - RereadFileWithUnityWebRequest(sourcePath, ConfigDir, ConfigFile_Network, targetFolder); - NetworkJSON_Load(); - } public static void RereadFiles_PersistentDataPath() { - Debug.Log("Reread_PersistentDataPath"); + + //Debug.Log("Reread_PersistentDataPath"); //RereadFileUWR(StreamingAssetLoader.file_1_path, StreamingAssetLoader.file_1, ID_toPath.PersistentDataPath); //---- string rootPath = Path.Combine(Application.streamingAssetsPath, StreamToPersistentDataPath_Folder); string targetFolder = Application.persistentDataPath; - ReReadFiles(rootPath, targetFolder); - - - + if(!ReReadFiles(rootPath, targetFolder)){ + ReloadManualy_StreamToPers(); + } } public static void RereadFiles_DataPath() { - Debug.Log("Reread_DataPath"); + //Debug.Log("Reread_DataPath"); string rootPath = Path.Combine(Application.streamingAssetsPath, StreamToDataPath_Folder); string targetFolder = Application.dataPath; - ReReadFiles(rootPath, targetFolder); + RereadFiles_DataPath_withHandler(); + if (!ReReadFiles(rootPath, targetFolder)) + { + ReloadManualy_StreamToDataPath(); + } + } public static void RereadFiles_DataPath_withHandler() { string rootPath = Path.Combine(Application.streamingAssetsPath, StreamToDataPath_withHandler_Folder); - string targetFolder = Application.dataPath; + string targetFolder_wh = Application.dataPath; + + //Debug.Log(CommunicationEvents.Opsys); if (CommunicationEvents.Opsys == OperationSystem.Android) { - targetFolder = Application.persistentDataPath; + targetFolder_wh = Application.persistentDataPath; + //Debug.Log(OperationSystem.Android + " " + targetFolder_wh); } - ReReadFiles(rootPath, targetFolder); + if (!ReReadFiles(rootPath, targetFolder_wh)) + { + //Debug.Log( " 2 " + targetFolder_wh); + ReloadManualy_StreamToDataPathWithHandler(targetFolder_wh); + } } - public static void ReReadFiles(string rootPath, string targetFolder)//ID_toPath PathHandler) + public static bool ReReadFiles(string rootPath, string targetFolder)//ID_toPath PathHandler) { - if (!Directory.Exists(rootPath)) { return ; } + if (!Directory.Exists(rootPath)) { Debug.Log("no Dir: " + rootPath); return false ; } //---- + //Debug.Log("Loading Dir"); string dir = ""; DirectoryInfo dirInfo = new DirectoryInfo(@rootPath); FileInfo[] Files = dirInfo.GetFiles("*"); foreach (FileInfo file in Files) { if (file.Name.Contains(".meta")) { continue; }; - RereadFileWithUnityWebRequest(rootPath, dir, file.Name, targetFolder); + if (!RereadFileWithUnityWebRequest(rootPath, dir, file.Name, targetFolder)) + { + return false; + + } } //---- + //Debug.Log("Saving Dir"); string[] dirs = Directory.GetDirectories(rootPath, "*", SearchOption.AllDirectories); foreach (string dir_fullpath in dirs) { @@ -225,18 +292,32 @@ public static void ReReadFiles(string rootPath, string targetFolder)//ID_toPath foreach (FileInfo file in Files) { if (file.Name.Contains(".meta")) { continue; }; - RereadFileWithUnityWebRequest(dir_fullpath, dir, file.Name, targetFolder); + if(!RereadFileWithUnityWebRequest(dir_fullpath, dir, file.Name, targetFolder)){ + return false; + } } } + + //Debug.Log("Dir Reloaded"); + return true; } + public static void NetworkJSON_Load() + { + NetworkJSON_Load_x(Application.persistentDataPath); + } + public static void NetworkJSON_Load_0() + { + var x = Path.Combine(Application.streamingAssetsPath, StreamToPersistentDataPath_Folder); + NetworkJSON_Load_x(x); + } - public static void NetworkJSON_Load() + public static void NetworkJSON_Load_x(string path) { - var reader = new StreamReader(Path.Combine(Application.persistentDataPath, ConfigDir, ConfigFile_Network)); + var reader = new StreamReader(Path.Combine(path, ConfigDir, ConfigFile_Network)); string json = reader.ReadToEnd(); reader.Close(); @@ -288,6 +369,10 @@ public static void NetworkJSON_Load() } else { CommunicationEvents.autoOSrecognition = myObjs.autoOSrecognition; } + if (string.IsNullOrEmpty(myObjsOnlyStrings.autoOSrecognition)){ + } else { + UIconfig.autoSettingsAdaption = myObjs.autoSettingsAdaption; + } if (string.IsNullOrEmpty(myObjsOnlyStrings.Opsys)) { } else { CommunicationEvents.Opsys = (OperationSystem)Enum.Parse(typeof(OperationSystem), myObjs.Opsys); @@ -361,11 +446,11 @@ public static void RereadFileUWR(string pathfolders, string fileName, ID_toPath } } - public static void RereadFileWithUnityWebRequest(string sourcePath1, string pathfolders, string fileName, string targetpath) + public static bool RereadFileWithUnityWebRequest(string sourcePath1, string pathfolders, string fileName, string targetpath) { - if (fileName == "") { Debug.Log("no File"); return; } + if (fileName == "") { Debug.Log("no File"); return false; } string destpathf = pathfolders; string destname = fileName; @@ -383,14 +468,15 @@ public static void RereadFileWithUnityWebRequest(string sourcePath1, string path } if (loadingRequest.result == UnityWebRequest.Result.ConnectionError || loadingRequest.result == UnityWebRequest.Result.ProtocolError) { - Debug.Log("ConnectionError"); + Debug.Log("ConnectionError" + sourcePath); + return false; } else { - - + + string destinationPath = Path.Combine(targetpath, destpathf); - + //Debug.Log("ss" + destinationPath + "," + Application.persistentDataPath + "," + Application.dataPath + "," + destpathf + " , " + destname); SafeCreateDirectory(destinationPath); @@ -400,6 +486,7 @@ public static void RereadFileWithUnityWebRequest(string sourcePath1, string path //Debug.Log("ss" + destinationPath); } + return true; } //Path.Combine() but without the Path.IsPathRooted() @@ -432,14 +519,7 @@ public static string CombineTwoPaths(string path1, string path2) /* public static string RereadFileNA(string pathfolders, string fileName, string destpathf, string destname) { - if (fileName == "") - { - return "noName"; - } - - - - + if (fileName == ""){return "noName"; } // copies and unpacks file from apk to persistentDataPath where it can be accessed string destinationPath = Path.Combine(Application.persistentDataPath, destpathf); @@ -447,11 +527,8 @@ public static string RereadFileNA(string pathfolders, string fileName, string de { Directory.CreateDirectory(destinationPath); } - - destinationPath = Path.Combine(destinationPath, destname); - string sourcePath = Path.Combine(Application.streamingAssetsPath, pathfolders); sourcePath = Path.Combine(sourcePath, fileName); @@ -465,9 +542,6 @@ public static string RereadFileNA(string pathfolders, string fileName, string de //UnityEngine.Debug.Log(string.Format("{0}-{1}-{2}-{3}", sourcePath, File.GetLastWriteTimeUtc(sourcePath), File.GetLastWriteTimeUtc(destinationPath))); - - - //copy whatsoever //if DB does not exist in persistent data folder (folder "Documents" on iOS) or source DB is newer then copy it @@ -506,10 +580,9 @@ public static string RereadFileNA(string pathfolders, string fileName, string de StreamReader reader = new StreamReader(destinationPath); var jsonString = reader.ReadToEnd(); - reader.Close(); - + reader.Close(); - return jsonString; + return jsonString; } */ diff --git a/Assets/Scripts/MeshGenerator/ShapeGenerator.cs b/Assets/Scripts/MeshGenerator/ShapeGenerator.cs index 7bcddfc85be4f0d415d98016f6bc46114129cb28..1753f61f28f7cb6ea482b244b4a6d2f72894e0eb 100644 --- a/Assets/Scripts/MeshGenerator/ShapeGenerator.cs +++ b/Assets/Scripts/MeshGenerator/ShapeGenerator.cs @@ -6,7 +6,13 @@ public abstract class ShapeGenerator : MonoBehaviour #region UnityMethods void Start() => GenerateShape(); - void OnValidate() => GenerateShape(); + #if UNITY_EDITOR + void OnValidate() + { + // prevent 'SendMessage cannot be called during Awake, CheckConsistency, or OnValidate' warning + UnityEditor.EditorApplication.delayCall += GenerateShape; + } + #endif #endregion UnityMethods protected abstract void GenerateShape(); diff --git a/Assets/Scripts/StageStatic.cs b/Assets/Scripts/StageStatic.cs index f0bdcbadb614d25d5a175a74dca2f37b414f3e93..1563560c7d249cf4d4591553a442607a17783294 100644 --- a/Assets/Scripts/StageStatic.cs +++ b/Assets/Scripts/StageStatic.cs @@ -195,10 +195,11 @@ public StageErrorStruct(bool category, bool id, bool name, bool description, boo public static void SetMode(Mode mode, GameObject gameObject = null) { //gameObject ??= new GameObject(); + StageStatic.mode = mode; // handle StageStatic.mode - if(gameObject != null) { - switch (StageStatic.mode = mode) + if (gameObject != null) { + switch (mode) { case Mode.Play: gameObject.SetActiveByTagRecursive("CreatorMode", false); diff --git a/Assets/Scripts/UI/FactExplorer.meta b/Assets/Scripts/UI/FactExplorer.meta new file mode 100644 index 0000000000000000000000000000000000000000..75174aa3fe688475a6cbf96362bd613f0bf567d2 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86b7e84f19731b844a24c97e89fdc5d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/FactExplorer/FactExplorer.cs b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs new file mode 100644 index 0000000000000000000000000000000000000000..b956c23c999a30d2fc8642cf2dd875e3ef127233 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs @@ -0,0 +1,168 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Reflection; +using UnityEngine; +using System.Linq; +using UnityEngine.UI; + +public class FactExplorer : MonoBehaviour +{ + #region InspectorVariables + [Header("PrefabComponents")] + [SerializeField] private Transform factParentsUI; + [SerializeField] private Transform mainFactUI; + [SerializeField] private Transform factChildrenUI; + [SerializeField] private Transform linesUI; + + [Header("Prefabs")] + [SerializeField] private GameObject factSpotPrefab; + [SerializeField] private GameObject parentLine; + [SerializeField] private GameObject childLine; + #endregion InspectorVariables + + #region Variables + private Fact mainFact; + private List<Fact> parentFacts; + private List<Fact> childFacts; + #endregion Variables + + #region UnityMethods + private void Update() + { + DestroyIfClickedOutside(); + } + + public void Initialize(Fact fact, Vector3 factPosition) + { + mainFact = fact; + parentFacts = GetParentFacts(); + childFacts = GetChildFacts(); + + //Debug.Log($"Parents of {mainFact.Label}: {string.Join(", ", parentFacts.Select(cf => cf.Label))}"); + //Debug.Log($"Children of {mainFact.Label}: {string.Join(", ", childFacts.Select(cf => cf.Label))}"); + + UpdateFactExplorerUI(); + + MoveToPreferredPosition(factPosition); + } + #endregion UnityMethods + + #region Implementation + private List<Fact> GetParentFacts() + { + _ = StageStatic.stage.factState.safe_dependencies(mainFact.Id, out var parentFactIds); + return parentFactIds.Distinct().Select(factId => StageStatic.stage.factState[factId]).Where(f => f != mainFact).ToList(); + } + + private List<Fact> GetChildFacts() + { + return mainFact.getDependentFactIds().Distinct().Select(factId => StageStatic.stage.factState[factId]).ToList(); + } + + private void UpdateFactExplorerUI() + { + SpawnUIFacts(factParentsUI, parentFacts); + SpawnUIFacts(mainFactUI, new List<Fact>() { mainFact }); + SpawnUIFacts(factChildrenUI, childFacts); + + // Force rebuild of FactExplorer layout, since the positions of the factObjects will be wrong otherwise + LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>()); + + SpawnParentLines(factParentsUI.gameObject, mainFactUI); + SpawnChildLines(factChildrenUI.gameObject, mainFactUI); + } + + private void DestroyIfClickedOutside() + { + // Destroy on tab press or left click outside of FactExplorer + if (Input.GetKeyDown(KeyCode.Tab) + || (Input.GetMouseButtonDown(0) && !RectTransformUtility.RectangleContainsScreenPoint(transform.GetComponent<RectTransform>(), Input.mousePosition, null))) + { + Destroy(gameObject); + } + } + + private void MoveToPreferredPosition(Vector3 prefPos) + { + LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>()); + // calculate optimal position + var deltaPos = mainFactUI.position - prefPos; + transform.position -= deltaPos; + + // clamp position, so that no parts of the FactExplorer are out of screen + RectTransform rect = GetComponent<RectTransform>(); + RectTransform canvasRect = GetComponentInParent<Canvas>().transform.GetComponent<RectTransform>(); + + var sizeDelta = canvasRect.sizeDelta - rect.sizeDelta; + var panelPivot = rect.pivot; + var position = rect.anchoredPosition; + position.x = Mathf.Clamp(position.x, -sizeDelta.x * panelPivot.x, sizeDelta.x * (1 - panelPivot.x)); + position.y = Mathf.Clamp(position.y, -sizeDelta.y * panelPivot.y, sizeDelta.y * (1 - panelPivot.y)); + rect.anchoredPosition = position; + } + #endregion Implementation + + #region Spawner + private void SpawnUIFacts(Transform uiParent, List<Fact> toSpawn) + { + // if uiParent has no children: deactivate it + if (toSpawn.Count == 0) + uiParent.gameObject.SetActive(false); + + foreach (Fact f in toSpawn) + { + var spot = Instantiate(factSpotPrefab, uiParent); + + // TODO: this link to DisplayFacts is not ideal: maybe refactor to SciptableObject or such + var display = f.instantiateDisplay(DisplayFacts.prefabDictionary[f.GetType()], spot.transform); + display.transform.localPosition = Vector3.zero; + } + } + + private void SpawnParentLines(GameObject parent, Transform mainFactUI) + { + var mainTransform = mainFactUI.GetComponent<RectTransform>(); + var factWidth = mainTransform.rect.width; + // transform.positions are weird due to LayoutGroups => manually calculate offset + float xOffset = -factParentsUI.GetComponent<RectTransform>().rect.width / 2 + factWidth / 2; + float yOffset = transform.GetComponent<VerticalLayoutGroup>().spacing; + parent.ForAllChildren(par => + { + // position at the bottom center of par rect + var position = par.transform.TransformPoint(new Vector2(0, par.GetComponent<RectTransform>().rect.yMin)); + var line = Instantiate(parentLine, position, Quaternion.identity, par.transform); + + var uiLine = line.GetComponent<UILine>(); + uiLine.points = new List<Vector2>() { Vector2.zero, new Vector2(-xOffset, -yOffset) }; + + xOffset += factWidth + factParentsUI.GetComponent<HorizontalLayoutGroup>().spacing; + }); + } + + private void SpawnChildLines(GameObject parent, Transform mainFactUI) + { + var mainTransform = mainFactUI.GetComponent<RectTransform>(); + var factWidth = mainTransform.rect.width; + // transform.positions are weird due to LayoutGroups => manually calculate offset + float xOffset = -factChildrenUI.GetComponent<RectTransform>().rect.width / 2 + factWidth / 2; + float yOffset = -transform.GetComponent<VerticalLayoutGroup>().spacing; + parent.ForAllChildren(par => + { + // position at the top center of par rect + var position = par.transform.TransformPoint(new Vector2(0, par.GetComponent<RectTransform>().rect.yMax)); + var line = Instantiate(childLine, position, Quaternion.identity, par.transform); + + var uiLine = line.GetComponent<UILine>(); + uiLine.points = new List<Vector2>() { + Vector2.zero, + new Vector2(0, -yOffset/2), + new Vector2(-xOffset, -yOffset/2), + new Vector2(-xOffset, -yOffset) + }; + + xOffset += factWidth + factChildrenUI.GetComponent<HorizontalLayoutGroup>().spacing; + }); + } + #endregion Spawner +} diff --git a/Assets/Scripts/UI/FactExplorer/FactExplorer.cs.meta b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..4a30c208e64932be3254a5149f1ca69cc70eaccf --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 795998cb72dae4043beaf3c3bb6b1b16 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs b/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs new file mode 100644 index 0000000000000000000000000000000000000000..662cf3bf27ad631fdbf3b5bb010d0dc95b2d8091 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs @@ -0,0 +1,120 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.EventSystems; + +[RequireComponent(typeof(FactWrapper), typeof(RectTransform))] +public class FactFavorisation : MonoBehaviour, IPointerClickHandler +{ + #region InspectorVariables + [Header("Prefabs")] + [SerializeField] private GameObject favoriteDisplayPrefab; + #endregion InspectorVariables + + #region Static Variables + public static readonly UnityEvent<Fact, bool> ChangeFavoriteEvent = new(); + private static readonly List<Fact> favorites = new(); + #endregion Static Variables + + #region Variables + private GameObject favoriteDisplay; + private Fact fact; + private const float COOLDOWN_DURATION = 0.15f; // cooldown of the double touch + private bool touchOnCooldown = false; + #endregion Variables + + #region Properties + private bool isFavorite = false; + public bool IsFavorite + { + get { return isFavorite; } + set { ChangeFavoriteEvent.Invoke(fact, value); } + } + #endregion Properties + + #region UnityMethods + public void OnPointerClick(PointerEventData eventData) + { + if (eventData.button == PointerEventData.InputButton.Middle) + { + ToggleFavorite(); + } + } + + private void Update() + { + if (!touchOnCooldown) + HandleTouches(); + } + + private void Start() + { + fact = transform.GetComponent<FactWrapper>().fact; + ChangeFavoriteEvent.AddListener(OnFavoriteChange); + + // if there already was a favoriteDisplayPrefab child (e.g. due to cloning) remove it + gameObject.ForAllChildren(child => { + if (child.name.StartsWith(favoriteDisplayPrefab.name)) + Destroy(child); + }); + // instantiate new favoriteDisplay + favoriteDisplay = Instantiate(favoriteDisplayPrefab, transform); + + // check if fact is currenty a favorite + isFavorite = favorites.Contains(fact); + + UpdateDisplay(); + } + #endregion UnityMethods + + #region TouchControls + private void HandleTouches() + { + if (Input.touchCount != 1) + return; + + var touch = Input.touches[0]; + if (RectTransformUtility.RectangleContainsScreenPoint(transform.GetComponent<RectTransform>(), touch.position) && touch.tapCount == 2) + { + StartCoroutine(Cooldown()); + ToggleFavorite(); + } + } + + private IEnumerator Cooldown() + { + touchOnCooldown = true; + yield return new WaitForSeconds(COOLDOWN_DURATION); + touchOnCooldown = false; + } + #endregion TouchControls + + #region Implementation + private void OnFavoriteChange(Fact changedFact, bool isFavorite) + { + if (fact == changedFact) + { + this.isFavorite = isFavorite; + UpdateDisplay(); + } + } + + private void UpdateDisplay() + { + favoriteDisplay.SetActive(isFavorite); + } + + private void ToggleFavorite() + { + // write to property to invoke event + IsFavorite = !IsFavorite; + + // update favorites list + if (isFavorite) + favorites.Add(fact); + else + favorites.Remove(fact); + } + #endregion Implementation +} diff --git a/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs.meta b/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..a0d2b6f51ce6e11c9d870d6b32ca29274cc12795 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 88f8f222eb0a4a246908bde097a8726e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0, + type: 3} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs new file mode 100644 index 0000000000000000000000000000000000000000..95dc49730f2bc00a8fb25947179b33c8f66b3a46 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +[RequireComponent(typeof(FactWrapper), typeof(RectTransform), typeof(DragHandling))] +public class OpenFactExplorer : MonoBehaviour, IPointerClickHandler +{ + #region Variables + public GameObject factExplorerPrefab; + + private static Transform factExplorer; + private float pressTime = 0f; + private const float LONG_PRESS_DURATION = 0.5f; + #endregion Variables + + #region UnityMethods + public void OnPointerClick(PointerEventData eventData) + { + // open FactExplorer on right click on PC + if (eventData.button == PointerEventData.InputButton.Right) + { + DoOpenFactExplorer(); + } + } + + private void Update() + { + // open FactExplorer on press on fact longer than LONG_PRESS_DURATION + HandleTouches(); + } + #endregion UnityMethods + + #region Implementation + private void HandleTouches() + { + if (Input.touchCount != 1 || transform.GetComponent<DragHandling>().dragged) + { + pressTime = 0; + return; + } + + var touch = Input.GetTouch(0); + if (!RectTransformUtility.RectangleContainsScreenPoint(transform.GetComponent<RectTransform>(), touch.position)) + { + pressTime = 0; + return; + } + + switch (touch.phase) + { + case TouchPhase.Moved: + case TouchPhase.Began: + case TouchPhase.Ended: + case TouchPhase.Canceled: + pressTime = 0; + break; + + case TouchPhase.Stationary: + pressTime += Time.deltaTime; + if (pressTime >= LONG_PRESS_DURATION) + DoOpenFactExplorer(); + break; + } + } + + private void DoOpenFactExplorer() + { + Destroy(factExplorer != null ? factExplorer.gameObject : null); + + var parent = transform.GetComponentInParent<Canvas>().transform; + var fact = transform.GetComponent<FactWrapper>().fact; + + factExplorer = Instantiate(factExplorerPrefab.transform, Input.mousePosition, Quaternion.identity, parent); + factExplorer.GetComponent<FactExplorer>().Initialize(fact, transform.position); + } + #endregion Implementation +} + diff --git a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..13ca88bea8432cb0ffe675fa8ebea6a4e710fe6a --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a1ed516d861fa2c45a2b1767d1217acb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/FactExplorer/UILine.cs b/Assets/Scripts/UI/FactExplorer/UILine.cs new file mode 100644 index 0000000000000000000000000000000000000000..b8c56f425ee7f92303d7a952a78280af87184581 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/UILine.cs @@ -0,0 +1,190 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using System.Linq; + +public class UILine : Graphic +{ + #region InspectorVariables + [Header("General")] + public List<Vector2> points = new(); + public float width = 5f; + + [Header("Rounding")] + public bool roundCorners = true; + public bool roundStart = false; + public bool roundEnd = false; + + [Header("Dashed")] + public bool dashed = false; + public int dashLength = 10; + public int dashSpacing = 5; + #endregion InspectorVariables + + #region UnityMethods + protected override void OnPopulateMesh(VertexHelper vh) + { + // clear old vertecies and triangles + vh.Clear(); + + // a line with less than 2 points does not make any sense => return + if (points.Count < 2) + return; + + if (dashed) + GenerateLinesDashed(vh); + else + GenerateLinesStandard(vh); + + if (roundStart) + CreateCircle(vh, points[0], width); + + if (roundEnd) + CreateCircle(vh, points[^1], width); + } + #endregion UnityMethods + + #region Implementation + + #region GenerateLines + private void GenerateLinesStandard(VertexHelper vh) + { + points.Zip(points.Skip(1), (a, b) => Tuple.Create(a, b)) + .ToList() + .ForEach(tup => CreateSegment(vh, tup.Item1, tup.Item2)); + + if (roundCorners) + { + // take all points except for start and end and apply rounding + points.Take(points.Count - 1).Skip(1).ToList() + .ForEach(p => CreateCircle(vh, p, width)); + } + } + + private void GenerateLinesDashed(VertexHelper vh) + { + float restLen = dashLength; + bool isDash = true; + var lines = points.Zip(points.Skip(1), (a, b) => Tuple.Create(a, b)).ToList(); + for (int i = 0; i < lines.Count; i++) + { + var tup = lines[i]; + Vector2 start = tup.Item1; + Vector2 end = tup.Item2; + Vector2 dir = (end - start).normalized; + + // main spacing algorithm + Vector2 current = start; + while (Vector2.Distance(current, end) >= restLen) + { + Vector2 segmentEnd = current + restLen * dir; + if (isDash) + CreateSegment(vh, current, segmentEnd); + current = segmentEnd; + isDash = !isDash; + restLen = isDash ? dashLength : dashSpacing; + } + + // is there a dash wrapping around a corner? + bool dashOverCorner = false; + + + float distLeft = Vector2.Distance(current, end); + if (!isDash) + restLen -= distLeft; + // dont fill remaining distance with dash, if it would be short (shorter than width/2) + else if (isDash && distLeft > width/2) + { + CreateSegment(vh, current, end); + restLen -= distLeft; + dashOverCorner = true; + } + + // discard rest of dash if it is too short (shorter than width/2) + if (isDash && restLen < width/2) + { + isDash = false; + restLen = dashSpacing; + dashOverCorner = false; // dash does not wrap around corner as dashSpacing will follow + } + + // only create round corners if roundCorners are enabled and there is a dash wrapping around the corner and not last corner (aka end) + if (roundCorners && dashOverCorner && i != lines.Count-1) + CreateCircle(vh, end, width); + } + } + #endregion GenerateLines + + #region CreateLine + private void CreateSegment(VertexHelper vh, Vector2 start, Vector2 end) + { + //start += (Vector2)transform.position; + //end += (Vector2)transform.position; + + UIVertex vertex = UIVertex.simpleVert; + vertex.color = color; + + Vector2 dir = end - start; + Vector2 perp = Vector2.Perpendicular(dir).normalized; + Vector2 off = perp * width / 2; + + vertex.position = new Vector3(start.x + off.x, start.y + off.y); + vh.AddVert(vertex); + vertex.position = new Vector3(end.x + off.x, end.y + off.y); + vh.AddVert(vertex); + vertex.position = new Vector3(end.x - off.x, end.y - off.y); + vh.AddVert(vertex); + vertex.position = new Vector3(start.x - off.x, start.y - off.y); + vh.AddVert(vertex); + + int offset = vh.currentVertCount - 4; + vh.AddTriangle(0 + offset, 1 + offset, 2 + offset); + vh.AddTriangle(2 + offset, 3 + offset, 0 + offset); + } + #endregion CreateLine + + #region Rounding + private void CreateCircle(VertexHelper vh, Vector2 center, float diameter, int sideCount = 20) + { + //center += (Vector2)transform.position; + + UIVertex vertex = UIVertex.simpleVert; + vertex.color = color; + + Vector3[] vertices = GetCirclePoints(diameter/2, sideCount, center).Union(new Vector3[] { center }).ToArray(); + vertices.ToList().ForEach(vert => { + vertex.position = vert; + vh.AddVert(vertex); + } + ); + + int startVert = vh.currentVertCount - vertices.Length; + for (int i = 0; i < vertices.Length - 1; i++) + { + vh.AddTriangle( + vh.currentVertCount - 1, // center + startVert + i, + startVert + ((i + 1) % (vertices.Length - 1)) + ); + } + return; + } + + protected static Vector3[] GetCirclePoints(float circleRadius, int pointCount, Vector3 offset) + { + Vector3[] circle = new Vector3[pointCount]; + float slice = (2f * Mathf.PI) / pointCount; + for (int i = 0; i < pointCount; i++) + { + float angle = i * slice; + circle[i] = new Vector3(circleRadius * Mathf.Sin(angle), circleRadius * Mathf.Cos(angle)) + offset; + } + return circle; + } + + #endregion Rounding + + #endregion Implementation +} diff --git a/Assets/Scripts/UI/FactExplorer/UILine.cs.meta b/Assets/Scripts/UI/FactExplorer/UILine.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..1633aef80654570e14d5b765d0e78267fbc8f29a --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/UILine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8ed745d97410d6740921398c899d9ec0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/HideUI_mobile.cs b/Assets/Scripts/UI/HideUI_mobile.cs index d7c5af0598a0018b2a5d7ed31ad661d2599865df..80217448dae51ad5ea2d520b0965989f37c9e9ee 100644 --- a/Assets/Scripts/UI/HideUI_mobile.cs +++ b/Assets/Scripts/UI/HideUI_mobile.cs @@ -218,18 +218,30 @@ void CheckUI_Vis_walk() case ControlMode.Mobile: uiccm = 1; break; - default: + default: uiccm = 0; break; } - - - UIconfig.CanvasOnOff_Array[11] = uiccm; - UIconfig.CanvasOnOff_Array[12] = uiccm; - UIconfig.CanvasOnOff_Array[13] = uiccm; - UIconfig.CanvasOnOff_Array[15] = uiccm; - UIconfig.CanvasOnOff_Array[17] = uiccm; - UIconfig.CanvasOnOff_Array[18] = uiccm; + + switch(GameplayMode){ + case 2: + UIconfig.CanvasOnOff_Array[11] = 0; + UIconfig.CanvasOnOff_Array[19] = 1; + break; + default: + UIconfig.CanvasOnOff_Array[11] = uiccm; + UIconfig.CanvasOnOff_Array[12] = uiccm; + UIconfig.CanvasOnOff_Array[13] = uiccm; + UIconfig.CanvasOnOff_Array[15] = uiccm; + UIconfig.CanvasOnOff_Array[17] = uiccm; + UIconfig.CanvasOnOff_Array[19] = 0; + UIconfig.CanvasOnOff_Array[18] = uiccm; + + break; + + + } + } void setUI_Vis_walk(int a) { diff --git a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs index 6265c555db5fb9d183e2197dfcd5e237be2ec0a0..6e04bcf2625d43e51f6456d1586067241831b871 100644 --- a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs +++ b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs @@ -89,9 +89,11 @@ private void Update2(){ break; case 3: ThirdPerson_manualCam_GObj.SetActive(true); + UIconfig.interactingRangeMode = InteractingRangeMode.fromObserverView; break; case 4: ThirdPerson_dampedCam_GObj.SetActive(true); + UIconfig.interactingRangeMode = InteractingRangeMode.fromObserverView; break; case 5: FirstPerson_GObj.SetActive(true); @@ -102,6 +104,7 @@ private void Update2(){ break; case 7: ThirdPerson_Shoulder_GObj.SetActive(true); + UIconfig.interactingRangeMode = InteractingRangeMode.fromObserverView; break; case 8: Sidescroller_GObj.SetActive(true); diff --git a/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs b/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs index 9500eb462b171b066454a0fb02e54b7ae83c94c1..c36c306ba8652fc320c5052cecf8d7a665e57fe4 100644 --- a/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs +++ b/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs @@ -21,9 +21,10 @@ public class PointAndClick_changeCam : MonoBehaviour public GameObject Position1_GObj; public GameObject Position2_GObj; + public GameObject Position3_GObj; - + private int Position=1; @@ -31,14 +32,36 @@ void Start() { myCamera_GObj.transform.position = Position1_GObj.transform.position; myCamera_GObj.transform.rotation = Position1_GObj.transform.rotation; + } private void Update() { - if (GameplayMode==2) - { - //Position1_GObj. + } + + public void changePosition() + { + Position++; + switch (Position) + { + case 1: + myCamera_GObj.transform.position = Position1_GObj.transform.position; + myCamera_GObj.transform.rotation = Position1_GObj.transform.rotation; + break; + case 2: + myCamera_GObj.transform.position = Position2_GObj.transform.position; + myCamera_GObj.transform.rotation = Position2_GObj.transform.rotation; + break; + case 3: + myCamera_GObj.transform.position = Position3_GObj.transform.position; + myCamera_GObj.transform.rotation = Position3_GObj.transform.rotation; + break; + default: + myCamera_GObj.transform.position = Position1_GObj.transform.position; + myCamera_GObj.transform.rotation = Position1_GObj.transform.rotation; + Position = 1; + break; } } diff --git a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs index 2812448333259b4d205aeeebbd461b67aa045876..46459bd23db5346849e9dc8f3da0229c11359eed 100644 --- a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs @@ -12,8 +12,7 @@ using static UIconfig; using static StreamingAssetLoader; using static CommunicationEvents; - - +using System; public class StartMenue_mobile : MonoBehaviour { @@ -33,16 +32,16 @@ public class StartMenue_mobile : MonoBehaviour private void Awake() { ScreenOptimization(); - + //GObj_text.text = "1: "+ Application.streamingAssetsPath + " " + Application.persistentDataPath + " " + Application.dataPath; toChild1(); - - if (checkOperationSystemAlreadyDone == false) + if (checkOperationSystemAlreadyDone == false || checkOperationSystemAlreadyDone_check == false) { - start2_CheckOS_CheckConfig(); checkOperationSystemAlreadyDone = true; } - GObj_text.text = CommunicationEvents.Opsys + ""; + GObj_text.text = Application.platform + " -> " + CommunicationEvents.Opsys + ""; + //GObj_text.text = "2: " + Application.streamingAssetsPath + " " + Application.persistentDataPath + " " + Application.dataPath; + //Debug.Log(Application.streamingAssetsPath); CheckServerA[1] = 1; CheckServerA[2] = 1; CheckServerA[3] = 1; @@ -56,97 +55,78 @@ void Start() void start2_CheckOS_CheckConfig() { - //Debug.Log("start2: " + CommunicationEvents.Opsys); - switch (CommunicationEvents.Opsys) - { - - case OperationSystem.Windows: - - //Debug.Log(checkPersistentDataPath()); - if (!checkPersistentDataPath()) - { - //Debug.Log("initialReset_PDP"); - ResetPersistentDataPath(); - switch (Opsys) - { - case OperationSystem.Windows: - UIconfig.controlMode = ControlMode.Keyboard; - break; - case OperationSystem.Android: - UIconfig.controlMode = ControlMode.Mobile; - break; - default: - break; - } - - NetworkJSON_Save(); - } - NetworkJSON_Load(); - checkOS(); - if (!checkDataPath()) - { - ResetDataPath(); - } - setMouse(); - break; - case OperationSystem.Android: - - if (!checkPersistentDataPath()) - { - //Debug.Log("initialReset_PDP"); - ResetPersistentDataPath(); - switch (Opsys) - { - case OperationSystem.Windows: - UIconfig.controlMode = ControlMode.Keyboard; - break; - case OperationSystem.Android: - UIconfig.controlMode = ControlMode.Mobile; - break; - default: - break; - } - - NetworkJSON_Save(); - } - NetworkJSON_Load(); - checkOS(); - if (!checkDataPath()) - { - ResetDataPath(); - }; - setMouse(); - break; - - default: + //Try to find existing Config: + int configExists = 0; + //Debug.Log("Load Streaming Asset"); + try { NetworkJSON_Load_0(); configExists=1; } + catch (Exception e) + { + Debug.Log(e); + } + //Debug.Log("Load Streaming Asset finished"); + //Debug.Log(checkPersistentDataPath()); + try + { + NetworkJSON_Load(); + configExists = 2; + } + catch(Exception e) + { + Debug.Log(e); + } - if (!checkPersistentDataPath()) - { - //Debug.Log("initialReset_PDP"); - ResetPersistentDataPath(); - switch (Opsys) - { - case OperationSystem.Windows: - UIconfig.controlMode = ControlMode.Keyboard; - break; - case OperationSystem.Android: - UIconfig.controlMode = ControlMode.Mobile; - break; - default: - break; - } - - NetworkJSON_Save(); - } + + if (configExists == 0) + { + Debug.Log(configExists + "No Config found"); + checkOS2(); + try + { + ResetPlayerConfig(); NetworkJSON_Load(); - checkOS(); - if (!checkDataPath()) - { - ResetDataPath(); - } - setMouse(); - break; + configExists = 3; + } + catch (Exception e) + { + Debug.Log(e); + } + } + else + { + //Debug.Log(configExists + "Config found"); + checkOS(); } + //Entpacken + if (!checkPersistentDataPath() || configExists<1) + { + //Debug.Log("initialReset_PDP"); + ResetPersistentDataPath(); + //Debug.Log("Reset_PDP_finished"); + NetworkJSON_Load(); + checkOS(); + changeSettingsToOS(); + NetworkJSON_Save(); + } + //Save CheckOS + NetworkJSON_Save(); + + //Debug.Log("StartAdaption"); + if (autoSettingsAdaption) + { + changeSettingsToOS(); + NetworkJSON_Save(); + } + //Debug.Log("EndAdaption"); + NetworkJSON_Load(); + + if (!checkDataPath() || true) + { + ResetDataPath(); + //Debug.Log("DataPath new finished"); + }; + //Debug.Log("DataPath finished"); + setMouse(); + if (UIconfig.MouseKeepingInWindow == true) { Cursor.lockState = CursorLockMode.Confined; @@ -155,6 +135,7 @@ void start2_CheckOS_CheckConfig() { Cursor.lockState = CursorLockMode.None; } + } private void Update() @@ -180,22 +161,29 @@ void checkOS() void checkOS2() { //https://docs.unity3d.com/ScriptReference/RuntimePlatform.html + + if (Application.platform == RuntimePlatform.WindowsPlayer) { - Debug.Log("Windows OS detected"); + //Debug.Log("Windows OS detected"); CommunicationEvents.Opsys = OperationSystem.Windows; return; } if (Application.platform == RuntimePlatform.Android) { - Debug.Log("Android OS detected"); - CommunicationEvents.Opsys = OperationSystem.Windows; + //Debug.Log("Android OS detected"); + CommunicationEvents.Opsys = OperationSystem.Android; return; } - + if (Application.platform == RuntimePlatform.WindowsEditor) + { + CommunicationEvents.Opsys = OperationSystem.Windows; + return; + } + Debug.Log("Detecting OS: " + Application.platform + " -> " + CommunicationEvents.Opsys); //Default: //CommunicationEvents.Opsys = CommunicationEvents.Opsys_Default; @@ -203,8 +191,25 @@ void checkOS2() } + void changeSettingsToOS() + { + switch (Opsys) + { + case OperationSystem.Windows: + UIconfig.controlMode = ControlMode.Keyboard; + UIconfig.FrameITUIversion = 1; + break; + case OperationSystem.Android: + UIconfig.controlMode = ControlMode.Mobile; + UIconfig.FrameITUIversion = 2; + break; + default: + break; + } + } + - public void setMouse() +public void setMouse() { updateMouseCursor.setMouse(); } diff --git a/Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs index 9d68153fc3f9b18a90e44bd016f0c9c8540154b6..e4781bfe45dec8e66621d1e607f39314fb4a5acd 100644 --- a/Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs @@ -22,7 +22,10 @@ public class SystemOptionsMenue_mobile : MonoBehaviour public GameObject FrameITUI_ButtonT; public GameObject FrameITUI_ButtonUT; - + + public GameObject AutoSettingsAdap_Button; + public GameObject AutoSettingsAdap_ButtonUT; + /* @@ -66,6 +69,28 @@ void UpdateUI_6() } + switch (UIconfig.autoSettingsAdaption) + { + case false: + + //GameObject.Find("TextSlotTOO").GetComponent<Text>().text = "Touch controls OFF"; + AutoSettingsAdap_Button.GetComponent<Text>().text = "Settings Adaption: OFF"; + AutoSettingsAdap_ButtonUT.GetComponentInChildren<Text>().text = "Press for activating"; + break; + + case true: + + AutoSettingsAdap_Button.GetComponent<Text>().text = "Settings Adaption: ON"; + AutoSettingsAdap_ButtonUT.GetComponentInChildren<Text>().text = "Press for deactivating"; + break; + + + } + + + + + switch (CommunicationEvents.Opsys) { case OperationSystem.Windows: @@ -142,6 +167,31 @@ public void ChangeAutoOSrecognition() NetworkJSON_Save(); } + public void ChangeAutoSettingsAdaption() + { + switch (UIconfig.autoSettingsAdaption) + { + case false: + UIconfig.autoSettingsAdaption = true; + AutoSettingsAdap_Button.GetComponent<Text>().text = "Settings Adaption: ON"; + AutoSettingsAdap_ButtonUT.GetComponentInChildren<Text>().text = "Press for deactivating"; + break; + + case true: + UIconfig.autoSettingsAdaption = false; + //GameObject.Find("TextSlotTOO").GetComponent<Text>().text = "Touch controls OFF"; + AutoSettingsAdap_Button.GetComponent<Text>().text = "Settings Adaption: OFF"; + AutoSettingsAdap_ButtonUT.GetComponentInChildren<Text>().text = "Press for activating"; + break; + + + } + //updateUIpreview(); + NetworkJSON_Save(); + } + + + public void ChangeOpsysModes() { switch (CommunicationEvents.Opsys) diff --git a/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs b/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs index a45e9abe323d80808c2a935e5217c64e31c82581..eaf36efa76c83e1a751852d0e726e74710080efa 100644 --- a/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs +++ b/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs @@ -1,6 +1,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; +using static UIconfig; namespace PlayerCtrl { @@ -8,7 +9,13 @@ namespace PlayerCtrl [RequireComponent(typeof(Image))] public class AxisTouchPad : MonoBehaviour, IPointerDownHandler, IPointerUpHandler { + // Options for which axes to use + public int DPAD_ID; + public int DPAD_subID; + public int DPAD_ID_2; + public int DPAD_subID_2; + public enum AxisOption { Both, // Use both @@ -89,11 +96,13 @@ void UpdateVirtualAxes(Vector3 value) if (m_UseX) { m_HorizontalVirtualAxis.Update(value.x); + DPAD[DPAD_ID, DPAD_subID] = value.x; } if (m_UseY) { m_VerticalVirtualAxis.Update(value.y); + DPAD[DPAD_ID_2, DPAD_subID_2] = value.y; } } @@ -133,6 +142,8 @@ void Update() m_PreviousMouse = new Vector3(Input.mousePosition.x, Input.mousePosition.y, 0f); #endif UpdateVirtualAxes(new Vector3(pointerDelta.x, pointerDelta.y, 0)); + + } } @@ -142,6 +153,8 @@ public void OnPointerUp(PointerEventData data) m_Dragging = false; m_Id = -1; UpdateVirtualAxes(Vector3.zero); + DPAD[DPAD_ID, DPAD_subID] = 0f; + DPAD[DPAD_ID_2, DPAD_subID_2] = 0f; } void OnDisable() diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs index 85c67658154de68d04ab17349a792b1ba37ed5d9..7ff3546ab5fe833e7c10fa0b67f1ce34157525e5 100644 --- a/Assets/Scripts/UI/UIconfig.cs +++ b/Assets/Scripts/UI/UIconfig.cs @@ -12,6 +12,8 @@ public static class UIconfig public static int GameplayMode = 5; //5=First Person, 4=third, 3=third+, 2=Escaperoom, 1=Sidescroller, 0=Sidescroller+ public static bool InputDisable = false; //deactivate all Objects with access to the input system, so Bindings can be rebinded. + public static bool autoSettingsAdaption = false; + public static float cursorMaxRange_fromFirstPersonView = 10f; //used in World cursor public static float cursorMaxRange_fromObeserverView = float.MaxValue; //used in World cursor public static InteractingRangeMode interactingRangeMode = InteractingRangeMode.fromCharacterView; @@ -41,6 +43,7 @@ public enum InteractingRangeMode public static double cursorSize_SliderMax = 1; //Faktor public static double cursorsize_default = 0.03125; public static bool checkOperationSystemAlreadyDone = false; + public static bool checkOperationSystemAlreadyDone_check = false; public static int refHeight = -1; public static int refWidth = -1; @@ -105,6 +108,7 @@ public class NetworkJSON public int TouchMode; public float TAvisibility; public bool autoOSrecognition; + public bool autoSettingsAdaption; public string Opsys; public int FrameITUIversion; public int InputManagerVersion; @@ -126,6 +130,7 @@ public class NetworkJSONonlyString public string TouchMode; public string TAvisibility; public string autoOSrecognition; + public string autoSettingsAdaption; public string Opsys; public string FrameITUIversion; public string InputManagerVersion; diff --git a/Assets/StreamingAssets/README_StreamingAssets.md b/Assets/StreamingAssets/README_StreamingAssets.md index 3a645bdb2da6e6f52c541ea44c085cf46b5d5b0b..043f859a1619185176ee40527cfa39329b607704 100644 --- a/Assets/StreamingAssets/README_StreamingAssets.md +++ b/Assets/StreamingAssets/README_StreamingAssets.md @@ -1,3 +1,7 @@ +## Info: +For OperatingSystem Android: please register all Files in StreamingAssetLoader! + + ## StreamToDataPath: All files and subfolders will be copied to DataPath. Exception: Files with "meta" in the name. diff --git a/Assets/StreamingAssets/StreamToDataPath/Stages.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages.meta similarity index 100% rename from Assets/StreamingAssets/StreamToDataPath/Stages.meta rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages.meta diff --git a/Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo A.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON similarity index 100% rename from Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo A.JSON rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON diff --git a/Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo A.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta similarity index 100% rename from Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo A.JSON.meta rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta diff --git a/Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo B.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON similarity index 100% rename from Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo B.JSON rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON diff --git a/Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo B.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta similarity index 100% rename from Assets/StreamingAssets/StreamToDataPath/Stages/TechDemo B.JSON.meta rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON index a261a61d1aa689cf1841dc450358b5d2b641d5ab..ac0e842d55b0880107545430c7a39264d208b3b8 100644 --- a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON +++ b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON @@ -9,7 +9,8 @@ "TouchMode": 1, "TAvisibility": 1.0, "autoOSrecognition": true, - "Opsys": "Windows", + "autoSettingsAdaption": true, + "Opsys": "Android", "FrameITUIversion": 2, "InputManagerVersion": 1, "colliderScale_all": 1.200000047683716, diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 20793095ffe69b1ed7f77be2d51d13fad2814a1b..c0df12af4211b2b907fafbb821f764d388d02cb7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,7 +15,7 @@ EditorUserSettings: value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d flags: 0 RecentlyUsedSceneGuid-3: - value: 520107035d0c510c080d547215760b4413154d2e7a2c226129281c65e3b63768 + value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e flags: 0 RecentlyUsedSceneGuid-4: value: 5b01035553515d0e0b0f5b7415725d444e4f1d2b2e782332757f4863e4e6673c @@ -23,8 +23,8 @@ EditorUserSettings: RecentlyUsedSceneGuid-5: value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c flags: 0 - RecentlyUsedSceneGuid-6: - value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e + RecentlyUsedSceneGuid-5: + value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c681f041b1c39631c3435281e1221eee47a2decee22f0