同步

Assets/Scripts/Manager/ProjectLoader.cs

@@ -76,6 +76,7 @@ namespace Ichni
                             {
                                 GameManager.Instance.gameLoadingCanvas.FadeOut();
                                 GameManager.Instance.songPlayer.isLoading = false;
+                                GameManager.Instance.songPlayer.isStarting = true;
 
                                 GameManager.Instance.beatmapContainer.gameElementList.ForEach(element => element.BeforeStart());
 

Assets/Scripts/Manager/SongPlayer.cs

@@ -10,12 +10,12 @@ namespace Ichni
     public class SongPlayer : SerializedMonoBehaviour
     {
         public bool isLoading = true;
-        public bool isStarting = true;
+        public bool isStarting = false;
         public bool isDelaying = false;
         public bool isPlaying = false; // 是否正在播放音乐
         public bool isPausing = false; // 是否正在暂停音乐
         public bool isFinished = false;
-        public bool isUpdating => isDelaying || isPlaying;
+        public bool isUpdating => isStarting || isDelaying || isPlaying;
         
         public Event PlayMusicEvent; // 播放背景音乐的事件
         public Event ResumeMusicEvent; // 恢复播放背景音乐的事件
@@ -35,7 +35,7 @@ namespace Ichni
             InformationTransistor.instance.chapterSwitch.SetValue(gameObject);
             InformationTransistor.instance.songSwitch.SetValue(gameObject);
             isLoading = true;
-            isStarting = true;
+            isStarting = false;
         }
         
         private void Update()

Assets/Scripts/Manager/ThemeBundleManager.cs

@@ -193,11 +193,11 @@ namespace Ichni
             assetList_Other = new List<Object>();
         }
 
-        public T GetObject<T>(string name)
+        public T GetObject<T>(string name) where T : class
         {
             if (name == "None")
             {
-                return default(T);
+                return null;
             }
 
             T[] assetList;
@@ -210,7 +210,7 @@ namespace Ichni
                 {
                     if (name == assetList_GameObject[i].name)
                     {
-                        return assetList[i];
+                        if (assetList != null) return assetList[i];
                     }
                 }
             }
@@ -222,7 +222,7 @@ namespace Ichni
                 {
                     if (name == assetList_Material[i].name)
                     {
-                        return assetList[i];
+                        if (assetList != null) return assetList[i];
                     }
                 }
             }
@@ -234,7 +234,7 @@ namespace Ichni
                 {
                     if (name == assetList_Texture[i].name)
                     {
-                        return assetList[i];
+                        if (assetList != null) return assetList[i];
                     }
                 }
             }
@@ -245,12 +245,12 @@ namespace Ichni
                 {
                     if (name == assetList_Other[i].name)
                     {
-                        return assetList[i];
+                        if (assetList != null) return assetList[i];
                     }
                 }
             }
 
-            return default(T);
+            return null;
         }
     }
 }