fix: update assets file

With the addition of the Grand Assault, the Joint Firing Drill button was moved to the top half of where the Tactical Challenge button previously was, and the new Tactical Challenge button is only the lower half.

README.en.md

@@ -12,7 +12,7 @@
 
 The script is still under active development. The following features have been implemented:
 
-- [x] **Cafe** Claim rewards / Interact / Second floor
+- [x] **Cafe** Claim rewards / Interact / Invitation / Second floor
 - [x] **Club** Claim AP
 - [x] **Mailbox** Claim rewards
 - [x] **Bounty** Auto sweep
@@ -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

@@ -12,7 +12,7 @@
 
 当前脚本还在活跃开发中，已经实现的功能有：
 
-- [x] **咖啡厅** 领取奖励 / 互动 / 第二咖啡厅
+- [x] **咖啡厅** 领取奖励 / 互动 / 邀请 / 第二咖啡厅
 - [x] **公会** 领取体力
 - [x] **邮箱** 领取奖励
 - [x] **悬赏通缉** 自动扫荡
@@ -22,12 +22,18 @@
 目前支持的服务器：
 
 - [x] 日服
-- [x] 国际服 - 全球
+- [x] 国际服
+
+目前支持的游戏内语言：
+
+- [x] 日语
+- [x] 英语
 
 ## 已知问题
 
-若愿意提供其他服务器支持，请开 PR 或 Issue。
+若愿意提供其他语言或国服支持，请开 PR 或 Issue。
 
+- **国际服登录的全屏通知**：未实现自动关闭，正在研究中
 - **大小月卡**：未实现自动领取，~~因为没买过~~，可能不影响使用。愿意提供图片的请开 Issue
 - **月卡的额外悬赏券和学院交流券**：不太清楚月卡领取额外券的机制，~~因为没买过~~，可能影响相关任务使用券和体力的计算。愿意提供相关信息的请开
   Issue

config/template.json

@@ -45,14 +45,13 @@
       "Touch": true,
       "AutoAdjust": true,
       "SecondCafe": true
-    }
-  },
-  "Mail": {
-    "Scheduler": {
+    },
+    "Invitation": {
       "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Mail",
-      "ServerUpdate": "04:00"
+      "WaitingHour": 0,
+      "Choice": "list_top",
+      "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,
@@ -74,15 +81,15 @@
       "OnError": "skip"
     },
     "Highway": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "DesertRailroad": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Schoolhouse": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     }
   },
@@ -97,15 +104,15 @@
       "OnError": "skip"
     },
     "Trinity": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Gehenna": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Millennium": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     }
   },

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": {
-    "Scheduler": {
+    },
+    "Invitation": {
       "Enable": {
         "type": "checkbox",
-        "value": true,
+        "value": true
+      },
+      "WaitingHour": {
+        "type": "select",
+        "value": 0,
         "option": [
-          true,
-          false
+          0,
+          3,
+          6,
+          9
         ]
       },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
+      "Choice": {
+        "type": "select",
+        "value": "list_top",
+        "option": [
+          "list_top",
+          "by_name"
+        ]
       },
-      "Command": {
-        "type": "input",
-        "value": "Mail",
-        "display": "hide"
+      "Name": {
+        "type": "textarea",
+        "value": null
       },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "04:00",
-        "display": "hide"
+      "Substitute": {
+        "type": "checkbox",
+        "value": false
       }
     }
   },
@@ -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": {
@@ -296,8 +332,9 @@
     "Highway": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -306,7 +343,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -317,8 +355,9 @@
     "DesertRailroad": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -327,7 +366,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -338,8 +378,9 @@
     "Schoolhouse": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -348,7 +389,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -396,8 +438,9 @@
     "Trinity": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -412,8 +455,9 @@
     "Gehenna": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -428,8 +472,9 @@
     "Millennium": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,

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:
@@ -88,18 +100,18 @@ Bounty:
 
 Highway:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 DesertRailroad:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 Schoolhouse:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 
 Scrimmage:
@@ -109,18 +121,18 @@ Scrimmage:
 
 Trinity:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 Gehenna:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 Millennium:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 
 TacticalChallenge:

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:
-      - Scheduler
+      - Invitation
     Circle:
       - Scheduler
+    Mail:
+      - Scheduler
     Bounty:
       - Scheduler
       - Bounty

module/config/config_generated.py

@@ -17,7 +17,7 @@ class GeneratedConfig:
 
     # Group `Emulator`
     Emulator_Serial = 'auto'
-    Emulator_PackageName = 'auto'  # auto, JP-Official, OVERSEA-Global
+    Emulator_PackageName = 'auto'  # auto, JP-Official, OVERSEA-TWHKMO, OVERSEA-Korea, OVERSEA-Asia, OVERSEA-America, OVERSEA-Global
     Emulator_GameLanguage = 'auto'  # auto, jp, en
     Emulator_ScreenshotMethod = 'auto'  # auto, ADB, ADB_nc, uiautomator2, aScreenCap, aScreenCap_nc, DroidCast, DroidCast_raw, scrcpy
     Emulator_ControlMethod = 'MaaTouch'  # minitouch, MaaTouch
@@ -45,34 +45,41 @@ class GeneratedConfig:
     Cafe_AutoAdjust = True
     Cafe_SecondCafe = True
 
+    # Group `Invitation`
+    Invitation_Enable = True
+    Invitation_WaitingHour = 0  # 0, 3, 6, 9
+    Invitation_Choice = 'list_top'  # list_top, by_name
+    Invitation_Name = None
+    Invitation_Substitute = False
+
     # Group `Bounty`
     Bounty_OnError = 'skip'  # stop, skip
 
     # Group `Highway`
-    Highway_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Highway_Count = 2
 
     # Group `DesertRailroad`
-    DesertRailroad_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     DesertRailroad_Count = 2
 
     # Group `Schoolhouse`
-    Schoolhouse_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Schoolhouse_Count = 2
 
     # Group `Scrimmage`
     Scrimmage_OnError = 'skip'  # stop, skip
 
     # Group `Trinity`
-    Trinity_Stage = 1  # 1, 2, 3, 4
+    Trinity_Stage = 0  # 0, 1, 2, 3, 4
     Trinity_Count = 2
 
     # Group `Gehenna`
-    Gehenna_Stage = 1  # 1, 2, 3, 4
+    Gehenna_Stage = 0  # 0, 1, 2, 3, 4
     Gehenna_Count = 2
 
     # Group `Millennium`
-    Millennium_Stage = 1  # 1, 2, 3, 4
+    Millennium_Stage = 0  # 0, 1, 2, 3, 4
     Millennium_Count = 2
 
     # Group `TacticalChallenge`