diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
index 431d90f5fb4cc706fcc1c06844737cc346e4d4d4..5df0053f310c5d6fa0263721904560bbf50831dd 100644
--- a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
@@ -2171,7 +2171,8 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: Please wait ...
+ m_Text: Make sure that the folder 'archives' and the 'frameit-mmt.jar' are in the
+ right 'StreamingAssets' folder.
--- !u!1 &4737743320538516526
GameObject:
m_ObjectHideFlags: 0
@@ -2364,8 +2365,8 @@ RectTransform:
m_Father: {fileID: 20385689445018545}
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_AnchorMin: {x: 0.6, y: 0.5}
+ m_AnchorMax: {x: 0.6, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
@@ -2420,7 +2421,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
rotateSpeed: 0
- scale: 5
+ scale: 14
--- !u!1 &5290022960781819333
GameObject:
m_ObjectHideFlags: 0
@@ -3604,6 +3605,85 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Waiting for local MMT Server to start.
+--- !u!1 &5824065305538372702
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9092953270949564538}
+ - component: {fileID: 239406296362296994}
+ - component: {fileID: 7505224852893358147}
+ m_Layer: 5
+ m_Name: OptMT (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &9092953270949564538
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5824065305538372702}
+ 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: 20385689445018545}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.4}
+ m_AnchorMax: {x: 0.5, y: 0.6}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &239406296362296994
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5824065305538372702}
+ m_CullTransparentMesh: 1
+--- !u!114 &7505224852893358147
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5824065305538372702}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 60
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 100
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Please wait ...
--- !u!1 &5824578313542523308
GameObject:
m_ObjectHideFlags: 0
@@ -4230,6 +4310,7 @@ RectTransform:
- {fileID: 3415527872007802782}
- {fileID: 8885932543130391121}
- {fileID: 348790405099367209}
+ - {fileID: 9092953270949564538}
m_Father: {fileID: 6846632430007306933}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index b224fe2859baabcdb4fe0dcc0c2d3e819e3f7c67..e82b13022119b0e0ee08d8041b1a924cf7d39fe4 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -39596,6 +39596,11 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3431640950835660668, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 3618627260122670347, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_Name
@@ -39751,6 +39756,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6275790083704784081, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6322013052525978475, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_Name
@@ -59225,7 +59235,7 @@ PrefabInstance:
- target: {fileID: 5942919038966713621, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Enabled
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5947573416298360518, guid: b07552db700124a4680401e6fb94c186,
type: 3}
@@ -59500,7 +59510,7 @@ PrefabInstance:
- target: {fileID: 7299826999578007368, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: default_value
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7364148210846522891, guid: b07552db700124a4680401e6fb94c186,
type: 3}
diff --git a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs
index 4b2e95bacd71f3db910029e99663245d6dfa7533..8a27b58eb6e3707fb8fd1a72d54e87e1ca19e0f6 100644
--- a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs
+++ b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs
@@ -1,4 +1,6 @@
using System.Collections.Generic;
+using System.Diagnostics;
+using UnityEngine.Networking;
using UnityEngine;
using UnityEngine.Events;
using System;
@@ -61,7 +63,8 @@ public class AnimationEventWithUris : UnityEvent<List<string>> { }
public static string ServerAddressLocal = "http://localhost:8085"; // "http://localhost:8085"
public static string ServerAdress = "http://localhost:8085"; //need "http://" //used by dispalyScrolls.cs //http://10.231.4.95:8085";
-
+ public static Process process_mmt_frameIT_server;
+
public static bool takeNewToolID = false; //0=no, 1=instead, 2=both
public static int ToolID_new;
public static int ToolID_selected;//Script
diff --git a/Assets/Scripts/Restart.cs b/Assets/Scripts/Restart.cs
index 6ba64952e2922066e6de0469242873e37dfe067f..6610d93737d7b3037e540b94c635efd2180a35ed 100644
--- a/Assets/Scripts/Restart.cs
+++ b/Assets/Scripts/Restart.cs
@@ -1,51 +1,53 @@
using UnityEngine;
using UnityEngine.SceneManagement;
using static UIconfig;
+using static Restart_script;
public class Restart : MonoBehaviour
{
public void LevelReset()
{
- StageStatic.stage.ResetPlay();
- //UIconfig.CanvasOnOff_Array[2] = 0;
- //UIconfig.GamePaused = false;
- //Time.timeScale = 1; // UIconfig.Game_TimeScale;
- Loader.LoadStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder, false);
- //StageStatic.stage.factState.softreset();
+ Restart_script resClass = new Restart_script();
+ resClass.LevelReset();
+
}
public void LoadMainMenue()
{
- //not over SceneManager.LoadingScreen as MainMenue is too light to need to load over a LoadingScreen
- SceneManager.LoadScene("MainMenue");
+ Restart_script resClass = new Restart_script();
+ resClass.LoadMainMenue();
}
public void StageFactState_modundo()
{
- StageStatic.stage.factState.undo();
+ Restart_script resClass = new Restart_script();
+ resClass.LoadMainMenue();
}
public void StageFactState_modredo()
{
- StageStatic.stage.factState.redo();
+ Restart_script resClass = new Restart_script();
+ resClass.StageFactState_modredo();
}
public void StageFactState_modreset()
{
- StageStatic.stage.factState.softreset();
+ Restart_script resClass = new Restart_script();
+ resClass.StageFactState_modreset();
}
public void Stage_modsave()
{
- StageStatic.stage.push_record();
+ Restart_script resClass = new Restart_script();
+ resClass.Stage_modsave();
}
public void StageFactState_modload()
{
- StageStatic.stage.factState.hardreset();
- StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder);
+ Restart_script resClass = new Restart_script();
+ resClass.StageFactState_modload();
}
@@ -53,12 +55,13 @@ public void StageFactState_modload()
public void LoadStartScreen()
{
- StartServer.process.Kill(); // null reference exception if Server started manually
- SceneManager.LoadScene(0);
+ Restart_script resClass = new Restart_script();
+ resClass.LoadStartScreen();
}
public void OnApplicationQuit()
{
- StartServer.process.Kill(); // null reference exception if Server started manually
+ Restart_script resClass = new Restart_script();
+ resClass.OnApplicationQuit();
}
}
diff --git a/Assets/Scripts/Restart_script.cs b/Assets/Scripts/Restart_script.cs
new file mode 100644
index 0000000000000000000000000000000000000000..c165c8420fe012a4b105cf671842d8229c3158ac
--- /dev/null
+++ b/Assets/Scripts/Restart_script.cs
@@ -0,0 +1,64 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using static UIconfig;
+
+public class Restart_script
+{
+ public void LevelReset()
+ {
+
+ StageStatic.stage.ResetPlay();
+ //UIconfig.CanvasOnOff_Array[2] = 0;
+ //UIconfig.GamePaused = false;
+ //Time.timeScale = 1; // UIconfig.Game_TimeScale;
+ Loader.LoadStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder, false);
+ //StageStatic.stage.factState.softreset();
+
+ }
+
+ public void LoadMainMenue()
+ {
+ //not over SceneManager.LoadingScreen as MainMenue is too light to need to load over a LoadingScreen
+ SceneManager.LoadScene("MainMenue");
+ }
+
+
+ public void StageFactState_modundo()
+ {
+ StageStatic.stage.factState.undo();
+ }
+ public void StageFactState_modredo()
+ {
+ StageStatic.stage.factState.redo();
+ }
+
+ public void StageFactState_modreset()
+ {
+ StageStatic.stage.factState.softreset();
+ }
+
+ public void Stage_modsave()
+ {
+ StageStatic.stage.push_record();
+ }
+
+ public void StageFactState_modload()
+ {
+ StageStatic.stage.factState.hardreset();
+ StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder);
+ }
+
+
+
+
+ public void LoadStartScreen()
+ {
+ StartServer.process.Kill(); // null reference exception if Server started manually
+ SceneManager.LoadScene(0);
+ }
+
+ public void OnApplicationQuit()
+ {
+ StartServer.process.Kill(); // null reference exception if Server started manually
+ }
+}
diff --git a/Assets/Scripts/Restart_script.cs.meta b/Assets/Scripts/Restart_script.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e5ec77a1020e766f2bf09299080dcf44143d61f5
--- /dev/null
+++ b/Assets/Scripts/Restart_script.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 24dee529ff67a2944b706e63b58d9945
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/StartServer.cs b/Assets/Scripts/StartServer.cs
index 51d00709d8742d15be577ca18c3c13309bd642bb..0d60e3f25bddd932cfa0618f9b49c695b3926a3a 100644
--- a/Assets/Scripts/StartServer.cs
+++ b/Assets/Scripts/StartServer.cs
@@ -138,7 +138,8 @@ IEnumerator ServerRoutine()
print("Serverinit: " + processInfo.Arguments);
process = Process.Start(processInfo);
-
+ process_mmt_frameIT_server = process;
+
//#endif
yield return null;
#endif
diff --git a/Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs b/Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs
index 8bf49fb0225e9b8edad0be9119f78c6ef798661a..20933ee12b402025a719d62b3c1479b7defcd6eb 100644
--- a/Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs
+++ b/Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs
@@ -12,7 +12,8 @@
using static UIconfig;
using UnityEngine.EventSystems;
using static Restart;
-using static SceneSwitcher;
+using static Restart_script;
+//using static SceneSwitcher;
@@ -121,21 +122,38 @@ private void setPauseToken()
private void PauseGame()
{
- //Time.timeScale = 0;
- Time.timeScale = UIconfig.Game_TimeScale;
+ Time.timeScale = 0;
+ //Time.timeScale = UIconfig.Game_TimeScale;
}
private void ResumeGame()
{
Time.timeScale = UIconfig.Game_TimeScale;
if (ResetLevel)
{
- Restart resClass = new Restart();
+ //Restart resClass = new Restart();
+ Restart_script resClass = new Restart_script();
resClass.LevelReset();
}
if (switchToScene_ID_ > 0)
{
- SceneSwitcher ScSw = new SceneSwitcher();
- ScSw.NowsSwitchToScene(switchToScene_ID_);
+
+ //SceneSwitcher ScSw = new SceneSwitcher();
+ //ScSw.NowsSwitchToScene(switchToScene_ID_);
+ //SceneManager.LoadScene("MainMenue");
+
+ switch (switchToScene_ID_)
+ {
+ case 3:
+ SceneManager.LoadScene("LaunchMenue");
+ break;
+ case 4:
+ SceneManager.LoadScene("MainMenue");
+ break;
+ default:
+ SceneManager.LoadScene("LaunchMenue");
+ break;
+
+ }
}
diff --git a/Assets/Scripts/UI/MainMenue/QuitApp.cs b/Assets/Scripts/UI/MainMenue/QuitApp.cs
index bd0482a9be3cc42c8167c024388bebecc75f6f79..4dbcc1099ca5b1bfee5dbcd20d0aa37cf41a7136 100644
--- a/Assets/Scripts/UI/MainMenue/QuitApp.cs
+++ b/Assets/Scripts/UI/MainMenue/QuitApp.cs
@@ -10,6 +10,7 @@
///using static CommunicationEvents;
using static StreamingAssetLoader;
using static UIconfig;
+using static CommunicationEvents;
using UnityEngine.EventSystems;
@@ -43,10 +44,11 @@ public void QuitApp1()
//Input.backButtonLeavesApp = true;
NetworkJSON_Save();
+ process_mmt_frameIT_server.Kill();
#if UNITY_EDITOR
UnityEditor.EditorApplication.isPlaying = false;
- #endif
+#endif
Application.Quit();
}
diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs
index 8993430d24dfd42e214d0ffd9ef46c54503fadc1..62e826151395321d7b053e55c47ece95babb6d31 100644
--- a/Assets/Scripts/UI/UIconfig.cs
+++ b/Assets/Scripts/UI/UIconfig.cs
@@ -6,8 +6,8 @@
public static class UIconfig
{
- public static int FrameITUIversion = 3; // 1= FrameITUI; 2= FrameITUI_mobil
- public static int InputManagerVersion = 2; // 1= InputManager, 2=InputSystemPackage ; 3=overConfigfile
+ public static int FrameITUIversion = 2; // 1= FrameITUI; 2= FrameITUI_mobil
+ public static int InputManagerVersion = 1; // 1= InputManager, 2=InputSystemPackage ; 3=overConfigfile
public static int GameplayMode = 5; //5=First Person, 4=third, 3=third+, 2=Escaperoom, 1=Sidescroller, 0=Sidescroller+
public static int MainCameraID = 0; //0=Camera.main; 1=Cam1, 2=Cam2
diff --git a/Assets/Stages/TechDemo B.JSON b/Assets/Stages/TechDemo B.JSON
index 93dca637ef60dc021e2b09a39ded027157a7cf80..fb62ee2526b6a2d15e3b58d41e7d999ba21652cb 100644
--- a/Assets/Stages/TechDemo B.JSON
+++ b/Assets/Stages/TechDemo B.JSON
@@ -1 +1 @@
-{"category":"Demo Category","number":0,"name":"TechDemo B","description":"River Stage","scene":"RiverWorld","use_install_folder":true,"hierarchie":[],"player_record_list":{},"player_record":{}}
\ No newline at end of file
+{"category":"Demo Category","number":0,"name":"TechDemo B","description":"River Stage","scene":"RiverWorld","use_install_folder":true,"hierarchie":[],"player_record_list":{},"player_record":{"solved":false,"date":-8585450840412060476,"seconds":0.0,"name":"TechDemo B_save"}}
\ No newline at end of file
diff --git a/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON b/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON
index 158ef3dbab977c624865eb75a92dcbb216cd550d..106754fb2e41a53a144bd2ff92cdcf3172613416 100644
--- a/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON
+++ b/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON
@@ -1 +1 @@
-{"PointFacts":[{"Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","Label":"A","hasCustomLabel":false,"LabelId":1},{"Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","Pid2":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151","samestep":true,"steplink":0,"creation":true}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":2,"UnusedLabelIds":[]}
\ No newline at end of file
+{"PointFacts":[{"Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205","Label":"A","hasCustomLabel":false,"LabelId":1},{"Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207","samestep":true,"steplink":0,"creation":true}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":2,"UnusedLabelIds":[]}
\ No newline at end of file
diff --git a/Assets/Stages/ValidationSets/TechDemo B_val.JSON b/Assets/Stages/ValidationSets/TechDemo B_val.JSON
index f620ff128b57ffa6a7cc6bc449ae4de6927122d5..3799ba23639b9579b43d4e040819c6805f7bf937 100644
--- a/Assets/Stages/ValidationSets/TechDemo B_val.JSON
+++ b/Assets/Stages/ValidationSets/TechDemo B_val.JSON
@@ -1 +1 @@
-[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}]
\ No newline at end of file
+[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}]
\ No newline at end of file
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 681b79cabf99eb55d1333b469a01b2d9e37257cb..0a74b62c402f2c5273503b05534a6f733b7d29e2 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -27,10 +27,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0
flags: 0
RecentlyUsedScenePath-7:
- value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
+ value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
flags: 0
RecentlyUsedScenePath-8:
- value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
+ value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512