Merge pull request Alex-Rachel#91 from mi1890/main

* [fix] installed as a package ,class not found issue
BlisonFCF · Aug 8, 2024 · c7fad13 · c7fad13
2 parents 5a883bc + 650469a
commit c7fad13
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/UnityProject/Assets/TEngine/Editor/EventInterface/EventInterfaceGenerate.cs b/UnityProject/Assets/TEngine/Editor/EventInterface/EventInterfaceGenerate.cs
@@ -69,7 +69,23 @@ public static void Generate()
         EventInterfaceGenerateTag.HadGenerate = true;
 
         // 加载程序集
-        Assembly assembly = typeof(GameApp).Assembly;
+         Assembly assembly = null;
+        foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+        {
+            foreach(var type in asm.GetTypes())
+            {
+                if (type.Name == "GameApp")
+                {
+                    assembly = asm;
+                    break;
+                }
+            }
+        }
+        if(assembly == null)
+        {
+            Debug.LogError("Game App Class Not Found");
+            return;
+        }
 
         // 获取程序集中的所有类型
         Type[] types = assembly.GetTypes();

diff --git a/UnityProject/Assets/TEngine/Editor/GameSettings/TEngineSettingsProvider.cs b/UnityProject/Assets/TEngine/Editor/GameSettings/TEngineSettingsProvider.cs
@@ -10,14 +10,20 @@ public class TEngineSettingsProvider : SettingsProvider
     private const string headerName = "TEngine/TEngineSettings";
     private SerializedObject m_CustomSettings;
 
+    private static string m_SettingsPath = k_SettingsPath;
     internal static SerializedObject GetSerializedSettings()
     {
         return new SerializedObject(SettingsUtils.GlobalSettings);
     }
 
     public static bool IsSettingsAvailable()
     {
-        return File.Exists(k_SettingsPath);
+        var pathes = AssetDatabase.FindAssets("TEngineGlobalSettings", new string[2] { k_SettingsPath,"Packages/com.tengine/" });
+        if (pathes.Length > 0)
+        {
+            m_SettingsPath = AssetDatabase.GUIDToAssetPath(pathes[0]);
+        }
+        return pathes.Length > 0;
     }
 
     public override void OnActivate(string searchContext, VisualElement rootElement)
@@ -29,16 +35,16 @@ public override void OnActivate(string searchContext, VisualElement rootElement)
     public override void OnDeactivate()
     {
         base.OnDeactivate();
-        SaveAssetData(k_SettingsPath);
+        SaveAssetData(m_SettingsPath);
     }
-    
+
     void SaveAssetData(string path)
     {
-        TEngineSettings old = AssetDatabase.LoadAssetAtPath<TEngineSettings>(k_SettingsPath);
+        TEngineSettings old = AssetDatabase.LoadAssetAtPath<TEngineSettings>(m_SettingsPath);
         TEngineSettings data = ScriptableObject.CreateInstance<TEngineSettings>();
         data.Set(old.FrameworkGlobalSettings, old.BybridCLRCustomGlobalSettings);
         AssetDatabase.DeleteAsset(path);
-        AssetDatabase.CreateAsset(data, path);              
+        AssetDatabase.CreateAsset(data, path);
         AssetDatabase.SaveAssets();
         AssetDatabase.Refresh();
     }