Merge branch 'main' of https://github.com/MAWHA/MWA

MAWHA · Sep 15, 2024 · bd34b2b · bd34b2b
2 parents 2edccd3 + affaa8b
commit bd34b2b
Show file tree

Hide file tree

Showing 18 changed files with 488 additions and 100 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -93,7 +93,8 @@
             "name": "博物研学",
             "entry": "museum_Research",
             "option": [
-                "选择哪个"
+                "选择研学主题",
+                "选择地图(仅老研学)"
             ]
         },
         {
@@ -593,57 +594,49 @@
                 }
             ]
         },
-        "选择哪个": {
+        "选择研学主题": {
             "cases": [
                 {
-                    "name": "雪景寒林图",
+                    "name": "山水纪行",
                     "param": {
-                        "Research": {
-                            "next": "snowscape"
+                        "choose_theme": {
+                            "next": "mountain-river"
                         }
                     }
                 },
                 {
-                    "name": "千里江山图 （暂无）",
+                    "name": "金银纪行",
                     "param": {
-                        "Research": {
-                            "next": "landscape"
-                        }
-                    }
-                },
-                {
-                    "name": "溪山旅行图 （暂无）",
-                    "param": {
-                        "Research": {
-                            "next": "journey"
+                        "choose_theme": {
+                            "next": "gold-silver"
                         }
                     }
                 }
             ]
         },
-        "初始buff": {
+        "选择地图(仅老研学)": {
             "cases": [
                 {
-                    "name": "神射",
+                    "name": "雪景寒林图",
                     "param": {
-                        "snowscape": {
-                            "next": "Marksmanship"
+                        "mountain_Research": {
+                            "next": "snowscape"
                         }
                     }
                 },
                 {
-                    "name": "炽刀",
+                    "name": "千里江山图 （暂无）",
                     "param": {
-                        "snowscape": {
-                            "next": "Blazing_Knife"
+                        "mountain_Research": {
+                            "next": "landscape"
                         }
                     }
                 },
                 {
-                    "name": "术法精通",
+                    "name": "溪山旅行图 （暂无）",
                     "param": {
-                        "snowscape": {
-                            "next": "Spells"
+                        "mountain_Research": {
+                            "next": "journey"
                         }
                     }
                 }

diff --git a/assets/resource_picli/base/image/Research/mountain_research.png b/assets/resource_picli/base/image/Research/mountain_research.png
diff --git a/assets/resource_picli/base/image/Research2/begin_research.png b/assets/resource_picli/base/image/Research2/begin_research.png
diff --git a/assets/resource_picli/base/image/Research2/choose_role.png b/assets/resource_picli/base/image/Research2/choose_role.png
diff --git a/assets/resource_picli/base/image/Research2/ensure_1.png b/assets/resource_picli/base/image/Research2/ensure_1.png
diff --git a/assets/resource_picli/base/image/Research2/enter_research.png b/assets/resource_picli/base/image/Research2/enter_research.png
diff --git a/assets/resource_picli/base/image/Research2/filter.png b/assets/resource_picli/base/image/Research2/filter.png
diff --git a/assets/resource_picli/base/image/Research2/golden_research.png b/assets/resource_picli/base/image/Research2/golden_research.png
diff --git a/assets/resource_picli/base/image/Research2/quit.png b/assets/resource_picli/base/image/Research2/quit.png
diff --git a/assets/resource_picli/base/image/Research2/rest.png b/assets/resource_picli/base/image/Research2/rest.png
diff --git a/assets/resource_picli/base/image/Research2/start_point.png b/assets/resource_picli/base/image/Research2/start_point.png
diff --git a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json
@@ -21,7 +21,7 @@
             "Blazing_Knife",
             "Spells",
             "snowscape",
-            "Research",
+            "mountain_Research",
             "museum",
             "buff-one"
         ]
@@ -41,7 +41,7 @@
             "Blazing_Knife",
             "Spells",
             "snowscape",
-            "Research",
+            "mountain_Research",
             "museum",
             "advance_four"
         ]

diff --git a/assets/resource_picli/base/pipeline/11_(03)_landscape.json b/assets/resource_picli/base/pipeline/11_(03)_landscape.json
@@ -1,44 +1,49 @@
 {
-  "landscape": {
-      "recognition": "TemplateMatch",
-      "template": "Research/r1.png",
-      "roi": [494, 386, 90, 84],
-      "action": "Click",
-      "target_offset": [
-          60,
-          150,
-          0,
-          0
-      ],
-      "post_wait_freezes": 3000,
-      "next": [
-          "Marksmanship",
-          "Blazing_Knife",
-          "Spells",
-          "landscape",
-          "Research",
-          "museum",
-          "landscape-buff-one"
-      ]
-  },
-  "landscape-buff-one": {
-      "action": "Click",
-      "target": [
-          360,
-          340,
-          0,
-          0
-      ],
-      "post_delay": 3000,
-      "next": [
-          "agree",
-          "Marksmanship",
-          "Blazing_Knife",
-          "Spells",
-          "landscape",
-          "Research",
-          "museum",
-          "advance_four"
-      ]
-  }
-}
+    "landscape": {
+        "recognition": "TemplateMatch",
+        "template": "Research/r1.png",
+        "roi": [
+            494,
+            386,
+            90,
+            84
+        ],
+        "action": "Click",
+        "target_offset": [
+            60,
+            150,
+            0,
+            0
+        ],
+        "post_wait_freezes": 3000,
+        "next": [
+            "Marksmanship",
+            "Blazing_Knife",
+            "Spells",
+            "landscape",
+            "mountain_Research",
+            "museum",
+            "landscape-buff-one"
+        ]
+    },
+    "landscape-buff-one": {
+        "action": "Click",
+        "target": [
+            360,
+            340,
+            0,
+            0
+        ],
+        "post_delay": 3000,
+        "next": [
+            "agree",
+            "Marksmanship",
+            "Blazing_Knife",
+            "Spells",
+            "landscape",
+            "mountain_Research",
+            "museum",
+            "advance_four"
+        ]
+    }
+}
diff --git a/assets/resource_picli/base/pipeline/11_(04)_journey.json b/assets/resource_picli/base/pipeline/11_(04)_journey.json
@@ -2,33 +2,48 @@
   "journey": {
     "recognition": "TemplateMatch",
     "template": "Research/r2.png",
-    "roi": [878, 385, 92, 90],
+    "roi": [
+      878,
+      385,
+      92,
+      90
+    ],
     "action": "Click",
-    "target_offset": [60, 150, 0, 0],
+    "target_offset": [
+      60,
+      150,
+      0,
+      0
+    ],
     "post_wait_freezes": 3000,
     "next": [
       "Marksmanship",
       "Blazing_Knife",
       "Spells",
       "journey",
-      "Research",
+      "mountain_Research",
       "museum",
       "journey-buff-one"
     ]
   },
   "journey-buff-one": {
     "action": "Click",
-    "target": [360, 340, 0, 0],
+    "target": [
+      360,
+      340,
+      0,
+      0
+    ],
     "post_delay": 3000,
     "next": [
       "agree",
       "Marksmanship",
       "Blazing_Knife",
       "Spells",
       "journey",
-      "Research",
+      "mountain_Research",
       "museum",
       "advance_four"
     ]
   }
-}
+}