Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
commit
3c9666f915
|
@ -147,7 +147,7 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
|
||||||
private IEnumerator ShowLoad(UnityAction callback = null)
|
private IEnumerator ShowLoad(UnityAction callback = null)
|
||||||
{
|
{
|
||||||
loadTem.SetActive(true);
|
loadTem.SetActive(true);
|
||||||
yield return new WaitForSeconds(0.1f);
|
yield return new WaitForSeconds(3f);
|
||||||
loadTem.SetActive(false);
|
loadTem.SetActive(false);
|
||||||
callback?.Invoke();
|
callback?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,7 +125,7 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
|
||||||
public void CreateUI(string deviceID, Camera camera, RawImage rawImage)
|
public void CreateUI(string deviceID, Camera camera, RawImage rawImage)
|
||||||
{
|
{
|
||||||
if (deviceID.Length < 10) return;
|
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;
|
if (v != null) return;
|
||||||
RenderTexture renderTexture = new RenderTexture(500, 500, 0);
|
RenderTexture renderTexture = new RenderTexture(500, 500, 0);
|
||||||
renderTexture.name = deviceID;
|
renderTexture.name = deviceID;
|
||||||
|
|
|
@ -91,7 +91,7 @@ PlayerSettings:
|
||||||
xboxEnableFitness: 0
|
xboxEnableFitness: 0
|
||||||
visibleInBackground: 1
|
visibleInBackground: 1
|
||||||
allowFullscreenSwitch: 0
|
allowFullscreenSwitch: 0
|
||||||
fullscreenMode: 3
|
fullscreenMode: 1
|
||||||
xboxSpeechDB: 0
|
xboxSpeechDB: 0
|
||||||
xboxEnableHeadOrientation: 0
|
xboxEnableHeadOrientation: 0
|
||||||
xboxEnableGuest: 0
|
xboxEnableGuest: 0
|
||||||
|
|
Loading…
Reference in New Issue