From 43f0c771ca5b9fcffe79e15c890f115f80829beb Mon Sep 17 00:00:00 2001 From: Kurtis Eveleigh Date: Mon, 11 Jun 2018 16:41:02 -0700 Subject: [PATCH] Reverting some breaking changes --- .../UX/Scenes/ObjectCollectionExample.unity | 2561 +++++++++-------- .../Scripts/Collections/ObjectCollection.cs | 35 +- 2 files changed, 1288 insertions(+), 1308 deletions(-) diff --git a/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity b/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity index 1a32d8f3632..23cb0981bbd 100644 --- a/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity +++ b/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity @@ -88,6 +88,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 0 --- !u!196 &4 @@ -439,7 +440,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 115809085} - m_LocalRotation: {x: -0, y: 0.27421921, z: -0, w: 0.96166724} + m_LocalRotation: {x: -0, y: 0.2742193, z: -0, w: 0.9616672} m_LocalPosition: {x: 0.094934754, y: 0, z: 0.15292938} m_LocalScale: {x: 0.05751, y: 0.041169997, z: 0.05751} m_Children: [] @@ -784,7 +785,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 280520055} + objectReference: {fileID: 1258448305} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (2) @@ -1089,138 +1090,6 @@ Transform: m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} m_PrefabInternal: {fileID: 1663133480} ---- !u!21 &280520055 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - 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: 30699e294936bf6489bb1984d770e07e, 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} --- !u!1 &284233491 GameObject: m_ObjectHideFlags: 0 @@ -1595,9 +1464,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Convex: 0 - m_InflateMesh: 0 + m_CookingOptions: 14 m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &371267954 @@ -2144,7 +2013,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1593478363} + objectReference: {fileID: 1457304886} - target: {fileID: 33078583375533282, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Mesh @@ -2666,7 +2535,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 679948655} + objectReference: {fileID: 1872005383} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (3) @@ -2711,131 +2580,263 @@ Transform: m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} m_PrefabInternal: {fileID: 2076086480} ---- !u!1 &558842869 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 558842870} - - component: {fileID: 558842873} - - component: {fileID: 558842872} - - component: {fileID: 558842871} - m_Layer: 0 - m_Name: Sphere (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &558842870 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 558842869} - m_LocalRotation: {x: -0, y: 0.7401768, z: -0, w: 0.6724123} - m_LocalPosition: {x: 0.17917344, y: 0, z: -0.01723021} - m_LocalScale: {x: 0.083019994, y: 0.083019994, z: 0.083019994} - m_Children: [] - m_Father: {fileID: 1785529723} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &558842871 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 558842869} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, 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_StitchLightmapSeams: 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!135 &558842872 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 558842869} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &558842873 -MeshFilter: +--- !u!21 &558359276 +Material: + serializedVersion: 6 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 558842869} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &566798035 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 907517898} - m_Modifications: - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalPosition.x - value: 0.27393773 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalPosition.z - value: 0.30505428 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.y - value: 0.35774648 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.w - value: 0.93381876 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1207221346183892, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_Name + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + 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: 517a5268112b8854e8d807547081e670, 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1 &558842869 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 558842870} + - component: {fileID: 558842873} + - component: {fileID: 558842872} + - component: {fileID: 558842871} + m_Layer: 0 + m_Name: Sphere (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &558842870 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 558842869} + m_LocalRotation: {x: -0, y: 0.7401769, z: -0, w: 0.6724123} + m_LocalPosition: {x: 0.17917344, y: 0, z: -0.01723021} + m_LocalScale: {x: 0.083019994, y: 0.083019994, z: 0.083019994} + m_Children: [] + m_Father: {fileID: 1785529723} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &558842871 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 558842869} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, 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_StitchLightmapSeams: 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!135 &558842872 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 558842869} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &558842873 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 558842869} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &566798035 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 907517898} + m_Modifications: + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalPosition.x + value: 0.27393773 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalPosition.z + value: 0.30505428 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.y + value: 0.35774648 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.w + value: 0.93381876 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1207221346183892, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_Name value: ButtonBalloon (4) objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} @@ -2948,12 +2949,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.05 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 5 + CellWidth: 0.085 CellHeight: 0.035 - HorizontalMargin: 0.2 - VerticalMargin: 0.2 - DepthMargin: 0.2 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &576672716 @@ -3081,7 +3082,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 596368488} - m_LocalRotation: {x: -0, y: 0.52741534, z: -0, w: 0.8496076} + m_LocalRotation: {x: -0, y: 0.5274155, z: -0, w: 0.8496075} m_LocalPosition: {x: 0.16131459, y: 0, z: 0.079859905} m_LocalScale: {x: 0.07479, y: 0.07479, z: 0.07479} m_Children: [] @@ -3559,140 +3560,8 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} m_IsPrefabParent: 0 ---- !u!21 &679948655 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - 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: fa5e3c121495d23458245aacbc4cc29b, 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} ---- !u!1001 &698491862 -Prefab: +--- !u!1001 &698491862 +Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -3920,7 +3789,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 789324033} - m_LocalRotation: {x: -0, y: 0.8961922, z: -0, w: 0.44366607} + m_LocalRotation: {x: -0, y: 0.89619213, z: -0, w: 0.44366622} m_LocalPosition: {x: 0.14313963, y: 0, z: -0.10913776} m_LocalScale: {x: 0.08302312, y: 0.08302312, z: 0.08302314} m_Children: [] @@ -4075,12 +3944,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.87 radialRange: 105 - rows: 3 - cellWidth: 0.3 + Rows: 3 + CellWidth: 0.5 CellHeight: 0 - HorizontalMargin: 0 - VerticalMargin: 0 - DepthMargin: 0 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &790477814 @@ -4512,12 +4381,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 1.2 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 3 + CellWidth: 0.5 CellHeight: 0.3 - HorizontalMargin: 0.2 - VerticalMargin: 0.2 - DepthMargin: 0.2 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!212 &859038168 @@ -4831,12 +4700,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.41 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 1 + CellWidth: 0.2 CellHeight: 0.2 - HorizontalMargin: 0.2 - VerticalMargin: 0.2 - DepthMargin: 0.2 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &907517898 @@ -6159,215 +6028,83 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} m_PrefabInternal: {fileID: 1100076585} ---- !u!21 &1101480097 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - 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: 844c611d8989e904cba0fd67b9536d11, 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} ---- !u!1001 &1130691646 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1813752216} - m_Modifications: - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalPosition.x - value: 0.33258575 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalPosition.y - value: -0.14929087 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalPosition.z - value: -0.8119106 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalRotation.y - value: 0.98116535 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalRotation.w - value: 0.19316977 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_RootOrder - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalScale.x - value: 0.131375 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalScale.y - value: 0.131375 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalScale.z - value: 0.131375 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_Name - value: Model_Platonic (14) - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - m_IsPrefabParent: 0 ---- !u!4 &1130691647 stripped -Transform: - m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - m_PrefabInternal: {fileID: 1130691646} ---- !u!1 &1130691648 stripped -GameObject: - m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - m_PrefabInternal: {fileID: 1130691646} ---- !u!23 &1130691649 stripped -MeshRenderer: - m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, - type: 3} - m_PrefabInternal: {fileID: 1130691646} ---- !u!114 &1130691650 -MonoBehaviour: +--- !u!1001 &1130691646 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.x + value: 0.33258575 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.y + value: -0.14929087 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.z + value: -0.8119106 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.y + value: 0.98116535 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.w + value: 0.19316977 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_RootOrder + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Name + value: Model_Platonic (14) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1130691647 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1130691646} +--- !u!1 &1130691648 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1130691646} +--- !u!23 &1130691649 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 1130691646} +--- !u!114 &1130691650 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -6467,12 +6204,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.4 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 1 + CellWidth: 0.2 CellHeight: 0.2 - HorizontalMargin: 0.2 - VerticalMargin: 0.2 - DepthMargin: 0.2 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1147482681 @@ -6837,103 +6574,235 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1182537054 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1813752216} - m_Modifications: - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalPosition.x - value: 0.22695123 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalPosition.y - value: -0.66433185 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalPosition.z - value: 0.5470432 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalRotation.y - value: 0.19536453 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9807307 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_RootOrder - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalScale.x - value: 0.1289292 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalScale.y - value: 0.12892923 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalScale.z - value: 0.1289292 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} - - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_Name - value: Model_Octa (15) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - m_IsPrefabParent: 0 ---- !u!4 &1182537055 stripped -Transform: - m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - m_PrefabInternal: {fileID: 1182537054} ---- !u!4 &1183937286 stripped -Transform: - m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - m_PrefabInternal: {fileID: 1541459136} ---- !u!1001 &1191971580 -Prefab: +--- !u!21 &1171670877 +Material: + serializedVersion: 6 m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 790477814} - m_Modifications: - - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} - propertyPath: m_LocalPosition.x - value: -0.31178012 - objectReference: {fileID: 0} - - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} - propertyPath: m_LocalPosition.z - value: 0.812215 - objectReference: {fileID: 0} - - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} - propertyPath: m_LocalRotation.x - value: -0.000000059604645 - objectReference: {fileID: 0} - - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} - propertyPath: m_LocalRotation.y - value: -0.18223554 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + 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: fa5e3c121495d23458245aacbc4cc29b, 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1001 &1182537054 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: 0.22695123 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.66433185 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.5470432 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.19536453 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9807307 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.1289292 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.1289292 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (15) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1182537055 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 1182537054} +--- !u!4 &1183937286 stripped +Transform: + m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + m_PrefabInternal: {fileID: 1541459136} +--- !u!1001 &1191971580 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: -0.31178012 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.812215 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: -0.18223554 objectReference: {fileID: 0} - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.z @@ -7206,7 +7075,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1219307209} - m_LocalRotation: {x: -0, y: -0.000000010348027, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0.000000008683296, z: -0, w: 1} m_LocalPosition: {x: -0.00000000372529, y: 0, z: 0.18} m_LocalScale: {x: 0.05751, y: 0.041169997, z: 0.05751} m_Children: [] @@ -7536,38 +7405,170 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1269269383 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1269269384} - - component: {fileID: 1269269385} - m_Layer: 0 - m_Name: MRTKLogo2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1269269384 -Transform: +--- !u!21 &1258448305 +Material: + serializedVersion: 6 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1269269383} - m_LocalRotation: {x: -0, y: -0.40471452, z: -0, w: 0.91444314} - m_LocalPosition: {x: -0.8882122, y: 0, z: 0.8068948} - m_LocalScale: {x: 0.018755898, y: 0.0187559, z: 0.0187559} - m_Children: [] - m_Father: {fileID: 859038169} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1269269385 -SpriteRenderer: - m_ObjectHideFlags: 0 + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + 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: 30699e294936bf6489bb1984d770e07e, 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1 &1269269383 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1269269384} + - component: {fileID: 1269269385} + m_Layer: 0 + m_Name: MRTKLogo2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1269269384 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1269269383} + m_LocalRotation: {x: -0, y: -0.40471452, z: -0, w: 0.91444314} + m_LocalPosition: {x: -0.8882122, y: 0, z: 0.8068948} + m_LocalScale: {x: 0.018755898, y: 0.0187559, z: 0.0187559} + m_Children: [] + m_Father: {fileID: 859038169} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1269269385 +SpriteRenderer: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1269269383} @@ -7835,12 +7836,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.2 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 3 + CellWidth: 0.5 CellHeight: 0.3 - HorizontalMargin: 0 - VerticalMargin: 0 - DepthMargin: 0 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!212 &1313812360 @@ -8044,7 +8045,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1353953882} - m_LocalRotation: {x: -0, y: -0.7401768, z: -0, w: 0.6724123} + m_LocalRotation: {x: -0, y: -0.7401769, z: -0, w: 0.6724123} m_LocalPosition: {x: -0.17917344, y: 0, z: -0.01723021} m_LocalScale: {x: 0.057513956, y: 0.04117186, z: 0.05751395} m_Children: [] @@ -8295,7 +8296,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1801555337} + objectReference: {fileID: 558359276} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (1) @@ -8567,7 +8568,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1454294924} - m_LocalRotation: {x: -0, y: 0.9835004, z: -0, w: -0.18090607} + m_LocalRotation: {x: -0, y: 0.9835004, z: -0, w: -0.18090598} m_LocalPosition: {x: -0.06405162, y: 0, z: -0.16821827} m_LocalScale: {x: 0.07479188, y: 0.07479188, z: 0.07479188} m_Children: [] @@ -8627,103 +8628,235 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1454294924} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1458672178 -Prefab: +--- !u!21 &1457304886 +Material: + serializedVersion: 6 m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 907517898} - m_Modifications: - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalPosition.x - value: 0.38496193 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalPosition.z - value: 0.14108254 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.y - value: 0.57266754 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalRotation.w - value: 0.81978774 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1207221346183892, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_Name - value: ButtonBalloon (5) - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalScale.x - value: 1.6319141 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalScale.y - value: 1.6319138 - objectReference: {fileID: 0} - - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} - propertyPath: m_LocalScale.z - value: 1.6319138 - objectReference: {fileID: 0} - - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: AnimActions.Array.data[0].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: AnimActions.Array.data[1].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: AnimActions.Array.data[2].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: AnimActions.Array.data[3].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: AnimActions.Array.data[4].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: AnimActions.Array.data[5].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 23987754555849932, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 8b4fa37d32efc2547b4954812f85e246, type: 2} - - target: {fileID: 23067865308481886, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 8b4fa37d32efc2547b4954812f85e246, type: 2} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + 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: e2d1418e284d6a84791331a768e88c69, 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1001 &1458672178 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 907517898} + m_Modifications: + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalPosition.x + value: 0.38496193 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalPosition.z + value: 0.14108254 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.y + value: 0.57266754 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalRotation.w + value: 0.81978774 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1207221346183892, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_Name + value: ButtonBalloon (5) + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalScale.x + value: 1.6319141 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalScale.y + value: 1.6319138 + objectReference: {fileID: 0} + - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} + propertyPath: m_LocalScale.z + value: 1.6319138 + objectReference: {fileID: 0} + - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: AnimActions.Array.data[0].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: AnimActions.Array.data[1].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: AnimActions.Array.data[2].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: AnimActions.Array.data[3].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: AnimActions.Array.data[4].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114537197540792740, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: AnimActions.Array.data[5].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23987754555849932, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 8b4fa37d32efc2547b4954812f85e246, type: 2} + - target: {fileID: 23067865308481886, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 8b4fa37d32efc2547b4954812f85e246, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} m_IsPrefabParent: 0 --- !u!1 &1489525909 GameObject: @@ -9221,140 +9354,8 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} m_IsPrefabParent: 0 ---- !u!21 &1593478363 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - 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: e2d1418e284d6a84791331a768e88c69, 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} ---- !u!1001 &1606377935 -Prefab: +--- !u!1001 &1606377935 +Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -9401,7 +9402,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1740259996} + objectReference: {fileID: 1171670877} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (4) @@ -9494,7 +9495,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1101480097} + objectReference: {fileID: 1956893068} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (5) @@ -9868,7 +9869,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1712880174} - m_LocalRotation: {x: -0, y: 0.9835004, z: -0, w: 0.18090607} + m_LocalRotation: {x: -0, y: 0.9835004, z: -0, w: 0.18090598} m_LocalPosition: {x: 0.06405162, y: 0, z: -0.16821827} m_LocalScale: {x: 0.057513688, y: 0.04116752, z: 0.05751369} m_Children: [] @@ -9987,138 +9988,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} m_IsPrefabParent: 0 ---- !u!21 &1740259996 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - 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: fa5e3c121495d23458245aacbc4cc29b, 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} --- !u!1 &1742590019 GameObject: m_ObjectHideFlags: 0 @@ -10320,12 +10189,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.18 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 1 + CellWidth: 0.1 CellHeight: 0.1 - HorizontalMargin: 0.2 - VerticalMargin: 0.2 - DepthMargin: 0.2 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1785529723 @@ -10431,140 +10300,8 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!21 &1801555337 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - 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: 517a5268112b8854e8d807547081e670, 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} ---- !u!1001 &1809495677 -Prefab: +--- !u!1001 &1809495677 +Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -10848,12 +10585,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.89 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 6 + CellWidth: 0.7 CellHeight: 0.3 - HorizontalMargin: 0.3 - VerticalMargin: 0.5 - DepthMargin: 0.5 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1813752216 @@ -11173,7 +10910,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1848865362} - m_LocalRotation: {x: -0, y: -0.52741534, z: -0, w: 0.8496076} + m_LocalRotation: {x: -0, y: -0.5274155, z: -0, w: 0.8496075} m_LocalPosition: {x: -0.16131459, y: 0, z: 0.079859905} m_LocalScale: {x: 0.083019994, y: 0.083019994, z: 0.083019994} m_Children: [] @@ -11302,6 +11039,138 @@ Transform: m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} m_PrefabInternal: {fileID: 2044691128} +--- !u!21 &1872005383 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + 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: fa5e3c121495d23458245aacbc4cc29b, 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} --- !u!4 &1899434004 stripped Transform: m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, @@ -11359,7 +11228,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1904827883} - m_LocalRotation: {x: -0, y: 0.8961922, z: -0, w: -0.44366607} + m_LocalRotation: {x: -0, y: 0.89619213, z: -0, w: -0.44366622} m_LocalPosition: {x: -0.14313963, y: 0, z: -0.10913776} m_LocalScale: {x: 0.08302152, y: 0.083021514, z: 0.083021514} m_Children: [] @@ -11665,6 +11534,138 @@ Transform: m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} m_PrefabInternal: {fileID: 1947383295} +--- !u!21 &1956893068 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + 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: 844c611d8989e904cba0fd67b9536d11, 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} --- !u!4 &1957586992 stripped Transform: m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, @@ -11852,12 +11853,12 @@ MonoBehaviour: IgnoreInactiveTransforms: 1 Radius: 0.71 radialRange: 180 - rows: 3 - cellWidth: 0.5 + Rows: 2 + CellWidth: 0.12 CellHeight: 0.12 - HorizontalMargin: 0.2 - VerticalMargin: 0.2 - DepthMargin: 0.2 + horizontalMargin: 0.2 + verticalMargin: 0.2 + depthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &2001628445 diff --git a/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs b/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs index 7dacc65fb48..f771e40a405 100644 --- a/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs +++ b/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs @@ -76,44 +76,23 @@ public float RadialRange set { radialRange = value; } } - [SerializeField] - [Tooltip("Number of rows per column")] - private int rows = 3; - /// - /// Number of rows per column, column number is automatically determined + /// Number of rows per column (column number is automatically determined). /// - public int Rows - { - get { return rows; } - set { rows = value; } - } - - [SerializeField] - [Tooltip("Width of cell per object")] - private float cellWidth = 0.5f; + [Tooltip("Number of rows per column")] + public int Rows = 3; /// /// Width of the cell per object in the collection. /// - public float CellWidth - { - get { return cellWidth; } - set { cellWidth = value; } - } - - [SerializeField] - [Tooltip("Height of cell per object")] - private float cellHeight = 0.5f; + [Tooltip("Width of cell per object")] + public float CellWidth = 0.5f; /// /// Height of the cell per object in the collection. /// - public float CellHeight - { - get { return cellHeight; } - set { cellHeight = value; } - } + [Tooltip("Height of cell per object")] + public float CellHeight = 0.5f; [SerializeField] [Tooltip("Margin between objects horizontally")]