From a49ed1e54f49e960e694a2a50d93887c022456ef Mon Sep 17 00:00:00 2001 From: wangzhixun <3077614386@qq.com> Date: Tue, 4 Nov 2025 22:38:27 +0800 Subject: [PATCH] 3.0 --- 3d/Assets/AVProVideo/Editor/Scripts/EditorHelper.cs | 5 +++-- 3d/Assets/Framework/Manager/ProcessManager.cs | 7 ++++--- .../Scripts/CrossPlatformInputManager.cs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/3d/Assets/AVProVideo/Editor/Scripts/EditorHelper.cs b/3d/Assets/AVProVideo/Editor/Scripts/EditorHelper.cs index fa41799..431438d 100644 --- a/3d/Assets/AVProVideo/Editor/Scripts/EditorHelper.cs +++ b/3d/Assets/AVProVideo/Editor/Scripts/EditorHelper.cs @@ -1,6 +1,7 @@ using UnityEngine; using UnityEditor; using System.Collections.Generic; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; //----------------------------------------------------------------------------- // Copyright 2015-2021 RenderHeads Ltd. All rights reserved. @@ -47,9 +48,9 @@ namespace RenderHeads.Media.AVProVideo.Editor /// Also changes all backslash characters to forwardslash for better cross-platform compatability /// internal static bool SafeSetPathProperty(string path, SerializedProperty property) - { + { bool result = false; - if (path == null) + if (string.IsNullOrEmpty(path)) { path = string.Empty; } diff --git a/3d/Assets/Framework/Manager/ProcessManager.cs b/3d/Assets/Framework/Manager/ProcessManager.cs index 5a79433..1694f30 100644 --- a/3d/Assets/Framework/Manager/ProcessManager.cs +++ b/3d/Assets/Framework/Manager/ProcessManager.cs @@ -11,6 +11,7 @@ using HighlightPlus; // using HighlightPlus; using MotionFramework; using Newtonsoft.Json; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; using TMPro; using Unity.VisualScripting; using UnityEngine; @@ -2818,10 +2819,10 @@ namespace DefaultNamespace.ProcessMode private bool IsStringEqualIgnoreCase(string str1, string str2) { // 如果两个字符串都为null,则认为相等 - if (str1 == null && str2 == null) return true; + if (string.IsNullOrEmpty(str1)&& string.IsNullOrEmpty(str2)) return true; // 如果只有一个为null,则认为不相等 - if (str1 == null || str2 == null) return false; + if (string.IsNullOrEmpty(str1) || string.IsNullOrEmpty(str2) ) return false; // 先进行中文符号转换,再进行忽略大小写的比较 string normalizedStr1 = NormalizeChineseSymbols(str1); @@ -3834,7 +3835,7 @@ namespace DefaultNamespace.ProcessMode } } - if (matchedAnswer == null) + if (string.IsNullOrEmpty(matchedAnswer)) { Debug.Log($"【框架消息】【输入验证】输入验证失败: '{input}' 不匹配当前动作的正确答案 (UI: {uiId})"); return false; diff --git a/3d/Assets/Plugins/Standard Assets/CrossPlatformInput/Scripts/CrossPlatformInputManager.cs b/3d/Assets/Plugins/Standard Assets/CrossPlatformInput/Scripts/CrossPlatformInputManager.cs index 9d368c8..b42e324 100644 --- a/3d/Assets/Plugins/Standard Assets/CrossPlatformInput/Scripts/CrossPlatformInputManager.cs +++ b/3d/Assets/Plugins/Standard Assets/CrossPlatformInput/Scripts/CrossPlatformInputManager.cs @@ -68,7 +68,7 @@ namespace UnityStandardAssets.CrossPlatformInput public static void UnRegisterVirtualAxis(string name) { - if (name == null) + if (string.IsNullOrEmpty(name)) { throw new ArgumentNullException("name"); }