Kaynağa Gözat

提交修复部分问题

wartheking 1 ay önce
ebeveyn
işleme
c3bb379e3c

Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 98
Assets/Scene 1.unity


+ 7 - 1
Assets/Scripts/UI/Tools/ObsPlayerPanel.cs

@@ -13,6 +13,7 @@ using UnityEngine.Networking;
 using UnityEngine.UI;
 using UnityEngine.UIElements;
 using Button = UnityEngine.UI.Button;
+using UnityAsync;
 
 public class ObsPlayerPanel : MonoBehaviour
 {
@@ -131,11 +132,16 @@ public class ObsPlayerPanel : MonoBehaviour
         _targetName = _data.targetName;
         
         string playUrl = await HttpHelper._Instance.GetObsUrl(_data.deviceId, _data.channelId);
-        
+        obsPlayer.GetComponent<DisplayUGUI>().color = Color.clear;
         obsPlayer.OpenMedia(MediaPathType.AbsolutePathOrURL,playUrl, true);
         obsPlayer.Play();
         currentChannelId = _data.channelId;
         currentDeviceId = _data.deviceId;
+        await new UnityAsync.WaitUntil(() =>
+        {
+            return obsPlayer.MediaOpened;
+        });
+        obsPlayer.GetComponent<DisplayUGUI>().color = Color.white;
     }
     
     private void OnDirButtonDown(ObsCtrlType type)

+ 17 - 0
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -250,6 +250,9 @@ public class GCJKLayer : YZTRootLayer
 
     public GameObject loading;
 
+    public Button buyuanBtn;
+    public Button taokouBtn;
+
     private void Awake()
     {
         _Instance = this;
@@ -258,6 +261,20 @@ public class GCJKLayer : YZTRootLayer
         _shuiWeiHistoryPanel = this.transform.Find("Main/ShuiWeiHistoryPanel").GetComponent<ShuiWeiHistoryPanel>();
         _shuiWeiHistoryPanel.Init();
         _shuiWeiHistoryPanel.gameObject.SetActive(false);
+
+        buyuanBtn.onClick.AddListener(() =>
+        {
+            buyuanBtn.GetComponent<CanvasGroup>().alpha = 1f;
+            taokouBtn.GetComponent<CanvasGroup>().alpha = 0.5f;
+            SetCurrentDataToPanel(0);
+        });
+
+        taokouBtn.onClick.AddListener(() =>
+        {
+            buyuanBtn.GetComponent<CanvasGroup>().alpha = 0.5f;
+            taokouBtn.GetComponent<CanvasGroup>().alpha = 1f;
+            SetCurrentDataToPanel(1);
+        });
     }
 
     private async void OnEnable()

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor