From 7749b6448e48ff3e3c920992a41166bb355669d5 Mon Sep 17 00:00:00 2001
From: walon <walon@focus-creative-games.com>
Date: Mon, 12 Jun 2023 13:30:32 +0800
Subject: [PATCH] =?UTF-8?q?[change]=20=E5=BD=93=E7=94=A8=E4=B8=8D=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E7=89=88=E6=9C=AC=E6=89=93=E5=BC=80Installer=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E6=98=AF=E6=98=BE=E7=A4=BA=E2=80=9C=E4=B8=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=89=88=E6=9C=AC=E4=B8=8D=E5=85=BC=E5=AE=B9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Editor/Installer/InstallerController.cs |  7 ++++++-
 Editor/Installer/InstallerWindow.cs     | 22 ++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Editor/Installer/InstallerController.cs b/Editor/Installer/InstallerController.cs
index 8c578f3..1531549 100644
--- a/Editor/Installer/InstallerController.cs
+++ b/Editor/Installer/InstallerController.cs
@@ -6,6 +6,7 @@ using UnityEditor;
 using UnityEngine;
 using Debug = UnityEngine.Debug;
 using System.Text.RegularExpressions;
+using System.Linq;
 
 namespace HybridCLR.Editor.Installer
 {
@@ -27,7 +28,7 @@ namespace HybridCLR.Editor.Installer
         {
             _curVersion = ParseUnityVersion(Application.unityVersion);
             _versionManifest = GetHybridCLRVersionManifest();
-            _curDefaultVersion = _versionManifest.versions.Find(v => v.unity_version == _curVersion.major.ToString());
+            _curDefaultVersion = _versionManifest.versions.FirstOrDefault(v => v.unity_version == _curVersion.major.ToString());
         }
 
         private HybridclrVersionManifest GetHybridCLRVersionManifest()
@@ -112,6 +113,10 @@ namespace HybridCLR.Editor.Installer
         public bool IsComaptibleVersion()
         {
             UnityVersion version = _curVersion;
+            if (version == null)
+            {
+                return false;
+            }
             if (version.minor1 != 3)
             {
                 return false;
diff --git a/Editor/Installer/InstallerWindow.cs b/Editor/Installer/InstallerWindow.cs
index 9e0363c..4067f4a 100644
--- a/Editor/Installer/InstallerWindow.cs
+++ b/Editor/Installer/InstallerWindow.cs
@@ -48,24 +48,18 @@ namespace HybridCLR.Editor.Installer
             GUILayout.Space(5f);
             EditorGUILayout.LabelField($"il2cpp_plus 版本:    {_controller.Il2cppPlusLocalVersion}");
             GUILayout.Space(5f);
-            //GUIInstallButton("检查更新", "检查", UpdateHybridCLR);
-            //GUILayout.Space(40f);
             
             GUILayout.Space(10f);
 
+            if (_controller.IsComaptibleVersion())
+            {
+                GUIInstallButton("安装hybridclr+il2cpp_plus代码到本地目录", "安装");
+            }
+            else
+            {
+                EditorGUILayout.HelpBox("与当前版本不兼容", MessageType.Error);
+            }
 
-            //EditorGUILayout.BeginHorizontal();
-            //EditorGUILayout.LabelField("待安装的 hybridclr 仓库版本号(或branch或tag)(默认取最新版本):", GUILayout.MaxWidth(400));
-            //_hybridclrVersion = EditorGUILayout.TextField(_hybridclrVersion);
-            //EditorGUILayout.EndHorizontal();
-
-            //EditorGUILayout.BeginHorizontal();
-            //EditorGUILayout.LabelField($"待安装的 il2cpp_plus 仓库版本号(或branch或tag)(默认取{_controller.MajorVersion}-main分支最新版本):", GUILayout.MaxWidth(400));
-            //_il2cppPlusVersion = EditorGUILayout.TextField(_il2cppPlusVersion);
-            //EditorGUILayout.EndHorizontal();
-
-
-            GUIInstallButton("安装hybridclr+il2cpp_plus代码到本地目录", "安装");
             EditorGUILayout.EndVertical();
         }