diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2639601358..6ce533f67f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
-## v6.4.3
+## v6.5.0
-### 修复 | Fix
+### Highlight
-* 紧急修复地图资源错误 @status102 @MistEO
+这么短写什么 Highlight ~~都怪鹰角~~
+
+### 新增 | New
+
+* 卫二期 @ABA2396
+* 调整提示文本 @ABA2396
diff --git a/resource/tasks/MiniGame/SPA.json b/resource/tasks/MiniGame/SPA.json
index 88b427da6e..5d28a7ef29 100644
--- a/resource/tasks/MiniGame/SPA.json
+++ b/resource/tasks/MiniGame/SPA.json
@@ -7,7 +7,8 @@
"MiniGame@SPA@EnterIndependent": {
"action": "ClickSelf",
"roi": [519, 568, 268, 152],
- "next": ["MiniGame@SPA@EnterStandard", "#self"]
+ "postDelay": 1000,
+ "next": ["MiniGame@SPA@EnterDanger", "MiniGame@SPA@EnterStandard", "#self"]
},
"MiniGame@SPA@EnterStandard": {
"action": "ClickSelf",
@@ -17,7 +18,7 @@
},
"MiniGame@SPA@EnterDanger": {
"action": "ClickSelf",
- "roi": [735, 235, 300, 140],
+ "roi": [735, 40, 300, 300],
"next": ["MiniGame@SPA@StartSimulation"]
},
"MiniGame@SPA@StartSimulation": {
@@ -52,7 +53,7 @@
},
"MiniGame@SPA@ReadyAgain": {
"action": "ClickSelf",
- "roi": [1081, 42, 199, 127],
+ "roi": [1081, 0, 199, 200],
"postDelay": 1000,
"next": ["MiniGame@SPA@NoMoreHint", "MiniGame@SPA@ExitButton"]
},
@@ -93,19 +94,40 @@
"template": "MiniGame@SPA@ConfirmHint.png",
"baseTask": "MiniGame@SPA@ConfirmHint",
"postDelay": 8000,
- "next": ["MiniGame@SPA@ReturnHome", "MiniGame@SPA@LoadingText", "MiniGame@SPA@LoadingIcon"]
+ "next": [
+ "MiniGame@SPA@GiveUp",
+ "MiniGame@SPA@ReturnHome",
+ "MiniGame@SPA@LoadingText",
+ "MiniGame@SPA@LoadingIcon"
+ ]
},
"MiniGame@SPA@LoadingText": {
- "next": ["MiniGame@SPA@ReturnHome", "MiniGame@SPA@LoadingText", "MiniGame@SPA@LoadingIcon"]
+ "next": [
+ "MiniGame@SPA@GiveUp",
+ "MiniGame@SPA@ReturnHome",
+ "MiniGame@SPA@LoadingText",
+ "MiniGame@SPA@LoadingIcon"
+ ]
},
"MiniGame@SPA@LoadingIcon": {
"template": "LoadingIcon.png",
- "next": ["MiniGame@SPA@ReturnHome", "MiniGame@SPA@LoadingText", "MiniGame@SPA@LoadingIcon"]
+ "next": [
+ "MiniGame@SPA@GiveUp",
+ "MiniGame@SPA@ReturnHome",
+ "MiniGame@SPA@LoadingText",
+ "MiniGame@SPA@LoadingIcon"
+ ]
},
"MiniGame@SPA@ReturnHome": {
"action": "ClickSelf",
"roi": [964, 590, 294, 130],
"postDelay": 2000,
"next": ["MiniGame@SPA@EnterIndependent"]
+ },
+ "MiniGame@SPA@GiveUp": {
+ "doc": "二期新加的允许中断返回",
+ "action": "ClickSelf",
+ "roi": [717, 573, 242, 141],
+ "next": ["MiniGame@SPA@ConfirmResult"]
}
}
diff --git a/resource/template/MiniGame/SPA/MiniGame@SPA@GiveUp.png b/resource/template/MiniGame/SPA/MiniGame@SPA@GiveUp.png
new file mode 100644
index 0000000000..00c185e82c
Binary files /dev/null and b/resource/template/MiniGame/SPA/MiniGame@SPA@GiveUp.png differ
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index ff51165b34..0d239b5f50 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -906,6 +906,9 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla
Automatically clear from the selected stage. If you choose the first stage, start from the leftmost side of the event page; for other stages, enter the previous stage and then return to calibrate the position.
Stronghold Protocol: Alliance
Start the task from the main event screen (where ｢Independent Simulation｣ is located)
+If there is a saved game, you need to manually abandon it first
+Only tested up to ｢Perilous Simulation｣
+If higher difficulties have been cleared and ｢Perilous Simulation｣ or ｢Standard Simulation｣ is not visible, manually select ｢Perilous Simulation｣ difficulty once
Completing ｢Standard Simulation｣ manually allows faster score farming
Only level rewards can be farmed; to get the Engraved Medal, all ｢Key Objectives｣ must be completed
OS-Karlan Trade Technology R&D Department
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 9257b53384..0eaa330a88 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -907,6 +907,9 @@ C:\\leidian\\LDPlayer9
選択したステージから自動でクリアします。最初のステージを選んだ場合は、イベントページの最左側から開始してください。その他のステージを選んだ場合は、位置を校正するために前のステージに一度入ってから戻ってください。
ガードプロトコル：盟約
イベントメイン画面（「独立シミュレーション」の場所）からタスクを開始
+セーブデータがある場合は、まず手動で破棄する必要があります
+「危機シミュレーション」までテスト済み
+より高い難易度をクリア済みで「危機シミュレーション」または「スタンダードシミュレーション」が表示されない場合、「危機シミュレーション」難易度を手動で一度選択してください
「スタンダードシミュレーション」を手動でクリアすると、より早くスコアを稼げます
レベル報酬のみ取得可能。「刻印章」を入手するには全ての「重要目標」をクリアする必要があります
OS-カラン貿易技術開発部
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 7dab4c8aea..23cee69c75 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -908,6 +908,9 @@ C:\\leidian\\LDPlayer9
선택한 스테이지부터 자동으로 클리어합니다. 첫 번째 스테이지를 선택한 경우에는 이벤트 페이지의 가장 왼쪽에서 시작하세요. 다른 스테이지를 선택한 경우에는 위치 보정을 위해 이전 스테이지에 먼저 들어갔다가 돌아오세요.
위수 협의: 맹약
이벤트 메인 화면(｢독립 시뮬레이션｣ 위치)에서 임무 시작
+저장 데이터가 있는 경우 먼저 수동으로 포기해야 합니다
+｢위험 시뮬레이션｣까지만 테스트되었습니다
+더 높은 난이도를 클리어하여 ｢위험 시뮬레이션｣ 또는 ｢스탠다드 시뮬레이션｣이 보이지 않는 경우, ｢위험 시뮬레이션｣ 난이도를 수동으로 한 번 선택하세요
｢스탠다드 시뮬레이션｣ 을 수동으로 클리어하면 점수를 더 빠르게 획득할 수 있습니다
레벨 보상만 획득 가능하며, 조각 메달을 얻으려면 모든 ｢핵심 목표｣를 완료해야 합니다
OS-칼란 무역 기술 연구 개발부
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 992ca6989d..d0edc9309a 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -907,6 +907,9 @@ C:\\leidian\\LDPlayer9。\n
从所选关卡开始并自动通关。若选择第一关，则从活动页最左侧开始；若选择其他关卡，请先进入上一关再返回以校准位置。
卫戍协议：盟约
在活动主界面（有 ｢独立模拟｣ 处开始任务）
+在有存档时需要先手动放弃
+最高只测试过 ｢险境模拟｣
+如果已通关更高难度导致看不到 ｢险境模拟｣ 或 ｢标准模拟｣，需手动选择一次 ｢险境模拟｣ 难度
手动通关 ｢标准模拟｣ 可以更快的刷分
只能刷等级奖励，拿蚀刻章得打完所有的 ｢关键目标｣
OS-喀兰贸易技术研发部
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index ba8e58fff3..9bec7b2b9b 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -907,6 +907,9 @@ C:\\leidian\\LDPlayer9\n
從所選關卡開始並自動通關。若選擇第一關，則從活動頁面最左側開始；若選擇其他關卡，請先進入上一關再返回以校準位置。
衛戍協議：盟約
在活動主介面（有「獨立模擬」處）開始任務。
+在有存檔時需要先手動放棄
+最高只測試過「險境模擬」
+如果已通關更高難度導致看不到「險境模擬」或「標準模擬」，需手動選擇一次「險境模擬」難度
手動通關「標準模擬」可以更快刷分。
只能刷等級獎勵，拿蝕刻章得打完所有的「關鍵目標」。
OS-喀蘭貿易技術研發部
diff --git a/tools/OptimizeTemplates/optimize_templates.json b/tools/OptimizeTemplates/optimize_templates.json
index 0f6337997b..52811dcb36 100644
--- a/tools/OptimizeTemplates/optimize_templates.json
+++ b/tools/OptimizeTemplates/optimize_templates.json
@@ -3937,5 +3937,6 @@
"resource/template/items/giftPackageTicket_2_2": "34fd7e2ed9ad8d5feb38959b2f4b5440cfae75a97d4cee6252bb74e91027669a",
"resource/template/items/main16_spitem_4": "11b631dd8cc6f1777ae246dc636f8a5d5821b82756f7a99faae47d72407890ca",
"resource/template/items/giftPackageTicket_2_1": "657b927cad4c91993f626ab5c718e365c06c492287e69dd17f168b4f2d9ed120",
- "resource/template/items/act2autochess_token_chess": "c2e7e783a9ef0dbf687c7660cbc030c5d17f7b09cac33432f781845b0715d10c"
-}
\ No newline at end of file
+ "resource/template/items/act2autochess_token_chess": "c2e7e783a9ef0dbf687c7660cbc030c5d17f7b09cac33432f781845b0715d10c",
+ "resource/template/MiniGame/SPA/MiniGame@SPA@GiveUp": "0801924a9e0db35404dbf54c4de4e2baa38e9113dc8fcc04778103bb42aa38ac"
+}