1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-05-17 02:38:38 +08:00

Merge branch 'master' into dev

This commit is contained in:
nEEtdo0d
2025-06-28 16:11:37 -04:00
74 changed files with 839 additions and 726 deletions

View File

@@ -66,6 +66,10 @@
"name": "Event General",
"help": ""
},
"Coalition": {
"name": "Neon City Investigator",
"help": ""
},
"Event": {
"name": "Event",
"help": ""
@@ -82,10 +86,6 @@
"name": "Valley Hospital",
"help": ""
},
"Coalition": {
"name": "Frostfall",
"help": ""
},
"MaritimeEscort": {
"name": "Maritime Escort",
"help": ""
@@ -94,6 +94,10 @@
"name": "War Archives",
"help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search"
},
"CoalitionSp": {
"name": "Neon City Investigator SP",
"help": ""
},
"EventA": {
"name": "Event Daily A",
"help": ""
@@ -118,10 +122,6 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "Frostfall SP",
"help": ""
},
"Commission": {
"name": "Commission",
"help": ""
@@ -681,6 +681,7 @@
"campaign_main": "campaign_main",
"coalition_20230323": "Frostfall",
"coalition_20240627": "Welcome to Little Academy",
"coalition_20250626": "The Neon City Investigator",
"event_20200227_cn": "Northern Overture",
"event_20200312_cn": "The Solomon Ranger Rerun",
"event_20200326_cn": "Microlayer Medley",
@@ -736,7 +737,7 @@
"event_20221124_cn": "The Alchemist and the Archipelago of Secrets",
"event_20221222_cn": "Parallel Superimposition Rerun",
"event_20230223_cn": "Revelations of Dust Rerun",
"event_20230525_cn": "Confluence of Nothingness",
"event_20230525_cn": "Confluence of Nothingness Rerun",
"event_20230803_cn": "Anthem of Remembrance",
"event_20230817_cn": "The Fools Scales",
"event_20230914_cn": "Effulgence Before Eclipse",
@@ -1310,10 +1311,10 @@
"Mode": {
"name": "Mode",
"help": "SP needs to use event daily SP to run",
"tc1": "tc1",
"tc2": "tc2",
"tc3": "tc3",
"sp": "sp",
"easy": "Easy",
"normal": "Normal",
"hard": "Hard",
"sp": "SP",
"ex": "EX"
},
"Fleet": {

View File

@@ -66,6 +66,10 @@
"name": "イベント共通設定",
"help": ""
},
"Coalition": {
"name": "ネオンシティの探索者",
"help": ""
},
"Event": {
"name": "イベント海域",
"help": ""
@@ -82,10 +86,6 @@
"name": "病院探訪",
"help": ""
},
"Coalition": {
"name": "星霜海嵐",
"help": ""
},
"MaritimeEscort": {
"name": "Maritime Escort",
"help": ""
@@ -94,6 +94,10 @@
"name": "作戦履歴",
"help": ""
},
"CoalitionSp": {
"name": "ネオンシティの探索者SP",
"help": ""
},
"EventA": {
"name": "毎日イベント海域A",
"help": ""
@@ -118,10 +122,6 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "星霜海嵐SP",
"help": ""
},
"Commission": {
"name": "委託",
"help": ""
@@ -681,6 +681,7 @@
"campaign_main": "campaign_main",
"coalition_20230323": "星霜海嵐",
"coalition_20240627": "リトル学園へようこそ",
"coalition_20250626": "ネオンシティの探索者",
"event_20200227_cn": "凍絶の北海",
"event_20200312_cn": "南洋に靡く硝煙(復刻)",
"event_20200326_cn": "闇靄払う銀翼",
@@ -736,7 +737,7 @@
"event_20221124_cn": "錬金術士と謎の遺跡群島",
"event_20221222_cn": "積重なる事象の幻界(復刻)",
"event_20230223_cn": "黙示の遺構(復刻)",
"event_20230525_cn": "覆天せし万象の塵",
"event_20230525_cn": "覆天せし万象の塵(復刻)",
"event_20230803_cn": "燃ゆる聖都の回想曲",
"event_20230817_cn": "愚者の天秤",
"event_20230914_cn": "須臾望月抄",
@@ -1310,9 +1311,9 @@
"Mode": {
"name": "Coalition.Mode.name",
"help": "Coalition.Mode.help",
"tc1": "tc1",
"tc2": "tc2",
"tc3": "tc3",
"easy": "easy",
"normal": "normal",
"hard": "hard",
"sp": "sp",
"ex": "ex"
},

View File

@@ -66,6 +66,10 @@
"name": "活动通用设置",
"help": ""
},
"Coalition": {
"name": "迷彩都市的寻踪者",
"help": ""
},
"Event": {
"name": "活动图",
"help": ""
@@ -82,10 +86,6 @@
"name": "深谷来信",
"help": ""
},
"Coalition": {
"name": "极地风暴",
"help": ""
},
"MaritimeEscort": {
"name": "商船护航",
"help": ""
@@ -94,6 +94,10 @@
"name": "作战档案",
"help": "由于作战档案缺少维护开荒功能不一定能正常使用如果发现Alas运行异常请手动完成开荒后使用自律寻敌功能"
},
"CoalitionSp": {
"name": "迷彩都市的寻踪者SP",
"help": ""
},
"EventA": {
"name": "活动每日A图",
"help": ""
@@ -118,10 +122,6 @@
"name": "共斗活动每日",
"help": ""
},
"CoalitionSp": {
"name": "极地风暴每日SP",
"help": ""
},
"Commission": {
"name": "委托",
"help": ""
@@ -681,6 +681,7 @@
"campaign_main": "主线图",
"coalition_20230323": "极地风暴",
"coalition_20240627": "欢迎来到童心学院",
"coalition_20250626": "迷彩都市的寻踪者",
"event_20200227_cn": "北境序曲",
"event_20200312_cn": "复刻斯图尔特的硝烟",
"event_20200326_cn": "微层混合",
@@ -736,7 +737,7 @@
"event_20221124_cn": "炼金术士与秘密遗迹群岛",
"event_20221222_cn": "复刻定向折叠",
"event_20230223_cn": "复刻湮烬尘墟",
"event_20230525_cn": "空相交汇点",
"event_20230525_cn": "复刻空相交汇点",
"event_20230803_cn": "奏响鸢尾之歌",
"event_20230817_cn": "愚者的天平",
"event_20230914_cn": "须臾望月抄",
@@ -1310,10 +1311,10 @@
"Mode": {
"name": "难度",
"help": "SP图需要使用活动每日SP运行",
"tc1": "tc1",
"tc2": "tc2",
"tc3": "tc3",
"sp": "sp",
"easy": "简单",
"normal": "普通",
"hard": "困难",
"sp": "SP",
"ex": "EX"
},
"Fleet": {

View File

@@ -66,6 +66,10 @@
"name": "活動通用",
"help": ""
},
"Coalition": {
"name": "極地風暴",
"help": ""
},
"Event": {
"name": "活動圖",
"help": ""
@@ -82,10 +86,6 @@
"name": "深谷来信",
"help": ""
},
"Coalition": {
"name": "極地風暴",
"help": ""
},
"MaritimeEscort": {
"name": "商船護航",
"help": ""
@@ -94,6 +94,10 @@
"name": "作戰檔案",
"help": "由於作戰檔案缺少維護開荒功能不一定能正常使用如果發現Alas運行異常請手動完成開荒後使用自律尋敵功能"
},
"CoalitionSp": {
"name": "極地風暴每日SP",
"help": ""
},
"EventA": {
"name": "活動每日A圖",
"help": ""
@@ -118,10 +122,6 @@
"name": "共鬥活動每日",
"help": ""
},
"CoalitionSp": {
"name": "極地風暴每日SP",
"help": ""
},
"Commission": {
"name": "委託",
"help": ""
@@ -681,6 +681,7 @@
"campaign_main": "主線圖",
"coalition_20230323": "極地風暴",
"coalition_20240627": "歡迎來到童心學院",
"coalition_20250626": "The Neon City Investigator",
"event_20200227_cn": "Northern Overture",
"event_20200312_cn": "斯圖爾特的硝煙",
"event_20200326_cn": "Microlayer Medley",
@@ -1310,9 +1311,9 @@
"Mode": {
"name": "難度",
"help": "SP圖需要使用活動每日SP運行",
"tc1": "tc1",
"tc2": "tc2",
"tc3": "tc3",
"easy": "簡單",
"normal": "普通",
"hard": "困難",
"sp": "sp",
"ex": "EX"
},