diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 35410ca..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/AUTO_MAA.iml b/.idea/AUTO_MAA.iml deleted file mode 100644 index d63d97c..0000000 --- a/.idea/AUTO_MAA.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/MarsCodeWorkspaceAppSettings.xml b/.idea/MarsCodeWorkspaceAppSettings.xml deleted file mode 100644 index 0fbf073..0000000 --- a/.idea/MarsCodeWorkspaceAppSettings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 7e4d313..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index ee0c587..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index ac7bc93..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/__pycache__/__init__.cpython-312.pyc b/app/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index 22ef460..0000000 Binary files a/app/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/app/core/__pycache__/__init__.cpython-312.pyc b/app/core/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index 8b85241..0000000 Binary files a/app/core/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/app/core/__pycache__/config.cpython-312.pyc b/app/core/__pycache__/config.cpython-312.pyc deleted file mode 100644 index 4a7444d..0000000 Binary files a/app/core/__pycache__/config.cpython-312.pyc and /dev/null differ diff --git a/app/core/__pycache__/main_info_bar.cpython-312.pyc b/app/core/__pycache__/main_info_bar.cpython-312.pyc deleted file mode 100644 index ffefc25..0000000 Binary files a/app/core/__pycache__/main_info_bar.cpython-312.pyc and /dev/null differ diff --git a/app/core/__pycache__/task_manager.cpython-312.pyc b/app/core/__pycache__/task_manager.cpython-312.pyc deleted file mode 100644 index 63fdfbc..0000000 Binary files a/app/core/__pycache__/task_manager.cpython-312.pyc and /dev/null differ diff --git a/app/core/__pycache__/timer.cpython-312.pyc b/app/core/__pycache__/timer.cpython-312.pyc deleted file mode 100644 index 53fbaf1..0000000 Binary files a/app/core/__pycache__/timer.cpython-312.pyc and /dev/null differ diff --git a/app/models/__pycache__/MAA.cpython-312.pyc b/app/models/__pycache__/MAA.cpython-312.pyc deleted file mode 100644 index 9d12436..0000000 Binary files a/app/models/__pycache__/MAA.cpython-312.pyc and /dev/null differ diff --git a/app/models/__pycache__/__init__.cpython-312.pyc b/app/models/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index ffd1791..0000000 Binary files a/app/models/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/app/services/__pycache__/__init__.cpython-312.pyc b/app/services/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index 7cb9060..0000000 Binary files a/app/services/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/app/services/__pycache__/notification.cpython-312.pyc b/app/services/__pycache__/notification.cpython-312.pyc deleted file mode 100644 index 28630ba..0000000 Binary files a/app/services/__pycache__/notification.cpython-312.pyc and /dev/null differ diff --git a/app/services/__pycache__/security.cpython-312.pyc b/app/services/__pycache__/security.cpython-312.pyc deleted file mode 100644 index 8f5c7b9..0000000 Binary files a/app/services/__pycache__/security.cpython-312.pyc and /dev/null differ diff --git a/app/services/__pycache__/system.cpython-312.pyc b/app/services/__pycache__/system.cpython-312.pyc deleted file mode 100644 index 734f533..0000000 Binary files a/app/services/__pycache__/system.cpython-312.pyc and /dev/null differ diff --git a/app/ui/__pycache__/Widget.cpython-312.pyc b/app/ui/__pycache__/Widget.cpython-312.pyc deleted file mode 100644 index 69b4b49..0000000 Binary files a/app/ui/__pycache__/Widget.cpython-312.pyc and /dev/null differ diff --git a/app/ui/__pycache__/__init__.cpython-312.pyc b/app/ui/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index 8b61e6c..0000000 Binary files a/app/ui/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/app/ui/__pycache__/dispatch_center.cpython-312.pyc b/app/ui/__pycache__/dispatch_center.cpython-312.pyc deleted file mode 100644 index de60a47..0000000 Binary files a/app/ui/__pycache__/dispatch_center.cpython-312.pyc and /dev/null differ diff --git a/app/ui/__pycache__/main_window.cpython-312.pyc b/app/ui/__pycache__/main_window.cpython-312.pyc deleted file mode 100644 index e2d84ed..0000000 Binary files a/app/ui/__pycache__/main_window.cpython-312.pyc and /dev/null differ diff --git a/app/ui/__pycache__/member_manager.cpython-312.pyc b/app/ui/__pycache__/member_manager.cpython-312.pyc deleted file mode 100644 index a7d20b9..0000000 Binary files a/app/ui/__pycache__/member_manager.cpython-312.pyc and /dev/null differ diff --git a/app/ui/__pycache__/queue_manager.cpython-312.pyc b/app/ui/__pycache__/queue_manager.cpython-312.pyc deleted file mode 100644 index 1f9e100..0000000 Binary files a/app/ui/__pycache__/queue_manager.cpython-312.pyc and /dev/null differ diff --git a/app/ui/__pycache__/setting.cpython-312.pyc b/app/ui/__pycache__/setting.cpython-312.pyc deleted file mode 100644 index d190feb..0000000 Binary files a/app/ui/__pycache__/setting.cpython-312.pyc and /dev/null differ diff --git a/app/utils/__pycache__/Updater.cpython-312.pyc b/app/utils/__pycache__/Updater.cpython-312.pyc deleted file mode 100644 index 3df650e..0000000 Binary files a/app/utils/__pycache__/Updater.cpython-312.pyc and /dev/null differ diff --git a/app/utils/__pycache__/__init__.cpython-312.pyc b/app/utils/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index 33b9630..0000000 Binary files a/app/utils/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/config/MaaConfig/脚本_1/Default/gui.json b/config/MaaConfig/脚本_1/Default/gui.json deleted file mode 100644 index d494ac5..0000000 --- a/config/MaaConfig/脚本_1/Default/gui.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "Configurations": { - "Default": { - "AutoRecruit.AutoRecruitFirstList": "", - "AutoRecruit.ChooseLevel3": "True", - "AutoRecruit.ChooseLevel3.Time": "540", - "AutoRecruit.ChooseLevel4": "True", - "AutoRecruit.ChooseLevel4.Time": "540", - "AutoRecruit.ChooseLevel5": "False", - "AutoRecruit.ChooseLevel5.Time": "540", - "AutoRecruit.ForceRefresh": "True", - "AutoRecruit.MaxTimes": "4", - "AutoRecruit.NotChooseLevel1": "True", - "AutoRecruit.RefreshLevel3": "True", - "AutoRecruit.SelectExtraTags": "0", - "Bluestacks.Config.Keyword": "", - "Bluestacks.Config.Path": "", - "Connect.AdbLiteEnabled": "False", - "Connect.AdbPath": "E:\\MuMu Player 12\\shell\\.\\adb.exe", - "Connect.AdbReplaced": "False", - "Connect.Address": "127.0.0.1:16384", - "Connect.AddressHistory": "[\"127.0.0.1:16384\"]", - "Connect.AllowADBHardRestart": "True", - "Connect.AllowADBRestart": "True", - "Connect.AlwaysAutoDetect": "False", - "Connect.AutoDetect": "False", - "Connect.ConnectConfig": "MuMuEmulator12", - "Connect.KillAdbOnExit": "False", - "Connect.LdPlayerEmulatorPath": "C:\\leidian\\LDPlayer9", - "Connect.LdPlayerExtras.Enabled": "False", - "Connect.LdPlayerIndex": "0", - "Connect.MuMu12EmulatorPath": "C:\\Program Files\\Netease\\MuMuPlayer-12.0", - "Connect.MuMu12Extras.Enabled": "False", - "Connect.MuMu12Index": "0", - "Connect.MumuBridgeConnection": "False", - "Connect.RetryOnDisconnected": "False", - "Connect.TouchMode": "minitouch", - "Copilot.AddUserAdditional": "False", - "Copilot.CopilotTaskList": "", - "Copilot.LoopTimes": "1", - "Copilot.UserAdditional": "", - "ExternalNotification.Bark.SendKey": "", - "ExternalNotification.Bark.Server": "https://api.day.app", - "ExternalNotification.Discord.BotToken": "", - "ExternalNotification.Discord.UserId": "", - "ExternalNotification.Discord.WebhookUrl": "", - "ExternalNotification.Enabled": "", - "ExternalNotification.Qmsg.Bot": "", - "ExternalNotification.Qmsg.Key": "", - "ExternalNotification.Qmsg.Server": "", - "ExternalNotification.Qmsg.User": "", - "ExternalNotification.ServerChan.SendKey": "", - "ExternalNotification.Smtp.From": "", - "ExternalNotification.Smtp.Password": "", - "ExternalNotification.Smtp.Port": "", - "ExternalNotification.Smtp.RequiresAuthentication": "false", - "ExternalNotification.Smtp.Server": "", - "ExternalNotification.Smtp.To": "", - "ExternalNotification.Smtp.User": "", - "ExternalNotification.Smtp.UseSsl": "false", - "ExternalNotification.Telegram.BotToken": "", - "ExternalNotification.Telegram.ChatId": "", - "Fight.RemainingSanityStage": "", - "Fight.UseExpiringMedicine": "False", - "Fight.UseRemainingSanityStage": "True", - "Gacha.ShowDisclaimerNoMore": "False", - "GUI.AllowUseStoneSave": "False", - "GUI.CustomStageCode": "False", - "GUI.HideSeries": "False", - "GUI.HideUnavailableStage": "True", - "GUI.UseAlternateStage": "False", - "GUI.WindowTitlePrefix": "", - "Guide.StepIndex": "4", - "Infrast.ContinueTraining": "False", - "Infrast.Control.IsChecked": "True", - "Infrast.CustomInfrastEnabled": "False", - "Infrast.CustomInfrastFile": "", - "Infrast.CustomInfrastPlanIndex": "0", - "Infrast.CustomInfrastPlanShowInFightSettings": "False", - "Infrast.DefaultInfrast": "user_defined", - "Infrast.Dorm.IsChecked": "True", - "Infrast.DormFilterNotStationedEnabled": "True", - "Infrast.DormThreshold": "30", - "Infrast.DormTrustEnabled": "False", - "Infrast.IsCustomInfrastFileReadOnly": "False", - "Infrast.Mfg.IsChecked": "True", - "Infrast.Office.IsChecked": "True", - "Infrast.Order.Control": "2", - "Infrast.Order.Dorm": "6", - "Infrast.Order.Mfg": "0", - "Infrast.Order.Office": "5", - "Infrast.Order.Power": "3", - "Infrast.Order.Processing": "7", - "Infrast.Order.Reception": "4", - "Infrast.Order.Trade": "1", - "Infrast.Order.Training": "8", - "Infrast.OriginiumShardAutoReplenishment": "True", - "Infrast.Power.IsChecked": "True", - "Infrast.Processing.IsChecked": "True", - "Infrast.Reception.IsChecked": "True", - "Infrast.Trade.IsChecked": "True", - "Infrast.Training.IsChecked": "True", - "Infrast.UsesOfDrones": "Money", - "MainFunction.Drops.Enable": "False", - "MainFunction.Drops.ItemId": "", - "MainFunction.Drops.ItemName": "不选择", - "MainFunction.Drops.Quantity": "5", - "MainFunction.InverseMode": "False", - "MainFunction.PostActions": "0", - "MainFunction.Series.Quantity": "1", - "MainFunction.Stage1": "", - "MainFunction.Stage2": "", - "MainFunction.Stage3": "", - "MainFunction.TimesLimited": "False", - "MainFunction.TimesLimited.Quantity": "5", - "MainFunction.UseMedicine": "False", - "MainFunction.UseMedicine.Quantity": "999", - "MainFunction.UseStone.Quantity": "0", - "Mall.CreditBlackListNew": "碳;家具;加急许可", - "Mall.CreditFirstListNew": "招聘许可", - "Mall.CreditForceShoppingIfCreditFull": "False", - "Mall.CreditOnlyBuyDiscount": "False", - "Mall.CreditShopping": "True", - "Mall.CreditVisitFriendsEnabled": "True", - "Mall.CreditVisitOnceADay": "False", - "Mall.CreidtReserveMaxCredit": "False", - "Mall.LastCreditVisitFriendsTime": "2025/01/21 00:00:00", - "Mission.ReceiveAward": "True", - "Mission.ReceiveFreeRecruit": "False", - "Mission.ReceiveMail": "False", - "Mission.ReceiveMining": "False", - "Mission.ReceiveOrundum": "False", - "Mission.ReceiveSpecialAccess": "False", - "OperBox.Data": "[]", - "Peep.TargetFps": "20", - "Penguin.EnablePenguin": "True", - "Penguin.Id": "", - "Penguin.IsDrGrandet": "False", - "Performance.AllowDeprecatedGpu": "false", - "Performance.PreferredGpuDescription": "", - "Performance.PreferredGpuInstancePath": "", - "Performance.UseGpu": "false", - "Reclamation.Mode": "1", - "Reclamation.ReclamationIncrementMode": "0", - "Reclamation.ReclamationMaxCraftCountPerRound": "16", - "Reclamation.Theme": "Tales", - "Reclamation.ToolToCraft": "", - "Recruit.AutoSetTime": "True", - "Recruit.ChooseLevel3": "False", - "Recruit.ChooseLevel4": "True", - "Recruit.ChooseLevel5": "True", - "Recruit.ChooseLevel6": "True", - "Recruit.ShowPotential": "True", - "RemoteControl.RemoteControlDeviceIdentity": "", - "RemoteControl.RemoteControlGetTaskEndpointUri": "", - "RemoteControl.RemoteControlReportStatusUri": "", - "RemoteControl.RemoteControlUserIdentity": "", - "Roguelike.CoreChar": "", - "Roguelike.DeploymentWithPause": "False", - "Roguelike.Difficulty": "2147483647", - "Roguelike.ExitAtFinalBoss": "False", - "Roguelike.InvestmentEnabled": "True", - "Roguelike.InvestmentEnterSecondFloor": "False", - "Roguelike.InvestsCount": "9999999", - "Roguelike.Mode": "0", - "Roguelike.RefreshTraderWithDice": "False", - "Roguelike.Roguelike3FirstFloorFoldartal": "False", - "Roguelike.Roguelike3NewSquad2StartingFoldartal": "False", - "Roguelike.Roguelike3NewSquad2StartingFoldartals": "", - "Roguelike.Roguelike3StartFloorFoldartal": "", - "Roguelike.RoguelikeDelayAbortUntilCombatComplete": "False", - "Roguelike.RoguelikeEnableNonfriendSupport": "False", - "Roguelike.RoguelikeExpectedCollapsalParadigms": "", - "Roguelike.RoguelikeOnlyStartWithEliteTwo": "False", - "Roguelike.RoguelikeStartWithEliteTwo": "False", - "Roguelike.RoguelikeTheme": "Sarkaz", - "Roguelike.RoguelikeUseSupportUnit": "False", - "Roguelike.Roles": "", - "Roguelike.Squad": "", - "Roguelike.StartsCount": "99999", - "Roguelike.StartWithSeed": "False", - "Roguelike.StopAtMaxLevel": "False", - "Roguelike.StopWhenInvestmentFull": "False", - "Start.AccountName": "", - "Start.AutoRestartOnDrop": "True", - "Start.BlockSleep": "False", - "Start.BlockSleepWithScreenOn": "True", - "Start.ClientType": "Official", - "Start.CopilotWithScript": "False", - "Start.EmulatorAddCommand": "", - "Start.EmulatorPath": "E:\\MuMu Player 12\\shell\\MuMuPlayer.exe", - "Start.EmulatorWaitSeconds": "60", - "Start.EndsWithScript": "", - "Start.ManualStopWithScript": "False", - "Start.OpenEmulatorAfterLaunch": "True", - "Start.RunDirectly": "True", - "Start.StartsWithScript": "", - "TaskQueue.AutoRoguelike.IsChecked": "False", - "TaskQueue.Base.IsChecked": "False", - "TaskQueue.Combat.IsChecked": "False", - "TaskQueue.Mall.IsChecked": "False", - "TaskQueue.Mission.IsChecked": "False", - "TaskQueue.Order.AutoRoguelike": "6", - "TaskQueue.Order.Base": "2", - "TaskQueue.Order.Combat": "3", - "TaskQueue.Order.Mall": "4", - "TaskQueue.Order.Mission": "5", - "TaskQueue.Order.Reclamation": "7", - "TaskQueue.Order.Recruiting": "1", - "TaskQueue.Order.WakeUp": "0", - "TaskQueue.Reclamation.IsChecked": "False", - "TaskQueue.Recruiting.IsChecked": "False", - "TaskQueue.WakeUp.IsChecked": "True", - "VersionUpdate.Proxy": "", - "Visit.CreditFightSelectFormation": "0", - "Visit.CreditFightTaskEnabled": "False", - "Visit.LastCreditFightTaskTime": "2025/01/21 00:00:00", - "Yituliu.EnableYituliu": "True" - } - }, - "Current": "Default", - "Global": { - "GUI.Cheers": "False", - "GUI.CustomCulture": "", - "GUI.Hangover": "False", - "GUI.HideCloseButton": "False", - "GUI.InverseClearMode": "Clear", - "GUI.LastBuyWineTime": "2025/01/21 00:00:00", - "GUI.Localization": "zh-cn", - "GUI.LogItemDateFormatString": "HH:mm:ss", - "GUI.MinimizeToTray": "False", - "GUI.OperNameLanguage": "OperNameLanguageMAA", - "GUI.Placement": "{\"Length\":44,\"Flags\":0,\"ShowCmd\":1,\"MinPosition\":{\"X\":-1,\"Y\":-1},\"MaxPosition\":{\"X\":-1,\"Y\":-1},\"NormalPosition\":{\"Left\":873,\"Top\":89,\"Right\":1873,\"Bottom\":839}}", - "GUI.Placement.Load": "True", - "GUI.Placement.SaveOnClosing": "True", - "GUI.SoberLanguage": "zh-cn", - "GUI.UseTray": "True", - "GUI.WindowTitleScrollable": "False", - "GUI.WindowTitleSelectShowList": "1 2 3 4", - "HotKeys": "{\"ShowGui\":{\"Key\":56,\"Modifiers\":7},\"LinkStart\":{\"Key\":55,\"Modifiers\":7}}", - "Start.MinimizeDirectly": "False", - "Start.OpenEmulatorAfterLaunch": "False", - "Start.RunDirectly": "False", - "Timer.CustomConfig": "False", - "Timer.ForceScheduledStart": "False", - "Timer.ShowWindowBeforeForceScheduledStart": "False", - "Timer.Timer1": "False", - "Timer.Timer1.Config": "Default", - "Timer.Timer1Hour": "0", - "Timer.Timer1Min": "0", - "Timer.Timer2": "False", - "Timer.Timer2.Config": "Default", - "Timer.Timer2Hour": "3", - "Timer.Timer2Min": "0", - "Timer.Timer3": "False", - "Timer.Timer3.Config": "Default", - "Timer.Timer3Hour": "6", - "Timer.Timer3Min": "0", - "Timer.Timer4": "False", - "Timer.Timer4.Config": "Default", - "Timer.Timer4Hour": "9", - "Timer.Timer4Min": "0", - "Timer.Timer5": "False", - "Timer.Timer5.Config": "Default", - "Timer.Timer5Hour": "12", - "Timer.Timer5Min": "0", - "Timer.Timer6": "False", - "Timer.Timer6.Config": "Default", - "Timer.Timer6Hour": "15", - "Timer.Timer6Min": "0", - "Timer.Timer7": "False", - "Timer.Timer7.Config": "Default", - "Timer.Timer7Hour": "18", - "Timer.Timer7Min": "0", - "Timer.Timer8": "False", - "Timer.Timer8.Config": "Default", - "Timer.Timer8Hour": "21", - "Timer.Timer8Min": "0", - "VersionUpdate.AllowNightlyUpdates": "False", - "VersionUpdate.AutoDownloadUpdatePackage": "False", - "VersionUpdate.AutoInstallUpdatePackage": "False", - "VersionUpdate.body": "## v5.13.0-beta.2\n\n### 新增 | New\n\n* 添加 MirrorChyan 资源更新方式 (#11669) @ABA2396 @MistEO\n* discord link for website docs (#11687) @Constrat @momomochi987 @Rbqwow\n* Discord link in About Us @Constrat\n* 适配新 ui 未进驻选项 @ABA2396\n* en announcement wpf logic @Constrat\n\n### 改进 | Improved\n\n* mirrorchyan toast @MistEO\n* 简化肉鸽任务使用助战参数内部存储流程 @status102\n* 添加资源更新提示翻译 @ABA2396\n* 将Sarkaz开局添加负荷干员的进入任务改为范围点击 (#11100) @Daydreamer114\n* 萨卡兹肉鸽不期而遇统一使用默认策略 (#11512) @Daydreamer114\n* 小工具-仓库识别 隐藏黑边 @ABA2396\n\n### 修复 | Fix\n\n* mirror-chyan notify error @MistEO\n* missing `user_agent` param for mirrorchyan query @MistEO\n* Wpf肉鸽烧水时使用分队UI为空 @status102\n* 肉鸽临时招募预备干员时, 不额外提升权重 (#11442) @Daydreamer114\n* 公告窗口触控板滚动异常 (#11684) @Rbqwow\n* styling @Constrat\n* 添加不期而遇新事件空无前兆 (#11573) @DavidWang19\n* Attempt retry once screencap for MumuExtras (#11550) @teldd1\n* 肉鸽作战编队截图过快导致截图与实际不符 (#11527) @Daydreamer114\n* 肉鸽烧水未获得目标奖励逻辑补漏 @status102\n* 幸运墙领取奖励界面识别过早 @status102\n* 临时处理肉鸽烧水flag异常 @status102\n\n### 文档 | Docs\n\n* Auto Update Changelogs of v5.13.0-beta.1 (#11703) @github-actions[bot] @Constrat\n* 推荐分辨率720P或1080P (#11651) @Rbqwow\n* 替换.NET8 桌面运行时下载链接为直链 (#11693) @wryx166\n* 肉鸽推荐开局策略 (#11570) @Rbqwow @Constrat\n\n### 其他 | Other\n\n* Mirror酱说明调整 @status102\n* NoSkland 放到 wpf 内部 @ABA2396\n* 任务执行期间Log Rotate增加检查,并上调阈值至64MiB (#11670) @status102\n* 密钥改成 PasswordBox @ABA2396\n* remove chinese punctuation from en @Constrat\n* JP 艾雅法拉 ocrReplace (#11685) @Saratoga-Official @status102 @Daydreamer114\n* 调整肉鸽选择烧水奖励任务链,重新将Roguelike@LastRewardConfirm并入主任务链 (#11689) @status102\n* add discord link to main readme @Constrat\n* 修改划火柴设置界面布局 (#11682) @Rbqwow\n* WpfGui划火柴相关说明调整 @status102\n* Revert \"perf: 肉鸽优先拿美愿 (#11558)\" (#11565) @Daydreamer114\n* 繁中服「懷黍離」導航入口更動 (#11662) @momomochi987\n* 调整基建办公室阈值 @ABA2396\n* 调整 InfrastBottomLeftTab 的 specificRect @ABA2396\n\n**Full Changelog**: [v5.12.3 -> v5.13.0-beta.2](https://github.com/MaaAssistantArknights/MaaAssistantArknights/compare/v5.12.3...v5.13.0-beta.2)\n", - "VersionUpdate.doNotShowUpdate": "False", - "VersionUpdate.HasAcknowledgedNightlyWarning": "False", - "VersionUpdate.isfirstboot": "False", - "VersionUpdate.name": "v5.13.0-beta.2", - "VersionUpdate.package": "MAAComponent-OTA-v5.12.0-beta.1_v5.13.0-beta.2-win-x64.zip", - "VersionUpdate.Proxy": "", - "VersionUpdate.ProxyType": "http", - "VersionUpdate.ScheduledUpdateCheck": "False", - "VersionUpdate.UpdateCheck": "True", - "VersionUpdate.VersionType": "Beta" - } -} \ No newline at end of file diff --git a/config/MaaConfig/脚本_1/config.json b/config/MaaConfig/脚本_1/config.json deleted file mode 100644 index 8ff76b0..0000000 --- a/config/MaaConfig/脚本_1/config.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "MaaSet": { - "Name": "Maa", - "Path": "E:/download/MAA-v5.11.1-win-x64" - }, - "RunSet": { - "AnnihilationTimeLimit": 40, - "ProxyTimesLimit": 0, - "RoutineTimeLimit": 10, - "RunTimesLimit": 3 - }, - "QFluentWidgets": { - "ThemeColor": "#ff009faa", - "ThemeMode": "Auto" - } -} \ No newline at end of file diff --git a/config/MaaConfig/脚本_1/user_data.db b/config/MaaConfig/脚本_1/user_data.db deleted file mode 100644 index 99a0367..0000000 Binary files a/config/MaaConfig/脚本_1/user_data.db and /dev/null differ diff --git a/config/QueueConfig/调度队列_1.json b/config/QueueConfig/调度队列_1.json deleted file mode 100644 index d50b2f8..0000000 --- a/config/QueueConfig/调度队列_1.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "QueueSet": { - "Enabled": false, - "Name": "" - }, - "Queue": { - "Member_1": "脚本_1", - "Member_10": "禁用", - "Member_2": "禁用", - "Member_3": "禁用", - "Member_4": "禁用", - "Member_5": "禁用", - "Member_6": "禁用", - "Member_7": "禁用", - "Member_8": "禁用", - "Member_9": "禁用" - }, - "QFluentWidgets": { - "ThemeColor": "#ff009faa", - "ThemeMode": "Auto" - }, - "Time": { - "TimeEnabled_0": true, - "TimeEnabled_1": false, - "TimeEnabled_2": false, - "TimeEnabled_3": false, - "TimeEnabled_4": false, - "TimeEnabled_5": false, - "TimeEnabled_6": false, - "TimeEnabled_7": false, - "TimeEnabled_8": false, - "TimeEnabled_9": false, - "TimeSet_0": "12:56", - "TimeSet_1": "00:00", - "TimeSet_2": "00:00", - "TimeSet_3": "00:00", - "TimeSet_4": "02:00", - "TimeSet_5": "00:00", - "TimeSet_6": "00:00", - "TimeSet_7": "00:00", - "TimeSet_8": "00:00", - "TimeSet_9": "00:00" - } -} \ No newline at end of file diff --git a/config/config.json b/config/config.json deleted file mode 100644 index f48c6bf..0000000 --- a/config/config.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "Function": { - "BossKey": "", - "IfAllowSleep": false, - "IfSilence": false - }, - "Notify": { - "CompanyWebHookBotUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=2c9218cb-c086-42d9-9f0a-a8859e10cc0a", - "IfCompanyWebHookBot": false, - "IfPushDeer": false, - "PushDeerKey": "", - "IfPushPlyer": false, - "IfSendErrorOnly": false, - "IfSendMail": false, - "IfServerChan": false, - "MailAddress": "hezizizi@126.com", - "ServerChanChannel": "hello", - "ServerChanKey": "SCT53272TqVLN4TlrrKmgcmKI1nnoQHmb", - "ServerChanTag": "" - }, - "Start": { - "IfRunDirectly": false, - "IfSelfStart": false - }, - "QFluentWidgets": { - "ThemeColor": "#ff009faa", - "ThemeMode": "Auto" - }, - "UI": { - "IfShowTray": false, - "IfToTray": false, - "location": "239x13", - "maximized": false, - "size": "1200x700" - }, - "Update": { - "IfAutoUpdate": false - } -} \ No newline at end of file diff --git a/config/history.json b/config/history.json deleted file mode 100644 index 49c9a21..0000000 --- a/config/history.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "脚本_1": { - "History": "任务开始时间:2025-02-03 17:53:20,结束时间:2025-02-03 17:53:20\n已完成数:0,未完成数:0\n\n", - "Time": "2025-02-03 17:53:20" - }, - "调度队列_1": { - "Time": "2025-02-03 17:53:20", - "History": "任务名称:脚本_1,任务开始时间:2025-02-03 17:53:20,结束时间:2025-02-03 17:53:20\n 已完成数:0,未完成数:0\n \n \n" - }, - "用户自定义队列": { - "Time": "2025-02-02 13:11:44", - "History": "任务名称:脚本_1,任务开始时间:2025-02-02 13:11:44,结束时间:2025-02-02 13:11:46\n 已完成数:0,未完成数:1\n \n 代理未成功的用户:\n 新用户\n \n" - } -} \ No newline at end of file diff --git a/data/data.db b/data/data.db deleted file mode 100644 index b43af49..0000000 Binary files a/data/data.db and /dev/null differ diff --git a/data/gameid.txt b/data/gameid.txt deleted file mode 100644 index 6c05329..0000000 --- a/data/gameid.txt +++ /dev/null @@ -1,5 +0,0 @@ -龙门币:CE-6 -技能:CA-5 -红票:AP-5 -经验:LS-6 -剿灭模式:Annihilation \ No newline at end of file diff --git a/data/key/AES_password_verify.bin b/data/key/AES_password_verify.bin deleted file mode 100644 index a1dca8f..0000000 --- a/data/key/AES_password_verify.bin +++ /dev/null @@ -1 +0,0 @@ -@X4BhԅP+ \ No newline at end of file diff --git a/data/key/PASSWORDsalt.txt b/data/key/PASSWORDsalt.txt deleted file mode 100644 index 63f4f2c..0000000 --- a/data/key/PASSWORDsalt.txt +++ /dev/null @@ -1 +0,0 @@ -277237fbe5c9134e2d0784d6c84c843f77662dedfb20858d81b983d28cf9ccdea4a709030500c62783e4ab8324b1b618ec5e70295d51cd887bf99bbb015dadec39e780f93f0fcfdaab453a1987a57ac2838204ccfae7958fe73236e1d3c9a7fb72e1c8140b5bd0a3bd559d510ea2cb8ab9a83bf33030aa38b4fe8956ad0c7a3fa7b21507cfe54e9fbed65255439c41d4ca999fbc6e696bb3bf92df69423064bf01ad83eebbfe4ae723b3ccb9c9ebaea02c53ec732f24b758680792feabd8b26ac3785ae1fc468e1806c17c1114d24692872c35cee6e0ef2b0526b433a5977c4fb727aff50817ec9ca6af98d55f27bb72f0f43fd388af14784a \ No newline at end of file diff --git a/data/key/private_key.bin b/data/key/private_key.bin deleted file mode 100644 index eb89783..0000000 Binary files a/data/key/private_key.bin and /dev/null differ diff --git a/data/key/public_key.pem b/data/key/public_key.pem deleted file mode 100644 index a124600..0000000 --- a/data/key/public_key.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RbLNnJ/nAHzCqhs1xk/ -MR9RHaoqHyjupz1tNtu+Y+xVtoczLFTF/unj0ypzwKwnC6uSgf+R+VqVn8SGyUdx -PqbGKjFB29erSSUVgtGfcEh93c7KSWTNMNrC5pUSMZs23iOdSEi4tLdENWw3hjTu -jJVQIg1mJOUeHOWINHfnRfjlzCpovXOVYVmhRcZ8O0idwrSJF2KrpXd/LmbABANr -ivSf/hCbBLpw+WOR21SCTRGDQ2twQFRl98cS0lSWtibg7GSk+Dv3vn02EnXpLszo -xvWEpiH6djr7exDgGxVIU4rGjG0dI80LTHLetfa+ls/XuTODie8tKVsbu1IXViAs -iQIDAQAB ------END PUBLIC KEY----- \ No newline at end of file diff --git a/data/key/verifysalt.txt b/data/key/verifysalt.txt deleted file mode 100644 index 377c7cb..0000000 --- a/data/key/verifysalt.txt +++ /dev/null @@ -1 +0,0 @@ -e0898ac44f7e7c0bdd98654ae9913364a58dc6031f43f1ed73d95b3bee10adfd730a3f34e00d9e02e96a8162e996f9db8b494de674249f223f9f85680fa7f3c2e3c5f8e5c577aafea1cec9d2f6ae2b241536c85e4adb69d4cf4dbce4c62b772e68e66e0f3f7def44a1c93bfeef2f88a367da49263b9a0d3f15201a6cc511cc81cc642357d94906840c0127178aaa4bc3f041c3f8344673488d855a7114b59a86f357cb23447a5d2329ab63477f15aab281c2cc430a3a31e08ad98fdcd3d34b2e99e19925230e42684437d1e3c33c4972dee71b436169ac4612dcdea50fe833a277360aeb2864ed88f368b513e19c861f659100b6f40dda7742d3906a02961f4536027db681a562264f6c7eedaf7e9e285c27470fc6831cd154bc1f7de120d4214baa729a916ce4e90617453ef006b630d61be8cc5ada8767815050138fae75474ce4d65f98279283ec361e5469ec9918ab5e41e8d230137b571a28cc8445182ef09ec50336d22f451bf8c5c4f4f1c0e548a8c2e17bd71b430d68a4b37303e61907d19052cfb01a80d7d628f23d17627afef9d38bc4b4380691e48930339d6ebf12fd3d229da5926064dfd65265f5d94e6d622680da23900a0b18a2de6d884ffa12c01016e0de2e20326c71c38d47be4ef3bffb7a89a2b677a55800c4fb0b7ddcafc5ca0f910e4a2a2ab8594266f307789c44e90e9201ca88a7849ef253d48733ce6eec72cc1ddf0e2605ddf470a2c71980b952b8568f41b05824a1c6a57302999774d7ab2d003f4659fadc731aef1e836946e4761287c74f3b64f03e0ae3529ee42ee336c88e60cfa68a31d3502de2e7c8ecaf6fe0a383d8c3c5e79165c85eea9c6da96657e5e72b77b4d60d \ No newline at end of file diff --git a/debug/AUTO_MAA.log b/debug/AUTO_MAA.log deleted file mode 100644 index 6376a3d..0000000 --- a/debug/AUTO_MAA.log +++ /dev/null @@ -1,389 +0,0 @@ -2025-02-02 12:44:03.942 | INFO | =================================== -2025-02-02 12:44:03.943 | INFO | AUTO_MAA 主程序 -2025-02-02 12:44:03.943 | INFO | 版本号: v4.2.1.1 -2025-02-02 12:44:03.943 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-02 12:44:03.943 | INFO | =================================== -2025-02-02 12:44:03.943 | INFO | 日志记录器初始化完成 -2025-02-02 12:44:03.943 | INFO | 配置类初始化完成 -2025-02-02 12:44:03.950 | INFO | 程序配置管理模块初始化完成 -2025-02-02 12:45:01.910 | INFO | 中止任务:ALL -2025-02-02 12:45:01.918 | INFO | AUTO_MAA主程序关闭 -2025-02-02 12:45:01.918 | INFO | =================================== -2025-02-02 12:46:03.856 | INFO | =================================== -2025-02-02 12:46:03.857 | INFO | AUTO_MAA 主程序 -2025-02-02 12:46:03.857 | INFO | 版本号: v4.2.1.1 -2025-02-02 12:46:03.857 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-02 12:46:03.857 | INFO | =================================== -2025-02-02 12:46:03.857 | INFO | 日志记录器初始化完成 -2025-02-02 12:46:03.857 | INFO | 配置类初始化完成 -2025-02-02 12:46:03.858 | INFO | 程序配置管理模块初始化完成 -2025-02-02 12:47:14.166 | INFO | 中止任务:ALL -2025-02-02 12:47:14.169 | INFO | AUTO_MAA主程序关闭 -2025-02-02 12:47:14.170 | INFO | =================================== -2025-02-02 12:47:56.895 | INFO | =================================== -2025-02-02 12:47:56.895 | INFO | AUTO_MAA 主程序 -2025-02-02 12:47:56.895 | INFO | 版本号: v4.2.1.1 -2025-02-02 12:47:56.895 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-02 12:47:56.896 | INFO | =================================== -2025-02-02 12:47:56.896 | INFO | 日志记录器初始化完成 -2025-02-02 12:47:56.896 | INFO | 配置类初始化完成 -2025-02-02 12:47:56.897 | INFO | 程序配置管理模块初始化完成 -2025-02-02 12:48:02.843 | INFO | 中止任务:ALL -2025-02-02 12:48:02.847 | INFO | AUTO_MAA主程序关闭 -2025-02-02 12:48:02.847 | INFO | =================================== -2025-02-02 12:48:09.691 | INFO | =================================== -2025-02-02 12:48:09.691 | INFO | AUTO_MAA 主程序 -2025-02-02 12:48:09.691 | INFO | 版本号: v4.2.1.1 -2025-02-02 12:48:09.692 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-02 12:48:09.692 | INFO | =================================== -2025-02-02 12:48:09.692 | INFO | 日志记录器初始化完成 -2025-02-02 12:48:09.692 | INFO | 配置类初始化完成 -2025-02-02 12:48:09.692 | INFO | 程序配置管理模块初始化完成 -2025-02-02 12:48:27.337 | INFO | 用户数据库初始化完成 -2025-02-02 12:49:20.168 | INFO | 任务开始:脚本_1 -2025-02-02 12:49:20.173 | INFO | 任务开始:设置脚本_1 -2025-02-02 12:50:51.649 | INFO | 任务结束:脚本_1 -2025-02-02 12:50:59.025 | INFO | 任务开始:脚本_1 -2025-02-02 12:50:59.030 | INFO | 任务开始:设置脚本_1 -2025-02-02 12:51:28.346 | INFO | 任务结束:脚本_1 -2025-02-02 12:51:35.376 | INFO | 任务开始:脚本_1 -2025-02-02 12:51:35.381 | INFO | 任务开始:设置脚本_1 -2025-02-02 12:51:53.533 | INFO | 任务结束:脚本_1 -2025-02-02 12:53:04.412 | INFO | 任务开始:脚本_1 -2025-02-02 12:53:04.417 | INFO | 任务开始:设置脚本_1 -2025-02-02 12:53:34.732 | INFO | 任务结束:脚本_1 -2025-02-02 12:53:42.866 | INFO | 任务开始:脚本_1 -2025-02-02 12:53:42.870 | INFO | 任务开始:设置脚本_1 -2025-02-02 12:53:46.971 | INFO | 任务结束:脚本_1 -2025-02-02 12:56:32.093 | INFO | 用户添加任务:调度队列_1 -2025-02-02 12:56:32.093 | INFO | 任务开始:调度队列_1 -2025-02-02 12:56:32.102 | INFO | 任务开始:脚本_1 -2025-02-02 12:56:46.679 | INFO | 中止任务:调度队列_1 -2025-02-02 12:56:46.685 | INFO | 申请中止本次任务 -2025-02-02 12:56:47.695 | INFO | 任务完成:脚本_1 -2025-02-02 12:56:47.706 | INFO | 任务结束:调度队列_1 -2025-02-02 12:56:49.483 | INFO | 用户添加任务:调度队列_1 -2025-02-02 12:56:49.483 | INFO | 任务开始:调度队列_1 -2025-02-02 12:56:49.488 | INFO | 任务开始:脚本_1 -2025-02-02 12:57:04.593 | INFO | 中止任务:调度队列_1 -2025-02-02 12:57:04.598 | INFO | 申请中止本次任务 -2025-02-02 12:57:05.044 | INFO | 任务完成:脚本_1 -2025-02-02 12:57:05.052 | INFO | 任务结束:调度队列_1 -2025-02-02 12:57:07.172 | INFO | 任务开始:脚本_1 -2025-02-02 12:57:07.177 | INFO | 任务开始:设置脚本_1 -2025-02-02 12:57:21.333 | INFO | 任务结束:脚本_1 -2025-02-02 12:58:57.187 | INFO | 用户添加任务:调度队列_1 -2025-02-02 12:58:57.187 | INFO | 任务开始:调度队列_1 -2025-02-02 12:58:57.192 | INFO | 任务开始:脚本_1 -2025-02-02 13:01:20.361 | INFO | 任务完成:脚本_1 -2025-02-02 13:01:20.374 | INFO | 任务结束:调度队列_1 -2025-02-02 13:01:38.117 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:01:38.117 | INFO | 任务开始:调度队列_1 -2025-02-02 13:01:38.122 | INFO | 任务开始:脚本_1 -2025-02-02 13:03:41.077 | INFO | 中止任务:调度队列_1 -2025-02-02 13:03:41.080 | INFO | 申请中止本次任务 -2025-02-02 13:03:42.088 | INFO | 任务完成:脚本_1 -2025-02-02 13:03:42.094 | INFO | 任务结束:调度队列_1 -2025-02-02 13:05:07.329 | INFO | 中止任务:ALL -2025-02-02 13:05:07.332 | INFO | AUTO_MAA主程序关闭 -2025-02-02 13:05:07.332 | INFO | =================================== -2025-02-02 13:05:13.663 | INFO | =================================== -2025-02-02 13:05:13.664 | INFO | AUTO_MAA 主程序 -2025-02-02 13:05:13.664 | INFO | 版本号: v4.2.1.1 -2025-02-02 13:05:13.664 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-02 13:05:13.664 | INFO | =================================== -2025-02-02 13:05:13.664 | INFO | 日志记录器初始化完成 -2025-02-02 13:05:13.666 | INFO | 配置类初始化完成 -2025-02-02 13:05:13.667 | INFO | 程序配置管理模块初始化完成 -2025-02-02 13:07:45.248 | WARNING | 未选择调度模式 -2025-02-02 13:07:48.387 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:07:48.387 | INFO | 任务开始:调度队列_1 -2025-02-02 13:07:48.391 | INFO | 任务开始:脚本_1 -2025-02-02 13:08:05.198 | INFO | 中止任务:调度队列_1 -2025-02-02 13:08:05.201 | INFO | 申请中止本次任务 -2025-02-02 13:08:06.303 | INFO | 任务完成:脚本_1 -2025-02-02 13:08:06.310 | INFO | 任务结束:调度队列_1 -2025-02-02 13:08:52.743 | INFO | 用户添加任务:脚本_1 -2025-02-02 13:08:52.743 | INFO | 任务开始:用户自定义队列 -2025-02-02 13:08:52.748 | INFO | 任务开始:脚本_1 -2025-02-02 13:10:39.715 | INFO | 任务完成:脚本_1 -2025-02-02 13:10:39.728 | INFO | 任务结束:用户自定义队列 -2025-02-02 13:10:56.493 | INFO | 用户添加任务:脚本_1 -2025-02-02 13:10:56.493 | INFO | 任务开始:用户自定义队列 -2025-02-02 13:10:56.498 | INFO | 任务开始:脚本_1 -2025-02-02 13:11:20.424 | INFO | 中止任务:用户自定义队列 -2025-02-02 13:11:20.427 | INFO | 申请中止本次任务 -2025-02-02 13:11:21.242 | INFO | 任务完成:脚本_1 -2025-02-02 13:11:21.254 | INFO | 任务结束:用户自定义队列 -2025-02-02 13:11:21.272 | INFO | 用户添加任务:脚本_1 -2025-02-02 13:11:21.273 | INFO | 任务开始:用户自定义队列 -2025-02-02 13:11:21.279 | INFO | 任务开始:脚本_1 -2025-02-02 13:11:43.441 | INFO | 中止任务:用户自定义队列 -2025-02-02 13:11:43.443 | INFO | 申请中止本次任务 -2025-02-02 13:11:44.115 | INFO | 任务完成:脚本_1 -2025-02-02 13:11:44.123 | INFO | 任务结束:用户自定义队列 -2025-02-02 13:11:44.254 | INFO | 用户添加任务:脚本_1 -2025-02-02 13:11:44.255 | INFO | 任务开始:用户自定义队列 -2025-02-02 13:11:44.259 | INFO | 任务开始:脚本_1 -2025-02-02 13:11:45.450 | INFO | 中止任务:用户自定义队列 -2025-02-02 13:11:45.454 | INFO | 申请中止本次任务 -2025-02-02 13:11:46.471 | INFO | 任务完成:脚本_1 -2025-02-02 13:11:46.479 | INFO | 任务结束:用户自定义队列 -2025-02-02 13:12:07.783 | INFO | 任务开始:脚本_1 -2025-02-02 13:12:07.789 | INFO | 任务开始:设置脚本_1 -2025-02-02 13:12:09.308 | WARNING | 任务已存在:脚本_1 -2025-02-02 13:12:22.037 | INFO | 任务结束:脚本_1 -2025-02-02 13:12:41.333 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:12:41.334 | INFO | 任务开始:调度队列_1 -2025-02-02 13:12:41.338 | INFO | 任务开始:脚本_1 -2025-02-02 13:12:41.340 | INFO | 任务完成:脚本_1 -2025-02-02 13:12:41.347 | INFO | 任务结束:调度队列_1 -2025-02-02 13:13:10.404 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:13:10.404 | INFO | 任务开始:调度队列_1 -2025-02-02 13:13:10.409 | INFO | 任务开始:脚本_1 -2025-02-02 13:13:10.436 | INFO | 任务完成:脚本_1 -2025-02-02 13:13:10.442 | INFO | 任务结束:调度队列_1 -2025-02-02 13:13:12.137 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:13:12.137 | INFO | 任务开始:调度队列_1 -2025-02-02 13:13:12.143 | INFO | 任务开始:脚本_1 -2025-02-02 13:13:12.146 | INFO | 任务完成:脚本_1 -2025-02-02 13:13:12.152 | INFO | 任务结束:调度队列_1 -2025-02-02 13:13:13.410 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:13:13.411 | INFO | 任务开始:调度队列_1 -2025-02-02 13:13:13.416 | INFO | 任务开始:脚本_1 -2025-02-02 13:13:13.418 | INFO | 任务完成:脚本_1 -2025-02-02 13:13:13.424 | INFO | 任务结束:调度队列_1 -2025-02-02 13:13:13.640 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:13:13.640 | INFO | 任务开始:调度队列_1 -2025-02-02 13:13:13.644 | INFO | 任务开始:脚本_1 -2025-02-02 13:13:13.646 | INFO | 任务完成:脚本_1 -2025-02-02 13:13:13.653 | INFO | 任务结束:调度队列_1 -2025-02-02 13:13:14.042 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:13:14.042 | INFO | 任务开始:调度队列_1 -2025-02-02 13:13:14.047 | INFO | 任务开始:脚本_1 -2025-02-02 13:13:14.050 | INFO | 任务完成:脚本_1 -2025-02-02 13:13:14.055 | INFO | 任务结束:调度队列_1 -2025-02-02 13:13:14.239 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:13:14.239 | INFO | 任务开始:调度队列_1 -2025-02-02 13:13:14.245 | INFO | 任务开始:脚本_1 -2025-02-02 13:13:14.246 | INFO | 任务完成:脚本_1 -2025-02-02 13:13:14.255 | INFO | 任务结束:调度队列_1 -2025-02-02 13:14:02.390 | INFO | =================================== -2025-02-02 13:14:02.390 | INFO | AUTO_MAA 主程序 -2025-02-02 13:14:02.390 | INFO | 版本号: v4.2.1.1 -2025-02-02 13:14:02.390 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-02 13:14:02.390 | INFO | =================================== -2025-02-02 13:14:02.390 | INFO | 日志记录器初始化完成 -2025-02-02 13:14:02.393 | INFO | 配置类初始化完成 -2025-02-02 13:14:02.393 | INFO | 程序配置管理模块初始化完成 -2025-02-02 13:14:14.834 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:14:14.834 | INFO | 任务开始:调度队列_1 -2025-02-02 13:14:14.838 | INFO | 任务开始:脚本_1 -2025-02-02 13:14:14.840 | INFO | 任务完成:脚本_1 -2025-02-02 13:14:14.847 | INFO | 任务结束:调度队列_1 -2025-02-02 13:16:11.217 | INFO | =================================== -2025-02-02 13:16:11.217 | INFO | AUTO_MAA 主程序 -2025-02-02 13:16:11.217 | INFO | 版本号: v4.2.1.1 -2025-02-02 13:16:11.217 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-02 13:16:11.217 | INFO | =================================== -2025-02-02 13:16:11.217 | INFO | 日志记录器初始化完成 -2025-02-02 13:16:11.219 | INFO | 配置类初始化完成 -2025-02-02 13:16:11.220 | INFO | 程序配置管理模块初始化完成 -2025-02-02 13:16:20.198 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:16:20.199 | INFO | 任务开始:调度队列_1 -2025-02-02 13:16:20.205 | INFO | 任务开始:脚本_1 -2025-02-02 13:16:20.208 | INFO | 任务完成:脚本_1 -2025-02-02 13:16:20.213 | INFO | 任务结束:调度队列_1 -2025-02-02 13:16:44.397 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:16:44.397 | INFO | 任务开始:调度队列_1 -2025-02-02 13:16:44.401 | INFO | 任务开始:脚本_1 -2025-02-02 13:16:44.403 | INFO | 任务完成:脚本_1 -2025-02-02 13:16:44.409 | INFO | 任务结束:调度队列_1 -2025-02-02 13:17:29.545 | INFO | 用户添加任务:调度队列_1 -2025-02-02 13:17:29.546 | INFO | 任务开始:调度队列_1 -2025-02-02 13:17:29.550 | INFO | 任务开始:脚本_1 -2025-02-02 13:17:29.561 | INFO | 任务完成:脚本_1 -2025-02-02 13:17:29.565 | INFO | 任务结束:调度队列_1 -2025-02-02 13:17:59.643 | INFO | 中止任务:ALL -2025-02-02 13:17:59.647 | INFO | AUTO_MAA主程序关闭 -2025-02-02 13:17:59.647 | INFO | =================================== -2025-02-03 16:54:24.071 | INFO | =================================== -2025-02-03 16:54:24.074 | INFO | AUTO_MAA 主程序 -2025-02-03 16:54:24.074 | INFO | 版本号: v4.2.1.1 -2025-02-03 16:54:24.075 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 16:54:24.075 | INFO | =================================== -2025-02-03 16:54:24.075 | INFO | 日志记录器初始化完成 -2025-02-03 16:54:24.080 | INFO | 配置类初始化完成 -2025-02-03 16:54:24.084 | INFO | 程序配置管理模块初始化完成 -2025-02-03 16:55:19.304 | INFO | 用户添加任务:调度队列_1 -2025-02-03 16:55:19.304 | INFO | 任务开始:调度队列_1 -2025-02-03 16:55:19.316 | INFO | 任务开始:脚本_1 -2025-02-03 16:55:19.810 | INFO | 任务完成:脚本_1 -2025-02-03 16:55:19.813 | INFO | 任务结束:调度队列_1 -2025-02-03 16:55:19.957 | INFO | 用户添加任务:调度队列_1 -2025-02-03 16:55:19.957 | INFO | 任务开始:调度队列_1 -2025-02-03 16:55:19.962 | INFO | 任务开始:脚本_1 -2025-02-03 16:55:20.343 | INFO | 任务完成:脚本_1 -2025-02-03 16:55:20.346 | INFO | 任务结束:调度队列_1 -2025-02-03 16:58:08.736 | INFO | 中止任务:ALL -2025-02-03 16:58:08.739 | INFO | AUTO_MAA主程序关闭 -2025-02-03 16:58:08.739 | INFO | =================================== -2025-02-03 16:58:12.332 | INFO | =================================== -2025-02-03 16:58:12.333 | INFO | AUTO_MAA 主程序 -2025-02-03 16:58:12.333 | INFO | 版本号: v4.2.1.1 -2025-02-03 16:58:12.333 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 16:58:12.333 | INFO | =================================== -2025-02-03 16:58:12.333 | INFO | 日志记录器初始化完成 -2025-02-03 16:58:12.335 | INFO | 配置类初始化完成 -2025-02-03 16:58:12.336 | INFO | 程序配置管理模块初始化完成 -2025-02-03 16:58:22.873 | INFO | 用户添加任务:调度队列_1 -2025-02-03 16:58:22.873 | INFO | 任务开始:调度队列_1 -2025-02-03 16:58:22.879 | INFO | 任务开始:脚本_1 -2025-02-03 16:58:23.187 | INFO | 邮件发送成功 -2025-02-03 16:58:23.213 | INFO | 任务完成:脚本_1 -2025-02-03 16:58:23.216 | INFO | 任务结束:调度队列_1 -2025-02-03 16:58:24.030 | INFO | 用户添加任务:调度队列_1 -2025-02-03 16:58:24.031 | INFO | 任务开始:调度队列_1 -2025-02-03 16:58:24.035 | INFO | 任务开始:脚本_1 -2025-02-03 16:58:25.319 | INFO | 邮件发送成功 -2025-02-03 16:58:25.341 | INFO | 任务完成:脚本_1 -2025-02-03 16:58:25.345 | INFO | 任务结束:调度队列_1 -2025-02-03 16:59:38.862 | INFO | 中止任务:ALL -2025-02-03 16:59:38.867 | INFO | AUTO_MAA主程序关闭 -2025-02-03 16:59:38.867 | INFO | =================================== -2025-02-03 16:59:44.413 | INFO | =================================== -2025-02-03 16:59:44.413 | INFO | AUTO_MAA 主程序 -2025-02-03 16:59:44.413 | INFO | 版本号: v4.2.1.1 -2025-02-03 16:59:44.413 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 16:59:44.413 | INFO | =================================== -2025-02-03 16:59:44.413 | INFO | 日志记录器初始化完成 -2025-02-03 16:59:44.415 | INFO | 配置类初始化完成 -2025-02-03 16:59:44.415 | INFO | 程序配置管理模块初始化完成 -2025-02-03 16:59:51.541 | INFO | 用户添加任务:调度队列_1 -2025-02-03 16:59:51.541 | INFO | 任务开始:调度队列_1 -2025-02-03 16:59:51.546 | INFO | 任务开始:脚本_1 -2025-02-03 16:59:51.853 | INFO | 邮件发送成功 -2025-02-03 16:59:52.135 | INFO | Server酱推送通知成功 -2025-02-03 16:59:52.136 | INFO | 任务完成:脚本_1 -2025-02-03 16:59:52.139 | INFO | 任务结束:调度队列_1 -2025-02-03 17:06:00.621 | INFO | 中止任务:ALL -2025-02-03 17:06:00.625 | INFO | AUTO_MAA主程序关闭 -2025-02-03 17:06:00.625 | INFO | =================================== -2025-02-03 17:06:03.677 | INFO | =================================== -2025-02-03 17:06:03.677 | INFO | AUTO_MAA 主程序 -2025-02-03 17:06:03.677 | INFO | 版本号: v4.2.1.1 -2025-02-03 17:06:03.677 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 17:06:03.677 | INFO | =================================== -2025-02-03 17:06:03.677 | INFO | 日志记录器初始化完成 -2025-02-03 17:06:03.679 | INFO | 配置类初始化完成 -2025-02-03 17:06:03.680 | INFO | 程序配置管理模块初始化完成 -2025-02-03 17:06:19.154 | INFO | 用户添加任务:调度队列_1 -2025-02-03 17:06:19.154 | INFO | 任务开始:调度队列_1 -2025-02-03 17:06:19.159 | INFO | 任务开始:脚本_1 -2025-02-03 17:06:19.513 | INFO | 邮件发送成功 -2025-02-03 17:06:19.874 | INFO | Server酱推送通知成功 -2025-02-03 17:06:19.874 | INFO | 任务完成:脚本_1 -2025-02-03 17:06:19.877 | INFO | 任务结束:调度队列_1 -2025-02-03 17:46:35.127 | INFO | =================================== -2025-02-03 17:46:35.127 | INFO | AUTO_MAA 主程序 -2025-02-03 17:46:35.127 | INFO | 版本号: v4.2.1.1 -2025-02-03 17:46:35.127 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 17:46:35.128 | INFO | =================================== -2025-02-03 17:46:35.128 | INFO | 日志记录器初始化完成 -2025-02-03 17:46:35.131 | INFO | 配置类初始化完成 -2025-02-03 17:46:35.131 | INFO | 程序配置管理模块初始化完成 -2025-02-03 17:47:29.902 | INFO | =================================== -2025-02-03 17:47:29.902 | INFO | AUTO_MAA 主程序 -2025-02-03 17:47:29.902 | INFO | 版本号: v4.2.1.1 -2025-02-03 17:47:29.902 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 17:47:29.902 | INFO | =================================== -2025-02-03 17:47:29.902 | INFO | 日志记录器初始化完成 -2025-02-03 17:47:29.904 | INFO | 配置类初始化完成 -2025-02-03 17:47:29.905 | INFO | 程序配置管理模块初始化完成 -2025-02-03 17:48:34.890 | INFO | 中止任务:ALL -2025-02-03 17:48:34.894 | INFO | AUTO_MAA主程序关闭 -2025-02-03 17:48:34.894 | INFO | =================================== -2025-02-03 17:48:37.973 | INFO | =================================== -2025-02-03 17:48:37.973 | INFO | AUTO_MAA 主程序 -2025-02-03 17:48:37.974 | INFO | 版本号: v4.2.1.1 -2025-02-03 17:48:37.974 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 17:48:37.974 | INFO | =================================== -2025-02-03 17:48:37.974 | INFO | 日志记录器初始化完成 -2025-02-03 17:48:37.978 | INFO | 配置类初始化完成 -2025-02-03 17:48:37.978 | INFO | 程序配置管理模块初始化完成 -2025-02-03 17:49:32.858 | INFO | 中止任务:ALL -2025-02-03 17:49:32.861 | INFO | AUTO_MAA主程序关闭 -2025-02-03 17:49:32.861 | INFO | =================================== -2025-02-03 17:49:43.242 | INFO | =================================== -2025-02-03 17:49:43.242 | INFO | AUTO_MAA 主程序 -2025-02-03 17:49:43.242 | INFO | 版本号: v4.2.1.1 -2025-02-03 17:49:43.242 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 17:49:43.242 | INFO | =================================== -2025-02-03 17:49:43.242 | INFO | 日志记录器初始化完成 -2025-02-03 17:49:43.244 | INFO | 配置类初始化完成 -2025-02-03 17:49:43.245 | INFO | 程序配置管理模块初始化完成 -2025-02-03 17:51:37.814 | INFO | 中止任务:ALL -2025-02-03 17:51:37.818 | INFO | AUTO_MAA主程序关闭 -2025-02-03 17:51:37.819 | INFO | =================================== -2025-02-03 17:51:41.100 | INFO | =================================== -2025-02-03 17:51:41.100 | INFO | AUTO_MAA 主程序 -2025-02-03 17:51:41.100 | INFO | 版本号: v4.2.1.1 -2025-02-03 17:51:41.100 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 17:51:41.100 | INFO | =================================== -2025-02-03 17:51:41.101 | INFO | 日志记录器初始化完成 -2025-02-03 17:51:41.103 | INFO | 配置类初始化完成 -2025-02-03 17:51:41.104 | INFO | 程序配置管理模块初始化完成 -2025-02-03 17:52:15.264 | INFO | 用户添加任务:调度队列_1 -2025-02-03 17:52:15.264 | INFO | 任务开始:调度队列_1 -2025-02-03 17:52:15.269 | INFO | 任务开始:脚本_1 -2025-02-03 17:52:15.633 | INFO | 企业微信群机器人推送通知成功 -2025-02-03 17:52:15.634 | INFO | 任务完成:脚本_1 -2025-02-03 17:52:15.640 | INFO | 任务结束:调度队列_1 -2025-02-03 17:53:06.904 | INFO | 中止任务:ALL -2025-02-03 17:53:06.907 | INFO | AUTO_MAA主程序关闭 -2025-02-03 17:53:06.908 | INFO | =================================== -2025-02-03 17:53:09.899 | INFO | =================================== -2025-02-03 17:53:09.900 | INFO | AUTO_MAA 主程序 -2025-02-03 17:53:09.900 | INFO | 版本号: v4.2.1.1 -2025-02-03 17:53:09.900 | INFO | 根目录: D:\编程\Auto_Maa\AUTO_MAA -2025-02-03 17:53:09.900 | INFO | =================================== -2025-02-03 17:53:09.900 | INFO | 日志记录器初始化完成 -2025-02-03 17:53:09.903 | INFO | 配置类初始化完成 -2025-02-03 17:53:09.903 | INFO | 程序配置管理模块初始化完成 -2025-02-03 17:53:20.295 | INFO | 用户添加任务:调度队列_1 -2025-02-03 17:53:20.295 | INFO | 任务开始:调度队列_1 -2025-02-03 17:53:20.300 | INFO | 任务开始:脚本_1 -2025-02-03 17:53:20.627 | INFO | 企业微信群机器人推送通知成功 -2025-02-03 17:53:20.628 | INFO | 任务完成:脚本_1 -2025-02-03 17:53:20.631 | INFO | 任务结束:调度队列_1 -2025-02-03 17:53:20.729 | INFO | 用户添加任务:调度队列_1 -2025-02-03 17:53:20.729 | INFO | 任务开始:调度队列_1 -2025-02-03 17:53:20.733 | INFO | 任务开始:脚本_1 -2025-02-03 17:53:20.961 | INFO | 企业微信群机器人推送通知成功 -2025-02-03 17:53:20.961 | INFO | 任务完成:脚本_1 -2025-02-03 17:53:20.965 | INFO | 任务结束:调度队列_1 -2025-02-03 18:10:37.068 | INFO | 中止任务:ALL -2025-02-03 18:10:37.074 | INFO | AUTO_MAA主程序关闭 -2025-02-03 18:10:37.074 | INFO | =================================== -2025-02-03 18:43:07.460 | INFO | =================================== -2025-02-03 18:43:07.460 | INFO | AUTO_MAA 主程序 -2025-02-03 18:43:07.460 | INFO | 版本号: v4.2.1.1 -2025-02-03 18:43:07.461 | INFO | 根目录: D:\编程\Auto_Maa - 副本\AUTO_MAA -2025-02-03 18:43:07.461 | INFO | =================================== -2025-02-03 18:43:07.461 | INFO | 日志记录器初始化完成 -2025-02-03 18:43:07.463 | INFO | 配置类初始化完成 -2025-02-03 18:43:07.464 | INFO | 程序配置管理模块初始化完成 -2025-02-03 18:44:57.072 | INFO | 中止任务:ALL -2025-02-03 18:44:57.076 | INFO | AUTO_MAA主程序关闭 -2025-02-03 18:44:57.076 | INFO | =================================== -2025-02-03 18:45:02.114 | INFO | =================================== -2025-02-03 18:45:02.114 | INFO | AUTO_MAA 主程序 -2025-02-03 18:45:02.115 | INFO | 版本号: v4.2.1.1 -2025-02-03 18:45:02.115 | INFO | 根目录: D:\编程\Auto_Maa - 副本\AUTO_MAA -2025-02-03 18:45:02.115 | INFO | =================================== -2025-02-03 18:45:02.115 | INFO | 日志记录器初始化完成 -2025-02-03 18:45:02.120 | INFO | 配置类初始化完成 -2025-02-03 18:45:02.120 | INFO | 程序配置管理模块初始化完成 -2025-02-03 18:45:26.677 | INFO | 中止任务:ALL -2025-02-03 18:45:26.680 | INFO | AUTO_MAA主程序关闭 -2025-02-03 18:45:26.681 | INFO | =================================== diff --git a/resources/notice.json b/resources/notice.json deleted file mode 100644 index 096d215..0000000 --- a/resources/notice.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "content": "检测到系统词条,新年,内容读取已完成。\n词条更新时间:十二小时前。\n词条更新内容:博士,新年快乐!礼物已经放在办公桌上,快点拆开看看吧!\n —— 白面鸮", - "time": "2025-01-29 00:00" -} \ No newline at end of file diff --git a/test.py b/test.py deleted file mode 100644 index 6a8463d..0000000 --- a/test.py +++ /dev/null @@ -1,29 +0,0 @@ -import requests -from serverchan_sdk import sc_send - -# 发送消息 -sendkey = "SCT53272TqVLN4TlrrKmgcmKI1nnoQHmb" -title = "测试标题" -desp = "这是消息内容" -options = {"tags": "服务器报警|图片"} # 可选参数 - -content = f'{title}\n{desp}' -data = { - "msgtype": "text", - "text": { - "content": content - } -} -response = requests.post(url='https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=2c9218cb-c086-42d9-9f0a-a8859e10cc0a' - , json=data) -print(isinstance(response.json(), dict)) - - - -""" -{"errcode":0,"errmsg":"ok"} -""" - -""" -{'code': 0, 'message': '', 'data': {'pushid': '191226387', 'readkey': 'SCTUReMFXaCBsZi', 'error': 'SUCCESS', 'errno': 0}} -""" \ No newline at end of file