1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-11 23:18:22 +08:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ala
2021-12-18 13:58:51 +08:00
5 changed files with 28 additions and 14 deletions

View File

@@ -576,6 +576,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
"event_20211028_tw",
@@ -609,7 +610,6 @@
"event_20200716_en",
"event_20200611_en",
"event_20200603_en",
"event_20200603_cn",
"event_20200521_en",
"event_20200521_cn",
"event_20200507_cn",
@@ -2556,6 +2556,7 @@
"value": "campaign_main",
"option": [
"campaign_main",
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
"event_20211028_tw",
@@ -2589,7 +2590,6 @@
"event_20200716_en",
"event_20200611_en",
"event_20200603_en",
"event_20200603_cn",
"event_20200521_en",
"event_20200521_cn",
"event_20200507_cn",
@@ -4292,6 +4292,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
"event_20211028_tw",
@@ -4325,7 +4326,6 @@
"event_20200716_en",
"event_20200611_en",
"event_20200603_en",
"event_20200603_cn",
"event_20200521_en",
"event_20200521_cn",
"event_20200507_cn",
@@ -4689,6 +4689,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
"event_20211028_tw",
@@ -4722,7 +4723,6 @@
"event_20200716_en",
"event_20200611_en",
"event_20200603_en",
"event_20200603_cn",
"event_20200521_en",
"event_20200521_cn",
"event_20200507_cn",
@@ -5076,6 +5076,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
"event_20211028_tw",
@@ -5109,7 +5110,6 @@
"event_20200716_en",
"event_20200611_en",
"event_20200603_en",
"event_20200603_cn",
"event_20200521_en",
"event_20200521_cn",
"event_20200507_cn",

View File

@@ -296,7 +296,7 @@
},
"HandleError": {
"name": "Enable Exception Handling",
"help": "Handles select exceptions, will retreat if in battle"
"help": "Handles select exceptions, will retreat if in battle\nIn some tasks, will disable the error task and try restarting"
},
"SaveError": {
"name": "Record Exception",
@@ -426,6 +426,7 @@
"name": "Event Name",
"help": "Automatically selects to the latest event",
"campaign_main": "campaign_main",
"event_20200603_cn": "峡湾间的反击",
"event_20211125_cn": "World-spanning Arclight",
"event_20211111_cn": "The Flame-Touched Dagger",
"event_20211028_tw": "復刻光與影的鳶尾之華",
@@ -461,7 +462,6 @@
"raid_20200624": "Air Raid Drills with Essex Rerun",
"event_20200611_en": "Skybound Oratorio",
"event_20200603_en": "Prelude under the Moon Rerun",
"event_20200603_cn": "峡湾间的反击",
"event_20200521_en": "Iris of Light and Dark Rerun",
"event_20200521_cn": "穹顶下的圣咏曲",
"event_20200507_cn": "The Way Home in the Night",

View File

@@ -296,7 +296,7 @@
},
"HandleError": {
"name": "启用异常处理",
"help": "处理部分异常,运行出错时撤退"
"help": "处理部分异常,运行出错时撤退\n部分任务中会将出错的任务移出列表并重启游戏"
},
"SaveError": {
"name": "出错时,保存 Log 和截图",
@@ -426,6 +426,7 @@
"name": "活动名称",
"help": "自动选择至最新的活动",
"campaign_main": "主线图",
"event_20200603_cn": "峡湾间的反击",
"event_20211125_cn": "交汇世界的弧光",
"event_20211111_cn": "杰诺瓦的焰火",
"event_20211028_tw": "復刻光與影的鳶尾之華",
@@ -461,7 +462,6 @@
"raid_20200624": "复刻特别演习埃塞克斯级",
"event_20200611_en": "Skybound Oratorio",
"event_20200603_en": "Prelude under the Moon Rerun",
"event_20200603_cn": "峡湾间的反击",
"event_20200521_en": "Iris of Light and Dark Rerun",
"event_20200521_cn": "穹顶下的圣咏曲",
"event_20200507_cn": "夜幕下的归途",

View File

@@ -296,7 +296,7 @@
},
"HandleError": {
"name": "啟用異常處理",
"help": "處理部分異常,執行出錯時撤退"
"help": "處理部分異常,執行出錯時撤退\n部分任務中會將出錯的任務移出列表並重啟遊戲"
},
"SaveError": {
"name": "出錯時,保存 Log 和截圖",
@@ -426,6 +426,7 @@
"name": "活動名稱",
"help": "自動選擇至最新的活動圖",
"campaign_main": "主線圖",
"event_20200603_cn": "峽灣間的反擊",
"event_20211125_cn": "交匯世界的弧光",
"event_20211111_cn": "The Flame-Touched Dagger",
"event_20211028_tw": "復刻光與影的鳶尾之華",
@@ -461,7 +462,6 @@
"raid_20200624": "特別演習埃塞克斯級",
"event_20200611_en": "Skybound Oratorio",
"event_20200603_en": "Prelude under the Moon Rerun",
"event_20200603_cn": "峽灣間的反擊",
"event_20200521_en": "Iris of Light and Dark Rerun",
"event_20200521_cn": "穹顶下的圣咏曲",
"event_20200507_cn": "The Way Home in the Night",