diff --git a/Assets/Scripts/GlobalBehaviour.cs b/Assets/Scripts/GlobalBehaviour.cs
index af7d23928a141de48259f9fe25010ebf88adf6a7..9de3f3b6e8d29ae9fe8f91b53d3c84ad6d81f71a 100644
--- a/Assets/Scripts/GlobalBehaviour.cs
+++ b/Assets/Scripts/GlobalBehaviour.cs
@@ -36,7 +36,7 @@ public class GlobalBehaviour : MonoBehaviour
void Awake()
{
- GenerateDemoFiles.GenerateAll();
+ //GenerateDemoFiles.GenerateAll();
hintAnimationStartColor = _hintAnimationStartColor;
hintAnimationEndColor = _hintAnimationEndColor;
diff --git a/Assets/Scripts/Loading/StreamingAssetLoader.cs b/Assets/Scripts/Loading/StreamingAssetLoader.cs
index cfc4b5d83a353fe53f67ad40ed75bd1f0cfc50b9..fcbf5bd36bec0e1143c1dc9e7a76699564f530d5 100644
--- a/Assets/Scripts/Loading/StreamingAssetLoader.cs
+++ b/Assets/Scripts/Loading/StreamingAssetLoader.cs
@@ -15,6 +15,12 @@
public static class StreamingAssetLoader
{
+ public static string StreamToDataPath_Folder = "StreamToDataPath";
+ public static string StreamToDataPath_Folder_Cookie = "cookie_dataPath.txt";
+ public static string StreamToPersistentDataPath_Folder = "StreamToPersistentDataPath";
+ public static string StreamToPersistentDataPath_Folder_Cookie = "cookie_persistentDataPath.txt";
+ public static string StreamToDataPath_withHandler_Folder = "StreamToDataPath_withHandler";
+
//""
@@ -53,17 +59,37 @@ public static class StreamingAssetLoader
public static string file_10_path = "";
public static string file_10 = "";
+ //public static ID_toPath toPath = ID_toPath.DataPath;
+ public enum ID_toPath
+ {
+ DataPath = 0,
+ PersistentDataPath = 1,
+
+ }
+
- public static bool checkPDP()
+ public static bool checkPersistentDataPath()
+ {
+ return checkFileExistence(Application.persistentDataPath, StreamToPersistentDataPath_Folder_Cookie);
+ }
+ public static bool checkDataPath()
+ {
+ return checkFileExistence(Application.dataPath, StreamToDataPath_Folder_Cookie);
+ }
+ public static bool checkFileExistence(string sourcepath, string filename)
{
- string filePath = Application.persistentDataPath + "/Config/Network.json";
+ string filePath = sourcepath;
+ filePath = Path.Combine(filePath, filename);
if (System.IO.File.Exists(filePath))
{
+ Debug.Log("FileFound: " + filePath );
return true;
}
+ Debug.Log("NoFileFound: " + filePath);
return false;
+
}
@@ -105,11 +131,15 @@ public static void NetworkJSON_Save()
}
public static DirectoryInfo SafeCreateDirectory(string path)
{
+
//Generate if you don't check if the directory exists
if (Directory.Exists(path))
{
+ //Debug.Log(path + " exists");
return null;
+
}
+ //Debug.Log(path + " create");
return Directory.CreateDirectory(path);
}
@@ -122,6 +152,11 @@ public static void ResetPlayerConfig()
RereadFiles_PersistentDataPath();
NetworkJSON_Load();
}
+ public static void ResetPersistentDataPath()
+ {
+ RereadFiles_PersistentDataPath();
+ NetworkJSON_Load();
+ }
public static void ResetDataPath()
{
@@ -141,23 +176,81 @@ public static void ResetStreamingAsset()
public static void RereadFiles_PersistentDataPath()
{
- RereadFileUWR(StreamingAssetLoader.file_8_path, StreamingAssetLoader.file_8, 1);
- RereadFileUWR(StreamingAssetLoader.file_1_path, StreamingAssetLoader.file_1, 1);
+ //RereadFileUWR(StreamingAssetLoader.file_8_path, StreamingAssetLoader.file_8, ID_toPath.PersistentDataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_1_path, StreamingAssetLoader.file_1, ID_toPath.PersistentDataPath);
+ //----
+ string rootPath = Path.Combine(Application.streamingAssetsPath, StreamToPersistentDataPath_Folder);
+ string targetFolder = Application.persistentDataPath;
+ ReReadFiles(rootPath, targetFolder);
+
+
+
}
public static void RereadFiles_DataPath()
+ {
+ string rootPath = Path.Combine(Application.streamingAssetsPath, StreamToDataPath_Folder);
+ string targetFolder = Application.dataPath;
+ ReReadFiles(rootPath, targetFolder);
+ RereadFiles_DataPath_withHandler();
+ }
+
+ public static void RereadFiles_DataPath_withHandler()
+ {
+ //RereadFileUWR(StreamingAssetLoader.file_2_path, StreamingAssetLoader.file_2, ID_toPath.DataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_3_path, StreamingAssetLoader.file_3, ID_toPath.DataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_4_path, StreamingAssetLoader.file_4, ID_toPath.DataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_5_path, StreamingAssetLoader.file_5, ID_toPath.DataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_6_path, StreamingAssetLoader.file_6, ID_toPath.DataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_7_path, StreamingAssetLoader.file_7, ID_toPath.DataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_9_path, StreamingAssetLoader.file_9, ID_toPath.DataPath);
+ //RereadFileUWR(StreamingAssetLoader.file_10_path, StreamingAssetLoader.file_10, ID_toPath.DataPath);
+
+ string rootPath = Path.Combine(Application.streamingAssetsPath, StreamToDataPath_withHandler_Folder);
+ string targetFolder = Application.dataPath;
+ if (CommunicationEvents.Opsys == OperationSystem.Android)
+ {
+ targetFolder = Application.persistentDataPath;
+ }
+
+ ReReadFiles(rootPath, targetFolder);
+ }
+
+ public static void ReReadFiles(string rootPath, string targetFolder)//ID_toPath PathHandler)
{
- RereadFileUWR(StreamingAssetLoader.file_2_path, StreamingAssetLoader.file_2, 0);
- RereadFileUWR(StreamingAssetLoader.file_3_path, StreamingAssetLoader.file_3, 0);
- RereadFileUWR(StreamingAssetLoader.file_4_path, StreamingAssetLoader.file_4, 0);
- RereadFileUWR(StreamingAssetLoader.file_5_path, StreamingAssetLoader.file_5, 0);
- RereadFileUWR(StreamingAssetLoader.file_6_path, StreamingAssetLoader.file_6, 0);
- RereadFileUWR(StreamingAssetLoader.file_7_path, StreamingAssetLoader.file_7, 0);
- RereadFileUWR(StreamingAssetLoader.file_9_path, StreamingAssetLoader.file_9, 0);
- RereadFileUWR(StreamingAssetLoader.file_10_path, StreamingAssetLoader.file_10, 0);
+
+ //----
+ string dir = "";
+ DirectoryInfo dirInfo = new DirectoryInfo(rootPath);
+ FileInfo[] Files = dirInfo.GetFiles("*");
+ foreach (FileInfo file in Files)
+ {
+ if (file.Name.Contains(".meta")) { continue; };
+ RereadFileWithUnityWebRequest(rootPath, dir, file.Name, targetFolder);
+ }
+ //----
+ string[] dirs = Directory.GetDirectories(rootPath, "*", SearchOption.AllDirectories);
+ foreach (string dir_fullpath in dirs)
+ {
+ int pos = dir_fullpath.IndexOf(rootPath);
+ int endpos = pos;
+ if (dir_fullpath.Length > (rootPath.Length + 1)) { endpos = rootPath.Length + 1; } else { endpos = rootPath.Length; }
+ dir = dir_fullpath.Remove(pos, endpos);
+ dirInfo = new DirectoryInfo(dir_fullpath);
+ Files = dirInfo.GetFiles("*");
+
+ foreach (FileInfo file in Files)
+ {
+ if (file.Name.Contains(".meta")) { continue; };
+ RereadFileWithUnityWebRequest(dir_fullpath, dir, file.Name, targetFolder);
+ }
+ }
}
- public static void NetworkJSON_Load()
+
+
+
+ public static void NetworkJSON_Load()
{
var reader = new StreamReader(Application.persistentDataPath + "/Config/Network.JSON");
string json = reader.ReadToEnd();
@@ -243,17 +336,14 @@ public static void NetworkJSON_Load()
}
- public static void RereadFileUWR(string pathfolders, string fileName, int toMainpath)
+ public static void RereadFileUWR(string pathfolders, string fileName, ID_toPath toMainpath)
{
- if (fileName == "")
- {
- return;
- }
+ if (fileName == ""){ return; }
+ string sourcePath = Path.Combine(Application.streamingAssetsPath, pathfolders);
string destpathf = pathfolders;
string destname = fileName;
- string sourcePath = Path.Combine(Application.streamingAssetsPath, pathfolders);
sourcePath = Path.Combine(sourcePath, fileName);
using var loadingRequest = UnityWebRequest.Get(sourcePath);
loadingRequest.SendWebRequest();
@@ -271,25 +361,87 @@ public static void RereadFileUWR(string pathfolders, string fileName, int toMain
else
{
//copies and unpacks file from apk to persistentDataPath where it can be accessed
- string destinationPath = "";
- if (toMainpath == 0 && CommunicationEvents.Opsys != OperationSystem.Android) { destinationPath = Path.Combine(Application.dataPath, destpathf); }
+ string destinationPath;
+ if (toMainpath == ID_toPath.DataPath && CommunicationEvents.Opsys != OperationSystem.Android) { destinationPath = Path.Combine(Application.dataPath, destpathf); }
else
{
destinationPath = Path.Combine(Application.persistentDataPath, destpathf);
}
- if (Directory.Exists(destinationPath) == false)
+ SafeCreateDirectory(destinationPath);
+ File.WriteAllBytes(Path.Combine(destinationPath, destname), loadingRequest.downloadHandler.data);
+
+
+
+
+ }
+ }
+
+ public static void RereadFileWithUnityWebRequest(string sourcePath1, string pathfolders, string fileName, string targetFolder)
+ {
+
+
+ if (fileName == "") { Debug.Log("no File"); return; }
+ string destpathf = pathfolders;
+ string destname = fileName;
+
+
+ string sourcePath = Path.Combine(sourcePath1, fileName);
+ using var loadingRequest = UnityWebRequest.Get(sourcePath);
+ loadingRequest.SendWebRequest();
+ while (!loadingRequest.isDone)
+ {
+ if (loadingRequest.result == UnityWebRequest.Result.ConnectionError || loadingRequest.result == UnityWebRequest.Result.ProtocolError)
{
- Directory.CreateDirectory(destinationPath);
+ break;
}
- File.WriteAllBytes(Path.Combine(destinationPath, destname), loadingRequest.downloadHandler.data);
+ }
+ if (loadingRequest.result == UnityWebRequest.Result.ConnectionError || loadingRequest.result == UnityWebRequest.Result.ProtocolError)
+ {
+ Debug.Log("ConnectionError");
+ }
+ else
+ {
+
+ string destinationPath = Path.Combine(targetFolder, destpathf);
+
+ //Debug.Log("ss" + destinationPath + "," + Application.persistentDataPath + "," + Application.dataPath + "," + destpathf + " , " + destname);
+
+ SafeCreateDirectory(destinationPath);
+ File.WriteAllBytes(Path.Combine(destinationPath, destname), loadingRequest.downloadHandler.data);
+ //Debug.Log("ss" + destinationPath);
}
}
+ //Path.Combine() but without the Path.IsPathRooted()
+ public static string CombineTwoPaths(string path1, string path2)
+ {
+ if (path1 == null || path2 == null)
+ {
+ throw new ArgumentNullException((path1 == null) ? "path1" : "path2");
+ }
+ //Path.CheckInvalidPathChars(path1, false);
+ //Path.CheckInvalidPathChars(path2, false);
+ if (path2.Length == 0)
+ {
+ return path1;
+ }
+ if (path1.Length == 0)
+ {
+ return path2;
+ }
+ char c = path1[path1.Length - 1];
+ if (c != Path.DirectorySeparatorChar && c != Path.AltDirectorySeparatorChar && c != Path.VolumeSeparatorChar)
+ {
+ return path1 + Path.DirectorySeparatorChar + path2;
+ }
+ return path1 + path2;
+ }
+
//WWW has been replaced with UnityWebRequest.
/*
diff --git a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
index 642c394be521eeda4fa0d8d7e8efed645a65e0ea..a56114926faa29493487b74871bcf8f489e28736 100644
--- a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
@@ -64,10 +64,10 @@ void start2_CheckOS_CheckConfig()
- if (!checkPDP())
+ if (!checkPersistentDataPath())
{
- ResetStreamingAsset();
+ ResetPersistentDataPath();
switch (Opsys)
{
case OperationSystem.Windows:
@@ -82,18 +82,20 @@ void start2_CheckOS_CheckConfig()
NetworkJSON_Save();
}
-
NetworkJSON_Load();
checkOS();
- ResetDataPath();
+ if (!checkDataPath())
+ {
+ ResetDataPath();
+ }
setMouse();
break;
case OperationSystem.Android:
- if (!checkPDP())
+ if (!checkPersistentDataPath())
{
- ResetStreamingAsset();
+ ResetPersistentDataPath();
switch (Opsys)
{
case OperationSystem.Windows:
@@ -105,22 +107,24 @@ void start2_CheckOS_CheckConfig()
default:
break;
}
+
NetworkJSON_Save();
}
NetworkJSON_Load();
checkOS();
- ResetDataPath();
+ if (!checkDataPath())
+ {
+ ResetDataPath();
+ };
setMouse();
-
break;
+
default:
- setMouse();
- if (!checkPDP())
+ if (!checkPersistentDataPath())
{
- ResetStreamingAsset();
-
+ ResetPersistentDataPath();
switch (Opsys)
{
case OperationSystem.Windows:
@@ -132,11 +136,15 @@ void start2_CheckOS_CheckConfig()
default:
break;
}
+
NetworkJSON_Save();
}
-
NetworkJSON_Load();
checkOS();
+ if (!checkDataPath())
+ {
+ ResetDataPath();
+ }
setMouse();
break;
}
diff --git a/Assets/Stages/TechDemo A.JSON.meta b/Assets/Stages/TechDemo A.JSON.meta
index f8998aac04795c53235dc53ed958bec5bd07d6a0..07a41910efa4288ef8b7d958e34c7dc717b02356 100644
--- a/Assets/Stages/TechDemo A.JSON.meta
+++ b/Assets/Stages/TechDemo A.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 2980c8ebfb250ef4e95c96619554751f
+guid: 218d2a96656c0084bbe511b0b0338d01
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/Stages/TechDemo B.JSON.meta b/Assets/Stages/TechDemo B.JSON.meta
index 0435d1a4e9c85faabe1baafc0368a395fa6f6a28..3f314c0213c591eed59a7462f8d0f274a865e3bb 100644
--- a/Assets/Stages/TechDemo B.JSON.meta
+++ b/Assets/Stages/TechDemo B.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: daaacf33c8c5ad042b89fd48f6cd5980
+guid: 61155bac0d422bd42bba9368cf492aa6
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/Stages/ValidationSets.meta b/Assets/Stages/ValidationSets.meta
index ad54ce5b72374f0e9fadfc549f9adb0647c3469e..96e9abd97e93601b1b653ab708c3c8d36062e563 100644
--- a/Assets/Stages/ValidationSets.meta
+++ b/Assets/Stages/ValidationSets.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: adcbcdc21be4b2a4a85d96580503e38b
+guid: 63b411c1287cd9e4d891bf68fb264216
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Stages/ValidationSets/TechDemo A_val.JSON.meta b/Assets/Stages/ValidationSets/TechDemo A_val.JSON.meta
index e82db1a4aafa5502d34c9fc11fbb12060afb7d12..adf8b6522ddc22fa392676862bdd70e2f84f5b46 100644
--- a/Assets/Stages/ValidationSets/TechDemo A_val.JSON.meta
+++ b/Assets/Stages/ValidationSets/TechDemo A_val.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: c1f88002b210dd4449cbaf8b9bb46003
+guid: a68a50c4fbf67b04e98165c21d086ea4
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/Stages/ValidationSets/TechDemo B_val.JSON.meta b/Assets/Stages/ValidationSets/TechDemo B_val.JSON.meta
index 7f8e7e62582d45f9128d1cf112be4e6c377d6d4f..8f86088c26909612d48575ab92a4fd8d00387f45 100644
--- a/Assets/Stages/ValidationSets/TechDemo B_val.JSON.meta
+++ b/Assets/Stages/ValidationSets/TechDemo B_val.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 8fe9258a5917e3c4f8935875a478ed20
+guid: 9e94bd4e978e956409a167f0b9d7eef7
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/StreamingAssets/README_StreamingAssets.md b/Assets/StreamingAssets/README_StreamingAssets.md
new file mode 100644
index 0000000000000000000000000000000000000000..3a645bdb2da6e6f52c541ea44c085cf46b5d5b0b
--- /dev/null
+++ b/Assets/StreamingAssets/README_StreamingAssets.md
@@ -0,0 +1,16 @@
+## StreamToDataPath:
+All files and subfolders will be copied to DataPath.
+Exception: Files with "meta" in the name.
+
+## StreamToPersistentDataPath:
+All files and subfolders will be copied to PersistentDataPath.
+Exception: Files with "meta" in the name.
+
+
+## StreamToDataPath_withHandler:
+If Operatingsystem is Android, then:
+ - All files and subfolders will be copied to PersistentDataPath.
+ - Exception: Files with "meta" in the name.
+If Operatingsystem is other than Android, then:
+ - All files and subfolders will be copied to DataPath.
+ - Exception: Files with "meta" in the name.
diff --git a/Assets/StreamingAssets/Stages_0107.meta b/Assets/StreamingAssets/Stages_freshGenerated.meta
similarity index 77%
rename from Assets/StreamingAssets/Stages_0107.meta
rename to Assets/StreamingAssets/Stages_freshGenerated.meta
index 0f8ddc74efa91903bdefe47d91f41807d61085fd..8870f6a70976a891ff9e274d488a67a57e0c39da 100644
--- a/Assets/StreamingAssets/Stages_0107.meta
+++ b/Assets/StreamingAssets/Stages_freshGenerated.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 48d49f72b4ec2504b80c20e982d69f8a
+guid: 131e4927e04391e4782e51617403b381
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/StreamingAssets/StreamToDataPath.meta b/Assets/StreamingAssets/StreamToDataPath.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f8f49fa4fd1224350db5aaacd818d01aa430fb40
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToDataPath.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c31b390bc26b0348a244891f573c7b5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/Stages.meta b/Assets/StreamingAssets/StreamToDataPath/Stages.meta
similarity index 77%
rename from Assets/StreamingAssets/Stages.meta
rename to Assets/StreamingAssets/StreamToDataPath/Stages.meta
index 95c54355b4a61a78d5b15944064050bb6cbb671e..c0a4364c1968a3ee0ef62ddfdc186f466782207c 100644
--- a/Assets/StreamingAssets/Stages.meta
+++ b/Assets/StreamingAssets/StreamToDataPath/Stages.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: ff74962d43564f24da42a6c1fc0afd04
+guid: ed14a0e8d3597d34aa385c91f48d882b
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/StreamingAssets/StreamToDataPath/cookie_dataPath.txt b/Assets/StreamingAssets/StreamToDataPath/cookie_dataPath.txt
new file mode 100644
index 0000000000000000000000000000000000000000..56a6051ca2b02b04ef92d5150c9ef600403cb1de
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToDataPath/cookie_dataPath.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/Assets/StreamingAssets/StreamToDataPath/cookie_dataPath.txt.meta b/Assets/StreamingAssets/StreamToDataPath/cookie_dataPath.txt.meta
new file mode 100644
index 0000000000000000000000000000000000000000..a2bc960ca26ec7288e074b532a0d049864798924
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToDataPath/cookie_dataPath.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b2295653dd0acd1478dbcf793ac8762c
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8b66319c4f79a6517b195cfee69a5edec99291d3
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToDataPath_withHandler.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4b09aaecee4db1449faa23b38381414
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages.meta
new file mode 100644
index 0000000000000000000000000000000000000000..6305ed3e7d6458449a178a3db74b2bae22be633f
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 08ca77ca3ac12c146ba9bfe942162be8
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/Stages/TechDemo A.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON
similarity index 100%
rename from Assets/StreamingAssets/Stages/TechDemo A.JSON
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON
diff --git a/Assets/StreamingAssets/Stages/TechDemo A.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta
similarity index 75%
rename from Assets/StreamingAssets/Stages/TechDemo A.JSON.meta
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta
index f8998aac04795c53235dc53ed958bec5bd07d6a0..07a41910efa4288ef8b7d958e34c7dc717b02356 100644
--- a/Assets/StreamingAssets/Stages/TechDemo A.JSON.meta
+++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 2980c8ebfb250ef4e95c96619554751f
+guid: 218d2a96656c0084bbe511b0b0338d01
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/StreamingAssets/Stages/TechDemo B.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON
similarity index 100%
rename from Assets/StreamingAssets/Stages/TechDemo B.JSON
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON
diff --git a/Assets/StreamingAssets/Stages/TechDemo B.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta
similarity index 75%
rename from Assets/StreamingAssets/Stages/TechDemo B.JSON.meta
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta
index 0435d1a4e9c85faabe1baafc0368a395fa6f6a28..3f314c0213c591eed59a7462f8d0f274a865e3bb 100644
--- a/Assets/StreamingAssets/Stages/TechDemo B.JSON.meta
+++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: daaacf33c8c5ad042b89fd48f6cd5980
+guid: 61155bac0d422bd42bba9368cf492aa6
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/StreamingAssets/Stages/ValidationSets.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets.meta
similarity index 77%
rename from Assets/StreamingAssets/Stages/ValidationSets.meta
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets.meta
index ad54ce5b72374f0e9fadfc549f9adb0647c3469e..96e9abd97e93601b1b653ab708c3c8d36062e563 100644
--- a/Assets/StreamingAssets/Stages/ValidationSets.meta
+++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: adcbcdc21be4b2a4a85d96580503e38b
+guid: 63b411c1287cd9e4d891bf68fb264216
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/StreamingAssets/Stages/ValidationSets/TechDemo A_val.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo A_val.JSON
similarity index 100%
rename from Assets/StreamingAssets/Stages/ValidationSets/TechDemo A_val.JSON
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo A_val.JSON
diff --git a/Assets/StreamingAssets/Stages/ValidationSets/TechDemo A_val.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo A_val.JSON.meta
similarity index 75%
rename from Assets/StreamingAssets/Stages/ValidationSets/TechDemo A_val.JSON.meta
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo A_val.JSON.meta
index e82db1a4aafa5502d34c9fc11fbb12060afb7d12..adf8b6522ddc22fa392676862bdd70e2f84f5b46 100644
--- a/Assets/StreamingAssets/Stages/ValidationSets/TechDemo A_val.JSON.meta
+++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo A_val.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: c1f88002b210dd4449cbaf8b9bb46003
+guid: a68a50c4fbf67b04e98165c21d086ea4
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/StreamingAssets/Stages/ValidationSets/TechDemo B_val.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo B_val.JSON
similarity index 100%
rename from Assets/StreamingAssets/Stages/ValidationSets/TechDemo B_val.JSON
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo B_val.JSON
diff --git a/Assets/StreamingAssets/Stages/ValidationSets/TechDemo B_val.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo B_val.JSON.meta
similarity index 75%
rename from Assets/StreamingAssets/Stages/ValidationSets/TechDemo B_val.JSON.meta
rename to Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo B_val.JSON.meta
index 7f8e7e62582d45f9128d1cf112be4e6c377d6d4f..8f86088c26909612d48575ab92a4fd8d00387f45 100644
--- a/Assets/StreamingAssets/Stages/ValidationSets/TechDemo B_val.JSON.meta
+++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets/TechDemo B_val.JSON.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 8fe9258a5917e3c4f8935875a478ed20
+guid: 9e94bd4e978e956409a167f0b9d7eef7
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath.meta b/Assets/StreamingAssets/StreamToPersistentDataPath.meta
new file mode 100644
index 0000000000000000000000000000000000000000..9e9c727a571fccddbe5bfe988d3241281584d752
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3520941a910c21e4ea26b432d9cfb6ff
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/Config.meta b/Assets/StreamingAssets/StreamToPersistentDataPath/Config.meta
similarity index 77%
rename from Assets/StreamingAssets/Config.meta
rename to Assets/StreamingAssets/StreamToPersistentDataPath/Config.meta
index d393ff1252da1263072a784492b21fea31e39679..93a39e2f89fb310ab661520144ef084c70393627 100644
--- a/Assets/StreamingAssets/Config.meta
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath/Config.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 19d00baa6e4bb9e43b364406180a1b00
+guid: f96ea8acaa559a74492a29de4098ca6d
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/StreamingAssets/Config/Network.JSON b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON
similarity index 100%
rename from Assets/StreamingAssets/Config/Network.JSON
rename to Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON
diff --git a/Assets/StreamingAssets/Config/Network.JSON.meta b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON.meta
similarity index 100%
rename from Assets/StreamingAssets/Config/Network.JSON.meta
rename to Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON.meta
diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath/cookie_persistentDataPath.txt b/Assets/StreamingAssets/StreamToPersistentDataPath/cookie_persistentDataPath.txt
new file mode 100644
index 0000000000000000000000000000000000000000..56a6051ca2b02b04ef92d5150c9ef600403cb1de
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath/cookie_persistentDataPath.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath/cookie_persistentDataPath.txt.meta b/Assets/StreamingAssets/StreamToPersistentDataPath/cookie_persistentDataPath.txt.meta
new file mode 100644
index 0000000000000000000000000000000000000000..64fe03d8ba09bdf460f21559beb10f847561ee34
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath/cookie_persistentDataPath.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 387038d9b729e4240bb2a1b25db9262d
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/scrolls.json b/Assets/StreamingAssets/StreamToPersistentDataPath/scrolls.json
similarity index 100%
rename from Assets/StreamingAssets/scrolls.json
rename to Assets/StreamingAssets/StreamToPersistentDataPath/scrolls.json
diff --git a/Assets/StreamingAssets/scrolls.json.meta b/Assets/StreamingAssets/StreamToPersistentDataPath/scrolls.json.meta
similarity index 74%
rename from Assets/StreamingAssets/scrolls.json.meta
rename to Assets/StreamingAssets/StreamToPersistentDataPath/scrolls.json.meta
index 4665eb1c42210200a9e2e27bc0f114a2a36431b0..26accb97ed8df6e280ba7a4515467e897547826e 100644
--- a/Assets/StreamingAssets/scrolls.json.meta
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath/scrolls.json.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 610110843770eb7468fad8b79ec7fdfa
+guid: 3fd389b6980cdc4468de6666706c2ba9
DefaultImporter:
externalObjects: {}
userData:
diff --git a/ProjectSettings/BurstAotSettings_WSAPlayer.json b/ProjectSettings/BurstAotSettings_WSAPlayer.json
new file mode 100644
index 0000000000000000000000000000000000000000..64de35e86f4d3b73c9b05d93600d7845f90cd415
--- /dev/null
+++ b/ProjectSettings/BurstAotSettings_WSAPlayer.json
@@ -0,0 +1,16 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "EnableBurstCompilation": true,
+ "EnableOptimisations": true,
+ "EnableSafetyChecks": false,
+ "EnableDebugInAllBuilds": false,
+ "CpuMinTargetX32": 0,
+ "CpuMaxTargetX32": 0,
+ "CpuMinTargetX64": 0,
+ "CpuMaxTargetX64": 0,
+ "CpuTargetsX32": 6,
+ "CpuTargetsX64": 72,
+ "OptimizeFor": 0
+ }
+}
diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
index 6a0b8ede35976d6af1b9648d0353a995eb31e28f..c409aa1a3c620da310848cb978e2a155feaf6bf9 100644
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -1,6 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_PixelRect:
+ serializedVersion: 2
+ x: 2783
+ y: 205
+ width: 640
+ height: 661
+ m_ShowMode: 0
+ m_Title: Build Settings
+ m_RootView: {fileID: 4}
+ m_MinSize: {x: 640, y: 601}
+ m_MaxSize: {x: 4000, y: 4021}
+ m_Maximized: 0
+--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +38,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
- x: 2249
- y: 302.5
- width: 1206
- height: 715
+ x: -1920
+ y: 43
+ width: 1920
+ height: 1037
m_ShowMode: 4
- m_Title:
- m_RootView: {fileID: 6}
+ m_Title: Game
+ m_RootView: {fileID: 9}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
- m_Maximized: 0
---- !u!114 &2
+ m_Maximized: 1
+--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -32,24 +56,74 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
- m_EditorHideFlags: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name: BuildPlayerWindow
+ m_EditorClassIdentifier:
+ m_Children: []
+ m_Position:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 640
+ height: 661
+ m_MinSize: {x: 640, y: 580}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_ActualView: {fileID: 15}
+ m_Panes:
+ - {fileID: 15}
+ m_Selected: 0
+ m_LastSelected: 0
+--- !u!114 &4
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 9}
- {fileID: 3}
+ m_Position:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 640
+ height: 661
+ m_MinSize: {x: 640, y: 601}
+ m_MaxSize: {x: 4000, y: 4021}
+ vertical: 0
+ controlID: 15
+--- !u!114 &5
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 1
+ m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Children:
+ - {fileID: 12}
+ - {fileID: 6}
m_Position:
serializedVersion: 2
x: 0
y: 30
- width: 1206
- height: 665
- m_MinSize: {x: 679, y: 492}
- m_MaxSize: {x: 14002, y: 14042}
+ width: 1920
+ height: 987
+ m_MinSize: {x: 300, y: 200}
+ m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 119
---- !u!114 &3
+ controlID: 136
+--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -64,18 +138,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 921
+ x: 1640
y: 0
- width: 285
- height: 665
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 13}
+ width: 280
+ height: 987
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_ActualView: {fileID: 17}
m_Panes:
- - {fileID: 13}
+ - {fileID: 17}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -92,16 +166,16 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 228
- height: 394
+ width: 623
+ height: 342
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 14}
+ m_ActualView: {fileID: 18}
m_Panes:
- - {fileID: 14}
+ - {fileID: 18}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &5
+--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -111,24 +185,24 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ProjectBrowser
+ m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 394
- width: 921
- height: 271
- m_MinSize: {x: 231, y: 271}
- m_MaxSize: {x: 10001, y: 10021}
- m_ActualView: {fileID: 12}
+ y: 342
+ width: 1640
+ height: 645
+ m_MinSize: {x: 101, y: 121}
+ m_MaxSize: {x: 4001, y: 4021}
+ m_ActualView: {fileID: 21}
m_Panes:
- - {fileID: 12}
- - {fileID: 17}
- m_Selected: 0
- m_LastSelected: 1
---- !u!114 &6
+ - {fileID: 16}
+ - {fileID: 21}
+ m_Selected: 1
+ m_LastSelected: 0
+--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -141,18 +215,22 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 7}
- - {fileID: 2}
- - {fileID: 8}
+ - {fileID: 10}
+ - {fileID: 5}
+ - {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 1206
- height: 715
+ width: 1920
+ height: 1037
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
---- !u!114 &7
+ m_UseTopView: 1
+ m_TopViewHeight: 30
+ m_UseBottomView: 1
+ m_BottomViewHeight: 20
+--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -169,14 +247,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1206
+ width: 1920
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
- m_LoadedToolbars: []
- m_MainToolbar: {fileID: 18}
- m_LastLoadedLayoutName: Default
---- !u!114 &8
+ m_LastLoadedLayoutName:
+--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -192,12 +268,12 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 695
- width: 1206
+ y: 1017
+ width: 1920
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
---- !u!114 &9
+--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -210,19 +286,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 10}
- - {fileID: 5}
+ - {fileID: 13}
+ - {fileID: 8}
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 921
- height: 665
- m_MinSize: {x: 403, y: 492}
- m_MaxSize: {x: 10001, y: 14042}
+ width: 1640
+ height: 987
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 92
---- !u!114 &10
+ controlID: 203
+--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -235,19 +311,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 4}
- - {fileID: 11}
+ - {fileID: 7}
+ - {fileID: 14}
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 921
- height: 394
- m_MinSize: {x: 403, y: 221}
- m_MaxSize: {x: 8003, y: 4021}
+ width: 1640
+ height: 342
+ m_MinSize: {x: 200, y: 100}
+ m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 93
---- !u!114 &11
+ controlID: 204
+--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -257,24 +333,74 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
+ m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
- x: 228
+ x: 623
y: 0
- width: 693
- height: 394
+ width: 1017
+ height: 342
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 15}
+ m_ActualView: {fileID: 20}
m_Panes:
- - {fileID: 15}
- - {fileID: 16}
- m_Selected: 0
- m_LastSelected: 1
---- !u!114 &12
+ - {fileID: 19}
+ - {fileID: 20}
+ m_Selected: 1
+ m_LastSelected: 0
+--- !u!114 &15
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_MinSize: {x: 640, y: 580}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_TitleContent:
+ m_Text: Build Settings
+ m_Image: {fileID: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 2783
+ y: 205
+ width: 640
+ height: 640
+ m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
+ m_TreeViewState:
+ scrollPos: {x: 0, y: 0}
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs:
+ m_RenameOverlay:
+ m_UserAcceptedRename: 0
+ m_Name:
+ m_OriginalName:
+ m_EditFieldRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 0
+ height: 0
+ m_UserData: 0
+ m_IsWaitingForDelay: 0
+ m_IsRenaming: 0
+ m_OriginalEventType: 11
+ m_IsRenamingFilename: 0
+ m_ClientGUIView: {fileID: 0}
+ m_SearchString:
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -290,15 +416,19 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
- m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000,
+ type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 2249
- y: 726.5
- width: 920
- height: 250
+ x: -1856
+ y: 560
+ width: 1389
+ height: 408
m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
m_SearchFilter:
m_NameFilter:
m_ClassNames: []
@@ -312,21 +442,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets
+ - Assets/Scenes/Menues
m_Globs: []
+ m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets
+ - Assets/Scenes/Menues
m_LastFoldersGridSize: -1
- m_LastProjectPath: U:\layout
+ m_LastProjectPath: C:\Users\o-s-r\Documents\fau\Projekt_KI\OHNELEER\fresh\UFrameIT
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs: f4350000
- m_LastClickedID: 13812
- m_ExpandedIDs: 00000000f435000000ca9a3b
+ scrollPos: {x: 0, y: 573}
+ m_SelectedIDs: 4c720100
+ m_LastClickedID: 94796
+ m_ExpandedIDs: 00000000a67d0000a87d0000aa7d0000ac7d0000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d0000c07d0000c27d0000c47d0000c67d0000c87d0000ca7d0000cc7d0000ce7d0000d07d0000d27d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -354,7 +485,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000f4350000
+ m_ExpandedIDs: 00000000a67d0000a87d0000aa7d0000ac7d0000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d0000c07d0000c27d0000c47d0000c67d0000c87d0000ca7d0000cc7d0000ce7d0000d07d0000d27d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -379,9 +510,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs:
- m_LastClickedInstanceID: 0
- m_HadKeyboardFocusLastEvent: 0
+ m_SelectedInstanceIDs: 1a9b0400
+ m_LastClickedInstanceID: 301850
+ m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -410,7 +541,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
---- !u!114 &13
+--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -426,15 +557,19 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
- m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000,
+ type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 3170
- y: 332.5
- width: 284
- height: 644
+ x: -280
+ y: 73
+ width: 279
+ height: 966
m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
@@ -443,12 +578,12 @@ MonoBehaviour:
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
- m_AssetGUID:
- m_InstanceID: 0
+ m_GlobalObjectId:
+ m_InspectorMode: 0
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
---- !u!114 &14
+--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -464,21 +599,25 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
- m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000,
+ type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 2249
- y: 332.5
- width: 227
- height: 373
+ x: -1920
+ y: 73
+ width: 622
+ height: 321
m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 42fbffff
+ m_ExpandedIDs: 02fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -494,7 +633,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 0}
+ m_ClientGUIView: {fileID: 7}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -502,7 +641,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &15
+--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -518,16 +657,228 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
- m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000,
+ type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 2477
- y: 332.5
- width: 691
- height: 373
+ x: -1326
+ y: 98
+ width: 858
+ height: 441
m_ViewDataDictionary: {fileID: 0}
- m_ShowContextualTools: 0
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData:
+ - dockPosition: 0
+ containerId: overlay-toolbar__top
+ floating: 0
+ collapsed: 0
+ displayed: 1
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: -101, y: -26}
+ snapCorner: 3
+ id: Tool Settings
+ index: 0
+ layout: 1
+ - dockPosition: 0
+ containerId: overlay-toolbar__top
+ floating: 0
+ collapsed: 0
+ displayed: 1
+ snapOffset: {x: -141, y: 149}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 1
+ id: unity-grid-and-snap-toolbar
+ index: 1
+ layout: 1
+ - dockPosition: 1
+ containerId: overlay-toolbar__top
+ floating: 0
+ collapsed: 0
+ displayed: 1
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: unity-scene-view-toolbar
+ index: 0
+ layout: 1
+ - dockPosition: 1
+ containerId: overlay-toolbar__top
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 1
+ id: unity-search-toolbar
+ index: 1
+ layout: 1
+ - dockPosition: 1
+ containerId: overlay-toolbar__top
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Open Tile Palette
+ index: 2
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-toolbar__top
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Tilemap Focus
+ index: 3
+ layout: 4
+ - dockPosition: 0
+ containerId: overlay-container--left
+ floating: 0
+ collapsed: 0
+ displayed: 1
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: unity-transform-toolbar
+ index: 0
+ layout: 2
+ - dockPosition: 0
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 1
+ snapOffset: {x: 67.5, y: 86}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Orientation
+ index: 0
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Light Settings
+ index: 0
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Camera
+ index: 1
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Cloth Constraints
+ index: 2
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Cloth Collisions
+ index: 3
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Navmesh Display
+ index: 4
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Agent Display
+ index: 5
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Obstacle Display
+ index: 6
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Occlusion Culling
+ index: 7
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Physics Debugger
+ index: 8
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Scene Visibility
+ index: 9
+ layout: 4
+ - dockPosition: 1
+ containerId: overlay-container--right
+ floating: 0
+ collapsed: 0
+ displayed: 0
+ snapOffset: {x: 0, y: 0}
+ snapOffsetDelta: {x: 0, y: 0}
+ snapCorner: 0
+ id: Scene View/Particles
+ index: 10
+ layout: 4
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
m_Gizmos: 1
m_OverrideSceneCullingMask: 6917529027641081856
@@ -550,13 +901,14 @@ MonoBehaviour:
m_DoValidateTrueMetals: 0
m_ExposureSliderValue: 0
m_SceneViewState:
+ m_AlwaysRefresh: 0
showFog: 1
- showMaterialUpdate: 0
showSkybox: 1
showFlares: 1
showImageEffects: 1
showParticleSystems: 1
showVisualEffectGraphs: 1
+ m_FxEnabled: 1
m_Grid:
xGrid:
m_Fade:
@@ -590,9 +942,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_Size:
- m_Target: 10
+ m_Target: 14.562745
speed: 2
- m_Value: 10
+ m_Value: 14.562745
m_Ortho:
m_Target: 0
speed: 2
@@ -605,19 +957,19 @@ MonoBehaviour:
m_EasingEnabled: 1
m_EasingDuration: 0.4
m_AccelerationEnabled: 1
- m_FieldOfView: 90
+ m_FieldOfViewHorizontalOrVertical: 60
m_NearClip: 0.03
m_FarClip: 10000
m_DynamicClip: 1
m_OcclusionCulling: 0
- m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
+ m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
---- !u!114 &16
+--- !u!114 &20
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -633,40 +985,44 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
- m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000,
+ type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 507
- y: 94
- width: 1532
- height: 790
+ x: -1297
+ y: 73
+ width: 1015
+ height: 321
m_ViewDataDictionary: {fileID: 0}
- m_SerializedViewsNames: []
- m_SerializedViewsValues: []
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
+ m_SerializedViewNames: []
+ m_SerializedViewValues: []
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 640, y: 480}
+ m_TargetSize: {x: 1920, y: 1080}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
- m_RenderIMGUI: 0
- m_MaximizeOnPlay: 0
+ m_RenderIMGUI: 1
+ m_EnterPlayModeBehavior: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
m_Stats: 0
- m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+ m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
- m_HBaseRangeMin: -766
- m_HBaseRangeMax: 766
- m_VBaseRangeMin: -395
- m_VBaseRangeMax: 395
+ m_HBaseRangeMin: -960
+ m_HBaseRangeMax: 960
+ m_VBaseRangeMin: -540
+ m_VBaseRangeMax: 540
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -683,30 +1039,30 @@ MonoBehaviour:
m_DrawArea:
serializedVersion: 2
x: 0
- y: 0
- width: 1532
- height: 790
- m_Scale: {x: 1, y: 1}
- m_Translation: {x: 766, y: 395}
+ y: 21
+ width: 1015
+ height: 300
+ m_Scale: {x: 0.2777778, y: 0.2777778}
+ m_Translation: {x: 507.5, y: 150}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -766
- y: -395
- width: 1532
- height: 790
+ x: -1826.9999
+ y: -540
+ width: 3653.9998
+ height: 1080
m_MinimalGUI: 1
- m_defaultScale: 1
- m_LastWindowPixelSize: {x: 1532, y: 790}
+ m_defaultScale: 0.2777778
+ m_LastWindowPixelSize: {x: 1015, y: 321}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
---- !u!114 &17
+--- !u!114 &21
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -722,25 +1078,16 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
- m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000,
+ type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 2249
- y: 726.5
- width: 920
- height: 250
+ x: -1920
+ y: 415
+ width: 1639
+ height: 624
m_ViewDataDictionary: {fileID: 0}
---- !u!114 &18
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 13963, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_DontSaveToLayout: 0
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings
new file mode 100644
index 0000000000000000000000000000000000000000..9e26dfeeb6e641a33dae4961196235bdb965b21b
--- /dev/null
+++ b/UserSettings/Search.settings
@@ -0,0 +1 @@
+{}
\ No newline at end of file