diff --git a/config/template.json b/config/template.json index 9b93b6506..472b1f264 100644 --- a/config/template.json +++ b/config/template.json @@ -270,8 +270,8 @@ "RegularInspections": { "CurrentCampaignTimes": 0, "CheckInterval": 5, - "IsResearchCheck": false, - "ResearchCheckNotify": false + "IsResearchInspect": false, + "ResearchInspectNotify": false }, "Fleet": { "Fleet1": 1, diff --git a/module/campaign/run.py b/module/campaign/run.py index f84287262..f49f81a30 100644 --- a/module/campaign/run.py +++ b/module/campaign/run.py @@ -479,7 +479,7 @@ class CampaignRun(CampaignEvent, ShopStatus): try: self.campaign.run() if self.config.task.command in ['Main2']: - if self.config.RegularInspections_IsResearchCheck: + if self.config.RegularInspections_IsResearchInspect: CurrentTimes = self.config.RegularInspections_CurrentCampaignTimes + 1 CheckInterval = self.config.RegularInspections_CheckInterval self.config.modified["Main2.RegularInspections.CurrentCampaignTimes"] = CurrentTimes diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 55981ba48..51ea6486c 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1203,11 +1203,11 @@ "type": "input", "value": 5 }, - "IsResearchCheck": { + "IsResearchInspect": { "type": "checkbox", "value": false }, - "ResearchCheckNotify": { + "ResearchInspectNotify": { "type": "checkbox", "value": false } diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index f0e2d8d1c..ae491b819 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -249,8 +249,8 @@ StopCondition: RegularInspections: CurrentCampaignTimes: 0 CheckInterval: 5 - IsResearchCheck: false - ResearchCheckNotify: false + IsResearchInspect: false + ResearchInspectNotify: false EventPt: EventPtSwitch: false Event2MapName: diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 83fa4b117..5113f6d7a 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -172,8 +172,8 @@ class GeneratedConfig: # Group `RegularInspections` RegularInspections_CurrentCampaignTimes = 0 RegularInspections_CheckInterval = 5 - RegularInspections_IsResearchCheck = False - RegularInspections_ResearchCheckNotify = False + RegularInspections_IsResearchInspect = False + RegularInspections_ResearchInspectNotify = False # Group `EventPt` EventPt_EventPtSwitch = False diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 7b6c765d3..a1e962550 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1193,13 +1193,13 @@ "name": "RegularInspections.CheckInterval.name", "help": "RegularInspections.CheckInterval.help" }, - "IsResearchCheck": { - "name": "RegularInspections.IsResearchCheck.name", - "help": "RegularInspections.IsResearchCheck.help" + "IsResearchInspect": { + "name": "RegularInspections.IsResearchInspect.name", + "help": "RegularInspections.IsResearchInspect.help" }, - "ResearchCheckNotify": { - "name": "RegularInspections.ResearchCheckNotify.name", - "help": "RegularInspections.ResearchCheckNotify.help" + "ResearchInspectNotify": { + "name": "RegularInspections.ResearchInspectNotify.name", + "help": "RegularInspections.ResearchInspectNotify.help" } }, "EventPt": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 86280d1e9..431416d3c 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1193,13 +1193,13 @@ "name": "RegularInspections.CheckInterval.name", "help": "RegularInspections.CheckInterval.help" }, - "IsResearchCheck": { - "name": "RegularInspections.IsResearchCheck.name", - "help": "RegularInspections.IsResearchCheck.help" + "IsResearchInspect": { + "name": "RegularInspections.IsResearchInspect.name", + "help": "RegularInspections.IsResearchInspect.help" }, - "ResearchCheckNotify": { - "name": "RegularInspections.ResearchCheckNotify.name", - "help": "RegularInspections.ResearchCheckNotify.help" + "ResearchInspectNotify": { + "name": "RegularInspections.ResearchInspectNotify.name", + "help": "RegularInspections.ResearchInspectNotify.help" } }, "EventPt": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 37480aab9..9fce72c64 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1193,12 +1193,12 @@ "name": "每刷 X 次检查", "help": "" }, - "IsResearchCheck": { + "IsResearchInspect": { "name": "是否检查研究经验", "help": "" }, - "ResearchCheckNotify": { - "name": "刷完后通知", + "ResearchInspectNotify": { + "name": "研究经验进度通知", "help": "推荐开启" } }, diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 201f2eed5..a1b6c7a29 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1193,13 +1193,13 @@ "name": "RegularInspections.CheckInterval.name", "help": "RegularInspections.CheckInterval.help" }, - "IsResearchCheck": { - "name": "RegularInspections.IsResearchCheck.name", - "help": "RegularInspections.IsResearchCheck.help" + "IsResearchInspect": { + "name": "RegularInspections.IsResearchInspect.name", + "help": "RegularInspections.IsResearchInspect.help" }, - "ResearchCheckNotify": { - "name": "RegularInspections.ResearchCheckNotify.name", - "help": "RegularInspections.ResearchCheckNotify.help" + "ResearchInspectNotify": { + "name": "RegularInspections.ResearchInspectNotify.name", + "help": "RegularInspections.ResearchInspectNotify.help" } }, "EventPt": { diff --git a/module/regular_inspect/research_inspect.py b/module/regular_inspect/research_inspect.py index 3a2a87432..4854aaa53 100644 --- a/module/regular_inspect/research_inspect.py +++ b/module/regular_inspect/research_inspect.py @@ -5,7 +5,7 @@ from module.base.base import ModuleBase from module.ui.ui import UI from module.ui.page import page_shipyard from module.shipyard.shipyard_reward import RewardShipyard -from module.research_farming.assets import (SHIP_EXPERIENCE_PERCENT_1, SHIP_EXPERIENCE_PERCENT_2, +from module.regular_inspect.assets import (SHIP_EXPERIENCE_PERCENT_1, SHIP_EXPERIENCE_PERCENT_2, SHIP_EXPERIENCE_FINISHED_1, SHIP_EXPERIENCE_FINISHED_2, SHIP_EXPERIENCE_COMPLETE_1, SHIP_EXPERIENCE_COMPLETE_2, SHIP_EXPERIENCE_COMMIT_1, SHIP_EXPERIENCE_COMMIT_2) @@ -72,7 +72,7 @@ class ResearchInspect(UI, ModuleBase): raise ExpNotFinished def _Notify(self, Index): - IsPush = deep_get(self.config.data, "Main2.RegularInspections.ResearchCheckNotify") + IsPush = deep_get(self.config.data, "Main2.RegularInspections.ResearchInspectNotify") if IsPush: from module.notify import handle_notify handle_notify(self.config.Error_OnePushConfig,