Compare commits

..

No commits in common. "ed4fc75cad10696fea69e4da92dc23ae9462b9f0" and "429f2bb1a7cfb8b765db4ebdcbd30ea2b4e84608" have entirely different histories.

5 changed files with 5 additions and 23 deletions

1
.gitignore vendored
View File

@ -16,4 +16,3 @@
/UniTask.Addressables.csproj /UniTask.Addressables.csproj
/UniTask.csproj /UniTask.csproj
/Build /Build
/Bulid

View File

@ -32,8 +32,8 @@ Material:
- _dispStrength: 1 - _dispStrength: 1
- _overBright: 1 - _overBright: 1
m_Colors: m_Colors:
- _AmbientTint: {r: 0, g: 0, b: 0, a: 1} - _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003} - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1} - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1} - _TintColor: {r: 1, g: 1, b: 1, a: 1}

View File

@ -31,8 +31,6 @@ public class PostureController : MonoBehaviour
private void OnEnable() private void OnEnable()
{ {
redShowImage.gameObject.SetActive(false);
blueShowImage.gameObject.SetActive(false);
GetSceneInfo(); GetSceneInfo();
} }
/// <summary> /// <summary>
@ -120,21 +118,14 @@ public class PostureController : MonoBehaviour
private void OnDeviceBtn(string id, int redOrBlue) private void OnDeviceBtn(string id, int redOrBlue)
{ {
if (droneViewDisplay.renderTextureTo(id) == null) if (droneViewDisplay.renderTextureTo(id) == null) return;
{
redShowImage.gameObject.SetActive(false);
blueShowImage.gameObject.SetActive(false);
return;
}
if (string.IsNullOrEmpty(id)) return; if (string.IsNullOrEmpty(id)) return;
if (redOrBlue == 0) if (redOrBlue == 0)
{ {
redShowImage.gameObject.SetActive(true);
redShowImage.texture = droneViewDisplay.renderTextureTo(id); redShowImage.texture = droneViewDisplay.renderTextureTo(id);
} }
else else
{ {
blueShowImage.gameObject.SetActive(true);
blueShowImage.texture = droneViewDisplay.renderTextureTo(id); blueShowImage.texture = droneViewDisplay.renderTextureTo(id);
} }

View File

@ -176,15 +176,7 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
/// <returns></returns> /// <returns></returns>
public RenderTexture renderTextureTo(string deviceID) public RenderTexture renderTextureTo(string deviceID)
{ {
RenderTexture radioAngleView = null; RenderTexture radioAngleView = renderTextures.Find(x => x.name == deviceID);
for (int i = 0; i < renderTextures.Count; i++)
{
if(renderTextures[i].name == deviceID)
{
radioAngleView = renderTextures[i];
return radioAngleView;
}
}
return radioAngleView; return radioAngleView;
} }

View File

@ -91,7 +91,7 @@ PlayerSettings:
xboxEnableFitness: 0 xboxEnableFitness: 0
visibleInBackground: 1 visibleInBackground: 1
allowFullscreenSwitch: 1 allowFullscreenSwitch: 1
fullscreenMode: 3 fullscreenMode: 2
xboxSpeechDB: 0 xboxSpeechDB: 0
xboxEnableHeadOrientation: 0 xboxEnableHeadOrientation: 0
xboxEnableGuest: 0 xboxEnableGuest: 0