diff --git a/Form1.frm b/Form1.frm index 19104d0..69991c1 100644 --- a/Form1.frm +++ b/Form1.frm @@ -1,11 +1,11 @@ VERSION 5.00 Object = "{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}#1.1#0"; "ieframe.dll" Begin VB.Form Form1 - Caption = "Fujao-Bot Light Model [1.001]" - ClientHeight = 6615 + Caption = "Fujao-Bot Light Model [1.002]" + ClientHeight = 6375 ClientLeft = 540 ClientTop = 720 - ClientWidth = 9375 + ClientWidth = 13095 BeginProperty Font Name = "Microsoft YaHei UI" Size = 12 @@ -18,33 +18,589 @@ Begin VB.Form Form1 Icon = "Form1.frx":0000 LinkTopic = "Form1" MaxButton = 0 'False - ScaleHeight = 6615 - ScaleWidth = 9375 - Begin VB.CommandButton Command2 - Caption = "Refresh" + ScaleHeight = 6375 + ScaleWidth = 13095 + Begin VB.CommandButton Command4 + Caption = "unselect all" + Height = 495 + Left = 11280 + TabIndex = 70 + Top = 120 + Width = 1695 + End + Begin VB.CommandButton Command3 + Caption = "select 0 / 30" Height = 495 - Left = 2640 + Left = 9480 + TabIndex = 69 + Top = 120 + Width = 1695 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 59 + Left = 12600 + TabIndex = 68 + Top = 5040 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 58 + Left = 12600 + TabIndex = 67 + Top = 4560 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 57 + Left = 12600 + TabIndex = 66 + Top = 4080 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 56 + Left = 12600 + TabIndex = 65 + Top = 3600 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 55 + Left = 12600 + TabIndex = 64 + Top = 3120 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 54 + Left = 12600 + TabIndex = 63 + Top = 2640 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 53 + Left = 12600 + TabIndex = 62 + Top = 2160 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 52 + Left = 12600 + TabIndex = 61 + Top = 1680 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 51 + Left = 12600 + TabIndex = 60 + Top = 1200 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 50 + Left = 12600 + TabIndex = 59 + Top = 720 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 49 + Left = 12000 + TabIndex = 58 + Top = 5040 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 48 + Left = 12000 + TabIndex = 57 + Top = 4560 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 47 + Left = 12000 + TabIndex = 56 + Top = 4080 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 46 + Left = 12000 + TabIndex = 55 + Top = 3600 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 45 + Left = 12000 + TabIndex = 54 + Top = 3120 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 44 + Left = 12000 + TabIndex = 53 + Top = 2640 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 43 + Left = 12000 + TabIndex = 52 + Top = 2160 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 42 + Left = 12000 + TabIndex = 51 + Top = 1680 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 41 + Left = 12000 + TabIndex = 50 + Top = 1200 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 40 + Left = 12000 + TabIndex = 49 + Top = 720 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 39 + Left = 11400 + TabIndex = 48 + Top = 5040 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 38 + Left = 11400 + TabIndex = 47 + Top = 4560 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 37 + Left = 11400 + TabIndex = 46 + Top = 4080 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 36 + Left = 11400 + TabIndex = 45 + Top = 3600 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 35 + Left = 11400 + TabIndex = 44 + Top = 3120 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 34 + Left = 11400 + TabIndex = 43 + Top = 2640 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 33 + Left = 11400 + TabIndex = 42 + Top = 2160 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 32 + Left = 11400 + TabIndex = 41 + Top = 1680 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 31 + Left = 11400 + TabIndex = 40 + Top = 1200 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 30 + Left = 11400 + TabIndex = 39 + Top = 720 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 29 + Left = 10800 + TabIndex = 38 + Top = 5040 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 28 + Left = 10800 + TabIndex = 37 + Top = 4560 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 27 + Left = 10800 + TabIndex = 36 + Top = 4080 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 26 + Left = 10800 + TabIndex = 35 + Top = 3600 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 25 + Left = 10800 + TabIndex = 34 + Top = 3120 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 24 + Left = 10800 + TabIndex = 33 + Top = 2640 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 23 + Left = 10800 + TabIndex = 32 + Top = 2160 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 22 + Left = 10800 + TabIndex = 31 + Top = 1680 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 21 + Left = 10800 + TabIndex = 30 + Top = 1200 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 20 + Left = 10800 + TabIndex = 29 + Top = 720 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 19 + Left = 10200 + TabIndex = 28 + Top = 5040 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 18 + Left = 10200 + TabIndex = 27 + Top = 4560 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 17 + Left = 10200 + TabIndex = 26 + Top = 4080 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 16 + Left = 10200 + TabIndex = 25 + Top = 3600 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 15 + Left = 10200 + TabIndex = 24 + Top = 3120 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 14 + Left = 10200 + TabIndex = 23 + Top = 2640 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 13 + Left = 10200 + TabIndex = 22 + Top = 2160 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 12 + Left = 10200 + TabIndex = 21 + Top = 1680 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 11 + Left = 10200 + TabIndex = 20 + Top = 1200 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 10 + Left = 10200 + TabIndex = 19 + Top = 720 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 9 + Left = 9600 + TabIndex = 18 + Top = 5040 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 8 + Left = 9600 + TabIndex = 17 + Top = 4560 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 7 + Left = 9600 + TabIndex = 16 + Top = 4080 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 6 + Left = 9600 + TabIndex = 15 + Top = 3600 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 5 + Left = 9600 + TabIndex = 14 + Top = 3120 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 4 + Left = 9600 + TabIndex = 13 + Top = 2640 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 3 + Left = 9600 + TabIndex = 12 + Top = 2160 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 2 + Left = 9600 + TabIndex = 11 + Top = 1680 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 1 + Left = 9600 + TabIndex = 10 + Top = 1200 + Width = 255 + End + Begin VB.CheckBox Check2 + Caption = "Check2" + Height = 255 + Index = 0 + Left = 9600 TabIndex = 9 - Top = 6000 - Width = 2415 + Top = 720 + Width = 255 + End + Begin VB.CommandButton Command2 + Caption = "refresh" + Height = 495 + Left = 7680 + TabIndex = 8 + Top = 120 + Width = 1695 End Begin VB.CheckBox Check1 - Caption = "Use Control + Enter" + Caption = "use control + enter" Height = 315 Index = 1 - Left = 6600 - TabIndex = 8 - Top = 6120 - Width = 2655 + Left = 9600 + TabIndex = 7 + Top = 6000 + Width = 3255 End Begin VB.CheckBox Check1 - Caption = "Enabled" + Caption = "master switch" Height = 315 Index = 0 - Left = 5160 - TabIndex = 7 - Top = 6120 - Width = 1335 + Left = 9600 + TabIndex = 6 + Top = 5520 + Width = 3375 End Begin VB.Timer Timer6 Enabled = 0 'False @@ -57,31 +613,23 @@ Begin VB.Form Form1 Left = 2040 Top = 120 End - Begin VB.CommandButton Command1 - Caption = "Gacha!" - Height = 495 - Left = 120 - TabIndex = 6 - Top = 6000 - Width = 2415 - End Begin VB.TextBox Text5 Height = 405 - Left = 8640 + Left = 6960 TabIndex = 5 Top = 120 Width = 645 End Begin VB.TextBox Text4 Height = 405 - Left = 7920 + Left = 6240 TabIndex = 4 Top = 120 Width = 645 End Begin VB.TextBox Text3 Height = 405 - Left = 7200 + Left = 5520 TabIndex = 3 Top = 120 Width = 645 @@ -93,7 +641,7 @@ Begin VB.Form Form1 End Begin VB.Timer Timer4 Enabled = 0 'False - Interval = 100 + Interval = 200 Left = 1560 Top = 120 End @@ -118,8 +666,8 @@ Begin VB.Form Form1 Italic = 0 'False Strikethrough = 0 'False EndProperty - Height = 6420 - Left = 9480 + Height = 6180 + Left = 13200 MultiLine = -1 'True ScrollBars = 2 'Vertical TabIndex = 1 @@ -128,13 +676,13 @@ Begin VB.Form Form1 Width = 7005 End Begin SHDocVwCtl.WebBrowser WebBrowser1 - Height = 5310 + Height = 5535 Left = 120 TabIndex = 0 - Top = 600 - Width = 9135 - ExtentX = 16113 - ExtentY = 9366 + Top = 720 + Width = 9255 + ExtentX = 16325 + ExtentY = 9763 ViewMode = 0 Offline = 0 Silent = 0 @@ -157,7 +705,7 @@ Begin VB.Form Form1 Left = 120 TabIndex = 2 Top = 120 - Width = 7005 + Width = 5325 End End Attribute VB_Name = "Form1" @@ -166,8 +714,7 @@ Attribute VB_Creatable = False Attribute VB_PredeclaredId = True Attribute VB_Exposed = False Option Explicit -Dim ready As Boolean -Dim pwr As Boolean +Dim ready(60) As Boolean Dim the_void As Long Dim slist As Variant Dim scount As Long @@ -177,21 +724,31 @@ Private Declare Sub mouse_event Lib "user32" (ByVal dwFlags As Long, ByVal dx As Private Const MOUSEEVENTF_LEFTDOWN = &H2 Private Const MOUSEEVENTF_LEFTUP = &H4 -Private Sub Command1_Click() -MsgBox Text1.Text -End Sub - Private Sub Command2_Click() Timer2.Enabled = True End Sub +Private Sub Command3_Click() +Check2(0).Value = 1 +Check2(30).Value = 1 +End Sub + +Private Sub Command4_Click() +Dim i As Long +For i = 0 To 59 +Check2(i).Value = 0 +Next i +End Sub + Private Sub Form_Load() WebBrowser1.Navigate "about:blank" Text2.Text = "https://cdn.jsdelivr.net/gh/fujao-time/fujaoese-hitokoto/sentence.txt" Text4.Text = 0 Text5.Text = 0 -ready = True -pwr = False +Dim i As Long +For i = 0 To 59 +ready(i) = True +Next i End Sub Private Sub Timer1_Timer() 'parse @@ -200,13 +757,12 @@ Exit Sub Else slist = Split(WebBrowser1.Document.body.innerText, vbCrLf) scount = Fix(Val(slist(0))) +Timer3.Enabled = True Timer1.Enabled = False -Timer4.Enabled = True End If End Sub Private Sub Timer2_Timer() 'fetch sentences -Timer4.Enabled = False WebBrowser1.Navigate Text2.Text Timer1.Enabled = True Timer2.Enabled = False @@ -215,12 +771,15 @@ End Sub Private Sub Timer3_Timer() 'check time Text3.Text = Minute(Now) If Check1(0).Value = 1 Then -If Val(Text3.Text) Mod 30 = 0 And ready Then -Timer6.Enabled = True -ready = False -ElseIf Val(Text3.Text) Mod 30 <> 0 Then -ready = True +Dim i As Long +For i = 0 To 59 +If Check2(i).Value = 1 And Val(Text3.Text) = i And ready(i) Then +Timer4.Enabled = True +ready(i) = False +ElseIf Val(Text3.Text) <> i Then +ready(i) = True End If +Next i End If End Sub @@ -229,10 +788,13 @@ Dim x As Long x = Fix(Rnd * scount) + 1 If x >= 1 And x <= scount Then Text1.Text = "[Fujao-time]" & vbCrLf & Year(Now) & "/" & Month(Now) & "/" & Day(Now) & " " & Hour(Now) & ":" & Text3.Text & vbCrLf & slist(x) +Timer6.Enabled = True +Timer4.Enabled = False End If End Sub Private Sub Timer5_Timer() 'check update every 10 min +Timer3.Enabled = False Timer2.Enabled = True End Sub @@ -249,3 +811,4 @@ SendKeys ("{ENTER}") End If Timer6.Enabled = False End Sub + diff --git a/main.vbp b/main.vbp index 52b8d92..cc86bed 100644 --- a/main.vbp +++ b/main.vbp @@ -7,13 +7,13 @@ IconForm="Form1" Startup="Form1" HelpFile="" Title="Fujao-Bot Light" -ExeName32="Fujao-Bot.exe" +ExeName32="FujaoBotLightModel.exe" Command32="" Name="FujaoBotLightModel" HelpContextID="0" CompatibleMode="0" MajorVer=1 -MinorVer=1 +MinorVer=2 RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 diff --git a/main.vbw b/main.vbw index e3dd988..1c8e4d4 100644 --- a/main.vbw +++ b/main.vbw @@ -1 +1 @@ -Form1 = 218, 42, 1577, 919, , 11, 17, 1466, 924, C +Form1 = 215, -3, 1574, 874, , 11, 17, 1466, 924, C