Simplify BuildIndex calculation

Author: arimger

Assets/Editor Toolbox/Runtime/Serialization/SceneSerializationUtility.cs

@@ -3,6 +3,7 @@
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
+using UnityEngine.SceneManagement;
 
 namespace Toolbox.Serialization
 {
@@ -40,37 +41,30 @@ internal static void ConfirmCache()
         internal static void RefreshCache()
         {
             cachedScenes.Clear();
-            var buildIndex = -1;
             foreach (var scene in EditorBuildSettings.scenes)
             {
-                if (string.IsNullOrEmpty(scene.path))
+                var path = scene.path;
+                if (string.IsNullOrEmpty(path))
                 {
                     continue;
                 }
 
-                var sceneAsset = EditorGUIUtility.Load(scene.path) as SceneAsset;
+                var sceneAsset = EditorGUIUtility.Load(path) as SceneAsset;
                 if (sceneAsset == null)
                 {
                     continue;
                 }
 
-                var sceneIndex = InvalidSceneIndex;
-                if (scene.enabled)
-                {
-                    buildIndex++;
-                    sceneIndex = buildIndex;
-                }
-
                 if (cachedScenes.ContainsKey(sceneAsset))
                 {
                     continue;
                 }
 
                 cachedScenes.Add(sceneAsset, new SceneData()
                 {
-                    BuildIndex = sceneIndex,
+                    BuildIndex = SceneUtility.GetBuildIndexByScenePath(path),
                     SceneName = sceneAsset.name,
-                    ScenePath = scene.path
+                    ScenePath = path
                 });
             }
         }