diff --git a/Assets/Resources/Prefabs/UI/FactExplorer.meta b/Assets/Resources/Prefabs/UI/FactExplorer.meta new file mode 100644 index 0000000000000000000000000000000000000000..631c8c9c407df2f324c10127b5ec77c96a39d29a --- /dev/null +++ b/Assets/Resources/Prefabs/UI/FactExplorer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e5fb0597e5dd8f4fb544bd891a58d25 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab new file mode 100644 index 0000000000000000000000000000000000000000..37209044b8dde9b441ae64363a335c955b2b18e8 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab @@ -0,0 +1,396 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &88742477166944048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1922303121985957924} + - component: {fileID: 3640990131242893537} + - component: {fileID: 9026517263373289086} + m_Layer: 5 + m_Name: FactParents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1922303121985957924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88742477166944048} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3406631590813364790} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3640990131242893537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88742477166944048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &9026517263373289086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88742477166944048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &2146237966352740759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2636669742664082113} + m_Layer: 5 + m_Name: MainFact + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2636669742664082113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146237966352740759} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3406631590813364790} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5592893003942163674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3406631590813364790} + - component: {fileID: 3395920202856463226} + - component: {fileID: 5712507090492513276} + - component: {fileID: 2117595904752085810} + - component: {fileID: 1017489668606288636} + - component: {fileID: 871613573032911794} + m_Layer: 5 + m_Name: FactExplorerUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3406631590813364790 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8009565381998387591} + - {fileID: 1922303121985957924} + - {fileID: 2636669742664082113} + - {fileID: 9153153668998730241} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3395920202856463226 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_CullTransparentMesh: 1 +--- !u!114 &5712507090492513276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.19607843} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2117595904752085810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 4 + m_Spacing: 30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1017489668606288636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &871613573032911794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5592893003942163674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 795998cb72dae4043beaf3c3bb6b1b16, type: 3} + m_Name: + m_EditorClassIdentifier: + factParentsUI: {fileID: 1922303121985957924} + mainFactUI: {fileID: 2636669742664082113} + factChildrenUI: {fileID: 9153153668998730241} + linesUI: {fileID: 8009565381998387591} + factExplorerLineParents_Prefab: {fileID: 602666608487228118, guid: 6cdb6cc4d5af8db409745afbc201068b, + type: 3} + factExplorerLineChildren_Prefab: {fileID: 4365600632079246398, guid: a9fcb9d279efe6849a46855110d5e794, + type: 3} + factSpotPrefab: {fileID: 7124463502404826001, guid: 04d12e0a0a5aa884c8c7dff56f4963f6, + type: 3} +--- !u!1 &7302347448387664938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9153153668998730241} + - component: {fileID: 7740801215330722997} + - component: {fileID: 334048272176286206} + m_Layer: 5 + m_Name: FactChildren + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9153153668998730241 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7302347448387664938} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3406631590813364790} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7740801215330722997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7302347448387664938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &334048272176286206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7302347448387664938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &7418920549591013849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8009565381998387591} + - component: {fileID: 835707716098452998} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8009565381998387591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7418920549591013849} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3406631590813364790} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &835707716098452998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7418920549591013849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab.meta b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..aaf163b376b67b58bc59a80e564a73994f3bd7c4 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff7415df1aac19c41a7855516a108a8a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab new file mode 100644 index 0000000000000000000000000000000000000000..7e2630bd14b97c494fb9a085e16423b95b3b1a2b --- /dev/null +++ b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7124463502404826001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2492119118187225485} + - component: {fileID: 3183854850668897353} + - component: {fileID: 2474205050366502828} + m_Layer: 0 + m_Name: FactExplorer_FactSpot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2492119118187225485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7124463502404826001} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3183854850668897353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7124463502404826001} + m_CullTransparentMesh: 1 +--- !u!114 &2474205050366502828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7124463502404826001} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.39215687} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab.meta b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..585fd90f2a17b978f2f319b35aec15edd54ff752 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04d12e0a0a5aa884c8c7dff56f4963f6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/FrameITUI.prefab b/Assets/Resources/Prefabs/UI/FrameITUI.prefab index 3fd1eadffe361b9af9873664f9bb535f00973329..ee3cb3bc8f0c914499914b0ac396c58b44ccc499 100644 --- a/Assets/Resources/Prefabs/UI/FrameITUI.prefab +++ b/Assets/Resources/Prefabs/UI/FrameITUI.prefab @@ -406,12 +406,12 @@ PrefabInstance: - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} @@ -691,7 +691,7 @@ PrefabInstance: - target: {fileID: 9207926681532248490, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} propertyPath: m_AnchoredPosition.x - value: 3903.3896 + value: 4959.8555 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 9207926679892754397, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab b/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab index b95c492474d8201a9b3c96800315a19a161ce9d6..bcc50610ff3c670f7df361882215b85ad7bdfefe 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3869010688581027450} m_RootOrder: 0 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: 7571158064837864710} - component: {fileID: 5331562473041691776} - component: {fileID: 5437783688132341522} + - component: {fileID: 7217286308176857857} m_Layer: 0 m_Name: AngleCircleLine m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1617200358099008032} - {fileID: 1321826948182935295} @@ -240,6 +243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &5331562473041691776 CanvasGroup: m_ObjectHideFlags: 0 @@ -264,6 +268,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7217286308176857857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4902928549420802332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &7854085605173747270 GameObject: m_ObjectHideFlags: 0 @@ -292,6 +310,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.4} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3869010688581027450} m_RootOrder: 1 diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab index 5d753a6a25880733d5b05f1519884b35a921e3a0..e0572bca9e76d0e379a15001a6e4a08ee5a80b23 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6643637775379894485} m_RootOrder: 1 @@ -60,6 +61,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -85,13 +87,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -99,6 +100,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -109,10 +112,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -120,40 +121,18 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 6643637774014364123} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6643637774878492038 @@ -184,6 +163,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6643637775379894485} m_RootOrder: 0 @@ -216,6 +196,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -241,13 +222,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -255,6 +235,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -265,10 +247,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -276,40 +256,18 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 6643637774878492040} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6643637775318367256 @@ -340,6 +298,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6643637775379894485} m_RootOrder: 2 @@ -372,6 +331,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -397,13 +357,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -411,6 +370,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -421,10 +382,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -432,40 +391,18 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 6643637775318367258} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6643637775379894484 @@ -483,6 +420,7 @@ GameObject: - component: {fileID: 225831940989964384} - component: {fileID: 114522817932931646} - component: {fileID: 3011926265969909947} + - component: {fileID: 3573135846559875297} m_Layer: 5 m_Name: AngleDisplay m_TagString: Untagged @@ -500,6 +438,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6643637774878492039} - {fileID: 6643637774014364122} @@ -535,6 +474,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -562,10 +502,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 6643637775379894486} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 --- !u!225 &225831940989964384 CanvasGroup: m_ObjectHideFlags: 0 @@ -590,6 +526,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!114 &3011926265969909947 MonoBehaviour: m_ObjectHideFlags: 0 @@ -602,3 +539,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &3573135846559875297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6643637775379894484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab b/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab index 807e63f91fe8a7f4b25e50d3f1c4c0dd393c007d..9391cebc64d77aba703a36cce617f6e9488762a2 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 17.8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7235558123707866364} m_RootOrder: 0 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: 6928182635216917115} - component: {fileID: 8310254113192487485} - component: {fileID: 6811931286641226162} + - component: {fileID: 4444078412922319222} m_Layer: 0 m_Name: AreaCircle_perfab m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4555626192197843171} m_Father: {fileID: 0} @@ -239,6 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &8310254113192487485 CanvasGroup: m_ObjectHideFlags: 0 @@ -263,3 +267,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4444078412922319222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016901710118546043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab b/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab index a1c024a4d683e1ab20c22465a7397451174ca59c..a50b0f607aacff166ea90b751a24c9f9b3db6e28 100644 --- a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8780569031657450116} m_RootOrder: 0 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: 3896398116007953758} - component: {fileID: 6482343618895123747} - component: {fileID: 1602337205070616824} + - component: {fileID: -8545268462245846538} m_Layer: 5 m_Name: CircleFact m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8695166600416321831} m_Father: {fileID: 0} @@ -239,6 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &6482343618895123747 CanvasGroup: m_ObjectHideFlags: 0 @@ -263,3 +267,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-8545268462245846538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6636443472981757786} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab b/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab index 9ec0e4efc010015a1c41ea8e03f4e02657d0ac1f..41d2ed33d151570516e140b7c3ec4c2cfbe70887 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 17.8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1359998811365411408} m_RootOrder: 0 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: 4263320076605886561} - component: {fileID: 3829202662460982349} - component: {fileID: 2650353447837694094} + - component: {fileID: -1328819392998620038} m_Layer: 0 m_Name: ConeVolume_prefab m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4986007063741953014} m_Father: {fileID: 0} @@ -239,6 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &3829202662460982349 CanvasGroup: m_ObjectHideFlags: 0 @@ -263,3 +267,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-1328819392998620038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2523593828849809055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab b/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab index bf194d69b45ee0a2871b6acb5813535509c05bd2..6770dcb8d41fa1adea35fc6c4447c71f0c61213e 100644 --- a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7509137162853395042} m_RootOrder: 0 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: -7338472263132780475} - component: {fileID: 7240967210820331247} - component: {fileID: 2130710490396271644} + - component: {fileID: 8056345640559627384} m_Layer: 0 m_Name: CylinderVolume m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3254540930359715604} m_Father: {fileID: 0} @@ -239,6 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &7240967210820331247 CanvasGroup: m_ObjectHideFlags: 0 @@ -263,3 +267,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8056345640559627384 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5287418535931939099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab b/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab index dc924311770247470868d4c459bae634f2aecb40..2387c59149567798edeac5c12212d795b0236956 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8643015897288315615} m_RootOrder: 0 @@ -60,6 +61,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -85,13 +87,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -99,6 +100,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -109,10 +112,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -120,40 +121,18 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 5696377050731032053} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7510387096843212865 @@ -171,6 +150,7 @@ GameObject: - component: {fileID: 3914868910838030883} - component: {fileID: 4479822174921760807} - component: {fileID: 7215917396402112958} + - component: {fileID: 7981125183230312854} m_Layer: 5 m_Name: DisplayLine m_TagString: Untagged @@ -188,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3165017659102780400} m_Father: {fileID: 0} @@ -221,6 +202,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -248,10 +230,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 6811289727063397518} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 --- !u!114 &3914868910838030883 MonoBehaviour: m_ObjectHideFlags: 0 @@ -264,6 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &4479822174921760807 CanvasGroup: m_ObjectHideFlags: 0 @@ -288,3 +267,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7981125183230312854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510387096843212865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab b/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab index 7da811c09c291c368344df51748140e56e8524e3..76fa03895ffecd03b6ae08ac8e66c923a25581fc 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5490242222770183200} m_RootOrder: 1 @@ -60,6 +61,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -85,13 +87,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -99,6 +100,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -109,10 +112,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -120,40 +121,18 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 6.839691, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 3599574990072972372} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3216314843116350079 @@ -184,6 +163,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5490242222770183200} m_RootOrder: 0 @@ -216,6 +196,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -241,13 +222,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -255,6 +235,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -265,10 +247,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -276,40 +256,18 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 9.470367} - m_textInfo: - textComponent: {fileID: 8416932638320714506} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6050914136827205310 @@ -327,6 +285,7 @@ GameObject: - component: {fileID: 979255380955983068} - component: {fileID: 425851386909748952} - component: {fileID: 6910630412647778113} + - component: {fileID: -4875952770271437981} m_Layer: 5 m_Name: DisplayOnLine m_TagString: Untagged @@ -344,6 +303,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1166166042567054607} - {fileID: 2026273491173073505} @@ -378,6 +338,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -405,10 +366,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 7297490523703237233} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 --- !u!114 &979255380955983068 MonoBehaviour: m_ObjectHideFlags: 0 @@ -421,6 +378,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &425851386909748952 CanvasGroup: m_ObjectHideFlags: 0 @@ -445,3 +403,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-4875952770271437981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050914136827205310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab b/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab index 6e4bfcd649bebd86ee8267ee9d816706698a15b1..61637d51f8dddbae87b5d91c428e4016e503b186 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 114132791164475416} - component: {fileID: 225408562469983378} - component: {fileID: 114984628052382182} + - component: {fileID: -6287292158833946431} m_Layer: 5 m_Name: DisplayPoint m_TagString: Untagged @@ -32,6 +33,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 858001164857725564} m_Father: {fileID: 0} @@ -65,6 +67,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -92,10 +95,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 858001163752551617} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 --- !u!114 &114132791164475416 MonoBehaviour: m_ObjectHideFlags: 0 @@ -108,6 +107,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &225408562469983378 CanvasGroup: m_ObjectHideFlags: 0 @@ -132,6 +132,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-6287292158833946431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858001163752551619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &858001164857725565 GameObject: m_ObjectHideFlags: 0 @@ -160,6 +174,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 858001163752551618} m_RootOrder: 0 @@ -192,6 +207,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -217,13 +233,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 @@ -231,6 +246,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -241,10 +258,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -252,39 +267,17 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 858001164857725563} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab index 879b216fa2f33f86642c7777848be85a2b7be20c..f2273b0f6941c57af926a2c3c148954b21588c6b 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2785940634305866798} - component: {fileID: 9035428711241438515} - component: {fileID: 114476148939060428} + - component: {fileID: 6775995842619458444} m_Layer: 5 m_Name: DistanceDisplay m_TagString: Untagged @@ -32,6 +33,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 46295265100678663} - {fileID: 1552400999978466847} @@ -66,6 +68,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -93,10 +96,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 1241458608524046696} - animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1} - animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1} - animationTrigger: 0 - animateDuration: 5 --- !u!114 &2785940634305866798 MonoBehaviour: m_ObjectHideFlags: 0 @@ -109,6 +108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &9035428711241438515 CanvasGroup: m_ObjectHideFlags: 0 @@ -133,6 +133,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6775995842619458444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4221381813544557775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &6379254425133528592 GameObject: m_ObjectHideFlags: 0 @@ -161,6 +175,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7299404996771626324} m_RootOrder: 0 @@ -193,6 +208,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -219,13 +235,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 37.3 m_fontSizeBase: 36 m_fontWeight: 400 @@ -233,6 +248,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -243,10 +260,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -254,40 +269,18 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 3246237648589042601} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6753951534025985804 @@ -318,6 +311,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7299404996771626324} m_RootOrder: 1 @@ -350,6 +344,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -376,13 +371,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 37.3 m_fontSizeBase: 36 m_fontWeight: 400 @@ -390,6 +384,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 @@ -400,10 +396,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -411,39 +405,17 @@ MonoBehaviour: 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_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 469060305737786517} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab index 053fe1f2e24bf110865cf3b7b7a9e2b3a1574135..a49c4d998e2b5414f9eb8c4ad2b5870373d9c0f9 100644 --- a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2057578581648752616} m_RootOrder: 1 @@ -162,6 +163,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2057578581648752616} m_RootOrder: 0 @@ -283,6 +285,7 @@ GameObject: - component: {fileID: 6805943141472748426} - component: {fileID: 3549802384644774303} - component: {fileID: 4430445033801091530} + - component: {fileID: -8548468547709009186} m_Layer: 0 m_Name: EqualCirclesPrefab m_TagString: Untagged @@ -300,6 +303,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1916022202853548340} - {fileID: 3366796833421112245} @@ -374,6 +378,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &3549802384644774303 CanvasGroup: m_ObjectHideFlags: 0 @@ -398,3 +403,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-8548468547709009186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7523305359074541435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab b/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab index 7261b306f21d02bcaf1a01c34fc6da19caefe918..e110186bf95e6e3d312dbba4d3d5a330aabfa685 100644 --- a/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FrameWorld_LM_T1.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 5150765483095940290} - component: {fileID: 5150765483095940288} - component: {fileID: 5150765483095940289} + - component: {fileID: -857370535303115610} + - component: {fileID: 8668162515051376506} m_Layer: 5 m_Name: FrameWorld_LM_T1 m_TagString: Untagged @@ -28,6 +30,7 @@ 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: 0.4166666} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -75,3 +78,29 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &-857370535303115610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5150765483095940291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8668162515051376506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5150765483095940291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab b/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab index 5c78bf8fda220c7d0912e5a7ca3b644ece34f888..502f249b7914ccad2920db9dc09163e454de2e1e 100644 --- a/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/GadgetButton.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 4469453702329312233} - component: {fileID: 565795937736748943} - component: {fileID: 6315983451093957514} + - component: {fileID: 6972799681139387453} + - component: {fileID: 1550777745310495707} m_Layer: 5 m_Name: GadgetButton m_TagString: Untagged @@ -121,3 +123,29 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6972799681139387453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5345241908758045532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1550777745310495707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5345241908758045532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab b/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab index 7eadc8e56a03027f296920261db1134e5f73075b..7fb3de69dc17500efe9652d16834c479d059e0c0 100644 --- a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 6441113378387087702} - component: {fileID: -8964638906401905625} - component: {fileID: 9073127243885313005} + - component: {fileID: -5954085419867829670} m_Layer: 5 m_Name: OnCirclePreFab m_TagString: Untagged @@ -32,6 +33,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7483112472360205916} m_Father: {fileID: 0} @@ -106,6 +108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &-8964638906401905625 CanvasGroup: m_ObjectHideFlags: 0 @@ -130,6 +133,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-5954085419867829670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115817999818309900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &5265014618439724607 GameObject: m_ObjectHideFlags: 0 @@ -158,6 +175,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8464853153116416756} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab index 1c49b3ea90ae025a96fb8325e1ec12f3fcfebc5d..c3b6dd16c711e6627efc895edbd51d543ffad0d4 100644 --- a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 313608976654385155} m_RootOrder: 0 @@ -162,6 +163,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2.1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 313608976654385155} m_RootOrder: 1 @@ -283,6 +285,7 @@ GameObject: - component: {fileID: 8593937097866258120} - component: {fileID: 8996773866579933820} - component: {fileID: 930378118197085978} + - component: {fileID: -4766878545130701298} m_Layer: 0 m_Name: OrthogonalCircleAnglePrefab m_TagString: Untagged @@ -300,6 +303,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5933166921333861473} - {fileID: 7894779467777820317} @@ -374,6 +378,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &8996773866579933820 CanvasGroup: m_ObjectHideFlags: 0 @@ -398,3 +403,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-4766878545130701298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8554350198830106250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab index 8b9fe1f0e8d0ea58b7f98af0700015d3e45e54dc..41541468485bb8e5e27aeb96100520a50505f964 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8643015897288315615} m_RootOrder: 0 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: 3914868910838030883} - component: {fileID: 4479822174921760807} - component: {fileID: 7215917396402112958} + - component: {fileID: 41121149337675280} m_Layer: 5 m_Name: ParallelLinePrefab m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3165017659102780400} - {fileID: 3726921479501637083} @@ -240,6 +243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &4479822174921760807 CanvasGroup: m_ObjectHideFlags: 0 @@ -264,6 +268,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &41121149337675280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510387096843212865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &7693994637337906468 GameObject: m_ObjectHideFlags: 0 @@ -292,6 +310,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8643015897288315615} m_RootOrder: 1 diff --git a/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab index 34ebc875bb0fec2fc5bfafbdc4171a38386b52b6..d104923e692d92265307bbe06302c8cb19ccd8cc 100644 --- a/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/PythagorasDisplay.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 3034026415523795643} - component: {fileID: 1128051559874898766} - component: {fileID: 4377593509458917284} + - component: {fileID: -5845435364745367903} + - component: {fileID: 8919255525270428308} m_Layer: 5 m_Name: PythagorasDisplay m_TagString: Untagged @@ -28,6 +30,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.2170901, y: 2.2170901, z: 2.2170901} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -54,12 +57,14 @@ MonoBehaviour: m_GameObject: {fileID: 1096499547874235316} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -72,3 +77,30 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &-5845435364745367903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096499547874235316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8919255525270428308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096499547874235316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab index 3e64a454c956f94d834121f880cc94beaf2a7b11..adc98aea06b176c356a5cc65265ac0e66b97227d 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 173279308733449335} - component: {fileID: 6544775749910269078} - component: {fileID: 3955180868949107883} + - component: {fileID: -497146227597533108} m_Layer: 0 m_Name: RadiusPrefab m_TagString: Untagged @@ -32,6 +33,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7905377173249376416} m_Father: {fileID: 0} @@ -105,6 +107,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &6544775749910269078 CanvasGroup: m_ObjectHideFlags: 0 @@ -129,6 +132,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-497146227597533108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2513701074329712390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &8185219527703794732 GameObject: m_ObjectHideFlags: 0 @@ -157,6 +174,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 8.6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5635985299619511840} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab index ea9b3af77454a62dadd7e6c43ddf7101cb2613d8..7c45a42579fcbb66dbc7d58ffbf572231e0a2954 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 1 @@ -162,6 +163,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 0 @@ -296,6 +298,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 3 @@ -430,6 +433,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351056462585403637} m_RootOrder: 2 @@ -551,6 +555,7 @@ GameObject: - component: {fileID: 2163234623969663275} - component: {fileID: 8026609014010234375} - component: {fileID: 4558040300745642744} + - component: {fileID: -1221418573146676442} m_Layer: 5 m_Name: RectangleFactPrefab m_TagString: Untagged @@ -568,6 +573,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6853670326260023163} - {fileID: 4437548300139704302} @@ -644,6 +650,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &8026609014010234375 CanvasGroup: m_ObjectHideFlags: 0 @@ -668,3 +675,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-1221418573146676442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8156936215466465834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab index dd99580a47cab66ec6e90e4d122d2f4e008e04b3..6834abf78d9b29b2167e6635ab8c053c57fe44a9 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3558427588790173337} m_RootOrder: 2 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: 3794236076833855767} - component: {fileID: 8245241791380942728} - component: {fileID: 8661743446683420805} + - component: {fileID: 4176151758276728228} m_Layer: 0 m_Name: RightAnglePrefab m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8820573273228334392} - {fileID: 6929334133930288485} @@ -241,6 +244,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &8245241791380942728 CanvasGroup: m_ObjectHideFlags: 0 @@ -265,6 +269,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4176151758276728228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3080888058940174091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &7613847065484003782 GameObject: m_ObjectHideFlags: 0 @@ -293,6 +311,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3558427588790173337} m_RootOrder: 0 @@ -427,6 +446,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3558427588790173337} m_RootOrder: 1 diff --git a/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab index d83591a380658b6e74a310645ebd4db4d5c722cf..46f867cd7bb71830f8fa912bd6f189bfae886193 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/ScrollDisplay.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 3213819025273557502} - component: {fileID: 2305338954152611092} - component: {fileID: 114452647229146242} + - component: {fileID: -5871582389276684046} + - component: {fileID: -69831139679443375} m_Layer: 5 m_Name: ScrollDisplay m_TagString: Untagged @@ -29,6 +31,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5295466371659185427} m_Father: {fileID: 0} @@ -90,6 +93,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: DetailScreen: {fileID: 0} +--- !u!114 &-5871582389276684046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3173330253721512196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-69831139679443375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3173330253721512196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &5809183911047187526 GameObject: m_ObjectHideFlags: 0 @@ -118,6 +147,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 659044494318708747} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab index 3a43cec84139fba4bf648e2e8060af2170ba2246..ca6497426e5756edd2b711114bb10460d5131a3f 100644 --- a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 156028697059819196} - component: {fileID: 1224931104090066081} - component: {fileID: -5313503588223420466} + - component: {fileID: 7299521122061085080} m_Layer: 0 m_Name: TestFactPrefab m_TagString: Untagged @@ -32,6 +33,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -91,6 +93,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &156028697059819196 CanvasGroup: m_ObjectHideFlags: 0 @@ -128,3 +131,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 0} +--- !u!114 &7299521122061085080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2846439484187545958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} diff --git a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab index e8d5b381b9578cdec396da23f1770554a8061ada..6b933ce8e02f8fe4545e5164319d99d49f2ba18a 100644 --- a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 6431159876548220859} - component: {fileID: 5268227492380838391} - component: {fileID: 4468595272332714251} + - component: {fileID: 3888340986020047728} m_Layer: 0 m_Name: TruncatedConeVolumePrefab m_TagString: Untagged @@ -32,6 +33,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7937755305675264209} m_Father: {fileID: 0} @@ -105,6 +107,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &5268227492380838391 CanvasGroup: m_ObjectHideFlags: 0 @@ -129,6 +132,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &3888340986020047728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4123133807278660472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &6234169056530260467 GameObject: m_ObjectHideFlags: 0 @@ -157,6 +174,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 16.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4304353889690954113} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab index 99761cdd546673a6f5774bb5c31faf6a91c793f2..f4bed2865669f4c3bee7cc66a8e7c92e24d17b09 100644 --- a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab @@ -28,6 +28,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1329885387404967602} m_RootOrder: 1 @@ -149,6 +150,7 @@ GameObject: - component: {fileID: 4056140006323214235} - component: {fileID: 8957209247582476496} - component: {fileID: -6417425987847613228} + - component: {fileID: -6842305447839815895} m_Layer: 0 m_Name: UnequalCirclesPrefab m_TagString: Untagged @@ -166,6 +168,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5090358772929881988} - {fileID: 6656328133969465038} @@ -240,6 +243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: + dragged: 0 --- !u!225 &8957209247582476496 CanvasGroup: m_ObjectHideFlags: 0 @@ -264,6 +268,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-6842305447839815895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5769925203401971992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3} + m_Name: + m_EditorClassIdentifier: + factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} --- !u!1 &5984757243279669606 GameObject: m_ObjectHideFlags: 0 @@ -292,6 +310,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1329885387404967602} m_RootOrder: 0 diff --git a/Assets/Scenes/Menues/MainMenue.unity b/Assets/Scenes/Menues/MainMenue.unity index 5f6c52ec01082e7f84f02c803581404bc74c8824..a71f8fd0ea2cf2c1929c3ab9d7ff12693b225097 100644 --- a/Assets/Scenes/Menues/MainMenue.unity +++ b/Assets/Scenes/Menues/MainMenue.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3730807, g: 0.380755, b: 0.35876408, a: 1} + m_IndirectSpecularColor: {r: 0.37294164, g: 0.38055754, b: 0.35860202, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs index b5cc69264a7efbe88bc54e4b39bfc6788559a82b..62e89a5f61c04fc17a6caa49ccc01ee45544baeb 100644 --- a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs +++ b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs @@ -41,7 +41,7 @@ private void UpdateDisplay() if (factObj == null) { // should never happen, if the layerMask is set up correctly - Debug.LogError("WorldFactInteraction Raycast collided with object in factLayerMask, that did not contain a FactObject script: " + hit.transform.gameObject.name); + //Debug.LogError("WorldFactInteraction Raycast collided with object in factLayerMask, that did not contain a FactObject script: " + hit.transform.gameObject.name); lastHit = null; return; } diff --git a/Assets/Scripts/InventoryStuff/DisplayFacts.cs b/Assets/Scripts/InventoryStuff/DisplayFacts.cs index c35ffe7e24a04bba2884f9f166eef8e6741277c7..fe6e8039c3b26aadcf478ec5b921866c39c3b17a 100644 --- a/Assets/Scripts/InventoryStuff/DisplayFacts.cs +++ b/Assets/Scripts/InventoryStuff/DisplayFacts.cs @@ -8,7 +8,7 @@ public class DisplayFacts : MonoBehaviour { public static Dictionary<Type, GameObject> prefabDictionary; - public Dictionary<string, GameObject> displayedFacts = new(); + public static Dictionary<string, GameObject> displayedFacts = new(); public Transform factscreenContent; diff --git a/Assets/Scripts/UI/FactExplorer.meta b/Assets/Scripts/UI/FactExplorer.meta new file mode 100644 index 0000000000000000000000000000000000000000..75174aa3fe688475a6cbf96362bd613f0bf567d2 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86b7e84f19731b844a24c97e89fdc5d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/FactExplorer/FactExplorer.cs b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs new file mode 100644 index 0000000000000000000000000000000000000000..a1583f8bda0fc8dc2f25cc3baa5fb38d45b6f7af --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs @@ -0,0 +1,113 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Reflection; +using UnityEngine; +using System.Linq; +using UnityEngine.UI; + +public class FactExplorer : MonoBehaviour +{ + [Header("PrefabComponents")] + [SerializeField] private Transform factParentsUI; + [SerializeField] private Transform mainFactUI; + [SerializeField] private Transform factChildrenUI; + [SerializeField] private Transform linesUI; + + [Header("Prefabs")] + [SerializeField] private GameObject factSpotPrefab; + + + private Fact mainFact; + private List<Fact> parentFacts; + private List<Fact> childFacts; + + + private void Update() + { + DestroyIfClickedOutside(); + } + + public void Initialize(Fact fact) + { + + mainFact = fact; + parentFacts = GetParentFacts(); + childFacts = GetChildFacts(); + + Debug.Log($"Parents of {mainFact.Label}: {string.Join(", ", parentFacts.Select(cf => cf.Label))}"); + Debug.Log($"Children of {mainFact.Label}: {string.Join(", ", childFacts.Select(cf => cf.Label))}"); + + UpdateFactExplorerUI(); + } + + #region Implementation + private List<Fact> GetParentFacts() + { + //TODO: TSC how to get all current facts without this dumb workaround + var allFacts = DisplayFacts.displayedFacts.Values.Select(x => x.GetComponent<FactWrapper>().fact); + List<Fact> _parentFacts = new(); + + // get all facts that reference the mainFact + foreach (Fact f in allFacts) + if (GetReferencedPids(f).Contains(mainFact.Id)) // if f contains reference to mainFact + _parentFacts.Add(f); + + return _parentFacts; + } + + private List<Fact> GetChildFacts() + { + List<Fact> childFacts = new(); + + // get all properties of Type mainFactType that are strings and start with "pid" + foreach (string factId in GetReferencedPids(mainFact)) + childFacts.Add(StageStatic.stage.factState[factId]); + + return childFacts; + } + + private void UpdateFactExplorerUI() + { + SpawnUIFacts(factParentsUI, parentFacts); + SpawnUIFacts(mainFactUI, new List<Fact>() { mainFact }); + SpawnUIFacts(factChildrenUI, childFacts); + } + + private void DestroyIfClickedOutside() + { + if ((Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1)) && + !RectTransformUtility.RectangleContainsScreenPoint(transform.GetComponent<RectTransform>(), Input.mousePosition, null)) + { + Destroy(gameObject); + } + } + #endregion Implementation + + #region Helper + /// <summary> + /// Check all fields of a Fact for references to other facts and return their ids + /// </summary> + /// <param name="f"></param> + /// <returns>An Enumerable containing the ids of facts referenced by the input fact</returns> + private static IEnumerable<string> GetReferencedPids(Fact f) + { + return (f.GetType().GetFields() + .Where(field => field.FieldType == typeof(string) && field.Name.ToLower().StartsWith("pid")) + ).Select(fi => (string)fi.GetValue(f)); + } + + private void SpawnUIFacts(Transform uiParent, List<Fact> toSpawn) + { + uiParent.gameObject.DestroyAllChildren(); + foreach (Fact f in toSpawn) + { + var spot = Instantiate(factSpotPrefab, uiParent); + + // TODO: this link to DisplayFacts is not ideal: maybe refactor to SciptableObject or such + var display = f.instantiateDisplay(DisplayFacts.prefabDictionary[f.GetType()], spot.transform); + display.transform.localPosition = Vector3.zero; + } + } + #endregion Helper +} diff --git a/Assets/Scripts/UI/FactExplorer/FactExplorer.cs.meta b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..4a30c208e64932be3254a5149f1ca69cc70eaccf --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/FactExplorer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 795998cb72dae4043beaf3c3bb6b1b16 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs new file mode 100644 index 0000000000000000000000000000000000000000..1407a6026832947d4a91153ec85fdd497555a585 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +[RequireComponent(typeof(FactWrapper))] +public class OpenFactExplorer : MonoBehaviour, IPointerClickHandler +{ + public GameObject factExplorerPrefab; + + private static Transform factExplorer; + + public void OnPointerClick(PointerEventData eventData) + { + // TODO: add support for other input systems + Destroy(factExplorer != null ? factExplorer.gameObject : null); + if (eventData.button == PointerEventData.InputButton.Right) + { + var parent = transform.GetComponentInParent<Canvas>().transform; + var fact = transform.GetComponent<FactWrapper>().fact; + + factExplorer = Instantiate(factExplorerPrefab.transform, Input.mousePosition, Quaternion.identity, parent); + factExplorer.GetComponent<FactExplorer>().Initialize(fact); + } + } +} + diff --git a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..74e8ec14666b52149393c2b163e1115ba410d916 --- /dev/null +++ b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a1ed516d861fa2c45a2b1767d1217acb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: