com.typhoon.unitysdk 1.0.50 → 1.0.52

package/CHANGELOG.md

@@ -1,7 +1,22 @@
 # 更新日志
+## [1.0.52] - 2023-12-10
+
+### 修复
+* 安装更新报错问题
+
+
+## [1.0.51] - 2023-12-10
+
+### 修复
+* 修复检查自动更新的bug
+
+### 优化
+* 自动更新是查看日志窗口添加安装按钮
+
+
 ## [1.0.50] - 2023-12-10
 
-### 新增
+### 新增
 * 新增历史版本记录
 * 允许切换历史版本
 

package/Editor/ChangelogPreviewerWindow.cs

@@ -12,6 +12,8 @@ namespace TyphoonUnitySDK
         private static void Open()
         {
             _changelog = null;
+            _versionInfo = null;
+            _showInstallBtn = false;
             var win = GetWindow<ChangelogPreviewerWindow>();
             win.minSize = new Vector2(600, 800);
             win.titleContent = new GUIContent("更新日志");
@@ -19,9 +21,11 @@ namespace TyphoonUnitySDK
         }
 
 
-        public static void Open(string changelog)
+        public static void Open(string changelog, bool showInstallBtn, PackageVersionInfo versionInfo)
         {
             _changelog = changelog;
+            _versionInfo = versionInfo;
+            _showInstallBtn = showInstallBtn;
             var win = GetWindow<ChangelogPreviewerWindow>();
             win.minSize = new Vector2(600, 800);
             win.titleContent = new GUIContent("更新日志");
@@ -29,6 +33,8 @@ namespace TyphoonUnitySDK
         }
 
         private static string _changelog;
+        private static PackageVersionInfo _versionInfo;
+        private static bool _showInstallBtn = false;
         private static Vector2 _scroll;
         private static GUIStyle _styleTxt;
 
@@ -67,6 +73,13 @@ namespace TyphoonUnitySDK
             _scroll = GUILayout.BeginScrollView(_scroll);
             GUILayout.TextArea(Changelog, StyleTxt);
             GUILayout.EndScrollView();
+            if (_showInstallBtn && _versionInfo != null)
+            {
+                if (GUILayout.Button("安装", GUILayout.Height(32)))
+                {
+                    UniEditor.UpdateInstallVersion(_versionInfo);
+                }
+            }
         }
     }
 }

package/Editor/UniEditor.cs

@@ -836,9 +836,9 @@ namespace TyphoonUnitySDK
         }
 
         //检查更新
-        public static bool CheckUpdate()
+        public static bool CheckUpdate(bool force = false)
         {
-            if (!Preferences.Default.CheckUpdate)
+            if (!Preferences.Default.CheckUpdate && force == false)
             {
                 return false;
             }
@@ -850,13 +850,13 @@ namespace TyphoonUnitySDK
                 {
                     //如果大于本地版本，提示有更新
                     var click = EditorUtility.DisplayDialogComplex("提示",
-                        $"发现新版本(可从选项中关闭此检查)\n版本：{CheckUpdateCacheData.Default.Latest.Version}\n日期：{CheckUpdateCacheData.Default.Latest.WriteTime.ToShortTimeString()}是否更新?",
+                        $"发现新版本(可从选项中关闭此检查)\n版本：{CheckUpdateCacheData.Default.Latest.Version}\n日期：{CheckUpdateCacheData.Default.Latest.GetWriteTimeDateString()}\n是否更新?",
                         "是", "否", "查看日志");
                     switch (click)
                     {
                         case 0:
                         {
-                            Debug.Log("修改配置，更新插件包");
+                            UpdateInstallVersion(CheckUpdateCacheData.Default.Latest);
                         }
                             break;
                         case 1:
@@ -866,8 +866,8 @@ namespace TyphoonUnitySDK
                             break;
                         case 2:
                         {
-                            Debug.Log("打开日志并展示");
-                            ChangelogPreviewerWindow.Open(CheckUpdateCacheData.Default.CombineChangelog());
+                            ChangelogPreviewerWindow.Open(CheckUpdateCacheData.Default.CombineChangelog(), true,
+                                CheckUpdateCacheData.Default.Latest);
                         }
                             break;
                     }
@@ -880,9 +880,9 @@ namespace TyphoonUnitySDK
         }
 
         //检查是否存在重大版本修复
-        public static bool CheckMajor()
+        public static bool CheckMajor(bool force = false)
         {
-            if (!Preferences.Default.CheckMajor)
+            if (!Preferences.Default.CheckMajor && force == false)
             {
                 return false;
             }
@@ -911,13 +911,13 @@ namespace TyphoonUnitySDK
             if (major)
             {
                 var click = EditorUtility.DisplayDialogComplex("提示",
-                    $"发现重大版本修复(可从选项中关闭此检查)\n版本：{CheckUpdateCacheData.Default.Latest.Version}\n日期：{CheckUpdateCacheData.Default.Latest.WriteTime.ToShortTimeString()}是否更新?",
+                    $"发现重大版本修复(可从选项中关闭此检查)\n版本：{CheckUpdateCacheData.Default.Latest.Version}\n日期：{CheckUpdateCacheData.Default.Latest.GetWriteTimeDateString()}\n是否更新?",
                     "是", "否", "查看日志");
                 switch (click)
                 {
                     case 0:
                     {
-                        Debug.Log("修改配置，更新插件包");
+                        UpdateInstallVersion(CheckUpdateCacheData.Default.Latest);
                     }
                         break;
                     case 1:
@@ -927,8 +927,8 @@ namespace TyphoonUnitySDK
                         break;
                     case 2:
                     {
-                        Debug.Log("打开日志并展示");
-                        ChangelogPreviewerWindow.Open(CheckUpdateCacheData.Default.CombineChangelog());
+                        ChangelogPreviewerWindow.Open(CheckUpdateCacheData.Default.CombineChangelog(), true,
+                            CheckUpdateCacheData.Default.Latest);
                     }
                         break;
                 }
@@ -962,11 +962,11 @@ namespace TyphoonUnitySDK
             if (flag)
             {
                 //检查完毕
-                var popUp = CheckMajor();
+                var popUp = CheckMajor(true);
                 //如果没有检查完毕
                 if (!popUp)
                 {
-                    popUp = CheckUpdate();
+                    popUp = CheckUpdate(true);
                 }
 
                 if (!popUp)
@@ -1159,7 +1159,7 @@ namespace TyphoonUnitySDK
                     depMap["com.typhoon.unitysdk"] = $"{versionInfo.Version}";
                     map["dependencies"] = depMap.ToXJson();
                     var final = map.ToXJson();
-                    File.WriteAllText(final, package);
+                    File.WriteAllText(package, final);
                     Debug.LogError($"更改成功，刷新工程...");
                     AssetDatabase.Refresh();
                 }

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.50","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"version_log":"## [1.0.50] - 2023-12-10\r\n\r\n### 新增\n* 新增历史版本记录\r\n* 允许切换历史版本\r\n\r\n","major_flag":false,"write_time_stamp":1702189549000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.52","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"version_log":"## [1.0.52] - 2023-12-10\r\n\r\n### 修复\n* 安装更新报错问题\r\n\r\n","major_flag":true,"write_time_stamp":1702190819000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}