From 3abdbcdabc3218deb504a7c5cbf08fb5cfacef15 Mon Sep 17 00:00:00 2001
From: Richard Marcus <richard.marcus@fau.de>
Date: Wed, 1 Apr 2020 00:37:52 +0200
Subject: [PATCH] old server again
---
Assets/StartScreen.unity | 16 ++--
Assets/StartServer.cs | 27 ++++++-
Assets/TreeWorld_02.unity | 159 ++++++++++++++++++++++++++++++++++++++
Assets/start.BAT | 2 -
Assets/start.BAT.meta | 7 --
5 files changed, 190 insertions(+), 21 deletions(-)
delete mode 100644 Assets/start.BAT
delete mode 100644 Assets/start.BAT.meta
diff --git a/Assets/StartScreen.unity b/Assets/StartScreen.unity
index aea7cd80..fdd8e129 100644
--- a/Assets/StartScreen.unity
+++ b/Assets/StartScreen.unity
@@ -637,7 +637,7 @@ RectTransform:
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: -210, y: 157}
+ m_AnchoredPosition: {x: -294, y: 140}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1809880658
@@ -658,8 +658,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 'Your task is to measure the height of a tree with the help of gadgets and
- trigonometry.
+ m_text: 'You will find yourself in a virtual forest-like environment. Your task
+ is to measure the height of a tree with the help of gadgets and trigonometry.
This game was built with the FrameIT method, which proposes the use of Knowledge
@@ -714,7 +714,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: 62
+ m_firstOverflowCharacterIndex: 77
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
@@ -735,13 +735,13 @@ MonoBehaviour:
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: -193.95554, y: 0, z: -440.0515, w: 0}
+ m_margin: {x: -193.95554, y: 0, z: -491.03467, w: 0}
m_textInfo:
textComponent: {fileID: 1809880658}
- characterCount: 366
+ characterCount: 427
spriteCount: 0
- spaceCount: 64
- wordCount: 62
+ spaceCount: 73
+ wordCount: 71
linkCount: 0
lineCount: 9
pageCount: 1
diff --git a/Assets/StartServer.cs b/Assets/StartServer.cs
index 593780ee..b4b8c908 100644
--- a/Assets/StartServer.cs
+++ b/Assets/StartServer.cs
@@ -82,14 +82,30 @@ IEnumerator ServerRoutine()
{
UnityEngine.Debug.Log("no running server");
- string command = "\"" + Application.streamingAssetsPath + "\"/start.BAT " + "\"" + Application.streamingAssetsPath + "\"";
- command = command.Replace("/", @"\");
- command = "\"" + command + "\"";
- UnityEngine.Debug.Log(command);
+
+
// int exitCode;
ProcessStartInfo processInfo;
Process process;
+
+#if UNITY_STANDALONE_LINUX
+
+ ProcessStartInfo proc = new ProcessStartInfo();
+ proc.FileName = "xdg-open";
+ proc.WorkingDirectory = Application.streamingAssetsPath;
+ proc.Arguments = "startServer.sh";
+ proc.WindowStyle = ProcessWindowStyle.Minimized;
+ proc.CreateNoWindow = true;
+ process = Process.Start(proc);
+
+#else
+ string command = "";
+ command = "\"" + Application.streamingAssetsPath + "\"/start.BAT " + "\"" + Application.streamingAssetsPath + "\"";
+ command = command.Replace("/", @"\");
+ command = "\"" + command + "\"";
+
+
processInfo = new ProcessStartInfo("cmd.exe", "/c " + command);
processInfo.CreateNoWindow = false;
processInfo.UseShellExecute = true;
@@ -97,7 +113,10 @@ IEnumerator ServerRoutine()
// processInfo.RedirectStandardError = true;
//processInfo.RedirectStandardOutput = true;
+
+
process = Process.Start(processInfo);
+#endif
yield return null;
while (true)
diff --git a/Assets/TreeWorld_02.unity b/Assets/TreeWorld_02.unity
index e386629b..009592ed 100644
--- a/Assets/TreeWorld_02.unity
+++ b/Assets/TreeWorld_02.unity
@@ -21602,6 +21602,164 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2047117829}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1050648769
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1050648770}
+ - component: {fileID: 1050648772}
+ - component: {fileID: 1050648771}
+ m_Layer: 5
+ m_Name: Gadgets (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1050648770
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1050648769}
+ 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: 1404130503}
+ m_RootOrder: 5
+ 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: 597, y: -485}
+ m_SizeDelta: {x: 600, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1050648771
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1050648769}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Make sure to use the correct ordering when selecting points for distances
+ and angles!
+
+ Hint: Top>Ground>Root'
+ 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: 4278391957
+ m_fontColor: {r: 0.5849056, g: 0.07925822, b: 0.013794942, 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_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 36
+ m_fontSizeBase: 36
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 258
+ 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_firstOverflowCharacterIndex: 21
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 158.00317, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 1050648771}
+ characterCount: 107
+ spriteCount: 0
+ spaceCount: 15
+ wordCount: 18
+ linkCount: 0
+ lineCount: 5
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1050648772
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1050648769}
+ m_CullTransparentMesh: 0
--- !u!4 &1052836966 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8783306491909106419, guid: f02116c209ecd9e488fc4d2cd8996133,
@@ -29184,6 +29342,7 @@ RectTransform:
- {fileID: 214639563}
- {fileID: 1942964534}
- {fileID: 1848813038}
+ - {fileID: 1050648770}
m_Father: {fileID: 75251955}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/start.BAT b/Assets/start.BAT
deleted file mode 100644
index 37fef73e..00000000
--- a/Assets/start.BAT
+++ /dev/null
@@ -1,2 +0,0 @@
-SET PATH= "%~1"\jdk-13.0.2\bin;%PATH%
-java -jar "%~1"\FrameIt-MMT-Server.jar "%~1"\mathhub frameworld 8081
diff --git a/Assets/start.BAT.meta b/Assets/start.BAT.meta
deleted file mode 100644
index 4176c5e1..00000000
--- a/Assets/start.BAT.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0ff74ce5a3169aa4985865a28dd259d0
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
--
GitLab