From b0a299a71348d4e814e7e942942e9b8b067c74d1 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Mon, 29 Jan 2024 22:16:43 +0800 Subject: [PATCH 1/3] 222 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5e7247eb..dbf8e593 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /UniTask.Addressables.csproj /UniTask.csproj /Build +/Bulid From 7fbed652725e59606e6031a34a8e13e6db427c81 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 30 Jan 2024 16:08:03 +0800 Subject: [PATCH 2/3] rerer --- .../Zion/Scripts/Adam/Components/PostureController.cs | 11 ++++++++++- Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs | 10 +++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Assets/Zion/Scripts/Adam/Components/PostureController.cs b/Assets/Zion/Scripts/Adam/Components/PostureController.cs index 9c981a4e..5aa49781 100644 --- a/Assets/Zion/Scripts/Adam/Components/PostureController.cs +++ b/Assets/Zion/Scripts/Adam/Components/PostureController.cs @@ -31,6 +31,8 @@ public class PostureController : MonoBehaviour private void OnEnable() { + redShowImage.gameObject.SetActive(false); + blueShowImage.gameObject.SetActive(false); GetSceneInfo(); } /// @@ -118,14 +120,21 @@ public class PostureController : MonoBehaviour private void OnDeviceBtn(string id, int redOrBlue) { - if (droneViewDisplay.renderTextureTo(id) == null) return; + if (droneViewDisplay.renderTextureTo(id) == null) + { + redShowImage.gameObject.SetActive(false); + blueShowImage.gameObject.SetActive(false); + return; + } if (string.IsNullOrEmpty(id)) return; if (redOrBlue == 0) { + redShowImage.gameObject.SetActive(true); redShowImage.texture = droneViewDisplay.renderTextureTo(id); } else { + blueShowImage.gameObject.SetActive(true); blueShowImage.texture = droneViewDisplay.renderTextureTo(id); } diff --git a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs index 0ae590d9..9a99ceec 100644 --- a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs +++ b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs @@ -176,7 +176,15 @@ public class DroneViewDisplay : MonoSingleton /// public RenderTexture renderTextureTo(string deviceID) { - RenderTexture radioAngleView = renderTextures.Find(x => x.name == deviceID); + RenderTexture radioAngleView = null; + for (int i = 0; i < renderTextures.Count; i++) + { + if(renderTextures[i].name == deviceID) + { + radioAngleView = renderTextures[i]; + return radioAngleView; + } + } return radioAngleView; } From 7c54bb211e307cc250335b78adedaa6a629405e9 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 30 Jan 2024 16:08:24 +0800 Subject: [PATCH 3/3] ew --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e3ec292a..71513c2a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -91,7 +91,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0