diff --git a/Assets/Resources/Prefabs/LanguageSelectFlag.prefab b/Assets/Resources/Prefabs/LanguageSelectFlag.prefab index e5ae1e7..452cbef 100644 --- a/Assets/Resources/Prefabs/LanguageSelectFlag.prefab +++ b/Assets/Resources/Prefabs/LanguageSelectFlag.prefab @@ -9,7 +9,7 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1330149800350536} + m_RootGameObject: {fileID: 1870780660331822} m_IsPrefabParent: 1 --- !u!1 &1093268079576834 GameObject: @@ -21,6 +21,7 @@ GameObject: - component: {fileID: 224450866601641818} - component: {fileID: 222803596777175386} - component: {fileID: 114256446231503418} + - component: {fileID: 114782317710288346} m_Layer: 5 m_Name: LanguageNameLabel m_TagString: Untagged @@ -41,6 +42,23 @@ GameObject: - 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} + m_Layer: 5 m_Name: LanguageSelectFlag m_TagString: Untagged m_Icon: {fileID: 0} @@ -65,6 +83,7 @@ MonoBehaviour: m_PreferredHeight: -1 m_FlexibleWidth: 1 m_FlexibleHeight: 1 + m_LayoutPriority: 1 --- !u!114 &114256446231503418 MonoBehaviour: m_ObjectHideFlags: 1 @@ -118,7 +137,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 258 m_isAlignmentEnumConverted: 1 m_characterSpacing: 0 m_wordSpacing: 0 @@ -245,6 +264,37 @@ MonoBehaviour: 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_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: 1 + m_LayoutPriority: 1 --- !u!222 &222618047529750836 CanvasRenderer: m_ObjectHideFlags: 1 @@ -257,6 +307,32 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1093268079576834} +--- !u!222 &222960981589513356 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1870780660331822} +--- !u!224 &224192554854338646 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1870780660331822} + 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} + 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} --- !u!224 &224212217427961336 RectTransform: m_ObjectHideFlags: 1 @@ -266,15 +342,14 @@ RectTransform: 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: 224450866601641818} - m_Father: {fileID: 0} + m_Children: [] + m_Father: {fileID: 224192554854338646} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 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: 220, y: 132} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224450866601641818 RectTransform: @@ -283,14 +358,14 @@ RectTransform: 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: -1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224212217427961336} - m_RootOrder: 0 + m_Father: {fileID: 224192554854338646} + m_RootOrder: 1 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: -16} - m_SizeDelta: {x: 0, y: 32} + m_AnchorMin: {x: 0.2, y: 0.4} + m_AnchorMax: {x: 0.8, y: 0.44} + 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/UI/ARView.prefab b/Assets/Resources/UI/ARView.prefab index 3b3b460..b5ddd88 100644 --- a/Assets/Resources/UI/ARView.prefab +++ b/Assets/Resources/UI/ARView.prefab @@ -967,7 +967,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: 7ea22a853705cb04cbedbad9f9fa79e6, type: 3} + m_Sprite: {fileID: 21300000, guid: a563ce80830404f4c8679edceb490e4d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1203,7 +1203,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: 88c92cd0a61144c4c90690e92286b21d, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f23181e0a1c78544835bd9301f1eef7, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/Assets/Resources/UI/ColorSelectView.prefab b/Assets/Resources/UI/ColorSelectView.prefab index e65948e..b3f3b35 100644 --- a/Assets/Resources/UI/ColorSelectView.prefab +++ b/Assets/Resources/UI/ColorSelectView.prefab @@ -11,16 +11,35 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1530640290346280} m_IsPrefabParent: 1 ---- !u!1 &1063640758338194 +--- !u!1 &1129698595492812 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224494032561534748} - - component: {fileID: 222796701163864096} - - component: {fileID: 114529091699362428} + - component: {fileID: 224423226335189446} + - component: {fileID: 222191119839416754} + - component: {fileID: 114269142431248838} + - component: {fileID: 114941787814822646} + m_Layer: 5 + m_Name: ColorCircle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1210141957160624 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224125319600290544} + - component: {fileID: 222946919128408452} + - component: {fileID: 114416084065759590} + - component: {fileID: 114798251844073798} m_Layer: 5 m_Name: LanguageNameLabel m_TagString: Untagged @@ -45,6 +64,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1408799004937590 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224700617536308116} + - component: {fileID: 222625242278154342} + - component: {fileID: 114281791937311286} + m_Layer: 5 + m_Name: ColorSelectionCircle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!1 &1423640151677840 GameObject: m_ObjectHideFlags: 0 @@ -61,25 +97,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1439967820323134 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224268489068894602} - - component: {fileID: 222391030269382016} - - component: {fileID: 114259764683289312} - - component: {fileID: 114907234108455122} - - component: {fileID: 114595810335764976} - m_Layer: 5 - m_Name: ColorSelectionCircle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 --- !u!1 &1530640290346280 GameObject: m_ObjectHideFlags: 0 @@ -110,6 +127,7 @@ GameObject: - component: {fileID: 224150896017563766} - component: {fileID: 222562460769798160} - component: {fileID: 114442948297432030} + - component: {fileID: 114208553699807782} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -128,7 +146,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b4717e5be719b940a55640735c5cae4, type: 3} m_Name: m_EditorClassIdentifier: - ColorSelectCircle: {fileID: 1439967820323134} + ColorSelectCircle: {fileID: 1408799004937590} --- !u!114 &114023881603788018 MonoBehaviour: m_ObjectHideFlags: 1 @@ -146,17 +164,29 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 12 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 ---- !u!114 &114259764683289312 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + 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: 1439967820323134} + 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 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1129698595492812} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -170,14 +200,33 @@ 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_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114281791937311286 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1408799004937590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: 1 + m_LayoutPriority: 1 --- !u!114 &114405187272099950 MonoBehaviour: m_ObjectHideFlags: 1 @@ -205,60 +254,12 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114437598464738088 +--- !u!114 &114416084065759590 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1530640290346280} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!114 &114442948297432030 -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: -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: 21300000, guid: eb49301329e107446aa50581556c6c63, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114529091699362428 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1063640758338194} + m_GameObject: {fileID: 1210141957160624} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} @@ -306,7 +307,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 258 m_isAlignmentEnumConverted: 1 m_characterSpacing: 0 m_wordSpacing: 0 @@ -317,7 +318,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 9 + m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_enableKerning: 1 @@ -338,13 +339,13 @@ MonoBehaviour: m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: - textComponent: {fileID: 114529091699362428} + textComponent: {fileID: 114416084065759590} characterCount: 13 spriteCount: 0 spaceCount: 1 wordCount: 2 linkCount: 0 - lineCount: 2 + lineCount: 1 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -365,12 +366,88 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &114595810335764976 +--- !u!114 &114437598464738088 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1439967820323134} + m_GameObject: {fileID: 1530640290346280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &114442948297432030 +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: -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: 21300000, guid: c13dcca1862da4149bb34c49f8adbf5f, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114769754509622112 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1530640290346280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + 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 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1129698595492812} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -400,7 +477,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 114259764683289312} + m_TargetGraphic: {fileID: 114269142431248838} m_OnClick: m_PersistentCalls: m_Calls: @@ -417,70 +494,42 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &114769754509622112 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1530640290346280} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &114907234108455122 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1439967820323134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: 1 - m_FlexibleHeight: 1 --- !u!222 &222144103084300208 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1238024921093434} ---- !u!222 &222391030269382016 +--- !u!222 &222191119839416754 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1439967820323134} + m_GameObject: {fileID: 1129698595492812} --- !u!222 &222562460769798160 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1903496386009006} +--- !u!222 &222625242278154342 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1408799004937590} --- !u!222 &222727468347014598 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1530640290346280} ---- !u!222 &222796701163864096 +--- !u!222 &222946919128408452 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1063640758338194} + m_GameObject: {fileID: 1210141957160624} --- !u!223 &223254025722396856 Canvas: m_ObjectHideFlags: 1 @@ -519,6 +568,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 4, y: 4} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224125319600290544 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1210141957160624} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224700617536308116} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.2, y: 0.4} + m_AnchorMax: {x: 0.8, y: 0.44} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224150896017563766 RectTransform: m_ObjectHideFlags: 1 @@ -532,29 +599,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48, y: -48} - m_SizeDelta: {x: 48, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224268489068894602 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1439967820323134} - 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: 224494032561534748} - m_Father: {fileID: 224340703255627502} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 512, y: -384} - m_SizeDelta: {x: 100, y: 100} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224340703255627502 RectTransform: @@ -566,12 +614,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224268489068894602} + - {fileID: 224700617536308116} m_Father: {fileID: 224360344833465170} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.2, y: 0} + m_AnchorMax: {x: 0.8, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -596,21 +644,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!224 &224494032561534748 +--- !u!224 &224423226335189446 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1063640758338194} + m_GameObject: {fileID: 1129698595492812} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224268489068894602} + m_Father: {fileID: 224700617536308116} 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: -16} - m_SizeDelta: {x: 0, y: 32} + 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 &224700617536308116 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1408799004937590} + 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: 224423226335189446} + - {fileID: 224125319600290544} + m_Father: {fileID: 224340703255627502} + m_RootOrder: 0 + 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_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/CreditsView.prefab b/Assets/Resources/UI/CreditsView.prefab index eb534fd..e6cbe70 100644 --- a/Assets/Resources/UI/CreditsView.prefab +++ b/Assets/Resources/UI/CreditsView.prefab @@ -74,6 +74,7 @@ GameObject: - component: {fileID: 222203661534893336} - component: {fileID: 114856393737139808} - component: {fileID: 114365560402626540} + - component: {fileID: 114766449491170998} m_Layer: 5 m_Name: Headline m_TagString: Untagged @@ -110,6 +111,7 @@ GameObject: m_Component: - component: {fileID: 224105024989387982} - component: {fileID: 114873919048767614} + - component: {fileID: 114549499659694102} m_Layer: 5 m_Name: Head m_TagString: Untagged @@ -143,6 +145,7 @@ GameObject: - component: {fileID: 224246252733405256} - component: {fileID: 222058416552286328} - component: {fileID: 114713400967023104} + - component: {fileID: 114635645336116288} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -161,6 +164,7 @@ GameObject: - component: {fileID: 222356890047705732} - component: {fileID: 114243583540241576} - component: {fileID: 114592252867868356} + - component: {fileID: 114091865845724026} m_Layer: 5 m_Name: Footer m_TagString: Untagged @@ -246,6 +250,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224229517299928608} + - component: {fileID: 114876702735145276} m_Layer: 5 m_Name: ButtonBack m_TagString: Untagged @@ -349,6 +354,18 @@ 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 @@ -367,6 +384,7 @@ MonoBehaviour: m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!114 &114243583540241576 MonoBehaviour: m_ObjectHideFlags: 1 @@ -420,7 +438,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 257 + m_textAlignment: 1025 m_isAlignmentEnumConverted: 1 m_characterSpacing: 0 m_wordSpacing: 0 @@ -431,7 +449,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 0 + m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_enableKerning: 1 @@ -524,6 +542,7 @@ MonoBehaviour: m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!114 &114437598464738088 MonoBehaviour: m_ObjectHideFlags: 1 @@ -564,9 +583,9 @@ 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_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -591,9 +610,9 @@ 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: d12308a75cc66384abf62a0214482acf, type: 3} + m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -626,6 +645,25 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114549499659694102 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1606649730564444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 0 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!114 &114592252867868356 MonoBehaviour: m_ObjectHideFlags: 1 @@ -644,6 +682,19 @@ MonoBehaviour: m_PreferredHeight: -1 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 @@ -742,7 +793,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 508 + m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_enableKerning: 1 @@ -769,7 +820,7 @@ MonoBehaviour: spaceCount: 82 wordCount: 82 linkCount: 0 - lineCount: 21 + lineCount: 17 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -812,6 +863,18 @@ 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 @@ -922,7 +985,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 13 + m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_enableKerning: 1 @@ -985,9 +1048,10 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 375.5 + m_PreferredHeight: -1 m_FlexibleWidth: -1 - m_FlexibleHeight: -1 + m_FlexibleHeight: 3 + m_LayoutPriority: 1 --- !u!114 &114873919048767614 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1010,6 +1074,18 @@ 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 @@ -1028,6 +1104,7 @@ MonoBehaviour: m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!114 &114929402249897480 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1157,10 +1234,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 1 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.1, y: 0.1} + m_AnchorMax: {x: 0.9, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 530, y: 500} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224105024989387982 RectTransform: @@ -1219,10 +1296,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} + m_AnchorMin: {x: 0.9, y: 0.9} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -75, y: -75} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224246252733405256 RectTransform: @@ -1237,10 +1314,10 @@ RectTransform: m_Father: {fileID: 224972324973630942} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 256, y: -158.34} - m_SizeDelta: {x: 512, y: 305.56} + 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} --- !u!224 &224310619414536014 RectTransform: @@ -1307,15 +1384,15 @@ RectTransform: m_GameObject: {fileID: 1300065597454686} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9999991, y: 0.9999991, z: 0.9999991} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224229517299928608} m_RootOrder: 1 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: 48, y: 48} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224512175913867604 RectTransform: diff --git a/Assets/Resources/UI/InfoModelAnimatorController.controller b/Assets/Resources/UI/InfoModelAnimatorController.controller deleted file mode 100644 index 832497f..0000000 --- a/Assets/Resources/UI/InfoModelAnimatorController.controller +++ /dev/null @@ -1,67 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: InfoModelAnimatorController - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1107372604878335606} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &1102112571353430342 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: poi_model_rotation - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 174e4b3b259f9b746b9fc42d7fd4b36d, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: ---- !u!1107 &1107372604878335606 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102112571353430342} - m_Position: {x: 264, y: 120, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102112571353430342} diff --git a/Assets/Resources/UI/InfoModelAnimatorController.controller.meta b/Assets/Resources/UI/InfoModelAnimatorController.controller.meta deleted file mode 100644 index f8f763c..0000000 --- a/Assets/Resources/UI/InfoModelAnimatorController.controller.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c9efa66e812e7b8459a19c372a6fd05e -timeCreated: 1505143865 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/UI/LanguageSelectView.prefab b/Assets/Resources/UI/LanguageSelectView.prefab index 762d11f..17cff5c 100644 --- a/Assets/Resources/UI/LanguageSelectView.prefab +++ b/Assets/Resources/UI/LanguageSelectView.prefab @@ -74,6 +74,7 @@ GameObject: - component: {fileID: 224610144177016324} - component: {fileID: 222102007686133384} - component: {fileID: 114417891219477538} + - component: {fileID: 114603035056422536} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -98,11 +99,11 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 12 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 --- !u!114 &114153881196739850 MonoBehaviour: m_ObjectHideFlags: 1 @@ -115,7 +116,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: FlagContainer: {fileID: 1423640151677840} - FlagPrefab: {fileID: 1330149800350536, guid: c13f7f96aebb0184a8768754314e5729, type: 2} + FlagPrefab: {fileID: 1870780660331822, guid: c13f7f96aebb0184a8768754314e5729, type: 2} --- !u!114 &114405187272099950 MonoBehaviour: m_ObjectHideFlags: 1 @@ -162,9 +163,9 @@ 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: b7b98bcf7fb71ec49b9e9efcf88cc54f, type: 3} + m_Sprite: {fileID: 21300000, guid: c5442431c660fb04187df8dfe3e1818e, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -191,6 +192,18 @@ MonoBehaviour: 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 @@ -276,10 +289,10 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.2, y: 0} + m_AnchorMax: {x: 0.8, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 220} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224360344833465170 RectTransform: @@ -315,8 +328,8 @@ RectTransform: m_Father: {fileID: 224360344833465170} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48, y: -48} - m_SizeDelta: {x: 48, y: 48} + 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_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/SettingsView.prefab b/Assets/Resources/UI/SettingsView.prefab index e27987d..6b16104 100644 --- a/Assets/Resources/UI/SettingsView.prefab +++ b/Assets/Resources/UI/SettingsView.prefab @@ -328,6 +328,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1876542019120094 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224820400269443288} + - component: {fileID: 222469164334548030} + - component: {fileID: 114339176493472056} + - component: {fileID: 114609205135736288} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1884352349440970 GameObject: m_ObjectHideFlags: 1 @@ -488,9 +506,9 @@ 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: ad77152caa09fa446a4973275688e110, type: 3} + m_Sprite: {fileID: 21300000, guid: b5e202b95d89cd049b427305de29d3ec, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -745,9 +763,9 @@ 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: b7b98bcf7fb71ec49b9e9efcf88cc54f, type: 3} + m_Sprite: {fileID: 21300000, guid: c5442431c660fb04187df8dfe3e1818e, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -784,9 +802,9 @@ 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: d6316c1983979184aa5d23b35e44799d, type: 3} + m_Sprite: {fileID: 21300000, guid: a765cfabfca9fa34fb6d7d0f8c0e5943, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -904,6 +922,33 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &114339176493472056 +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: -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: 21300000, guid: 8f23181e0a1c78544835bd9301f1eef7, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114340094141147230 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1136,6 +1181,18 @@ 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 @@ -1155,9 +1212,9 @@ 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: eb49301329e107446aa50581556c6c63, type: 3} + m_Sprite: {fileID: 21300000, guid: c13dcca1862da4149bb34c49f8adbf5f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1446,7 +1503,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: d12308a75cc66384abf62a0214482acf, type: 3} + m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1680,6 +1737,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1566260761276548} +--- !u!222 &222469164334548030 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1876542019120094} --- !u!222 &222547030763414376 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1839,6 +1902,7 @@ RectTransform: - {fileID: 224360344833465170} - {fileID: 224893211876998240} - {fileID: 224844527725026830} + - {fileID: 224820400269443288} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1914,10 +1978,10 @@ RectTransform: m_Father: {fileID: 224696479351442688} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.5} - m_AnchorMax: {x: 0.05, y: 0.5} + m_AnchorMin: {x: 0, y: 0.2} + m_AnchorMax: {x: 0.1, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224482497675166948 RectTransform: @@ -1932,10 +1996,10 @@ RectTransform: m_Father: {fileID: 224750414370576322} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.5} - m_AnchorMax: {x: 0.05, y: 0.5} + m_AnchorMin: {x: 0, y: 0.2} + m_AnchorMax: {x: 0.1, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224552794473583084 RectTransform: @@ -2015,6 +2079,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224820400269443288 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1876542019120094} + 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: 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_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224844527725026830 RectTransform: m_ObjectHideFlags: 1 @@ -2071,10 +2153,10 @@ RectTransform: m_Father: {fileID: 224969683658863468} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.5} - m_AnchorMax: {x: 0.05, y: 0.5} + m_AnchorMin: {x: 0, y: 0.2} + m_AnchorMax: {x: 0.1, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224893211876998240 RectTransform: @@ -2145,10 +2227,10 @@ RectTransform: m_Father: {fileID: 224877065014001232} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.5} - m_AnchorMax: {x: 0.05, y: 0.5} + m_AnchorMin: {x: 0, y: 0.2} + m_AnchorMax: {x: 0.1, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} + m_SizeDelta: {x: 0, y: 0} 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 a86bcb7..9fd9ac0 100644 --- a/Assets/Resources/UI/TutorialView.prefab +++ b/Assets/Resources/UI/TutorialView.prefab @@ -36,6 +36,7 @@ GameObject: - component: {fileID: 224773095307896718} - component: {fileID: 222125691281678280} - component: {fileID: 114364223746917038} + - component: {fileID: 114502305032582084} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -70,6 +71,7 @@ GameObject: - component: {fileID: 224658397301747820} - component: {fileID: 222584687511144990} - component: {fileID: 114578623418952694} + - component: {fileID: 114504370255026716} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -77,6 +79,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1112494842730624 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224257449048418606} + - component: {fileID: 222483487564013734} + - component: {fileID: 114058094134189366} + m_Layer: 5 + m_Name: ConnectorHorizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1170597526670374 GameObject: m_ObjectHideFlags: 1 @@ -120,6 +139,7 @@ GameObject: - component: {fileID: 224024286302778554} - component: {fileID: 222542415928726304} - component: {fileID: 114510575319355086} + - component: {fileID: 114021140929131048} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -151,6 +171,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224336834733934388} + - component: {fileID: 114584589056048672} m_Layer: 5 m_Name: ButtonMenu m_TagString: Untagged @@ -173,6 +194,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1375812340030450 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224669631191999706} + - component: {fileID: 222715623099804702} + - component: {fileID: 114635013348880514} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1395188841539774 GameObject: m_ObjectHideFlags: 1 @@ -190,6 +228,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1428847988044214 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224820724373761764} + - component: {fileID: 222390555562366110} + - component: {fileID: 114564497257062652} + - component: {fileID: 114934246685716862} + m_Layer: 5 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1430019019411406 GameObject: m_ObjectHideFlags: 1 @@ -206,23 +262,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1443904180031652 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224871589705394280} - - component: {fileID: 222907581833545426} - - component: {fileID: 114264537711150094} - m_Layer: 5 - m_Name: ConnectorHorizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1449474661047768 GameObject: m_ObjectHideFlags: 1 @@ -255,23 +294,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1494847141247564 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224270573851986854} - - component: {fileID: 222219527244485046} - - component: {fileID: 114259015221719018} - m_Layer: 5 - m_Name: Reticule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1630346904590610 GameObject: m_ObjectHideFlags: 1 @@ -289,16 +311,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1709605360546612 +--- !u!1 &1754144216622158 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224862869207227734} + - component: {fileID: 224552402661067298} + - component: {fileID: 95304401181590314} + - component: {fileID: 114003589050709218} + - component: {fileID: 114810455410940454} m_Layer: 5 - m_Name: Crosshairs + m_Name: Reticule m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -312,6 +337,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224543001454646402} + - component: {fileID: 114559618442054936} m_Layer: 5 m_Name: ButtonSelect m_TagString: Untagged @@ -319,6 +345,23 @@ 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 @@ -380,6 +423,7 @@ GameObject: - component: {fileID: 224669615654841574} - component: {fileID: 222099817702158366} - component: {fileID: 114955655822971140} + - component: {fileID: 114152855451479104} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -421,23 +465,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1981411832570300 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224768289979070024} - - component: {fileID: 222796320701059162} - - component: {fileID: 114333082859953020} - m_Layer: 5 - m_Name: ConnectorDiagonal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1985483034637490 GameObject: m_ObjectHideFlags: 0 @@ -458,6 +485,88 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1991900300183792 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224374825834825260} + m_Layer: 5 + m_Name: Crosshairs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &95304401181590314 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1754144216622158} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0ee2f5feba4671f4893e80ceb40ab892, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 +--- !u!114 &114003589050709218 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1754144216622158} + m_Enabled: 1 + m_EditorHideFlags: 0 + 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 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1112494842730624} + 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 &114094662748965206 MonoBehaviour: m_ObjectHideFlags: 1 @@ -540,87 +649,18 @@ MonoBehaviour: reticuleHighlight: {fileID: 114430674035238108} menuHighlight: {fileID: 114094662748965206} selectHighlight: {fileID: 114425245405885838} ---- !u!114 &114259015221719018 +--- !u!114 &114152855451479104 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1494847141247564} + m_GameObject: {fileID: 1919422478631130} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, 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: 21300000, guid: 35ce36be5f7e6ea4ab96dc68cb4ab19b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114264537711150094 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1443904180031652} - 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 &114333082859953020 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1981411832570300} - 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 + SizeClass: 1 --- !u!114 &114339554770605862 MonoBehaviour: m_ObjectHideFlags: 1 @@ -640,9 +680,9 @@ 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_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -667,8 +707,35 @@ 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: d6316c1983979184aa5d23b35e44799d, type: 3} + m_Sprite: {fileID: 21300000, guid: a765cfabfca9fa34fb6d7d0f8c0e5943, type: 3} m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + 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 @@ -724,6 +791,30 @@ MonoBehaviour: 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 @@ -890,6 +981,45 @@ 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 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1428847988044214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 1c3855372a0292c4e9de9524dc2b46d2, type: 2} + 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: 21300000, guid: 48ecc8a9d56982a4b9d0c2d373cbcbb5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114578623418952694 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1002,6 +1132,18 @@ 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 @@ -1029,6 +1171,33 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114635013348880514 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1375812340030450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 227907003f436984ea6d05149e0ef1ee, type: 2} + 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: 21300000, guid: 48ecc8a9d56982a4b9d0c2d373cbcbb5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114660300147402932 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1048,9 +1217,9 @@ 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: 88c92cd0a61144c4c90690e92286b21d, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f23181e0a1c78544835bd9301f1eef7, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1102,14 +1271,26 @@ 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: 7ea22a853705cb04cbedbad9f9fa79e6, type: 3} + m_Sprite: {fileID: 21300000, guid: a563ce80830404f4c8679edceb490e4d, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114810455410940454 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1754144216622158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3} + m_Name: + m_EditorClassIdentifier: + Padding: 0.01 --- !u!114 &114835658581219120 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1129,9 +1310,9 @@ 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_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1153,6 +1334,18 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &114934246685716862 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1428847988044214} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!114 &114955655822971140 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1289,12 +1482,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1955457478861574} ---- !u!222 &222219527244485046 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1494847141247564} --- !u!222 &222241844012228314 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1313,12 +1500,30 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1092432317940402} +--- !u!222 &222390555562366110 +CanvasRenderer: + m_ObjectHideFlags: 1 + 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 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1112494842730624} --- !u!222 &222542415928726304 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1343,30 +1548,24 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1463309367116254} +--- !u!222 &222715623099804702 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1375812340030450} --- !u!222 &222716279279430732 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1985483034637490} ---- !u!222 &222796320701059162 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1981411832570300} --- !u!222 &222870291870833666 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1630346904590610} ---- !u!222 &222907581833545426 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1443904180031652} --- !u!222 &222912539976350282 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1424,10 +1623,10 @@ RectTransform: m_Father: {fileID: 224543001454646402} 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, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224024286302778554 RectTransform: @@ -1447,6 +1646,24 @@ 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 @@ -1479,10 +1696,10 @@ RectTransform: m_Father: {fileID: 224336834733934388} m_RootOrder: 1 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: 48, y: 48} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224220789679716058 RectTransform: @@ -1504,23 +1721,23 @@ RectTransform: m_AnchoredPosition: {x: -187, y: -50} m_SizeDelta: {x: 220, y: 32} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224270573851986854 +--- !u!224 &224257449048418606 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1494847141247564} + m_GameObject: {fileID: 1112494842730624} 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: 224862869207227734} - m_RootOrder: 0 + m_Father: {fileID: 224374825834825260} + m_RootOrder: 1 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.52, y: 0.5} + m_AnchorMax: {x: 0.905, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} + m_SizeDelta: {x: 0, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224336834733934388 RectTransform: @@ -1538,10 +1755,32 @@ RectTransform: m_Father: {fileID: 224386065082169650} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} + m_AnchorMin: {x: 0.9, y: 0.9} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -75, y: -75} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224374825834825260 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1991900300183792} + 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: 224552402661067298} + - {fileID: 224257449048418606} + - {fileID: 224128503128817360} + - {fileID: 224882127646750572} + m_Father: {fileID: 224386065082169650} + m_RootOrder: 4 + 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} --- !u!224 &224386065082169650 RectTransform: @@ -1557,7 +1796,7 @@ RectTransform: - {fileID: 224773095307896718} - {fileID: 224336834733934388} - {fileID: 224543001454646402} - - {fileID: 224862869207227734} + - {fileID: 224374825834825260} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1618,10 +1857,30 @@ RectTransform: m_Father: {fileID: 224386065082169650} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224552402661067298 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1754144216622158} + 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: 224820724373761764} + - {fileID: 224669631191999706} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224560155636731064 RectTransform: @@ -1695,6 +1954,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224669631191999706 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1375812340030450} + 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: 224552402661067298} + m_RootOrder: 1 + 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} --- !u!224 &224712233638768390 RectTransform: m_ObjectHideFlags: 1 @@ -1708,28 +1985,10 @@ RectTransform: m_Father: {fileID: 224336834733934388} 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, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224768289979070024 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1981411832570300} - 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: 224862869207227734} - 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: -142.29993, y: -33.100006} - m_SizeDelta: {x: 94.5, y: 2} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224770383868184822 RectTransform: @@ -1744,10 +2003,10 @@ RectTransform: m_Father: {fileID: 224543001454646402} m_RootOrder: 1 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: 48, y: 48} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224773095307896718 RectTransform: @@ -1762,10 +2021,28 @@ RectTransform: m_Father: {fileID: 224386065082169650} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48, y: -48} - m_SizeDelta: {x: 48, y: 48} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224820724373761764 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1428847988044214} + 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: 224552402661067298} + 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!224 &224845810070959288 RectTransform: @@ -1786,58 +2063,18 @@ RectTransform: m_AnchoredPosition: {x: 21.7, y: 15.8} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224862869207227734 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1709605360546612} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 224270573851986854} - - {fileID: 224871589705394280} - - {fileID: 224768289979070024} - - {fileID: 224882127646750572} - m_Father: {fileID: 224386065082169650} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224871589705394280 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1443904180031652} - 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: 224862869207227734} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -77.5, y: 50} - m_SizeDelta: {x: -195, y: 2} - m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224882127646750572 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1262410245316548} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224220789679716058} - m_Father: {fileID: 224862869207227734} + m_Father: {fileID: 224374825834825260} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs index cf7eebf..535bdd0 100644 --- a/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs @@ -23,7 +23,7 @@ namespace RothenburgAR.UI var baseColor = colorSchemes[i].BaseColorOpaque; var selectionCircle = InstatiateSelectionCircle(id, baseColor); - selectionCircle.GetComponent