Просмотр исходного кода

Merge pull request #18 from runhey/dev

fix(globalgame): add pictures
huangrunheng 3 лет назад
Родитель
Сommit
40bdc89fef

+ 5 - 1
module/config/config.py

@@ -41,7 +41,11 @@ class Function:
 
 
         self.enable: bool = data['scheduler']['enable']
         self.enable: bool = data['scheduler']['enable']
         self.command: str = ConfigModel.type(key)
         self.command: str = ConfigModel.type(key)
-        self.next_run: datetime = data['scheduler']['next_run']
+        next_run = data['scheduler']['next_run']
+        if isinstance(next_run, str):
+            next_run = datetime.strptime(next_run, "%Y-%m-%d %H:%M:%S")
+        self.next_run: datetime = next_run
+
         # self.enable = deep_get(data, keys="Scheduler.Enable", default=False)
         # self.enable = deep_get(data, keys="Scheduler.Enable", default=False)
         # self.command = deep_get(data, keys="Scheduler.Command", default="Unknown")
         # self.command = deep_get(data, keys="Scheduler.Command", default="Unknown")
         # self.next_run = deep_get(data, keys="Scheduler.NextRun", default=DEFAULT_TIME)
         # self.next_run = deep_get(data, keys="Scheduler.NextRun", default=DEFAULT_TIME)

BIN
tasks/GlobalGame/gg/gg_accept.png


BIN
tasks/GlobalGame/gg/gg_client_clear.png


BIN
tasks/GlobalGame/gg/gg_f_accept.png


BIN
tasks/GlobalGame/gg/gg_f_jade.png


BIN
tasks/GlobalGame/gg/gg_f_reject.png


BIN
tasks/GlobalGame/gg/gg_jade.png


BIN
tasks/GlobalGame/gg/gg_network_abnormal.png


BIN
tasks/GlobalGame/gg/gg_network_error.png


BIN
tasks/GlobalGame/gg/gg_reject.png


+ 56 - 0
tasks/GlobalGame/gg/image.json

@@ -0,0 +1,56 @@
+[
+  {
+    "itemName": "accept",
+    "imageName": "gg_accept.png",
+    "roiFront": "825,395,56,46",
+    "roiBack": "825,395,56,46",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "reject",
+    "imageName": "gg_reject.png",
+    "roiFront": "825,493,53,51",
+    "roiBack": "825,493,53,51",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "jade",
+    "imageName": "gg_jade.png",
+    "roiFront": "661,466,43,46",
+    "roiBack": "661,466,43,46",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "勾玉"
+  },
+  {
+    "itemName": "network_abnormal",
+    "imageName": "gg_network_abnormal.png",
+    "roiFront": "583,330,221,67",
+    "roiBack": "583,330,221,67",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "网络异常"
+  },
+  {
+    "itemName": "network_error",
+    "imageName": "gg_network_error.png",
+    "roiFront": "431,253,416,208",
+    "roiBack": "431,253,416,208",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已端口游戏服务器,需要重新连接,这种情况一般是断开很久了"
+  },
+  {
+    "itemName": "client_clear",
+    "imageName": "gg_client_clear.png",
+    "roiFront": "578,369,151,72",
+    "roiBack": "578,369,151,72",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "我还没有碰到这个情况没能截图"
+  }
+]