Merge branch '3d-2.0' of http://gitea.umayle.com/huangjiayu/Test-TaizhouWarehousePhaseII into 3d-2.0

3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightManager.cs

@@ -238,7 +238,7 @@ namespace HighlightPlus {
 
 
         bool CanInteract() {
-            if (!respectUI) return true;
+           
             EventSystem es = EventSystem.current;
             if (es == null) return true;
             if (Application.isMobilePlatform && InputProxy.touchCount > 0 && es.IsPointerOverGameObject(InputProxy.GetFingerIdFromTouch(0))) {

3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs

@@ -256,7 +256,7 @@ namespace HighlightPlus {
 #endif
 
         void SwitchCollider(Collider newCollider) {
-            if (!highlightOnHover && !hb.isSelected) return;
+            if (!hb.isSelected) return;
 
             currentCollider = newCollider;
             if (currentCollider != null) {

3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarController.cs

@@ -58,7 +58,7 @@ namespace ZTools
         {
             zCalendarModel.zCalendarController = this;
             zCalendarModel.Init();
-            if (zCalendarModel.isStaticCalendar) return;
+            
             // <20><>̬<EFBFBD><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹر<C9B9>
            
             

3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_PlatformOptions.cs

@@ -145,7 +145,7 @@ namespace RenderHeads.Media.AVProVideo
 				|| !useHardwareDecoding
 				
 				|| use10BitTextures
-				|| useLowLatency
+				
 				|| audioOutput != WindowsUWP.AudioOutput.System
 				|| (audio360ChannelMode != Audio360ChannelMode.TBE_8_2)
 				|| videoApi != WindowsUWP.VideoApi.WinRT
@@ -606,7 +606,7 @@ namespace RenderHeads.Media.AVProVideo
 
 			public override bool IsModified()
 			{
-				return (base.IsModified() || externalLibrary != WebGL.ExternalLibrary.None || useTextureMips);
+				return (base.IsModified() || externalLibrary != WebGL.ExternalLibrary.None);
 			}
 
 			// Decryption support

3d/Assets/Editor/QuestionConfigEditor.cs

@@ -3,6 +3,7 @@ using UnityEditor;
 using System.Collections.Generic;
 using System.IO;
 using Newtonsoft.Json;
+using System.Text;
 
 public class QuestionConfigEditor : EditorWindow
 {

3d/Assets/Framework/ThirdParty/NaughtyAttributes/Scripts/Editor/NaughtyInspector.cs

@@ -137,13 +137,13 @@ namespace NaughtyAttributes.Editor
         {
             if (_nonSerializedFields.Any())
             {
-                if (drawHeader)
+               
-                {
+                
-                    EditorGUILayout.Space();
+                    
-                    EditorGUILayout.LabelField("Non-Serialized Fields", GetHeaderGUIStyle());
+                    
-                    NaughtyEditorGUI.HorizontalLine(
+                    
-                        EditorGUILayout.GetControlRect(false), HorizontalLineAttribute.DefaultHeight, HorizontalLineAttribute.DefaultColor.GetColor());
+                       
-                }
+                
 
                 foreach (var field in _nonSerializedFields)
                 {

3d/Assets/Plugins/Demigiant/DOTweenPro/DOTweenAnimation.cs

@@ -648,7 +648,7 @@ namespace DG.Tweening
             if (tween == null) {
                 if (Debugger.logPriority > 1) Debugger.LogNullTween(tween); return;
             }
-            if (fromHere && isRelative) ReEvaluateRelativeTween();
+            
             DOTween.Restart(GetTweenTarget());
         }
 

3d/Assets/Plugins/UniTask/Runtime/Internal/ArrayPool.cs

@@ -59,7 +59,7 @@ namespace Cysharp.Threading.Tasks.Internal
                 }
                 finally
                 {
-                    if (lockTaken) locks[index].Exit(false);
+                    
                 }
             }
 
@@ -97,7 +97,7 @@ namespace Cysharp.Threading.Tasks.Internal
                 }
                 finally
                 {
-                    if (lockTaken) locks[index].Exit(false);
+                    
                 }
             }
         }

3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs

@@ -180,7 +180,7 @@ namespace Cysharp.Threading.Tasks.Internal
                 }
                 finally
                 {
-                    if (lockTaken) gate.Exit(false);
+                    
                 }
             }
 

3d/Assets/Plugins/UniTask/Runtime/Internal/WeakDictionary.cs

@@ -231,14 +231,14 @@ namespace Cysharp.Threading.Tasks.Internal
         // avoid allocate everytime.
         public int ToList(ref List<KeyValuePair<TKey, TValue>> list, bool clear = true)
         {
-            if (clear)
+            
-            {
+            
-                list.Clear();
+        
-            }
+            
 
             var listIndex = 0;
 
-            bool lockTaken = false;
+            
             try
             {
                 for (int i = 0; i < buckets.Length; i++)

3d/Assets/Plugins/UniTask/Runtime/UniTaskSynchronizationContext.cs

@@ -65,7 +65,7 @@ namespace Cysharp.Threading.Tasks
             }
             finally
             {
-                if (lockTaken) gate.Exit(false);
+                
             }
         }
 

3d/Assets/Scripts/ProgressBarController.cs

@@ -61,10 +61,10 @@ public class ProgressBarController : MonoBehaviour
     /// </summary>
     private void Start()
     {
-        if (autoStart)
+        
-        {
+        
-            StartProgress();
+            
-        }
+        
     }
     
     /// <summary>

3d/Assets/Scripts/QuestionManager.cs

@@ -224,17 +224,16 @@ public class QuestionManager : MonoBehaviour
             c.questionName == name && c.configType == type);
     }
 
-    // 获取对象的Hierarchy路径
+   
-    private string GetHierarchyPath(Transform trans)
+    
-    {
+        
-        string path = trans.name;
+      
-        while (trans.parent != null)
+        
-        {
+            
-            trans = trans.parent;
+            
-            path = trans.name + "/" + path;
+        
-        }
+ 
-        return path;
+    
-    }
 
     // 重新加载配置并绑定事件（可以在运行时调用）
     public void ReloadConfig()

3d/Assets/Zion/Scripts/配送/Manager/ZipWrapper.cs

@@ -471,8 +471,8 @@ public class ZipWrapper : MonoBehaviour
             entry = new ZipEntry(entryName);
             entry.DateTime = System.DateTime.Now;
 
-            if ((null != _zipCallback) && !_zipCallback.OnPreZip(entry))
+         
-                return true;    // 跳过
+               
 
             // 使用 using 语句确保 FileStream 资源被正确释放
             using (FileStream fileStream = File.OpenRead(_filePathName))
@@ -516,8 +516,8 @@ public class ZipWrapper : MonoBehaviour
             entry.DateTime = System.DateTime.Now;
             entry.Size = 0;
 
-            if ((null != _zipCallback) && !_zipCallback.OnPreZip(entry))
+          
-                return true;    // <20><><EFBFBD><EFBFBD>
+              
 
             _zipOutputStream.PutNextEntry(entry);
             _zipOutputStream.Flush();