diff --git a/Assets/Stages/TechDemo B.JSON b/Assets/Stages/TechDemo B.JSON index 51150b78866c24b1ac7e6b9edb8f188e43ab606f..44549d720d83fd21ef1f979673c67275fa4b1c9a 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":{"TechDemo B_save_0":{"solved":false,"date":-8585673497204150468,"seconds":55.357247404026566,"name":"TechDemo B_save_0"},"TechDemo B_save_1":{"solved":false,"date":-8585673490728461998,"seconds":78.191550506559,"name":"TechDemo B_save_1"},"TechDemo B_save_3":{"solved":true,"date":-8585673449592354048,"seconds":79.800666006110987,"name":"TechDemo B_save_3"},"TechDemo B_save_4":{"solved":true,"date":-8585673446781321879,"seconds":301.22462983053629,"name":"TechDemo B_save_4"},"TechDemo B_save_2":{"solved":true,"date":-8585673098702330839,"seconds":319.15686133008921,"name":"TechDemo B_save_2"}},"player_record":{"solved":true,"date":-8585673098887035230,"seconds":319.15686133008921,"name":"TechDemo B_save"}} \ 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":{"TechDemo B_save_0":{"solved":false,"date":-8585673497204150468,"seconds":55.357247404026566,"name":"TechDemo B_save_0"},"TechDemo B_save_1":{"solved":false,"date":-8585673490728461998,"seconds":78.191550506559,"name":"TechDemo B_save_1"},"TechDemo B_save_3":{"solved":true,"date":-8585673449592354048,"seconds":79.800666006110987,"name":"TechDemo B_save_3"},"TechDemo B_save_4":{"solved":true,"date":-8585673446781321879,"seconds":301.22462983053629,"name":"TechDemo B_save_4"}},"player_record":{"solved":true,"date":-8585673072203914289,"seconds":301.22462983053629,"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 e3c1ee51642d463a18d942618b279ace9b6629cc..5652977abf4fd9628f52c63bc0bc43b5cc1650c1 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?fact114","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?fact115","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact114","Pid2":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact115","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?fact116","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact114":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact115":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact116":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact114","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact115","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact116","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/integrationtests?SampleSituationSpace/Root?fact225","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?fact226","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact225","Pid2":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact226","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?fact227","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact225":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact226":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact227":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact225","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact226","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact227","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 f27b90d77f3f992424af5ef02763bca86167a43a..3ef67d149811cc4e0adff47d22df59e993fee72a 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?fact116"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact116"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}] \ No newline at end of file +[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact227"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact227"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}] \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index ed355067501ec00f317ccdd16d47f4d9c3acbfaf..aa612daa8e00f34615d3b923b57ca3918db58623 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,10 +4,10 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "3.7.5", "com.unity.analytics": "3.6.11", - "com.unity.collab-proxy": "1.9.0", + "com.unity.collab-proxy": "1.11.2", "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.11", - "com.unity.ide.vscode": "1.2.3", + "com.unity.ide.vscode": "1.2.4", "com.unity.multiplayer-hlapi": "1.0.8", "com.unity.nuget.newtonsoft-json": "2.0.0", "com.unity.probuilder": "4.2.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ec0f115c7095eaed356d2f3f10fa0ac6d84b2180..80c4ae276b7eff43b49220d262bf3927ffc8d5b6 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -31,7 +31,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.9.0", + "version": "1.11.2", "depth": 0, "source": "registry", "dependencies": {}, @@ -63,7 +63,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 565025152d1379cdfd30614c97f415ba2e1e926c..cec2ec90f61d57ca79cbee5f7ec74e925da43da8 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.18f1 -m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c) +m_EditorVersion: 2020.3.20f1 +m_EditorVersionWithRevision: 2020.3.20f1 (41c4e627c95f)