From 570a549ff329d962d26686d699eb10b67d676a51 Mon Sep 17 00:00:00 2001 From: "547471846@qq.com" Date: Sun, 20 Aug 2023 22:12:00 +0800 Subject: [PATCH] Beta 0.12.1 --- README.md | 156 ++-- WavenLauncher/App.config | 6 +- WavenLauncher/My Project/AssemblyInfo.vb | 6 +- WavenLauncher/My Project/Settings.Designer.vb | 6 +- WavenLauncher/My Project/Settings.settings | 6 +- WavenLauncher/WavenLauncher.Designer.vb | 766 +++++++++++------- WavenLauncher/WavenLauncher.vb | 193 ++++- 7 files changed, 719 insertions(+), 420 deletions(-) diff --git a/README.md b/README.md index ab2f24a..b2ae7eb 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ # Waven汉化启动器 ![Interface](http://pan.layah.tk/1:/WLpic.png) -![汉化启动器版本](https://img.shields.io/badge/%E6%B1%89%E5%8C%96%E5%90%AF%E5%8A%A8%E5%99%A8%E7%89%88%E6%9C%AC-2.12.13.2-brightgreen) -![汉化补丁包版本](https://img.shields.io/badge/%E6%B1%89%E5%8C%96%E8%A1%A5%E4%B8%81%E5%8C%85%E7%89%88%E6%9C%AC-2022.12.19--V1-red) -![适用游戏版本](https://img.shields.io/badge/%E9%80%82%E7%94%A8%E6%B8%B8%E6%88%8F%E7%89%88%E6%9C%AC-0.10.3.35618-blue) -![适用战网版本](https://img.shields.io/badge/%E9%80%82%E7%94%A8%E6%88%98%E7%BD%91%E7%89%88%E6%9C%AC-3.8.6-orange) +![汉化启动器版本](https://img.shields.io/badge/%E6%B1%89%E5%8C%96%E5%90%AF%E5%8A%A8%E5%99%A8%E7%89%88%E6%9C%AC-3.8.20.1-brightgreen) +![汉化补丁包版本](https://img.shields.io/badge/%E6%B1%89%E5%8C%96%E8%A1%A5%E4%B8%81%E5%8C%85%E7%89%88%E6%9C%AC-2023.8.20--V1-red) +![适用游戏版本](https://img.shields.io/badge/%E9%80%82%E7%94%A8%E6%B8%B8%E6%88%8F%E7%89%88%E6%9C%AC-0.12.1.40485-blue) +![适用战网版本](https://img.shields.io/badge/%E9%80%82%E7%94%A8%E6%88%98%E7%BD%91%E7%89%88%E6%9C%AC-3.11.4-orange) @@ -19,16 +19,16 @@ 2. 打开汉化启动器`WavenLauncher.exe` - 若提示需安装4.7.2版本的.NET 框架，则下载[微软官方在线安装包](https://dotnet.microsoft.com/download/dotnet-framework/thank-you/net472-web-installer)或[备用离线完整安装包](https://ankamacn.coding.net/s/922fd231-7211-487e-818e-de87d8134ba6) - 由于战网从3.2.5版本开始，默认安装路径改为系统盘Program Files文件夹，所以需要以**管理员权限**运行汉化启动器才能对战网进行汉化等操作 - - 打开汉化启动器时会根据`设置`里的`下载线路`自动检测软件、汉化补丁包以及游戏的最新版本，需稍等片刻 -3. 下载安装**Ankama战网**，若已安装过最新版战网，在汉化启动器`设置`里`选择战网路径` + - 打开汉化启动器时会根据`设置`里`下载`分页的`下载线路`自动检测软件、汉化补丁包以及游戏的最新版本，需稍等片刻 +3. 下载安装**Ankama战网**，若已安装过最新版战网，在汉化启动器`设置`的`启动`分页里`选择战网路径` - 方式一：[官方下载途经](https://www.ankama.com/en/launcher) - - 方式二：点击汉化启动器右下角`下载战网`或`设置`里战网版本号可下载战网硬盘版，下载失败可尝试切换至`国际下载线路` + - 方式二：点击汉化启动器右下角`下载战网`或`设置`的`下载`分页里可下载战网硬盘版，下载失败可尝试切换至`国际下载线路` 4. 打开Ankama战网登录Ankama账户 - - 若需要战网的汉化可以勾选汉化启动器`设置`里`启用战网汉化`，然后点击`启动战网`，软件会替换`en.json`文件的方式汉化战网，所以战网语言需选择**英语English** + - 若需要战网的汉化可以勾选汉化启动器`设置`的`汉化`分页里`启用战网汉化`，然后点击`启动战网`，软件会替换`en.json`文件的方式汉化战网，所以战网语言需选择**英语English** 5. 下载安装**Waven游戏** - 方式一：Ankama战网里下载安装游戏，当没下载速度了可尝试暂停后重试 - - 方式二：点击汉化启动器`设置`里游戏版本号可下载游戏硬盘版，下载失败可尝试切换至`国际下载线路` -6. 打开游戏确保可以正常进入后关闭游戏，在汉化启动器`设置`里`选择游戏路径`并`保存` + - 方式二：点击汉化启动器`设置`的`下载`分页里可下载游戏硬盘版，下载失败可尝试切换至`国际下载线路` +6. 打开游戏确保可以正常进入后关闭游戏，在汉化启动器`设置`的`启动`分页里`选择游戏路径`并`保存` 7. 点击汉化启动器`汉化游戏`，战网里游戏的语言设置请选**法语Francais**，方可汉化成功，之后就可以退出本软件了 ### 【一般使用流程】 @@ -38,24 +38,26 @@ ### 【常见问题】 1. 我没有Ankama账户，我该如何注册？ -> 按[教程](https://www.bilibili.com/read/cv9232061)通过Steam注册，若未找到steam登录ankama入口，[请点此](https://account.ankama.com/auth/steam?from=https%3A%2F%2Faccount.ankama.com%2Fen)。注意使用真实ip，仅使用某易UU加速器代理Steam社区即可，否则大概率会提示ip不可用。用steam登录进官网后，在个人信息页找到steam编辑按钮，设置账户登录用绑定邮箱及登录密码；之后完善个人信息、设置好密保问题，即可使用账户登录战网了。 +> 按[教程](https://www.bilibili.com/read/cv9232061)通过Steam注册，若未找到steam登录ankama入口，[请点此](https://account.ankama.com/auth/steam?from=https%3A%2F%2Faccount.ankama.com%2Fen)。注意使用真实ip，仅使用某易UU加速器代理Steam社区即可，否则大概率会提示ip不可用。用steam登录进官网后，在个人信息页找到steam编辑按钮，设置账户登录用绑定邮箱及登录密码；之后完善个人信息、设置好密保问题，即可使用账户登录战网了。**2023年8月更新**：Waven上线了Steam版本，直接用Steam就能开游戏，无需再搞账户，不过还是需要加速器。 2. 为什么战网无限更新，然后自动关闭了？ -> 一般是战网更新失败导致的，点击汉化启动器`设置`里战网版本号强制下载更新战网即可。不推荐手动解压使用的方式，容易形成过多无用的旧版目录。 -3. 战网无法登录进去，显示IP地址隐藏？ -> 请关闭VPN等科学上网手段，使用真实IP进行登录。若属于IP误封等情况，请[联系客服](http://support.ankama.com/)提交工单，PS客服网站的账户密码完全独立，并且可能需要翻墙。 +> 一般是战网更新失败导致的，点击汉化启动器`设置`的`下载`分页里点击下载更新战网即可。不推荐手动解压使用的方式，容易形成过多无用的旧版目录。 +3. 战网无法登录进去，提示Http错误或IP地址隐藏？ +> 请关闭VPN等科学上网手段，使用真实IP进行登录。仅使用诸如uu加速器，路由模式，加速游戏选择Wakfu或Waven，多换几个2W+的节点即可。若属于IP误封等情况，请[联系客服](http://support.ankama.com/)提交工单，PS客服网站的账户密码完全独立，并且可能需要翻墙。 4. 为什么打开游戏黑屏，只有左下角显示版本号？ > 原因可能是检测不到时区，可在`%USERPROFILE%\AppData\Roaming\zaap\waven\waven.log`中确认是否有`TimeZoneNotFoundException`关键词。解决办法就是系统时区调成自动获取或直接设置后再尝试打开游戏。 -5. 我不是Windows系统或不想使用汉化启动器，但我想使用汉化补丁，如何手动安装？ -> 手动下载`Waven-zh-cn.zip`解压至游戏目录内，询问替换则确定即可。[下载地址一](https://ankamacn.coding.net/p/coding-devops-guide/d/coding-devops-guide/git/raw/master/Waven-zh-cn.zip?download=true)，[下载地址二](http://www.oupai.pw/download/)(Waven文件夹内) +5. 我是Steam版本或不想使用汉化启动器，但我想使用汉化补丁，如何手动安装？ +> 手动下载`Waven-zh-cn.zip`放至游戏根目录（即Waven.exe所在目录），右键解压，询问替换则确定即可。[下载地址一](https://ankamacn.coding.net/p/coding-devops-guide/d/coding-devops-guide/git/raw/master/Waven-zh-cn.zip?download=true)，[下载地址二](http://www.oupai.pw/download/)(Waven文件夹内) 6. 为什么用汉化启动器安装战网时解压错误，提示拒绝访问？ > 退出360等辣鸡安全软件，或将汉化启动器及战网目录加入白名单。 -7. 为什么战网无法登录，提示Http错误或IP地址隐藏？ -> 目前战网屏蔽了大陆IP，请使用诸如uu或者雷电等加速器，加速游戏选择Wakfu或沃土，多换几个节点即可。 +7. 游戏有移动端吗？ +> 目前开启的是抢先测试Beta版，不删档。移动端只有等年底正式版了才会推出。 +8. 游戏怎么氪金？ +> Steam版氪DLC，价格比用战网游戏里买要便宜。战网购买前需要在[官网](https://account.ankama.com/en/account/information)的个人信息里设置地址信息，国家选中国，方可在付款界面的Xsolla见到支付宝微信选项，或可用Paypal。 ### 【补充说明】 1. 官方下载途径的战网和游戏可以自行设置安装路径，通过本汉化启动器下载则都是默认装到C盘，安装好的游戏可以通过战网移动到别的盘 2. 汉化启动器下载的文件都在同目录下的`WLDownload`文件夹内，视情况可自行清理 -3. 若汉化出现乱码等问题可点击战网的**修复Repair**或取消勾选汉化启动器的`启用游戏汉化`，此时会下载`Waven-fr-fr.zip`原版游戏文件解压并替换 +3. 若汉化出现乱码等问题可点击战网的**修复Repair**或Steam检查游戏完整性，或取消勾选汉化启动器的`启用游戏汉化`，此时会下载`Waven-fr-fr.zip`原版游戏文件解压并替换 4. 游戏里打开设置→社交→表情项旁边有当前已安装的汉化补丁包的版本号，可用于确认是否为最新版 5. 校验及解压大文件时软件会无响应，这是正常现象，因为没有添加异步处理，目前只有下载和检测更新操作是异步 6. 国内下载线路服务器为上海市腾讯云等，国际下载线路服务器为美国Cloudflare节点 @@ -63,42 +65,50 @@ ## 汉化启动器更新日志： -### 2.12.13.2 -- 适配游戏Alpha 0.10.3版以及新版战网 -- 添加设置游戏窗口模式及分辨率的功能 -- 添加设置游戏画质的功能 -- 优化是否已安装汉化的判断逻辑 -- 修复游戏版本号读取与显示错误问题 -- 修复安装战网后未保存战网路径的问题 -- 修复窗口置顶状态下的消息框未前置显示的问题 -- 修复国内下载线路子域名更换导致下载失败问题 -- 修复国际下载线路worker.dev及cdn.jsdelivr.net被墙导致下载失败问题 -- 修复未获取到下载文件大小时剩余时间显示负数问题 - -### 1.12.22.1 -- 适配游戏Alpha 0.9.1版以及新版战网 -- 修复战网版本号及汉化版本号显示不完整问题 - -### 1.10.27.2 -- 修复卡在`汉化游戏`按钮的问题 - -### 1.10.27.1 -- 适配游戏Alpha 0.8.4版以及新版战网 -- 添加判断本地NET框架版本的功能 -- 添加检测游戏服务器延迟的功能 -- 添加估算下载剩余时间的功能，下载速度改为瞬时速度 -- 添加窗口置顶特性，启动战网后取消置顶 -- 添加主按钮文本与动作一致性判断，防止误操作 -- 添加官方最新版本页备用镜像，检测更新失败即启用 -- 修复任务栏图标未显示的问题 -- 修复国内下载线路失效的问题 -- 修复同游戏版本下不同汉化补丁版本的校验问题 -- 完善校验文件MD5值功能，避免下载链接失效导致的问题 -- 其他亿点细节的优化 +### 3.8.20.1 +- 适配游戏Beta 0.12.1版以及新版战网 +- 修复高DPI 缩放下设置游戏窗口分辨率的问题 +- 设置现分为4页面：下载、汉化、启动、游戏 +- 添加显示本地战网、游戏版本的功能 +- 在选择游戏路径时会自动定位到已安装的路径 +- 修复国内下载线路
汉化启动器旧版日志 - + +> ### 2.12.13.2 +> - 适配游戏Alpha 0.10.3版以及新版战网 +> - 添加设置游戏窗口模式及分辨率的功能 +> - 添加设置游戏画质的功能 +> - 优化是否已安装汉化的判断逻辑 +> - 修复游戏版本号读取与显示错误问题 +> - 修复安装战网后未保存战网路径的问题 +> - 修复窗口置顶状态下的消息框未前置显示的问题 +> - 修复国内下载线路子域名更换导致下载失败问题 +> - 修复国际下载线路worker.dev及cdn.jsdelivr.net被墙导致下载失败问题 +> - 修复未获取到下载文件大小时剩余时间显示负数问题 +> +> ### 2.12.22.1 +> - 适配游戏Alpha 0.9.1版以及新版战网 +> - 修复战网版本号及汉化版本号显示不完整问题 +> +> ### 1.10.27.2 +> - 修复卡在`汉化游戏`按钮的问题 +> +> ### 1.10.27.1 +> - 适配游戏Alpha 0.8.4版以及新版战网 +> - 添加判断本地NET框架版本的功能 +> - 添加检测游戏服务器延迟的功能 +> - 添加估算下载剩余时间的功能，下载速度改为瞬时速度 +> - 添加窗口置顶特性，启动战网后取消置顶 +> - 添加主按钮文本与动作一致性判断，防止误操作 +> - 添加官方最新版本页备用镜像，检测更新失败即启用 +> - 修复任务栏图标未显示的问题 +> - 修复国内下载线路失效的问题 +> - 修复同游戏版本下不同汉化补丁版本的校验问题 +> - 完善校验文件MD5值功能，避免下载链接失效导致的问题 +> - 其他亿点细节的优化 +> > ### 1.2.23.1 > - 适配游戏Alpha 0.7.0版以及新版战网 > - 添加基于Cloudflare的[国际下载线路](http://www.oupai.pw/download/) @@ -152,27 +162,35 @@ ## 汉化补丁包更新日志： -### 2021.12.30-V1 -- 更新文本适配到Alpha 0.9.5版本 - -### 2021.12.22-V1 -- 更新文本适配到Alpha 0.9.1版本 - -### 2021.11.4-V1 -- 更新文本适配到Alpha 0.8.6版本 - -### 2021.10.28-V1 -- 更新文本适配到Alpha 0.8.5版本 -- 将未翻译的法语替换成Maufeat制作的英文版 - -### 2021.10.27-V1 -- 更新文本适配到Alpha 0.8.4版本 -- 由于UABE工具没有适配游戏所用的Unity版本，因此改为参照Maufeat的方法读取Json进行汉化 -- 感谢苦力QingYing、evenKY、Juhun以及过去众群友帮忙翻译 +### 2023.8.20-V1 +- 更新文本适配到Beta 0.12.1版本 +- 由于Ankama删除了中文字库，因此手动导入了[思源黑体](https://github.com/adobe-fonts/source-han-sans)中文字库 +- 感谢新加入汉化组的小伙伴们！（WAKFU真好玩、哆啦阿卡、大肩膀、Cyz）
汉化补丁包旧版日志 +> ### 2022.12.19-V1 +> - 更新文本适配到Alpha 0.10.3版本 +> +> ### 2021.12.30-V1 +> - 更新文本适配到Alpha 0.9.5版本 +> +> ### 2021.12.22-V1 +> - 更新文本适配到Alpha 0.9.1版本 +> +> ### 2021.11.4-V1 +> - 更新文本适配到Alpha 0.8.6版本 +> +> ### 2021.10.28-V1 +> - 更新文本适配到Alpha 0.8.5版本 +> - 将未翻译的法语替换成Maufeat制作的英文版 +> +> ### 2021.10.27-V1 +> - 更新文本适配到Alpha 0.8.4版本 +> - 由于UABE工具没有适配游戏所用的Unity版本，因此改为参照Maufeat的方法读取Json进行汉化 +> - 感谢苦力QingYing、evenKY、Juhun以及过去众群友帮忙翻译 +> > ### 2021.3.4-V1 > - 戒指、天赋和武器法术翻译完成 > diff --git a/WavenLauncher/App.config b/WavenLauncher/App.config index dca5c6d..806a1ec 100644 --- a/WavenLauncher/App.config +++ b/WavenLauncher/App.config @@ -26,13 +26,13 @@ - 3.8.5 + 3.11.4 True - 0.10.0.35559 + 0.12.1.40485 False @@ -41,7 +41,7 @@ False - 202212132 + 202308201 diff --git a/WavenLauncher/My Project/AssemblyInfo.vb b/WavenLauncher/My Project/AssemblyInfo.vb index 4d8bf5a..ac60c72 100644 --- a/WavenLauncher/My Project/AssemblyInfo.vb +++ b/WavenLauncher/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices '通过使用 "*"，如下所示: ' - - + + diff --git a/WavenLauncher/My Project/Settings.Designer.vb b/WavenLauncher/My Project/Settings.Designer.vb index 08b7207..f4cb285 100644 --- a/WavenLauncher/My Project/Settings.Designer.vb +++ b/WavenLauncher/My Project/Settings.Designer.vb @@ -116,7 +116,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("3.11.4")> _ Public Property VersionAL() As String Get Return CType(Me("VersionAL"),String) @@ -140,7 +140,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("0.12.1.40485")> _ Public Property VersionGM() As String Get Return CType(Me("VersionGM"),String) @@ -176,7 +176,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("202308201")> _ Public Property VersionWL() As UInteger Get Return CType(Me("VersionWL"),UInteger) diff --git a/WavenLauncher/My Project/Settings.settings b/WavenLauncher/My Project/Settings.settings index 05fcdc8..f57d50d 100644 --- a/WavenLauncher/My Project/Settings.settings +++ b/WavenLauncher/My Project/Settings.settings @@ -18,13 +18,13 @@ - 3.8.5 + 3.11.4 True - 0.10.0.35559 + 0.12.1.40485 False @@ -33,7 +33,7 @@ False - 202212132 + 202308201 \ No newline at end of file diff --git a/WavenLauncher/WavenLauncher.Designer.vb b/WavenLauncher/WavenLauncher.Designer.vb index c4af3f4..eb8e66e 100644 --- a/WavenLauncher/WavenLauncher.Designer.vb +++ b/WavenLauncher/WavenLauncher.Designer.vb @@ -26,23 +26,12 @@ Partial Class WavenLauncher Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(WavenLauncher)) Me.StartButton = New System.Windows.Forms.Button() Me.WLVersionLabel = New System.Windows.Forms.Label() - Me.ALVersionLabel = New System.Windows.Forms.Label() Me.QuitForm = New System.Windows.Forms.Button() Me.FormTitle = New System.Windows.Forms.Label() Me.IcoPicture = New System.Windows.Forms.PictureBox() Me.ShowToolTip = New System.Windows.Forms.ToolTip(Me.components) Me.LabelDirGM = New System.Windows.Forms.Label() Me.OpenSettings = New System.Windows.Forms.Button() - Me.GMVersionLabel = New System.Windows.Forms.Label() - Me.AutoUDCheck = New System.Windows.Forms.CheckBox() - Me.UpdateCN = New System.Windows.Forms.Button() - Me.ButtonDirGM = New System.Windows.Forms.Button() - Me.LocGameCheck = New System.Windows.Forms.CheckBox() - Me.LocALCheck = New System.Windows.Forms.CheckBox() - Me.CloseAction = New System.Windows.Forms.GroupBox() - Me.CloseForm2 = New System.Windows.Forms.RadioButton() - Me.CloseForm1 = New System.Windows.Forms.RadioButton() - Me.CloseForm0 = New System.Windows.Forms.RadioButton() Me.SysTrayIcon = New System.Windows.Forms.NotifyIcon(Me.components) Me.SysTrayMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() @@ -58,28 +47,55 @@ Partial Class WavenLauncher Me.PanelProgressBar = New System.Windows.Forms.Panel() Me.PanelProgress = New System.Windows.Forms.Panel() Me.Timer_ShowDSpeed = New System.Windows.Forms.Timer(Me.components) - Me.ButtonSwitchLine = New System.Windows.Forms.Button() - Me.LabelSwitchLine = New System.Windows.Forms.Label() Me.Timer_CheckVersion = New System.Windows.Forms.Timer(Me.components) Me.SettingPanel = New System.Windows.Forms.Panel() - Me.GraphQualityList = New System.Windows.Forms.ComboBox() - Me.WindowHeight = New System.Windows.Forms.TextBox() - Me.WindowWidth = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.WindowResolution = New System.Windows.Forms.Label() - Me.PingLabel = New System.Windows.Forms.Label() + Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.GMVersionLabel = New System.Windows.Forms.Label() + Me.ButtonSwitchLine = New System.Windows.Forms.Button() + Me.ALVersionLabel = New System.Windows.Forms.Label() + Me.LabelSwitchLine = New System.Windows.Forms.Label() + Me.LocalGMVersionLabel = New System.Windows.Forms.Label() + Me.LocalALVersionLabel = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.AutoUDCheck = New System.Windows.Forms.CheckBox() + Me.UpdateCN = New System.Windows.Forms.Button() + Me.LocGameCheck = New System.Windows.Forms.CheckBox() + Me.LocALCheck = New System.Windows.Forms.CheckBox() + Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.CloseAction = New System.Windows.Forms.GroupBox() + Me.CloseForm2 = New System.Windows.Forms.RadioButton() + Me.CloseForm1 = New System.Windows.Forms.RadioButton() + Me.CloseForm0 = New System.Windows.Forms.RadioButton() + Me.ButtonDirGM = New System.Windows.Forms.Button() Me.ButtonDirAL = New System.Windows.Forms.Button() Me.LabelDirAL = New System.Windows.Forms.Label() + Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.Label5 = New System.Windows.Forms.Label() Me.WindowedMode = New System.Windows.Forms.CheckBox() + Me.PingLabel = New System.Windows.Forms.Label() + Me.WindowHeight = New System.Windows.Forms.TextBox() + Me.WindowWidth = New System.Windows.Forms.TextBox() + Me.WindowResolution = New System.Windows.Forms.Label() + Me.GraphQualityList = New System.Windows.Forms.ComboBox() + Me.Label1 = New System.Windows.Forms.Label() Me.MiniForm = New System.Windows.Forms.Button() Me.Timer_HideForm = New System.Windows.Forms.Timer(Me.components) Me.Timer_Ping = New System.Windows.Forms.Timer(Me.components) CType(Me.IcoPicture, System.ComponentModel.ISupportInitialize).BeginInit() - Me.CloseAction.SuspendLayout() Me.SysTrayMenu.SuspendLayout() Me.StatusPanel.SuspendLayout() Me.PanelProgressBar.SuspendLayout() Me.SettingPanel.SuspendLayout() + Me.TabControl1.SuspendLayout() + Me.TabPage1.SuspendLayout() + Me.TabPage2.SuspendLayout() + Me.TabPage3.SuspendLayout() + Me.CloseAction.SuspendLayout() + Me.TabPage4.SuspendLayout() Me.SuspendLayout() ' 'StartButton @@ -109,20 +125,6 @@ Partial Class WavenLauncher Me.WLVersionLabel.Text = "软件版本号：" Me.WLVersionLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft ' - 'ALVersionLabel - ' - Me.ALVersionLabel.AutoSize = True - Me.ALVersionLabel.BackColor = System.Drawing.Color.Teal - Me.ALVersionLabel.Cursor = System.Windows.Forms.Cursors.Hand - Me.ALVersionLabel.Enabled = False - Me.ALVersionLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.ALVersionLabel.ForeColor = System.Drawing.Color.Yellow - Me.ALVersionLabel.Location = New System.Drawing.Point(16, 17) - Me.ALVersionLabel.Name = "ALVersionLabel" - Me.ALVersionLabel.Size = New System.Drawing.Size(92, 17) - Me.ALVersionLabel.TabIndex = 4 - Me.ALVersionLabel.Text = "适用战网版本：" - ' 'QuitForm ' Me.QuitForm.BackColor = System.Drawing.Color.Transparent @@ -178,7 +180,7 @@ Partial Class WavenLauncher Me.LabelDirGM.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.LabelDirGM.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) Me.LabelDirGM.ForeColor = System.Drawing.Color.Black - Me.LabelDirGM.Location = New System.Drawing.Point(15, 101) + Me.LabelDirGM.Location = New System.Drawing.Point(34, 59) Me.LabelDirGM.Name = "LabelDirGM" Me.LabelDirGM.Size = New System.Drawing.Size(307, 21) Me.LabelDirGM.TabIndex = 10 @@ -200,152 +202,6 @@ Partial Class WavenLauncher Me.OpenSettings.Text = "设置" Me.OpenSettings.UseVisualStyleBackColor = False ' - 'GMVersionLabel - ' - Me.GMVersionLabel.AutoSize = True - Me.GMVersionLabel.BackColor = System.Drawing.Color.Teal - Me.GMVersionLabel.Cursor = System.Windows.Forms.Cursors.Hand - Me.GMVersionLabel.Enabled = False - Me.GMVersionLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.GMVersionLabel.ForeColor = System.Drawing.Color.Yellow - Me.GMVersionLabel.Location = New System.Drawing.Point(16, 74) - Me.GMVersionLabel.Name = "GMVersionLabel" - Me.GMVersionLabel.Size = New System.Drawing.Size(92, 17) - Me.GMVersionLabel.TabIndex = 9 - Me.GMVersionLabel.Text = "适用游戏版本：" - ' - 'AutoUDCheck - ' - Me.AutoUDCheck.AutoSize = True - Me.AutoUDCheck.BackColor = System.Drawing.Color.Teal - Me.AutoUDCheck.Checked = True - Me.AutoUDCheck.CheckState = System.Windows.Forms.CheckState.Checked - Me.AutoUDCheck.Cursor = System.Windows.Forms.Cursors.Hand - Me.AutoUDCheck.Enabled = False - Me.AutoUDCheck.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.AutoUDCheck.ForeColor = System.Drawing.Color.Yellow - Me.AutoUDCheck.Location = New System.Drawing.Point(339, 70) - Me.AutoUDCheck.Name = "AutoUDCheck" - Me.AutoUDCheck.Size = New System.Drawing.Size(99, 21) - Me.AutoUDCheck.TabIndex = 17 - Me.AutoUDCheck.Text = "自动安装汉化" - Me.AutoUDCheck.UseVisualStyleBackColor = False - ' - 'UpdateCN - ' - Me.UpdateCN.BackColor = System.Drawing.Color.Teal - Me.UpdateCN.Cursor = System.Windows.Forms.Cursors.Hand - Me.UpdateCN.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.UpdateCN.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.UpdateCN.ForeColor = System.Drawing.Color.Yellow - Me.UpdateCN.Location = New System.Drawing.Point(337, 167) - Me.UpdateCN.Name = "UpdateCN" - Me.UpdateCN.Size = New System.Drawing.Size(101, 25) - Me.UpdateCN.TabIndex = 22 - Me.UpdateCN.Text = "强制下载汉化" - Me.UpdateCN.UseVisualStyleBackColor = False - ' - 'ButtonDirGM - ' - Me.ButtonDirGM.Cursor = System.Windows.Forms.Cursors.Hand - Me.ButtonDirGM.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.ButtonDirGM.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.ButtonDirGM.ForeColor = System.Drawing.Color.White - Me.ButtonDirGM.Location = New System.Drawing.Point(297, 102) - Me.ButtonDirGM.Name = "ButtonDirGM" - Me.ButtonDirGM.Size = New System.Drawing.Size(24, 19) - Me.ButtonDirGM.TabIndex = 6 - Me.ButtonDirGM.Text = "…" - Me.ButtonDirGM.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.ButtonDirGM.UseVisualStyleBackColor = True - ' - 'LocGameCheck - ' - Me.LocGameCheck.AutoSize = True - Me.LocGameCheck.BackColor = System.Drawing.Color.Teal - Me.LocGameCheck.Checked = True - Me.LocGameCheck.CheckState = System.Windows.Forms.CheckState.Checked - Me.LocGameCheck.Cursor = System.Windows.Forms.Cursors.Hand - Me.LocGameCheck.Enabled = False - Me.LocGameCheck.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.LocGameCheck.ForeColor = System.Drawing.Color.Yellow - Me.LocGameCheck.Location = New System.Drawing.Point(339, 43) - Me.LocGameCheck.Name = "LocGameCheck" - Me.LocGameCheck.Size = New System.Drawing.Size(99, 21) - Me.LocGameCheck.TabIndex = 16 - Me.LocGameCheck.Text = "启用游戏汉化" - Me.LocGameCheck.UseVisualStyleBackColor = False - ' - 'LocALCheck - ' - Me.LocALCheck.AutoSize = True - Me.LocALCheck.BackColor = System.Drawing.Color.Teal - Me.LocALCheck.Cursor = System.Windows.Forms.Cursors.Hand - Me.LocALCheck.Enabled = False - Me.LocALCheck.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.LocALCheck.ForeColor = System.Drawing.Color.Yellow - Me.LocALCheck.Location = New System.Drawing.Point(339, 16) - Me.LocALCheck.Name = "LocALCheck" - Me.LocALCheck.Size = New System.Drawing.Size(99, 21) - Me.LocALCheck.TabIndex = 15 - Me.LocALCheck.Text = "启用战网汉化" - Me.LocALCheck.UseVisualStyleBackColor = False - ' - 'CloseAction - ' - Me.CloseAction.BackColor = System.Drawing.Color.Teal - Me.CloseAction.Controls.Add(Me.CloseForm2) - Me.CloseAction.Controls.Add(Me.CloseForm1) - Me.CloseAction.Controls.Add(Me.CloseForm0) - Me.CloseAction.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.CloseAction.ForeColor = System.Drawing.Color.Yellow - Me.CloseAction.Location = New System.Drawing.Point(15, 138) - Me.CloseAction.Name = "CloseAction" - Me.CloseAction.Size = New System.Drawing.Size(306, 56) - Me.CloseAction.TabIndex = 7 - Me.CloseAction.TabStop = False - Me.CloseAction.Text = "点击汉化启动器关闭按钮时" - ' - 'CloseForm2 - ' - Me.CloseForm2.AutoSize = True - Me.CloseForm2.BackColor = System.Drawing.Color.Teal - Me.CloseForm2.Cursor = System.Windows.Forms.Cursors.Hand - Me.CloseForm2.Location = New System.Drawing.Point(195, 22) - Me.CloseForm2.Name = "CloseForm2" - Me.CloseForm2.Size = New System.Drawing.Size(110, 21) - Me.CloseForm2.TabIndex = 9 - Me.CloseForm2.TabStop = True - Me.CloseForm2.Text = "隐藏至系统托盘" - Me.CloseForm2.UseVisualStyleBackColor = False - ' - 'CloseForm1 - ' - Me.CloseForm1.AutoSize = True - Me.CloseForm1.BackColor = System.Drawing.Color.Teal - Me.CloseForm1.Cursor = System.Windows.Forms.Cursors.Hand - Me.CloseForm1.Location = New System.Drawing.Point(85, 22) - Me.CloseForm1.Name = "CloseForm1" - Me.CloseForm1.Size = New System.Drawing.Size(110, 21) - Me.CloseForm1.TabIndex = 8 - Me.CloseForm1.TabStop = True - Me.CloseForm1.Text = "最小化到任务栏" - Me.CloseForm1.UseVisualStyleBackColor = False - ' - 'CloseForm0 - ' - Me.CloseForm0.AutoSize = True - Me.CloseForm0.BackColor = System.Drawing.Color.Teal - Me.CloseForm0.Checked = True - Me.CloseForm0.Cursor = System.Windows.Forms.Cursors.Hand - Me.CloseForm0.Location = New System.Drawing.Point(11, 22) - Me.CloseForm0.Name = "CloseForm0" - Me.CloseForm0.Size = New System.Drawing.Size(74, 21) - Me.CloseForm0.TabIndex = 7 - Me.CloseForm0.TabStop = True - Me.CloseForm0.Text = "退出程序" - Me.CloseForm0.UseVisualStyleBackColor = False - ' 'SysTrayIcon ' Me.SysTrayIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info @@ -453,13 +309,74 @@ Partial Class WavenLauncher 'Timer_ShowDSpeed ' ' + 'Timer_CheckVersion + ' + Me.Timer_CheckVersion.Interval = 50 + ' + 'SettingPanel + ' + Me.SettingPanel.BackColor = System.Drawing.Color.Teal + Me.SettingPanel.Controls.Add(Me.TabControl1) + Me.SettingPanel.Location = New System.Drawing.Point(305, 140) + Me.SettingPanel.Name = "SettingPanel" + Me.SettingPanel.Size = New System.Drawing.Size(381, 202) + Me.SettingPanel.TabIndex = 25 + ' + 'TabControl1 + ' + Me.TabControl1.Controls.Add(Me.TabPage1) + Me.TabControl1.Controls.Add(Me.TabPage2) + Me.TabControl1.Controls.Add(Me.TabPage3) + Me.TabControl1.Controls.Add(Me.TabPage4) + Me.TabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed + Me.TabControl1.Font = New System.Drawing.Font("微软雅黑", 11.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.TabControl1.Location = New System.Drawing.Point(-3, 0) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(387, 205) + Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed + Me.TabControl1.TabIndex = 23 + ' + 'TabPage1 + ' + Me.TabPage1.BackColor = System.Drawing.Color.Teal + Me.TabPage1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.TabPage1.Controls.Add(Me.GMVersionLabel) + Me.TabPage1.Controls.Add(Me.ButtonSwitchLine) + Me.TabPage1.Controls.Add(Me.ALVersionLabel) + Me.TabPage1.Controls.Add(Me.LabelSwitchLine) + Me.TabPage1.Controls.Add(Me.LocalGMVersionLabel) + Me.TabPage1.Controls.Add(Me.LocalALVersionLabel) + Me.TabPage1.Controls.Add(Me.Label2) + Me.TabPage1.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.TabPage1.Location = New System.Drawing.Point(4, 28) + Me.TabPage1.Name = "TabPage1" + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Size = New System.Drawing.Size(379, 173) + Me.TabPage1.TabIndex = 0 + Me.TabPage1.Text = "下载" + ' + 'GMVersionLabel + ' + Me.GMVersionLabel.AutoSize = True + Me.GMVersionLabel.BackColor = System.Drawing.Color.Teal + Me.GMVersionLabel.Cursor = System.Windows.Forms.Cursors.Hand + Me.GMVersionLabel.Enabled = False + Me.GMVersionLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.GMVersionLabel.ForeColor = System.Drawing.Color.Yellow + Me.GMVersionLabel.Location = New System.Drawing.Point(187, 79) + Me.GMVersionLabel.Name = "GMVersionLabel" + Me.GMVersionLabel.Size = New System.Drawing.Size(106, 17) + Me.GMVersionLabel.TabIndex = 9 + Me.GMVersionLabel.Text = "★ 点击下载游戏：" + ' 'ButtonSwitchLine ' Me.ButtonSwitchLine.Cursor = System.Windows.Forms.Cursors.Hand Me.ButtonSwitchLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.ButtonSwitchLine.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) Me.ButtonSwitchLine.ForeColor = System.Drawing.Color.White - Me.ButtonSwitchLine.Location = New System.Drawing.Point(297, 16) + Me.ButtonSwitchLine.Location = New System.Drawing.Point(230, 30) Me.ButtonSwitchLine.Name = "ButtonSwitchLine" Me.ButtonSwitchLine.Size = New System.Drawing.Size(24, 19) Me.ButtonSwitchLine.TabIndex = 4 @@ -467,6 +384,20 @@ Partial Class WavenLauncher Me.ButtonSwitchLine.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.ButtonSwitchLine.UseVisualStyleBackColor = True ' + 'ALVersionLabel + ' + Me.ALVersionLabel.AutoSize = True + Me.ALVersionLabel.BackColor = System.Drawing.Color.Teal + Me.ALVersionLabel.Cursor = System.Windows.Forms.Cursors.Hand + Me.ALVersionLabel.Enabled = False + Me.ALVersionLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.ALVersionLabel.ForeColor = System.Drawing.Color.Yellow + Me.ALVersionLabel.Location = New System.Drawing.Point(24, 79) + Me.ALVersionLabel.Name = "ALVersionLabel" + Me.ALVersionLabel.Size = New System.Drawing.Size(106, 17) + Me.ALVersionLabel.TabIndex = 4 + Me.ALVersionLabel.Text = "★ 点击下载战网：" + ' 'LabelSwitchLine ' Me.LabelSwitchLine.BackColor = System.Drawing.Color.White @@ -474,118 +405,233 @@ Partial Class WavenLauncher Me.LabelSwitchLine.Cursor = System.Windows.Forms.Cursors.Hand Me.LabelSwitchLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.LabelSwitchLine.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.LabelSwitchLine.Location = New System.Drawing.Point(202, 15) + Me.LabelSwitchLine.Location = New System.Drawing.Point(135, 29) Me.LabelSwitchLine.Name = "LabelSwitchLine" Me.LabelSwitchLine.Size = New System.Drawing.Size(119, 21) Me.LabelSwitchLine.TabIndex = 5 Me.LabelSwitchLine.Text = "国内下载线路" Me.LabelSwitchLine.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' - 'Timer_CheckVersion + 'LocalGMVersionLabel + ' + Me.LocalGMVersionLabel.AutoSize = True + Me.LocalGMVersionLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.LocalGMVersionLabel.ForeColor = System.Drawing.Color.Yellow + Me.LocalGMVersionLabel.Location = New System.Drawing.Point(187, 125) + Me.LocalGMVersionLabel.Name = "LocalGMVersionLabel" + Me.LocalGMVersionLabel.Size = New System.Drawing.Size(106, 17) + Me.LocalGMVersionLabel.TabIndex = 15 + Me.LocalGMVersionLabel.Text = "★ 本地游戏版本：" + ' + 'LocalALVersionLabel + ' + Me.LocalALVersionLabel.AutoSize = True + Me.LocalALVersionLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.LocalALVersionLabel.ForeColor = System.Drawing.Color.Yellow + Me.LocalALVersionLabel.Location = New System.Drawing.Point(24, 125) + Me.LocalALVersionLabel.Name = "LocalALVersionLabel" + Me.LocalALVersionLabel.Size = New System.Drawing.Size(106, 17) + Me.LocalALVersionLabel.TabIndex = 15 + Me.LocalALVersionLabel.Text = "★ 本地战网版本：" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Label2.ForeColor = System.Drawing.Color.Yellow + Me.Label2.Location = New System.Drawing.Point(24, 30) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(106, 17) + Me.Label2.TabIndex = 15 + Me.Label2.Text = "★ 设置下载线路：" + ' + 'TabPage2 + ' + Me.TabPage2.BackColor = System.Drawing.Color.Teal + Me.TabPage2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.TabPage2.Controls.Add(Me.Label4) + Me.TabPage2.Controls.Add(Me.Label3) + Me.TabPage2.Controls.Add(Me.AutoUDCheck) + Me.TabPage2.Controls.Add(Me.UpdateCN) + Me.TabPage2.Controls.Add(Me.LocGameCheck) + Me.TabPage2.Controls.Add(Me.LocALCheck) + Me.TabPage2.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.TabPage2.Location = New System.Drawing.Point(4, 28) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(379, 173) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "汉化" + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Label4.ForeColor = System.Drawing.Color.Yellow + Me.Label4.Location = New System.Drawing.Point(30, 73) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(82, 17) + Me.Label4.TabIndex = 24 + Me.Label4.Text = "★ 游戏汉化：" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Label3.ForeColor = System.Drawing.Color.Yellow + Me.Label3.Location = New System.Drawing.Point(30, 37) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(82, 17) + Me.Label3.TabIndex = 23 + Me.Label3.Text = "★ 战网汉化：" ' - Me.Timer_CheckVersion.Interval = 50 + 'AutoUDCheck ' - 'SettingPanel + Me.AutoUDCheck.AutoSize = True + Me.AutoUDCheck.BackColor = System.Drawing.Color.Teal + Me.AutoUDCheck.Checked = True + Me.AutoUDCheck.CheckState = System.Windows.Forms.CheckState.Checked + Me.AutoUDCheck.Cursor = System.Windows.Forms.Cursors.Hand + Me.AutoUDCheck.Enabled = False + Me.AutoUDCheck.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.AutoUDCheck.ForeColor = System.Drawing.Color.Yellow + Me.AutoUDCheck.Location = New System.Drawing.Point(241, 73) + Me.AutoUDCheck.Name = "AutoUDCheck" + Me.AutoUDCheck.Size = New System.Drawing.Size(99, 21) + Me.AutoUDCheck.TabIndex = 17 + Me.AutoUDCheck.Text = "自动安装汉化" + Me.AutoUDCheck.UseVisualStyleBackColor = False ' - Me.SettingPanel.BackColor = System.Drawing.Color.Teal - Me.SettingPanel.Controls.Add(Me.GraphQualityList) - Me.SettingPanel.Controls.Add(Me.WindowHeight) - Me.SettingPanel.Controls.Add(Me.WindowWidth) - Me.SettingPanel.Controls.Add(Me.Label1) - Me.SettingPanel.Controls.Add(Me.WindowResolution) - Me.SettingPanel.Controls.Add(Me.PingLabel) - Me.SettingPanel.Controls.Add(Me.ButtonSwitchLine) - Me.SettingPanel.Controls.Add(Me.CloseAction) - Me.SettingPanel.Controls.Add(Me.ALVersionLabel) - Me.SettingPanel.Controls.Add(Me.LabelSwitchLine) - Me.SettingPanel.Controls.Add(Me.GMVersionLabel) - Me.SettingPanel.Controls.Add(Me.LocALCheck) - Me.SettingPanel.Controls.Add(Me.LocGameCheck) - Me.SettingPanel.Controls.Add(Me.ButtonDirAL) - Me.SettingPanel.Controls.Add(Me.ButtonDirGM) - Me.SettingPanel.Controls.Add(Me.LabelDirAL) - Me.SettingPanel.Controls.Add(Me.LabelDirGM) - Me.SettingPanel.Controls.Add(Me.UpdateCN) - Me.SettingPanel.Controls.Add(Me.WindowedMode) - Me.SettingPanel.Controls.Add(Me.AutoUDCheck) - Me.SettingPanel.Location = New System.Drawing.Point(229, 133) - Me.SettingPanel.Name = "SettingPanel" - Me.SettingPanel.Size = New System.Drawing.Size(457, 209) - Me.SettingPanel.TabIndex = 25 + 'UpdateCN ' - 'GraphQualityList + Me.UpdateCN.BackColor = System.Drawing.Color.Teal + Me.UpdateCN.Cursor = System.Windows.Forms.Cursors.Hand + Me.UpdateCN.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.UpdateCN.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.UpdateCN.ForeColor = System.Drawing.Color.Yellow + Me.UpdateCN.Location = New System.Drawing.Point(118, 110) + Me.UpdateCN.Name = "UpdateCN" + Me.UpdateCN.Size = New System.Drawing.Size(101, 25) + Me.UpdateCN.TabIndex = 22 + Me.UpdateCN.Text = "强制下载汉化" + Me.UpdateCN.UseVisualStyleBackColor = False ' - Me.GraphQualityList.BackColor = System.Drawing.Color.Teal - Me.GraphQualityList.Cursor = System.Windows.Forms.Cursors.Hand - Me.GraphQualityList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.GraphQualityList.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.GraphQualityList.ForeColor = System.Drawing.Color.Yellow - Me.GraphQualityList.FormattingEnabled = True - Me.GraphQualityList.ItemHeight = 17 - Me.GraphQualityList.Items.AddRange(New Object() {"极低", "低", "中等", "高", "极致"}) - Me.GraphQualityList.Location = New System.Drawing.Point(387, 138) - Me.GraphQualityList.Name = "GraphQualityList" - Me.GraphQualityList.Size = New System.Drawing.Size(51, 25) - Me.GraphQualityList.TabIndex = 21 + 'LocGameCheck ' - 'WindowHeight + Me.LocGameCheck.AutoSize = True + Me.LocGameCheck.BackColor = System.Drawing.Color.Teal + Me.LocGameCheck.Checked = True + Me.LocGameCheck.CheckState = System.Windows.Forms.CheckState.Checked + Me.LocGameCheck.Cursor = System.Windows.Forms.Cursors.Hand + Me.LocGameCheck.Enabled = False + Me.LocGameCheck.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.LocGameCheck.ForeColor = System.Drawing.Color.Yellow + Me.LocGameCheck.Location = New System.Drawing.Point(118, 73) + Me.LocGameCheck.Name = "LocGameCheck" + Me.LocGameCheck.Size = New System.Drawing.Size(99, 21) + Me.LocGameCheck.TabIndex = 16 + Me.LocGameCheck.Text = "启用游戏汉化" + Me.LocGameCheck.UseVisualStyleBackColor = False ' - Me.WindowHeight.BackColor = System.Drawing.SystemColors.Window - Me.WindowHeight.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.WindowHeight.ForeColor = System.Drawing.SystemColors.WindowText - Me.WindowHeight.Location = New System.Drawing.Point(403, 119) - Me.WindowHeight.MaxLength = 5 - Me.WindowHeight.Name = "WindowHeight" - Me.WindowHeight.ShortcutsEnabled = False - Me.WindowHeight.Size = New System.Drawing.Size(35, 16) - Me.WindowHeight.TabIndex = 20 - Me.WindowHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + 'LocALCheck ' - 'WindowWidth + Me.LocALCheck.AutoSize = True + Me.LocALCheck.BackColor = System.Drawing.Color.Teal + Me.LocALCheck.Cursor = System.Windows.Forms.Cursors.Hand + Me.LocALCheck.Enabled = False + Me.LocALCheck.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.LocALCheck.ForeColor = System.Drawing.Color.Yellow + Me.LocALCheck.Location = New System.Drawing.Point(118, 36) + Me.LocALCheck.Name = "LocALCheck" + Me.LocALCheck.Size = New System.Drawing.Size(99, 21) + Me.LocALCheck.TabIndex = 15 + Me.LocALCheck.Text = "启用战网汉化" + Me.LocALCheck.UseVisualStyleBackColor = False ' - Me.WindowWidth.BackColor = System.Drawing.SystemColors.Window - Me.WindowWidth.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.WindowWidth.ForeColor = System.Drawing.SystemColors.WindowText - Me.WindowWidth.Location = New System.Drawing.Point(354, 119) - Me.WindowWidth.MaxLength = 5 - Me.WindowWidth.Name = "WindowWidth" - Me.WindowWidth.ShortcutsEnabled = False - Me.WindowWidth.Size = New System.Drawing.Size(35, 16) - Me.WindowWidth.TabIndex = 19 - Me.WindowWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + 'TabPage3 + ' + Me.TabPage3.BackColor = System.Drawing.Color.Teal + Me.TabPage3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.TabPage3.Controls.Add(Me.CloseAction) + Me.TabPage3.Controls.Add(Me.ButtonDirGM) + Me.TabPage3.Controls.Add(Me.ButtonDirAL) + Me.TabPage3.Controls.Add(Me.LabelDirAL) + Me.TabPage3.Controls.Add(Me.LabelDirGM) + Me.TabPage3.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.TabPage3.Location = New System.Drawing.Point(4, 28) + Me.TabPage3.Name = "TabPage3" + Me.TabPage3.Size = New System.Drawing.Size(379, 173) + Me.TabPage3.TabIndex = 2 + Me.TabPage3.Text = "启动" ' - 'Label1 + 'CloseAction ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.Label1.ForeColor = System.Drawing.Color.Yellow - Me.Label1.Location = New System.Drawing.Point(334, 142) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(56, 17) - Me.Label1.TabIndex = 14 - Me.Label1.Text = "游戏画质" + Me.CloseAction.BackColor = System.Drawing.Color.Teal + Me.CloseAction.Controls.Add(Me.CloseForm2) + Me.CloseAction.Controls.Add(Me.CloseForm1) + Me.CloseAction.Controls.Add(Me.CloseForm0) + Me.CloseAction.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.CloseAction.ForeColor = System.Drawing.Color.Yellow + Me.CloseAction.Location = New System.Drawing.Point(34, 100) + Me.CloseAction.Name = "CloseAction" + Me.CloseAction.Size = New System.Drawing.Size(306, 56) + Me.CloseAction.TabIndex = 7 + Me.CloseAction.TabStop = False + Me.CloseAction.Text = "点击汉化启动器关闭按钮时" ' - 'WindowResolution + 'CloseForm2 ' - Me.WindowResolution.AutoSize = True - Me.WindowResolution.Font = New System.Drawing.Font("微软雅黑", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.WindowResolution.ForeColor = System.Drawing.Color.Yellow - Me.WindowResolution.Location = New System.Drawing.Point(386, 115) - Me.WindowResolution.Name = "WindowResolution" - Me.WindowResolution.Size = New System.Drawing.Size(22, 22) - Me.WindowResolution.TabIndex = 14 - Me.WindowResolution.Text = "×" + Me.CloseForm2.AutoSize = True + Me.CloseForm2.BackColor = System.Drawing.Color.Teal + Me.CloseForm2.Cursor = System.Windows.Forms.Cursors.Hand + Me.CloseForm2.Location = New System.Drawing.Point(195, 22) + Me.CloseForm2.Name = "CloseForm2" + Me.CloseForm2.Size = New System.Drawing.Size(110, 21) + Me.CloseForm2.TabIndex = 9 + Me.CloseForm2.TabStop = True + Me.CloseForm2.Text = "隐藏至系统托盘" + Me.CloseForm2.UseVisualStyleBackColor = False ' - 'PingLabel + 'CloseForm1 ' - Me.PingLabel.AutoSize = True - Me.PingLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) - Me.PingLabel.ForeColor = System.Drawing.Color.Yellow - Me.PingLabel.Location = New System.Drawing.Point(202, 74) - Me.PingLabel.Name = "PingLabel" - Me.PingLabel.Size = New System.Drawing.Size(95, 17) - Me.PingLabel.TabIndex = 14 - Me.PingLabel.Text = "游戏延迟：- ms" + Me.CloseForm1.AutoSize = True + Me.CloseForm1.BackColor = System.Drawing.Color.Teal + Me.CloseForm1.Cursor = System.Windows.Forms.Cursors.Hand + Me.CloseForm1.Location = New System.Drawing.Point(85, 22) + Me.CloseForm1.Name = "CloseForm1" + Me.CloseForm1.Size = New System.Drawing.Size(110, 21) + Me.CloseForm1.TabIndex = 8 + Me.CloseForm1.TabStop = True + Me.CloseForm1.Text = "最小化到任务栏" + Me.CloseForm1.UseVisualStyleBackColor = False + ' + 'CloseForm0 + ' + Me.CloseForm0.AutoSize = True + Me.CloseForm0.BackColor = System.Drawing.Color.Teal + Me.CloseForm0.Checked = True + Me.CloseForm0.Cursor = System.Windows.Forms.Cursors.Hand + Me.CloseForm0.Location = New System.Drawing.Point(11, 22) + Me.CloseForm0.Name = "CloseForm0" + Me.CloseForm0.Size = New System.Drawing.Size(74, 21) + Me.CloseForm0.TabIndex = 7 + Me.CloseForm0.TabStop = True + Me.CloseForm0.Text = "退出程序" + Me.CloseForm0.UseVisualStyleBackColor = False + ' + 'ButtonDirGM + ' + Me.ButtonDirGM.Cursor = System.Windows.Forms.Cursors.Hand + Me.ButtonDirGM.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.ButtonDirGM.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.ButtonDirGM.ForeColor = System.Drawing.Color.White + Me.ButtonDirGM.Location = New System.Drawing.Point(316, 60) + Me.ButtonDirGM.Name = "ButtonDirGM" + Me.ButtonDirGM.Size = New System.Drawing.Size(24, 19) + Me.ButtonDirGM.TabIndex = 6 + Me.ButtonDirGM.Text = "…" + Me.ButtonDirGM.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.ButtonDirGM.UseVisualStyleBackColor = True ' 'ButtonDirAL ' @@ -593,7 +639,7 @@ Partial Class WavenLauncher Me.ButtonDirAL.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.ButtonDirAL.Font = New System.Drawing.Font("宋体", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) Me.ButtonDirAL.ForeColor = System.Drawing.Color.White - Me.ButtonDirAL.Location = New System.Drawing.Point(297, 44) + Me.ButtonDirAL.Location = New System.Drawing.Point(316, 22) Me.ButtonDirAL.Name = "ButtonDirAL" Me.ButtonDirAL.Size = New System.Drawing.Size(24, 19) Me.ButtonDirAL.TabIndex = 5 @@ -609,13 +655,43 @@ Partial Class WavenLauncher Me.LabelDirAL.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.LabelDirAL.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) Me.LabelDirAL.ForeColor = System.Drawing.Color.Black - Me.LabelDirAL.Location = New System.Drawing.Point(15, 43) + Me.LabelDirAL.Location = New System.Drawing.Point(34, 21) Me.LabelDirAL.Name = "LabelDirAL" Me.LabelDirAL.Size = New System.Drawing.Size(307, 21) Me.LabelDirAL.TabIndex = 7 Me.LabelDirAL.Text = "选择Ankama战网路径" Me.LabelDirAL.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' + 'TabPage4 + ' + Me.TabPage4.BackColor = System.Drawing.Color.Teal + Me.TabPage4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.TabPage4.Controls.Add(Me.Label5) + Me.TabPage4.Controls.Add(Me.WindowedMode) + Me.TabPage4.Controls.Add(Me.PingLabel) + Me.TabPage4.Controls.Add(Me.WindowHeight) + Me.TabPage4.Controls.Add(Me.WindowWidth) + Me.TabPage4.Controls.Add(Me.WindowResolution) + Me.TabPage4.Controls.Add(Me.GraphQualityList) + Me.TabPage4.Controls.Add(Me.Label1) + Me.TabPage4.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.TabPage4.Location = New System.Drawing.Point(4, 28) + Me.TabPage4.Name = "TabPage4" + Me.TabPage4.Size = New System.Drawing.Size(379, 173) + Me.TabPage4.TabIndex = 3 + Me.TabPage4.Text = "游戏" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Label5.ForeColor = System.Drawing.Color.Yellow + Me.Label5.Location = New System.Drawing.Point(37, 35) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(70, 17) + Me.Label5.TabIndex = 24 + Me.Label5.Text = "★ 分辨率：" + ' 'WindowedMode ' Me.WindowedMode.AutoSize = True @@ -624,13 +700,89 @@ Partial Class WavenLauncher Me.WindowedMode.Enabled = False Me.WindowedMode.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) Me.WindowedMode.ForeColor = System.Drawing.Color.Yellow - Me.WindowedMode.Location = New System.Drawing.Point(339, 96) + Me.WindowedMode.Location = New System.Drawing.Point(236, 35) Me.WindowedMode.Name = "WindowedMode" Me.WindowedMode.Size = New System.Drawing.Size(99, 21) Me.WindowedMode.TabIndex = 18 Me.WindowedMode.Text = "窗口模式游戏" Me.WindowedMode.UseVisualStyleBackColor = False ' + 'PingLabel + ' + Me.PingLabel.AutoSize = True + Me.PingLabel.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.PingLabel.ForeColor = System.Drawing.Color.Yellow + Me.PingLabel.Location = New System.Drawing.Point(37, 120) + Me.PingLabel.Name = "PingLabel" + Me.PingLabel.Size = New System.Drawing.Size(109, 17) + Me.PingLabel.TabIndex = 14 + Me.PingLabel.Text = "★ 游戏延迟：- ms" + ' + 'WindowHeight + ' + Me.WindowHeight.BackColor = System.Drawing.SystemColors.Window + Me.WindowHeight.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.WindowHeight.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.WindowHeight.ForeColor = System.Drawing.SystemColors.WindowText + Me.WindowHeight.Location = New System.Drawing.Point(155, 36) + Me.WindowHeight.MaxLength = 5 + Me.WindowHeight.Name = "WindowHeight" + Me.WindowHeight.ShortcutsEnabled = False + Me.WindowHeight.Size = New System.Drawing.Size(35, 16) + Me.WindowHeight.TabIndex = 20 + Me.WindowHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'WindowWidth + ' + Me.WindowWidth.BackColor = System.Drawing.SystemColors.Window + Me.WindowWidth.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.WindowWidth.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.WindowWidth.ForeColor = System.Drawing.SystemColors.WindowText + Me.WindowWidth.Location = New System.Drawing.Point(106, 36) + Me.WindowWidth.MaxLength = 5 + Me.WindowWidth.Name = "WindowWidth" + Me.WindowWidth.ShortcutsEnabled = False + Me.WindowWidth.Size = New System.Drawing.Size(35, 16) + Me.WindowWidth.TabIndex = 19 + Me.WindowWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'WindowResolution + ' + Me.WindowResolution.AutoSize = True + Me.WindowResolution.Font = New System.Drawing.Font("微软雅黑", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.WindowResolution.ForeColor = System.Drawing.Color.Yellow + Me.WindowResolution.Location = New System.Drawing.Point(138, 32) + Me.WindowResolution.Name = "WindowResolution" + Me.WindowResolution.Size = New System.Drawing.Size(22, 22) + Me.WindowResolution.TabIndex = 14 + Me.WindowResolution.Text = "×" + ' + 'GraphQualityList + ' + Me.GraphQualityList.BackColor = System.Drawing.Color.Teal + Me.GraphQualityList.Cursor = System.Windows.Forms.Cursors.Hand + Me.GraphQualityList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.GraphQualityList.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.GraphQualityList.ForeColor = System.Drawing.Color.Yellow + Me.GraphQualityList.FormattingEnabled = True + Me.GraphQualityList.ItemHeight = 17 + Me.GraphQualityList.Items.AddRange(New Object() {"极低", "低", "中等", "高", "极致"}) + Me.GraphQualityList.Location = New System.Drawing.Point(117, 73) + Me.GraphQualityList.Name = "GraphQualityList" + Me.GraphQualityList.Size = New System.Drawing.Size(73, 25) + Me.GraphQualityList.TabIndex = 21 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("微软雅黑", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(134, Byte)) + Me.Label1.ForeColor = System.Drawing.Color.Yellow + Me.Label1.Location = New System.Drawing.Point(37, 77) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(82, 17) + Me.Label1.TabIndex = 14 + Me.Label1.Text = "★ 游戏画质：" + ' 'MiniForm ' Me.MiniForm.BackColor = System.Drawing.Color.Transparent @@ -680,66 +832,84 @@ Partial Class WavenLauncher Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Waven汉化启动器 by layah" CType(Me.IcoPicture, System.ComponentModel.ISupportInitialize).EndInit() - Me.CloseAction.ResumeLayout(False) - Me.CloseAction.PerformLayout() Me.SysTrayMenu.ResumeLayout(False) Me.StatusPanel.ResumeLayout(False) Me.StatusPanel.PerformLayout() Me.PanelProgressBar.ResumeLayout(False) Me.SettingPanel.ResumeLayout(False) - Me.SettingPanel.PerformLayout() + Me.TabControl1.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) + Me.TabPage1.PerformLayout() + Me.TabPage2.ResumeLayout(False) + Me.TabPage2.PerformLayout() + Me.TabPage3.ResumeLayout(False) + Me.CloseAction.ResumeLayout(False) + Me.CloseAction.PerformLayout() + Me.TabPage4.ResumeLayout(False) + Me.TabPage4.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents StartButton As Button Friend WithEvents WLVersionLabel As Label - Friend WithEvents ALVersionLabel As Label Friend WithEvents QuitForm As Button Friend WithEvents FormTitle As Label Friend WithEvents IcoPicture As PictureBox Friend WithEvents ShowToolTip As ToolTip Friend WithEvents OpenSettings As Button - Friend WithEvents LocGameCheck As CheckBox - Friend WithEvents LocALCheck As CheckBox - Friend WithEvents CloseAction As GroupBox - Friend WithEvents CloseForm2 As RadioButton - Friend WithEvents CloseForm1 As RadioButton - Friend WithEvents CloseForm0 As RadioButton Friend WithEvents SysTrayIcon As NotifyIcon Friend WithEvents Timer_ShowForm As Timer Friend WithEvents SysTrayMenu As ContextMenuStrip Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem Friend WithEvents ToolStripSeparator1 As ToolStripSeparator - Friend WithEvents ButtonDirGM As Button - Friend WithEvents LabelDirGM As Label Friend WithEvents SelectDirDialog As OpenFileDialog Friend WithEvents StatusLabel As Label Friend WithEvents StatusPanel As Panel - Friend WithEvents UpdateCN As Button Friend WithEvents WLVerStatus As Label Friend WithEvents Timer_NewVersionNeon As Timer - Friend WithEvents AutoUDCheck As CheckBox Friend WithEvents PanelProgressBar As Panel Friend WithEvents PanelProgress As Panel Friend WithEvents Timer_ShowDSpeed As Timer - Friend WithEvents GMVersionLabel As Label Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem Friend WithEvents Timer_CheckVersion As Timer - Friend WithEvents LabelSwitchLine As Label - Friend WithEvents ButtonSwitchLine As Button Friend WithEvents SettingPanel As Panel - Friend WithEvents LabelDirAL As Label - Friend WithEvents ButtonDirAL As Button Friend WithEvents MiniForm As Button Friend WithEvents Timer_HideForm As Timer - Friend WithEvents PingLabel As Label Friend WithEvents Timer_Ping As Timer - Friend WithEvents WindowResolution As Label + Friend WithEvents TabControl1 As TabControl + Friend WithEvents TabPage1 As TabPage + Friend WithEvents GMVersionLabel As Label + Friend WithEvents ButtonSwitchLine As Button + Friend WithEvents ALVersionLabel As Label + Friend WithEvents LabelSwitchLine As Label + Friend WithEvents TabPage2 As TabPage + Friend WithEvents AutoUDCheck As CheckBox + Friend WithEvents UpdateCN As Button + Friend WithEvents LocGameCheck As CheckBox + Friend WithEvents LocALCheck As CheckBox + Friend WithEvents TabPage3 As TabPage + Friend WithEvents CloseAction As GroupBox + Friend WithEvents CloseForm2 As RadioButton + Friend WithEvents CloseForm1 As RadioButton + Friend WithEvents CloseForm0 As RadioButton + Friend WithEvents ButtonDirGM As Button + Friend WithEvents ButtonDirAL As Button + Friend WithEvents LabelDirAL As Label + Friend WithEvents LabelDirGM As Label + Friend WithEvents TabPage4 As TabPage Friend WithEvents WindowedMode As CheckBox + Friend WithEvents Label1 As Label + Friend WithEvents PingLabel As Label Friend WithEvents WindowHeight As TextBox Friend WithEvents WindowWidth As TextBox - Friend WithEvents Label1 As Label + Friend WithEvents WindowResolution As Label Friend WithEvents GraphQualityList As ComboBox + Friend WithEvents Label2 As Label + Friend WithEvents LocalGMVersionLabel As Label + Friend WithEvents LocalALVersionLabel As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label5 As Label End Class diff --git a/WavenLauncher/WavenLauncher.vb b/WavenLauncher/WavenLauncher.vb index 21f6191..f64ac82 100644 --- a/WavenLauncher/WavenLauncher.vb +++ b/WavenLauncher/WavenLauncher.vb @@ -8,7 +8,7 @@ Imports System.Threading Imports Microsoft.Win32 '读写注册表用 Public Class WavenLauncher - Const VersionWL As UInteger = 202212132 '汉化启动器版本号，跟随发布版本 + Const VersionWL As UInteger = 202308201 '汉化启动器9位版本号，跟随发布版本 Dim NewVersionWL As String '检测最新汉化启动器版本号 Dim NewVersionCN As String '检测最新游戏汉化文本版本号 Dim NewVersionAL As String '检测最新战网版本号 @@ -56,7 +56,8 @@ Public Class WavenLauncher Dim CurrentVersion As String '储存从官方服务器检测到的游戏版本 ReadOnly LocalJsonFile As String = $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\zaap\repositories\production\waven\main\release.json" '存储本地游戏信息文件路径 ReadOnly ReleaseJsonFile As String = $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\zaap\repositories\production\waven\main\data\release.json" '存储游戏服务器状态文件路径 - Dim LocalVersion As String '储存从本地缓存检测到的游戏版本 + Dim LocalGMVersion As String '储存从本地缓存检测到的游戏版本 + Dim LocalALVersion As String '储存从本地缓存检测到的战网版本 Dim StartDLTime As Date '储存下载开始时间 Dim RestTime As Long '储存下载剩余时间 Dim newstatusText As String '储存最新状态信息 @@ -66,8 +67,8 @@ Public Class WavenLauncher 'ReadOnly Authorization As String = "&Authorization=Bearer%20eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9." ReadOnly clouddrive As String = "http://pan.layah.tk/" ReadOnly gitpage As String = "https://jihulab.com/ankamacn/waven/-/raw/main/" - Dim accessToken As String '储存云盘授权下载信息 - Dim domainNumber As String '储存云盘下载服务器编号 + Dim accessToken As String '储存云盘分享链接代码 + 'Dim domainNumber As String '储存云盘下载服务器编号 Dim CheckHash As String '储存校验用hash值 Dim lastUpdate As Date '储存计算下载速度的起始时间 Dim lastBytes As Long = 0 '储存计算下载速度的起始大小 @@ -89,6 +90,7 @@ Public Class WavenLauncher ReadOnly graphQualityKey As String = "Waven.Graphics.Alpha.PreferredGraphicQualityIndexV2_h3609782037" Dim tempWindowWidth As Int32 Dim tempWindowHeight As Int32 + Dim ScreenSize As Size '用于改变开始游戏按钮文本与行为 Private Enum StartStatus As Byte @@ -175,11 +177,13 @@ Public Class WavenLauncher If File.Exists(ALDir) Then ALDataPath = Path.GetDirectoryName(ALDir) '存储战网目录 LabelDirAL.Text = ALDir '显示战网路径 + CheckLocalAL() Else ButtonDirAL.BackColor = Color.Red LabelDirGM.Enabled = False ButtonDirGM.Enabled = False GMVersionLabel.Enabled = False + LocalALVersion = "未查询到" End If CheckFileExisting(My.Settings.GMDir) '验证游戏路径合法性，不合法取空值 GMDir = My.Settings.GMDir @@ -190,9 +194,11 @@ Public Class WavenLauncher CheckRegValue(windowWidthKey) CheckRegValue(windowHeightKey) CheckRegValue(graphQualityKey) + CheckLocalGM() Else AutoUD = False '无游戏路径则不自动安装汉化 ButtonDirGM.BackColor = Color.Red + LocalGMVersion = "未查询到" End If '根据条件显示按钮状态 If DownloadClient.IsBusy = True Then @@ -242,6 +248,7 @@ Public Class WavenLauncher Timer_ShowForm.Enabled = True '加载完窗体再触发计时器延时显示窗体 CheckVersion() '检查版本 + If Not IO.File.Exists(ALDir) Then Firsttip() End If @@ -250,6 +257,65 @@ Public Class WavenLauncher End Try End Sub + Private Sub CheckLocalGM() + LocalGMVersion = GetLocalJson("version", 7, 12) '从本地缓存获取本地游戏版本 + If LocalGMVersion.EndsWith("""") Then + LocalGMVersion = LocalGMVersion.Substring(0, 11) + End If + LocalGMVersionLabel.Text = "★ 本地游戏版本：" & LocalGMVersion + End Sub + + Private Sub CheckLocalAL() + Dim versionInfo = FileVersionInfo.GetVersionInfo(ALDir) '从本地战网程序获取本地战网版本 + Dim version As String = versionInfo.FileVersion + LocalALVersion = version.Substring(0, Len(version) - 6) + LocalALVersionLabel.Text = "★ 本地战网版本：" & LocalALVersion + End Sub + + '自定义TabControl的标签样式 + Private Sub TabControl1_DrawItem(ByVal sender As Object, ByVal e As System.Windows.Forms.DrawItemEventArgs) Handles TabControl1.DrawItem + Dim CurrentTab As TabPage = TabControl1.TabPages(e.Index) + Dim ItemRect As Rectangle = TabControl1.GetTabRect(e.Index) + Dim FillBrush As New SolidBrush(Color.White) + Dim TextBrush As New SolidBrush(Color.Teal) + Using sf As New StringFormat + sf.Alignment = StringAlignment.Center + sf.LineAlignment = StringAlignment.Center + + 'If we are currently painting the Selected TabItem we'll + 'change the brush colors and inflate the rectangle. + If CBool(e.State And DrawItemState.Selected) Then + FillBrush.Color = Color.Teal + TextBrush.Color = Color.Yellow + ItemRect.Inflate(2, 2) + End If + + 'Set up rotation for left and right aligned tabs + If TabControl1.Alignment = TabAlignment.Left Or TabControl1.Alignment = TabAlignment.Right Then + Dim RotateAngle As Single = 90 + If TabControl1.Alignment = TabAlignment.Left Then RotateAngle = 270 + Dim cp As New PointF(ItemRect.Left + (ItemRect.Width \ 2), ItemRect.Top + (ItemRect.Height \ 2)) + e.Graphics.TranslateTransform(cp.X, cp.Y) + e.Graphics.RotateTransform(RotateAngle) + ItemRect = New Rectangle(-(ItemRect.Height \ 2), -(ItemRect.Width \ 2), ItemRect.Height, ItemRect.Width) + End If + + 'Next we'll paint the TabItem with our Fill Brush + e.Graphics.FillRectangle(FillBrush, ItemRect) + + 'Now draw the text. + e.Graphics.DrawString(CurrentTab.Text, e.Font, TextBrush, RectangleF.op_Implicit(ItemRect), sf) + End Using + + 'Reset any Graphics rotation + e.Graphics.ResetTransform() + + 'Finally, we should Dispose of our brushes. + FillBrush.Dispose() + TextBrush.Dispose() + + End Sub + '接受点击任务栏最小化 Protected Overrides ReadOnly Property CreateParams As CreateParams Get @@ -377,10 +443,10 @@ Public Class WavenLauncher '绘制设置面板边框 Private Sub SettingPanel_Paint(sender As Object, e As PaintEventArgs) Handles SettingPanel.Paint ControlPaint.DrawBorder(e.Graphics, SettingPanel.ClientRectangle, - Color.Yellow, 1, ButtonBorderStyle.Dashed, - Color.Yellow, 1, ButtonBorderStyle.Dashed, - Color.Yellow, 1, ButtonBorderStyle.Dashed, - Color.Yellow, 1, ButtonBorderStyle.Dashed) + Color.White, 1, ButtonBorderStyle.Dashed, + Color.White, 1, ButtonBorderStyle.Dashed, + Color.White, 1, ButtonBorderStyle.Dashed, + Color.White, 1, ButtonBorderStyle.Dashed) End Sub '检测软件和汉化文本的版本 @@ -536,7 +602,8 @@ Public Class WavenLauncher End Using Dim WavenID As String = """gameId"":22," Dim tempCurrentVersion As String = CurrentVersionResource.Remove(0, CurrentVersionResource.IndexOf(WavenID)) - tempCurrentVersion = tempCurrentVersion.Remove(0, tempCurrentVersion.IndexOf("windows") + 22) + tempCurrentVersion = tempCurrentVersion.Remove(0, tempCurrentVersion.IndexOf("windows")) + tempCurrentVersion = tempCurrentVersion.Remove(0, tempCurrentVersion.IndexOf("main") + 11) tempCurrentVersion = tempCurrentVersion.Substring(0, 12) If tempCurrentVersion.EndsWith("""") Then tempCurrentVersion = tempCurrentVersion.Substring(0, 11) @@ -557,23 +624,27 @@ Public Class WavenLauncher ZipVersionGM = GetVersion("游戏硬盘版", 12) 'accessToken = VersionResource.Remove(0, VersionResource.IndexOf("授权下载密匙") + 8) 'domainNumber = VersionResource.Remove(0, VersionResource.IndexOf("授权下载密匙") + 7).Substring(0, 1) + ALVersionLabel.Text = "★ 点击下载战网：" & NewVersionAL + GMVersionLabel.Text = "★ 点击下载游戏：" & NewVersionGM + LocalALVersionLabel.Text = "★ 本地战网版本：" & LocalALVersion + LocalGMVersionLabel.Text = "★ 本地游戏版本：" & LocalGMVersion If Val(NewVersionWL) > VersionWL Then '若获取到版本号比当前软件版本号要新（如201908051>201908011 WLVerStatus.Text = "点此更新软件" wlneedtoupdate = True '设置需要更新以便点击label时为下载 Timer_NewVersionNeon.Enabled = True '开启红黄闪烁 VersionAL = My.Settings.VersionAL - ALVersionLabel.Text = "适用战网版本：" & VersionAL + 'ALVersionLabel.Text = "适用战网版本：" & VersionAL VersionGM = My.Settings.VersionGM - GMVersionLabel.Text = "适用游戏版本：" & VersionGM ' 显示软件自带版本号 + 'GMVersionLabel.Text = "适用游戏版本：" & VersionGM ' 显示软件自带版本号 Else If CurrentVersion <> "" Then WLVerStatus.Text = "" End If VersionAL = NewVersionAL - ALVersionLabel.Text = "适用战网版本：" & NewVersionAL + 'ALVersionLabel.Text = "适用战网版本：" & NewVersionAL VersionGM = NewVersionGM - GMVersionLabel.Text = "适用游戏版本：" & NewVersionGM ' 显示兼容的版本号 + 'GMVersionLabel.Text = "适用游戏版本：" & NewVersionGM ' 显示兼容的版本号 End If ALVersionLabel.Enabled = True If File.Exists(ALDir) Then @@ -801,12 +872,9 @@ Public Class WavenLauncher LayoutLabel("未检测到本地游戏版本，请打开战网校验游戏文件") Exit Sub End If - LocalVersion = GetLocalJson("version", 7, 12) '从本地缓存获取本地游戏版本 - If LocalVersion.EndsWith("""") Then - LocalVersion = LocalVersion.Substring(0, 11) - End If - If LocalVersion <> CurrentVersion AndAlso CurrentVersion <> "" Then - LayoutLabel($"本地游戏版本为{LocalVersion}，请更新到{CurrentVersion}后再安装汉化！") + + If LocalGMVersion <> CurrentVersion AndAlso CurrentVersion <> "" Then + LayoutLabel($"本地游戏版本为{LocalGMVersion}，请更新到{CurrentVersion}后再安装汉化！") Exit Sub End If Dim tempVersionCN As String @@ -830,12 +898,12 @@ Public Class WavenLauncher LayoutLabel("Waven汉化启动器过旧！请更新软件！") Exit Sub End If - If LocalVersion = NewVersionGM Then '若未检测到最新游戏版本，那么比较本地游戏版本与汉化适用版本 + If LocalGMVersion = NewVersionGM Then '若未检测到最新游戏版本，那么比较本地游戏版本与汉化适用版本 ExZip(DefaultFileAddress, "Waven-zh-cn.zip", GameDataPath) '调用解压zip方法 LastMsg = $"安装汉化成功，版本为【{tempVersionCN}】" Else - LayoutLabel($"汉化失败：本地游戏版本为{LocalVersion}，而汉化适用版本为{NewVersionGM}。") + LayoutLabel($"汉化失败：本地游戏版本为{LocalGMVersion}，而汉化适用版本为{NewVersionGM}。") Exit Sub End If Else '若汉化适用版本与游戏版本不一致 @@ -1006,6 +1074,7 @@ Public Class WavenLauncher GMVersionLabel.Enabled = True End If ButtonAction(False) '改变按钮状态 + CheckLocalAL() Else LayoutLabel("取消安装Ankama战网") ButtonAction(False) '改变按钮状态 @@ -1044,6 +1113,7 @@ Public Class WavenLauncher ButtonDirGM.BackColor = Color.Teal End If ButtonAction(False) + CheckLocalGM() Else LayoutLabel("取消安装Waven游戏") ButtonAction(False) '改变按钮状态 @@ -1116,6 +1186,7 @@ Public Class WavenLauncher Private Sub OpenOrSaveSetting(ByVal KeepOpening As Boolean) Try If PanelVisible = False Then + ScreenSize = GetRealScreenSize() CheckRegValue(fullscreenKey) CheckRegValue(windowWidthKey) CheckRegValue(windowHeightKey) @@ -1152,6 +1223,7 @@ Public Class WavenLauncher If GMDir <> My.Settings.GMDir Then '若游戏路径已选择 ButtonAction(False) '改变按钮状态 + CheckLocalGM() End If End If If LocAL <> My.Settings.LocAL Then @@ -1177,6 +1249,7 @@ Public Class WavenLauncher If ALDir <> My.Settings.ALDir AndAlso ALDir <> "" Then '若战网路径已选择且不为空 ButtonAction(False) '改变按钮状态 + CheckLocalAL() End If With My.Settings .CloseForm = CloseForm '保存最小化的操作 @@ -1213,7 +1286,7 @@ Public Class WavenLauncher Private Async Sub DelegateProcess() '委托线程 Try - Dim task_ping As Task(Of Boolean) = PingwithPort("betassl.platforms.waven-game.com", "5988") + Dim task_ping As Task(Of Boolean) = PingwithPort("waven-101.ankama-games.com", "5988") TCPstatus = Await task_ping task_ping.Dispose() Catch ex As Exception @@ -1243,7 +1316,7 @@ Public Class WavenLauncher Private Sub Timer_Ping_Tick(sender As Object, e As EventArgs) Handles Timer_Ping.Tick '每隔大致5s检测一次返回值，tick100ms。由于计时器间隔不一定准确，所以只是大概5s，要准确只能读取系统时钟 TickCount += 1 - If PingLabel.Text = "游戏延迟：- ms" Then '首次打开设置若获取到则先直接显示一次 + If PingLabel.Text = "★ 游戏延迟：- ms" Then '首次打开设置若获取到则先直接显示一次 If Len(TCPstatus) <> 0 AndAlso latency < 3000 Then If TCPstatus Then TickCount = 51 @@ -1253,9 +1326,9 @@ Public Class WavenLauncher If TickCount > 50 Then If Len(TCPstatus) <> 0 AndAlso latency < 3000 Then If TCPstatus Then - PingLabel.Text = $"游戏延迟：{latency} ms" + PingLabel.Text = $"★ 游戏延迟：{latency} ms" Else - PingLabel.Text = "游戏延迟：- ms" + PingLabel.Text = "★ 游戏延迟：- ms" End If pingflag = True TCPstatus = "" @@ -1263,7 +1336,7 @@ Public Class WavenLauncher If pingflag Then pingflag = False Else - PingLabel.Text = "游戏延迟：超时" + PingLabel.Text = "★ 游戏延迟：超时" End If Timer_Ping.Enabled = False Checkping() @@ -1378,6 +1451,7 @@ Public Class WavenLauncher GMVersionLabel.Enabled = True LabelDirGM.Enabled = True ButtonDirGM.Enabled = True + CheckLocalAL() LayoutLabel($"已选择Ankama战网路径""{ALDir}""，请点击保存以生效") Else LayoutLabel($"所选择路径无Ankama战网程序") @@ -1393,7 +1467,12 @@ Public Class WavenLauncher Try Dim tempinidr As String If String.IsNullOrEmpty(GMDir) Then - tempinidr = DefaultGameDataPath + If GetLocalJson("location") = "" Then + tempinidr = DefaultGameDataPath + Else + tempinidr = GetLocalJson("location") + End If + Else tempinidr = Path.GetDirectoryName(GMDir) End If @@ -1414,6 +1493,7 @@ Public Class WavenLauncher CheckRegValue(windowWidthKey) CheckRegValue(windowHeightKey) CheckRegValue(graphQualityKey) + CheckLocalGM() Else LayoutLabel($"所选择路径无Waven游戏程序") End If @@ -1749,8 +1829,9 @@ Public Class WavenLauncher Select Case INTLine '选择下载线路 Case False '默认国内线路走coding网盘 If filename = "Ankama-Launcher.zip" Then + accessToken = VersionResource.Remove(0, VersionResource.IndexOf(FileNameCN) + 7).Substring(0, 22) 'DownloadFile($"https://fs-{domainNumber}.matpool.com/fs?path=%2F{filename}{Authorization}{accessToken}", filename, savepath) - DownloadFile("http://wx.blockelite.cn:15021/web/client/pubshares/cRXZuvhEWMrejFcMqdXkT5?compress=false", filename, savepath) + DownloadFile($"http://pan.blockelite.cn:15021/web/client/pubshares/{accessToken}?compress=false", filename, savepath) ElseIf filename = "en.json" And My.Settings.LocAL Then '战网汉化版文件 DownloadFile($"{gitpage}src/{filename}", filename, savepath) Else @@ -1896,7 +1977,8 @@ Public Class WavenLauncher If INTLine Then DownloadFile($"{clouddrive}0:/Waven/Waven.zip", "Waven.zip", DefaultFileAddress) Else - DownloadFile($"http://wx.blockelite.cn:15021/web/client/pubshares/Uq69RVeNXiHSxs8tjtcQLo?compress=false", "Waven.zip", DefaultFileAddress) + accessToken = VersionResource.Remove(0, VersionResource.IndexOf("游戏安装文件") + 7).Substring(0, 22) + DownloadFile($"http://pan.blockelite.cn:15021/web/client/pubshares/{accessToken}?compress=false", "Waven.zip", DefaultFileAddress) End If Catch ex As Exception LayoutLabel("下载失败:" & ex.Message & "。请检查网络连接。") @@ -1944,9 +2026,15 @@ Public Class WavenLauncher Exit Function End If Dim temp As String = valuelist.Remove(0, valuelist.IndexOf(name) _ - + name.Length _ - + shift) - Return temp.Substring(0, length) + + name.Length _ + + shift) + If name = "location" Then + temp = temp.Remove(0, 1) + temp = temp.Substring(0, temp.IndexOf("""")) + Return temp.Replace("\\", "\") + Else + Return temp.Substring(0, length) + End If Catch ex As Exception Return "" End Try @@ -2055,6 +2143,32 @@ Public Class WavenLauncher End Try End Sub + '利用屏幕截图到Bitmap，找到Alpha=0的像素点，以获得缩放之前屏幕真实分辨率 + Public Function GetRealScreenSize() As Size + Dim W As Integer = Screen.PrimaryScreen.Bounds.Width + Dim H As Integer = Screen.PrimaryScreen.Bounds.Height + + Dim Img As Image = New Bitmap(W * 3, H * 3) + Dim G As Graphics + G = Graphics.FromImage(Img) + G.CopyFromScreen(New Point(0, 0), New Point(0, 0), Img.Size) + G.Dispose() + GC.Collect() + Dim i As Integer + For i = W To W * 3 - 1 Step 1 + Dim PointColor As Color = CType(Img, Bitmap).GetPixel(i, 0) + If PointColor.A = 0 And PointColor.R = 0 And PointColor.G = 0 And PointColor.B = 0 Then + W = i + Exit For + End If + Next + + If W <> Screen.PrimaryScreen.Bounds.Width Then + H = CInt(H * (W / Screen.PrimaryScreen.Bounds.Width)) + End If + Return New Size(W, H) + End Function + '限制分辨率输入框只能输入数字或删除键,并且不得超过屏幕分辨率 Private Sub WindowWidth_KeyPress(sender As Object, e As KeyPressEventArgs) Handles WindowWidth.KeyPress Try @@ -2064,7 +2178,7 @@ Public Class WavenLauncher If Not (Char.IsDigit(e.KeyChar) Or e.KeyChar = Chr(8)) Then e.Handled = True End If - If Char.IsDigit(e.KeyChar) AndAlso Val(WindowWidth.Text) = Screen.PrimaryScreen.Bounds.Width.ToString Then + If Char.IsDigit(e.KeyChar) AndAlso Val(WindowWidth.Text) = ScreenSize.Width Then WindowWidth.Clear() End If Catch ex As Exception @@ -2073,8 +2187,8 @@ Public Class WavenLauncher End Sub Private Sub WindowWidth_TextChanged(sender As Object, e As EventArgs) Handles WindowWidth.TextChanged - If Val(WindowWidth.Text) > Screen.PrimaryScreen.Bounds.Width.ToString Then - WindowWidth.Text = Screen.PrimaryScreen.Bounds.Width.ToString + If Val(WindowWidth.Text) > ScreenSize.Width Then + WindowWidth.Text = ScreenSize.Width End If End Sub @@ -2093,7 +2207,7 @@ Public Class WavenLauncher If Not (Char.IsDigit(e.KeyChar) Or e.KeyChar = Chr(8)) Then e.Handled = True End If - If Char.IsDigit(e.KeyChar) AndAlso Val(WindowHeight.Text) = Screen.PrimaryScreen.Bounds.Height.ToString Then + If Char.IsDigit(e.KeyChar) AndAlso Val(WindowHeight.Text) = ScreenSize.Height Then WindowHeight.Clear() End If Catch ex As Exception @@ -2102,8 +2216,8 @@ Public Class WavenLauncher End Sub Private Sub WindowHeight_TextChanged(sender As Object, e As EventArgs) Handles WindowHeight.TextChanged - If Val(WindowHeight.Text) > Screen.PrimaryScreen.Bounds.Height.ToString Then - WindowHeight.Text = Screen.PrimaryScreen.Bounds.Height.ToString + If Val(WindowHeight.Text) > ScreenSize.Height Then + WindowHeight.Text = ScreenSize.Height End If End Sub @@ -2121,8 +2235,5 @@ Public Class WavenLauncher Private Sub WLVersionLabel_Click(sender As Object, e As EventArgs) Handles WLVersionLabel.Click 'Process.Start("zaap://app/games/game/waven/main?launch") - 'Dim versionInfo = FileVersionInfo.GetVersionInfo(ALDir) - 'Dim version As String = versionInfo.FileVersion - 'Console.WriteLine(version) End Sub End Class