diff --git a/Form1.Designer.vb b/Form1.Designer.vb
index f36cd62..1979bef 100644
--- a/Form1.Designer.vb
+++ b/Form1.Designer.vb
@@ -39,26 +39,24 @@ Partial Class Form1
Button6 = New Button()
CheckBox1 = New CheckBox()
Button7 = New Button()
- Button8 = New Button()
- Label6 = New Label()
SuspendLayout()
'
' Button1
'
- Button1.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- Button1.Location = New Drawing.Point(256, 252)
+ Button1.Font = New Font("Microsoft YaHei UI", 26.25F)
+ Button1.Location = New Point(256, 252)
Button1.Name = "Button1"
- Button1.Size = New Drawing.Size(170, 72)
+ Button1.Size = New Size(170, 72)
Button1.TabIndex = 0
Button1.Text = "开始抽奖"
Button1.UseVisualStyleBackColor = True
'
' Button2
'
- Button2.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- Button2.Location = New Drawing.Point(479, 38)
+ Button2.Font = New Font("Microsoft YaHei UI", 26.25F)
+ Button2.Location = New Point(479, 38)
Button2.Name = "Button2"
- Button2.Size = New Drawing.Size(147, 60)
+ Button2.Size = New Size(147, 60)
Button2.TabIndex = 1
Button2.Text = "换一个"
Button2.UseVisualStyleBackColor = True
@@ -67,51 +65,51 @@ Partial Class Form1
' Label1
'
Label1.AutoSize = True
- Label1.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- Label1.Location = New Drawing.Point(51, 45)
+ Label1.Font = New Font("Microsoft YaHei UI", 26.25F)
+ Label1.Location = New Point(51, 45)
Label1.Name = "Label1"
- Label1.Size = New Drawing.Size(160, 46)
+ Label1.Size = New Size(160, 46)
Label1.TabIndex = 2
Label1.Text = "第一小组"
'
' TextBox1
'
- TextBox1.BackColor = Drawing.SystemColors.HighlightText
- TextBox1.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- TextBox1.Location = New Drawing.Point(217, 42)
+ TextBox1.BackColor = SystemColors.HighlightText
+ TextBox1.Font = New Font("Microsoft YaHei UI", 26.25F)
+ TextBox1.Location = New Point(217, 42)
TextBox1.Name = "TextBox1"
TextBox1.ReadOnly = True
- TextBox1.Size = New Drawing.Size(256, 52)
+ TextBox1.Size = New Size(256, 52)
TextBox1.TabIndex = 3
TextBox1.TextAlign = HorizontalAlignment.Center
'
' TextBox2
'
- TextBox2.BackColor = Drawing.SystemColors.HighlightText
- TextBox2.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- TextBox2.Location = New Drawing.Point(217, 108)
+ TextBox2.BackColor = SystemColors.HighlightText
+ TextBox2.Font = New Font("Microsoft YaHei UI", 26.25F)
+ TextBox2.Location = New Point(217, 108)
TextBox2.Name = "TextBox2"
TextBox2.ReadOnly = True
- TextBox2.Size = New Drawing.Size(256, 52)
+ TextBox2.Size = New Size(256, 52)
TextBox2.TabIndex = 6
TextBox2.TextAlign = HorizontalAlignment.Center
'
' Label2
'
Label2.AutoSize = True
- Label2.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- Label2.Location = New Drawing.Point(51, 111)
+ Label2.Font = New Font("Microsoft YaHei UI", 26.25F)
+ Label2.Location = New Point(51, 111)
Label2.Name = "Label2"
- Label2.Size = New Drawing.Size(160, 46)
+ Label2.Size = New Size(160, 46)
Label2.TabIndex = 5
Label2.Text = "第二小组"
'
' Button3
'
- Button3.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- Button3.Location = New Drawing.Point(479, 104)
+ Button3.Font = New Font("Microsoft YaHei UI", 26.25F)
+ Button3.Location = New Point(479, 104)
Button3.Name = "Button3"
- Button3.Size = New Drawing.Size(147, 60)
+ Button3.Size = New Size(147, 60)
Button3.TabIndex = 4
Button3.Text = "换一个"
Button3.UseVisualStyleBackColor = True
@@ -119,31 +117,31 @@ Partial Class Form1
'
' TextBox3
'
- TextBox3.BackColor = Drawing.SystemColors.HighlightText
- TextBox3.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- TextBox3.Location = New Drawing.Point(217, 174)
+ TextBox3.BackColor = SystemColors.HighlightText
+ TextBox3.Font = New Font("Microsoft YaHei UI", 26.25F)
+ TextBox3.Location = New Point(217, 174)
TextBox3.Name = "TextBox3"
TextBox3.ReadOnly = True
- TextBox3.Size = New Drawing.Size(256, 52)
+ TextBox3.Size = New Size(256, 52)
TextBox3.TabIndex = 9
TextBox3.TextAlign = HorizontalAlignment.Center
'
' Label3
'
Label3.AutoSize = True
- Label3.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- Label3.Location = New Drawing.Point(51, 177)
+ Label3.Font = New Font("Microsoft YaHei UI", 26.25F)
+ Label3.Location = New Point(51, 177)
Label3.Name = "Label3"
- Label3.Size = New Drawing.Size(160, 46)
+ Label3.Size = New Size(160, 46)
Label3.TabIndex = 8
Label3.Text = "第三小组"
'
' Button4
'
- Button4.Font = New Drawing.Font("Microsoft YaHei UI", 26.25F, Drawing.FontStyle.Regular, Drawing.GraphicsUnit.Point)
- Button4.Location = New Drawing.Point(479, 170)
+ Button4.Font = New Font("Microsoft YaHei UI", 26.25F)
+ Button4.Location = New Point(479, 170)
Button4.Name = "Button4"
- Button4.Size = New Drawing.Size(147, 60)
+ Button4.Size = New Size(147, 60)
Button4.TabIndex = 7
Button4.Text = "换一个"
Button4.UseVisualStyleBackColor = True
@@ -161,18 +159,18 @@ Partial Class Form1
' Label5
'
Label5.AutoSize = True
- Label5.Location = New Drawing.Point(413, 440)
+ Label5.Location = New Point(418, 386)
Label5.Name = "Label5"
- Label5.Size = New Drawing.Size(244, 17)
+ Label5.Size = New Size(244, 17)
Label5.TabIndex = 13
- Label5.Text = "code by 陈浩南@第一小组 2023年9月21日"
- Label5.TextAlign = Drawing.ContentAlignment.TopRight
+ Label5.Text = "code by 陈浩南@第一小组 2024年10月6日"
+ Label5.TextAlign = ContentAlignment.TopRight
'
' Button6
'
- Button6.Location = New Drawing.Point(109, 434)
+ Button6.Location = New Point(152, 374)
Button6.Name = "Button6"
- Button6.Size = New Drawing.Size(107, 23)
+ Button6.Size = New Size(107, 23)
Button6.TabIndex = 14
Button6.Text = "导出名单到excel"
Button6.UseVisualStyleBackColor = True
@@ -182,47 +180,27 @@ Partial Class Form1
CheckBox1.AutoSize = True
CheckBox1.Checked = True
CheckBox1.CheckState = CheckState.Checked
- CheckBox1.Location = New Drawing.Point(106, 330)
+ CheckBox1.Location = New Point(106, 330)
CheckBox1.Name = "CheckBox1"
- CheckBox1.Size = New Drawing.Size(471, 38)
+ CheckBox1.Size = New Size(471, 38)
CheckBox1.TabIndex = 15
CheckBox1.Text = "尽量避免重复" & vbCrLf & "(已经抽到过的人将不再被抽到,除非程序被重启或那个小组的人都轮换了一遍。)" & vbCrLf
CheckBox1.UseVisualStyleBackColor = True
'
' Button7
'
- Button7.Location = New Drawing.Point(12, 406)
+ Button7.Location = New Point(17, 374)
Button7.Name = "Button7"
- Button7.Size = New Drawing.Size(81, 23)
+ Button7.Size = New Size(131, 23)
Button7.TabIndex = 16
- Button7.Text = "下载最新版"
+ Button7.Text = "下载最新版和源代码"
Button7.UseVisualStyleBackColor = True
'
- ' Button8
- '
- Button8.Location = New Drawing.Point(12, 434)
- Button8.Name = "Button8"
- Button8.Size = New Drawing.Size(81, 23)
- Button8.TabIndex = 17
- Button8.Text = "获取源代码"
- Button8.UseVisualStyleBackColor = True
- '
- ' Label6
- '
- Label6.AutoSize = True
- Label6.Location = New Drawing.Point(99, 409)
- Label6.Name = "Label6"
- Label6.Size = New Drawing.Size(181, 17)
- Label6.TabIndex = 18
- Label6.Text = "或手动访问kkmeeting.chn.moe"
- '
' Form1
'
- AutoScaleDimensions = New Drawing.SizeF(7.0F, 17.0F)
+ AutoScaleDimensions = New SizeF(7F, 17F)
AutoScaleMode = AutoScaleMode.Font
- ClientSize = New Drawing.Size(669, 464)
- Controls.Add(Label6)
- Controls.Add(Button8)
+ ClientSize = New Size(669, 406)
Controls.Add(Button7)
Controls.Add(CheckBox1)
Controls.Add(Button6)
@@ -263,6 +241,4 @@ Partial Class Form1
Friend WithEvents Button6 As Button
Friend WithEvents CheckBox1 As CheckBox
Friend WithEvents Button7 As Button
- Friend WithEvents Button8 As Button
- Friend WithEvents Label6 As Label
End Class
diff --git a/Form1.resx b/Form1.resx
index 25fdfdb..ce7ab22 100644
--- a/Form1.resx
+++ b/Form1.resx
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/My Project/Settings.Designer.vb b/My Project/Settings.Designer.vb
deleted file mode 100644
index 9f68023..0000000
--- a/My Project/Settings.Designer.vb
+++ /dev/null
@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-'
-' 此代码由工具生成。
-' 运行时版本:4.0.30319.42000
-'
-' 对此文件的更改可能会导致不正确的行为,并且如果
-' 重新生成代码,这些更改将会丢失。
-'
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-
- _
- Partial Friend NotInheritable Class MySettings
- Inherits Global.System.Configuration.ApplicationSettingsBase
-
- Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-
-#Region "My.Settings 自动保存功能"
-#If _MyType = "WindowsForms" Then
- Private Shared addedHandler As Boolean
-
- Private Shared addedHandlerLockObject As New Object
-
- _
- Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
- If My.Application.SaveMySettingsOnExit Then
- My.Settings.Save()
- End If
- End Sub
-#End If
-#End Region
-
- Public Shared ReadOnly Property [Default]() As MySettings
- Get
-
-#If _MyType = "WindowsForms" Then
- If Not addedHandler Then
- SyncLock addedHandlerLockObject
- If Not addedHandler Then
- AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
- addedHandler = True
- End If
- End SyncLock
- End If
-#End If
- Return defaultInstance
- End Get
- End Property
- End Class
-End Namespace
-
-Namespace My
-
- _
- Friend Module MySettingsProperty
-
- _
- Friend ReadOnly Property Settings() As Global.幸运抽奖.My.MySettings
- Get
- Return Global.幸运抽奖.My.MySettings.Default
- End Get
- End Property
- End Module
-End Namespace
diff --git a/My Project/Settings.settings b/My Project/Settings.settings
deleted file mode 100644
index 392df0a..0000000
--- a/My Project/Settings.settings
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/My Project/app.manifest b/My Project/app.manifest
deleted file mode 100644
index c628ed9..0000000
--- a/My Project/app.manifest
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/幸运抽奖.sln b/幸运抽奖.sln
index 2683d82..03b987c 100644
--- a/幸运抽奖.sln
+++ b/幸运抽奖.sln
@@ -1,9 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
-VisualStudioVersion = 17.1.32210.238
+VisualStudioVersion = 17.11.35312.102
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "幸运抽奖", "幸运抽奖.vbproj", "{9FA8009F-4168-4221-98EF-DEAF6D62D94D}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "幸运抽奖", "幸运抽奖.vbproj", "{DF7EE13A-545F-47A8-A6F3-7643B10CFDC4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +11,15 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {9FA8009F-4168-4221-98EF-DEAF6D62D94D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9FA8009F-4168-4221-98EF-DEAF6D62D94D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9FA8009F-4168-4221-98EF-DEAF6D62D94D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9FA8009F-4168-4221-98EF-DEAF6D62D94D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DF7EE13A-545F-47A8-A6F3-7643B10CFDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DF7EE13A-545F-47A8-A6F3-7643B10CFDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DF7EE13A-545F-47A8-A6F3-7643B10CFDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DF7EE13A-545F-47A8-A6F3-7643B10CFDC4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {F939207A-147C-4E59-846D-3C8EF03A9186}
+ SolutionGuid = {7FE65332-BB0D-4511-BCA6-F1359021D80F}
EndGlobalSection
EndGlobal
diff --git a/幸运抽奖.vbproj b/幸运抽奖.vbproj
index f676e5e..26e43c3 100644
--- a/幸运抽奖.vbproj
+++ b/幸运抽奖.vbproj
@@ -1,38 +1,42 @@
-
- <_SuppressWinFormsTrimError>true
-
+
WinExe
- net6.0-windows
+ net8.0-windows
Sub Main
true
WindowsForms
+ OfficeOpenXml=False,System.Data=False,System.Drawing=False,System.Windows.Forms=False,Microsoft.VisualBasic=True,System=True,System.Collections=True,System.Collections.Generic=True,System.Diagnostics=True,System.Linq=True,System.Xml.Linq=True,System.Threading.Tasks=True,幸运抽奖=True
On
- My Project\app.manifest
- index.ico
+ AnyCPU;x64
-
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036
+ AnyCPU
+
+
+
+ AnyCPU
-
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036
+ AnyCPU
+
+
+
+ AnyCPU
-
-
-
-
+
+
+
-
+
+
@@ -41,24 +45,6 @@
True
Application.myapp
-
- True
- True
- Resources.resx
-
-
- True
- True
- Settings.settings
-
-
-
-
-
- My.Resources
- VbMyResourcesResXFileCodeGenerator
- Resources.Designer.vb
-
@@ -66,11 +52,6 @@
MyApplicationCodeGenerator
Application.Designer.vb
-
- My
- SettingsSingleFileGenerator
- Settings.Designer.vb
-
\ No newline at end of file