Merge branch 'MaaXYZ:main' into main

MaaXYZ · Jun 12, 2024 · 023793d · 023793d
2 parents 3594698 + f9b74aa
commit 023793d
Show file tree

Hide file tree

Showing 31 changed files with 2,245 additions and 1 deletion.
diff --git a/assets/interface.json b/assets/interface.json
@@ -174,6 +174,15 @@
         {
             "name": "肉鸽：山麓的回音（已结束）",
             "entry": "EchoesinInTheMountain"
+        },
+        {
+            "name": "局外演绎：黄昏的音序",
+            "entry": "SeriesOfDusks",
+            "param": {
+                "EnterTheShow": {
+                    "next": "OutsideDeduction"
+                }
+            }
         }
     ],
     "recognizer": {},
@@ -572,4 +581,4 @@
             ]
         }
     }
-}
+}
diff --git a/assets/resource/base/image/OutsideDeduction/OutsideDeduction.png b/assets/resource/base/image/OutsideDeduction/OutsideDeduction.png
diff --git a/assets/resource/base/image/OutsideDeduction/SODStart.png b/assets/resource/base/image/OutsideDeduction/SODStart.png
diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_Confirm.png b/assets/resource/base/image/OutsideDeduction/SODStart_Confirm.png
diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_MediaSellect.png b/assets/resource/base/image/OutsideDeduction/SODStart_MediaSellect.png
diff --git a/assets/resource/base/image/OutsideDeduction/SODStop.png b/assets/resource/base/image/OutsideDeduction/SODStop.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd.png b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd_Confirm_1.png b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd_Confirm_1.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistSellct.png b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistSellct.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Combat.png b/assets/resource/base/image/OutsideDeduction/SOD_Combat.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_CombatStart.png b/assets/resource/base/image/OutsideDeduction/SOD_CombatStart.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Combating.png b/assets/resource/base/image/OutsideDeduction/SOD_Combating.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Danger.png b/assets/resource/base/image/OutsideDeduction/SOD_Danger.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_1.png b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_1.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_2.png b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_2.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Discovery.png b/assets/resource/base/image/OutsideDeduction/SOD_Discovery.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_EndEvent.png b/assets/resource/base/image/OutsideDeduction/SOD_EndEvent.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_EndEvent_OK.png b/assets/resource/base/image/OutsideDeduction/SOD_EndEvent_OK.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Ending_1.png b/assets/resource/base/image/OutsideDeduction/SOD_Ending_1.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Ending_2.png b/assets/resource/base/image/OutsideDeduction/SOD_Ending_2.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Imminent.png b/assets/resource/base/image/OutsideDeduction/SOD_Imminent.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Main.png b/assets/resource/base/image/OutsideDeduction/SOD_Main.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Move.png b/assets/resource/base/image/OutsideDeduction/SOD_Move.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Nothinghappen.png b/assets/resource/base/image/OutsideDeduction/SOD_Nothinghappen.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Quickformation.png b/assets/resource/base/image/OutsideDeduction/SOD_Quickformation.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Quickformation_On.png b/assets/resource/base/image/OutsideDeduction/SOD_Quickformation_On.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_RestSite.png b/assets/resource/base/image/OutsideDeduction/SOD_RestSite.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Shopping.png b/assets/resource/base/image/OutsideDeduction/SOD_Shopping.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Shopping_Leave.png b/assets/resource/base/image/OutsideDeduction/SOD_Shopping_Leave.png
diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Treasure.png b/assets/resource/base/image/OutsideDeduction/SOD_Treasure.png