feat(cafe): add invitation condition check

README.en.md

@@ -22,7 +22,12 @@ The script is still under active development. The following features have been i
 Supported servers:
 
 - [x] JP
-- [x] OVERSEA - Global
+- [x] OVERSEA
+
+Supported in-game languages:
+
+- [x] Japanese
+- [x] English
 
 ## Relative projects
 

README.md

@@ -22,12 +22,18 @@
 目前支持的服务器：
 
 - [x] 日服
-- [x] 国际服 - 全球
+- [x] 国际服
+
+目前支持的游戏内语言：
+
+- [x] 日语
+- [x] 英语
 
 ## 已知问题
 
-若愿意提供其他服务器支持，请开 PR 或 Issue。
+若愿意提供其他语言或国服支持，请开 PR 或 Issue。
 
+- **国际服登录的全屏通知**：未实现自动关闭，正在研究中
 - **大小月卡**：未实现自动领取，~~因为没买过~~，可能不影响使用。愿意提供图片的请开 Issue
 - **月卡的额外悬赏券和学院交流券**：不太清楚月卡领取额外券的机制，~~因为没买过~~，可能影响相关任务使用券和体力的计算。愿意提供相关信息的请开
   Issue

config/deploy.template-cn.yaml

@@ -128,8 +128,8 @@ Deploy:
     WebuiHost: 0.0.0.0
     # --port. Port to listen
     # You will be able to access webui via `http://{host}:{port}`
-    # [In most cases] Default to 22367
+    # [In most cases] Default to 23467
-    WebuiPort: 22367
+    WebuiPort: 23467
     # Language to use on web ui
     # 'zh-CN' for Chinese simplified
     # 'en-US' for English

config/deploy.template.yaml

@@ -128,8 +128,8 @@ Deploy:
     WebuiHost: 0.0.0.0
     # --port. Port to listen
     # You will be able to access webui via `http://{host}:{port}`
-    # [In most cases] Default to 22367
+    # [In most cases] Default to 23467
-    WebuiPort: 22367
+    WebuiPort: 23467
     # Language to use on web ui
     # 'zh-CN' for Chinese simplified
     # 'en-US' for English

config/template.json

@@ -45,14 +45,13 @@
       "Touch": true,
       "AutoAdjust": true,
       "SecondCafe": true
-    }
     },
-  "Mail": {
+    "Invitation": {
-    "Scheduler": {
       "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
+      "WaitingHour": 0,
-      "Command": "Mail",
+      "Choice": "list_top",
-      "ServerUpdate": "04:00"
+      "Name": null,
+      "Substitute": false
     }
   },
   "Circle": {
@@ -63,6 +62,14 @@
       "ServerUpdate": "04:00"
     }
   },
+  "Mail": {
+    "Scheduler": {
+      "Enable": true,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Mail",
+      "ServerUpdate": "04:00"
+    }
+  },
   "Bounty": {
     "Scheduler": {
       "Enable": true,

deploy/Windows/config.py

@@ -55,7 +55,7 @@ class ConfigModel:
 
     # Webui
     WebuiHost: str = "0.0.0.0"
-    WebuiPort: int = 22367
+    WebuiPort: int = 23467
     Language: str = "en-US"
     Theme: str = "default"
     DpiScaling: bool = True
@@ -77,6 +77,12 @@ class DeployConfig(ConfigModel):
         self.config_template = {}
         self.read()
 
+        self.set_repo()
+
+        self.write()
+        self.show_config()
+
+    def set_repo(self):
         # Bypass webui.config.DeployConfig.__setattr__()
         # Don't write these into deploy.yaml
         if self.Repository == 'cn':
@@ -84,9 +90,6 @@ class DeployConfig(ConfigModel):
         if self.Repository == 'global':
             super().__setattr__('Repository', 'https://github.com/TheFunny/ArisuAutoSweeper')
 
-        self.write()
-        self.show_config()
-
     def show_config(self):
         logger.hr("Show deploy config", 1)
         for k, v in self.config.items():

deploy/Windows/template.yaml

@@ -128,8 +128,8 @@ Deploy:
     WebuiHost: 0.0.0.0
     # --port. Port to listen
     # You will be able to access webui via `http://{host}:{port}`
-    # [In most cases] Default to 22367
+    # [In most cases] Default to 23467
-    WebuiPort: 22367
+    WebuiPort: 23467
     # Language to use on web ui
     # 'zh-CN' for Chinese simplified
     # 'en-US' for English

gui.py

@@ -49,7 +49,7 @@ def func(ev: threading.Event):
     args, _ = parser.parse_known_args()
 
     host = args.host or State.deploy_config.WebuiHost or "0.0.0.0"
-    port = args.port or int(State.deploy_config.WebuiPort) or 22367
+    port = args.port or int(State.deploy_config.WebuiPort) or 23467
     State.electron = args.electron
 
     logger.hr("Launcher config")

module/config/argument/args.json

@@ -12,6 +12,10 @@
         "option": [
           "auto",
           "JP-Official",
+          "OVERSEA-TWHKMO",
+          "OVERSEA-Korea",
+          "OVERSEA-Asia",
+          "OVERSEA-America",
           "OVERSEA-Global"
         ]
       },
@@ -201,32 +205,37 @@
         "type": "checkbox",
         "value": true
       }
-    }
     },
-  "Mail": {
+    "Invitation": {
-    "Scheduler": {
       "Enable": {
         "type": "checkbox",
-        "value": true,
+        "value": true
+      },
+      "WaitingHour": {
+        "type": "select",
+        "value": 0,
         "option": [
-          true,
+          0,
-          false
+          3,
+          6,
+          9
         ]
       },
-      "NextRun": {
+      "Choice": {
-        "type": "datetime",
+        "type": "select",
-        "value": "2020-01-01 00:00:00",
+        "value": "list_top",
-        "validate": "datetime"
+        "option": [
+          "list_top",
+          "by_name"
+        ]
       },
-      "Command": {
+      "Name": {
-        "type": "input",
+        "type": "textarea",
-        "value": "Mail",
+        "value": null
-        "display": "hide"
       },
-      "ServerUpdate": {
+      "Substitute": {
-        "type": "input",
+        "type": "checkbox",
-        "value": "04:00",
+        "value": false
-        "display": "hide"
       }
     }
   },
@@ -257,6 +266,33 @@
       }
     }
   },
+  "Mail": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": true,
+        "option": [
+          true,
+          false
+        ]
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "Mail",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    }
+  },
   "Bounty": {
     "Scheduler": {
       "Enable": {

module/config/argument/argument.yaml

@@ -80,6 +80,18 @@ Cafe:
   Touch: true
   AutoAdjust: true
   SecondCafe: true
+Invitation:
+  Enable: true
+  WaitingHour:
+    value: 0
+    option: [ 0, 3, 6, 9 ]
+  Choice:
+    value: list_top
+    option: [ list_top, by_name ]
+  Name:
+    value: null
+    type: textarea
+  Substitute: false
 
 Bounty:
   OnError:

module/config/argument/menu.json

@@ -12,8 +12,8 @@
     "page": "setting",
     "tasks": [
       "Cafe",
-      "Mail",
       "Circle",
+      "Mail",
       "Bounty",
       "Scrimmage",
       "TacticalChallenge",

module/config/argument/task.yaml

@@ -25,10 +25,11 @@ Daily:
     Cafe:
       - Scheduler
       - Cafe
-    Mail:
+      - Invitation
-      - Scheduler
     Circle:
       - Scheduler
+    Mail:
+      - Scheduler
     Bounty:
       - Scheduler
       - Bounty