适配活动打关与外勤流程，每周研学节点修改

.gitignore

@@ -454,3 +454,7 @@ debug
 # MWA
 MWA
 .nicegui
+
+# ai
+.agents
+.codex

assets/interface.json

@@ -89,6 +89,22 @@
             "name": "邮箱",
             "entry": "Mail"
         },
+        {
+            "name": "外勤",
+            "entry": "waiqin"
+        },
+        {
+            "name": "行会",
+            "entry": "xinghui"
+        },        
+        {
+            "name": "活动打关",
+            "entry": "activity_fit"
+        },
+        {
+            "name": "每周研学",
+            "entry": "weekly_to_do"
+        },
         {
             "name": "博物研学",
             "entry": "museum_Research",
@@ -423,6 +439,17 @@
         },
         "社教模拟仪": {
             "cases": [
+                {
+                    "name": "不领取",
+                    "pipeline_override": {
+                        "entry_dispath_three": {
+                            "next": [
+                                "dispath_back",
+                                "dispath_convened"
+                            ]
+                        }
+                    }
+                },
                 {
                     "name": "初级社会指南",
                     "pipeline_override": {
@@ -454,22 +481,22 @@
                             "next": "dispatch_social_four"
                         }
                     }
-                },
+                }
+            ]
+        },
+        "制造物品": {
+            "cases": [
                 {
-                    "name": "不领取",
+                    "name": "不制造",
                     "pipeline_override": {
-                        "entry_dispath_three": {
+                        "entry_dispath_four": {
                             "next": [
-                                "dispath_back",
-                                "dispath_convened"
+                                "fabricate_back",
+                                "fabricate_convened"
                             ]
                         }
                     }
-                }
-            ]
-        },
-        "制造物品": {
-            "cases": [
+                },
                 {
                     "name": "蓝色装备",
                     "pipeline_override": {
@@ -549,38 +576,27 @@
                             "next": "fabricate_all_ten"
                         }
                     }
-                },
-                {
-                    "name": "不制造",
-                    "pipeline_override": {
-                        "entry_dispath_four": {
-                            "next": [
-                                "fabricate_back",
-                                "fabricate_convened"
-                            ]
-                        }
-                    }
                 }
             ]
         },
         "是否喝茶": {
             "cases": [
                 {
-                    "name": "喝茶",
+                    "name": "不喝茶",
                     "pipeline_override": {
                         "tea": {
-                            "next": "entry_dispath_five"
+                            "next": [
+                                "tea_back",
+                                "tea_convened"
+                            ]
                         }
                     }
                 },
                 {
-                    "name": "不喝茶",
+                    "name": "喝茶",
                     "pipeline_override": {
                         "tea": {
-                            "next": [
-                                "tea_back",
-                                "tea_convened"
-                            ]
+                            "next": "entry_dispath_five"
                         }
                     }
                 }
@@ -589,21 +605,21 @@
         "是否领取活力值": {
             "cases": [
                 {
-                    "name": "领取",
+                    "name": "不领取",
                     "pipeline_override": {
                         "vitality": {
-                            "next": "entry_dispath_six"
+                            "next": [
+                                "vitality_back",
+                                "vitality-convened"
+                            ]
                         }
                     }
                 },
                 {
-                    "name": "不领取",
+                    "name": "领取",
                     "pipeline_override": {
                         "vitality": {
-                            "next": [
-                                "vitality_back",
-                                "vitality-convened"
-                            ]
+                            "next": "entry_dispath_six"
                         }
                     }
                 }
@@ -712,7 +728,6 @@
                         "gold_research": {
                             "next": [
                                 "choose_boss",
-                                "sub_choose_boss",
                                 "action_1"
                             ]
                         }
@@ -751,34 +766,34 @@
         "征集几个": {
             "cases": [
                 {
-                    "name": "征集1个",
+                    "name": "征集4个",
                     "pipeline_override": {
                         "Collect-add-all": {
-                            "next": "Collect-add-one"
+                            "next": "Collect-add-four"
                         }
                     }
                 },
                 {
-                    "name": "征集2个",
+                    "name": "征集1个",
                     "pipeline_override": {
                         "Collect-add-all": {
-                            "next": "Collect-add-two"
+                            "next": "Collect-add-one"
                         }
                     }
                 },
                 {
-                    "name": "征集3个",
+                    "name": "征集2个",
                     "pipeline_override": {
                         "Collect-add-all": {
-                            "next": "Collect-add-three"
+                            "next": "Collect-add-two"
                         }
                     }
                 },
                 {
-                    "name": "征集4个",
+                    "name": "征集3个",
                     "pipeline_override": {
                         "Collect-add-all": {
-                            "next": "Collect-add-four"
+                            "next": "Collect-add-three"
                         }
                     }
                 }

assets/resource_picli/base/pipeline/10receivemail.json

@@ -1,25 +1,30 @@
 {
     "Mail": {
         "next": [
-            "EnterMail"
-        ],
-        "interrupt": [
-            "Exception-handling-remind",
-            "Exception-handling-nurturance-one"
+            "EnterMail",
+            "[JumpBack]Exception-handling-remind",
+            "[JumpBack]Exception-handling-nurturance-one"
         ]
     },
     "EnterMail": {
-        "recognition": "TemplateMatch",
-        "template": "Mainpage/mail.png",
-        "action": "Click",
-        "next": [
-            "ReceiveMail",
-            "Quit"
-        ],
-        "interrupt": [
-            "Exception-handling-remind",
-            "Exception-handling-nurturance-one"
-        ]
+      "recognition": {
+        "type": "TemplateMatch",
+        "param": {
+          "template": [
+            "Mainpage/mail.png",
+            "Mainpage/mail2.png"
+          ]
+        }
+      },
+      "action": {
+        "type": "Click"
+      },
+      "next": [
+        "ReceiveMail",
+        "Quit",
+        "[JumpBack]Exception-handling-remind",
+        "[JumpBack]Exception-handling-nurturance-one"
+      ]
     },
     "ReceiveMail": {
         "recognition": "OCR",
@@ -41,4 +46,4 @@
             "Mail-get"
         ]
     }
-}
+}

assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json

@@ -6,7 +6,7 @@
         ],
         "action": "Click",
         "post_delay": 2000,
-        "next": "choose-difficulty"
+        "next": ["choose-difficulty"]
     },
     "choose-difficulty": {
         "action": "Click",
@@ -39,7 +39,7 @@
             1
         ],
         "post_delay": 1000,
-        "next": "rlgr-choose-role-2"
+        "next": ["rlgr-choose-role-2"]
     },
     "rlgr-choose-role-2": {
         "action": "Click",
@@ -50,7 +50,7 @@
             1
         ],
         "post_delay": 1000,
-        "next": "rlgr-choose-role-3"
+        "next": ["rlgr-choose-role-3"]
     },
     "rlgr-choose-role-3": {
         "action": "Click",
@@ -61,7 +61,7 @@
             1
         ],
         "post_delay": 1000,
-        "next": "rlgr-choose-role-4"
+        "next": ["rlgr-choose-role-4"]
     },
     "rlgr-choose-role-4": {
         "action": "Click",
@@ -190,7 +190,7 @@
     "rlgr-not-full": {
         "pre_delay": 500,
         "recognition": "TemplateMatch",
-        "template": "Research2\\ensure_2.png",
+        "template": "Research2/ensure_2.png",
         "roi": [
             686,
             396,
@@ -206,7 +206,7 @@
     },
     "rlgr-auto": {
         "recognition": "TemplateMatch",
-        "template": "Research2\\auto.png",
+        "template": "Research2/auto.png",
         "roi": [
             1196,
             123,
@@ -222,7 +222,7 @@
     },
     "rlgr-fight-begin-2": {
         "recognition": "TemplateMatch",
-        "template": "Research2//begin_fight.png",
+        "template": "Research2/begin_fight.png",
         "action": "Click",
         "next": [
             "rlgr-sure-fightwait",
@@ -231,16 +231,14 @@
     },
     "rlgr-sure-fightwait": {
         "next": [
-            "rlgr-sure-fightwait-1"
-        ],
-        "interrupt": [
-            "rlgr-auto-fightwait"
+            "rlgr-sure-fightwait-1",
+            "[JumpBack]rlgr-auto-fightwait"
         ]
     },
     "rlgr-auto-fightwait": {
         "pre_delay": 10000,
         "recognition": "TemplateMatch",
-        "template": "research and lenrning gold and silver\\stop.png",
+        "template": "research and lenrning gold and silver/stop.png",
         "action": "DoNothing"
     },
     "rlgr-sure-fightwait-1": {
@@ -262,7 +260,7 @@
     },
     "rlgr-buff-recognition-afterfight": {
         "recognition": "TemplateMatch",
-        "template": "research and lenrning gold and silver\\new-buff.png",
+        "template": "research and lenrning gold and silver/new-buff.png",
         "pre_wait_freezes": 300,
         "next": [
             "rlgr-buff-afterfight-click-mid"
@@ -348,4 +346,4 @@
         "expected": "等级",
         "action": "DoNothing"
     }
-}
+}