ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-14 07:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix(Research_inspect): 修改变量名

Browse Source
This commit is contained in:
W1NDes 2025-07-16 23:42:19 +08:00
parent 241f67fb47
commit b60bd51323
10 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/template.json
View File

@ -270,8 +270,8 @@
"RegularInspections": {
"CurrentCampaignTimes": 0,
"CheckInterval": 5,
"IsResearchCheck": false,
"ResearchCheckNotify": false
"IsResearchInspect": false,
"ResearchInspectNotify": false
},
"Fleet": {
"Fleet1": 1,

2
module/campaign/run.py
View File

@ -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

4
module/config/argument/args.json
View File

@ -1203,11 +1203,11 @@
"type": "input",
"value": 5
},
"IsResearchCheck": {
"IsResearchInspect": {
"type": "checkbox",
"value": false
},
"ResearchCheckNotify": {
"ResearchInspectNotify": {
"type": "checkbox",
"value": false
}

4
module/config/argument/argument.yaml
View File

@ -249,8 +249,8 @@ StopCondition:
RegularInspections:
CurrentCampaignTimes: 0
CheckInterval: 5
IsResearchCheck: false
ResearchCheckNotify: false
IsResearchInspect: false
ResearchInspectNotify: false
EventPt:
EventPtSwitch: false
Event2MapName:

4
module/config/config_generated.py
View File

@ -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

12
module/config/i18n/en-US.json
View File

@ -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": {

12
module/config/i18n/ja-JP.json
View File

@ -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": {

6
module/config/i18n/zh-CN.json
View File

@ -1193,12 +1193,12 @@
"name": "每刷 X 次检查",
"help": ""
},
"IsResearchCheck": {
"IsResearchInspect": {
"name": "是否检查研究经验",
"help": ""
},
"ResearchCheckNotify": {
"name": "刷完后通知",
"ResearchInspectNotify": {
"name": "研究经验进度通知",
"help": "推荐开启"
}
},

12
module/config/i18n/zh-TW.json
View File

@ -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": {

4
module/regular_inspect/research_inspect.py
View File

@ -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,