huangjiayu
/
Test-TaizhouWarehousePhaseII
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.0

This commit is contained in:
wangzhixun 2025-11-04 22:38:27 +08:00
parent bd1d86b54d
commit a49ed1e54f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3d/Assets/AVProVideo/Editor/Scripts/EditorHelper.cs
View File

@ -1,6 +1,7 @@
using UnityEngine; using UnityEngine;
using UnityEditor; using UnityEditor;
using System.Collections.Generic; using System.Collections.Generic;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright 2015-2021 RenderHeads Ltd. All rights reserved. // 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 /// Also changes all backslash characters to forwardslash for better cross-platform compatability
/// </summary> /// </summary>
internal static bool SafeSetPathProperty(string path, SerializedProperty property) internal static bool SafeSetPathProperty(string path, SerializedProperty property)
{ {
bool result = false; bool result = false;
if (path == null) if (string.IsNullOrEmpty(path))
{ {
path = string.Empty; path = string.Empty;
} }

7
3d/Assets/Framework/Manager/ProcessManager.cs
View File

@ -11,6 +11,7 @@ using HighlightPlus;
// using HighlightPlus; // using HighlightPlus;
using MotionFramework; using MotionFramework;
using Newtonsoft.Json; using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using TMPro; using TMPro;
using Unity.VisualScripting; using Unity.VisualScripting;
using UnityEngine; using UnityEngine;
@ -2818,10 +2819,10 @@ namespace DefaultNamespace.ProcessMode
private bool IsStringEqualIgnoreCase(string str1, string str2) private bool IsStringEqualIgnoreCase(string str1, string str2)
{ {
// 如果两个字符串都为null，则认为相等 // 如果两个字符串都为null，则认为相等
if (str1 == null && str2 == null) return true; if (string.IsNullOrEmpty(str1)&& string.IsNullOrEmpty(str2)) return true;
// 如果只有一个为null，则认为不相等 // 如果只有一个为null，则认为不相等
if (str1 == null || str2 == null) return false; if (string.IsNullOrEmpty(str1) || string.IsNullOrEmpty(str2) ) return false;
// 先进行中文符号转换，再进行忽略大小写的比较 // 先进行中文符号转换，再进行忽略大小写的比较
string normalizedStr1 = NormalizeChineseSymbols(str1); string normalizedStr1 = NormalizeChineseSymbols(str1);
@ -3834,7 +3835,7 @@ namespace DefaultNamespace.ProcessMode
} }
} }
if (matchedAnswer == null) if (string.IsNullOrEmpty(matchedAnswer))
{ {
Debug.Log($"<color=green>【框架消息】</color>【输入验证】输入验证失败: '{input}' 不匹配当前动作的正确答案 (UI: {uiId})"); Debug.Log($"<color=green>【框架消息】</color>【输入验证】输入验证失败: '{input}' 不匹配当前动作的正确答案 (UI: {uiId})");
return false; return false;

2
3d/Assets/Plugins/Standard Assets/CrossPlatformInput/Scripts/CrossPlatformInputManager.cs
View File

@ -68,7 +68,7 @@ namespace UnityStandardAssets.CrossPlatformInput
public static void UnRegisterVirtualAxis(string name) public static void UnRegisterVirtualAxis(string name)
{ {
if (name == null) if (string.IsNullOrEmpty(name))
{ {
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
} }