From 0401d638a1198b4d2580e8ff160cc4b01a6f832b Mon Sep 17 00:00:00 2001 From: walon Date: Tue, 6 Dec 2022 14:32:54 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8Dinstaller=E4=B8=AD?= =?UTF-8?q?=E6=9C=AA=E5=A1=ABhybridclr=E5=8F=8Ail2cpp=5Fplus=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=97=B6hybridclr=E5=8F=96main=E5=88=86?= =?UTF-8?q?=E6=94=AF=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=EF=BC=8C=E8=80=8C?= =?UTF-8?q?il2cpp=5Fplus=E5=8F=961.0=E5=88=86=E6=94=AF=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=89=88=E6=9C=AC=E4=B8=8D=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E8=80=8C=E5=B4=A9=E6=BA=83=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/Installer/InstallerWindow.cs | 10 +++++++--- package.json | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Editor/Installer/InstallerWindow.cs b/Editor/Installer/InstallerWindow.cs index 345416a..0074ded 100644 --- a/Editor/Installer/InstallerWindow.cs +++ b/Editor/Installer/InstallerWindow.cs @@ -10,12 +10,14 @@ namespace HybridCLR.Editor.Installer { private InstallerController m_Controller; - string _hybridclrVersion = ""; - string _il2cppPlusVersion = ""; + string _hybridclrVersion; + string _il2cppPlusVersion; private void OnEnable() { m_Controller = new InstallerController(); + _hybridclrVersion = "1.0"; + _il2cppPlusVersion = $"{m_Controller.Il2CppBranch}-1.0"; } private void OnGUI() @@ -138,7 +140,9 @@ namespace HybridCLR.Editor.Installer private void InitHybridCLR() { - m_Controller.InitHybridCLR(m_Controller.Il2CppBranch, m_Controller.Il2CppInstallDirectory, _hybridclrVersion, _il2cppPlusVersion); + string hybridclrVersion = string.IsNullOrWhiteSpace(_hybridclrVersion) ? "1.0" : _hybridclrVersion; + string il2cppPlusVersion = string.IsNullOrWhiteSpace(_il2cppPlusVersion) ? $"{m_Controller.Il2CppBranch}-1.0" : _il2cppPlusVersion; + m_Controller.InitHybridCLR(m_Controller.Il2CppBranch, m_Controller.Il2CppInstallDirectory, hybridclrVersion, il2cppPlusVersion); } private void UpdateHybridCLR() diff --git a/package.json b/package.json index e0f2a84..c5c7fff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.focus-creative-games.hybridclr_unity", - "version": "1.0.3", + "version": "1.0.4", "displayName": "HybridCLR", "description": "Unity package for HybridCLR. It includes editor and runtime scripts and assets for HybridCLR", "category": "Runtime",