diff --git a/Assets/Zion/Scripts/Adam/UIBootstrap.cs b/Assets/Zion/Scripts/Adam/UIBootstrap.cs index 522ffb79..aca0ee0b 100644 --- a/Assets/Zion/Scripts/Adam/UIBootstrap.cs +++ b/Assets/Zion/Scripts/Adam/UIBootstrap.cs @@ -147,7 +147,7 @@ public class UIBootstrap : MonoSingleton private IEnumerator ShowLoad(UnityAction callback = null) { loadTem.SetActive(true); - yield return new WaitForSeconds(0.1f); + yield return new WaitForSeconds(3f); loadTem.SetActive(false); callback?.Invoke(); } diff --git a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs index 0d988699..59e194ee 100644 --- a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs +++ b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs @@ -125,7 +125,7 @@ public class DroneViewDisplay : MonoSingleton public void CreateUI(string deviceID, Camera camera, RawImage rawImage) { if (deviceID.Length < 10) return; - var v = renderTextures.Find(x => x.name == deviceID); + var v = renderTextures.Find(x => (x!=null&&x.name == deviceID)); if (v != null) return; RenderTexture renderTexture = new RenderTexture(500, 500, 0); renderTexture.name = deviceID; diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c20de4f4..7cf2e29c 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -17,4 +17,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity guid: 7715b43affb2bbd41ab81007375a0709 + - enabled: 1 + path: Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity + guid: 3fc76af30740490439d741e289eb411f m_configObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a6fae501..e9c73b19 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -91,7 +91,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 0 - fullscreenMode: 3 + fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0