diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.cs b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.cs index 5212c39..1d04f21 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.cs +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.cs @@ -321,7 +321,7 @@ private void InitializeCalibraton(Mat frameMat) texture.wrapMode = TextureWrapMode.Clamp; previewQuad.GetComponent().material.mainTexture = texture; - previewQuad.transform.localScale = new Vector3 (1, height/width, 1); + previewQuad.transform.localScale = new Vector3 (0.2f * width / height, 0.2f, 1); float imageSizeScale = 1.0f; diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.unity b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.unity index 688033b..f3c8991 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoCameraCalibrationExample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 @@ -116,9 +115,11 @@ NavMeshSettings: --- !u!1 &21723068 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 21723069} - component: {fileID: 21723071} @@ -133,9 +134,10 @@ GameObject: --- !u!224 &21723069 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 21723068} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -152,9 +154,10 @@ RectTransform: --- !u!114 &21723070 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 21723068} m_Enabled: 1 m_EditorHideFlags: 0 @@ -186,16 +189,19 @@ MonoBehaviour: --- !u!222 &21723071 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 21723068} + m_CullTransparentMesh: 0 --- !u!1 &58547536 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 58547537} - component: {fileID: 58547540} @@ -211,8 +217,9 @@ GameObject: --- !u!224 &58547537 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 58547536} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -231,8 +238,9 @@ RectTransform: --- !u!114 &58547538 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 58547536} m_Enabled: 1 m_EditorHideFlags: 0 @@ -262,8 +270,9 @@ MonoBehaviour: --- !u!114 &58547539 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 58547536} m_Enabled: 1 m_EditorHideFlags: 0 @@ -286,18 +295,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &58547540 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 58547536} + m_CullTransparentMesh: 0 --- !u!1 &66643585 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 66643586} - component: {fileID: 66643588} @@ -312,8 +325,9 @@ GameObject: --- !u!224 &66643586 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 66643585} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -330,8 +344,9 @@ RectTransform: --- !u!114 &66643587 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 66643585} m_Enabled: 1 m_EditorHideFlags: 0 @@ -363,15 +378,19 @@ MonoBehaviour: --- !u!222 &66643588 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 66643585} + m_CullTransparentMesh: 0 --- !u!1 &74903960 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 74903961} - component: {fileID: 74903963} @@ -386,9 +405,10 @@ GameObject: --- !u!224 &74903961 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74903960} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -405,9 +425,10 @@ RectTransform: --- !u!114 &74903962 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74903960} m_Enabled: 1 m_EditorHideFlags: 0 @@ -439,16 +460,19 @@ MonoBehaviour: --- !u!222 &74903963 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74903960} + m_CullTransparentMesh: 0 --- !u!1 &89716558 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 89716559} - component: {fileID: 89716561} @@ -463,8 +487,9 @@ GameObject: --- !u!224 &89716559 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 89716558} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -481,8 +506,9 @@ RectTransform: --- !u!114 &89716560 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 89716558} m_Enabled: 1 m_EditorHideFlags: 0 @@ -505,18 +531,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &89716561 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 89716558} + m_CullTransparentMesh: 0 --- !u!1 &101691100 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 101691101} - component: {fileID: 101691102} @@ -530,8 +560,9 @@ GameObject: --- !u!224 &101691101 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101691100} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -551,8 +582,9 @@ RectTransform: --- !u!114 &101691102 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101691100} m_Enabled: 1 m_EditorHideFlags: 0 @@ -596,9 +628,10 @@ MonoBehaviour: --- !u!1 &167844710 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 167844711} - component: {fileID: 167844712} @@ -612,8 +645,9 @@ GameObject: --- !u!224 &167844711 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 167844710} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -632,8 +666,9 @@ RectTransform: --- !u!114 &167844712 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 167844710} m_Enabled: 1 m_EditorHideFlags: 0 @@ -654,9 +689,10 @@ MonoBehaviour: --- !u!1 &229363022 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 229363023} - component: {fileID: 229363027} @@ -673,8 +709,9 @@ GameObject: --- !u!224 &229363023 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 229363022} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -694,8 +731,9 @@ RectTransform: --- !u!114 &229363024 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 229363022} m_Enabled: 1 m_EditorHideFlags: 0 @@ -713,8 +751,9 @@ MonoBehaviour: --- !u!114 &229363025 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 229363022} m_Enabled: 1 m_EditorHideFlags: 0 @@ -807,8 +846,9 @@ MonoBehaviour: --- !u!114 &229363026 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 229363022} m_Enabled: 1 m_EditorHideFlags: 0 @@ -831,18 +871,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &229363027 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 229363022} + m_CullTransparentMesh: 0 --- !u!1 &254324689 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 254324690} - component: {fileID: 254324693} @@ -858,8 +902,9 @@ GameObject: --- !u!224 &254324690 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 254324689} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -877,8 +922,9 @@ RectTransform: --- !u!114 &254324691 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 254324689} m_Enabled: 1 m_EditorHideFlags: 0 @@ -901,17 +947,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &254324692 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 254324689} + m_CullTransparentMesh: 0 --- !u!114 &254324693 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 254324689} m_Enabled: 1 m_EditorHideFlags: 0 @@ -922,9 +972,11 @@ MonoBehaviour: --- !u!1 &266668974 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 266668975} - component: {fileID: 266668979} @@ -941,9 +993,10 @@ GameObject: --- !u!224 &266668975 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266668974} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -961,9 +1014,10 @@ RectTransform: --- !u!114 &266668976 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266668974} m_Enabled: 1 m_EditorHideFlags: 0 @@ -981,9 +1035,10 @@ MonoBehaviour: --- !u!114 &266668977 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266668974} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1034,9 +1089,10 @@ MonoBehaviour: --- !u!114 &266668978 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266668974} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1059,19 +1115,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &266668979 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266668974} + m_CullTransparentMesh: 0 --- !u!1 &277725961 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 277725962} - component: {fileID: 277725965} @@ -1087,8 +1147,9 @@ GameObject: --- !u!224 &277725962 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277725961} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1107,8 +1168,9 @@ RectTransform: --- !u!114 &277725963 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277725961} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1138,8 +1200,9 @@ MonoBehaviour: --- !u!114 &277725964 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277725961} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1162,18 +1225,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &277725965 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277725961} + m_CullTransparentMesh: 0 --- !u!1 &313085498 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 313085506} - component: {fileID: 313085505} @@ -1194,8 +1261,9 @@ GameObject: --- !u!114 &313085499 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1207,15 +1275,16 @@ MonoBehaviour: --- !u!114 &313085500 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 @@ -1223,8 +1292,9 @@ MonoBehaviour: --- !u!114 &313085501 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Enabled: 0 m_EditorHideFlags: 0 @@ -1243,8 +1313,9 @@ MonoBehaviour: --- !u!65 &313085502 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1255,8 +1326,9 @@ BoxCollider: --- !u!114 &313085503 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1271,8 +1343,9 @@ MonoBehaviour: --- !u!114 &313085504 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1292,8 +1365,9 @@ MonoBehaviour: --- !u!223 &313085505 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Enabled: 1 serializedVersion: 3 @@ -1312,12 +1386,13 @@ Canvas: --- !u!224 &313085506 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 1419009409} m_Father: {fileID: 0} @@ -1331,8 +1406,9 @@ RectTransform: --- !u!114 &313085507 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313085498} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1343,9 +1419,10 @@ MonoBehaviour: --- !u!1 &315922390 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 315922391} - component: {fileID: 315922393} @@ -1360,8 +1437,9 @@ GameObject: --- !u!224 &315922391 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 315922390} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1378,8 +1456,9 @@ RectTransform: --- !u!114 &315922392 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 315922390} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1402,18 +1481,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &315922393 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 315922390} + m_CullTransparentMesh: 0 --- !u!1 &345517296 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 345517297} m_Layer: 5 @@ -1426,8 +1509,9 @@ GameObject: --- !u!224 &345517297 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 345517296} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1445,9 +1529,10 @@ RectTransform: --- !u!1 &348414744 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 348414745} - component: {fileID: 348414747} @@ -1462,8 +1547,9 @@ GameObject: --- !u!224 &348414745 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348414744} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1480,8 +1566,9 @@ RectTransform: --- !u!114 &348414746 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348414744} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1513,15 +1600,18 @@ MonoBehaviour: --- !u!222 &348414747 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348414744} + m_CullTransparentMesh: 0 --- !u!1 &412044042 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 412044043} - component: {fileID: 412044045} @@ -1536,8 +1626,9 @@ GameObject: --- !u!224 &412044043 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 412044042} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1554,8 +1645,9 @@ RectTransform: --- !u!114 &412044044 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 412044042} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1578,70 +1670,74 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &412044045 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 412044042} + m_CullTransparentMesh: 0 --- !u!1001 &414521311 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} + type: 3} propertyPath: Cursor value: objectReference: {fileID: 1793930089} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} --- !u!20 &414521312 stripped Camera: - m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} - m_PrefabInternal: {fileID: 414521311} + m_CorrespondingSourceObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, + type: 3} + m_PrefabInstance: {fileID: 414521311} + m_PrefabAsset: {fileID: 0} --- !u!1 &421401889 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 421401890} - component: {fileID: 421401892} @@ -1656,8 +1752,9 @@ GameObject: --- !u!224 &421401890 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 421401889} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1674,8 +1771,9 @@ RectTransform: --- !u!114 &421401891 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 421401889} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1698,18 +1796,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &421401892 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 421401889} + m_CullTransparentMesh: 0 --- !u!1 &446417940 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 446417941} - component: {fileID: 446417943} @@ -1724,8 +1826,9 @@ GameObject: --- !u!224 &446417941 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 446417940} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1742,8 +1845,9 @@ RectTransform: --- !u!114 &446417942 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 446417940} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1766,18 +1870,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &446417943 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 446417940} + m_CullTransparentMesh: 0 --- !u!1 &491937566 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 491937569} - component: {fileID: 491937568} @@ -1792,8 +1900,9 @@ GameObject: --- !u!114 &491937567 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 491937566} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1825,14 +1934,17 @@ MonoBehaviour: --- !u!222 &491937568 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 491937566} + m_CullTransparentMesh: 0 --- !u!224 &491937569 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 491937566} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1849,9 +1961,10 @@ RectTransform: --- !u!1 &537526438 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 537526439} - component: {fileID: 537526441} @@ -1866,8 +1979,9 @@ GameObject: --- !u!224 &537526439 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537526438} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1884,8 +1998,9 @@ RectTransform: --- !u!114 &537526440 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537526438} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1908,18 +2023,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &537526441 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537526438} + m_CullTransparentMesh: 0 --- !u!1 &563804969 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 563804970} m_Layer: 5 @@ -1932,8 +2051,9 @@ GameObject: --- !u!224 &563804970 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563804969} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1951,9 +2071,11 @@ RectTransform: --- !u!1 &580467252 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 580467253} - component: {fileID: 580467255} @@ -1968,9 +2090,10 @@ GameObject: --- !u!224 &580467253 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580467252} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1987,9 +2110,10 @@ RectTransform: --- !u!114 &580467254 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580467252} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2021,16 +2145,19 @@ MonoBehaviour: --- !u!222 &580467255 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580467252} + m_CullTransparentMesh: 0 --- !u!1 &601187578 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 601187579} - component: {fileID: 601187581} @@ -2045,8 +2172,9 @@ GameObject: --- !u!224 &601187579 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601187578} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2063,8 +2191,9 @@ RectTransform: --- !u!114 &601187580 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601187578} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2087,18 +2216,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &601187581 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601187578} + m_CullTransparentMesh: 0 --- !u!1 &664384079 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 664384080} - component: {fileID: 664384084} @@ -2115,8 +2248,9 @@ GameObject: --- !u!224 &664384080 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664384079} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2135,8 +2269,9 @@ RectTransform: --- !u!114 &664384081 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664384079} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2154,8 +2289,9 @@ MonoBehaviour: --- !u!114 &664384082 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664384079} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2217,8 +2353,9 @@ MonoBehaviour: --- !u!114 &664384083 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664384079} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2241,18 +2378,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &664384084 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664384079} + m_CullTransparentMesh: 0 --- !u!1 &686826706 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 686826707} - component: {fileID: 686826709} @@ -2267,9 +2409,10 @@ GameObject: --- !u!224 &686826707 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 686826706} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2286,9 +2429,10 @@ RectTransform: --- !u!114 &686826708 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 686826706} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2320,16 +2464,19 @@ MonoBehaviour: --- !u!222 &686826709 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 686826706} + m_CullTransparentMesh: 0 --- !u!1 &696734493 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 696734494} - component: {fileID: 696734497} @@ -2345,8 +2492,9 @@ GameObject: --- !u!224 &696734494 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696734493} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2364,8 +2512,9 @@ RectTransform: --- !u!114 &696734495 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696734493} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2410,8 +2559,9 @@ MonoBehaviour: --- !u!114 &696734496 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696734493} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2434,18 +2584,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &696734497 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696734493} + m_CullTransparentMesh: 0 --- !u!1 &696772636 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 696772637} - component: {fileID: 696772639} @@ -2460,9 +2615,10 @@ GameObject: --- !u!224 &696772637 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696772636} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2479,9 +2635,10 @@ RectTransform: --- !u!114 &696772638 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696772636} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2513,16 +2670,19 @@ MonoBehaviour: --- !u!222 &696772639 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696772636} + m_CullTransparentMesh: 0 --- !u!1 &705827132 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 705827133} - component: {fileID: 705827136} @@ -2538,8 +2698,9 @@ GameObject: --- !u!224 &705827133 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705827132} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2557,8 +2718,9 @@ RectTransform: --- !u!114 &705827134 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705827132} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2581,17 +2743,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &705827135 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705827132} + m_CullTransparentMesh: 0 --- !u!114 &705827136 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705827132} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2602,9 +2768,10 @@ MonoBehaviour: --- !u!1 &724712449 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 724712450} - component: {fileID: 724712454} @@ -2621,8 +2788,9 @@ GameObject: --- !u!224 &724712450 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724712449} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2642,8 +2810,9 @@ RectTransform: --- !u!114 &724712451 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724712449} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2661,8 +2830,9 @@ MonoBehaviour: --- !u!114 &724712452 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724712449} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2751,8 +2921,9 @@ MonoBehaviour: --- !u!114 &724712453 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724712449} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2775,18 +2946,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &724712454 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724712449} + m_CullTransparentMesh: 0 --- !u!1 &729747702 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 729747703} - component: {fileID: 729747706} @@ -2802,8 +2977,9 @@ GameObject: --- !u!224 &729747703 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729747702} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2822,8 +2998,9 @@ RectTransform: --- !u!114 &729747704 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729747702} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2853,8 +3030,9 @@ MonoBehaviour: --- !u!114 &729747705 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729747702} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2877,18 +3055,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &729747706 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729747702} + m_CullTransparentMesh: 0 --- !u!1 &756953504 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 756953505} - component: {fileID: 756953507} @@ -2903,8 +3085,9 @@ GameObject: --- !u!224 &756953505 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756953504} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2921,8 +3104,9 @@ RectTransform: --- !u!114 &756953506 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756953504} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2945,18 +3129,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &756953507 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756953504} + m_CullTransparentMesh: 0 --- !u!1 &912303030 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 912303031} - component: {fileID: 912303035} @@ -2973,9 +3162,10 @@ GameObject: --- !u!224 &912303031 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 912303030} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2993,9 +3183,10 @@ RectTransform: --- !u!114 &912303032 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 912303030} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3013,9 +3204,10 @@ MonoBehaviour: --- !u!114 &912303033 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 912303030} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3066,9 +3258,10 @@ MonoBehaviour: --- !u!114 &912303034 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 912303030} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3091,19 +3284,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &912303035 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 912303030} + m_CullTransparentMesh: 0 --- !u!1 &1018481071 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1018481072} - component: {fileID: 1018481073} @@ -3117,8 +3314,9 @@ GameObject: --- !u!224 &1018481072 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018481071} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3138,8 +3336,9 @@ RectTransform: --- !u!114 &1018481073 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018481071} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3183,9 +3382,10 @@ MonoBehaviour: --- !u!1 &1092023888 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1092023889} - component: {fileID: 1092023891} @@ -3200,8 +3400,9 @@ GameObject: --- !u!224 &1092023889 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1092023888} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3218,8 +3419,9 @@ RectTransform: --- !u!114 &1092023890 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1092023888} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3242,18 +3444,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1092023891 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1092023888} + m_CullTransparentMesh: 0 --- !u!1 &1106653298 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1106653299} m_Layer: 5 @@ -3266,8 +3472,9 @@ GameObject: --- !u!224 &1106653299 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1106653298} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3285,9 +3492,11 @@ RectTransform: --- !u!1 &1144110445 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1144110448} - component: {fileID: 1144110447} @@ -3302,9 +3511,10 @@ GameObject: --- !u!114 &1144110446 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1144110445} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3336,16 +3546,19 @@ MonoBehaviour: --- !u!222 &1144110447 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1144110445} + m_CullTransparentMesh: 0 --- !u!224 &1144110448 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1144110445} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3360,53 +3573,58 @@ RectTransform: m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1151483541 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!1 &1160862974 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1160862975} - component: {fileID: 1160862977} @@ -3421,8 +3639,9 @@ GameObject: --- !u!224 &1160862975 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1160862974} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3439,8 +3658,9 @@ RectTransform: --- !u!114 &1160862976 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1160862974} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3472,15 +3692,19 @@ MonoBehaviour: --- !u!222 &1160862977 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1160862974} + m_CullTransparentMesh: 0 --- !u!1 &1177067774 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1177067775} - component: {fileID: 1177067779} @@ -3497,9 +3721,10 @@ GameObject: --- !u!224 &1177067775 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1177067774} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3517,9 +3742,10 @@ RectTransform: --- !u!114 &1177067776 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1177067774} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3537,9 +3763,10 @@ MonoBehaviour: --- !u!114 &1177067777 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1177067774} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3590,9 +3817,10 @@ MonoBehaviour: --- !u!114 &1177067778 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1177067774} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3615,19 +3843,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1177067779 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1177067774} + m_CullTransparentMesh: 0 --- !u!1 &1194828894 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1194828895} - component: {fileID: 1194828897} @@ -3642,8 +3874,9 @@ GameObject: --- !u!224 &1194828895 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194828894} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3660,8 +3893,9 @@ RectTransform: --- !u!114 &1194828896 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194828894} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3693,15 +3927,19 @@ MonoBehaviour: --- !u!222 &1194828897 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194828894} + m_CullTransparentMesh: 0 --- !u!1 &1200307539 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1200307540} - component: {fileID: 1200307544} @@ -3718,9 +3956,10 @@ GameObject: --- !u!224 &1200307540 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1200307539} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3738,9 +3977,10 @@ RectTransform: --- !u!114 &1200307541 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1200307539} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3758,9 +3998,10 @@ MonoBehaviour: --- !u!114 &1200307542 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1200307539} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3811,9 +4052,10 @@ MonoBehaviour: --- !u!114 &1200307543 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1200307539} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3836,19 +4078,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1200307544 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1200307539} + m_CullTransparentMesh: 0 --- !u!1 &1224273890 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1224273891} - component: {fileID: 1224273895} @@ -3865,9 +4112,10 @@ GameObject: --- !u!224 &1224273891 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1224273890} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3885,9 +4133,10 @@ RectTransform: --- !u!114 &1224273892 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1224273890} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3905,9 +4154,10 @@ MonoBehaviour: --- !u!114 &1224273893 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1224273890} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3958,9 +4208,10 @@ MonoBehaviour: --- !u!114 &1224273894 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1224273890} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3983,19 +4234,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1224273895 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1224273890} + m_CullTransparentMesh: 0 --- !u!1 &1226228815 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1226228816} m_Layer: 5 @@ -4008,8 +4263,9 @@ GameObject: --- !u!224 &1226228816 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1226228815} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4027,9 +4283,10 @@ RectTransform: --- !u!1 &1228101179 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1228101180} m_Layer: 5 @@ -4042,8 +4299,9 @@ GameObject: --- !u!224 &1228101180 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1228101179} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4061,9 +4319,10 @@ RectTransform: --- !u!1 &1229642120 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1229642125} - component: {fileID: 1229642124} @@ -4080,8 +4339,9 @@ GameObject: --- !u!114 &1229642121 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229642120} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4148,8 +4408,9 @@ MonoBehaviour: --- !u!114 &1229642122 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229642120} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4172,11 +4433,13 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!114 &1229642123 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229642120} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4194,14 +4457,17 @@ MonoBehaviour: --- !u!222 &1229642124 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229642120} + m_CullTransparentMesh: 0 --- !u!224 &1229642125 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229642120} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4221,9 +4487,10 @@ RectTransform: --- !u!1 &1253649844 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1253649845} - component: {fileID: 1253649848} @@ -4239,8 +4506,9 @@ GameObject: --- !u!224 &1253649845 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253649844} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4258,8 +4526,9 @@ RectTransform: --- !u!114 &1253649846 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253649844} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4304,8 +4573,9 @@ MonoBehaviour: --- !u!114 &1253649847 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253649844} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4328,18 +4598,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1253649848 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253649844} + m_CullTransparentMesh: 0 --- !u!1 &1268744315 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1268744316} - component: {fileID: 1268744318} @@ -4354,8 +4628,9 @@ GameObject: --- !u!224 &1268744316 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268744315} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4372,8 +4647,9 @@ RectTransform: --- !u!114 &1268744317 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268744315} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4405,15 +4681,18 @@ MonoBehaviour: --- !u!222 &1268744318 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268744315} + m_CullTransparentMesh: 0 --- !u!1 &1291169537 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1291169538} - component: {fileID: 1291169540} @@ -4428,8 +4707,9 @@ GameObject: --- !u!224 &1291169538 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1291169537} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4446,8 +4726,9 @@ RectTransform: --- !u!114 &1291169539 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1291169537} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4479,15 +4760,18 @@ MonoBehaviour: --- !u!222 &1291169540 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1291169537} + m_CullTransparentMesh: 0 --- !u!1 &1312029635 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1312029636} - component: {fileID: 1312029638} @@ -4502,8 +4786,9 @@ GameObject: --- !u!224 &1312029636 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1312029635} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4520,8 +4805,9 @@ RectTransform: --- !u!114 &1312029637 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1312029635} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4544,18 +4830,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1312029638 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1312029635} + m_CullTransparentMesh: 0 --- !u!1 &1351606117 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1351606118} - component: {fileID: 1351606120} @@ -4570,8 +4860,9 @@ GameObject: --- !u!224 &1351606118 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351606117} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4588,8 +4879,9 @@ RectTransform: --- !u!114 &1351606119 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351606117} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4612,18 +4904,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1351606120 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351606117} + m_CullTransparentMesh: 0 --- !u!1 &1360384420 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1360384421} - component: {fileID: 1360384423} @@ -4638,8 +4934,9 @@ GameObject: --- !u!224 &1360384421 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1360384420} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4656,8 +4953,9 @@ RectTransform: --- !u!114 &1360384422 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1360384420} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4680,18 +4978,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1360384423 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1360384420} + m_CullTransparentMesh: 0 --- !u!1 &1387117717 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1387117718} - component: {fileID: 1387117721} @@ -4707,8 +5009,9 @@ GameObject: --- !u!224 &1387117718 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387117717} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4726,8 +5029,9 @@ RectTransform: --- !u!114 &1387117719 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387117717} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4750,17 +5054,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1387117720 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387117717} + m_CullTransparentMesh: 0 --- !u!114 &1387117721 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387117717} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4771,9 +5079,10 @@ MonoBehaviour: --- !u!1 &1399266469 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1399266470} - component: {fileID: 1399266473} @@ -4789,8 +5098,9 @@ GameObject: --- !u!224 &1399266470 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1399266469} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4809,8 +5119,9 @@ RectTransform: --- !u!114 &1399266471 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1399266469} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4840,8 +5151,9 @@ MonoBehaviour: --- !u!114 &1399266472 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1399266469} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4864,18 +5176,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1399266473 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1399266469} + m_CullTransparentMesh: 0 --- !u!1 &1411924867 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1411924868} m_Layer: 5 @@ -4888,8 +5204,9 @@ GameObject: --- !u!224 &1411924868 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1411924867} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4907,9 +5224,11 @@ RectTransform: --- !u!1 &1419009408 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100006, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1419009409} - component: {fileID: 1419009410} @@ -4923,9 +5242,10 @@ GameObject: --- !u!224 &1419009409 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1419009408} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4954,9 +5274,10 @@ RectTransform: --- !u!114 &1419009410 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400012, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400012, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1419009408} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4977,9 +5298,10 @@ MonoBehaviour: --- !u!1 &1425543868 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1425543869} - component: {fileID: 1425543871} @@ -4994,8 +5316,9 @@ GameObject: --- !u!224 &1425543869 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1425543868} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5012,8 +5335,9 @@ RectTransform: --- !u!114 &1425543870 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1425543868} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5045,15 +5369,18 @@ MonoBehaviour: --- !u!222 &1425543871 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1425543868} + m_CullTransparentMesh: 0 --- !u!1 &1439360858 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1439360859} - component: {fileID: 1439360860} @@ -5067,8 +5394,9 @@ GameObject: --- !u!224 &1439360859 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1439360858} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5088,8 +5416,9 @@ RectTransform: --- !u!114 &1439360860 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1439360858} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5133,9 +5462,10 @@ MonoBehaviour: --- !u!1 &1440298981 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1440298982} - component: {fileID: 1440298984} @@ -5150,8 +5480,9 @@ GameObject: --- !u!224 &1440298982 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1440298981} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5168,8 +5499,9 @@ RectTransform: --- !u!114 &1440298983 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1440298981} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5192,18 +5524,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1440298984 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1440298981} + m_CullTransparentMesh: 0 --- !u!1 &1499899213 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1499899214} - component: {fileID: 1499899218} @@ -5220,9 +5557,10 @@ GameObject: --- !u!224 &1499899214 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1499899213} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5240,9 +5578,10 @@ RectTransform: --- !u!114 &1499899215 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1499899213} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5260,9 +5599,10 @@ MonoBehaviour: --- !u!114 &1499899216 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1499899213} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5313,9 +5653,10 @@ MonoBehaviour: --- !u!114 &1499899217 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1499899213} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5338,19 +5679,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1499899218 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1499899213} + m_CullTransparentMesh: 0 --- !u!1 &1574495391 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1574495392} m_Layer: 5 @@ -5363,8 +5708,9 @@ GameObject: --- !u!224 &1574495392 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1574495391} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5382,9 +5728,11 @@ RectTransform: --- !u!1 &1585318592 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1585318593} - component: {fileID: 1585318595} @@ -5399,9 +5747,10 @@ GameObject: --- !u!224 &1585318593 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1585318592} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5418,9 +5767,10 @@ RectTransform: --- !u!114 &1585318594 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1585318592} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5452,16 +5802,20 @@ MonoBehaviour: --- !u!222 &1585318595 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1585318592} + m_CullTransparentMesh: 0 --- !u!1 &1620370068 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1620370069} - component: {fileID: 1620370071} @@ -5476,9 +5830,10 @@ GameObject: --- !u!224 &1620370069 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1620370068} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5495,9 +5850,10 @@ RectTransform: --- !u!114 &1620370070 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1620370068} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5529,16 +5885,19 @@ MonoBehaviour: --- !u!222 &1620370071 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1620370068} + m_CullTransparentMesh: 0 --- !u!1 &1669291396 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1669291397} - component: {fileID: 1669291401} @@ -5555,8 +5914,9 @@ GameObject: --- !u!224 &1669291397 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669291396} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5576,8 +5936,9 @@ RectTransform: --- !u!114 &1669291398 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669291396} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5595,8 +5956,9 @@ MonoBehaviour: --- !u!114 &1669291399 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669291396} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5685,8 +6047,9 @@ MonoBehaviour: --- !u!114 &1669291400 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669291396} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5709,18 +6072,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1669291401 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669291396} + m_CullTransparentMesh: 0 --- !u!1 &1699795908 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1699795913} - component: {fileID: 1699795912} @@ -5737,9 +6105,10 @@ GameObject: --- !u!114 &1699795909 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699795908} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5757,9 +6126,10 @@ MonoBehaviour: --- !u!114 &1699795910 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699795908} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5810,9 +6180,10 @@ MonoBehaviour: --- !u!114 &1699795911 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699795908} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5835,19 +6206,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1699795912 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699795908} + m_CullTransparentMesh: 0 --- !u!224 &1699795913 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699795908} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5865,9 +6240,10 @@ RectTransform: --- !u!1 &1709852081 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1709852085} - component: {fileID: 1709852088} @@ -5882,8 +6258,9 @@ GameObject: --- !u!4 &1709852085 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1709852081} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5895,8 +6272,9 @@ Transform: --- !u!114 &1709852087 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1709852081} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5919,8 +6297,9 @@ MonoBehaviour: --- !u!114 &1709852088 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1709852081} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5982,14 +6361,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: HoloLensWithOpenCVForUnityExample.WebCamTextureToMatHelper+ErrorUnityEvent, + m_TypeName: OpenCVForUnity.UnityUtils.Helper.WebCamTextureToMatHelper+ErrorUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + avoidAndroidFrontCameraLowLightIssue: 0 --- !u!1 &1745299525 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1745299526} - component: {fileID: 1745299529} @@ -6005,12 +6386,13 @@ GameObject: --- !u!4 &1745299526 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745299525} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1, y: 1, z: 10} - m_LocalScale: {x: 1, y: 0.7, z: 1} + m_LocalPosition: {x: -0.3, y: 0.2, z: 2.2} + m_LocalScale: {x: 0.354, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1765565190} m_RootOrder: 2 @@ -6018,8 +6400,9 @@ Transform: --- !u!23 &1745299527 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745299525} m_Enabled: 1 m_CastShadows: 1 @@ -6028,6 +6411,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 56562dd66b290634b865ecdd615f8440, type: 2} m_StaticBatchInfo: @@ -6052,8 +6437,9 @@ MeshRenderer: --- !u!64 &1745299528 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745299525} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -6061,91 +6447,98 @@ MeshCollider: serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &1745299529 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745299525} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1765565190 stripped Transform: - m_PrefabParentObject: {fileID: 4587520633816736, guid: d29bc40b7f3df26479d6a0aac211c355, - type: 2} - m_PrefabInternal: {fileID: 1151483541} + m_CorrespondingSourceObject: {fileID: 4587520633816736, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + m_PrefabInstance: {fileID: 1151483541} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1793930088 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - target: {fileID: 108000011213487996, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} + type: 3} propertyPath: m_Range value: 0.01 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 3} --- !u!114 &1793930089 stripped MonoBehaviour: - m_PrefabParentObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} - m_PrefabInternal: {fileID: 1793930088} + m_CorrespondingSourceObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, + type: 3} + m_PrefabInstance: {fileID: 1793930088} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: afa1ae235bc6cfa43addd1435e2fd822, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1793984378 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1793984379} m_Layer: 5 @@ -6158,8 +6551,9 @@ GameObject: --- !u!224 &1793984379 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1793984378} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6177,9 +6571,10 @@ RectTransform: --- !u!1 &1796208266 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1796208267} - component: {fileID: 1796208269} @@ -6194,8 +6589,9 @@ GameObject: --- !u!224 &1796208267 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1796208266} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6212,8 +6608,9 @@ RectTransform: --- !u!114 &1796208268 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1796208266} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6236,18 +6633,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1796208269 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1796208266} + m_CullTransparentMesh: 0 --- !u!1 &1860015351 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1860015354} - component: {fileID: 1860015353} @@ -6262,8 +6663,9 @@ GameObject: --- !u!114 &1860015352 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1860015351} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6295,14 +6697,17 @@ MonoBehaviour: --- !u!222 &1860015353 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1860015351} + m_CullTransparentMesh: 0 --- !u!224 &1860015354 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1860015351} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6319,9 +6724,10 @@ RectTransform: --- !u!1 &1892562365 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1892562366} - component: {fileID: 1892562368} @@ -6336,8 +6742,9 @@ GameObject: --- !u!224 &1892562366 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1892562365} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6354,8 +6761,9 @@ RectTransform: --- !u!114 &1892562367 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1892562365} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6387,15 +6795,18 @@ MonoBehaviour: --- !u!222 &1892562368 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1892562365} + m_CullTransparentMesh: 0 --- !u!1 &1937931446 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1937931447} - component: {fileID: 1937931450} @@ -6411,8 +6822,9 @@ GameObject: --- !u!224 &1937931447 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1937931446} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6430,8 +6842,9 @@ RectTransform: --- !u!114 &1937931448 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1937931446} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6454,17 +6867,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1937931449 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1937931446} + m_CullTransparentMesh: 0 --- !u!114 &1937931450 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1937931446} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6475,9 +6892,10 @@ MonoBehaviour: --- !u!1 &1944918441 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1944918442} - component: {fileID: 1944918444} @@ -6492,8 +6910,9 @@ GameObject: --- !u!224 &1944918442 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1944918441} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6510,8 +6929,9 @@ RectTransform: --- !u!114 &1944918443 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1944918441} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6534,18 +6954,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1944918444 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1944918441} + m_CullTransparentMesh: 0 --- !u!1 &1955760328 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1955760329} - component: {fileID: 1955760330} @@ -6559,8 +6983,9 @@ GameObject: --- !u!224 &1955760329 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955760328} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6580,8 +7005,9 @@ RectTransform: --- !u!114 &1955760330 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955760328} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6625,9 +7051,10 @@ MonoBehaviour: --- !u!1 &1981630455 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1981630456} - component: {fileID: 1981630459} @@ -6643,8 +7070,9 @@ GameObject: --- !u!224 &1981630456 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981630455} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6662,8 +7090,9 @@ RectTransform: --- !u!114 &1981630457 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981630455} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6708,8 +7137,9 @@ MonoBehaviour: --- !u!114 &1981630458 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981630455} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6732,18 +7162,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1981630459 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981630455} + m_CullTransparentMesh: 0 --- !u!1 &1985073062 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1985073063} - component: {fileID: 1985073066} @@ -6759,8 +7193,9 @@ GameObject: --- !u!224 &1985073063 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1985073062} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6778,8 +7213,9 @@ RectTransform: --- !u!114 &1985073064 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1985073062} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6824,8 +7260,9 @@ MonoBehaviour: --- !u!114 &1985073065 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1985073062} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6848,18 +7285,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1985073066 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1985073062} + m_CullTransparentMesh: 0 --- !u!1 &2025090538 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2025090539} - component: {fileID: 2025090541} @@ -6874,8 +7315,9 @@ GameObject: --- !u!224 &2025090539 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2025090538} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6892,8 +7334,9 @@ RectTransform: --- !u!114 &2025090540 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2025090538} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6916,18 +7359,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2025090541 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2025090538} + m_CullTransparentMesh: 0 --- !u!1 &2135101455 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2135101456} - component: {fileID: 2135101460} @@ -6944,9 +7392,10 @@ GameObject: --- !u!224 &2135101456 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135101455} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6964,9 +7413,10 @@ RectTransform: --- !u!114 &2135101457 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135101455} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6984,9 +7434,10 @@ MonoBehaviour: --- !u!114 &2135101458 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135101455} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7037,9 +7488,10 @@ MonoBehaviour: --- !u!114 &2135101459 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135101455} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7062,10 +7514,13 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2135101460 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135101455} + m_CullTransparentMesh: 0 diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.cs b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.cs index e528f0e..672521a 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.cs +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.cs @@ -281,7 +281,7 @@ public void OnWebCamTextureToMatHelperInitialized () texture = new Texture2D ((int)width, (int)height, TextureFormat.RGB24, false); previewQuad.GetComponent().material.mainTexture = texture; - previewQuad.transform.localScale = new Vector3 (1, height/width, 1); + previewQuad.transform.localScale = new Vector3 (0.2f * width / height, 0.2f, 1); previewQuad.SetActive (displayCameraPreview); diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.unity b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.unity index 9372ce9..f24079c 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/HoloLensArUcoExample.unity @@ -813,7 +813,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 @@ -920,8 +920,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 471094658} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 110278493} - {fileID: 1419009409} @@ -973,8 +973,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 524242140} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1, y: 1, z: 10} - m_LocalScale: {x: 1, y: 0.7, z: 1} + m_LocalPosition: {x: -0.3, y: 0.2, z: 2.2} + m_LocalScale: {x: 0.354, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1600368325} m_RootOrder: 2 @@ -1927,6 +1927,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!20 &1080557610 stripped @@ -3214,7 +3219,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8d27c020f1865746b5abf91a35964df, type: 3} m_Name: m_EditorClassIdentifier: - _downscaleRatio: 3 + _downscaleRatio: 2 _frameSkippingRatio: 2 --- !u!4 &1709852085 Transform: @@ -3254,10 +3259,10 @@ MonoBehaviour: arCube: {fileID: 883805531} arGameObject: {fileID: 1982842541} arCamera: {fileID: 1080557610} - enableLowPassFilter: 1 + enableLowPassFilter: 0 enableLowPassFilterToggle: {fileID: 364483433} positionLowPass: 0.02 - rotationLowPass: 2 + rotationLowPass: 3 --- !u!1 &1982842541 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.cs b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.cs index e44ced9..92411e9 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.cs +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.cs @@ -281,7 +281,7 @@ public void OnFrameMatAcquired (Mat bgraMat, Matrix4x4 projectionMatrix, Matrix4 // Position the canvas object slightly in front // of the real world web camera. Vector3 position = cameraToWorldMatrix.GetColumn (3) - cameraToWorldMatrix.GetColumn (2); - position *= 1.2f; + position *= 2.2f; // Rotate the canvas object so that it faces the user. Quaternion rotation = Quaternion.LookRotation (-cameraToWorldMatrix.GetColumn (2), cameraToWorldMatrix.GetColumn (1)); @@ -336,13 +336,13 @@ void Update () maskPixels [i] = 0; if (grayPixels [i] < 70) { - grayPixels [i] = 0; + grayPixels[i] = 0; maskPixels [i] = 1; } else if (70 <= grayPixels [i] && grayPixels [i] < 120) { grayPixels [i] = 100; } else { - grayPixels [i] = 255; + grayPixels[i] = 255; maskPixels [i] = 1; } } @@ -387,7 +387,7 @@ void Update () // Position the canvas object slightly in front // of the real world web camera. Vector3 position = cameraToWorldMatrix.GetColumn (3) - cameraToWorldMatrix.GetColumn (2); - position *= 1.2f; + position *= 2.2f; // Rotate the canvas object so that it faces the user. Quaternion rotation = Quaternion.LookRotation (-cameraToWorldMatrix.GetColumn (2), cameraToWorldMatrix.GetColumn (1)); diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.unity b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.unity index 1288be0..d9da52c 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensComicFilterExample/HoloLensComicFilterExample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 @@ -90,7 +89,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -116,9 +115,10 @@ NavMeshSettings: --- !u!1 &62512751 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 62512752} - component: {fileID: 62512755} @@ -134,8 +134,9 @@ GameObject: --- !u!224 &62512752 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62512751} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -157,8 +158,9 @@ RectTransform: --- !u!114 &62512753 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62512751} m_Enabled: 1 m_EditorHideFlags: 0 @@ -179,8 +181,9 @@ MonoBehaviour: --- !u!114 &62512754 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62512751} m_Enabled: 0 m_EditorHideFlags: 0 @@ -203,18 +206,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &62512755 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62512751} + m_CullTransparentMesh: 0 --- !u!114 &68990086 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968596576} m_Enabled: 1 m_EditorHideFlags: 0 @@ -265,9 +272,10 @@ MonoBehaviour: --- !u!114 &68990087 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968596576} m_Enabled: 1 m_EditorHideFlags: 0 @@ -290,19 +298,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &68990089 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968596576} + m_CullTransparentMesh: 0 --- !u!1 &92177783 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188612, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 188612, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 92177784} - component: {fileID: 92177788} @@ -319,9 +332,10 @@ GameObject: --- !u!224 &92177784 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22472068, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 22472068, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92177783} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -339,9 +353,10 @@ RectTransform: --- !u!114 &92177785 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11496388, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 11496388, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92177783} m_Enabled: 1 m_EditorHideFlags: 0 @@ -359,9 +374,10 @@ MonoBehaviour: --- !u!114 &92177786 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11479360, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 11479360, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92177783} m_Enabled: 1 m_EditorHideFlags: 0 @@ -412,9 +428,10 @@ MonoBehaviour: --- !u!114 &92177787 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11403094, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 11403094, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92177783} m_Enabled: 1 m_EditorHideFlags: 0 @@ -437,61 +454,70 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &92177788 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22294810, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 22294810, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92177783} + m_CullTransparentMesh: 0 --- !u!1001 &126543020 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!1 &262962544 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 166030, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 166030, guid: ef10ac26c869d1a48b3448396dc1cd46, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 262962545} - component: {fileID: 262962547} @@ -506,9 +532,10 @@ GameObject: --- !u!224 &262962545 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22482168, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 22482168, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 262962544} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -525,9 +552,10 @@ RectTransform: --- !u!114 &262962546 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11497250, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 11497250, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 262962544} m_Enabled: 1 m_EditorHideFlags: 0 @@ -559,21 +587,26 @@ MonoBehaviour: --- !u!222 &262962547 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22222354, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 22222354, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 262962544} + m_CullTransparentMesh: 0 --- !u!4 &270024293 stripped Transform: - m_PrefabParentObject: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, - type: 2} - m_PrefabInternal: {fileID: 864547286} + m_CorrespondingSourceObject: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, + type: 3} + m_PrefabInstance: {fileID: 864547286} + m_PrefabAsset: {fileID: 0} --- !u!1 &476606573 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 123802, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 123802, guid: ef10ac26c869d1a48b3448396dc1cd46, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 476606574} - component: {fileID: 476606578} @@ -590,9 +623,10 @@ GameObject: --- !u!224 &476606574 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22449066, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 22449066, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476606573} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -610,9 +644,10 @@ RectTransform: --- !u!114 &476606575 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11463280, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 11463280, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476606573} m_Enabled: 1 m_EditorHideFlags: 0 @@ -630,9 +665,10 @@ MonoBehaviour: --- !u!114 &476606576 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11498476, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 11498476, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476606573} m_Enabled: 1 m_EditorHideFlags: 0 @@ -683,9 +719,10 @@ MonoBehaviour: --- !u!114 &476606577 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11435532, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 11435532, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476606573} m_Enabled: 1 m_EditorHideFlags: 0 @@ -708,19 +745,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &476606578 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22207098, guid: ef10ac26c869d1a48b3448396dc1cd46, + m_CorrespondingSourceObject: {fileID: 22207098, guid: ef10ac26c869d1a48b3448396dc1cd46, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476606573} + m_CullTransparentMesh: 0 --- !u!1 &801376160 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100000, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 801376161} - component: {fileID: 968596578} @@ -735,9 +777,10 @@ GameObject: --- !u!224 &801376161 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801376160} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -754,9 +797,10 @@ RectTransform: --- !u!114 &801376162 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801376160} m_Enabled: 1 m_EditorHideFlags: 0 @@ -786,87 +830,88 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: Change Camera --- !u!1001 &864547286 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1478280153} m_Modifications: - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 1000011443254168, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000012084356042, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000012084356042, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalScale.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 4000012084356042, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012084356042, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalScale.y value: 5 objectReference: {fileID: 0} - - target: {fileID: 4000012084356042, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} + - target: {fileID: 4000012084356042, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} propertyPath: m_LocalScale.z value: 5 objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4000012520274942, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114814769360254126, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, - type: 2} + type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - target: {fileID: 114000014245746336, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, - type: 2} + type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 1000011443254168, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: c828c5b9571ec9c4bb75aef2ba6bc8c5, type: 3} --- !u!1 &968596576 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 968596579} - component: {fileID: 68990089} @@ -883,9 +928,10 @@ GameObject: --- !u!114 &968596577 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968596576} m_Enabled: 1 m_EditorHideFlags: 0 @@ -903,16 +949,19 @@ MonoBehaviour: --- !u!222 &968596578 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200000, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801376160} + m_CullTransparentMesh: 0 --- !u!224 &968596579 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968596576} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -930,9 +979,10 @@ RectTransform: --- !u!1 &1076083694 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1076083699} - component: {fileID: 1076083698} @@ -950,8 +1000,9 @@ GameObject: --- !u!114 &1076083695 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_Enabled: 1 m_EditorHideFlags: 0 @@ -964,8 +1015,9 @@ MonoBehaviour: --- !u!23 &1076083696 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_Enabled: 1 m_CastShadows: 1 @@ -974,6 +1026,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 88de79a80cfa4dc42a041ce745ba291f, type: 2} m_StaticBatchInfo: @@ -998,8 +1052,9 @@ MeshRenderer: --- !u!64 &1076083697 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1007,24 +1062,25 @@ MeshCollider: serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &1076083698 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1076083699 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.2} - m_LocalScale: {x: 1.77, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 2.2} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1032,8 +1088,9 @@ Transform: --- !u!114 &1076083702 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1095,14 +1152,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: HoloLensWithOpenCVForUnityExample.WebCamTextureToMatHelper+ErrorUnityEvent, + m_TypeName: OpenCVForUnity.UnityUtils.Helper.WebCamTextureToMatHelper+ErrorUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + avoidAndroidFrontCameraLowLightIssue: 0 --- !u!1 &1197189831 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100010, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1197189832} - component: {fileID: 1197189836} @@ -1119,9 +1179,10 @@ GameObject: --- !u!224 &1197189832 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197189831} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1139,9 +1200,10 @@ RectTransform: --- !u!114 &1197189833 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400016, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197189831} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1159,9 +1221,10 @@ MonoBehaviour: --- !u!114 &1197189834 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400018, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197189831} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1212,9 +1275,10 @@ MonoBehaviour: --- !u!114 &1197189835 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400020, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197189831} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1237,19 +1301,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1197189836 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197189831} + m_CullTransparentMesh: 0 --- !u!1 &1219316875 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1219316876} - component: {fileID: 1219316878} @@ -1264,9 +1333,10 @@ GameObject: --- !u!224 &1219316876 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219316875} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1283,9 +1353,10 @@ RectTransform: --- !u!114 &1219316877 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219316875} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1317,16 +1388,20 @@ MonoBehaviour: --- !u!222 &1219316878 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219316875} + m_CullTransparentMesh: 0 --- !u!1 &1336348342 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 143612, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 143612, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1336348343} - component: {fileID: 1336348345} @@ -1341,9 +1416,10 @@ GameObject: --- !u!224 &1336348343 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22481454, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 22481454, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1336348342} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1360,9 +1436,10 @@ RectTransform: --- !u!114 &1336348344 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11407456, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 11407456, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1336348342} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1394,16 +1471,20 @@ MonoBehaviour: --- !u!222 &1336348345 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22257296, guid: a7adb102e6f4d0249b72d9d082d2a9b4, + m_CorrespondingSourceObject: {fileID: 22257296, guid: a7adb102e6f4d0249b72d9d082d2a9b4, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1336348342} + m_CullTransparentMesh: 0 --- !u!1 &1343783942 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 177858, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 177858, guid: ec8add3647f6760478660247afb7b9da, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1343783943} - component: {fileID: 1343783947} @@ -1420,9 +1501,10 @@ GameObject: --- !u!224 &1343783943 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22452716, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 22452716, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343783942} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1440,9 +1522,10 @@ RectTransform: --- !u!114 &1343783944 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11492300, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 11492300, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343783942} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1460,9 +1543,10 @@ MonoBehaviour: --- !u!114 &1343783945 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11447584, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 11447584, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343783942} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1513,9 +1597,10 @@ MonoBehaviour: --- !u!114 &1343783946 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11469520, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 11469520, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343783942} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1538,19 +1623,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1343783947 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22296948, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 22296948, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343783942} + m_CullTransparentMesh: 0 --- !u!1 &1478280149 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1478280153} - component: {fileID: 1478280152} @@ -1571,8 +1660,9 @@ GameObject: --- !u!114 &1478280150 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1587,8 +1677,9 @@ MonoBehaviour: --- !u!114 &1478280151 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1608,8 +1699,9 @@ MonoBehaviour: --- !u!223 &1478280152 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Enabled: 1 serializedVersion: 3 @@ -1628,12 +1720,13 @@ Canvas: --- !u!224 &1478280153 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 62512752} - {fileID: 270024293} @@ -1648,15 +1741,16 @@ RectTransform: --- !u!114 &1478280154 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 @@ -1664,8 +1758,9 @@ MonoBehaviour: --- !u!114 &1478280155 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Enabled: 0 m_EditorHideFlags: 0 @@ -1684,8 +1779,9 @@ MonoBehaviour: --- !u!65 &1478280156 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1696,8 +1792,9 @@ BoxCollider: --- !u!114 &1478280157 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1709,8 +1806,9 @@ MonoBehaviour: --- !u!114 &1478280158 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1719,133 +1817,135 @@ MonoBehaviour: m_EditorClassIdentifier: Canvas: {fileID: 1478280152} --- !u!1001 &1492569179 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - target: {fileID: 108000011213487996, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} + type: 3} propertyPath: m_Range value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} - propertyPath: DefaultCursorDistance - value: 1.2 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 3} --- !u!114 &1492569180 stripped MonoBehaviour: - m_PrefabParentObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} - m_PrefabInternal: {fileID: 1492569179} + m_CorrespondingSourceObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, + type: 3} + m_PrefabInstance: {fileID: 1492569179} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: afa1ae235bc6cfa43addd1435e2fd822, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1972617040 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} + type: 3} propertyPath: Cursor value: objectReference: {fileID: 1492569180} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} --- !u!20 &1972617041 stripped Camera: - m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} - m_PrefabInternal: {fileID: 1972617040} + m_CorrespondingSourceObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, + type: 3} + m_PrefabInstance: {fileID: 1972617040} + m_PrefabAsset: {fileID: 0} --- !u!1 &2007257836 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 122042, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 122042, guid: ec8add3647f6760478660247afb7b9da, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2007257839} - component: {fileID: 2007257838} @@ -1860,9 +1960,10 @@ GameObject: --- !u!114 &2007257837 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11452160, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 11452160, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2007257836} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1894,16 +1995,19 @@ MonoBehaviour: --- !u!222 &2007257838 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22229166, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 22229166, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2007257836} + m_CullTransparentMesh: 0 --- !u!224 &2007257839 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22486416, guid: ec8add3647f6760478660247afb7b9da, + m_CorrespondingSourceObject: {fileID: 22486416, guid: ec8add3647f6760478660247afb7b9da, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2007257836} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.cs b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.cs index 51594b9..d6e5a26 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.cs +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.cs @@ -427,7 +427,7 @@ public void OnFrameMatAcquired (Mat bgraMat, Matrix4x4 projectionMatrix, Matrix4 // Position the canvas object slightly in front // of the real world web camera. Vector3 position = cameraToWorldMatrix.GetColumn (3) - cameraToWorldMatrix.GetColumn (2); - position *= 1.2f; + position *= 2.2f; // Rotate the canvas object so that it faces the user. Quaternion rotation = Quaternion.LookRotation (-cameraToWorldMatrix.GetColumn (2), cameraToWorldMatrix.GetColumn (1)); @@ -589,7 +589,7 @@ void Update () // Position the canvas object slightly in front // of the real world web camera. Vector3 position = cameraToWorldMatrix.GetColumn (3) - cameraToWorldMatrix.GetColumn (2); - position *= 1.2f; + position *= 2.2f; // Rotate the canvas object so that it faces the user. Quaternion rotation = Quaternion.LookRotation (-cameraToWorldMatrix.GetColumn (2), cameraToWorldMatrix.GetColumn (1)); diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.unity b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.unity index fca2209..9473741 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionExample/HoloLensFaceDetectionExample.unity @@ -622,6 +622,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!1 &262962544 @@ -1538,8 +1543,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.2} - m_LocalScale: {x: 1.77, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 2.2} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -2547,8 +2552,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 270024293} - {fileID: 62512752} @@ -2572,7 +2577,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 @@ -2682,11 +2687,6 @@ PrefabInstance: propertyPath: m_Range value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, - type: 3} - propertyPath: DefaultCursorDistance - value: 1.2 - objectReference: {fileID: 0} - target: {fileID: 4000013144497514, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.x value: 0.001 diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.cs b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.cs index 6a87b79..315e5a9 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.cs +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.cs @@ -55,7 +55,7 @@ public class HoloLensFaceDetectionOverlayExample : ExampleSceneBase /// /// The overlay Distance. /// - public float overlayDistance = 1.2f; + public float overlayDistance = 2.2f; /// /// The webcam texture to mat helper. diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.unity b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.unity index a2befe1..c283e02 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensFaceDetectionOverlayExample/HoloLensFaceDetectionOverlayExample.unity @@ -750,6 +750,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!1 &538427539 @@ -1088,7 +1093,7 @@ MonoBehaviour: enableDownScale: 0 enableDownScaleToggle: {fileID: 1198966548} minDetectionSizeRatio: 0.07 - overlayDistance: 1.2 + overlayDistance: 2.2 --- !u!23 &1076083696 MeshRenderer: m_ObjectHideFlags: 0 @@ -1156,8 +1161,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076083694} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.2} - m_LocalScale: {x: 1.77, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 2.2} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -2063,8 +2068,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478280149} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 270024293} - {fileID: 62512752} @@ -2088,7 +2093,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.cs b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.cs index 4f08e60..24b1226 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.cs +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.cs @@ -206,7 +206,7 @@ void OnPhotoCaptured (PhotoCapture.PhotoCaptureResult result, PhotoCaptureFrame // Position the canvas object slightly in front // of the real world web camera. Vector3 position = cameraToWorldMatrix.GetColumn (3) - cameraToWorldMatrix.GetColumn (2); - position *= 1.2f; + position *= 2.2f; // Rotate the canvas object so that it faces the user. Quaternion rotation = Quaternion.LookRotation (-cameraToWorldMatrix.GetColumn (2), cameraToWorldMatrix.GetColumn (1)); diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.unity b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.unity index d78283d..fb90a15 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensPhotoCaptureExample/HoloLensPhotoCaptureExample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -116,9 +115,10 @@ NavMeshSettings: --- !u!1 &34117363 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 34117367} - component: {fileID: 34117366} @@ -135,8 +135,9 @@ GameObject: --- !u!23 &34117364 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34117363} m_Enabled: 1 m_CastShadows: 1 @@ -145,6 +146,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 88de79a80cfa4dc42a041ce745ba291f, type: 2} m_StaticBatchInfo: @@ -169,8 +172,9 @@ MeshRenderer: --- !u!64 &34117365 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34117363} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -178,24 +182,25 @@ MeshCollider: serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &34117366 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34117363} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &34117367 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34117363} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.2} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 2.2} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -203,8 +208,9 @@ Transform: --- !u!114 &34117368 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34117363} m_Enabled: 1 m_EditorHideFlags: 0 @@ -212,58 +218,69 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: --- !u!1001 &116875595 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 4587520633816736, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!20 &228639285 stripped Camera: - m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} - m_PrefabInternal: {fileID: 2060851756} + m_CorrespondingSourceObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, + type: 3} + m_PrefabInstance: {fileID: 2060851756} + m_PrefabAsset: {fileID: 0} --- !u!1 &314898261 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100008, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 314898262} - component: {fileID: 314898264} @@ -278,9 +295,10 @@ GameObject: --- !u!224 &314898262 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 314898261} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -297,9 +315,10 @@ RectTransform: --- !u!114 &314898263 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400014, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 314898261} m_Enabled: 1 m_EditorHideFlags: 0 @@ -331,16 +350,19 @@ MonoBehaviour: --- !u!222 &314898264 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 314898261} + m_CullTransparentMesh: 0 --- !u!1 &1204382163 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1204382171} - component: {fileID: 1204382170} @@ -361,8 +383,9 @@ GameObject: --- !u!114 &1204382164 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Enabled: 1 m_EditorHideFlags: 0 @@ -374,15 +397,16 @@ MonoBehaviour: --- !u!114 &1204382165 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 @@ -390,8 +414,9 @@ MonoBehaviour: --- !u!114 &1204382166 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Enabled: 0 m_EditorHideFlags: 0 @@ -410,8 +435,9 @@ MonoBehaviour: --- !u!65 &1204382167 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -422,8 +448,9 @@ BoxCollider: --- !u!114 &1204382168 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Enabled: 1 m_EditorHideFlags: 0 @@ -438,8 +465,9 @@ MonoBehaviour: --- !u!114 &1204382169 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Enabled: 1 m_EditorHideFlags: 0 @@ -459,8 +487,9 @@ MonoBehaviour: --- !u!223 &1204382170 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Enabled: 1 serializedVersion: 3 @@ -479,12 +508,13 @@ Canvas: --- !u!224 &1204382171 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 1267244721} m_Father: {fileID: 0} @@ -498,8 +528,9 @@ RectTransform: --- !u!114 &1204382172 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204382163} m_Enabled: 1 m_EditorHideFlags: 0 @@ -510,9 +541,10 @@ MonoBehaviour: --- !u!1 &1267244720 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1267244721} - component: {fileID: 1267244724} @@ -528,8 +560,9 @@ GameObject: --- !u!224 &1267244721 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1267244720} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -547,8 +580,9 @@ RectTransform: --- !u!114 &1267244722 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1267244720} m_Enabled: 1 m_EditorHideFlags: 0 @@ -569,8 +603,9 @@ MonoBehaviour: --- !u!114 &1267244723 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1267244720} m_Enabled: 0 m_EditorHideFlags: 0 @@ -593,88 +628,93 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1267244724 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1267244720} + m_CullTransparentMesh: 0 --- !u!114 &1725320204 stripped MonoBehaviour: - m_PrefabParentObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} - m_PrefabInternal: {fileID: 1880953870} + m_CorrespondingSourceObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, + type: 3} + m_PrefabInstance: {fileID: 1880953870} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: afa1ae235bc6cfa43addd1435e2fd822, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1880953870 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - target: {fileID: 108000011213487996, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} + type: 3} propertyPath: m_Range value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} - propertyPath: DefaultCursorDistance - value: 1.2 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 3} --- !u!1 &2053462721 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100004, guid: 4859e20a6237a7041959573320b6a033, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2053462722} - component: {fileID: 2053462726} @@ -691,9 +731,10 @@ GameObject: --- !u!224 &2053462722 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22400004, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053462721} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -711,9 +752,10 @@ RectTransform: --- !u!114 &2053462723 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400006, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053462721} m_Enabled: 1 m_EditorHideFlags: 0 @@ -731,9 +773,10 @@ MonoBehaviour: --- !u!114 &2053462724 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400008, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053462721} m_Enabled: 1 m_EditorHideFlags: 0 @@ -784,9 +827,10 @@ MonoBehaviour: --- !u!114 &2053462725 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 11400010, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053462721} m_Enabled: 1 m_EditorHideFlags: 0 @@ -809,57 +853,59 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2053462726 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, + m_CorrespondingSourceObject: {fileID: 22200002, guid: 4859e20a6237a7041959573320b6a033, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053462721} + m_CullTransparentMesh: 0 --- !u!1001 &2060851756 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} + type: 3} propertyPath: Cursor value: objectReference: {fileID: 1725320204} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} diff --git a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensWithOpenCVForUnityExample.unity b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensWithOpenCVForUnityExample.unity index c8bd859..833878f 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/HoloLensWithOpenCVForUnityExample.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/HoloLensWithOpenCVForUnityExample.unity @@ -1070,8 +1070,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965925560} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 1899556538} m_Father: {fileID: 0} @@ -1171,7 +1171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 @@ -1574,6 +1574,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!1 &1084706036 diff --git a/Assets/HoloLensWithOpenCVForUnityExample/ShowLicense.unity b/Assets/HoloLensWithOpenCVForUnityExample/ShowLicense.unity index 2859417..fbf93f8 100644 --- a/Assets/HoloLensWithOpenCVForUnityExample/ShowLicense.unity +++ b/Assets/HoloLensWithOpenCVForUnityExample/ShowLicense.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 @@ -90,7 +89,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -116,9 +115,11 @@ NavMeshSettings: --- !u!1 &110107916 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 192634, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 192634, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 110107917} - component: {fileID: 110107921} @@ -135,9 +136,10 @@ GameObject: --- !u!224 &110107917 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22402038, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22402038, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110107916} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -155,9 +157,10 @@ RectTransform: --- !u!114 &110107918 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11458188, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11458188, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110107916} m_Enabled: 1 m_EditorHideFlags: 0 @@ -180,19 +183,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &110107919 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22245806, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22245806, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110107916} + m_CullTransparentMesh: 0 --- !u!114 &110107920 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11499568, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11499568, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110107916} m_Enabled: 1 m_EditorHideFlags: 0 @@ -203,9 +210,10 @@ MonoBehaviour: --- !u!114 &110107921 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11499518, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11499518, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110107916} m_Enabled: 1 m_EditorHideFlags: 0 @@ -233,58 +241,64 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1001 &113481611 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} + - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, - type: 2} + type: 3} propertyPath: m_ClearFlags value: 1 objectReference: {fileID: 0} + - target: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 3} + propertyPath: far clip plane + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3} --- !u!1 &222236842 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 193042, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 193042, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 222236843} m_Layer: 5 @@ -297,9 +311,10 @@ GameObject: --- !u!224 &222236843 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22466660, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22466660, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 222236842} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -317,9 +332,11 @@ RectTransform: --- !u!1 &593276356 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 161536, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 161536, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 593276357} - component: {fileID: 593276360} @@ -335,9 +352,10 @@ GameObject: --- !u!224 &593276357 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22462342, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22462342, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593276356} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -354,9 +372,10 @@ RectTransform: --- !u!114 &593276358 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11497886, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11497886, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593276356} m_Enabled: 1 m_EditorHideFlags: 0 @@ -368,9 +387,10 @@ MonoBehaviour: --- !u!114 &593276359 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11424936, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11424936, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593276356} m_Enabled: 1 m_EditorHideFlags: 0 @@ -426,68 +446,72 @@ MonoBehaviour: --- !u!222 &593276360 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22261078, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22261078, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593276356} + m_CullTransparentMesh: 0 --- !u!1001 &697584198 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} + type: 3} propertyPath: Cursor value: objectReference: {fileID: 1252979787} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 3} --- !u!20 &697584199 stripped Camera: - m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} - m_PrefabInternal: {fileID: 697584198} + m_CorrespondingSourceObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, + type: 3} + m_PrefabInstance: {fileID: 697584198} + m_PrefabAsset: {fileID: 0} --- !u!1 &737810279 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 174812, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 174812, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 737810280} - component: {fileID: 737810283} @@ -508,13 +532,14 @@ GameObject: --- !u!224 &737810280 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22425728, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22425728, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} - m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_Children: - {fileID: 2108325106} - {fileID: 1154483357} @@ -529,9 +554,10 @@ RectTransform: --- !u!114 &737810281 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11467790, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11467790, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Enabled: 1 m_EditorHideFlags: 0 @@ -546,9 +572,10 @@ MonoBehaviour: --- !u!114 &737810282 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11435054, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11435054, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Enabled: 1 m_EditorHideFlags: 0 @@ -568,9 +595,10 @@ MonoBehaviour: --- !u!223 &737810283 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22303112, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22303112, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Enabled: 1 serializedVersion: 3 @@ -589,8 +617,9 @@ Canvas: --- !u!114 &737810284 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Enabled: 1 m_EditorHideFlags: 0 @@ -602,15 +631,16 @@ MonoBehaviour: --- !u!114 &737810285 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2be8bd2ebd8277c448d6d81c75517fee, type: 3} m_Name: m_EditorClassIdentifier: - TagalongDistance: 1.1 + TagalongDistance: 2 EnforceDistance: 1 PositionUpdateSpeed: 9.8 SmoothMotion: 1 @@ -618,8 +648,9 @@ MonoBehaviour: --- !u!114 &737810286 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Enabled: 0 m_EditorHideFlags: 0 @@ -638,8 +669,9 @@ MonoBehaviour: --- !u!65 &737810287 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -650,8 +682,9 @@ BoxCollider: --- !u!114 &737810288 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737810279} m_Enabled: 1 m_EditorHideFlags: 0 @@ -662,9 +695,10 @@ MonoBehaviour: --- !u!1 &993264510 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 993264512} - component: {fileID: 993264511} @@ -678,8 +712,9 @@ GameObject: --- !u!114 &993264511 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 993264510} m_Enabled: 1 m_EditorHideFlags: 0 @@ -689,8 +724,9 @@ MonoBehaviour: --- !u!4 &993264512 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 993264510} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -702,9 +738,11 @@ Transform: --- !u!1 &1154483356 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 140666, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 140666, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1154483357} m_Layer: 5 @@ -717,9 +755,10 @@ GameObject: --- !u!224 &1154483357 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22453444, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22453444, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1154483356} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -736,59 +775,66 @@ RectTransform: m_SizeDelta: {x: -40, y: -90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1252979786 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} + - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 3} --- !u!114 &1252979787 stripped MonoBehaviour: - m_PrefabParentObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, - type: 2} - m_PrefabInternal: {fileID: 1252979786} + m_CorrespondingSourceObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, + type: 3} + m_PrefabInstance: {fileID: 1252979786} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: afa1ae235bc6cfa43addd1435e2fd822, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1760640403 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 112444, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 112444, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1760640404} - component: {fileID: 1760640406} @@ -803,9 +849,10 @@ GameObject: --- !u!224 &1760640404 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22473156, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22473156, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1760640403} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -822,9 +869,10 @@ RectTransform: --- !u!114 &1760640405 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11456146, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11456146, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1760640403} m_Enabled: 1 m_EditorHideFlags: 0 @@ -856,16 +904,20 @@ MonoBehaviour: --- !u!222 &1760640406 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22271704, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22271704, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1760640403} + m_CullTransparentMesh: 0 --- !u!1 &1873310889 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 122022, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 122022, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1873310893} - component: {fileID: 1873310892} @@ -881,9 +933,10 @@ GameObject: --- !u!114 &1873310890 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11478950, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11478950, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1873310889} m_Enabled: 1 m_EditorHideFlags: 0 @@ -928,9 +981,10 @@ MonoBehaviour: --- !u!114 &1873310891 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11468350, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11468350, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1873310889} m_Enabled: 1 m_EditorHideFlags: 0 @@ -953,19 +1007,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1873310892 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22223342, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22223342, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1873310889} + m_CullTransparentMesh: 0 --- !u!224 &1873310893 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22469058, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22469058, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1873310889} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -983,9 +1041,11 @@ RectTransform: --- !u!1 &2061365886 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 115930, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 115930, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2061365887} - component: {fileID: 2061365889} @@ -1000,9 +1060,10 @@ GameObject: --- !u!224 &2061365887 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22498310, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22498310, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2061365886} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1019,9 +1080,10 @@ RectTransform: --- !u!114 &2061365888 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11472488, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11472488, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2061365886} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1044,19 +1106,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2061365889 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22221040, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22221040, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2061365886} + m_CullTransparentMesh: 0 --- !u!1 &2108325105 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 196772, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 196772, guid: 0d195e81e100046469df8f810bf9c7be, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2108325106} - component: {fileID: 2108325109} @@ -1072,9 +1139,10 @@ GameObject: --- !u!224 &2108325106 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22471750, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22471750, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108325105} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1092,9 +1160,10 @@ RectTransform: --- !u!114 &2108325107 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11404174, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11404174, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108325105} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1145,9 +1214,10 @@ MonoBehaviour: --- !u!114 &2108325108 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11437702, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 11437702, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108325105} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1170,10 +1240,13 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2108325109 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210544, guid: 0d195e81e100046469df8f810bf9c7be, + m_CorrespondingSourceObject: {fileID: 22210544, guid: 0d195e81e100046469df8f810bf9c7be, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108325105} + m_CullTransparentMesh: 0