From 1f473b16ee981ec53fecd37c6789bd597d47db7d Mon Sep 17 00:00:00 2001 From: excitedneon Date: Fri, 12 May 2017 04:59:58 +0300 Subject: [PATCH] Fix server's shutdown, add offsets to texttexes, inv-fe dev --- Assets/Models/Hologram.blend | 2 +- Assets/Models/Materials/Hologram.mat | 12 +- Assets/Models/Materials/Hologram_Base.mat | 12 +- Assets/Models/Materials/Hologram_Edge.mat | 2 +- Assets/Models/Materials/Holograms.meta | 9 + .../Materials/Holograms/IconInventory.mat | 78 ++ .../Holograms/IconInventory.mat.meta | 9 + Assets/Models/Materials/Holograms/IconMap.mat | 78 ++ .../Materials/Holograms/IconMap.mat.meta | 9 + .../Models/Materials/Holograms/IconSocial.mat | 78 ++ .../Materials/Holograms/IconSocial.mat.meta | 9 + .../Models/Materials/Holograms/IconStatus.mat | 78 ++ .../Materials/Holograms/IconStatus.mat.meta | 9 + .../Materials/Holograms/InventoryLayout.mat | 78 ++ .../Holograms/InventoryLayout.mat.meta | 9 + .../Textures/HologramLayoutInventory.png | 3 + .../Textures/HologramLayoutInventory.png.meta | 116 +++ Assets/Models/Textures/Holograms.meta | 9 + .../{FloppyDisk16.png => IconInventory.png} | 0 .../Textures/Holograms/IconInventory.png.meta | 116 +++ .../Holograms/{Globe16.png => IconMap.png} | 0 .../Textures/Holograms/IconMap.png.meta | 116 +++ .../{Social16.png => IconSocial.png} | 0 .../Textures/Holograms/IconSocial.png.meta | 116 +++ .../Holograms/{Heart16.png => IconStatus.png} | 0 .../Textures/Holograms/IconStatus.png.meta | 116 +++ Assets/Scenes/TestMap.unity | 739 +++++++++++++++++- .../Scripts/Networking/Clientside/Client.cs | 2 +- Assets/Scripts/Util/TextTextureProperties.cs | 18 +- Assets/Scripts/Util/TextTextureRenderer.cs | 8 +- 30 files changed, 1811 insertions(+), 20 deletions(-) create mode 100644 Assets/Models/Materials/Holograms.meta create mode 100644 Assets/Models/Materials/Holograms/IconInventory.mat create mode 100644 Assets/Models/Materials/Holograms/IconInventory.mat.meta create mode 100644 Assets/Models/Materials/Holograms/IconMap.mat create mode 100644 Assets/Models/Materials/Holograms/IconMap.mat.meta create mode 100644 Assets/Models/Materials/Holograms/IconSocial.mat create mode 100644 Assets/Models/Materials/Holograms/IconSocial.mat.meta create mode 100644 Assets/Models/Materials/Holograms/IconStatus.mat create mode 100644 Assets/Models/Materials/Holograms/IconStatus.mat.meta create mode 100644 Assets/Models/Materials/Holograms/InventoryLayout.mat create mode 100644 Assets/Models/Materials/Holograms/InventoryLayout.mat.meta create mode 100644 Assets/Models/Textures/HologramLayoutInventory.png create mode 100644 Assets/Models/Textures/HologramLayoutInventory.png.meta create mode 100644 Assets/Models/Textures/Holograms.meta rename Assets/Models/Textures/Holograms/{FloppyDisk16.png => IconInventory.png} (100%) create mode 100644 Assets/Models/Textures/Holograms/IconInventory.png.meta rename Assets/Models/Textures/Holograms/{Globe16.png => IconMap.png} (100%) create mode 100644 Assets/Models/Textures/Holograms/IconMap.png.meta rename Assets/Models/Textures/Holograms/{Social16.png => IconSocial.png} (100%) create mode 100644 Assets/Models/Textures/Holograms/IconSocial.png.meta rename Assets/Models/Textures/Holograms/{Heart16.png => IconStatus.png} (100%) create mode 100644 Assets/Models/Textures/Holograms/IconStatus.png.meta diff --git a/Assets/Models/Hologram.blend b/Assets/Models/Hologram.blend index cc7422e..4f5d3df 100644 --- a/Assets/Models/Hologram.blend +++ b/Assets/Models/Hologram.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97601f98d3d5820e0fac3de23bc12bfe2497005fa0722d859f5d0891f85b7255 +oid sha256:2cc1920bf05d4390f68bfc10e69511def8ad880fb4741819f34697eb9a68bdfa size 527616 diff --git a/Assets/Models/Materials/Hologram.mat b/Assets/Models/Materials/Hologram.mat index 846be74..ae5e293 100644 --- a/Assets/Models/Materials/Hologram.mat +++ b/Assets/Models/Materials/Hologram.mat @@ -8,8 +8,8 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: Hologram m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF - m_LightmapFlags: 4 + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_CustomRenderQueue: 3000 stringTagMap: @@ -63,7 +63,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _InvFade: 1 - - _Metallic: 0 + - _Metallic: 1 - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -73,6 +73,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 1, g: 0.16600001, b: 0.97699326, a: 0.278} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 1, g: 0.13725491, b: 0.7058824, a: 0.15686275} + - _Color: {r: 1, g: 0.14700001, b: 0.97646916, a: 0.27450982} + - _EmissionColor: {r: 0.75, g: 0.47774994, b: 0.7342095, a: 1} + - _TintColor: {r: 1, g: 0.13725491, b: 0.7058824, a: 0.028} diff --git a/Assets/Models/Materials/Hologram_Base.mat b/Assets/Models/Materials/Hologram_Base.mat index 123bb31..9121a27 100644 --- a/Assets/Models/Materials/Hologram_Base.mat +++ b/Assets/Models/Materials/Hologram_Base.mat @@ -8,8 +8,8 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: Hologram_Base m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF - m_LightmapFlags: 4 + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_CustomRenderQueue: 3000 stringTagMap: @@ -63,7 +63,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _InvFade: 1 - - _Metallic: 0 + - _Metallic: 1 - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -73,6 +73,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 1, g: 0.16600001, b: 0.97699326, a: 0.278} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 1, g: 0.13725491, b: 0.7058824, a: 0.15686275} + - _Color: {r: 1, g: 0.14700001, b: 0.97646916, a: 0.27450982} + - _EmissionColor: {r: 0.75, g: 0.47774994, b: 0.7342095, a: 1} + - _TintColor: {r: 1, g: 0.13725491, b: 0.7058824, a: 0.028} diff --git a/Assets/Models/Materials/Hologram_Edge.mat b/Assets/Models/Materials/Hologram_Edge.mat index 87117d2..00954c2 100644 --- a/Assets/Models/Materials/Hologram_Edge.mat +++ b/Assets/Models/Materials/Hologram_Edge.mat @@ -74,5 +74,5 @@ Material: - _ZWrite: 0 m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 0} - - _EmissionColor: {r: 0.24316895, g: 0.17925, b: 0.25, a: 1} + - _EmissionColor: {r: 0.4863379, g: 0.3585, b: 0.5, a: 1} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.19607843} diff --git a/Assets/Models/Materials/Holograms.meta b/Assets/Models/Materials/Holograms.meta new file mode 100644 index 0000000..3599b18 --- /dev/null +++ b/Assets/Models/Materials/Holograms.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 43cd66f8cf9df438ca80a4bff47c8318 +folderAsset: yes +timeCreated: 1494549821 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Holograms/IconInventory.mat b/Assets/Models/Materials/Holograms/IconInventory.mat new file mode 100644 index 0000000..d067b6d --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconInventory.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: IconInventory + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: bcef9c2dadd47443fb1aa35ab0bbf383, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 1 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1.5784618, g: 1.1830498, b: 1.65, a: 1} + - _TintColor: {r: 0.9759962, g: 0.647, b: 1, a: 0.21568628} diff --git a/Assets/Models/Materials/Holograms/IconInventory.mat.meta b/Assets/Models/Materials/Holograms/IconInventory.mat.meta new file mode 100644 index 0000000..db34351 --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconInventory.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4fa61405fcf634bdcad4ae56f8083fb9 +timeCreated: 1494536123 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Holograms/IconMap.mat b/Assets/Models/Materials/Holograms/IconMap.mat new file mode 100644 index 0000000..a30c7c3 --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconMap.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: IconMap + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: b79a202822af448b4931cae23ea5a5e3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 1 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1.6502101, g: 1.2368248, b: 1.725, a: 1} + - _TintColor: {r: 0.9759962, g: 0.647, b: 1, a: 0.21568628} diff --git a/Assets/Models/Materials/Holograms/IconMap.mat.meta b/Assets/Models/Materials/Holograms/IconMap.mat.meta new file mode 100644 index 0000000..b099117 --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconMap.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2e2bb54edc0544095bfb5a74adee6cf3 +timeCreated: 1494536123 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Holograms/IconSocial.mat b/Assets/Models/Materials/Holograms/IconSocial.mat new file mode 100644 index 0000000..93339fd --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconSocial.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: IconSocial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 66271dd60c0094a2d86d5854dbc406cc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 1 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1.7697905, g: 1.3264498, b: 1.85, a: 1} + - _TintColor: {r: 0.9759962, g: 0.647, b: 1, a: 0.21568628} diff --git a/Assets/Models/Materials/Holograms/IconSocial.mat.meta b/Assets/Models/Materials/Holograms/IconSocial.mat.meta new file mode 100644 index 0000000..70747c3 --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconSocial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 96b1a97d0f6b843f29723adb8b3f1f71 +timeCreated: 1494536123 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Holograms/IconStatus.mat b/Assets/Models/Materials/Holograms/IconStatus.mat new file mode 100644 index 0000000..52e4c91 --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconStatus.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: IconStatus + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d963b113eccc243318c42b2092f4c09c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 1 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1.8654549, g: 1.3981497, b: 1.95, a: 1} + - _TintColor: {r: 0.9759962, g: 0.647, b: 1, a: 0.21568628} diff --git a/Assets/Models/Materials/Holograms/IconStatus.mat.meta b/Assets/Models/Materials/Holograms/IconStatus.mat.meta new file mode 100644 index 0000000..8d554d7 --- /dev/null +++ b/Assets/Models/Materials/Holograms/IconStatus.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 24ae1dd653e644f6193e6f6696e03ef7 +timeCreated: 1494536123 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Holograms/InventoryLayout.mat b/Assets/Models/Materials/Holograms/InventoryLayout.mat new file mode 100644 index 0000000..54f635d --- /dev/null +++ b/Assets/Models/Materials/Holograms/InventoryLayout.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: InventoryLayout + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: fd516fd32def54a088ab7f93e5e20b96, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 1 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1.3871332, g: 1.0396501, b: 1.45, a: 1} + - _TintColor: {r: 0.9759962, g: 0.647, b: 1, a: 0.21568628} diff --git a/Assets/Models/Materials/Holograms/InventoryLayout.mat.meta b/Assets/Models/Materials/Holograms/InventoryLayout.mat.meta new file mode 100644 index 0000000..c31a099 --- /dev/null +++ b/Assets/Models/Materials/Holograms/InventoryLayout.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a2f13121dc57b415d929aae5ea8fd85a +timeCreated: 1494536123 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/HologramLayoutInventory.png b/Assets/Models/Textures/HologramLayoutInventory.png new file mode 100644 index 0000000..e6cb082 --- /dev/null +++ b/Assets/Models/Textures/HologramLayoutInventory.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3365db67a7080b4bbd25629e8e955db33ca4683b2810c43c21ab8f6ad137500 +size 318 diff --git a/Assets/Models/Textures/HologramLayoutInventory.png.meta b/Assets/Models/Textures/HologramLayoutInventory.png.meta new file mode 100644 index 0000000..8051975 --- /dev/null +++ b/Assets/Models/Textures/HologramLayoutInventory.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: fd516fd32def54a088ab7f93e5e20b96 +timeCreated: 1494548702 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Tizen + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Samsung TV + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/Holograms.meta b/Assets/Models/Textures/Holograms.meta new file mode 100644 index 0000000..cf9de21 --- /dev/null +++ b/Assets/Models/Textures/Holograms.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 73ec60a77c539494189b5d0770239b20 +folderAsset: yes +timeCreated: 1494551829 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/Holograms/FloppyDisk16.png b/Assets/Models/Textures/Holograms/IconInventory.png similarity index 100% rename from Assets/Models/Textures/Holograms/FloppyDisk16.png rename to Assets/Models/Textures/Holograms/IconInventory.png diff --git a/Assets/Models/Textures/Holograms/IconInventory.png.meta b/Assets/Models/Textures/Holograms/IconInventory.png.meta new file mode 100644 index 0000000..a98de21 --- /dev/null +++ b/Assets/Models/Textures/Holograms/IconInventory.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: bcef9c2dadd47443fb1aa35ab0bbf383 +timeCreated: 1494551829 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Tizen + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Samsung TV + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/Holograms/Globe16.png b/Assets/Models/Textures/Holograms/IconMap.png similarity index 100% rename from Assets/Models/Textures/Holograms/Globe16.png rename to Assets/Models/Textures/Holograms/IconMap.png diff --git a/Assets/Models/Textures/Holograms/IconMap.png.meta b/Assets/Models/Textures/Holograms/IconMap.png.meta new file mode 100644 index 0000000..3188730 --- /dev/null +++ b/Assets/Models/Textures/Holograms/IconMap.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: b79a202822af448b4931cae23ea5a5e3 +timeCreated: 1494551829 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Tizen + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Samsung TV + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/Holograms/Social16.png b/Assets/Models/Textures/Holograms/IconSocial.png similarity index 100% rename from Assets/Models/Textures/Holograms/Social16.png rename to Assets/Models/Textures/Holograms/IconSocial.png diff --git a/Assets/Models/Textures/Holograms/IconSocial.png.meta b/Assets/Models/Textures/Holograms/IconSocial.png.meta new file mode 100644 index 0000000..f6c6a4c --- /dev/null +++ b/Assets/Models/Textures/Holograms/IconSocial.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 66271dd60c0094a2d86d5854dbc406cc +timeCreated: 1494551829 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Tizen + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Samsung TV + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/Holograms/Heart16.png b/Assets/Models/Textures/Holograms/IconStatus.png similarity index 100% rename from Assets/Models/Textures/Holograms/Heart16.png rename to Assets/Models/Textures/Holograms/IconStatus.png diff --git a/Assets/Models/Textures/Holograms/IconStatus.png.meta b/Assets/Models/Textures/Holograms/IconStatus.png.meta new file mode 100644 index 0000000..ed17166 --- /dev/null +++ b/Assets/Models/Textures/Holograms/IconStatus.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: d963b113eccc243318c42b2092f4c09c +timeCreated: 1494551829 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Tizen + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Samsung TV + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestMap.unity b/Assets/Scenes/TestMap.unity index daffe5a..c01f169 100644 --- a/Assets/Scenes/TestMap.unity +++ b/Assets/Scenes/TestMap.unity @@ -139,6 +139,198 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &27615709 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 27615710} + - component: {fileID: 27615714} + - component: {fileID: 27615713} + - component: {fileID: 27615712} + - component: {fileID: 27615711} + m_Layer: 0 + m_Name: Inventory List + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &27615710 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27615709} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.02, y: 0.685, z: 0.185} + m_LocalScale: {x: 0.06, y: 1, z: 0.067} + m_Children: [] + m_Father: {fileID: 229498030} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!114 &27615711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27615709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e0b8f69a817648969bf8ecd70b13d4d, type: 3} + m_Name: + m_EditorClassIdentifier: + TextProperties: + Text: '- Testing\n- A Nice List\n- Spicy Hat' + OffsetX: 0 + OffsetY: 0 + Background: {r: 0, g: 0, b: 0, a: 0} + FontSize: 32 + Width: 256 + Height: 229 + Mesh: {fileID: 27615712} + MaterialIndex: 0 + Emissive: 0 + Brightness: 1 +--- !u!23 &27615712 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27615709} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: bc07ff2ef266a4661adc506da3430c31, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &27615713 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27615709} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &27615714 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27615709} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &97891002 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 97891003} + - component: {fileID: 97891006} + - component: {fileID: 97891005} + - component: {fileID: 97891004} + m_Layer: 0 + m_Name: Icon Social + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &97891003 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 97891002} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: -0.075} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 229498030} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!23 &97891004 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 97891002} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 96b1a97d0f6b843f29723adb8b3f1f71, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &97891005 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 97891002} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &97891006 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 97891002} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &100803251 GameObject: m_ObjectHideFlags: 0 @@ -221,6 +413,164 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 100803251} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &132238581 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 132238582} + m_Layer: 0 + m_Name: Inventory Front End Development + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &132238582 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 132238581} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 438898519} + - {fileID: 144407926} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &144407925 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 144407926} + m_Layer: 0 + m_Name: Inventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &144407926 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 144407925} + m_LocalRotation: {x: -0, y: -0.7071056, z: -0, w: 0.7071081} + m_LocalPosition: {x: 0, y: 1, z: 0.65} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 229498030} + m_Father: {fileID: 132238582} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -90.00001, z: 0} +--- !u!1001 &229498029 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 144407926} + m_Modifications: + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1322065614505358, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_Name + value: Inventory Hologram + objectReference: {fileID: 0} + - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, + type: 2} + propertyPath: TextProperties.Text + value: Local Storage + objectReference: {fileID: 0} + - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, + type: 2} + propertyPath: TextProperties.OffsetX + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, + type: 2} + propertyPath: TextProperties.OffsetY + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, + type: 2} + propertyPath: TextProperties.FontSize + value: 33 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &229498030 stripped +Transform: + m_PrefabParentObject: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, + type: 2} + m_PrefabInternal: {fileID: 229498029} --- !u!1 &248140502 GameObject: m_ObjectHideFlags: 0 @@ -746,6 +1096,11 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 418104022} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &438898519 stripped +Transform: + m_PrefabParentObject: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, + type: 2} + m_PrefabInternal: {fileID: 2139315739} --- !u!1 &566501560 GameObject: m_ObjectHideFlags: 0 @@ -1925,6 +2280,90 @@ Transform: m_Father: {fileID: 949094013} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1410873969 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1410873970} + - component: {fileID: 1410873973} + - component: {fileID: 1410873972} + - component: {fileID: 1410873971} + m_Layer: 0 + m_Name: Icon Floppy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1410873970 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1410873969} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: 0.225} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 229498030} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!23 &1410873971 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1410873969} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 4fa61405fcf634bdcad4ae56f8083fb9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &1410873972 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1410873969} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1410873973 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1410873969} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1444061381 GameObject: m_ObjectHideFlags: 0 @@ -2268,7 +2707,7 @@ TextMesh: m_Text: m_OffsetZ: 0 m_CharacterSize: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.85 m_Anchor: 0 m_Alignment: 0 m_TabSize: 4 @@ -2653,6 +3092,90 @@ Transform: m_Father: {fileID: 344272455} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1944717508 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1944717509} + - component: {fileID: 1944717512} + - component: {fileID: 1944717511} + - component: {fileID: 1944717510} + m_Layer: 0 + m_Name: Icon Globe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1944717509 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1944717508} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: -0.2250001} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 229498030} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!23 &1944717510 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1944717508} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 2e2bb54edc0544095bfb5a74adee6cf3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &1944717511 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1944717508} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1944717512 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1944717508} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1988211392 stripped Transform: m_PrefabParentObject: {fileID: 4974430339442808, guid: 660bef6a67fed4941b963e96ff20a5e0, @@ -2769,6 +3292,90 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 500} m_SizeDelta: {x: 0, y: -1000} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2110329893 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2110329894} + - component: {fileID: 2110329897} + - component: {fileID: 2110329896} + - component: {fileID: 2110329895} + m_Layer: 0 + m_Name: Icon Heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2110329894 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2110329893} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: 0.075} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 229498030} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!23 &2110329895 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2110329893} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 24ae1dd653e644f6193e6f6696e03ef7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &2110329896 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2110329893} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &2110329897 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2110329893} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2130629203 GameObject: m_ObjectHideFlags: 0 @@ -2858,3 +3465,133 @@ Camera: m_StereoConvergence: 10 m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 +--- !u!1 &2130760163 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2130760164} + - component: {fileID: 2130760167} + - component: {fileID: 2130760166} + - component: {fileID: 2130760165} + m_Layer: 0 + m_Name: Inventory Layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2130760164 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2130760163} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.03, y: 0.70000005, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_Children: [] + m_Father: {fileID: 229498030} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!23 &2130760165 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2130760163} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: a2f13121dc57b415d929aae5ea8fd85a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &2130760166 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2130760163} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &2130760167 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2130760163} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &2139315739 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 132238582} + m_Modifications: + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1297568499365208, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + m_IsPrefabParent: 0 diff --git a/Assets/Scripts/Networking/Clientside/Client.cs b/Assets/Scripts/Networking/Clientside/Client.cs index 23781ef..9e0ba25 100644 --- a/Assets/Scripts/Networking/Clientside/Client.cs +++ b/Assets/Scripts/Networking/Clientside/Client.cs @@ -98,7 +98,7 @@ namespace Cyber.Networking.Clientside { /// /// Weather the client is running or not public static bool IsRunning() { - return Singleton.Running; + return !(Singleton == null || !Singleton.Running); } /// diff --git a/Assets/Scripts/Util/TextTextureProperties.cs b/Assets/Scripts/Util/TextTextureProperties.cs index c115525..0eb214d 100644 --- a/Assets/Scripts/Util/TextTextureProperties.cs +++ b/Assets/Scripts/Util/TextTextureProperties.cs @@ -16,7 +16,17 @@ namespace Cyber.Util { public string Text; /// - /// The background color. + /// The offset on the x-axis in pixels. + /// + public int OffsetX; + + /// + /// The offset on the y-axis in pixels. + /// + public int OffsetY; + + /// + /// The offset on the y-axis in pixels. /// public Color Background; @@ -44,8 +54,12 @@ namespace Cyber.Util { /// Font size. /// Width. /// Height. - public TextTextureProperties(string text, Color background = new Color(), int fontSize = 32, int width = 256, int height = 256) { + public TextTextureProperties(string text, int offsetX = 0, + int offsetY = 0, Color background = new Color(), + int fontSize = 32, int width = 256, int height = 256) { Text = text; + OffsetX = offsetX; + OffsetY = offsetY; Background = background; FontSize = fontSize; Width = width; diff --git a/Assets/Scripts/Util/TextTextureRenderer.cs b/Assets/Scripts/Util/TextTextureRenderer.cs index 9350c94..ddc37be 100644 --- a/Assets/Scripts/Util/TextTextureRenderer.cs +++ b/Assets/Scripts/Util/TextTextureRenderer.cs @@ -31,14 +31,17 @@ namespace Cyber.Util { } private Texture2D RenderText(TextTextureProperties text) { + float Scale = 1.0f / text.Width; Text.text = text.Text.Replace("\\n", "\n"); Text.fontSize = text.FontSize; - Text.characterSize = 0.5f * text.FontSize / text.Width; + Text.characterSize = text.FontSize * Scale * 0.5f; RenderTexture TextTexture = RenderTexture.GetTemporary(text.Width, text.Height); RenderTexture OldRT = Camera.targetTexture; Camera.targetTexture = TextTexture; Camera.backgroundColor = text.Background; + Camera.transform.localPosition = new Vector3(-text.OffsetX * Scale, + text.OffsetY * Scale); Camera.Render(); Camera.targetTexture = OldRT; @@ -71,7 +74,8 @@ namespace Cyber.Util { } private static string CreateHash(TextTextureProperties text) { - return text.Text + "," + text.Width + "," + text.Height + "," + + return text.Text + "," + text.OffsetX + "," + text.OffsetY + "," + + text.Width + "," + text.Height + "," + text.FontSize + "," + text.Background.r + "," + text.Background.g + "," + text.Background.b; }