diff --git a/Assets/Resources/Prefabs/UI/Facts.meta b/Assets/Resources/Prefabs/UI/Facts.meta
new file mode 100644
index 0000000000000000000000000000000000000000..083dde953bda95900ccc9a779e43f94ca6834e8e
--- /dev/null
+++ b/Assets/Resources/Prefabs/UI/Facts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6841a8ca06c22ca43a95bc676eabe75d
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer.meta
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer.meta
rename to Assets/Resources/Prefabs/UI/Facts/FactExplorer.meta
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab
rename to Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab.meta
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorerUI.prefab.meta
rename to Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorerUI.prefab.meta
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line.prefab b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line.prefab
rename to Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab.meta
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line.prefab.meta
rename to Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line.prefab.meta
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line_Dashed.prefab b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line_Dashed.prefab
rename to Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line_Dashed.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab.meta
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_Line_Dashed.prefab.meta
rename to Assets/Resources/Prefabs/UI/Facts/FactExplorer/FactExplorer_Line_Dashed.prefab.meta
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab b/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab
similarity index 96%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab
rename to Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab
index 7e2630bd14b97c494fb9a085e16423b95b3b1a2b..1e76da5dcf6a3ec453a3b0c309f7b7e71c3515c6 100644
--- a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab
+++ b/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab
@@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 3183854850668897353}
- component: {fileID: 2474205050366502828}
m_Layer: 0
- m_Name: FactExplorer_FactSpot
+ m_Name: FactSpot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -59,7 +59,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0, b: 0, a: 0.39215687}
+ m_Color: {r: 0, g: 0, b: 0, a: 0.15686275}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
diff --git a/Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab.meta
similarity index 100%
rename from Assets/Resources/Prefabs/UI/FactExplorer/FactExplorer_FactSpot.prefab.meta
rename to Assets/Resources/Prefabs/UI/Facts/FactSpot.prefab.meta
diff --git a/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..659fbdd698d1da04cf8ab89488d70ffcf97ba6a8
--- /dev/null
+++ b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab
@@ -0,0 +1,286 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3581652732795482904
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3581652732795482907}
+ - component: {fileID: 3581652732795482908}
+ - component: {fileID: 3581652732795482909}
+ - component: {fileID: 3581652732795482906}
+ m_Layer: 5
+ m_Name: Factscreen
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3581652732795482907
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3581652732795482904}
+ 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: 28794298399673692}
+ 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: 450, y: -225}
+ m_SizeDelta: {x: 900, y: 450}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3581652732795482908
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3581652732795482904}
+ m_CullTransparentMesh: 0
+--- !u!114 &3581652732795482909
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3581652732795482904}
+ 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: 1, g: 1, b: 1, a: 0.392}
+ 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: 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 &3581652732795482906
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3581652732795482904}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ factSpotPrefab: {fileID: 7124463502404826001, guid: 04d12e0a0a5aa884c8c7dff56f4963f6,
+ type: 3}
+ factscreenContent: {fileID: 4838871000058222821}
+ prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec,
+ type: 3}
+ prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67,
+ type: 3}
+ prefab_Angle: {fileID: 6643637775379894484, guid: 30fcd362f34a9844fba66065924c6143,
+ type: 3}
+ prefab_Default: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec,
+ type: 3}
+ prefab_OnLine: {fileID: 6050914136827205310, guid: 496d04605465c7f4dba7638cc6e2dc6e,
+ type: 3}
+ prefab_Line: {fileID: 7510387096843212865, guid: d6ee990520a44954fb494468665d19e9,
+ type: 3}
+ prefab_ParallelLineFact: {fileID: 0}
+ prefab_RectangleFact: {fileID: 0}
+ prefab_RadiusFact: {fileID: 0}
+ prefab_AreaCircle: {fileID: 0}
+ prefab_ConeVolume: {fileID: 0}
+ prefab_OrthogonalCircleLine: {fileID: 0}
+ prefab_TruncatedConeVolume: {fileID: 0}
+ prefab_RightAngle: {fileID: 0}
+ prefab_CylinderVolume: {fileID: 0}
+ prefab_EqualFact: {fileID: 0}
+ prefab_UnEqualFact: {fileID: 0}
+ prefab_TestFact: {fileID: 0}
+ prefab_CircleFact: {fileID: 0}
+ prefab_OnCircleFact: {fileID: 0}
+ prefab_AngleCircleLineFact: {fileID: 0}
+ x_Start: -125
+ y_Start: 475
+ X_Pacece_Between_Items: 110
+ y_Pacece_Between_Items: 110
+ number_of_Column: 3
+--- !u!1 &5020678014906925761
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4838871000058222821}
+ - component: {fileID: 8823539307371861913}
+ - component: {fileID: 8739701541209514273}
+ m_Layer: 5
+ m_Name: Facts
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4838871000058222821
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5020678014906925761}
+ 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: 28794298399673692}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &8823539307371861913
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5020678014906925761}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 10
+ m_Right: 10
+ m_Top: 10
+ m_Bottom: 10
+ m_ChildAlignment: 0
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 100, y: 100}
+ m_Spacing: {x: 10, y: 10}
+ m_Constraint: 0
+ m_ConstraintCount: 2
+--- !u!114 &8739701541209514273
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5020678014906925761}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!1 &9200394337360800321
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 28794298399673692}
+ - component: {fileID: 785712294914047956}
+ - component: {fileID: 8690182484269861222}
+ m_Layer: 5
+ m_Name: ScrollArea
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &28794298399673692
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9200394337360800321}
+ 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: 4838871000058222821}
+ m_Father: {fileID: 3581652732795482907}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &785712294914047956
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9200394337360800321}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 4838871000058222821}
+ m_Horizontal: 0
+ m_Vertical: 1
+ m_MovementType: 1
+ m_Elasticity: 0.1
+ m_Inertia: 0
+ m_DecelerationRate: 0.135
+ m_ScrollSensitivity: 5
+ m_Viewport: {fileID: 28794298399673692}
+ m_HorizontalScrollbar: {fileID: 0}
+ m_VerticalScrollbar: {fileID: 0}
+ m_HorizontalScrollbarVisibility: 0
+ m_VerticalScrollbarVisibility: 0
+ m_HorizontalScrollbarSpacing: 0
+ m_VerticalScrollbarSpacing: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &8690182484269861222
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9200394337360800321}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding: {x: 0, y: 0, z: 0, w: 0}
+ m_Softness: {x: 0, y: 0}
diff --git a/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8ae2db5dd04d7facebdfa10339765bda58a578c8
--- /dev/null
+++ b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 49deb83b881477047bfac0ee629a7ae9
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
index 03298f2760b0661c2e35beeae01c50201dcb7cd3..c7c3774b25c18736ae9d9affcc59da3f9ae1edc4 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
@@ -95,6 +95,7 @@ MonoBehaviour:
ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261,
type: 3}
DetailScreen: {fileID: 9207926680331850715}
+ scrollscreenContent: {fileID: 0}
x_Start: -240
y_Start: 200
X_Pacece_Between_Items: 105
@@ -423,7 +424,7 @@ RectTransform:
- {fileID: 9207926680103916033}
- {fileID: 9207926679476855460}
- {fileID: 9207926680489444168}
- - {fileID: 9207926680194070276}
+ - {fileID: 3144986313061421279}
- {fileID: 9207926680741575118}
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -901,112 +902,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &9207926680194070279
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 9207926680194070276}
- - component: {fileID: 9207926680194070275}
- - component: {fileID: 9207926680194070274}
- - component: {fileID: 9207926680194070277}
- m_Layer: 5
- m_Name: Factscreen
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &9207926680194070276
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9207926680194070279}
- 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: 9207926679660501330}
- m_RootOrder: 6
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 450, y: -225}
- m_SizeDelta: {x: 900, y: 450}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9207926680194070275
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9207926680194070279}
- m_CullTransparentMesh: 0
---- !u!114 &9207926680194070274
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9207926680194070279}
- 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: 1, g: 1, b: 1, a: 0.392}
- 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: 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 &9207926680194070277
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9207926680194070279}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec,
- type: 3}
- prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67,
- type: 3}
- prefab_Angle: {fileID: 6643637775379894484, guid: 30fcd362f34a9844fba66065924c6143,
- type: 3}
- prefab_Default: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec,
- type: 3}
- prefab_OnLine: {fileID: 6050914136827205310, guid: 496d04605465c7f4dba7638cc6e2dc6e,
- type: 3}
- prefab_Line: {fileID: 7510387096843212865, guid: d6ee990520a44954fb494468665d19e9,
- type: 3}
- x_Start: -125
- y_Start: 475
- X_Pacece_Between_Items: 110
- y_Pacece_Between_Items: 110
- number_of_Column: 3
--- !u!1 &9207926680331850715
GameObject:
m_ObjectHideFlags: 0
@@ -1043,10 +938,10 @@ RectTransform:
m_Father: {fileID: 9207926680489444168}
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: 450, y: 321}
- m_SizeDelta: {x: 900, y: 640}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9207926680331850695
CanvasRenderer:
@@ -1309,9 +1204,9 @@ RectTransform:
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: 600, y: 600}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.000061035156, y: 0}
+ m_SizeDelta: {x: 900, y: 630}
+ m_Pivot: {x: 0, y: 0}
--- !u!1 &9207926680522215218
GameObject:
m_ObjectHideFlags: 0
@@ -2887,6 +2782,136 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
+--- !u!1001 &1878469765440807876
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 9207926679660501330}
+ m_Modifications:
+ - target: {fileID: 3581652732795482904, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_Name
+ value: Factscreen
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 900
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 450
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 450
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -225
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3}
+--- !u!224 &3144986313061421279 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9,
+ type: 3}
+ m_PrefabInstance: {fileID: 1878469765440807876}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &7390358983506737413
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/InventoryStuff/DisplayFacts.cs b/Assets/Scripts/InventoryStuff/DisplayFacts.cs
index fe6e8039c3b26aadcf478ec5b921866c39c3b17a..76af53986e4b0f399ad7db4bfc58465f5a8c68df 100644
--- a/Assets/Scripts/InventoryStuff/DisplayFacts.cs
+++ b/Assets/Scripts/InventoryStuff/DisplayFacts.cs
@@ -10,6 +10,8 @@ public class DisplayFacts : MonoBehaviour
public static Dictionary<string, GameObject> displayedFacts = new();
+ [SerializeField] private GameObject factSpotPrefab;
+
public Transform factscreenContent;
[Header("FactPrefabs")]
@@ -78,40 +80,22 @@ void Start()
};
- var rect = GetComponent<RectTransform>();
- x_Start = (int)(rect.rect.x + X_Pacece_Between_Items * .5f);
- y_Start = (int)(- y_Pacece_Between_Items * .5f);
- number_of_Column = Mathf.Max(1, (int)(rect.rect.width / prefab_Point.GetComponent<RectTransform>().rect.width) - 1);
-
AddFactEvent.AddListener(AddFact);
RemoveFactEvent.AddListener(RemoveFact);
AnimateExistingFactEvent.AddListener(AnimateFact);
}
public void AddFact(Fact fact) {
- Debug.Log("EYYYYY we are adding a fact: " + fact.Label);
- var obj = CreateDisplay(transform, fact);
- var rect = obj.GetComponent<RectTransform>();
- rect.anchorMin = new Vector2(0.5f, 1);
- rect.anchorMax = new Vector2(0.5f, 1);
- rect.localPosition = GetPosition(displayedFacts.Count);
- displayedFacts.Add(fact.Id, obj);
- AdjustFactscreenContentHeight();
+ var display = CreateDisplay(transform, fact);
+ display.transform.localPosition = Vector3.zero;
+ displayedFacts.Add(fact.Id, display);
}
public void RemoveFact(Fact fact)
{
- GameObject.Destroy(displayedFacts[fact.Id]);
+ // destroy factSpot (parent of displayed fact) and the fact display with it
+ Destroy(displayedFacts[fact.Id].transform.parent);
displayedFacts.Remove(fact.Id);
- UpdatePositions();
- AdjustFactscreenContentHeight();
- }
-
- public void UpdatePositions()
- {
- int i = 0;
- foreach (var element in displayedFacts)
- element.Value.GetComponent<RectTransform>().localPosition = GetPosition(i++);
}
public void AnimateFact(Fact fact) {
@@ -121,18 +105,7 @@ public void AnimateFact(Fact fact) {
private GameObject CreateDisplay(Transform transform, Fact fact)
{
- return fact.instantiateDisplay(prefabDictionary[fact.GetType()], factscreenContent);
- }
-
- public Vector3 GetPosition(int i)
- {
- return new Vector3(x_Start + (X_Pacece_Between_Items * (i % number_of_Column)), y_Start + (-y_Pacece_Between_Items * (i / number_of_Column)), 0f);
- }
-
- private void AdjustFactscreenContentHeight()
- {
- var rect = factscreenContent.GetComponent<RectTransform>();
- var height = (float)(y_Pacece_Between_Items * Math.Ceiling(((float)displayedFacts.Count / number_of_Column)));
- rect.sizeDelta = new Vector2(rect.sizeDelta.x, height);
+ var spot = Instantiate(factSpotPrefab, factscreenContent);
+ return fact.instantiateDisplay(prefabDictionary[fact.GetType()], spot.transform);
}
}