diff --git a/Assets/GameAssets/Prefebs/Main Camera.prefab b/Assets/GameAssets/Prefebs/Main Camera.prefab index e1676818..6fc9e6ff 100644 --- a/Assets/GameAssets/Prefebs/Main Camera.prefab +++ b/Assets/GameAssets/Prefebs/Main Camera.prefab @@ -63,7 +63,7 @@ Camera: field of view: 60 orthographic: 0 orthographic size: 5 - m_Depth: -1 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 32567 diff --git a/Assets/Resources/Prefabs/DoublePlay.prefab b/Assets/Resources/Prefabs/DoublePlay.prefab index 53c90958..2b6e187c 100644 --- a/Assets/Resources/Prefabs/DoublePlay.prefab +++ b/Assets/Resources/Prefabs/DoublePlay.prefab @@ -2032,8 +2032,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: abe63c6c7a141e049b4b93716755df46, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2060,7 +2060,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 1480251055891144165} m_SelectOnLeft: {fileID: 1480251055914214144} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: m_NormalColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -6082,7 +6082,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 2119567.5} + m_AnchoredPosition: {x: 0, y: 2123188.2} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7554510022850465655 diff --git a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs index 59e194ee..acfd9081 100644 --- a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs +++ b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs @@ -95,6 +95,9 @@ public class DroneViewDisplay : MonoSingleton // 创建 RenderTexture RenderTexture renderTexture = new RenderTexture(500, 500, 0); renderTexture.name = unmannedAerialVehicleManage.equipmentCommon.deviceID; + + unmannedAerialVehicleManage.dzWRJCamera.targetTexture = renderTexture; + unmannedAerialVehicleManage.gxWRJCamera.targetTexture = renderTexture; if (unmannedAerialVehicleManage.wrjModel == WRJModel.电子侦察无人机) { unmannedAerialVehicleManage.dzWRJCamera.gameObject.SetActive(true); @@ -103,8 +106,6 @@ public class DroneViewDisplay : MonoSingleton { unmannedAerialVehicleManage.gxWRJCamera.gameObject.SetActive(true); } - unmannedAerialVehicleManage.dzWRJCamera.targetTexture = renderTexture; - unmannedAerialVehicleManage.gxWRJCamera.targetTexture = renderTexture; radioAngleViewMain.rawShow.texture = unmannedAerialVehicleManage.wrjModel == WRJModel.电子侦察无人机 ? unmannedAerialVehicleManage.dzWRJCamera.targetTexture : unmannedAerialVehicleManage.gxWRJCamera.targetTexture; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0fc5abbc..62a12912 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -17,8 +17,8 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 + m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 m_SplashScreenLogoStyle: 1