com.typhoon.unitysdk 1.0.49 → 1.0.51

package/CHANGELOG.md

@@ -1,7 +1,23 @@
 # 更新日志
+## [1.0.51] - 2023-12-10
+
+### 修复
+* 修复检查自动更新的bug
+
+### 优化
+* 自动更新是查看日志窗口添加安装按钮
+
+
+## [1.0.50] - 2023-12-10
+
+### 新增
+* 新增历史版本记录
+* 允许切换历史版本
+
+
 ## [1.0.49] - 2023-12-10
 
-### 其它
+### 其它
 * 更新测试版本3
 
 

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/CheckUpdate/PackageVersionInfo.cs

@@ -23,7 +23,7 @@ namespace TyphoonUnitySDK
             }
         }
 
-        public string GetWriteTimeDateString() => WriteTimeStamp > 0 ? WriteTime.Date.ToLongDateString() : "";
+        public string GetWriteTimeDateString() => WriteTimeStamp > 0 ? WriteTime.Date.ToShortDateString() : "";
 
 
         public DateTime PublishTime
@@ -36,7 +36,12 @@ namespace TyphoonUnitySDK
         }
 
         public string GetPublishTimeDateString() =>
-            PublishTimeStamp > 0 ? PublishTime.Date.ToLongDateString() : "";
+            PublishTimeStamp > 0 ? PublishTime.Date.ToShortDateString() : "";
+
+
+        public string GetPublishTimeString() =>
+            PublishTimeStamp > 0 ? $"{GetPublishTimeDateString()} {PublishTime.ToShortTimeString()}" : "";
+
 
         public PackageVersionInfo()
         {

package/Editor/HistoryVersionWindow.cs

@@ -10,14 +10,53 @@ namespace TyphoonUnitySDK
     public class HistoryVersionWindow : EditorWindow
     {
         private static Color SelectColor =>
-            EditorGUIUtility.isProSkin ? new Color(0.21f, 0.2f, 0.21f, 1f) : new Color(0.69f, 0.7f, 0.69f, 1f);
+            EditorGUIUtility.isProSkin ? new Color(0.03f, 0.39f, 0.7f, 1f) : new Color(0.69f, 0.7f, 0.69f, 1f);
 
         private static Color NormalColor =>
             EditorGUIUtility.isProSkin ? new Color(0.35f, 0.35f, 0.35f, 1f) : new Color(0.87f, 0.87f, 0.87f, 1f);
 
 
         private const float MENU_WIDTH = 268;
-        private List<PackageVersionInfo> _history = null;
+
+        private static GUIStyle _styleMenuBtnLabel = null;
+
+        private static GUIStyle StyleMenuBtnLabel
+        {
+            get
+            {
+                if (_styleMenuBtnLabel == null)
+                {
+                    _styleMenuBtnLabel = new GUIStyle("label");
+                    _styleMenuBtnLabel.padding = new RectOffset(2, 2, 2, 2);
+                    _styleMenuBtnLabel.margin = new RectOffset(2, 2, 2, 2);
+                    _styleMenuBtnLabel.border = new RectOffset(2, 2, 2, 2);
+                    _styleMenuBtnLabel.alignment = TextAnchor.MiddleLeft;
+                }
+
+                return _styleMenuBtnLabel;
+            }
+        }
+
+        private static GUIStyle _styleMenuBtn = null;
+
+        private static GUIStyle StyleMenuBtn
+        {
+            get
+            {
+                if (_styleMenuBtn == null)
+                {
+                    _styleMenuBtn = new GUIStyle("button");
+                    _styleMenuBtn.padding = new RectOffset(2, 2, 2, 2);
+                    _styleMenuBtn.margin = new RectOffset(2, 2, 2, 2);
+                    _styleMenuBtn.border = new RectOffset(0, 0, 0, 0);
+                    _styleMenuBtn.alignment = TextAnchor.MiddleLeft;
+                }
+
+                return _styleMenuBtn;
+            }
+        }
+
+        private static List<PackageVersionInfo> _history = null;
 
         public List<PackageVersionInfo> History
         {
@@ -25,7 +64,13 @@ namespace TyphoonUnitySDK
             {
                 if (_history == null)
                 {
-                    _history = CheckUpdateCacheData.Default.AllVersions ?? new List<PackageVersionInfo>();
+                    _history = new List<PackageVersionInfo>();
+                    var all = CheckUpdateCacheData.Default.AllVersions;
+                    if (all != null)
+                    {
+                        _history = new List<PackageVersionInfo>(all);
+                    }
+
                     _history.Sort((a, b) => { return b.PublishTimeStamp.CompareTo(a.PublishTimeStamp); });
                 }
 
@@ -33,14 +78,34 @@ namespace TyphoonUnitySDK
             }
         }
 
+        private PackageVersionInfo _currentVersion = null;
+
+        private PackageVersionInfo CurrentVersion
+        {
+            get
+            {
+                if (_currentVersion == null)
+                {
+                    _currentVersion = UniEditor.LoadCurrentVersionInfo();
+                }
+
+                return _currentVersion;
+            }
+        }
+
+
         private static Vector2 _scroll;
         private static PackageVersionInfo _select;
+        private Vector2 _logScroll;
+
+        private string _inputSearch;
 
         public static void Open()
         {
+            _history = null;
             var win = GetWindow<HistoryVersionWindow>();
-            win.titleContent = new GUIContent("历史版本");
-            win.minSize = new Vector2(600, 400);
+            win.titleContent = new GUIContent("所有版本");
+            win.minSize = new Vector2(720, 480);
             win.Show();
         }
 
@@ -56,6 +121,19 @@ namespace TyphoonUnitySDK
                 var rectLeft = rect;
                 rectLeft.width = MENU_WIDTH;
                 DrawLeftMenu(rectLeft);
+                var rectLine = rectLeft;
+                rectLine.x = rectLeft.xMax;
+                rectLine.width = 1;
+                var center = rectLine.center;
+                var draw = rectLine;
+                draw.height -= 8;
+                draw.center = center;
+                EditorGUI.DrawRect(draw, Color.black);
+
+                var rectRight = rectLine;
+                rectRight.x = rectLine.xMax;
+                rectRight.width = rect.xMax - rectRight.x;
+                DrawRightGUI(rectRight);
             }
         }
 
