From 13c07c168d104e60674bf85d55ed3a4c157c4948 Mon Sep 17 00:00:00 2001
From: Paul-Walcher <paulwalcher12@gmail.com>
Date: Sun, 2 Jun 2024 14:51:29 +0200
Subject: [PATCH] added square text field
---
.../Resources/Prefabs/Facts/Circle 1.prefab | 489 --------------
.../Prefabs/Facts/Circle 1.prefab.meta | 7 -
Assets/Resources/Prefabs/Facts/Square.prefab | 604 ++++++------------
.../FactHandling/FactSpawner.cs | 2 +
.../FactHandling/Facts/SquareFact.cs | 72 +--
.../InventoryStuff/Items/images/Square.png | 4 +-
.../Items/images/Square.png.meta | 99 +--
.../InventoryStuff/Items/images/SquareOld.png | 3 +
.../Items/images/SquareOld.png.meta | 163 +++++
9 files changed, 382 insertions(+), 1061 deletions(-)
delete mode 100644 Assets/Resources/Prefabs/Facts/Circle 1.prefab
delete mode 100644 Assets/Resources/Prefabs/Facts/Circle 1.prefab.meta
create mode 100644 Assets/Scripts/InventoryStuff/Items/images/SquareOld.png
create mode 100644 Assets/Scripts/InventoryStuff/Items/images/SquareOld.png.meta
diff --git a/Assets/Resources/Prefabs/Facts/Circle 1.prefab b/Assets/Resources/Prefabs/Facts/Circle 1.prefab
deleted file mode 100644
index 5296d3a0..00000000
--- a/Assets/Resources/Prefabs/Facts/Circle 1.prefab
+++ /dev/null
@@ -1,489 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3319392661904935552
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7541265271928914416}
- - component: {fileID: 1312883106029576503}
- - component: {fileID: 5284903402926663935}
- - component: {fileID: 2574848627300415222}
- - component: {fileID: 7280041197286401157}
- m_Layer: 15
- m_Name: Mesh Down
- m_TagString: SnapZone
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &7541265271928914416
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
- m_LocalPosition: {x: 0, y: -0.01, z: 0}
- m_LocalScale: {x: 1, y: 0.01, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 6787775389045427190}
- m_Father: {fileID: 3390467403729316765}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
---- !u!33 &1312883106029576503
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_Mesh: {fileID: 0}
---- !u!23 &5284903402926663935
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &2574848627300415222
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 1
- m_CookingOptions: 30
- m_Mesh: {fileID: 0}
---- !u!114 &7280041197286401157
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _URI:
- FactText: []
- StringLabelFormats: []
- Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
- Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
- Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
- renderer:
- - {fileID: 5284903402926663935}
- - {fileID: 1078883255209641429}
---- !u!1 &4682201382595328041
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6787775389045427190}
- - component: {fileID: 6626359674163989219}
- - component: {fileID: 4818731436791451552}
- m_Layer: 15
- m_Name: CircleHighlight
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6787775389045427190
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4682201382595328041}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.96, y: 1, z: 0.96}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7541265271928914416}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &6626359674163989219
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4682201382595328041}
- m_Mesh: {fileID: 0}
---- !u!23 &4818731436791451552
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4682201382595328041}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &5866155945383417828
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8554957501859850914}
- - component: {fileID: 3164742056485930267}
- - component: {fileID: 1460740696286669547}
- m_Layer: 15
- m_Name: CircleHighlight
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &8554957501859850914
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5866155945383417828}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.96, y: 1, z: 0.96}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 142224692930156368}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3164742056485930267
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5866155945383417828}
- m_Mesh: {fileID: 0}
---- !u!23 &1460740696286669547
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5866155945383417828}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &6262947649539239553
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 142224692930156368}
- - component: {fileID: 7167210412035754299}
- - component: {fileID: 1078883255209641429}
- - component: {fileID: 8526453253978894086}
- - component: {fileID: -7239156242830623982}
- m_Layer: 15
- m_Name: Mesh Up
- m_TagString: SnapZone
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &142224692930156368
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.01, z: 0}
- m_LocalScale: {x: 1, y: 0.01, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 8554957501859850914}
- m_Father: {fileID: 3390467403729316765}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &7167210412035754299
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_Mesh: {fileID: 0}
---- !u!23 &1078883255209641429
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &8526453253978894086
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 1
- m_CookingOptions: 30
- m_Mesh: {fileID: 0}
---- !u!114 &-7239156242830623982
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _URI:
- FactText: []
- StringLabelFormats: []
- Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
- Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
- Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
- renderer:
- - {fileID: 1078883255209641429}
- - {fileID: 5284903402926663935}
---- !u!1 &6839596689016440457
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3390467403729316765}
- - component: {fileID: 1812690906255965161}
- - component: {fileID: 6950663371922587874}
- m_Layer: 15
- m_Name: Circle 1
- m_TagString: Selectable
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &3390467403729316765
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6839596689016440457}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.019, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 142224692930156368}
- - {fileID: 7541265271928914416}
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1812690906255965161
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6839596689016440457}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 405087c38b8537e43bcc99727c5325ec, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- Meshs:
- - {fileID: 7167210412035754299}
- - {fileID: 3164742056485930267}
- - {fileID: 1312883106029576503}
- - {fileID: 6626359674163989219}
- NormalOffset: []
- AlternateNormals: 0
- radius: 1
- sideCount: 500
---- !u!114 &6950663371922587874
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6839596689016440457}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _URI:
- FactText: []
- StringLabelFormats: []
- Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
- Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
- Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
- renderer:
- - {fileID: 1078883255209641429}
diff --git a/Assets/Resources/Prefabs/Facts/Circle 1.prefab.meta b/Assets/Resources/Prefabs/Facts/Circle 1.prefab.meta
deleted file mode 100644
index 85adc8f1..00000000
--- a/Assets/Resources/Prefabs/Facts/Circle 1.prefab.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4888bfdf784b1654c9abbb999c485526
-PrefabImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/Facts/Square.prefab b/Assets/Resources/Prefabs/Facts/Square.prefab
index 6ec332c5..62feb61f 100644
--- a/Assets/Resources/Prefabs/Facts/Square.prefab
+++ b/Assets/Resources/Prefabs/Facts/Square.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3319392661904935552
+--- !u!1 &6839596689016440457
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,122 +8,78 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 7541265271928914416}
- - component: {fileID: 1312883106029576503}
- - component: {fileID: 5284903402926663935}
- - component: {fileID: 2574848627300415222}
- - component: {fileID: 7280041197286401157}
+ - component: {fileID: 3390467403729316765}
+ - component: {fileID: 1812690906255965161}
+ - component: {fileID: 6950663371922587874}
m_Layer: 15
- m_Name: Mesh Down
- m_TagString: SnapZone
+ m_Name: Square
+ m_TagString: Selectable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &7541265271928914416
+--- !u!4 &3390467403729316765
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 0, y: -0.01, z: 0}
- m_LocalScale: {x: 1, y: 0.01, z: 1}
- m_ConstrainProportionsScale: 0
+ m_GameObject: {fileID: 6839596689016440457}
+ 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: 1
m_Children:
- - {fileID: 6787775389045427190}
- {fileID: 2727348597328184922}
- m_Father: {fileID: 3390467403729316765}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!33 &1312883106029576503
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_Mesh: {fileID: 0}
---- !u!23 &5284903402926663935
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &2574848627300415222
-MeshCollider:
+ - {fileID: 6990040153469839674}
+ - {fileID: 6662482376097614856}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1812690906255965161
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_GameObject: {fileID: 6839596689016440457}
m_Enabled: 1
- serializedVersion: 4
- m_Convex: 1
- m_CookingOptions: 30
- m_Mesh: {fileID: 0}
---- !u!114 &7280041197286401157
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 405087c38b8537e43bcc99727c5325ec, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Meshs:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ NormalOffset: []
+ AlternateNormals: 0
+ radius: 1
+ sideCount: 500
+--- !u!114 &6950663371922587874
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3319392661904935552}
+ m_GameObject: {fileID: 6839596689016440457}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
_URI:
- FactText: []
+ FactText:
+ - {fileID: 7177577245137766670}
StringLabelFormats: []
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
renderer:
- - {fileID: 5284903402926663935}
- - {fileID: 1078883255209641429}
---- !u!1 &4682201382595328041
+ - {fileID: 0}
+--- !u!1 &7399997364077007465
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -131,46 +87,46 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6787775389045427190}
- - component: {fileID: 6626359674163989219}
- - component: {fileID: 4818731436791451552}
- m_Layer: 15
- m_Name: CircleHighlight
+ - component: {fileID: 6990040153469839674}
+ - component: {fileID: 8042990558578607756}
+ - component: {fileID: 5361971246579526846}
+ m_Layer: 0
+ m_Name: PlaneDown
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &6787775389045427190
+ m_IsActive: 1
+--- !u!4 &6990040153469839674
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4682201382595328041}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.96, y: 0.01, z: 0.96}
+ m_GameObject: {fileID: 7399997364077007465}
+ m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: -0.01}
+ m_LocalScale: {x: 0.2, y: 0.0009999999, z: 0.20000002}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 7541265271928914416}
- m_RootOrder: 0
+ m_Father: {fileID: 3390467403729316765}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &6626359674163989219
+--- !u!33 &8042990558578607756
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4682201382595328041}
- m_Mesh: {fileID: 0}
---- !u!23 &4818731436791451552
+ m_GameObject: {fileID: 7399997364077007465}
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5361971246579526846
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4682201382595328041}
+ m_GameObject: {fileID: 7399997364077007465}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -206,7 +162,7 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &5866155945383417828
+--- !u!1 &8598638540628061046
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -214,46 +170,46 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8554957501859850914}
- - component: {fileID: 3164742056485930267}
- - component: {fileID: 1460740696286669547}
- m_Layer: 15
- m_Name: CircleHighlight
+ - component: {fileID: 2727348597328184922}
+ - component: {fileID: 3597909010427076542}
+ - component: {fileID: 6517075380011649605}
+ m_Layer: 0
+ m_Name: PlaneUp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &8554957501859850914
+ m_IsActive: 1
+--- !u!4 &2727348597328184922
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5866155945383417828}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.96, y: 1, z: 0.96}
+ m_GameObject: {fileID: 8598638540628061046}
+ m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0.01}
+ m_LocalScale: {x: 0.2, y: 0.0009999999, z: 0.20000002}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 142224692930156368}
+ m_Father: {fileID: 3390467403729316765}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3164742056485930267
+--- !u!33 &3597909010427076542
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5866155945383417828}
- m_Mesh: {fileID: 0}
---- !u!23 &1460740696286669547
+ m_GameObject: {fileID: 8598638540628061046}
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6517075380011649605
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5866155945383417828}
+ m_GameObject: {fileID: 8598638540628061046}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -289,7 +245,7 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &6262947649539239553
+--- !u!1 &8645286316326201467
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -297,53 +253,47 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 142224692930156368}
- - component: {fileID: 7167210412035754299}
- - component: {fileID: 1078883255209641429}
- - component: {fileID: 8526453253978894086}
- - component: {fileID: -7239156242830623982}
- m_Layer: 15
- m_Name: Mesh Up
- m_TagString: SnapZone
+ - component: {fileID: 6662482376097614856}
+ - component: {fileID: 5986843358289336505}
+ - component: {fileID: 7177577245137766670}
+ - component: {fileID: 2586578973517344970}
+ m_Layer: 10
+ m_Name: LabelText
+ m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &142224692930156368
-Transform:
+--- !u!224 &6662482376097614856
+RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 0, y: 0.01, z: 8.2370816e-10}
- m_LocalScale: {x: 1, y: 0.01, z: 1}
+ m_GameObject: {fileID: 8645286316326201467}
+ 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:
- - {fileID: 8554957501859850914}
- - {fileID: 6990040153469839674}
+ m_Children: []
m_Father: {fileID: 3390467403729316765}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!33 &7167210412035754299
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_Mesh: {fileID: 0}
---- !u!23 &1078883255209641429
+ m_RootOrder: 2
+ 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: 2, y: 0.5}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!23 &5986843358289336505
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
+ m_GameObject: {fileID: 8645286316326201467}
m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
@@ -354,7 +304,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
+ - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -376,282 +326,110 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &8526453253978894086
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 1
- m_CookingOptions: 30
- m_Mesh: {fileID: 0}
---- !u!114 &-7239156242830623982
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6262947649539239553}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _URI:
- FactText: []
- StringLabelFormats: []
- Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
- Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
- Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
- renderer:
- - {fileID: 1078883255209641429}
- - {fileID: 5284903402926663935}
---- !u!1 &6839596689016440457
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3390467403729316765}
- - component: {fileID: 1812690906255965161}
- - component: {fileID: 6950663371922587874}
- m_Layer: 15
- m_Name: Square
- m_TagString: Selectable
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &3390467403729316765
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6839596689016440457}
- 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: 1
- m_Children:
- - {fileID: 142224692930156368}
- - {fileID: 7541265271928914416}
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1812690906255965161
+--- !u!114 &7177577245137766670
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6839596689016440457}
+ m_GameObject: {fileID: 8645286316326201467}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 405087c38b8537e43bcc99727c5325ec, type: 3}
+ m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
m_Name:
m_EditorClassIdentifier:
- Meshs:
- - {fileID: 7167210412035754299}
- - {fileID: 3164742056485930267}
- - {fileID: 1312883106029576503}
- - {fileID: 6626359674163989219}
- NormalOffset: []
- AlternateNormals: 0
- radius: 1
- sideCount: 500
---- !u!114 &6950663371922587874
+ 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: []
+ m_text: Test
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 4
+ m_fontSizeBase: 4
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 256
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 0
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ _SortingLayer: 0
+ _SortingLayerID: 0
+ _SortingOrder: 0
+ m_hasFontAssetChanged: 0
+ m_renderer: {fileID: 5986843358289336505}
+ m_maskType: 0
+--- !u!114 &2586578973517344970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6839596689016440457}
+ m_GameObject: {fileID: 8645286316326201467}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
m_Name:
m_EditorClassIdentifier:
- _URI:
- FactText: []
- StringLabelFormats: []
- Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
- Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
- Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
- renderer:
- - {fileID: 1078883255209641429}
---- !u!1 &7399997364077007465
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6990040153469839674}
- - component: {fileID: 8042990558578607756}
- - component: {fileID: 5361971246579526846}
- m_Layer: 0
- m_Name: Plane
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6990040153469839674
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7399997364077007465}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.2, y: 0.1, z: 0.2}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 142224692930156368}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8042990558578607756
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7399997364077007465}
- m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &5361971246579526846
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7399997364077007465}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &8598638540628061046
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2727348597328184922}
- - component: {fileID: 3597909010427076542}
- - component: {fileID: 6517075380011649605}
- m_Layer: 0
- m_Name: Plane
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2727348597328184922
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8598638540628061046}
- m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.2, y: 0.1, z: 0.2}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7541265271928914416}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!33 &3597909010427076542
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8598638540628061046}
- m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &6517075380011649605
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8598638540628061046}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
+ Cam1: {fileID: 0}
+ Cam2: {fileID: 0}
+ BackUPCam: {fileID: 0}
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
index 4e88736a..d6c2831c 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
@@ -71,6 +71,8 @@ public void SpawnSquare(SquareFact fact){
square.transform.SetPositionAndRotation(fact.Position, fact.Rotation);
square.transform.localScale = Vector3.Scale(square.transform.localScale, fact.LocalScale);
+ square.GetComponentInChildren<TextMeshPro>().text = fact.GetLabel(StageStatic.stage.factState) + " = " + System.Math.Round(fact.Area, 2) + "m²";
+
}
public void SpawnPoint(PointFact fact)
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs
index 905d3cf7..f222e8bb 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs
@@ -18,6 +18,8 @@ public class SquareFact : FactWrappedCRTP<SquareFact>
public Vector3 A, B, C, D;
+ public float Area = 0.0F;
+
public PointFact GetA {get => (PointFact)FactRecorder.AllFacts[PidA];}
@@ -30,80 +32,14 @@ protected void calculate_vectors(){
C = ((PointFact)FactRecorder.AllFacts[PidC]).Point + Vector3.zero;
D = (A - B) + C;
+ Area = (Vector3.Distance(A, B) * Vector3.Distance(B, C));
+
Vector3 scale = new Vector3(Vector3.Distance(B, C), Vector3.Distance(A, B), 1.0F);
LocalScale = scale * 0.5F;
-
Position = B + 0.5F*((A-B) + (C-B));
- //Vector3 normal = Vector3.Cross((A-B), (C-B)); s
- /*
- Vector3 arbitary_not_normal = normal == Vector3.forward ? Vector3.right : Vector3.forward;
- Vector3 forward = Vector3.Cross(arbitary_not_normal, normal);
-
- Rotation = Quaternion.LookRotation(forward, normal);
- */
-
- /*
- //angle rotation around y axis
- Vector3 AB = A - B;
- Vector3 BC = C - B;
-
- // Calculate the angle between AB and BC around the Y-axis
- float yAxisRotation = Mathf.Atan2(AB.z, AB.x) * Mathf.Rad2Deg;
- float xAxisRotation = Mathf.Atan2(BC.z, BC.y) * Mathf.Rad2Deg;
- float zAxisRotation = Mathf.Atan2(AB.y, AB.x) * Mathf.Rad2Deg;
-
- Vector3 rotationVector = new Vector3(0, yAxisRotation, 0);
- */
-
- //angle rotation around y axis
-
- /*
- float distABx = (A.x - B.x);
- float distABy = (A.y - B.y);
- float distABz = (A.z - B.z);
-
- float distBCx = (C.x - B.x);
- float distBCy = (C.y - B.y);
- float distBCz = (C.z - B.z);
-
- float ERROR = 1E-5F;
-
- float xAxisRotation = Mathf.Rad2Deg* - Mathf.Atan(distBCy / distBCz);
- float yAxisRotation = -(Mathf.Abs((distABx - distABz)) < ERROR ? 45.0F : Mathf.Rad2Deg*Mathf.Atan(distABx / distABz));
- float zAxisRotation = Mathf.Rad2Deg*Mathf.Atan(distABy / distABx);
-
- Vector3 rotationVector = new Vector3(xAxisRotation, yAxisRotation, zAxisRotation);
-
- Rotation = Quaternion.Euler(rotationVector);
-
- */
-
- /*
- Vector3 forward = (from + to).normalized;
-
- if (up.sqrMagnitude < Math3d.vectorPrecission)
- { //Angle is 180° (or 0°)
- Vector3 from_arbitary = from.normalized == Vector3.forward ? Vector3.right : Vector3.forward;
- up = Vector3.Cross(from_arbitary, to);
- forward = Vector3.Cross(up, to);
- }
-
- Vector3 upy0 = new Vector3(up.x, 0, up.z);
- Rotation = Quaternion.LookRotation(upy0, up);
-
- Vector3 from = (A - B).normalized;
- Vector3 to = (C - B).normalized;
- Vector3 up = Vector3.Cross(from, to);
-
- Rotation = Quaternion.LookRotation(up, new Vector3(0.0F, 0.0F, 1.0F));
-
- Vector3 normal = Vector3.Cross((A-B), (B-C));
- lookObject.transform.position = normal + Position;
- */
-
Rotation = Quaternion.LookRotation(Vector3.Cross((A-B), (C-B)), Vector3.up);
//Rotation = Quaternion.LookRotation(forward, new Vector3(1.0F, 0.0F, 0.0F));
diff --git a/Assets/Scripts/InventoryStuff/Items/images/Square.png b/Assets/Scripts/InventoryStuff/Items/images/Square.png
index 1e18d6b8..615842e4 100644
--- a/Assets/Scripts/InventoryStuff/Items/images/Square.png
+++ b/Assets/Scripts/InventoryStuff/Items/images/Square.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:919d2f4899174eef5894ae5fbf4829a0e5d586bace0e91fd72d740be6d080151
-size 4889
+oid sha256:3cbb2c10c3736f9050976f08113338c5f18a33e9d2b2d5d3aa521490001358aa
+size 950
diff --git a/Assets/Scripts/InventoryStuff/Items/images/Square.png.meta b/Assets/Scripts/InventoryStuff/Items/images/Square.png.meta
index 7f607453..9ef3c5b0 100644
--- a/Assets/Scripts/InventoryStuff/Items/images/Square.png.meta
+++ b/Assets/Scripts/InventoryStuff/Items/images/Square.png.meta
@@ -1,15 +1,12 @@
fileFormatVersion: 2
-guid: 95d8fa087e815214dbf6e4d75891106f
+guid: ef0f987b173579e48bd69c37287b5bad
TextureImporter:
- internalIDToNameTable:
- - first:
- 213: 7482667652216324306
- second: Square
+ internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -39,24 +36,24 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 1
lightmap: 0
compressionQuality: 50
- spriteMode: 2
+ spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 256
- spriteBorder: {x: 4, y: 4, z: 4, w: 4}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: 0
- textureType: 8
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -79,82 +76,20 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: iPhone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
- sprites:
- - serializedVersion: 2
- name: Square
- rect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 256
- height: 256
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
- border: {x: 0, y: 0, z: 0, w: 0}
- outline: []
- physicsShape: []
- tessellationDetail: 0
- bones: []
- spriteID: 2d009a6b596c7d760800000000000000
- internalID: 7482667652216324306
- vertices: []
- indices:
- edges: []
- weights: []
+ sprites: []
outline: []
- physicsShape:
- - - {x: -128, y: 128}
- - {x: -128, y: -128}
- - {x: 128, y: -128}
- - {x: 128, y: 128}
+ physicsShape: []
bones: []
- spriteID: 5e97eb03825dee720800000000000000
+ spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
- nameFileIdTable:
- Square: 7482667652216324306
+ nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
diff --git a/Assets/Scripts/InventoryStuff/Items/images/SquareOld.png b/Assets/Scripts/InventoryStuff/Items/images/SquareOld.png
new file mode 100644
index 00000000..1e18d6b8
--- /dev/null
+++ b/Assets/Scripts/InventoryStuff/Items/images/SquareOld.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:919d2f4899174eef5894ae5fbf4829a0e5d586bace0e91fd72d740be6d080151
+size 4889
diff --git a/Assets/Scripts/InventoryStuff/Items/images/SquareOld.png.meta b/Assets/Scripts/InventoryStuff/Items/images/SquareOld.png.meta
new file mode 100644
index 00000000..7f607453
--- /dev/null
+++ b/Assets/Scripts/InventoryStuff/Items/images/SquareOld.png.meta
@@ -0,0 +1,163 @@
+fileFormatVersion: 2
+guid: 95d8fa087e815214dbf6e4d75891106f
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 7482667652216324306
+ second: Square
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 2
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 256
+ spriteBorder: {x: 4, y: 4, z: 4, w: 4}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: 0
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: Square
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 256
+ height: 256
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 2d009a6b596c7d760800000000000000
+ internalID: 7482667652216324306
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ physicsShape:
+ - - {x: -128, y: 128}
+ - {x: -128, y: -128}
+ - {x: 128, y: -128}
+ - {x: 128, y: 128}
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable:
+ Square: 7482667652216324306
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
GitLab