更新1.10.27.1版本

适配Waven 0.8版本
layahcn · Oct 26, 2021 · 89d9224 · 89d9224
1 parent 167bf1f
commit 89d9224
Show file tree

Hide file tree

Showing 9 changed files with 699 additions and 391 deletions.
diff --git a/README.md b/README.md
diff --git a/WavenLauncher/App.config b/WavenLauncher/App.config
@@ -26,20 +26,23 @@
                 <value />
             </setting>
             <setting name="VersionAL" serializeAs="String">
-                <value>3.2.5</value>
+                <value>3.5.3</value>
             </setting>
             <setting name="AutoUD" serializeAs="String">
                 <value>True</value>
             </setting>
             <setting name="VersionGM" serializeAs="String">
-                <value>0.7.0.23443</value>
+                <value>0.8.4.30606</value>
             </setting>
             <setting name="Valid" serializeAs="String">
                 <value>False</value>
             </setting>
             <setting name="INTLine" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="VersionWL" serializeAs="String">
+                <value>202110271</value>
+            </setting>
         </WavenLauncher.My.MySettings>
     </userSettings>
 </configuration>
diff --git a/WavenLauncher/ApplicationEvents.vb b/WavenLauncher/ApplicationEvents.vb
@@ -1,4 +1,5 @@
 Imports Microsoft.VisualBasic.ApplicationServices
+Imports Microsoft.Win32
 
 Namespace My
     ' 以下事件可用于 MyApplication: 
@@ -11,5 +12,20 @@ Namespace My
         Private Sub MyApplication_StartupNextInstance(sender As Object, e As StartupNextInstanceEventArgs) Handles Me.StartupNextInstance
             Call WavenLauncher.DisplayForm()
         End Sub
+
+        Private Sub MyApplication_Startup(sender As Object, e As StartupEventArgs) Handles Me.Startup
+            Const subkey As String = "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\"
+            Using ndpKey As RegistryKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)
+                If ndpKey IsNot Nothing AndAlso ndpKey.GetValue("Release") IsNot Nothing Then
+                    If ndpKey.GetValue("Release") < 461808 Then
+                        MsgBox("当前.NET框架版本过旧，请下载安装4.7.2版本方可运行本软件", MsgBoxStyle.Critical, "框架版本不符")
+                        End
+                    End If
+                Else
+                    MsgBox("未检测到.NET框架，请下载安装4.7.2版本方可运行本软件", MsgBoxStyle.Critical, "框架未找到")
+                    End
+                End If
+            End Using
+        End Sub
     End Class
 End Namespace
diff --git a/WavenLauncher/My Project/AssemblyInfo.vb b/WavenLauncher/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.2.0.0")>
-<Assembly: AssemblyFileVersion("1.2.23.1")>
+<Assembly: AssemblyVersion("1.3.0.0")>
+<Assembly: AssemblyFileVersion("1.10.27.1")>
diff --git a/WavenLauncher/My Project/Settings.Designer.vb b/WavenLauncher/My Project/Settings.Designer.vb
diff --git a/WavenLauncher/My Project/Settings.settings b/WavenLauncher/My Project/Settings.settings
@@ -18,19 +18,22 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="VersionAL" Type="System.String" Scope="User">
-      <Value Profile="(Default)">3.2.5</Value>
+      <Value Profile="(Default)">3.5.3</Value>
     </Setting>
     <Setting Name="AutoUD" Type="System.String" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="VersionGM" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0.7.0.23443</Value>
+      <Value Profile="(Default)">0.8.4.30606</Value>
     </Setting>
     <Setting Name="Valid" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="INTLine" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="VersionWL" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">202110271</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/WavenLauncher/WavenLauncher.Designer.vb b/WavenLauncher/WavenLauncher.Designer.vb
diff --git a/WavenLauncher/WavenLauncher.resx b/WavenLauncher/WavenLauncher.resx
@@ -1909,8 +1909,11 @@
   <metadata name="Timer_HideForm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>360, 58</value>
   </metadata>
+  <metadata name="Timer_Ping.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>501, 58</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>133</value>
+    <value>91</value>
   </metadata>
   <data name="$this.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>