diff --git a/Assets/InteractionEngine/Fact.cs b/Assets/InteractionEngine/Fact.cs
index b073393114a17438dc839f77ac3de52409c12fd0..b363c89c8c6ee7a79906c1ea45a1abf802ce51ef 100644
--- a/Assets/InteractionEngine/Fact.cs
+++ b/Assets/InteractionEngine/Fact.cs
@@ -16,6 +16,7 @@ public class LineFact : Fact
{
//Id's of the 2 Point-Facts that are connected
public int Pid1, Pid2;
+
}
public class AngleFact : Fact
{
diff --git a/Assets/InventoryStuff/DisplayFacts.cs b/Assets/InventoryStuff/DisplayFacts.cs
index a6e855c192490ffbae739d69f31557636c83b5fd..96f82dd8ac8ac53156c9a4346c2c45f8f29a4a1f 100644
--- a/Assets/InventoryStuff/DisplayFacts.cs
+++ b/Assets/InventoryStuff/DisplayFacts.cs
@@ -3,10 +3,11 @@
using UnityEngine;
using UnityEngine.UI;
using TMPro;
+using System;
public class DisplayFacts : MonoBehaviour
{
- public Inventory inventory;
+ public HashSet<int> displayedFacts = new HashSet<int>();
public GameObject prefab_Point;
public GameObject prefab_Distance;
@@ -27,33 +28,67 @@ void Start()
// Update is called once per frame
void Update()
{
- UpdateDisplay();
+ UpdateDisplay2();
}
- public void UpdateDisplay()
- {
- for( int i = 0; i< inventory.Facts.Count; i++){
- if(! inventory.Facts[i].isDisplayed){
- var item = inventory.Facts[i].item;
- var obj = item.CreateDisplay(transform, getPrefab( item));
- obj.GetComponent<RectTransform>().localPosition = GetPosition(i);
- inventory.Facts[i].isDisplayed = true;
+ public void UpdateDisplay2()
+ {
+ List<Fact>.Enumerator enumerator = CommunicationEvents.Facts.GetEnumerator();
+ while (enumerator.MoveNext())
+ {
+ int fid = enumerator.Current.Id;
+ if (displayedFacts.Contains(fid))
+ {
+ continue;
}
-
+ var obj = CreateDisplay(transform, enumerator.Current);
+ obj.GetComponent<RectTransform>().localPosition = GetPosition(fid);
+ displayedFacts.Add(fid);
}
+
}
- public Vector3 GetPosition(int i)
+ private GameObject CreateDisplay(Transform transform, Fact fact)
{
- return new Vector3(x_Start+ (X_Pacece_Between_Items * (i % number_of_Column)), y_Start + (-y_Pacece_Between_Items * (i / number_of_Column)), 0f);
- }
+ switch (fact)
+ {
+ case LineFact f:
+ {
+ var obj = Instantiate(prefab_Distance, Vector3.zero, Quaternion.identity, transform);
+ obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = "" + CommunicationEvents.Facts[f.Pid1].Id;
+ obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = "" + CommunicationEvents.Facts[f.Pid2].Id;
+ obj.GetComponent<FactWrapper>().fact = f;
+ return obj;
+ }
+
+ case AngleFact f:
+ {
+ var obj = Instantiate(prefab_Angle, Vector3.zero, Quaternion.identity, transform);
+ obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = "" + CommunicationEvents.Facts[f.Pid1].Id;
+ obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = "" + CommunicationEvents.Facts[f.Pid2].Id;
+ obj.transform.GetChild(2).gameObject.GetComponent<TextMeshProUGUI>().text = "" + CommunicationEvents.Facts[f.Pid3].Id;
+ obj.GetComponent<FactWrapper>().fact = f;
+ return obj;
+ }
- public GameObject getPrefab(ItemObject item){
- switch( item.type){
- case ItemObject.ItemType.LengthFact:return prefab_Distance;
- case ItemObject.ItemType.AngleFact: return prefab_Angle;
- case ItemObject.ItemType.Point: return prefab_Point;
- default: return prefab_Default;
+ case PointFact f:
+ {
+ var obj = Instantiate(prefab_Point, Vector3.zero, Quaternion.identity, transform);
+ obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = "" + f.Id;
+ obj.GetComponent<FactWrapper>().fact = f;
+ return obj;
+ }
+ default:
+ {
+ var obj = Instantiate(prefab_Default, Vector3.zero, Quaternion.identity, transform);
+ return obj;
+ }
}
}
+
+ 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);
+ }
+
}
diff --git a/Assets/InventoryStuff/DisplayScrolls.cs b/Assets/InventoryStuff/DisplayScrolls.cs
index b73a0c16f605fc07d99f7583bb6692cc0a9426ce..b6166b73ab88e3cf17067527521d0a36956a7a0d 100644
--- a/Assets/InventoryStuff/DisplayScrolls.cs
+++ b/Assets/InventoryStuff/DisplayScrolls.cs
@@ -5,7 +5,7 @@
public class DisplayScrolls : MonoBehaviour
{
- public Inventory inventory;
+ //public Inventory inventory;
public int x_Start;
@@ -22,12 +22,12 @@ void Start()
// Update is called once per frame
void Update()
{
- UpdateDisplay();
+ // UpdateDisplay();
}
public void UpdateDisplay()
{
- for( int i = 0; i< inventory.Scrolls.Count; i++){
+ /* for( int i = 0; i< inventory.Scrolls.Count; i++){
if(! inventory.Scrolls[i].isDisplayed){
var item = inventory.Scrolls[i].item;
var obj = Instantiate(item.IconPrefab, Vector3.zero, Quaternion.identity, transform);
@@ -36,6 +36,7 @@ public void UpdateDisplay()
}
}
+ */
}
public Vector3 GetPosition(int i)
diff --git a/Assets/InventoryStuff/DropHandling.cs b/Assets/InventoryStuff/DropHandling.cs
index b0d7a1e586d0d37687687fb29b495992669b890d..8cffce12ccd13b64572e3aef780a1d30c37bcb6f 100644
--- a/Assets/InventoryStuff/DropHandling.cs
+++ b/Assets/InventoryStuff/DropHandling.cs
@@ -14,7 +14,7 @@ public void OnDrop(PointerEventData eventData){
GameObject scrollShow = gameObject.transform.parent.gameObject;
PythagorasScript pythagorasScript = scrollShow.GetComponent<PythagorasScript>();
var fact = ((FactWrapper)current.GetComponent<FactWrapper>()).fact;
- pythagorasScript.putItem(gameObject.name, fact);
+ pythagorasScript.putFact(gameObject.name, fact);
}
}
diff --git a/Assets/InventoryStuff/FactWrapper.cs b/Assets/InventoryStuff/FactWrapper.cs
index bf33331573daa62cb292d8746d0fef9a8059d45b..fda2652c27ba48aa6aa7bccdef5f1ffccec0cfb6 100644
--- a/Assets/InventoryStuff/FactWrapper.cs
+++ b/Assets/InventoryStuff/FactWrapper.cs
@@ -4,5 +4,5 @@
public class FactWrapper : MonoBehaviour
{
- public ItemObject fact;
+ public Fact fact;
}
diff --git a/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs b/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs
deleted file mode 100644
index 61f9fcbfa0ee4f578c6bb2448e218142ba889760..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[CreateAssetMenu(fileName = "New Inventory", menuName= "Inventory System/Inventory" )]
-public class Inventory : ScriptableObject
-{
- public List<InventorySlotFact> Facts = new List<InventorySlotFact>();
- public List<InventorySlotScroll> Scrolls = new List<InventorySlotScroll>();
-
- public void AddFact(ItemObject fact){
- Facts.Add(new InventorySlotFact(fact));
- }
-
- public void AddScroll(DefaultScroll scroll){
- Scrolls.Add(new InventorySlotScroll(scroll));
- }
-}
-[System.Serializable]
-public class InventorySlotFact{
- public ItemObject item;
- public bool isDisplayed;
-
- public InventorySlotFact(ItemObject _item){
- item = _item;
- isDisplayed = false;
- }
-
-}
-
-[System.Serializable]
-public class InventorySlotScroll{
- public DefaultScroll item;
- public bool isDisplayed;
-
- public InventorySlotScroll( DefaultScroll _item){
- item = _item;
- isDisplayed = false;
- }
-}
-
-
-
diff --git a/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs.meta b/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs.meta
deleted file mode 100644
index 3eed65c62b8f8833b4bee8bf1ec9cafc18691328..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 14aa6bfc325535540999d9ee4927d556
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset b/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset
deleted file mode 100644
index 314305b3d98ab744b348a6b299a45a3097f45c93..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset
+++ /dev/null
@@ -1,18 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 14aa6bfc325535540999d9ee4927d556, type: 3}
- m_Name: THE_INVENTORY
- m_EditorClassIdentifier:
- Facts: []
- Scrolls:
- - item: {fileID: 11400000, guid: b8e04ce999b77dc48a7f225e635bc2ce, type: 2}
- isDisplayed: 0
diff --git a/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset.meta b/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset.meta
deleted file mode 100644
index bb20d2c55bfdf23e60a801e1e5c47f8ce62a5731..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f3a619d9c65f61d4b9c7c86923b1ad95
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/scripts/AngleObject.cs b/Assets/InventoryStuff/Items/scripts/AngleObject.cs
deleted file mode 100644
index 1231871c3ac8393df3b7a635ef02a0d21533cd95..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/AngleObject.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using TMPro;
- [CreateAssetMenu(fileName = "new DefaultObject", menuName = "Inventory System/Items/Angle")]
-public class AngleObject : ItemObject
-{
- public string pointA;
- public string pointB;
- public string pointC;
- public double angle;
-
- public void Awake()
- {
- type = ItemType.AngleFact;
- }
- //prefab should be "AngleDisplay"
- public override GameObject CreateDisplay(Transform transform, GameObject prefab){
- var obj = Instantiate(prefab, Vector3.zero, Quaternion.identity, transform);
- obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = pointA;
- obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = pointB;
- obj.transform.GetChild(2).gameObject.GetComponent<TextMeshProUGUI>().text = pointC;
- obj.GetComponent<FactWrapper>().fact = this;
- return obj;
- }
-}
diff --git a/Assets/InventoryStuff/Items/scripts/AngleObject.cs.meta b/Assets/InventoryStuff/Items/scripts/AngleObject.cs.meta
deleted file mode 100644
index f7fbf1b5f17f71dd6cd3cf9b1806925ce9f70b59..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/AngleObject.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 53c362d013ad14747b779900f8c8242e
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/scripts/DefaultObject.cs b/Assets/InventoryStuff/Items/scripts/DefaultObject.cs
deleted file mode 100644
index 660f18699e2b60bca2dd65c36c0ef339c786dbdd..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/DefaultObject.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
- [CreateAssetMenu(fileName = "new DefaultObject", menuName = "Inventory System/Items/Default")]
-public class DefaultObject : ItemObject
-{
- public void Awake()
- {
- type = ItemType.Default;
- }
-
- //prefab should be "DefaultObjectDisplay"
- public override GameObject CreateDisplay(Transform transform, GameObject prefab){
- var obj = Instantiate(prefab, Vector3.zero, Quaternion.identity, transform);
- return obj;
- }
-}
diff --git a/Assets/InventoryStuff/Items/scripts/DefaultObject.cs.meta b/Assets/InventoryStuff/Items/scripts/DefaultObject.cs.meta
deleted file mode 100644
index cecbc3d8a9ece2bead169cd3033b62456d7f15cf..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/DefaultObject.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8fbc458136995e149baa33442083c952
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/scripts/DefaultScroll.cs b/Assets/InventoryStuff/Items/scripts/DefaultScroll.cs
deleted file mode 100644
index da02ef6f1be7087af3543640382bf538a05e8e9c..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/DefaultScroll.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
- [CreateAssetMenu(fileName = "new DefaultScroll", menuName = "Inventory System/Items/DefaultScroll")]
-public class DefaultScroll : ItemObject
-{
-
- public GameObject IconPrefab;
- public GameObject UsagePrefab;
- public void Awake()
- {
- type = ItemType.DefaultScroll;
- }
-
- //prefab should be "DefaultScrollDisplay"
- public override GameObject CreateDisplay(Transform transform, GameObject prefab){
- var obj = Instantiate(prefab, Vector3.zero, Quaternion.identity, transform);
- return obj;
- }
-
-}
diff --git a/Assets/InventoryStuff/Items/scripts/DefaultScroll.cs.meta b/Assets/InventoryStuff/Items/scripts/DefaultScroll.cs.meta
deleted file mode 100644
index 56eb1894577dbb83a8e4c1d48c6bc54679ff00f1..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/DefaultScroll.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4863e36a3d5b58b47a13400c96dce2fd
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/scripts/ItemObject.cs b/Assets/InventoryStuff/Items/scripts/ItemObject.cs
deleted file mode 100644
index 22afd0f6cd62c90f00a4a605a1d4fe2d33c0ad41..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/ItemObject.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-public abstract class ItemObject : ScriptableObject
-{
- public enum ItemType{
- LengthFact,
- AngleFact,
- DefaultScroll,
- Point,
- Default
- };
- public ItemType type;
- [TextArea(15,20)]
- public string Description;
-
- public abstract GameObject CreateDisplay(Transform transform, GameObject prefab);
-}
diff --git a/Assets/InventoryStuff/Items/scripts/ItemObject.cs.meta b/Assets/InventoryStuff/Items/scripts/ItemObject.cs.meta
deleted file mode 100644
index e91821ff05eb4d0d1f585c1aef55a4ae135bf560..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/ItemObject.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6fce2c2f8f4464e418f67820fc788f26
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/scripts/LengthObject.cs b/Assets/InventoryStuff/Items/scripts/LengthObject.cs
deleted file mode 100644
index 2fc722b34398792b7c4e06b06a592e978ae48a58..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/LengthObject.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using TMPro;
- [CreateAssetMenu(fileName = "new DefaultObject", menuName = "Inventory System/Items/Length")]
-public class LengthObject : ItemObject
-{
- public string pointA;
- public string pointB;
- public double Lenght;
-
-
- public void Awake()
- {
- type = ItemType.LengthFact;
- }
-
- //prefab should be "LengthDisplay"
- public override GameObject CreateDisplay(Transform transform, GameObject prefab){
- var obj = Instantiate(prefab, Vector3.zero, Quaternion.identity, transform);
- obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = pointA;
- obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = pointB;
- obj.GetComponent<FactWrapper>().fact = this;
- return obj;
- }
-}
diff --git a/Assets/InventoryStuff/Items/scripts/LengthObject.cs.meta b/Assets/InventoryStuff/Items/scripts/LengthObject.cs.meta
deleted file mode 100644
index 97149b7f5a0b5ca7af2e6089735d52f30b817274..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/LengthObject.cs.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-fileFormatVersion: 2
-guid: bc65288d8a9b7f343a6e221e4bdba74c
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences:
- - prefab: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67,
- type: 3}
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/scripts/PointObject.cs b/Assets/InventoryStuff/Items/scripts/PointObject.cs
deleted file mode 100644
index acf63e3739c2cc529f7bae6288eb38698fde9287..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/PointObject.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using TMPro;
- [CreateAssetMenu(fileName = "new PointObject", menuName = "Inventory System/Items/Point")]
-public class PointObject : ItemObject
-{
- public string point;
-
-
- public void Awake()
- {
- type = ItemType.Point;
- }
-
- //prefab should be "LengthDisplay"
- public override GameObject CreateDisplay(Transform transform, GameObject prefab){
- var obj = Instantiate(prefab, Vector3.zero, Quaternion.identity, transform);
- obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = point;
- obj.GetComponent<FactWrapper>(). fact = this;
- return obj;
- }
-}
\ No newline at end of file
diff --git a/Assets/InventoryStuff/Items/scripts/PointObject.cs.meta b/Assets/InventoryStuff/Items/scripts/PointObject.cs.meta
deleted file mode 100644
index 7aa5ab75769716ab7a85a21274121fc49b13f941..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/PointObject.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e50bfc6d769196d4e836ba779a6995ae
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/scripts/PythagorasScroll.cs b/Assets/InventoryStuff/Items/scripts/PythagorasScroll.cs
deleted file mode 100644
index ba7333f342d1dbe1e0d8f30e8312d18a25f69668..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/PythagorasScroll.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PythagorasScroll : DefaultScroll
-{
-
-}
diff --git a/Assets/InventoryStuff/Items/scripts/PythagorasScroll.cs.meta b/Assets/InventoryStuff/Items/scripts/PythagorasScroll.cs.meta
deleted file mode 100644
index 59e339052246e099df08e7e0867d0d5d96f2f2db..0000000000000000000000000000000000000000
--- a/Assets/InventoryStuff/Items/scripts/PythagorasScroll.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a4568103619d54d43925225cdb10b7ac
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/InventoryStuff/PointWrapper.cs b/Assets/InventoryStuff/PointWrapper.cs
index 9e7a54c93dd38fab480665ca69a4cb3049f0e07b..a0738d5d85c1aaccee70c66957aadbbc56b23475 100644
--- a/Assets/InventoryStuff/PointWrapper.cs
+++ b/Assets/InventoryStuff/PointWrapper.cs
@@ -4,5 +4,5 @@
public class PointWrapper : MonoBehaviour
{
- public PointObject point;
+ public Fact point;
}
diff --git a/Assets/PlayerScript.cs b/Assets/PlayerScript.cs
deleted file mode 100644
index 8a34cea07cffc66b3709f470580bcb10750a68d4..0000000000000000000000000000000000000000
--- a/Assets/PlayerScript.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PlayerScript : MonoBehaviour
-{
- public Inventory inventory;
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
-
- public void AddLenghtFact()
- {
- LengthObject fact = ScriptableObject.CreateInstance<LengthObject>();
- fact.pointA = "A";
- fact.pointB = "B";
- fact.Lenght = 1.0;
- fact.Description = "LengthFact";
- inventory.AddFact(fact);
- }
-
-
- public void AddAngleFact(){
- AngleObject fact = ScriptableObject.CreateInstance<AngleObject>();
- fact.pointA = "X";
- fact.pointB = "Y";
- fact.pointC = "Z";
- fact.angle = 90.0;
- fact.Description = "AngleFact";
- inventory.AddFact(fact);
- }
-
- public void AddPointFact(){
- PointObject fact = ScriptableObject.CreateInstance<PointObject>();
- fact.point = "P";
- inventory.AddFact(fact);
- }
-
- private void OnApplicationQuit()
- {
- inventory.Facts.Clear();
- for(int i = 0; i < inventory.Scrolls.Count; i++){
- inventory.Scrolls[i].isDisplayed = false;
- }
-
- }
-}
diff --git a/Assets/PlayerScript.cs.meta b/Assets/PlayerScript.cs.meta
deleted file mode 100644
index 4338a7767892f76fab840ba1d71e2c47a5d3c8e8..0000000000000000000000000000000000000000
--- a/Assets/PlayerScript.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 8deb287bc63461e4b9bfa68c45404328
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences:
- - inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2}
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/PythagorasScript.cs b/Assets/PythagorasScript.cs
index 3911edcc6095161dc18fb30a96d34634353b0d82..1cc4d56d0aaeb206115cef005ad538f4a306637a 100644
--- a/Assets/PythagorasScript.cs
+++ b/Assets/PythagorasScript.cs
@@ -4,9 +4,9 @@
public class PythagorasScript : MonoBehaviour
{
- private Dictionary<string, ItemObject> items = new Dictionary<string, ItemObject>();
+ private Dictionary<string, Fact> items = new Dictionary<string, Fact>();
- public void putItem(string name, ItemObject obj) {
+ public void putFact(string name, Fact obj) {
if (this.items.ContainsKey(name)) {
this.items.Remove(name);
}
@@ -14,7 +14,7 @@ public void putItem(string name, ItemObject obj) {
}
public void doMagic() {
- Dictionary<string, ItemObject>.Enumerator enumerator = this.items.GetEnumerator();
+ Dictionary<string, Fact>.Enumerator enumerator = this.items.GetEnumerator();
while (enumerator.MoveNext()){
Debug.Log(enumerator.Current.Key + " is mapped to " + enumerator.Current.Value);
}
diff --git a/Assets/inventoryStuff.unity b/Assets/inventoryStuff.unity
index f9966049ea4210f91e375d87efb6222e3f9a78ed..5f92ef306a00e24c4e1140aaef08a36cf353eb27 100644
--- a/Assets/inventoryStuff.unity
+++ b/Assets/inventoryStuff.unity
@@ -130,222 +130,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 413dcae9856bd794ab03d29210561c57, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &189930219
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 189930220}
- - component: {fileID: 189930222}
- - component: {fileID: 189930221}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &189930220
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 189930219}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 782021430}
- 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 &189930221
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 189930219}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: Button
---- !u!222 &189930222
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 189930219}
- m_CullTransparentMesh: 0
---- !u!1 &237865488
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 237865489}
- - component: {fileID: 237865493}
- - component: {fileID: 237865492}
- - component: {fileID: 237865491}
- - component: {fileID: 237865490}
- m_Layer: 5
- m_Name: AddAngle
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &237865489
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 237865488}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1706069127}
- m_Father: {fileID: 1243429077}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 80}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &237865490
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 237865488}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8deb287bc63461e4b9bfa68c45404328, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2}
---- !u!114 &237865491
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 237865488}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 237865492}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 237865490}
- m_MethodName: AddLenghtFact
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
---- !u!114 &237865492
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 237865488}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10905, 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
---- !u!222 &237865493
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 237865488}
- m_CullTransparentMesh: 0
--- !u!1 &249048811
GameObject:
m_ObjectHideFlags: 0
@@ -497,7 +281,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 66df8f5d2fa2cc140aa2d3eca570e8dd, type: 3}
m_Name:
m_EditorClassIdentifier:
- inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2}
x_Start: -175
y_Start: 0
X_Pacece_Between_Items: 110
@@ -538,222 +321,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 274389188}
m_CullTransparentMesh: 0
---- !u!1 &589000459
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 589000460}
- - component: {fileID: 589000462}
- - component: {fileID: 589000461}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &589000460
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 589000459}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1494109232}
- 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 &589000461
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 589000459}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: Button
---- !u!222 &589000462
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 589000459}
- m_CullTransparentMesh: 0
---- !u!1 &782021429
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 782021430}
- - component: {fileID: 782021434}
- - component: {fileID: 782021433}
- - component: {fileID: 782021432}
- - component: {fileID: 782021431}
- m_Layer: 5
- m_Name: Point
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &782021430
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 782021429}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 189930220}
- m_Father: {fileID: 1243429077}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 110}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &782021431
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 782021429}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8deb287bc63461e4b9bfa68c45404328, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2}
---- !u!114 &782021432
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 782021429}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 782021433}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 782021431}
- m_MethodName: AddPointFact
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
---- !u!114 &782021433
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 782021429}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10905, 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
---- !u!222 &782021434
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 782021429}
- m_CullTransparentMesh: 0
--- !u!1 &938894355
GameObject:
m_ObjectHideFlags: 0
@@ -894,97 +461,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1181841651}
m_CullTransparentMesh: 0
---- !u!1 &1183788649
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1183788650}
- - component: {fileID: 1183788653}
- - component: {fileID: 1183788652}
- - component: {fileID: 1183788651}
- m_Layer: 0
- m_Name: Cube
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1183788650
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1183788649}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 12.629, y: 12.629, z: 12.629}
- m_Children: []
- m_Father: {fileID: 1332007316}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &1183788651
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1183788649}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &1183788652
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1183788649}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 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
---- !u!33 &1183788653
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1183788649}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1243429076
GameObject:
m_ObjectHideFlags: 0
@@ -1014,10 +490,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_Children:
- - {fileID: 1494109232}
- - {fileID: 237865489}
- - {fileID: 782021430}
+ m_Children: []
m_Father: {fileID: 249048815}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1038,7 +511,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3}
m_Name:
m_EditorClassIdentifier:
- inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2}
prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec,
type: 3}
prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67,
@@ -1184,190 +656,6 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
---- !u!1 &1332007314
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1332007316}
- - component: {fileID: 1332007315}
- m_Layer: 0
- m_Name: Player
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1332007315
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1332007314}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8deb287bc63461e4b9bfa68c45404328, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2}
---- !u!4 &1332007316
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1332007314}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 777.8665, y: 452.496, z: -10.391348}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1183788650}
- m_Father: {fileID: 0}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1494109231
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1494109232}
- - component: {fileID: 1494109236}
- - component: {fileID: 1494109235}
- - component: {fileID: 1494109234}
- - component: {fileID: 1494109233}
- m_Layer: 5
- m_Name: AddDistance
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1494109232
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1494109231}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 589000460}
- m_Father: {fileID: 1243429077}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 50}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1494109233
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1494109231}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8deb287bc63461e4b9bfa68c45404328, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2}
---- !u!114 &1494109234
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1494109231}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 1494109235}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1494109233}
- m_MethodName: AddAngleFact
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
---- !u!114 &1494109235
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1494109231}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10905, 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
---- !u!222 &1494109236
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1494109231}
- m_CullTransparentMesh: 0
--- !u!1 &1549058023
GameObject:
m_ObjectHideFlags: 0
@@ -1450,83 +738,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1706069126
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1706069127}
- - component: {fileID: 1706069129}
- - component: {fileID: 1706069128}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1706069127
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1706069126}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 237865489}
- 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 &1706069128
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1706069126}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: Button
---- !u!222 &1706069129
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1706069126}
- m_CullTransparentMesh: 0
--- !u!224 &1738528914 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4362180880950796639, guid: 170ab14de1eba214fb78abe18aaf388c,