diff --git a/TTCS_Prot/Assets/Images/EndText.png.meta b/TTCS_Prot/Assets/Images/EndText.png.meta
index f5e17093c8108b71397a4b8caec2db6655605f71..504bc763f569cc7f8469e33a992f5704f80298d4 100644
--- a/TTCS_Prot/Assets/Images/EndText.png.meta
+++ b/TTCS_Prot/Assets/Images/EndText.png.meta
@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 70ffb8775ba243c4499df2d9049e6e47
TextureImporter:
- fileIDToRecycleName: {}
+ fileIDToRecycleName:
+ 2186277476908879412: ImportLogs
externalObjects: {}
serializedVersion: 7
mipmaps:
diff --git a/TTCS_Prot/Assets/Scenes/SampleScene.unity b/TTCS_Prot/Assets/Scenes/SampleScene.unity
index 765d3f264eecca81d665e911e4577a484427aa90..8c32ff5d62d420d1b8a8d65ed47c25bbec6ce563 100644
--- a/TTCS_Prot/Assets/Scenes/SampleScene.unity
+++ b/TTCS_Prot/Assets/Scenes/SampleScene.unity
@@ -1774,7 +1774,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 4, y: 0.0000076293945}
- m_SizeDelta: {x: -8, y: -255}
+ m_SizeDelta: {x: -8, y: -247.99}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &234521555
MonoBehaviour:
@@ -2239,8 +2239,8 @@ RectTransform:
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: -22.5}
- m_SizeDelta: {x: 0, y: -45}
+ m_AnchoredPosition: {x: 0, y: -19}
+ m_SizeDelta: {x: 0, y: -52.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &262724280
MonoBehaviour:
@@ -3267,8 +3267,8 @@ RectTransform:
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: -22.5}
- m_SizeDelta: {x: 0, y: -45}
+ m_AnchoredPosition: {x: 0, y: -18.22}
+ m_SizeDelta: {x: 0, y: -53.56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &335156270
MonoBehaviour:
@@ -5719,8 +5719,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 101.3, y: 28}
- m_SizeDelta: {x: 160, y: 20}
+ m_AnchoredPosition: {x: 101.3, y: 1.14}
+ m_SizeDelta: {x: 205.43, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &614996072
MonoBehaviour:
@@ -10959,8 +10959,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 4, y: 0.0000076293945}
- m_SizeDelta: {x: -8, y: -255}
+ m_AnchoredPosition: {x: 4, y: 0.000015258789}
+ m_SizeDelta: {x: -8, y: -246.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1151227948
MonoBehaviour:
@@ -13393,8 +13393,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 99.5, y: 28}
- m_SizeDelta: {x: 160, y: 20}
+ m_AnchoredPosition: {x: 99.5, y: 1.53}
+ m_SizeDelta: {x: 204.77, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1515718677
MonoBehaviour:
@@ -13763,7 +13763,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 4, y: 0.000015258789}
+ m_AnchoredPosition: {x: 4, y: 0.0000076293945}
m_SizeDelta: {x: -8, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1563812112
@@ -17889,6 +17889,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 318c5af9f416140419aa34bc3a7b57c3, type: 3}
m_Name:
m_EditorClassIdentifier:
+ hovering: 0
--- !u!1 &2113891587
GameObject:
m_ObjectHideFlags: 0
diff --git a/TTCS_Prot/Assets/Scenes/example.meta b/TTCS_Prot/Assets/Scenes/example.meta
deleted file mode 100644
index 2938a2cad0bab059ab6924f712eacddea4253a87..0000000000000000000000000000000000000000
--- a/TTCS_Prot/Assets/Scenes/example.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bebd874866a254106aae17e52a06ac6e
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs b/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs
index 2197ea958eb60704f02d7d3f20a909ff691662e5..bb4499e88c345e7ef39e7153bbbb83a612de8e8e 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs
@@ -217,6 +217,7 @@ public class EvidenceHandler : MonoBehaviour {
public void chooseSolution()
{
+ cutsceneManager = FindObjectOfType<CutsceneManager>();
timelineScript = FindObjectOfType<TimelineScript>();
for (int i = 0; i < timelineScript.corroborations.Count; i++)
diff --git a/TTCS_Prot/Assets/Scripts/Classes/HoverScript.cs b/TTCS_Prot/Assets/Scripts/Classes/HoverScript.cs
index c9d90f12ed5dd70151a24e0b5cc6890beed8bc77..fea04ab91d5c133337e8380e96e11c2fe12456c7 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/HoverScript.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/HoverScript.cs
@@ -10,16 +10,24 @@ public class HoverScript : MonoBehaviour, IPointerEnterHandler, IPointerExitHand
private GameObject panel;
private float width;
private float height;
- private bool hovering;
+ public bool hovering;
+ void Start()
+ {
+ hovering = false;
+ }
void Update()
{
- if(hovering)
+
+ width = panel.GetComponent<RectTransform>().sizeDelta.x;
+ height = panel.GetComponent<RectTransform>().sizeDelta.y;
+
+ if (hovering)
{
- panel.transform.position = new Vector3(Input.mousePosition.x + (width / 2) + 35, Input.mousePosition.y - (height / 2) - 15, Input.mousePosition.z);
+ panel.transform.position = new Vector3(Input.mousePosition.x + (width / 2) + 15, Input.mousePosition.y - (height / 2) - 15, Input.mousePosition.z);
} else
{
- panel.transform.position = new Vector3(-200, -200, 0);
+ panel.transform.position = new Vector3(-4000, -400, 0);
}
}
@@ -37,8 +45,11 @@ public class HoverScript : MonoBehaviour, IPointerEnterHandler, IPointerExitHand
public void setPanel(GameObject h)
{
+ Debug.Log("setting panel");
+ Debug.Log(h);
panel = h;
width = panel.GetComponent<RectTransform>().sizeDelta.x;
height = panel.GetComponent<RectTransform>().sizeDelta.y;
+ panel.transform.position = new Vector3(-4000, -400, 0);
}
}
diff --git a/TTCS_Prot/Assets/UI Prefabs/DetInfo.prefab b/TTCS_Prot/Assets/UI Prefabs/DetInfo.prefab
index 976f854b04545ab5e1f75ea41a9a9e5f1ff3adb0..3dd5ef96ada4bdeabd5eb5e480feeacc96630e14 100644
--- a/TTCS_Prot/Assets/UI Prefabs/DetInfo.prefab
+++ b/TTCS_Prot/Assets/UI Prefabs/DetInfo.prefab
@@ -146,10 +146,10 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 138.44, y: -61.59}
- m_SizeDelta: {x: 276.88, y: 123.18}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 600.44, y: -321.59}
+ m_SizeDelta: {x: 276.88, y: 123.17999}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1428737581675164895
CanvasRenderer:
diff --git a/TTCS_Prot/Assets/example.meta b/TTCS_Prot/Assets/example.meta
deleted file mode 100644
index 2cb0640099e2dab509e40ee97df215b3b2419557..0000000000000000000000000000000000000000
--- a/TTCS_Prot/Assets/example.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c66af92d50784d799545bc86c9b8590
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant: