喝水支持剩余一天、一天以内的水也给喝了

MAWHA · Sep 15, 2024 · 027cf4f · 027cf4f
1 parent 8667747
commit 027cf4f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -60,7 +60,7 @@
             "entry": "Barter_random"
         },
         {
-            "name": "在主界面喝完（/上限）2天过期的水（需要喝水请选择，无需则无视，注意！目前仅支持还剩两天就过期的水）",
+            "name": "在主界面喝完（/上限）支持剩余1天，一天以内的水一并喝了）",
             "entry": "drink_a_2day_water"
         },
         {
@@ -565,29 +565,29 @@
                 }
             ]
         },
-        "和合版本":{
-            "cases":[
+        "和合版本": {
+            "cases": [
                 {
-                    "name":"和合·椅",
-                    "param":{
-                        "combine-choose":{
-                            "next":"combine-chair"
+                    "name": "和合·椅",
+                    "param": {
+                        "combine-choose": {
+                            "next": "combine-chair"
                         }
                     }
                 },
                 {
-                    "name":"和合·朝代",
-                    "param":{
-                        "combine-choose":{
-                            "next":"combine-dynasty"
+                    "name": "和合·朝代",
+                    "param": {
+                        "combine-choose": {
+                            "next": "combine-dynasty"
                         }
                     }
                 },
                 {
-                    "name":"和合·船",
-                    "param":{
-                        "combine-choose":{
-                            "next":"combine-ship"
+                    "name": "和合·船",
+                    "param": {
+                        "combine-choose": {
+                            "next": "combine-ship"
                         }
                     }
                 }

diff --git a/assets/resource_picli/base/image/Research/121.png b/assets/resource_picli/base/image/Research/121.png
diff --git a/assets/resource_picli/base/image/Research/122.png b/assets/resource_picli/base/image/Research/122.png
diff --git a/assets/resource_picli/base/pipeline/6_(02)water.json b/assets/resource_picli/base/pipeline/6_(02)water.json
@@ -44,7 +44,11 @@
     },
     "sub_2daywater": {
         "recognition": "OCR",
-        "expected": "2天",
+        "expected": [
+            "2天",
+            "1天",
+            "时"
+        ],
         "threshold": 0.85,
         "roi": [
             390,