@@ -65,23 +143,154 @@ namespace TyphoonUnitySDK
             var center = rect.center;
             rectView.width -= 8;
             rectView.height -= 8;
+            rectView.center = center;
             GUILayout.BeginArea(rectView);
+            _inputSearch = GUILayout.TextField(_inputSearch);
+            var low = string.IsNullOrWhiteSpace(_inputSearch) ? null : _inputSearch.ToLower();
             _scroll = GUILayout.BeginScrollView(_scroll);
 
             foreach (var info in History)
             {
+                var publishTimeString = info.GetPublishTimeDateString();
+                var versionString = info.Version;
+                if (low != null)
+                {
+                    if (!publishTimeString.ToLower().Contains(low) && !versionString.Contains(low))
+                    {
+                        continue;
+                    }
+                }
+
                 var isSelect = _select == info;
-                DrawMenuButton(isSelect, info.Version, info.GetPublishTimeDateString());
+                StyleMenuBtnLabel.fontStyle = isSelect ? FontStyle.Bold : FontStyle.Normal;
+                if (GUILayout.Button("", StyleMenuBtn, GUILayout.Height(40)))
+                {
+                    _select = info;
+                    _logScroll = Vector2.zero;
+                }
+
+                var last = GUILayoutUtility.GetLastRect();
+                if (isSelect)
+                {
+                    EditorGUI.DrawRect(last, SelectColor * 0.7f);
+                }
+
+                var rectInfo = last;
+                center = rectInfo.center;
+                rectInfo.width -= 4;
+                rectInfo.height -= 4;
+                rectInfo.center = center;
+                var rectVersion = rectInfo;
+                rectVersion.height = 16;
+
+                GUI.Label(rectVersion, $"v{info.Version}", StyleMenuBtnLabel);
+                var rectPublishTime = rectVersion;
+                rectPublishTime.y += rectPublishTime.height;
+                GUI.Label(rectPublishTime, $"发布时间: {info.GetPublishTimeString()}", StyleMenuBtnLabel);
+
+                var used = CurrentVersion.Version == info.Version;
+                if (used)
+                {
+                    var rectFlag = rectInfo;
+                    rectFlag.width = 120;
+                    rectFlag.height = 16;
+                    rectFlag.center = rectInfo.center;
+                    rectFlag.x = rectInfo.xMax - rectFlag.width;
+                    rectFlag.x -= 8;
+                    GUIDrawer.DrawKeynotesAlignmentRight(rectFlag, "使用中");
+                }
             }
 
