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 diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat index 846a590c..44f8ade1 100644 --- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat +++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat @@ -32,8 +32,8 @@ Material: - _dispStrength: 1 - _overBright: 1 m_Colors: - - _AmbientTint: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2} + - _AmbientTint: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003} - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1} - _TintColor: {r: 1, g: 1, b: 1, a: 1} 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; } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bfac451b..71513c2a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -91,7 +91,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 2 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0