diff --git a/Assets/StartServer.cs b/Assets/StartServer.cs
index 495fe9e7526267b0301a6a92427c3ee03c0ad5f6..2075ea48a1dc3f4e289df64302f3c1dbd80076f6 100644
--- a/Assets/StartServer.cs
+++ b/Assets/StartServer.cs
@@ -80,24 +80,44 @@ IEnumerator ServerRoutine()
yield return request.SendWebRequest();
if (request.isNetworkError || request.isHttpError)
{
- UnityEngine.Debug.Log("no running server");
+ UnityEngine.Debug.Log("no running server "+ request.error);
-
- // int exitCode;
+#if!UNITY_WEBGL
+ // 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 "+Application.streamingAssetsPath;
- proc.WindowStyle = ProcessWindowStyle.Minimized;
- proc.CreateNoWindow = true;
- process = Process.Start(proc);
+ ProcessStartInfo proc = new ProcessStartInfo();
+ proc.FileName = "bash";
+ // proc.WorkingDirectory = Application.streamingAssetsPath;
+ proc.Arguments = Application.streamingAssetsPath+"/startServer.sh";// + " \"" +Application.streamingAssetsPath + "\"";
+ proc.WindowStyle = ProcessWindowStyle.Normal;
+ proc.CreateNoWindow = false;
+ proc.UseShellExecute = true;
+ process = Process.Start(proc);
+
+#elif UNITY_STANDALONE_OSX
+ /*
+ ProcessStartInfo proc = new ProcessStartInfo();//"open", "sh startServer.sh");// + " \"" +Application.streamingAssetsPath + "\"");
+ proc.FileName = "/bin/bash";
+ proc.WorkingDirectory = Application.streamingAssetsPath;
+ proc.Arguments = "sh " + Application.streamingAssetsPath+"/startServer.sh";
+ proc.CreateNoWindow = false;
+ proc.UseShellExecute = true;
+ process = Process.Start(proc);
+ */
+ ProcessStartInfo proc = new ProcessStartInfo();
+ String startServerPath = Application.streamingAssetsPath + "/startServer.sh";
+ String runWithTerminalPath = Application.streamingAssetsPath + "/startInTerminal.sh";
+ proc.FileName = "/bin/bash";
+ proc.Arguments = runWithTerminalPath + " /bin/bash " + startServerPath;
+ proc.CreateNoWindow = false;
+ proc.UseShellExecute = true;
+ process = Process.Start(proc);
#else
string command = "";
@@ -118,7 +138,7 @@ IEnumerator ServerRoutine()
process = Process.Start(processInfo);
#endif
yield return null;
-
+#endif
while (true)
{
request = UnityWebRequest.Get("localhost:8081/scroll/list");
@@ -142,13 +162,16 @@ IEnumerator ServerRoutine()
//string output = process.StandardOutput.ReadToEnd();
//string error = process.StandardError.ReadToEnd();
- // exitCode = process.ExitCode;
+ // exitCode = process.ExitCode;
// UnityEngine.Debug.Log(output);
// UnityEngine.Debug.Log(error);
// Console.WriteLine("output>>" + (String.IsNullOrEmpty(output) ? "(none)" : output));
// Console.WriteLine("error>>" + (String.IsNullOrEmpty(error) ? "(none)" : error));
// Console.WriteLine("ExitCode: " + exitCode.ToString(), "ExecuteCommand");
+#if !UNITY_WEBGL
+
process.Close();
+#endif
}
PrepareGame();
diff --git a/Assets/TreeWorld_02.unity b/Assets/TreeWorld_02.unity
index 009592ed0671ce49111bfff823ec7eb3322d60c4..79609ae1cc5da742be304318a8c069cda2c1a045 100644
--- a/Assets/TreeWorld_02.unity
+++ b/Assets/TreeWorld_02.unity
@@ -1163,6 +1163,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Restart Game
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -4395,6 +4397,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &195158027
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4413,6 +4417,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 644edf8b3fa05da418500a0e9dd10820, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -4677,6 +4683,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: You can select a different scroll but you only need the first one for this
example
m_isRightToLeft: 0
@@ -9375,36 +9383,26 @@ PrefabInstance:
propertyPath: cursor
value:
objectReference: {fileID: 1661088665}
- - target: {fileID: 7043679010477471483, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ - target: {fileID: 6732605675360346240, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
+ propertyPath: m_IsActive
+ value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7043679010477471483, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ - target: {fileID: 3142041667317727589, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
+ propertyPath: m_Pivot.y
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6789101892953060368, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.00000612256
+ value: 0.000012383021
objectReference: {fileID: 0}
- target: {fileID: 6789101892953060368, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3142041667317727589, guid: e8183f1330bd6124a9a9bb4d35ef2216,
- type: 3}
- propertyPath: m_Pivot.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6732605675360346240, guid: e8183f1330bd6124a9a9bb4d35ef2216,
- type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 7164430353978018680, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
propertyPath: m_textInfo.characterCount
@@ -9430,20 +9428,15 @@ PrefabInstance:
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4391071172276249716, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ - target: {fileID: 7043679010477471483, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
- propertyPath: m_Value
+ propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4391071172276249716, guid: e8183f1330bd6124a9a9bb4d35ef2216,
- type: 3}
- propertyPath: m_Size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4391071172276249716, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ - target: {fileID: 7043679010477471483, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
- propertyPath: m_Direction
- value: 2
+ propertyPath: m_AnchorMax.y
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5522762514858979121, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
@@ -9465,6 +9458,21 @@ PrefabInstance:
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4391071172276249716, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ type: 3}
+ propertyPath: m_Value
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4391071172276249716, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ type: 3}
+ propertyPath: m_Size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4391071172276249716, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ type: 3}
+ propertyPath: m_Direction
+ value: 2
+ objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 3188165521933089912, guid: e8183f1330bd6124a9a9bb4d35ef2216, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: e8183f1330bd6124a9a9bb4d35ef2216, type: 3}
@@ -9869,6 +9877,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -11167,6 +11177,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Press Tab to Switch between Fact Managment and World Interaction
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -11688,6 +11700,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Press TAB to switch between Fact Managment and World Interaction
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -15691,6 +15705,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -19658,6 +19674,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &980353958
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -19676,6 +19694,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 61c389e99e8388e4e93070d2f5e6275f, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -21657,6 +21677,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Make sure to use the correct ordering when selecting points for distances
and angles!
@@ -22535,6 +22557,8 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!4 &1098376303 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
@@ -23374,6 +23398,31 @@ PrefabInstance:
propertyPath: m_Name
value: Cursor
objectReference: {fileID: 0}
+ - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2600518978420199386, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: d9c43ce51f1a01d41a18fae03c0d406c, type: 2}
- target: {fileID: 1324548122521590688, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
type: 3}
propertyPath: Event.m_PersistentCalls.m_Calls.Array.size
@@ -23481,31 +23530,6 @@ PrefabInstance:
propertyPath: lineRenderer
value:
objectReference: {fileID: 1661088668}
- - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
- type: 3}
- propertyPath: m_RootOrder
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2600518978420199386, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d9c43ce51f1a01d41a18fae03c0d406c, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9cb473a50d07f1245b0f6a7ee2557d4f, type: 3}
--- !u!4 &1143480922 stripped
@@ -26358,6 +26382,8 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &1292066711
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -26376,6 +26402,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -28310,7 +28338,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 300, y: -241.69922}
+ m_AnchoredPosition: {x: 300, y: -241.75}
m_SizeDelta: {x: 600, y: 480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1368293734
@@ -28360,6 +28388,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -31079,6 +31109,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &1485585511
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -31097,6 +31129,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d456617ba2282854d9570dcebcc2b279, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -35596,6 +35630,8 @@ MonoBehaviour:
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: 26
@@ -35726,6 +35762,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &1756368390
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -35744,6 +35782,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 23ef0c9f8111e14439483be733da29eb, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -37151,6 +37191,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Use Gadgets by pointing with the mouse and pressing the left mouse button.
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -39337,6 +39379,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Drag Facts into the Scroll and press the MAGIC button when you are ready
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -39504,6 +39548,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: You can scroll through gadgets in Interaction Mode or click on them
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -41587,6 +41633,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &2045759071
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -41605,6 +41653,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f4c84b8f318e3cb469eb72c734ccbf39, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -42534,6 +42584,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -44591,6 +44643,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -44693,6 +44747,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -44784,6 +44840,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -44943,6 +45001,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!224 &5635158873214363574
RectTransform:
m_ObjectHideFlags: 0
@@ -44980,6 +45040,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 61c389e99e8388e4e93070d2f5e6275f, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -45037,6 +45099,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!224 &5635158873875320956
RectTransform:
m_ObjectHideFlags: 0
@@ -45074,6 +45138,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 23ef0c9f8111e14439483be733da29eb, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -45150,6 +45216,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!224 &5635158874006723670
RectTransform:
m_ObjectHideFlags: 0
@@ -45187,6 +45255,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 644edf8b3fa05da418500a0e9dd10820, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -45287,6 +45357,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d456617ba2282854d9570dcebcc2b279, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -45363,6 +45435,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!1 &5635158874164527069
GameObject:
m_ObjectHideFlags: 0
@@ -45419,6 +45493,8 @@ MonoBehaviour:
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: 26
@@ -45528,6 +45604,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
@@ -45730,6 +45808,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &5635158875035872823
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -45748,6 +45828,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f4c84b8f318e3cb469eb72c734ccbf39, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -45879,6 +45961,11 @@ PrefabInstance:
propertyPath: cursor
value:
objectReference: {fileID: 1661088665}
+ - target: {fileID: 6789101892953060368, guid: e8183f1330bd6124a9a9bb4d35ef2216,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -0.000018352279
+ objectReference: {fileID: 0}
- target: {fileID: 7043679010477471483, guid: e8183f1330bd6124a9a9bb4d35ef2216,
type: 3}
propertyPath: m_AnchorMax.x
@@ -45889,11 +45976,6 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 6789101892953060368, guid: e8183f1330bd6124a9a9bb4d35ef2216,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -0.000018352279
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e8183f1330bd6124a9a9bb4d35ef2216, type: 3}
--- !u!1001 &6999573641241424516
@@ -45983,21 +46065,6 @@ PrefabInstance:
propertyPath: talkingZoneDistance
value: 10
objectReference: {fileID: 0}
- - target: {fileID: 6999573640440716767, guid: 8590393c51194934a95cdc2075fc4dec,
- type: 3}
- propertyPath: m_Mesh
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 6999573640440716764, guid: 8590393c51194934a95cdc2075fc4dec,
- type: 3}
- propertyPath: Cam
- value:
- objectReference: {fileID: 1001044962}
- - target: {fileID: 6999573642288568607, guid: 8590393c51194934a95cdc2075fc4dec,
- type: 3}
- propertyPath: m_Mesh
- value:
- objectReference: {fileID: 0}
- target: {fileID: 5439856320987879120, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
propertyPath: m_LocalScale.x
@@ -46033,5 +46100,20 @@ PrefabInstance:
propertyPath: sentences.Array.data[7]
value: Speak to me again if you have a solution.
objectReference: {fileID: 0}
+ - target: {fileID: 6999573640440716767, guid: 8590393c51194934a95cdc2075fc4dec,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 6999573640440716764, guid: 8590393c51194934a95cdc2075fc4dec,
+ type: 3}
+ propertyPath: Cam
+ value:
+ objectReference: {fileID: 1001044962}
+ - target: {fileID: 6999573642288568607, guid: 8590393c51194934a95cdc2075fc4dec,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8590393c51194934a95cdc2075fc4dec, type: 3}
diff --git a/Assets/empty.unity b/Assets/empty.unity
new file mode 100644
index 0000000000000000000000000000000000000000..59176d41ed81aa53d8e1521639740413b7eeab87
--- /dev/null
+++ b/Assets/empty.unity
@@ -0,0 +1,265 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_OcclusionBakeSettings:
+ smallestOccluder: 5
+ smallestHole: 0.25
+ backfaceThreshold: 100
+ m_SceneGUID: 00000000000000000000000000000000
+ m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 9
+ m_Fog: 0
+ m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ m_FogMode: 3
+ m_FogDensity: 0.01
+ m_LinearFogStart: 0
+ m_LinearFogEnd: 300
+ m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+ m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+ m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+ m_AmbientIntensity: 1
+ m_AmbientMode: 0
+ m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+ m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+ m_HaloStrength: 0.5
+ m_FlareStrength: 1
+ m_FlareFadeSpeed: 3
+ m_HaloTexture: {fileID: 0}
+ m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+ m_DefaultReflectionMode: 0
+ m_DefaultReflectionResolution: 128
+ m_ReflectionBounces: 1
+ m_ReflectionIntensity: 1
+ m_CustomReflection: {fileID: 0}
+ m_Sun: {fileID: 0}
+ m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+ m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 11
+ m_GIWorkflowMode: 0
+ m_GISettings:
+ serializedVersion: 2
+ m_BounceScale: 1
+ m_IndirectOutputScale: 1
+ m_AlbedoBoost: 1
+ m_EnvironmentLightingMode: 0
+ m_EnableBakedLightmaps: 1
+ m_EnableRealtimeLightmaps: 1
+ m_LightmapEditorSettings:
+ serializedVersion: 10
+ m_Resolution: 2
+ m_BakeResolution: 40
+ m_AtlasSize: 1024
+ m_AO: 0
+ m_AOMaxDistance: 1
+ m_CompAOExponent: 1
+ m_CompAOExponentDirect: 0
+ m_Padding: 2
+ m_LightmapParameters: {fileID: 0}
+ m_LightmapsBakeMode: 1
+ m_TextureCompression: 1
+ m_FinalGather: 0
+ m_FinalGatherFiltering: 1
+ m_FinalGatherRayCount: 256
+ m_ReflectionCompression: 2
+ m_MixedBakeMode: 2
+ m_BakeBackend: 1
+ m_PVRSampling: 1
+ m_PVRDirectSampleCount: 32
+ m_PVRSampleCount: 500
+ m_PVRBounces: 2
+ m_PVRFilterTypeDirect: 0
+ m_PVRFilterTypeIndirect: 0
+ m_PVRFilterTypeAO: 0
+ m_PVRFilteringMode: 1
+ m_PVRCulling: 1
+ m_PVRFilteringGaussRadiusDirect: 1
+ m_PVRFilteringGaussRadiusIndirect: 5
+ m_PVRFilteringGaussRadiusAO: 2
+ m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+ m_PVRFilteringAtrousPositionSigmaIndirect: 2
+ m_PVRFilteringAtrousPositionSigmaAO: 1
+ m_ShowResolutionOverlay: 1
+ m_LightingDataAsset: {fileID: 0}
+ m_UseShadowmask: 1
+--- !u!196 &4
+NavMeshSettings:
+ serializedVersion: 2
+ m_ObjectHideFlags: 0
+ m_BuildSettings:
+ serializedVersion: 2
+ agentTypeID: 0
+ agentRadius: 0.5
+ agentHeight: 2
+ agentSlope: 45
+ agentClimb: 0.4
+ ledgeDropHeight: 0
+ maxJumpAcrossDistance: 0
+ minRegionArea: 2
+ manualCellSize: 0
+ cellSize: 0.16666667
+ manualTileSize: 0
+ tileSize: 256
+ accuratePlacement: 0
+ debug:
+ m_Flags: 0
+ m_NavMeshData: {fileID: 0}
+--- !u!1 &937283486
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 937283488}
+ - component: {fileID: 937283487}
+ m_Layer: 0
+ m_Name: Directional Light
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!108 &937283487
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 937283486}
+ m_Enabled: 1
+ serializedVersion: 8
+ m_Type: 1
+ m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+ m_Intensity: 1
+ m_Range: 10
+ m_SpotAngle: 30
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 2
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.05
+ m_NormalBias: 0.4
+ m_NearPlane: 0.2
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
+--- !u!4 &937283488
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 937283486}
+ m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+ m_LocalPosition: {x: 0, y: 3, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &2073630061
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2073630064}
+ - component: {fileID: 2073630063}
+ - component: {fileID: 2073630062}
+ m_Layer: 0
+ m_Name: Main Camera
+ m_TagString: MainCamera
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!81 &2073630062
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2073630061}
+ m_Enabled: 1
+--- !u!20 &2073630063
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2073630061}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 1
+ m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+ m_projectionMatrixMode: 1
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_GateFitMode: 2
+ m_FocalLength: 50
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 1000
+ field of view: 60
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: -1
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 0
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
+--- !u!4 &2073630064
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2073630061}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 1, z: -10}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/empty.unity.meta b/Assets/empty.unity.meta
new file mode 100644
index 0000000000000000000000000000000000000000..474e3fed00adc67112e21e160b7591afc21f864f
--- /dev/null
+++ b/Assets/empty.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: adc258ad592835340b9d3ecec180d100
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: