Merge branch 'dev' into dev

This commit is contained in:
知一一 2025-01-02 18:08:09 +08:00 committed by GitHub
commit 2e415adc13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions

View File

@ -3979,15 +3979,12 @@ doroGui.Add("Button", "R1 x+10", "检查更新").OnEvent("Click", ClickOnCheckFo
Tab := doroGui.Add("Tab3", "xm") ;由于autohotkey有bug只能这样写 Tab := doroGui.Add("Tab3", "xm") ;由于autohotkey有bug只能这样写
Tab.Add(["doro设置", "收获", "商店", "日常", "默认"]) Tab.Add(["doro设置", "收获", "商店", "日常", "默认"])
Tab.UseTab("doro设置") Tab.UseTab("doro设置")
doroGui.Add("Checkbox", IsCheckedToString(isCheckedAutoCheckUpdate) " R2", "自动检查更新(确保能连上github)").OnEvent("Click", doroGui.Add("Checkbox", IsCheckedToString(isCheckedAutoCheckUpdate) " R2", "自动检查更新(确保能连上github)").OnEvent("Click", ClickAutoCheckUpdate)
ClickAutoCheckUpdate) doroGui.Add("Text",, "点击间隔(单位毫秒),谨慎更改")
doroGui.Add("Text", , "点击间隔(单位毫秒),谨慎更改") doroGui.Add("DropDownList", "Choose" SleepTimeToLabel(sleepTime), [750, 1000, 1250, 1500, 1750, 2000]).OnEvent("Change", ChangeOnSleepTime)
doroGui.Add("DropDownList", "Choose" SleepTimeToLabel(sleepTime), [750, 1000, 1250, 1500, 1750, 2000]).OnEvent("Change", doroGui.Add("Text",, "色差容忍度,能跑就别改")
ChangeOnSleepTime) doroGui.Add("DropDownList", "Choose" ColorToleranceToLabel(colorTolerance), ["严格", "宽松"]).OnEvent("Change", ChangeOnColorTolerance)
doroGui.Add("Text", , "色差容忍度,能跑就别改") doroGui.Add("Button","R1" , "保存当前设置").OnEvent("Click", SaveSettings)
doroGui.Add("DropDownList", "Choose" ColorToleranceToLabel(colorTolerance), ["严格", "宽松"]).OnEvent("Change",
ChangeOnColorTolerance)
doroGui.Add("Button", "R1", "保存当前设置").OnEvent("Click", SaveSettings)
Tab.UseTab("收获") Tab.UseTab("收获")
doroGui.Add("Checkbox", IsCheckedToString(isCheckedOutposeDefence) " R1.2", "领取前哨基地防御奖励+1次免费歼灭").OnEvent("Click", doroGui.Add("Checkbox", IsCheckedToString(isCheckedOutposeDefence) " R1.2", "领取前哨基地防御奖励+1次免费歼灭").OnEvent("Click",
ClickOnOutpostDefence) ClickOnOutpostDefence)