From 0a82b0d339dc4746c22631a7d00b768df59585ef Mon Sep 17 00:00:00 2001
From: walon <walon@focus-creative-games.com>
Date: Fri, 16 Jun 2023 18:18:41 +0800
Subject: [PATCH] =?UTF-8?q?[new]=20Installer=E7=95=8C=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=98=BE=E7=A4=BApackage=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Editor/Installer/InstallerController.cs | 18 ++++++++++++++++++
 Editor/Installer/InstallerWindow.cs     |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Editor/Installer/InstallerController.cs b/Editor/Installer/InstallerController.cs
index 6d4cd53..25f628c 100644
--- a/Editor/Installer/InstallerController.cs
+++ b/Editor/Installer/InstallerController.cs
@@ -24,11 +24,14 @@ namespace HybridCLR.Editor.Installer
         private readonly HybridclrVersionManifest _versionManifest;
         private readonly HybridclrVersionInfo _curDefaultVersion;
 
+        public string PackageVersion { get; private set; }
+
         public InstallerController()
         {
             _curVersion = ParseUnityVersion(Application.unityVersion);
             _versionManifest = GetHybridCLRVersionManifest();
             _curDefaultVersion = _versionManifest.versions.FirstOrDefault(v => v.unity_version == _curVersion.major.ToString());
+            PackageVersion = LoadPackageInfo().version;
         }
 
         private HybridclrVersionManifest GetHybridCLRVersionManifest()
@@ -37,6 +40,21 @@ namespace HybridCLR.Editor.Installer
             return JsonUtility.FromJson<HybridclrVersionManifest>(File.ReadAllText(versionFile, Encoding.UTF8));
         }
 
+        private PackageInfo LoadPackageInfo()
+        {
+            string packageJson = $"{SettingsUtil.ProjectDir}/Packages/{SettingsUtil.PackageName}/package.json";
+            return JsonUtility.FromJson<PackageInfo>(File.ReadAllText(packageJson, Encoding.UTF8));
+        }
+
+
+        [Serializable]
+        class PackageInfo
+        {
+            public string name;
+
+            public string version;
+        }
+
         [Serializable]
         class VersionDesc
         {
diff --git a/Editor/Installer/InstallerWindow.cs b/Editor/Installer/InstallerWindow.cs
index 4067f4a..9f26c3c 100644
--- a/Editor/Installer/InstallerWindow.cs
+++ b/Editor/Installer/InstallerWindow.cs
@@ -44,7 +44,10 @@ namespace HybridCLR.Editor.Installer
             EditorGUILayout.LabelField($"安装状态：{(hasInstall ? "已安装" : "未安装")}", EditorStyles.boldLabel);
             GUILayout.Space(10f);
 
-            EditorGUILayout.LabelField($"HybridCLR 版本:    {_controller.HybridclrLocalVersion}");
+
+            EditorGUILayout.LabelField($"{SettingsUtil.PackageName} 版本:     v{_controller.PackageVersion}");
+            GUILayout.Space(5f);
+            EditorGUILayout.LabelField($"bybridclr 版本:    {_controller.HybridclrLocalVersion}");
             GUILayout.Space(5f);
             EditorGUILayout.LabelField($"il2cpp_plus 版本:    {_controller.Il2cppPlusLocalVersion}");
             GUILayout.Space(5f);