+            GUILayout.Space(30);
             GUILayout.EndScrollView();
             GUILayout.EndArea();
         }
 
 
+        private void DrawRightGUI(Rect rect)
+        {
+            var view = rect;
+            view.height -= 48;
+            var center = view.center;
+            var draw = view;
+            draw.width -= 8;
+            draw.height -= 8;
+            draw.center = center;
+            GUILayout.BeginArea(draw);
+            if (_select == null)
+            {
+                GUILayout.Label("请从左侧选择配置", Styles.rbold_label);
+            }
+            else
+            {
+                var title = $"当前选择: v{_select.Version}";
+                if (_select.IsMajor)
+                {
+                    title += $" [重大修复版本]";
+                }
+
+                GUILayout.Label(title, Styles.rbold_title, GUILayout.Height(24));
+                GUILayout.Label($"发布时间: {_select.GetPublishTimeString()}", Styles.rlabel_italic);
+                GUILayout.Space(5);
+                GUILayout.Label("版本更新日志:", Styles.rbold_label);
+                if (string.IsNullOrWhiteSpace(_select.VersionChangeLog))
+                {
+                    GUILayout.Label("无");
+                }
+                else
+                {
+                    _logScroll = GUILayout.BeginScrollView(_logScroll, false, false, GUIStyle.none, GUIStyle.none);
+                    GUILayout.Label(_select.VersionChangeLog);
+                    GUILayout.EndScrollView();
+                }
+            }
+
+            GUILayout.EndArea();
+
+            if (_select != null)
+            {
+                //绘制底部信息栏
+                var rectBottom = view;
+                rectBottom.y = view.yMax;
+                rectBottom.height = rect.yMax - rectBottom.y;
+                rectBottom.width -= 4;
+                var line = rectBottom;
+                line.height = 1;
+                line.y = rectBottom.y - line.height;
+                var colorLine = EditorGUIUtility.isProSkin
+                    ? new Color(0.14f, 0.14f, 0.14f, 1f)
+                    : new Color(0.6f, 0.6f, 0.6f, 1f);
+                var colorBg = EditorGUIUtility.isProSkin
+                    ? new Color(0.24f, 0.24f, 0.24f, 1f)
+                    : new Color(0.8f, 0.8f, 0.8f, 1f);
+                EditorGUI.DrawRect(rectBottom, colorBg);
+                EditorGUI.DrawRect(line, colorLine);
+
+                var btnInstallRect = rectBottom;
+                btnInstallRect.width = 120;
+                btnInstallRect.x = rectBottom.xMax - btnInstallRect.width;
+                center = btnInstallRect.center;
+                draw = btnInstallRect;
+                draw.width -= 8;
+                draw.height -= 8;
+                draw.center = center;
+                var temEnable = GUI.enabled;
+                var used = CurrentVersion.Version == _select.Version;
+                GUI.enabled = !used;
+                var txt = used ? "使用中" : $"安装";
+                if (GUI.Button(draw, txt, Styles.rbutton_bold))
+                {
+                    UniEditor.UpdateInstallVersion(_select);
+                }
+
+                GUI.enabled = temEnable;
+            }
+        }
+
+
         private void DrawMenuButton(bool select, string version, string date)
         {
-            GUILayout.Button("", Styles.rbutton, GUILayout.Height(32));
+            GUILayout.Button("", GUILayout.Height(32));
             var rect = GUILayoutUtility.GetLastRect();
             if (select)
             {

package/Editor/PublishWindow.cs

@@ -336,11 +336,11 @@ namespace TyphoonUnitySDK
             draw.width -= 4;
             draw.height -= 4;
             draw.center = center;
-            if (GUI.Button(draw, "历史版本", Styles.rbutton))
+            if (GUI.Button(draw, "所有版本", Styles.rbutton))
             {
                 if (CheckUpdateCacheData.Default.AllVersions.Count < 0)
                 {
-                    EditorUtility.DisplayDialog("提示", "历史版本读取失败", "是");
+                    EditorUtility.DisplayDialog("提示", "版本读取失败", "是");
                 }
                 else
                 {

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;
             }
@@ -856,7 +856,7 @@ namespace TyphoonUnitySDK
                     {
                         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;
             }
@@ -917,7 +917,7 @@ namespace TyphoonUnitySDK
                 {
                     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)
@@ -1115,5 +1115,59 @@ namespace TyphoonUnitySDK
                 }
             }
         }
