From dff043e075aff311c973f3e058f973f0a169fe60 Mon Sep 17 00:00:00 2001
From: ALEXTANG <574809918@qq.com>
Date: Wed, 24 Apr 2024 11:17:38 +0800
Subject: [PATCH] Update SahderVariantCollect

Update SahderVariantCollect
---
 .../ShaderVariantCollectionManifest.cs                | 11 ++++++++++-
 .../ShaderVariantCollector/ShaderVariantCollector.cs  |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs b/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs
index 73f7b783..49414bfe 100644
--- a/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs
+++ b/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs
@@ -25,7 +25,7 @@ public class ShaderVariantCollectionManifest
     }
 
     [Serializable]
-    public class ShaderVariantInfo
+    public class ShaderVariantInfo : IComparable<ShaderVariantInfo>
     {
         /// <summary>
         /// 着色器资源路径.
@@ -46,6 +46,13 @@ public class ShaderVariantCollectionManifest
         /// 着色器变种列表
         /// </summary>
         public List<ShaderVariantElement> ShaderVariantElements = new List<ShaderVariantElement>(1000);
+
+        public int CompareTo(ShaderVariantInfo other)
+        {
+            string thisStr = AssetPath + "+" +ShaderName;
+            string otherStr = other.AssetPath + "+" + other.ShaderName;
+            return thisStr.CompareTo(otherStr);
+        }
     }
 
 
@@ -141,6 +148,8 @@ public class ShaderVariantCollectionManifest
             }
         }
 
+        // 重新排序
+        manifest.ShaderVariantInfos.Sort();
         return manifest;
     }
 }
\ No newline at end of file
diff --git a/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollector.cs b/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollector.cs
index 5a953673..2eada214 100644
--- a/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollector.cs
+++ b/UnityProject/Packages/YooAsset/Editor/Extension/YooAssetEditor/ShaderVariantCollector/ShaderVariantCollector.cs
@@ -22,7 +22,7 @@ public static class ShaderVariantCollector
     }
 
     private const float WaitMilliseconds = 1000f;
-    private const float SleepMilliseconds = 100f;
+    private const float SleepMilliseconds = 2000f;
     private static string _savePath;
     private static string _packageName;
     private static int _processMaxNum;