From fe6ac87282fb289cdde7e4130832b4145733cc1d Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 18 Sep 2018 16:57:56 +0200 Subject: [PATCH] Reworked Views to use CanvasScaler on screen size mode --- .../Prefabs/LanguageSelectFlag.prefab | 293 +++++----- .../Prefabs/LanguageSelectFlag.prefab.meta | 3 +- Assets/Resources/UI/ARView.prefab | 101 +--- Assets/Resources/UI/ColorSelectView.prefab | 54 +- Assets/Resources/UI/CreditsView.prefab | 90 +-- Assets/Resources/UI/LanguageSelectView.prefab | 35 +- Assets/Resources/UI/SettingsView.prefab | 162 ++---- Assets/Resources/UI/TutorialView.prefab | 549 ++++++++---------- .../Scripts/Updater/UpdaterBehaviour.cs | 6 +- .../Sprites/POI-Spirale_Solid.png.meta | 6 +- .../RothenburgAR/Sprites/poi_rim_50.png.meta | 6 +- .../Sprites/poi_rim_norm.png.meta | 6 +- .../Sprites/rothenburg-app-logox192.png.meta | 18 +- Assets/RothenburgAR/UI-Prefabs.meta | 10 - .../UI-Prefabs/Content-Text.prefab | 180 ------ .../UI-Prefabs/Content-Text.prefab.meta | 10 - .../UI-Prefabs/Header-Text.prefab | 179 ------ .../UI-Prefabs/Header-Text.prefab.meta | 10 - Assets/updaterScene.unity | 544 ++++++++++++----- 19 files changed, 924 insertions(+), 1338 deletions(-) delete mode 100644 Assets/RothenburgAR/UI-Prefabs.meta delete mode 100644 Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab delete mode 100644 Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab.meta delete mode 100644 Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab delete mode 100644 Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab.meta diff --git a/Assets/Resources/Prefabs/LanguageSelectFlag.prefab b/Assets/Resources/Prefabs/LanguageSelectFlag.prefab index 452cbef..546b01a 100644 --- a/Assets/Resources/Prefabs/LanguageSelectFlag.prefab +++ b/Assets/Resources/Prefabs/LanguageSelectFlag.prefab @@ -9,19 +9,18 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1870780660331822} + m_RootGameObject: {fileID: 1601787591337144} m_IsPrefabParent: 1 ---- !u!1 &1093268079576834 +--- !u!1 &1278686113746266 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224450866601641818} - - component: {fileID: 222803596777175386} - - component: {fileID: 114256446231503418} - - component: {fileID: 114782317710288346} + - component: {fileID: 224539967715556762} + - component: {fileID: 222375580172000500} + - component: {fileID: 114526642046605964} m_Layer: 5 m_Name: LanguageNameLabel m_TagString: Untagged @@ -29,35 +28,16 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1330149800350536 +--- !u!1 &1601787591337144 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224212217427961336} - - component: {fileID: 222618047529750836} - - component: {fileID: 114312409334725960} - - component: {fileID: 114066756386589816} - - component: {fileID: 114505013374209628} - m_Layer: 5 - m_Name: LanguageFlag - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1870780660331822 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224192554854338646} - - component: {fileID: 222960981589513356} - - component: {fileID: 114784142905685508} + - component: {fileID: 224461277703036346} + - component: {fileID: 222825877978029604} + - component: {fileID: 114793490483303480} m_Layer: 5 m_Name: LanguageSelectFlag m_TagString: Untagged @@ -65,12 +45,72 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &114066756386589816 +--- !u!1 &1664710789713812 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224656127129577370} + - component: {fileID: 222852811897551344} + - component: {fileID: 114433057536107186} + - component: {fileID: 114200514061277590} + - component: {fileID: 114041765205589886} + m_Layer: 5 + m_Name: LanguageFlag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &114041765205589886 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330149800350536} + m_GameObject: {fileID: 1664710789713812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114433057536107186} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &114200514061277590 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1664710789713812} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -84,12 +124,39 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: 1 m_LayoutPriority: 1 ---- !u!114 &114256446231503418 +--- !u!114 &114433057536107186 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1093268079576834} + m_GameObject: {fileID: 1664710789713812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114526642046605964 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1278686113746266} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} @@ -130,8 +197,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -169,7 +236,7 @@ MonoBehaviour: m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: - textComponent: {fileID: 114256446231503418} + textComponent: {fileID: 114526642046605964} characterCount: 7 spriteCount: 0 spaceCount: 0 @@ -196,92 +263,12 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &114312409334725960 +--- !u!114 &114793490483303480 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330149800350536} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114505013374209628 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330149800350536} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 114312409334725960} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &114782317710288346 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1093268079576834} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 ---- !u!114 &114784142905685508 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1870780660331822} + m_GameObject: {fileID: 1601787591337144} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -295,73 +282,55 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: 1 m_LayoutPriority: 1 ---- !u!222 &222618047529750836 +--- !u!222 &222375580172000500 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330149800350536} ---- !u!222 &222803596777175386 + m_GameObject: {fileID: 1278686113746266} +--- !u!222 &222825877978029604 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1093268079576834} ---- !u!222 &222960981589513356 + m_GameObject: {fileID: 1601787591337144} +--- !u!222 &222852811897551344 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1870780660331822} ---- !u!224 &224192554854338646 + m_GameObject: {fileID: 1664710789713812} +--- !u!224 &224461277703036346 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1870780660331822} + m_GameObject: {fileID: 1601787591337144} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224212217427961336} - - {fileID: 224450866601641818} + - {fileID: 224656127129577370} + - {fileID: 224539967715556762} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: 960} + m_SizeDelta: {x: 700, y: 700} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224212217427961336 +--- !u!224 &224539967715556762 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330149800350536} + m_GameObject: {fileID: 1278686113746266} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224192554854338646} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0.45} - m_AnchorMax: {x: 0.8, y: 0.55} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224450866601641818 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1093268079576834} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224192554854338646} + m_Father: {fileID: 224461277703036346} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0.4} @@ -369,3 +338,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224656127129577370 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1664710789713812} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224461277703036346} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.2, y: 0.45} + m_AnchorMax: {x: 0.8, y: 0.55} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/Prefabs/LanguageSelectFlag.prefab.meta b/Assets/Resources/Prefabs/LanguageSelectFlag.prefab.meta index ac2a8df..9b71ad0 100644 --- a/Assets/Resources/Prefabs/LanguageSelectFlag.prefab.meta +++ b/Assets/Resources/Prefabs/LanguageSelectFlag.prefab.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 guid: c13f7f96aebb0184a8768754314e5729 -timeCreated: 1506373818 +timeCreated: 1537278609 licenseType: Free NativeFormatImporter: + externalObjects: {} mainObjectFileID: 100100000 userData: assetBundleName: diff --git a/Assets/Resources/UI/ARView.prefab b/Assets/Resources/UI/ARView.prefab index b5ddd88..c804b6b 100644 --- a/Assets/Resources/UI/ARView.prefab +++ b/Assets/Resources/UI/ARView.prefab @@ -193,7 +193,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224632685815868688} - - component: {fileID: 114549737417258442} m_Layer: 5 m_Name: ButtonSettings m_TagString: Untagged @@ -263,7 +262,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224954540062687134} - - component: {fileID: 114518976637844802} m_Layer: 5 m_Name: ButtonSelect m_TagString: Untagged @@ -367,7 +365,6 @@ GameObject: - component: {fileID: 224781237586130416} - component: {fileID: 95946319316223234} - component: {fileID: 114954497030479772} - - component: {fileID: 114935104924559364} m_Layer: 5 m_Name: Reticule m_TagString: Untagged @@ -601,7 +598,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8b5529ae19f2154419c212a3cbb23946, type: 3} + m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -994,7 +991,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6cc2cfaeed321a64eb2b1bca2699b6aa, type: 3} + m_Sprite: {fileID: 21300000, guid: 48ecc8a9d56982a4b9d0c2d373cbcbb5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1013,12 +1010,12 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 1024} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1106,30 +1103,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &114518976637844802 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1461557036225360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.01 ---- !u!114 &114549737417258442 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1386541956847342} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.01 --- !u!114 &114591155496247950 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1352,18 +1325,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &114935104924559364 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1753054310650300} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.01 --- !u!114 &114941164005360912 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1432,7 +1393,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 122 + m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_enableKerning: 1 @@ -1804,7 +1765,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 30, y: -30} - m_SizeDelta: {x: 48, y: 48} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224060988043194314 RectTransform: @@ -1819,10 +1780,10 @@ RectTransform: m_Father: {fileID: 224620536568054620} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.52, y: 0.5} - m_AnchorMax: {x: 0.905, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -75.5, y: 0} + m_SizeDelta: {x: -200, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224105959217507050 RectTransform: @@ -1897,8 +1858,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 230, y: -317.65} - m_SizeDelta: {x: 460, y: 115.29998} + m_AnchoredPosition: {x: 230, y: -187.65} + m_SizeDelta: {x: 460, y: 375.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224272151730405692 RectTransform: @@ -1913,11 +1874,11 @@ RectTransform: m_Father: {fileID: 224620536568054620} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} - m_AnchorMin: {x: 0.905, y: 0.5} - m_AnchorMax: {x: 0.958, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 2} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -110, y: -66} + m_SizeDelta: {x: 93.8, y: 2} + m_Pivot: {x: 1, y: 0.5} --- !u!224 &224292492441239568 RectTransform: m_ObjectHideFlags: 1 @@ -2044,10 +2005,10 @@ RectTransform: m_Father: {fileID: 224804495073354866} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0.9} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -75, y: -75} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224701352370170208 RectTransform: @@ -2062,10 +2023,10 @@ RectTransform: m_Father: {fileID: 224017865803686938} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.25, y: 0.25} + m_AnchorMax: {x: 0.75, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224781237586130416 RectTransform: @@ -2082,10 +2043,10 @@ RectTransform: m_Father: {fileID: 224620536568054620} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.47, y: 0.47} - m_AnchorMax: {x: 0.53, y: 0.53} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224804495073354866 RectTransform: @@ -2181,8 +2142,8 @@ RectTransform: m_Father: {fileID: 224804495073354866} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0.35} - m_AnchorMax: {x: 1, y: 0.45} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -75, y: -100} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/ColorSelectView.prefab b/Assets/Resources/UI/ColorSelectView.prefab index b3f3b35..221572b 100644 --- a/Assets/Resources/UI/ColorSelectView.prefab +++ b/Assets/Resources/UI/ColorSelectView.prefab @@ -39,7 +39,6 @@ GameObject: - component: {fileID: 224125319600290544} - component: {fileID: 222946919128408452} - component: {fileID: 114416084065759590} - - component: {fileID: 114798251844073798} m_Layer: 5 m_Name: LanguageNameLabel m_TagString: Untagged @@ -127,7 +126,6 @@ GameObject: - component: {fileID: 224150896017563766} - component: {fileID: 222562460769798160} - component: {fileID: 114442948297432030} - - component: {fileID: 114208553699807782} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -169,18 +167,6 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 m_ChildControlHeight: 1 ---- !u!114 &114208553699807782 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1903496386009006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.02 --- !u!114 &114269142431248838 MonoBehaviour: m_ObjectHideFlags: 1 @@ -300,8 +286,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -377,12 +363,12 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 1024} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -430,18 +416,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &114798251844073798 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1210141957160624} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114941787814822646 MonoBehaviour: m_ObjectHideFlags: 1 @@ -599,10 +573,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.95} - m_AnchorMax: {x: 0.05, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -75} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224340703255627502 RectTransform: @@ -618,10 +592,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} - m_AnchorMax: {x: 0.8, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 700, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224360344833465170 RectTransform: @@ -679,6 +653,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384, y: -540} - m_SizeDelta: {x: 768, y: 1080} + m_AnchoredPosition: {x: 350, y: -350} + m_SizeDelta: {x: 700, y: 700} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/CreditsView.prefab b/Assets/Resources/UI/CreditsView.prefab index e6cbe70..87a311a 100644 --- a/Assets/Resources/UI/CreditsView.prefab +++ b/Assets/Resources/UI/CreditsView.prefab @@ -74,7 +74,6 @@ GameObject: - component: {fileID: 222203661534893336} - component: {fileID: 114856393737139808} - component: {fileID: 114365560402626540} - - component: {fileID: 114766449491170998} m_Layer: 5 m_Name: Headline m_TagString: Untagged @@ -145,7 +144,6 @@ GameObject: - component: {fileID: 224246252733405256} - component: {fileID: 222058416552286328} - component: {fileID: 114713400967023104} - - component: {fileID: 114635645336116288} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -164,7 +162,6 @@ GameObject: - component: {fileID: 222356890047705732} - component: {fileID: 114243583540241576} - component: {fileID: 114592252867868356} - - component: {fileID: 114091865845724026} m_Layer: 5 m_Name: Footer m_TagString: Untagged @@ -250,7 +247,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224229517299928608} - - component: {fileID: 114876702735145276} m_Layer: 5 m_Name: ButtonBack m_TagString: Untagged @@ -354,18 +350,6 @@ MonoBehaviour: m_EditorClassIdentifier: ContentTextMesh: {fileID: 114713400967023104} FooterTextMesh: {fileID: 114243583540241576} ---- !u!114 &114091865845724026 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1756409441568252} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114178827671482430 MonoBehaviour: m_ObjectHideFlags: 1 @@ -431,8 +415,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -554,12 +538,12 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 1024} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -683,18 +667,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!114 &114635645336116288 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1749873518282982} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114674931360058408 MonoBehaviour: m_ObjectHideFlags: 1 @@ -775,8 +747,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -793,7 +765,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 585 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_enableKerning: 1 @@ -820,7 +792,7 @@ MonoBehaviour: spaceCount: 82 wordCount: 82 linkCount: 0 - lineCount: 17 + lineCount: 21 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -863,18 +835,6 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 m_ChildControlHeight: 1 ---- !u!114 &114766449491170998 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1405117012794444} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 0 --- !u!114 &114769754509622112 MonoBehaviour: m_ObjectHideFlags: 1 @@ -967,8 +927,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -985,7 +945,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 13 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_enableKerning: 1 @@ -1050,7 +1010,7 @@ MonoBehaviour: m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 - m_FlexibleHeight: 3 + m_FlexibleHeight: 5 m_LayoutPriority: 1 --- !u!114 &114873919048767614 MonoBehaviour: @@ -1074,18 +1034,6 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 m_ChildControlHeight: 1 ---- !u!114 &114876702735145276 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1890170837794496} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.01 --- !u!114 &114905389833756770 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1234,10 +1182,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.1, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 700, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224105024989387982 RectTransform: @@ -1296,10 +1244,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0.9} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -75, y: -75} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224246252733405256 RectTransform: diff --git a/Assets/Resources/UI/LanguageSelectView.prefab b/Assets/Resources/UI/LanguageSelectView.prefab index 17cff5c..c05aa48 100644 --- a/Assets/Resources/UI/LanguageSelectView.prefab +++ b/Assets/Resources/UI/LanguageSelectView.prefab @@ -74,7 +74,6 @@ GameObject: - component: {fileID: 224610144177016324} - component: {fileID: 222102007686133384} - component: {fileID: 114417891219477538} - - component: {fileID: 114603035056422536} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -116,7 +115,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: FlagContainer: {fileID: 1423640151677840} - FlagPrefab: {fileID: 1870780660331822, guid: c13f7f96aebb0184a8768754314e5729, type: 2} + FlagPrefab: {fileID: 1601787591337144, guid: c13f7f96aebb0184a8768754314e5729, type: 2} --- !u!114 &114405187272099950 MonoBehaviour: m_ObjectHideFlags: 1 @@ -182,28 +181,16 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 1024} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 ---- !u!114 &114603035056422536 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1720316130387708} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.02 --- !u!114 &114769754509622112 MonoBehaviour: m_ObjectHideFlags: 1 @@ -289,10 +276,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} - m_AnchorMax: {x: 0.8, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 700, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224360344833465170 RectTransform: @@ -328,8 +315,8 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.95} - m_AnchorMax: {x: 0.05, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -75} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/SettingsView.prefab b/Assets/Resources/UI/SettingsView.prefab index 513c92d..dfc6906 100644 --- a/Assets/Resources/UI/SettingsView.prefab +++ b/Assets/Resources/UI/SettingsView.prefab @@ -55,7 +55,6 @@ GameObject: - component: {fileID: 224562788853542486} - component: {fileID: 222257107596212176} - component: {fileID: 114703351711471558} - - component: {fileID: 114541473607554430} m_Layer: 5 m_Name: TextMeshPro Text m_TagString: Untagged @@ -144,7 +143,6 @@ GameObject: - component: {fileID: 224082682870789258} - component: {fileID: 222236235550470454} - component: {fileID: 114304727189119928} - - component: {fileID: 114179659714469870} m_Layer: 5 m_Name: TextMeshPro Text m_TagString: Untagged @@ -196,7 +194,6 @@ GameObject: - component: {fileID: 224899198735757046} - component: {fileID: 222430445161218842} - component: {fileID: 114962239977612638} - - component: {fileID: 114901347835684696} m_Layer: 5 m_Name: TextMeshPro Text m_TagString: Untagged @@ -230,7 +227,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224893211876998240} - - component: {fileID: 114340094141147230} m_Layer: 5 m_Name: ButtonBack m_TagString: Untagged @@ -248,7 +244,6 @@ GameObject: - component: {fileID: 224220608059838934} - component: {fileID: 222633703844647490} - component: {fileID: 114160009348696074} - - component: {fileID: 114455573160240600} m_Layer: 5 m_Name: TextMeshPro Text m_TagString: Untagged @@ -338,7 +333,6 @@ GameObject: - component: {fileID: 224820400269443288} - component: {fileID: 222469164334548030} - component: {fileID: 114339176493472056} - - component: {fileID: 114609205135736288} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -477,12 +471,12 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 1024} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -771,18 +765,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114179659714469870 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1453184506351326} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114189050068526520 MonoBehaviour: m_ObjectHideFlags: 1 @@ -949,18 +931,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114340094141147230 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1593863150254430} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.01 --- !u!114 &114402161305082402 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1013,18 +983,6 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &114455573160240600 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1663770969281230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114481541986733408 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1142,18 +1100,6 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: 1 m_LayoutPriority: 1 ---- !u!114 &114541473607554430 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1123889251050150} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114596666055262414 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1181,18 +1127,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114609205135736288 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1876542019120094} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.02 --- !u!114 &114641077175838792 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1511,18 +1445,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114901347835684696 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1566260761276548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114911072403513640 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1848,10 +1770,10 @@ RectTransform: m_Father: {fileID: 224877065014001232} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: -70, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224085511031855630 RectTransform: @@ -1924,10 +1846,10 @@ RectTransform: m_Father: {fileID: 224696479351442688} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: -70, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224360344833465170 RectTransform: @@ -1978,10 +1900,10 @@ RectTransform: m_Father: {fileID: 224696479351442688} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.2} - m_AnchorMax: {x: 0.2, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224482497675166948 RectTransform: @@ -1996,10 +1918,10 @@ RectTransform: m_Father: {fileID: 224750414370576322} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.2} - m_AnchorMax: {x: 0.2, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224552794473583084 RectTransform: @@ -2032,10 +1954,10 @@ RectTransform: m_Father: {fileID: 224969683658863468} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: -70, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224696479351442688 RectTransform: @@ -2092,10 +2014,10 @@ RectTransform: m_Father: {fileID: 224214707840811800} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.95} - m_AnchorMax: {x: 0.05, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -75} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224844527725026830 RectTransform: @@ -2114,10 +2036,10 @@ RectTransform: m_Father: {fileID: 224214707840811800} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0.1} - m_AnchorMax: {x: 0.75, y: 0.45} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 300} + m_SizeDelta: {x: 400, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224877065014001232 RectTransform: @@ -2153,10 +2075,10 @@ RectTransform: m_Father: {fileID: 224969683658863468} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.2} - m_AnchorMax: {x: 0.2, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224893211876998240 RectTransform: @@ -2173,10 +2095,10 @@ RectTransform: m_Father: {fileID: 224214707840811800} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0.9} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -75, y: -75} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224899198735757046 RectTransform: @@ -2191,10 +2113,10 @@ RectTransform: m_Father: {fileID: 224750414370576322} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: -70, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224951293784279432 RectTransform: @@ -2227,10 +2149,10 @@ RectTransform: m_Father: {fileID: 224877065014001232} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.2} - m_AnchorMax: {x: 0.2, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224969683658863468 RectTransform: diff --git a/Assets/Resources/UI/TutorialView.prefab b/Assets/Resources/UI/TutorialView.prefab index 9fd9ac0..2557885 100644 --- a/Assets/Resources/UI/TutorialView.prefab +++ b/Assets/Resources/UI/TutorialView.prefab @@ -36,7 +36,6 @@ GameObject: - component: {fileID: 224773095307896718} - component: {fileID: 222125691281678280} - component: {fileID: 114364223746917038} - - component: {fileID: 114502305032582084} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -71,7 +70,6 @@ GameObject: - component: {fileID: 224658397301747820} - component: {fileID: 222584687511144990} - component: {fileID: 114578623418952694} - - component: {fileID: 114504370255026716} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -139,7 +137,6 @@ GameObject: - component: {fileID: 224024286302778554} - component: {fileID: 222542415928726304} - component: {fileID: 114510575319355086} - - component: {fileID: 114021140929131048} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -171,7 +168,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224336834733934388} - - component: {fileID: 114584589056048672} m_Layer: 5 m_Name: ButtonMenu m_TagString: Untagged @@ -262,6 +258,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1448429516768738 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224976416680384442} + - component: {fileID: 222321881053020978} + - component: {fileID: 114740536442403832} + m_Layer: 5 + m_Name: Line_Diagonal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1449474661047768 GameObject: m_ObjectHideFlags: 1 @@ -311,6 +324,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1737318861369652 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224506085922051402} + - component: {fileID: 222340631510110140} + - component: {fileID: 114759445690927686} + m_Layer: 5 + m_Name: Line_Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1749097467687950 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224385246327759096} + - component: {fileID: 222643815330887078} + - component: {fileID: 114613592170508204} + m_Layer: 5 + m_Name: ConnectorDiagonal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1754144216622158 GameObject: m_ObjectHideFlags: 1 @@ -321,7 +368,6 @@ GameObject: - component: {fileID: 224552402661067298} - component: {fileID: 95304401181590314} - component: {fileID: 114003589050709218} - - component: {fileID: 114810455410940454} m_Layer: 5 m_Name: Reticule m_TagString: Untagged @@ -337,7 +383,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224543001454646402} - - component: {fileID: 114559618442054936} m_Layer: 5 m_Name: ButtonSelect m_TagString: Untagged @@ -345,57 +390,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1807654607707890 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224128503128817360} - - component: {fileID: 222431832160731866} - - component: {fileID: 114422971757440538} - m_Layer: 5 - m_Name: ConnectorDiagonal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1851452650826534 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224513858467724650} - - component: {fileID: 222129702102143540} - - component: {fileID: 114525388697953340} - m_Layer: 5 - m_Name: Line_Diagonal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1906555622392208 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224631836772639942} - - component: {fileID: 222432186078339652} - - component: {fileID: 114111117514055304} - m_Layer: 5 - m_Name: Line_Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1918066992004260 GameObject: m_ObjectHideFlags: 1 @@ -423,7 +417,6 @@ GameObject: - component: {fileID: 224669615654841574} - component: {fileID: 222099817702158366} - component: {fileID: 114955655822971140} - - component: {fileID: 114152855451479104} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -528,18 +521,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86567f108d79b694982dad61c7d7139f, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &114021140929131048 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1215384495255868} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114058094134189366 MonoBehaviour: m_ObjectHideFlags: 1 @@ -578,8 +559,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8d6fc7c5154bdd4e9a36599790cdc4d, type: 3} m_Name: m_EditorClassIdentifier: - HorizontalLine: {fileID: 224560155636731064} - DiagonalLine: {fileID: 224005487526306496} + HorizontalLine: {fileID: 224506085922051402} + DiagonalLine: {fileID: 224976416680384442} TextMesh: {fileID: 114578623418952694} --- !u!114 &114102076987245800 MonoBehaviour: @@ -608,33 +589,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114111117514055304 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1906555622392208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114145252764720510 MonoBehaviour: m_ObjectHideFlags: 1 @@ -649,18 +603,6 @@ MonoBehaviour: reticuleHighlight: {fileID: 114430674035238108} menuHighlight: {fileID: 114094662748965206} selectHighlight: {fileID: 114425245405885838} ---- !u!114 &114152855451479104 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1919422478631130} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114339554770605862 MonoBehaviour: m_ObjectHideFlags: 1 @@ -715,33 +657,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114422971757440538 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1807654607707890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b49170becc957054782e78d161ecef43, type: 2} - 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_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114425245405885838 MonoBehaviour: m_ObjectHideFlags: 1 @@ -753,8 +668,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8d6fc7c5154bdd4e9a36599790cdc4d, type: 3} m_Name: m_EditorClassIdentifier: - HorizontalLine: {fileID: 224631836772639942} - DiagonalLine: {fileID: 224513858467724650} + HorizontalLine: {fileID: 224560155636731064} + DiagonalLine: {fileID: 224005487526306496} TextMesh: {fileID: 114955655822971140} --- !u!114 &114430674035238108 MonoBehaviour: @@ -781,40 +696,16 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 1024} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 ---- !u!114 &114502305032582084 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1075177885722862} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.02 ---- !u!114 &114504370255026716 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1104168489494578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &114510575319355086 MonoBehaviour: m_ObjectHideFlags: 1 @@ -861,8 +752,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -927,33 +818,6 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &114525388697953340 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1851452650826534} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114549463175760568 MonoBehaviour: m_ObjectHideFlags: 1 @@ -981,18 +845,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114559618442054936 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1792505052625370} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.01 --- !u!114 &114564497257062652 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1066,8 +918,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1132,18 +984,6 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &114584589056048672 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1267095673593014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} - m_Name: - m_EditorClassIdentifier: - Padding: 0.01 --- !u!114 &114594422092748794 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1171,6 +1011,33 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114613592170508204 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1749097467687950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b49170becc957054782e78d161ecef43, type: 2} + 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_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114635013348880514 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1252,6 +1119,33 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114740536442403832 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1448429516768738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114747024589868032 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1279,18 +1173,33 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114810455410940454 +--- !u!114 &114759445690927686 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1754144216622158} + m_GameObject: {fileID: 1737318861369652} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - Padding: 0.01 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114835658581219120 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1392,8 +1301,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1470,12 +1379,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1075177885722862} ---- !u!222 &222129702102143540 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1851452650826534} --- !u!222 &222191168712571198 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1494,6 +1397,18 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1395188841539774} +--- !u!222 &222321881053020978 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1448429516768738} +--- !u!222 &222340631510110140 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1737318861369652} --- !u!222 &222389312311778482 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1506,18 +1421,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1428847988044214} ---- !u!222 &222431832160731866 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1807654607707890} ---- !u!222 &222432186078339652 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1906555622392208} --- !u!222 &222483487564013734 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1542,6 +1445,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1104168489494578} +--- !u!222 &222643815330887078 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1749097467687950} --- !u!222 &222702911795788774 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1598,16 +1507,16 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1918066992004260} - m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224973166079625610} + m_Father: {fileID: 224964216813268748} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -0.3600006, y: -16.18} + m_AnchoredPosition: {x: -0.30000305, y: -16.18} m_SizeDelta: {x: 75, y: 1} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224020227865350692 @@ -1646,24 +1555,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224128503128817360 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1807654607707890} - m_LocalRotation: {x: 0, y: 0, z: -0.38268343, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224374825834825260} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} - m_AnchorMin: {x: 0.905, y: 0.5} - m_AnchorMax: {x: 0.958, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 2} - m_Pivot: {x: 0, y: 0.5} --- !u!224 &224170597526670374 RectTransform: m_ObjectHideFlags: 1 @@ -1734,10 +1625,10 @@ RectTransform: m_Father: {fileID: 224374825834825260} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.52, y: 0.5} - m_AnchorMax: {x: 0.905, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -75.5, y: 0} + m_SizeDelta: {x: -200, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224336834733934388 RectTransform: @@ -1755,10 +1646,10 @@ RectTransform: m_Father: {fileID: 224386065082169650} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0.9} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -75, y: -75} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224374825834825260 RectTransform: @@ -1772,7 +1663,7 @@ RectTransform: m_Children: - {fileID: 224552402661067298} - {fileID: 224257449048418606} - - {fileID: 224128503128817360} + - {fileID: 224385246327759096} - {fileID: 224882127646750572} m_Father: {fileID: 224386065082169650} m_RootOrder: 4 @@ -1782,6 +1673,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224385246327759096 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1749097467687950} + m_LocalRotation: {x: -0, y: -0, z: -0.38268343, w: 0.92387956} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224374825834825260} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -110, y: -65.99994} + m_SizeDelta: {x: 93.8, y: 2} + m_Pivot: {x: 1, y: 0.5} --- !u!224 &224386065082169650 RectTransform: m_ObjectHideFlags: 1 @@ -1821,25 +1730,25 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 1} + m_SizeDelta: {x: 95, y: 1} m_Pivot: {x: 0, y: 0.5} ---- !u!224 &224513858467724650 +--- !u!224 &224506085922051402 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1851452650826534} - m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_GameObject: {fileID: 1737318861369652} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224964216813268748} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -0.33000183, y: -16.16} - m_SizeDelta: {x: 60, y: 1} + m_Father: {fileID: 224973166079625610} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224543001454646402 RectTransform: @@ -1857,10 +1766,10 @@ RectTransform: m_Father: {fileID: 224386065082169650} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0.35} - m_AnchorMax: {x: 1, y: 0.45} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -75, y: -100} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224552402661067298 RectTransform: @@ -1877,10 +1786,10 @@ RectTransform: m_Father: {fileID: 224374825834825260} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.47, y: 0.47} - m_AnchorMax: {x: 0.53, y: 0.53} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224560155636731064 RectTransform: @@ -1892,24 +1801,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224973166079625610} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 1} - m_Pivot: {x: 0, y: 0.5} ---- !u!224 &224631836772639942 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1906555622392208} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] m_Father: {fileID: 224964216813268748} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2021,10 +1912,10 @@ RectTransform: m_Father: {fileID: 224386065082169650} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.95} - m_AnchorMax: {x: 0.05, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -75} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224820724373761764 RectTransform: @@ -2060,7 +1951,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 21.7, y: 15.8} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224882127646750572 @@ -2110,8 +2001,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224631836772639942} - - {fileID: 224513858467724650} + - {fileID: 224560155636731064} + - {fileID: 224005487526306496} - {fileID: 224669615654841574} m_Father: {fileID: 224845810070959288} m_RootOrder: 0 @@ -2131,8 +2022,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224560155636731064} - - {fileID: 224005487526306496} + - {fileID: 224506085922051402} + - {fileID: 224976416680384442} - {fileID: 224658397301747820} m_Father: {fileID: 224170597526670374} m_RootOrder: 0 @@ -2142,3 +2033,21 @@ RectTransform: m_AnchoredPosition: {x: -152.3, y: -126.5} m_SizeDelta: {x: 220, y: 32} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224976416680384442 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1448429516768738} + m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224973166079625610} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -0.3600006, y: -16.18} + m_SizeDelta: {x: 75, y: 1} + m_Pivot: {x: 0, y: 0.5} diff --git a/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs b/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs index 2f445f2..88ca5e3 100644 --- a/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs @@ -119,10 +119,14 @@ namespace RothenburgAR.Updater if (!File.Exists(metaFilePath)) return; var exhibits = JsonConvert.DeserializeObject>(File.ReadAllText(metaFilePath)); + long newestVersion = 0; foreach (var exhibit in exhibits) { - result += @"""{id}"":""{version}"",".Replace("{id}", exhibit.Id).Replace("{version}", exhibit.UpdatedTime.ToString()); + newestVersion = Math.Max(newestVersion, exhibit.UpdatedTime); + //result += @"""{id}"":""{version}"",".Replace("{id}", exhibit.Id).Replace("{version}", exhibit.UpdatedTime.ToString()); } + + result += @"""{id}"":""{version}"",".Replace("{id}", dir.Name).Replace("{version}", newestVersion.ToString()); }); result = result.Substring(0, result.Length - 1) + "}"; diff --git a/Assets/RothenburgAR/Sprites/POI-Spirale_Solid.png.meta b/Assets/RothenburgAR/Sprites/POI-Spirale_Solid.png.meta index 2fb9100..e91eb68 100644 --- a/Assets/RothenburgAR/Sprites/POI-Spirale_Solid.png.meta +++ b/Assets/RothenburgAR/Sprites/POI-Spirale_Solid.png.meta @@ -34,9 +34,9 @@ TextureImporter: filterMode: -1 aniso: 16 mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/RothenburgAR/Sprites/poi_rim_50.png.meta b/Assets/RothenburgAR/Sprites/poi_rim_50.png.meta index 7965726..a494e49 100644 --- a/Assets/RothenburgAR/Sprites/poi_rim_50.png.meta +++ b/Assets/RothenburgAR/Sprites/poi_rim_50.png.meta @@ -34,9 +34,9 @@ TextureImporter: filterMode: -1 aniso: 16 mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/RothenburgAR/Sprites/poi_rim_norm.png.meta b/Assets/RothenburgAR/Sprites/poi_rim_norm.png.meta index 6cfb3bb..8b7fa8b 100644 --- a/Assets/RothenburgAR/Sprites/poi_rim_norm.png.meta +++ b/Assets/RothenburgAR/Sprites/poi_rim_norm.png.meta @@ -34,9 +34,9 @@ TextureImporter: filterMode: -1 aniso: 16 mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/RothenburgAR/Sprites/rothenburg-app-logox192.png.meta b/Assets/RothenburgAR/Sprites/rothenburg-app-logox192.png.meta index 22ca847..a8a8f06 100644 --- a/Assets/RothenburgAR/Sprites/rothenburg-app-logox192.png.meta +++ b/Assets/RothenburgAR/Sprites/rothenburg-app-logox192.png.meta @@ -4,6 +4,7 @@ timeCreated: 1505057685 licenseType: Free TextureImporter: fileIDToRecycleName: {} + externalObjects: {} serializedVersion: 4 mipmaps: mipMapMode: 0 @@ -12,6 +13,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -27,10 +30,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 16 mipBias: -1 - wrapMode: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -39,8 +45,9 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -52,32 +59,39 @@ TextureImporter: platformSettings: - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 - buildTarget: Standalone maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 - buildTarget: Android maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/RothenburgAR/UI-Prefabs.meta b/Assets/RothenburgAR/UI-Prefabs.meta deleted file mode 100644 index 9912799..0000000 --- a/Assets/RothenburgAR/UI-Prefabs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a4441867ce8514c47814be4103c1bdc1 -folderAsset: yes -timeCreated: 1535983495 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab b/Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab deleted file mode 100644 index b5128ea..0000000 --- a/Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab +++ /dev/null @@ -1,180 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1372864548455944} - m_IsPrefabParent: 1 ---- !u!1 &1372864548455944 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224649743259211562} - - component: {fileID: 222892162158991766} - - component: {fileID: 114255737912944738} - - component: {fileID: 114246606067108234} - m_Layer: 5 - m_Name: Content-Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &114246606067108234 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1372864548455944} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 ---- !u!114 &114255737912944738 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1372864548455944} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, 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: Es wurden Inhaltsupdates gefunden. Bitte warten sie, bis diese installiert - wurden. - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4279308561 - m_fontColor: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1} - m_enableVertexGradient: 0 - 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: 38.4 - m_fontSizeBase: 38.4 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 15 - m_fontSizeMax: 1000 - m_fontStyle: 0 - m_textAlignment: 257 - m_isAlignmentEnumConverted: 1 - 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_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_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 114255737912944738} - characterCount: 82 - spriteCount: 0 - spaceCount: 10 - wordCount: 11 - linkCount: 0 - lineCount: 2 - pageCount: 1 - materialCount: 1 - m_havePropertiesChanged: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 - m_inputSource: 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 &222892162158991766 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1372864548455944} ---- !u!224 &224649743259211562 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1372864548455944} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab.meta b/Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab.meta deleted file mode 100644 index 73a986e..0000000 --- a/Assets/RothenburgAR/UI-Prefabs/Content-Text.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: f0e20368501d2ab44a2da8b13a9f2df7 -timeCreated: 1535983515 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab b/Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab deleted file mode 100644 index 14d3a95..0000000 --- a/Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab +++ /dev/null @@ -1,179 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1688342124740992} - m_IsPrefabParent: 1 ---- !u!1 &1688342124740992 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224681203945809516} - - component: {fileID: 222034038926247372} - - component: {fileID: 114548906480688202} - - component: {fileID: 114321794584726058} - m_Layer: 5 - m_Name: Header-Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &114321794584726058 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1688342124740992} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 0 ---- !u!114 &114548906480688202 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1688342124740992} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, 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: Updates - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, 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_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: 120 - m_fontSizeBase: 120 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 42 - m_fontSizeMax: 420 - m_fontStyle: 0 - m_textAlignment: 514 - m_isAlignmentEnumConverted: 1 - 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_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_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 114548906480688202} - characterCount: 7 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_havePropertiesChanged: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 - m_inputSource: 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 &222034038926247372 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1688342124740992} ---- !u!224 &224681203945809516 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1688342124740992} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.1, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab.meta b/Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab.meta deleted file mode 100644 index 44da8f0..0000000 --- a/Assets/RothenburgAR/UI-Prefabs/Header-Text.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 29f4305098c707c45ade455d2501b7d1 -timeCreated: 1535983503 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/updaterScene.unity b/Assets/updaterScene.unity index 327f4a4..b241638 100644 --- a/Assets/updaterScene.unity +++ b/Assets/updaterScene.unity @@ -123,7 +123,6 @@ GameObject: - component: {fileID: 163479172} - component: {fileID: 163479175} - component: {fileID: 163479174} - - component: {fileID: 163479173} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -149,18 +148,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &163479173 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 163479171} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &163479174 MonoBehaviour: m_ObjectHideFlags: 0 @@ -208,8 +195,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 38.4 - m_fontSizeBase: 38.4 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -253,7 +240,7 @@ MonoBehaviour: spaceCount: 11 wordCount: 12 linkCount: 0 - lineCount: 2 + lineCount: 1 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -312,10 +299,10 @@ RectTransform: m_Father: {fileID: 419149449} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0.35} - m_AnchorMax: {x: 0.8, y: 0.45} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 300, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &227135288 MonoBehaviour: @@ -547,10 +534,10 @@ RectTransform: m_Father: {fileID: 485155447} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.02, y: 0.01} - m_AnchorMax: {x: 0.98, y: 0.84} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -52.5} + m_SizeDelta: {x: -30, y: -135} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &318423821 MonoBehaviour: @@ -585,6 +572,145 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 318423819} +--- !u!1 &401019190 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1372864548455944, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + m_PrefabInternal: {fileID: 2105737666} + serializedVersion: 5 + m_Component: + - component: {fileID: 879338379} + - component: {fileID: 401019193} + - component: {fileID: 401019192} + m_Layer: 5 + m_Name: Content-Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &401019192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114255737912944738, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + m_PrefabInternal: {fileID: 2105737666} + m_GameObject: {fileID: 401019190} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, 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: Es wurden Inhaltsupdates gefunden. Bitte warten sie, bis diese installiert + wurden. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279308561 + m_fontColor: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1} + m_enableVertexGradient: 0 + 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: 22 + m_fontSizeBase: 22 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 15 + m_fontSizeMax: 1000 + m_fontStyle: 0 + m_textAlignment: 1026 + m_isAlignmentEnumConverted: 1 + 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_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_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 401019192} + characterCount: 82 + spriteCount: 0 + spaceCount: 10 + wordCount: 11 + linkCount: 0 + lineCount: 2 + pageCount: 1 + materialCount: 1 + m_havePropertiesChanged: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_isInputParsingRequired: 1 + m_inputSource: 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 &401019193 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 222892162158991766, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + m_PrefabInternal: {fileID: 2105737666} + m_GameObject: {fileID: 401019190} --- !u!1 &419149448 GameObject: m_ObjectHideFlags: 0 @@ -618,10 +744,10 @@ RectTransform: m_Father: {fileID: 485155447} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.02, y: 0.01} - m_AnchorMax: {x: 0.98, y: 0.84} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -52.5} + m_SizeDelta: {x: -30, y: -135} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &419149450 MonoBehaviour: @@ -688,10 +814,10 @@ RectTransform: m_Father: {fileID: 318423820} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0.35} - m_AnchorMax: {x: 0.8, y: 0.45} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 300, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &426346271 MonoBehaviour: @@ -814,10 +940,10 @@ RectTransform: m_Father: {fileID: 869888025} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.05} - m_AnchorMax: {x: 0.95, y: 0.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -100, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &485155448 MonoBehaviour: @@ -898,10 +1024,10 @@ RectTransform: m_Father: {fileID: 485155447} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.02, y: 0.01} - m_AnchorMax: {x: 0.98, y: 0.84} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -52.5} + m_SizeDelta: {x: -30, y: -135} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &562107610 MonoBehaviour: @@ -1198,12 +1324,12 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 1024} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1248,11 +1374,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!224 &879338379 stripped +--- !u!224 &879338379 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 224649743259211562, guid: f0e20368501d2ab44a2da8b13a9f2df7, type: 2} m_PrefabInternal: {fileID: 2105737666} + m_GameObject: {fileID: 401019190} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 562107609} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1042781312 GameObject: m_ObjectHideFlags: 0 @@ -1263,7 +1403,6 @@ GameObject: - component: {fileID: 1042781313} - component: {fileID: 1042781316} - component: {fileID: 1042781315} - - component: {fileID: 1042781314} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1289,18 +1428,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1042781314 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1042781312} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &1042781315 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1347,8 +1474,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 38.4 - m_fontSizeBase: 38.4 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -1491,7 +1618,6 @@ GameObject: - component: {fileID: 1121907315} - component: {fileID: 1121907318} - component: {fileID: 1121907317} - - component: {fileID: 1121907316} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1517,18 +1643,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1121907316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1121907314} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &1121907317 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1576,14 +1690,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 38.4 - m_fontSizeBase: 38.4 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 m_fontSizeMax: 1000 m_fontStyle: 0 - m_textAlignment: 257 + m_textAlignment: 1026 m_isAlignmentEnumConverted: 1 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1621,7 +1735,7 @@ MonoBehaviour: spaceCount: 15 wordCount: 15 linkCount: 0 - lineCount: 3 + lineCount: 2 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -1648,6 +1762,144 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1121907314} +--- !u!1 &1323455956 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1688342124740992, guid: 29f4305098c707c45ade455d2501b7d1, + type: 2} + m_PrefabInternal: {fileID: 1621054711} + serializedVersion: 5 + m_Component: + - component: {fileID: 1940905981} + - component: {fileID: 1323455959} + - component: {fileID: 1323455958} + m_Layer: 5 + m_Name: Header-Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1323455958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114548906480688202, guid: 29f4305098c707c45ade455d2501b7d1, + type: 2} + m_PrefabInternal: {fileID: 1621054711} + m_GameObject: {fileID: 1323455956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, 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: Updates + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, 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_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: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 42 + m_fontSizeMax: 420 + m_fontStyle: 0 + m_textAlignment: 514 + m_isAlignmentEnumConverted: 1 + 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_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_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 1323455958} + characterCount: 7 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_havePropertiesChanged: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_isInputParsingRequired: 1 + m_inputSource: 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 &1323455959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 222034038926247372, guid: 29f4305098c707c45ade455d2501b7d1, + type: 2} + m_PrefabInternal: {fileID: 1621054711} + m_GameObject: {fileID: 1323455956} --- !u!1 &1576637857 GameObject: m_ObjectHideFlags: 0 @@ -1742,8 +1994,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 38.4 - m_fontSizeBase: 38.4 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -1999,12 +2251,12 @@ Prefab: - target: {fileID: 114548906480688202, guid: 29f4305098c707c45ade455d2501b7d1, type: 2} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 114548906480688202, guid: 29f4305098c707c45ade455d2501b7d1, type: 2} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1688342124740992, guid: 29f4305098c707c45ade455d2501b7d1, type: 2} propertyPath: m_StaticEditorFlags @@ -2013,9 +2265,20 @@ Prefab: - target: {fileID: 114548906480688202, guid: 29f4305098c707c45ade455d2501b7d1, type: 2} propertyPath: m_firstOverflowCharacterIndex - value: 0 + value: -1 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 114548906480688202, guid: 29f4305098c707c45ade455d2501b7d1, + type: 2} + propertyPath: m_fontSize + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 114548906480688202, guid: 29f4305098c707c45ade455d2501b7d1, + type: 2} + propertyPath: m_fontSizeBase + value: 40 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 114321794584726058, guid: 29f4305098c707c45ade455d2501b7d1, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 29f4305098c707c45ade455d2501b7d1, type: 2} m_IsPrefabParent: 0 --- !u!1 &1625774843 @@ -2050,10 +2313,10 @@ RectTransform: m_Father: {fileID: 1979410603} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} - m_AnchorMax: {x: 0.8, y: 0.1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 300, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1625774845 MonoBehaviour: @@ -2171,10 +2434,10 @@ RectTransform: m_Father: {fileID: 485155447} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.85} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1676323381 MonoBehaviour: @@ -2209,11 +2472,25 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1676323379} ---- !u!224 &1940905981 stripped +--- !u!224 &1940905981 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 224681203945809516, guid: 29f4305098c707c45ade455d2501b7d1, type: 2} m_PrefabInternal: {fileID: 1621054711} + m_GameObject: {fileID: 1323455956} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1676323380} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.1, y: 0.1} + m_AnchorMax: {x: 0.9, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1954580944 GameObject: m_ObjectHideFlags: 0 @@ -2224,7 +2501,6 @@ GameObject: - component: {fileID: 1954580945} - component: {fileID: 1954580948} - component: {fileID: 1954580947} - - component: {fileID: 1954580946} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2250,18 +2526,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1954580946 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1954580944} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &1954580947 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2308,8 +2572,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 38.4 - m_fontSizeBase: 38.4 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -2412,10 +2676,10 @@ RectTransform: m_Father: {fileID: 485155447} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.02, y: 0.01} - m_AnchorMax: {x: 0.98, y: 0.84} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -52.5} + m_SizeDelta: {x: -30, y: -135} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1979410604 MonoBehaviour: @@ -2528,7 +2792,6 @@ GameObject: - component: {fileID: 2032181273} - component: {fileID: 2032181276} - component: {fileID: 2032181275} - - component: {fileID: 2032181274} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2554,18 +2817,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2032181274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2032181272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &2032181275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2612,8 +2863,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 38.4 - m_fontSizeBase: 38.4 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -2762,7 +3013,6 @@ GameObject: - component: {fileID: 2042845845} - component: {fileID: 2042845848} - component: {fileID: 2042845847} - - component: {fileID: 2042845846} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2788,18 +3038,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2042845846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2042845844} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} - m_Name: - m_EditorClassIdentifier: - SizeClass: 1 --- !u!114 &2042845847 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2846,8 +3084,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 38.4 - m_fontSizeBase: 38.4 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -3015,6 +3253,36 @@ Prefab: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 114255737912944738, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114255737912944738, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114255737912944738, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + propertyPath: m_textAlignment + value: 1026 + objectReference: {fileID: 0} + - target: {fileID: 114255737912944738, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + propertyPath: m_fontSize + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 114255737912944738, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + propertyPath: m_fontSizeBase + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 114255737912944738, guid: f0e20368501d2ab44a2da8b13a9f2df7, + type: 2} + propertyPath: m_textInfo.lineCount + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f0e20368501d2ab44a2da8b13a9f2df7, type: 2} m_IsPrefabParent: 0