Commit c334046c authored by Samantha Straka's avatar Samantha Straka 💬
Browse files

can save logfiles in a build. Just add LogFiles Folder to Ads_Data after building.

parent 8052c53a
fileFormatVersion: 2
guid: 65268a66f33c5d7418d1a2956921d0e4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -466,6 +466,7 @@ RectTransform:
- {fileID: 1026239189}
- {fileID: 156021207}
- {fileID: 911440790}
- {fileID: 511789707}
m_Father: {fileID: 164710334}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -727,6 +728,7 @@ MonoBehaviour:
vpnummer: {fileID: 104395351}
text: {fileID: 361395110}
desktopVR: {fileID: 911440791}
test: {fileID: 511789705}
--- !u!114 &164710331
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -921,7 +923,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -933,7 +935,7 @@ MonoBehaviour:
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
......@@ -958,7 +960,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 361395109}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -28}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 104395348}
......@@ -966,7 +968,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: 0, y: -0.5}
m_AnchoredPosition: {x: 0, y: -2.2}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &366605829
......@@ -1217,6 +1219,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 493964554}
m_CullTransparentMesh: 0
--- !u!1 &511789704
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 511789707}
- component: {fileID: 511789706}
- component: {fileID: 511789705}
m_Layer: 5
m_Name: test
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &511789705
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 511789704}
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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
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: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!222 &511789706
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 511789704}
m_CullTransparentMesh: 0
--- !u!224 &511789707
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 511789704}
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: 112913428}
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: 0, y: 269.1}
m_SizeDelta: {x: 1000, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &526158248
GameObject:
m_ObjectHideFlags: 0
......
......@@ -31,7 +31,9 @@ public class GameManager : MonoBehaviour
private bool allCubesSortedRight = false;
private int rightCubes = 0;
public GameObject smallAngleModerator;
int condition; //0 is no brand, 1 is poster brand, 2 is puzzle brand, 3 is audio brand
// Start is called before the first frame update
//int numberOfcondition = 8; //the number of the condition. Goes up when a puzzle is solved
......@@ -82,7 +84,8 @@ public class GameManager : MonoBehaviour
{
Shuffle(adconditions);
Shuffle(distractorconditions);
//first Condition is a random condition out of the condition List
// print(conditionOrder.Count);
lastCondition = false;
......@@ -108,6 +111,20 @@ public class GameManager : MonoBehaviour
}
public static void Shuffle(List <string> ts)
{
var count = ts.Count;
var last = count - 1;
for (var i = 0; i < last; ++i)
{
var r = UnityEngine.Random.Range(i, count);
var tmp = ts[i];
ts[i] = ts[r];
ts[r] = tmp;
}
}
public bool puzzleSolved()
{
foreach (GameObject c in cubes)
......@@ -368,7 +385,8 @@ public class GameManager : MonoBehaviour
public void WriteLog()
{
logfile.Add("Endtime" + System.DateTime.Now.ToString("HH:mm:ss:fff"));
StreamWriter sw = new StreamWriter("Assets/LogFiles/" + StartScript.VPNummer);
StreamWriter sw = new StreamWriter(Application.dataPath +"/LogFiles/" + StartScript.VPNummer);
print("Writing Data...");
for (int i = 0; i < logfile.Count; i++)
......@@ -378,6 +396,6 @@ public class GameManager : MonoBehaviour
}
sw.Close();
print("Writing Done");
Application.Quit();
}
}
......@@ -14,6 +14,7 @@ public class StartScript : MonoBehaviour
public InputField vpnummer;
public Text text;
public Button desktopVR;
public Text test;
// Start is called before the first frame update
......@@ -28,6 +29,7 @@ public class StartScript : MonoBehaviour
// Update is called once per frame
void Update()
{
test.text = Application.dataPath;
}
void VRStart()
......
......@@ -35,6 +35,9 @@ GraphicsSettings:
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......
......@@ -4,7 +4,7 @@
UnityConnectSettings:
m_ObjectHideFlags: 0
serializedVersion: 1
m_Enabled: 0
m_Enabled: 1
m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment