From 65b770c5ee677af08fdaeaa22644a968e65824b2 Mon Sep 17 00:00:00 2001 From: Dschogo <36862419+Dschogo@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:39:00 +0200 Subject: [PATCH] MapBox ugly UI --- Assets/Marker.mat | 91 ++++++++++++++ Assets/Marker.mat.meta | 8 ++ Assets/Prefabs/Marker.prefab | 117 ++++++++++++++++++ Assets/Prefabs/Marker.prefab.meta | 7 ++ Assets/Resources/ARDK/ArdkAuthConfig.asset | 2 +- Assets/Scenes/SearchGPS.unity | 73 +++++++++-- .../Crate - Surface Shader Scene.mat | 14 ++- ProjectSettings/ProjectSettings.asset | 4 +- 8 files changed, 302 insertions(+), 14 deletions(-) create mode 100644 Assets/Marker.mat create mode 100644 Assets/Marker.mat.meta create mode 100644 Assets/Prefabs/Marker.prefab create mode 100644 Assets/Prefabs/Marker.prefab.meta diff --git a/Assets/Marker.mat b/Assets/Marker.mat new file mode 100644 index 0000000..b52eed0 --- /dev/null +++ b/Assets/Marker.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Marker + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _EMISSION + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_InvalidKeywords: [] + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 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: 0} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 0.5 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EmissionScaleUI: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.233 + - _GlossyReflections: 1 + - _Metallic: 0.482 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 0.1273585, b: 0.90026975, a: 0.0627451} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Marker.mat.meta b/Assets/Marker.mat.meta new file mode 100644 index 0000000..955ad3d --- /dev/null +++ b/Assets/Marker.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d58924545c9224a41adf3133ef5d5110 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Marker.prefab b/Assets/Prefabs/Marker.prefab new file mode 100644 index 0000000..e2b8aa2 --- /dev/null +++ b/Assets/Prefabs/Marker.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3967854370850067798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2359164289772086754} + m_Layer: 0 + m_Name: Marker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2359164289772086754 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3967854370850067798} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.1, z: 0} + m_LocalScale: {x: 15, y: 1, z: 15} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4750922067466627668} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6912448456335495993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4750922067466627668} + - component: {fileID: 6498070004140839578} + - component: {fileID: 2766907402719244813} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4750922067466627668 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6912448456335495993} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 0.01, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2359164289772086754} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6498070004140839578 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6912448456335495993} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2766907402719244813 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6912448456335495993} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d58924545c9224a41adf3133ef5d5110, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Marker.prefab.meta b/Assets/Prefabs/Marker.prefab.meta new file mode 100644 index 0000000..7bd9cce --- /dev/null +++ b/Assets/Prefabs/Marker.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 865d924887afe474cae14cf9b8458598 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ARDK/ArdkAuthConfig.asset b/Assets/Resources/ARDK/ArdkAuthConfig.asset index 5294e0a..6004a79 100644 --- a/Assets/Resources/ARDK/ArdkAuthConfig.asset +++ b/Assets/Resources/ARDK/ArdkAuthConfig.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3e818d7086440451e889be0511048aa6, type: 3} m_Name: ArdkAuthConfig m_EditorClassIdentifier: - _apiKey: + _apiKey: 2dudnWEgKZHuQl4vrYtn diff --git a/Assets/Scenes/SearchGPS.unity b/Assets/Scenes/SearchGPS.unity index 9e3c257..7b38f1d 100644 --- a/Assets/Scenes/SearchGPS.unity +++ b/Assets/Scenes/SearchGPS.unity @@ -489,21 +489,29 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4168681940542294, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} + propertyPath: m_LocalPosition.y + value: 6.61 + objectReference: {fileID: 0} - target: {fileID: 4310658642812482, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 4310658642812482, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4310658642812482, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4310658642812482, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542949352487020, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} + propertyPath: m_LocalScale.x + value: 1 objectReference: {fileID: 0} - target: {fileID: 4542949352487020, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalScale.z @@ -523,7 +531,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4886150424162858, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -6.4 objectReference: {fileID: 0} - target: {fileID: 4886150424162858, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalPosition.z @@ -547,15 +555,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4961856903295740, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4961856903295740, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4961856903295740, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4961856903295740, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} + propertyPath: m_LocalPosition.y + value: 10.17 + objectReference: {fileID: 0} + - target: {fileID: 4961856903295740, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 23386010693667174, guid: 35ce2bb4caba9434db5e656796b632b1, + type: 3} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 114105500206378512, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} @@ -570,7 +591,7 @@ PrefabInstance: - target: {fileID: 114105500206378512, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} propertyPath: _options.locationOptions.zoom - value: 14.3 + value: 15.7 objectReference: {fileID: 0} - target: {fileID: 114105500206378512, guid: 35ce2bb4caba9434db5e656796b632b1, type: 3} @@ -1334,6 +1355,42 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1617435085 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1094528686802348, guid: 35ce2bb4caba9434db5e656796b632b1, + type: 3} + m_PrefabInstance: {fileID: 843921207} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1617435086 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 114105500206378512, guid: 35ce2bb4caba9434db5e656796b632b1, + type: 3} + m_PrefabInstance: {fileID: 843921207} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617435085} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd961b1c9541a4cee99686069ecce852, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1617435089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617435085} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcf32ea2cc0514b569329f6b6b68f9b4, type: 3} + m_Name: + m_EditorClassIdentifier: + _map: {fileID: 1617435086} + _locationStrings: + - 49.85788941651469, 8.558879757745897 + _spawnScale: 3 + _markerPrefab: {fileID: 3967854370850067798, guid: 865d924887afe474cae14cf9b8458598, + type: 3} --- !u!1 &1827718300 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat b/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat index 330b9fb..11d3b97 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat +++ b/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat @@ -2,15 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Crate - Surface Shader Scene m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - m_LightmapFlags: 1 + m_ValidKeywords: + - _EMISSION + - _NORMALMAP + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_InvalidKeywords: [] + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -59,6 +63,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 0.5 - _Cutoff: 0.5 @@ -78,7 +83,8 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0.712} + - _Color: {r: 1, g: 1, b: 1, a: 0.09803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9f89d9e..21d1b3b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -135,7 +135,9 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 1.0.2 - preloadedAssets: [] + preloadedAssets: + - {fileID: -1982227178052435319, guid: 6f70b1763ea9d4749a5714274f31dcd2, type: 2} + - {fileID: 11400000, guid: b29825bfa8e0698458dc3e10b74d8966, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1