diff --git a/campaign/Readme.md b/campaign/Readme.md index 318c74f10..3a2f5da98 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -190,4 +190,7 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20240321 | raid 20230629 | Reflections of the Oasis | - | - | - | 綠洲往事 | | 20240328 | raid 20240328 | From Zero to Hero | 从零开始的魔王讨伐之旅 | From Zero to Hero | ゼロから頑張る魔王討伐 | - | | 20240403 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 復刻杰諾瓦的焰火 | +| 20240411 | event 20220224 cn | Abyssal Refrain Rerun | 复刻深度回音 | Abyssal Refrain Rerun | 鳴動せし星霜の淵（復刻） | - | +| 20240411 | event 20220224 cn | Abyssal Refrain Rerun | 复刻深度回音 | Abyssal Refrain Rerun | 鳴動せし星霜の淵（復刻） | - | +| 20240403 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 復刻杰諾瓦的焰火 | | 20240411 | event 20220224 cn | Abyssal Refrain Rerun | 复刻深度回音 | Abyssal Refrain Rerun | 鳴動せし星霜の淵（復刻） | - | \ No newline at end of file diff --git a/config/deploy.template-AidLux-cn.yaml b/config/deploy.template-AidLux-cn.yaml index 97fba4e43..fba862e3a 100644 --- a/config/deploy.template-AidLux-cn.yaml +++ b/config/deploy.template-AidLux-cn.yaml @@ -1,8 +1,8 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot Repository: git://git.lyoko.io/AzurLaneAutoScript # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: zh-CN # Theme of web ui # 'default' for light theme diff --git a/config/deploy.template-AidLux.yaml b/config/deploy.template-AidLux.yaml index 19dcdff71..bededb590 100644 --- a/config/deploy.template-AidLux.yaml +++ b/config/deploy.template-AidLux.yaml @@ -1,9 +1,9 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' - Repository: https://github.com/LmeSzinc/AzurLaneAutoScript + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot + Repository: global # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features # [Other] Use 'master', the stable branch @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: en-US # Theme of web ui # 'default' for light theme diff --git a/config/deploy.template-cn.yaml b/config/deploy.template-cn.yaml index 3800e347b..79c211ae8 100644 --- a/config/deploy.template-cn.yaml +++ b/config/deploy.template-cn.yaml @@ -1,8 +1,8 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot Repository: git://git.lyoko.io/AzurLaneAutoScript # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: zh-CN # Theme of web ui # 'default' for light theme diff --git a/config/deploy.template-docker-cn.yaml b/config/deploy.template-docker-cn.yaml index d26fefdb2..02b4356cf 100644 --- a/config/deploy.template-docker-cn.yaml +++ b/config/deploy.template-docker-cn.yaml @@ -1,8 +1,8 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot Repository: git://git.lyoko.io/AzurLaneAutoScript # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: zh-CN # Theme of web ui # 'default' for light theme diff --git a/config/deploy.template-docker.yaml b/config/deploy.template-docker.yaml index e2351ecd0..da5bfa140 100644 --- a/config/deploy.template-docker.yaml +++ b/config/deploy.template-docker.yaml @@ -1,9 +1,9 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' - Repository: https://github.com/LmeSzinc/AzurLaneAutoScript + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot + Repository: global # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features # [Other] Use 'master', the stable branch @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: en-US # Theme of web ui # 'default' for light theme diff --git a/config/deploy.template-linux-cn.yaml b/config/deploy.template-linux-cn.yaml index a4ba3c04d..35f1aaf46 100644 --- a/config/deploy.template-linux-cn.yaml +++ b/config/deploy.template-linux-cn.yaml @@ -1,8 +1,8 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot Repository: git://git.lyoko.io/AzurLaneAutoScript # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: zh-CN # Theme of web ui # 'default' for light theme diff --git a/config/deploy.template-linux.yaml b/config/deploy.template-linux.yaml index a256c2c50..9f32ea336 100644 --- a/config/deploy.template-linux.yaml +++ b/config/deploy.template-linux.yaml @@ -1,9 +1,9 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' - Repository: https://github.com/LmeSzinc/AzurLaneAutoScript + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot + Repository: global # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features # [Other] Use 'master', the stable branch @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: en-US # Theme of web ui # 'default' for light theme diff --git a/config/deploy.template.yaml b/config/deploy.template.yaml index 3d60a0319..1c6adfcb4 100644 --- a/config/deploy.template.yaml +++ b/config/deploy.template.yaml @@ -1,9 +1,9 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' - Repository: https://github.com/LmeSzinc/AzurLaneAutoScript + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot + Repository: global # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features # [Other] Use 'master', the stable branch @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: en-US # Theme of web ui # 'default' for light theme diff --git a/module/config/argument/args.json b/module/config/argument/args.json index f9aa2e192..689cb7f0b 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3131,13 +3131,13 @@ "event_20240229_cn" ], "option_bold": [ - "event_20210422_cn", - "event_20220324_cn" + "event_20211111_cn", + "event_20220224_cn" ], - "cn": "event_20220324_cn", - "en": "event_20220324_cn", - "jp": "event_20220324_cn", - "tw": "event_20210422_cn" + "cn": "event_20220224_cn", + "en": "event_20220224_cn", + "jp": "event_20220224_cn", + "tw": "event_20211111_cn" }, "Mode": { "type": "select", diff --git a/module/config/config_generated.py b/module/config/config_generated.py index b0e2e7130..53966296f 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -149,12 +149,12 @@ class GeneratedConfig: # Group `GemsFarming` GemsFarming_ChangeFlagship = 'ship' # ship, ship_equip + GemsFarming_CommonCV = 'any' # any, langley, bogue, ranger, hermes GemsFarming_ChangeVanguard = 'ship' # disabled, ship, ship_equip + GemsFarming_CommonDD = 'any' # any, aulick_or_foote, cassin_or_downes GemsFarming_ALLowLowVanguardLevel = True GemsFarming_FleetNumberInHardMode = 0 # 0, 1, 2 GemsFarming_StopIFAutoNotEnsured = True - GemsFarming_CommonCV = 'any' # any, langley, bogue, ranger, hermes - GemsFarming_CommonDD = 'any' # any, aulick_or_foote, cassin_or_downes GemsFarming_CommissionLimit = True # Group `FlagshipFilter` diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 92a76fead..9ee65a908 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1158,6 +1158,13 @@ "ship": "Change Ship", "ship_equip": "Change Ship + Gears" }, + "CommonDD": { + "name": "Flagship Common DD Preference", + "help": "", + "any": "any", + "aulick_or_foote": "aulick or foote", + "cassin_or_downes": "cassin or downes" + }, "ALLowLowVanguardLevel": { "name": "ALLow Low Vanguard Level", "help": "Destroyers over level 10 will now be used, 49 for Event CD" @@ -1173,13 +1180,6 @@ "name": "GemsFarming.StopIFAutoNotEnsured.name", "help": "GemsFarming.StopIFAutoNotEnsured.help" }, - "CommonDD": { - "name": "Flagship Common DD Preference", - "help": "", - "any": "any", - "aulick_or_foote": "aulick or foote", - "cassin_or_downes": "cassin or downes" - }, "CommissionLimit": { "name": "Prevent Too Many Urgent Commissions", "help": "When running 7x24, prevent having a lot of urgent commissions and not being able to complete daily commissions. It is recommended to select only short-terms and high-yields in the commission filter" diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index de5e71311..c1f598955 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1142,21 +1142,6 @@ "ship": "ship", "ship_equip": "ship_equip" }, - "ALLowLowVanguardLevel": { - "name": "GemsFarming.ALLowLowVanguardLevel.name", - "help": "GemsFarming.ALLowLowVanguardLevel.help" - }, - "FleetNumberInHardMode": { - "name": "GemsFarming.FleetNumberInHardMode.name", - "help": "GemsFarming.FleetNumberInHardMode.help", - "0": "0", - "1": "1", - "2": "2" - }, - "StopIFAutoNotEnsured": { - "name": "GemsFarming.StopIFAutoNotEnsured.name", - "help": "GemsFarming.StopIFAutoNotEnsured.help" - }, "CommonCV": { "name": "GemsFarming.CommonCV.name", "help": "GemsFarming.CommonCV.help", @@ -1180,6 +1165,21 @@ "aulick_or_foote": "aulick or foote", "cassin_or_downes": "cassin or downes" }, + "ALLowLowVanguardLevel": { + "name": "GemsFarming.ALLowLowVanguardLevel.name", + "help": "GemsFarming.ALLowLowVanguardLevel.help" + }, + "FleetNumberInHardMode": { + "name": "GemsFarming.FleetNumberInHardMode.name", + "help": "GemsFarming.FleetNumberInHardMode.help", + "0": "0", + "1": "1", + "2": "2" + }, + "StopIFAutoNotEnsured": { + "name": "GemsFarming.StopIFAutoNotEnsured.name", + "help": "GemsFarming.StopIFAutoNotEnsured.help" + }, "CommissionLimit": { "name": "GemsFarming.CommissionLimit.name", "help": "GemsFarming.CommissionLimit.help" diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 4dc9537d7..55f179591 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1158,6 +1158,13 @@ "ship": "更换舰船", "ship_equip": "更换舰船 + 装备" }, + "CommonDD": { + "name": "指定前排", + "help": "", + "any": "任意", + "aulick_or_foote": "奥利克或富特", + "cassin_or_downes": "卡辛或唐斯" + }, "ALLowLowVanguardLevel": { "name": "可更换低等级前排", "help": "倍率打开时，前排等级限制改为10以上即可。若为困难模式（如CD图）改为49级。" @@ -1173,13 +1180,6 @@ "name": "无法设置职能时停止任务", "help": "无法设置舰队职能时，以以下方式停止任务以免跨队队伍出击，石油被大量消耗：\n若设置了错误推送则推送任务停止的消息并停止该任务。\n若没有设置错误推送，则直接停止Alas。" }, - "CommonDD": { - "name": "指定前排", - "help": "", - "any": "任意", - "aulick_or_foote": "奥利克或富特", - "cassin_or_downes": "卡辛或唐斯" - }, "CommissionLimit": { "name": "防止紧急委托数量过多", "help": "在7x24运行时防止紧急委托数量过多做不完每日委托，建议在委托过滤器仅选择短时长高收益委托" diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 26ae0111c..a58765efb 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1158,6 +1158,13 @@ "ship": "更換艦船", "ship_equip": "更換艦船 + 裝備" }, + "CommonDD": { + "name": "指定前排", + "help": "", + "any": "任意", + "aulick_or_foote": "奧利克或富特", + "cassin_or_downes": "卡辛或唐斯" + }, "ALLowLowVanguardLevel": { "name": "可更換低等級前排", "help": "倍率打開時，前排等級限制改為10以上即可" @@ -1173,13 +1180,6 @@ "name": "GemsFarming.StopIFAutoNotEnsured.name", "help": "GemsFarming.StopIFAutoNotEnsured.help" }, - "CommonDD": { - "name": "指定前排", - "help": "", - "any": "任意", - "aulick_or_foote": "奧利克或富特", - "cassin_or_downes": "卡辛或唐斯" - }, "CommissionLimit": { "name": "防止緊急委託數量過多", "help": "在7x24運行時防止緊急委託數量過多做不完每日委託，建議在委託過濾器僅選擇短時長高收益委託" diff --git a/webapp/packages/main/public/deploy.yaml.tpl b/webapp/packages/main/public/deploy.yaml.tpl index 58732023f..8f0627f1b 100644 --- a/webapp/packages/main/public/deploy.yaml.tpl +++ b/webapp/packages/main/public/deploy.yaml.tpl @@ -1,8 +1,8 @@ Deploy: Git: # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' + # [CN user] Use 'cn' to get update from git-over-cdn service + # [Other] Use 'global' to get update from https://github.com/LmeSzinc/StarRailCopilot Repository: {{repository}} # Branch of Alas # [Developer] Use 'dev', 'app', etc, to try new features @@ -128,13 +128,14 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 + # [In most cases] Default to 22367 + WebuiPort: 22367 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English # 'ja-JP' for Japanese # 'zh-TW' for Chinese traditional + # 'es-ES' for Spanish Language: {{language}} # Theme of web ui # 'default' for light theme