+
+        /// <summary>
+        /// 更新安装版本
+        /// </summary>
+        public static void UpdateInstallVersion(PackageVersionInfo versionInfo)
+        {
+            //判断是否为upm包的模式
+            var root = Path.GetFullPath(PathRoot);
+            var projPath = Path.GetFullPath(Application.dataPath);
+            var current = LoadCurrentVersionInfo();
+            if (current.Version == versionInfo.Version)
+            {
+                EditorUtility.DisplayDialog("提示", "当前已经是目标版本了", "是");
+                return;
+            }
+
+            if (root.Contains(projPath))
+            {
+                EditorUtility.DisplayDialog("提示", "安装失败，只支持unity package manager 模式,本地包请手动进行更新", "是");
+                return;
+            }
+
+            var click = EditorUtility.DisplayDialog("提示",
+                $"更新版本到 v{versionInfo.Version} ?\n发布时间：{versionInfo.GetPublishTimeString()}",
+                "是");
+            if (click)
+            {
+                //修改package.json
+                try
+                {
+                    var package = $"Packages/manifest.json";
+                    var json = File.ReadAllText(package);
+                    var map = json.ToXObject<Dictionary<string, object>>();
+                    var dependencies = map["dependencies"].ToString();
+                    var depMap = dependencies.ToXObject<Dictionary<string, string>>();
+                    foreach (var pair in depMap)
+                    {
+                        Debug.Log($"{pair.Key},{pair.Value}");
+                    }
+
+                    //修改版本号
+                    depMap["com.typhoon.unitysdk"] = $"{versionInfo.Version}";
+                    map["dependencies"] = depMap.ToXJson();
+                    var final = map.ToXJson();
+                    File.WriteAllText(final, package);
+                    Debug.LogError($"更改成功，刷新工程...");
+                    AssetDatabase.Refresh();
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"安装失败：{e}");
+                }
+            }
+        }
     }
 }

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.49","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.49] - 2023-12-10\r\n\r\n### 其它\n* 更新测试版本3\r\n\r\n","major_flag":false,"write_time_stamp":1702183470000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.51","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.51] - 2023-12-10\r\n\r\n### 修复\n* 修复检查自动更新的bug\r\n\r\n### 优化\n* 自动更新是查看日志窗口添加安装按钮\r\n\r\n","major_flag":true,"write_time_stamp":1702190445000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}