From 5ecd6e5118c0316392849cfd802f2ca7b3ce10f6 Mon Sep 17 00:00:00 2001 From: wangzhixun <3077614386@qq.com> Date: Wed, 5 Nov 2025 13:43:54 +0800 Subject: [PATCH] 9.00002 --- .../Runtime/Scripts/Internal/BaseMediaPlayer.cs | 4 ++-- .../Core/DrawerAttributes/ProgressBarAttribute.cs | 3 ++- .../UniTask/Runtime/CancellationTokenExtensions.cs | 6 +++--- 3d/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs | 2 +- .../UniTask/Runtime/UniTaskObservableExtensions.cs | 11 ++++++----- 3d/Assets/Scripts/SetHorizontal.cs | 4 +--- 3d/Assets/Zion/Scripts/ChangeScence.cs | 6 +++--- .../Scripts/ERP/SwitchgearMaterialRequestSystem.cs | 8 ++++---- 3d/Assets/Zion/Scripts/MaterialCenter.cs | 1 - 3d/Assets/Zion/Scripts/单据/DeliveryList.cs | 8 +------- .../Scripts/单据/MaterialReturnWarehousingList.cs | 10 ++-------- .../Zion/Scripts/单据/WasteMaterialsFandoverForm.cs | 10 ++-------- .../Zion/Scripts/配送/Manager/UIManager/BasePanel.cs | 2 +- 13 files changed, 28 insertions(+), 47 deletions(-) diff --git a/3d/Assets/AVProVideo/Runtime/Scripts/Internal/BaseMediaPlayer.cs b/3d/Assets/AVProVideo/Runtime/Scripts/Internal/BaseMediaPlayer.cs index 814c2ee..81c28a5 100644 --- a/3d/Assets/AVProVideo/Runtime/Scripts/Internal/BaseMediaPlayer.cs +++ b/3d/Assets/AVProVideo/Runtime/Scripts/Internal/BaseMediaPlayer.cs @@ -247,9 +247,9 @@ namespace RenderHeads.Media.AVProVideo /// public virtual bool IsExternalPlaybackActive() { return false; } /// - public virtual void SetAllowsExternalPlayback(bool enable) { } + public virtual void SetAllowsExternalPlayback(bool enable) { Debug.Log("External playback not supported on this platform"); } /// - public virtual void SetExternalPlaybackVideoGravity(ExternalPlaybackVideoGravity gravity) { } + public virtual void SetExternalPlaybackVideoGravity(ExternalPlaybackVideoGravity gravity) { Debug.Log("External playback not supported on this platform"); } // Authentication //public virtual void SetKeyServerURL(string url) { } diff --git a/3d/Assets/Framework/ThirdParty/NaughtyAttributes/Scripts/Core/DrawerAttributes/ProgressBarAttribute.cs b/3d/Assets/Framework/ThirdParty/NaughtyAttributes/Scripts/Core/DrawerAttributes/ProgressBarAttribute.cs index 72b7ea8..4f2666e 100644 --- a/3d/Assets/Framework/ThirdParty/NaughtyAttributes/Scripts/Core/DrawerAttributes/ProgressBarAttribute.cs +++ b/3d/Assets/Framework/ThirdParty/NaughtyAttributes/Scripts/Core/DrawerAttributes/ProgressBarAttribute.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; namespace NaughtyAttributes { @@ -26,7 +27,7 @@ namespace NaughtyAttributes public ProgressBarAttribute(float maxValue, EColor color = EColor.Blue) : this("", maxValue, color) - { + {UnityEngine.Debug.Log("ProgressBarAttribute"); } public ProgressBarAttribute(string maxValueName, EColor color = EColor.Blue) diff --git a/3d/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs b/3d/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs index 3f3a532..80c593b 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs @@ -163,9 +163,9 @@ namespace Cysharp.Threading.Tasks public bool IsCompleted => !cancellationToken.CanBeCanceled || cancellationToken.IsCancellationRequested; - public void GetResult() - { - } + + + public void OnCompleted(Action continuation) { diff --git a/3d/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs b/3d/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs index 8ac8a29..a77b9d4 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs @@ -1088,7 +1088,7 @@ namespace Cysharp.Threading.Tasks public bool IsCompleted => false; - public void GetResult() { } + public void GetResult() {Debug.Log("GetResult"); } public void OnCompleted(Action continuation) { diff --git a/3d/Assets/Plugins/UniTask/Runtime/UniTaskObservableExtensions.cs b/3d/Assets/Plugins/UniTask/Runtime/UniTaskObservableExtensions.cs index e5efd95..51b7186 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/UniTaskObservableExtensions.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/UniTaskObservableExtensions.cs @@ -1,6 +1,7 @@ #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System; +using System.Diagnostics; using System.Runtime.ExceptionServices; using System.Threading; using Cysharp.Threading.Tasks.Internal; @@ -647,15 +648,15 @@ namespace Cysharp.Threading.Tasks.Internal } public void OnCompleted() - { + {UnityEngine.Debug.Log("EmptyObserver.OnCompleted"); } public void OnError(Exception error) - { + {UnityEngine.Debug.Log("EmptyObserver.OnError"); } public void OnNext(T value) - { + {UnityEngine.Debug.Log("EmptyObserver.OnNext"); } } @@ -669,7 +670,7 @@ namespace Cysharp.Threading.Tasks.Internal } public void OnCompleted() - { + {UnityEngine.Debug.Log("ThrowObserver.OnCompleted"); } public void OnError(Exception error) @@ -678,7 +679,7 @@ namespace Cysharp.Threading.Tasks.Internal } public void OnNext(T value) - { + {UnityEngine.Debug.Log("ThrowObserver.OnNext"); } } diff --git a/3d/Assets/Scripts/SetHorizontal.cs b/3d/Assets/Scripts/SetHorizontal.cs index cc012b2..ddfca3e 100644 --- a/3d/Assets/Scripts/SetHorizontal.cs +++ b/3d/Assets/Scripts/SetHorizontal.cs @@ -14,9 +14,7 @@ public class SetHorizontal : MonoBehaviour // Use this for initialization void Start() { - - //Init(); - //Nevigate(content.GetChild(45).GetComponent()); + Debug.Log("SetHorizontal Start"); } private void Init() diff --git a/3d/Assets/Zion/Scripts/ChangeScence.cs b/3d/Assets/Zion/Scripts/ChangeScence.cs index 0ca6269..f6d4b77 100644 --- a/3d/Assets/Zion/Scripts/ChangeScence.cs +++ b/3d/Assets/Zion/Scripts/ChangeScence.cs @@ -54,10 +54,10 @@ public class ChangeScence : MonoBehaviour } }); } - void Update() - { + + + - } /// /// 延迟显示黑屏 /// diff --git a/3d/Assets/Zion/Scripts/ERP/SwitchgearMaterialRequestSystem.cs b/3d/Assets/Zion/Scripts/ERP/SwitchgearMaterialRequestSystem.cs index b2e1cb1..181e66a 100644 --- a/3d/Assets/Zion/Scripts/ERP/SwitchgearMaterialRequestSystem.cs +++ b/3d/Assets/Zion/Scripts/ERP/SwitchgearMaterialRequestSystem.cs @@ -33,10 +33,10 @@ public class SwitchgearMaterialRequestSystem : MonoBehaviour private bool isfirst = true; - private void OnEnable() - { - - } + + + + // Start is called before the first frame update void Start() diff --git a/3d/Assets/Zion/Scripts/MaterialCenter.cs b/3d/Assets/Zion/Scripts/MaterialCenter.cs index 14573cc..69a0c2d 100644 --- a/3d/Assets/Zion/Scripts/MaterialCenter.cs +++ b/3d/Assets/Zion/Scripts/MaterialCenter.cs @@ -240,7 +240,6 @@ public class MaterialCenter : MonoBehaviour { List toggleValues = GetToggleValues(); var processManager = MotionFramework.MotionEngine.GetModule(); - if (IsTeachingOrPreviewMode(processManager)) { if (processManager.HandleClick(toggleValues)) diff --git a/3d/Assets/Zion/Scripts/单据/DeliveryList.cs b/3d/Assets/Zion/Scripts/单据/DeliveryList.cs index e062759..3715e37 100644 --- a/3d/Assets/Zion/Scripts/单据/DeliveryList.cs +++ b/3d/Assets/Zion/Scripts/单据/DeliveryList.cs @@ -7,12 +7,6 @@ public class DeliveryList : MonoBehaviour // Start is called before the first frame update void Start() { - - } - - // Update is called once per frame - void Update() - { - + Debug.Log("DeliveryList Start"); } } diff --git a/3d/Assets/Zion/Scripts/单据/MaterialReturnWarehousingList.cs b/3d/Assets/Zion/Scripts/单据/MaterialReturnWarehousingList.cs index 7418fb0..2870956 100644 --- a/3d/Assets/Zion/Scripts/单据/MaterialReturnWarehousingList.cs +++ b/3d/Assets/Zion/Scripts/单据/MaterialReturnWarehousingList.cs @@ -4,13 +4,13 @@ using TMPro; using UnityEngine; /// -/// ⵥ +/// 结余物资退料入库单 /// public class MaterialReturnWarehousingList : MonoBehaviour { /// - /// ı + /// 物料描述文本 /// public TextMeshProUGUI Materialdescription; void Start() @@ -19,10 +19,4 @@ public class MaterialReturnWarehousingList Materialdescription.text = data.materialName; } - - // Update is called once per frame - void Update() - { - - } } diff --git a/3d/Assets/Zion/Scripts/单据/WasteMaterialsFandoverForm.cs b/3d/Assets/Zion/Scripts/单据/WasteMaterialsFandoverForm.cs index 696c934..46ec31c 100644 --- a/3d/Assets/Zion/Scripts/单据/WasteMaterialsFandoverForm.cs +++ b/3d/Assets/Zion/Scripts/单据/WasteMaterialsFandoverForm.cs @@ -4,12 +4,12 @@ using TMPro; using UnityEngine; /// -/// Ͼƽ +/// 废旧物资移交单 /// public class WasteMaterialsFandoverForm : MonoBehaviour { /// - /// ı + /// 物料描述文本 /// public TextMeshProUGUI Materialdescription; void Start() @@ -18,10 +18,4 @@ public class WasteMaterialsFandoverForm : MonoBehaviour Materialdescription.text = data.materialName; } - - // Update is called once per frame - void Update() - { - - } } diff --git a/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs b/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs index 47b3b43..75e1774 100644 --- a/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs +++ b/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs @@ -144,7 +144,7 @@ public class BasePanel : MonoBehaviour /// Slider的当前值 protected virtual void OnChangeSlider(string sliderPath, float value) { - // 处理Slider值变化事件 + Debug.Log(sliderPath + " 处理Slider值变化事件: " + value); } ///