Commit 7bc3745b authored by SerjPaskhalov's avatar SerjPaskhalov
Browse files

Добавил информацию, что конкретно происходит во время старта приложения. Также...

Добавил информацию, что конкретно происходит во время старта приложения. Также исправил проблему с тем, что нижний бар не вмещался в экран на iPhone XS Max
parent 68ac32a5
No related merge requests found
Showing with 2373 additions and 2139 deletions
+2373 -2139
......@@ -595,7 +595,7 @@ GameObject:
- component: {fileID: 479349819}
- component: {fileID: 479349818}
m_Layer: 5
m_Name: Scaning
m_Name: Compass
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -617,8 +617,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 25, y: 95}
m_SizeDelta: {x: 246, y: 42}
m_AnchoredPosition: {x: 0, y: 95}
m_SizeDelta: {x: 300, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &479349818
MonoBehaviour:
......@@ -653,7 +653,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Scaning
m_text: Compass tuning
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7fa247022269db24faad0d8c0a1717b2, type: 2}
m_sharedMaterial: {fileID: 21909273685026686, guid: 7fa247022269db24faad0d8c0a1717b2,
......@@ -682,8 +682,8 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 28
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
......@@ -699,7 +699,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
......@@ -723,10 +723,10 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 479349819}
characterCount: 7
characterCount: 14
spriteCount: 0
spaceCount: 0
wordCount: 1
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 1
pageCount: 1
......@@ -1478,6 +1478,178 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 41.5}
m_SizeDelta: {x: 0, y: -83}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &916658613
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 916658614}
- component: {fileID: 916658617}
- component: {fileID: 916658616}
- component: {fileID: 916658615}
m_Layer: 5
m_Name: Floor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &916658614
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 916658613}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.90586, y: 0.90586, z: 0.90586}
m_Children: []
m_Father: {fileID: 1838851079}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 27.300049}
m_SizeDelta: {x: 300, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &916658615
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 916658613}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59d496ef81f96490a99b191a8abb57f3, type: 3}
m_Name:
m_EditorClassIdentifier:
updateTime: 0.5
--- !u!114 &916658616
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 916658613}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Floor scanning
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7fa247022269db24faad0d8c0a1717b2, type: 2}
m_sharedMaterial: {fileID: 21909273685026686, guid: 7fa247022269db24faad0d8c0a1717b2,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 28
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 257
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 916658616}
characterCount: 14
spriteCount: 0
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &916658617
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 916658613}
m_CullTransparentMesh: 0
--- !u!114 &952476189 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6803819575179027444, guid: 4067835cfae7a31448d876bca3d5a0e5,
......@@ -1634,6 +1806,39 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 14
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1123998024
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &1140051148
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -1884,7 +2089,7 @@ MonoBehaviour:
thresholds:
- Height: 1800
ScaleFactor: 2
- Height: 2500
- Height: 2700
ScaleFactor: 3
- Height: 0
ScaleFactor: 4
......@@ -1931,39 +2136,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1227406278
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1382766849
GameObject:
m_ObjectHideFlags: 0
......@@ -2745,6 +2917,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1838851079}
- component: {fileID: 1838851080}
m_Layer: 5
m_Name: LoadingIndicator
m_TagString: Untagged
......@@ -2765,6 +2938,8 @@ RectTransform:
m_Children:
- {fileID: 1918416528}
- {fileID: 479349817}
- {fileID: 1867457282}
- {fileID: 916658614}
m_Father: {fileID: 1449282806}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -2773,6 +2948,193 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -654}
m_SizeDelta: {x: 0, y: -654}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1838851080
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838851078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5f05e06087734cdabb4ced630b588b9, type: 3}
m_Name:
m_EditorClassIdentifier:
compassText: {fileID: 479349818}
gpsText: {fileID: 1867457283}
floorText: {fileID: 916658615}
--- !u!1 &1867457281
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1867457282}
- component: {fileID: 1867457285}
- component: {fileID: 1867457284}
- component: {fileID: 1867457283}
m_Layer: 5
m_Name: GPS
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1867457282
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1867457281}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.90586, y: 0.90586, z: 0.90586}
m_Children: []
m_Father: {fileID: 1838851079}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 60.69995}
m_SizeDelta: {x: 300, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1867457283
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1867457281}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59d496ef81f96490a99b191a8abb57f3, type: 3}
m_Name:
m_EditorClassIdentifier:
updateTime: 0.5
--- !u!114 &1867457284
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1867457281}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: GPS tuning
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7fa247022269db24faad0d8c0a1717b2, type: 2}
m_sharedMaterial: {fileID: 21909273685026686, guid: 7fa247022269db24faad0d8c0a1717b2,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 28
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 257
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1867457284}
characterCount: 10
spriteCount: 0
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1867457285
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1867457281}
m_CullTransparentMesh: 0
--- !u!1 &1918416527
GameObject:
m_ObjectHideFlags: 0
......@@ -2807,8 +3169,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 136.01}
m_SizeDelta: {x: 295.9, y: 44.182}
m_AnchoredPosition: {x: 0, y: 150}
m_SizeDelta: {x: 300, y: 44.182}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1918416530
MonoBehaviour:
......@@ -3820,7 +4182,7 @@ MonoBehaviour:
thresholds:
- Height: 1800
ScaleFactor: 2
- Height: 2500
- Height: 2700
ScaleFactor: 3
- Height: 0
ScaleFactor: 4
......@@ -11454,7 +11816,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 1227406278}
m_Material: {fileID: 1123998024}
m_Color: {r: 0.5568628, g: 0.5568628, b: 0.5764706, a: 0.12156863}
m_RaycastTarget: 1
m_OnCullStateChanged:
......
......@@ -279,7 +279,7 @@ MonoBehaviour:
thresholds:
- Height: 1800
ScaleFactor: 2
- Height: 2500
- Height: 2700
ScaleFactor: 3
- Height: 0
ScaleFactor: 4
......
......@@ -346,39 +346,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!21 &78145089
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!224 &126741952 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8897487206085308952, guid: 7a1351253fe0241c182de71e869cffef,
......@@ -518,7 +485,7 @@ MonoBehaviour:
thresholds:
- Height: 1800
ScaleFactor: 2
- Height: 2500
- Height: 2700
ScaleFactor: 3
- Height: 0
ScaleFactor: 4
......@@ -2544,6 +2511,39 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 846790972}
m_CullTransparentMesh: 0
--- !u!21 &892334745
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1005918664
GameObject:
m_ObjectHideFlags: 0
......@@ -4572,7 +4572,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 78145089}
m_Material: {fileID: 892334745}
m_Color: {r: 0.5568628, g: 0.5568628, b: 0.5764706, a: 0.12156863}
m_RaycastTarget: 1
m_OnCullStateChanged:
......@@ -4938,7 +4938,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 78145089}
m_Material: {fileID: 892334745}
m_Color: {r: 0, g: 0.47843137, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
......@@ -5346,7 +5346,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 78145089}
m_Material: {fileID: 892334745}
m_Color: {r: 0, g: 0.47843137, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
......
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.49641287, b: 0.5748173, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -2382,7 +2382,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 740619599}
m_Material: {fileID: 1058096089}
m_Color: {r: 0, g: 0.47843137, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
......@@ -4245,7 +4245,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 740619599}
m_Material: {fileID: 1058096089}
m_Color: {r: 0, g: 0.47843137, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
......@@ -7808,7 +7808,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 740619599}
m_Material: {fileID: 1058096089}
m_Color: {r: 0, g: 0.47843137, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
......@@ -9451,39 +9451,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 722078206}
m_CullTransparentMesh: 0
--- !u!21 &740619599
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!224 &743285545 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6803819575179027448, guid: 4067835cfae7a31448d876bca3d5a0e5,
......@@ -12985,7 +12952,7 @@ MonoBehaviour:
thresholds:
- Height: 1800
ScaleFactor: 2
- Height: 2500
- Height: 2700
ScaleFactor: 3
- Height: 0
ScaleFactor: 4
......@@ -13454,6 +13421,39 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1054662142}
m_CullTransparentMesh: 0
--- !u!21 &1058096089
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1064084331
GameObject:
m_ObjectHideFlags: 0
......@@ -17077,7 +17077,7 @@ MonoBehaviour:
thresholds:
- Height: 1800
ScaleFactor: 2
- Height: 2500
- Height: 2700
ScaleFactor: 3
- Height: 0
ScaleFactor: 4
......@@ -21973,6 +21973,111 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6803819574613179784, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 2136038616}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819574682290538, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 1523341640}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796564, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_havePropertiesChanged
......@@ -22083,11 +22188,6 @@ PrefabInstance:
propertyPath: m_Material
value:
objectReference: {fileID: 2136038616}
- target: {fileID: 6803819574613179784, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 2136038616}
- target: {fileID: 6803819575004166435, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_Material
......@@ -22183,61 +22283,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573105674369, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573232796567, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4265432912783407393, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
......@@ -22588,11 +22633,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819574682290538, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 1523341640}
- target: {fileID: 6164160187541690957, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
......@@ -22963,46 +23003,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573467586288, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819573895651628, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6803819574035089835, guid: 4067835cfae7a31448d876bca3d5a0e5,
type: 3}
propertyPath: m_Material
......
using System.Collections;
using System.Collections.Generic;
using AvvyLand.UI;
using UnityEngine;
using Zenject;
namespace AvvyLand.AR
{
public class DetailStatusIndicactor : MonoBehaviour
{
public LoadingTextAnimation compassText;
public LoadingTextAnimation gpsText;
public LoadingTextAnimation floorText;
// Start is called before the first frame update
void Start()
{
}
[Inject]
void Init(ARStateMachine stateMachine)
{
stateMachine.StateChanged += StateMachine_StateChanged;
}
private void StateMachine_StateChanged(ARStateMachine.State obj)
{
compassText.IsDone |= (obj & ARStateMachine.State.CompasAligmentAvailible) == ARStateMachine.State.CompasAligmentAvailible;
gpsText.IsDone |= (obj & ARStateMachine.State.PositionAligmentAvailible) == ARStateMachine.State.PositionAligmentAvailible;
floorText.IsDone |= (obj & ARStateMachine.State.PlaneAdded) == ARStateMachine.State.PlaneAdded;
}
}
}
fileFormatVersion: 2
guid: d5f05e06087734cdabb4ced630b588b9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -13,6 +13,22 @@ namespace AvvyLand.UI
string startText;
int pointCounter;
private string doneSymbol = "✓";
private bool isDone = false;
public bool IsDone
{
get => isDone;
set
{
isDone = value;
if(isDone)
{
text.text = $"{startText} {doneSymbol}";
}
}
}
private float passedTime;
private void Start()
......@@ -30,13 +46,16 @@ namespace AvvyLand.UI
// Update is called once per frame
private void Update()
{
passedTime += Time.deltaTime;
if(passedTime >= updateTime)
{
passedTime = 0;
text.text = startText + new string('.', pointCounter++);
if (pointCounter > 3)
pointCounter = 0;
if (!IsDone)
{
passedTime += Time.deltaTime;
if (passedTime >= updateTime)
{
passedTime = 0;
text.text = startText + new string('.', pointCounter++);
if (pointCounter > 3)
pointCounter = 0;
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment