bugfix: 修复切换场景离开事件触发不正确bug

jarjin · Feb 21, 2021 · bd12a3c · bd12a3c
1 parent eb3a59d
commit bd12a3c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/FirClient/Assets/Scripts/Utility/LuaHelper.cs b/FirClient/Assets/Scripts/Utility/LuaHelper.cs
@@ -1,5 +1,6 @@
 using FirClient.Data;
 using FirClient.Define;
+using FirClient.Extensions;
 using LuaInterface;
 using System;
 using System.Collections;
@@ -73,16 +74,19 @@ public static void LoadLevel(LevelType levelType, LuaTable self, LuaFunction onL
         /// </summary>
         static IEnumerator OnLoadLevel(LevelType levelType, LuaTable self, LuaFunction onLeave, LuaFunction onEnter)
         {
-            int levelid = (int)levelType;
-            var op = SceneManager.LoadSceneAsync(levelid);
+            Scene scene = SceneManager.GetActiveScene();
+            var levelName = scene.name.FirstCharToUpper();
+            LevelType currLevel = (LevelType)Enum.Parse(typeof(LevelType), levelName);
+
+            var op = SceneManager.LoadSceneAsync(levelType.ToString());
             yield return op;
             yield return new WaitForSeconds(0.1f);
 
             if (LevelType.Loader == levelType)
             {
                 if (onLeave != null)
                 {
-                    onLeave.Call<LuaTable, LevelType, Action>(self, levelType, (Action)delegate ()
+                    onLeave.Call<LuaTable, LevelType, Action>(self, currLevel, delegate ()
                     {
                         Util.StartCoroutine(OnLoadLevel(newLevel, self, onLeave, onEnter));
                     });