From 1663bd4277389ef30b3f030d931aa39f08e18360 Mon Sep 17 00:00:00 2001 From: rmbgame Date: Fri, 8 Jan 2021 10:56:53 +0800 Subject: [PATCH] fix text error --- references/MetroRadiance | 2 +- release-keylol.md | 35 +++++++++++++++---- source/SteamTool.Core/SteamToolService.cs | 2 +- .../SteamTool.Model/SteamModel/SteamUser.cs | 2 +- source/SteamTool.Proxy/HttpProxy.cs | 5 ++- .../Page/SteamAccountPageViewModel.cs | 1 + .../Content/About/AboutUpdateHistory.xaml | 8 ++--- 7 files changed, 38 insertions(+), 17 deletions(-) diff --git a/references/MetroRadiance b/references/MetroRadiance index be15f3bbd..1b54d1e79 160000 --- a/references/MetroRadiance +++ b/references/MetroRadiance @@ -1 +1 @@ -Subproject commit be15f3bbde56ce8b34cae32703d67c2d47d0996c +Subproject commit 1b54d1e79e005bad63290f300814cba169e0d20c diff --git a/release-keylol.md b/release-keylol.md index c24a6a31a..f62a196b0 100644 --- a/release-keylol.md +++ b/release-keylol.md @@ -13,8 +13,29 @@ Steam++只在keylol论坛与github发布，为了账号安全，请不要到其 ## 更新内容 +### 1.0.5 +``` +紧急修复因为第三方steamdb api挂掉导致程序崩溃(第三方api确实还是不太靠谱，考虑之后换回steam官方api) +优化反代过程的逻辑 +增加启动时自动运行Steam的设置项 +新增令牌刷新功能 +帐户切换增加了离线模式启动的选项 +修复刷新游戏缓存按钮程序闪退BUG +还修复了一些没有记下来的小错误... +``` + +### 1.0.4 +``` + 此版本修改了配置文件的保存读取功能，会无法读取1.0.4版本以前的配置文件包括令牌数据。(可以通过设置-令牌设置-导入旧版本Steam++令牌数据按钮来恢复旧版本令牌数据) + 还原steam社区反代上游地址修复部分请求会提示需要登录的问题 + 新增令牌导入导出备份功能 + 新增令牌可以选择保存在程序根目录下的设置选项(方便备份) + 修改了自动更新的提示方式 + 自动更新可以自动覆盖升级，不再需要手动替换 + 修复令牌无法保存的问题 +``` + ### 1.0.3.3 -一直在修BUG，下个版本开始要做新功能了。 ``` 新增pixiv本地反代服务支持 新增在欢迎页steam昵称后显示steam的登陆区域 @@ -128,11 +149,11 @@ SDA令牌导入不再支持导入加密文件，如果要导入加密的maFile > [Github](https://github.com/rmbadmin/SteamTools/releases) > 分流下载： > [hide] -> [蓝奏云](https://wws.lanzous.com/iqrxLjrm2kf) -> [百度云](https://pan.baidu.com/s/1yCimLO0HvptR0OOgpZVBCQ) -> 提取码：7h66 +> [蓝奏云](https://wws.lanzous.com/ilYjRk5ohfg) +> [百度云](https://pan.baidu.com/s/1n4yAlzqe6RIhHKU4vuoVGA) +> 提取码：g7nh > [/hide] -> EXE 大小：4.75MB -> MD5：BF6B5196FD95C8D689BA75243FBF8C96 -> [查毒链接](https://www.virustotal.com/gui/file/1073fc19c3208228b1a00eb9bceab771cbf77ffbf1a6c2de666a0e9a4967db60/detection) +> EXE 大小：4.85MB +> MD5：D5FB1CD6776687DC13BC01F5C717D2C5 +> [查毒链接](https://www.virustotal.com/gui/file/6d0a506044013d1cea7c2b4f7734f2405ad7ac6b1f5213abc68743f979acf51f/detection) 虽然没有什么杀毒软件报毒，但是使用过程中可能遇到windows defender误报，您可以选择添加信任。 \ No newline at end of file diff --git a/source/SteamTool.Core/SteamToolService.cs b/source/SteamTool.Core/SteamToolService.cs index 6c900c925..1e6aec3d3 100644 --- a/source/SteamTool.Core/SteamToolService.cs +++ b/source/SteamTool.Core/SteamToolService.cs @@ -110,10 +110,10 @@ namespace SteamTool.Core SteamId64 = Convert.ToInt64(item.Key.ToString()), AccountName = i.AccountName?.ToString(), SteamID = i.PersonaName?.ToString(), + PersonaName = i.PersonaName?.ToString(), RememberPassword = Convert.ToBoolean(Convert.ToInt64(i.RememberPassword?.ToString())), Timestamp = Convert.ToInt64(i.Timestamp?.ToString()) }; - user.PersonaName = user.SteamID; user.LastLoginTime = user.Timestamp.ToDateTime(); //老版本Steam数据 小写mostrecent 支持 diff --git a/source/SteamTool.Model/SteamModel/SteamUser.cs b/source/SteamTool.Model/SteamModel/SteamUser.cs index 78c92afd5..a41628313 100644 --- a/source/SteamTool.Model/SteamModel/SteamUser.cs +++ b/source/SteamTool.Model/SteamModel/SteamUser.cs @@ -66,7 +66,7 @@ namespace SteamTool.Model /// /// 从VDF读取到的用户名 /// - public string PersonaName { get; set; } = "No Name"; + public string PersonaName { get; set; } /// /// 用户名 diff --git a/source/SteamTool.Proxy/HttpProxy.cs b/source/SteamTool.Proxy/HttpProxy.cs index 6b316d18d..521b3316c 100644 --- a/source/SteamTool.Proxy/HttpProxy.cs +++ b/source/SteamTool.Proxy/HttpProxy.cs @@ -260,7 +260,7 @@ namespace SteamTool.Proxy proxyServer.CertificateManager.EnsureRootCertificate(); proxyServer.CertificateManager.RootCertificate.SaveCerCertificateFile(Path.Combine(AppContext.BaseDirectory, $@"{CertificateName}.Certificate.cer")); } - return proxyServer.CertificateManager.IsRootCertificateUserTrusted(); + return IsCertificateInstalled(proxyServer.CertificateManager.RootCertificate); } public bool DeleteCertificate() @@ -326,11 +326,10 @@ namespace SteamTool.Proxy return false; } } - //暂时移除443端口检测 //if (PortInUse(443)) //{ // return false; - //} + //} if (IsProxyGOG) { WirtePemCertificateToGoGSteamPlugins(); } #region 写入Hosts diff --git a/source/SteamTools/ViewModels/Page/SteamAccountPageViewModel.cs b/source/SteamTools/ViewModels/Page/SteamAccountPageViewModel.cs index a0caa5752..da12b5051 100644 --- a/source/SteamTools/ViewModels/Page/SteamAccountPageViewModel.cs +++ b/source/SteamTools/ViewModels/Page/SteamAccountPageViewModel.cs @@ -62,6 +62,7 @@ namespace SteamTools.ViewModels var temp = users[i]; users[i] = await webApiService.GetUserInfo(SteamUsers[i].SteamId64); users[i].AccountName = temp.AccountName; + users[i].SteamID = temp.SteamID; users[i].PersonaName = temp.PersonaName; users[i].RememberPassword = temp.RememberPassword; users[i].MostRecent = temp.MostRecent; diff --git a/source/SteamTools/Views/Content/About/AboutUpdateHistory.xaml b/source/SteamTools/Views/Content/About/AboutUpdateHistory.xaml index 25c20ab52..affa6c56d 100644 --- a/source/SteamTools/Views/Content/About/AboutUpdateHistory.xaml +++ b/source/SteamTools/Views/Content/About/AboutUpdateHistory.xaml @@ -34,20 +34,20 @@ TextAlignment="Left" MaxPageWidth="900"> - + - + - + - +