Merge branch 'dev' into master

added tree view Farm and Reward.

aas.py

@@ -46,11 +46,22 @@ class ArisuAutoSweeper(AzurLaneAutoScript):
         from tasks.tactical_challenge.tactical_challenge import TacticalChallenge
         TacticalChallenge(config=self.config, device=self.device).run()
 
+    def task(self):
+        from tasks.task.task import Task
+        Task(config=self.config, device=self.device).run()
+
+    def shop(self):
+        from tasks.shop.shop import Shop
+        Shop(config=self.config, device=self.device).run()
+
+    def momotalk(self):
+        from tasks.momotalk.momotalk import MomoTalk
+        MomoTalk(config=self.config, device=self.device).run()
+
     def data_update(self):
         from tasks.item.data_update import DataUpdate
         DataUpdate(config=self.config, device=self.device).run()
 
-
 if __name__ == '__main__':
     aas = ArisuAutoSweeper('aas')
     aas.loop()

config/template.json

@@ -33,6 +33,22 @@
       "ServerUpdate": "04:00"
     }
   },
+  "DataUpdate": {
+    "Scheduler": {
+      "Enable": true,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "DataUpdate",
+      "ServerUpdate": "04:00"
+    },
+    "ItemStorage": {
+      "AP": {},
+      "Credit": {},
+      "Pyroxene": {},
+      "BountyTicket": {},
+      "ScrimmageTicket": {},
+      "TacticalChallengeTicket": {}
+    }
+  },
   "Cafe": {
     "Scheduler": {
       "Enable": true,
@@ -54,20 +70,55 @@
       "Substitute": false
     }
   },
-  "Circle": {
+  "Shop": {
     "Scheduler": {
-      "Enable": true,
+      "Enable": false,
       "NextRun": "2020-01-01 00:00:00",
-      "Command": "Circle",
-      "ServerUpdate": "04:00"
-    }
-  },
-  "Mail": {
-    "Scheduler": {
-      "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Mail",
+      "Command": "Shop",
       "ServerUpdate": "04:00"
+    },
+    "NormalShop": {
+      "Enable": false,
+      "Purchases": 1,
+      "1": false,
+      "2": false,
+      "3": false,
+      "4": false,
+      "5": false,
+      "6": false,
+      "7": false,
+      "8": false,
+      "9": false,
+      "10": false,
+      "11": false,
+      "12": false,
+      "13": false,
+      "14": false,
+      "15": false,
+      "16": false,
+      "17": false,
+      "18": false,
+      "19": false,
+      "20": false
+    },
+    "TacticalChallengeShop": {
+      "Enable": false,
+      "Purchases": 1,
+      "1": false,
+      "2": false,
+      "3": false,
+      "4": false,
+      "5": false,
+      "6": false,
+      "7": false,
+      "8": false,
+      "9": false,
+      "10": false,
+      "11": false,
+      "12": false,
+      "13": false,
+      "14": false,
+      "15": false
     }
   },
   "Bounty": {
@@ -127,20 +178,36 @@
       "PlayerSelect": 0
     }
   },
-  "DataUpdate": {
+  "Circle": {
     "Scheduler": {
       "Enable": true,
       "NextRun": "2020-01-01 00:00:00",
-      "Command": "DataUpdate",
+      "Command": "Circle",
+      "ServerUpdate": "04:00"
+    }
+  },
+  "Task": {
+    "Scheduler": {
+      "Enable": false,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Task",
+      "ServerUpdate": "04:00"
+    }
+  },
+  "Mail": {
+    "Scheduler": {
+      "Enable": true,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Mail",
+      "ServerUpdate": "04:00"
+    }
+  },
+  "Momotalk": {
+    "Scheduler": {
+      "Enable": false,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Momotalk",
       "ServerUpdate": "04:00"
-    },
-    "ItemStorage": {
-      "AP": {},
-      "Credit": {},
-      "Pyroxene": {},
-      "BountyTicket": {},
-      "ScrimmageTicket": {},
-      "TacticalChallengeTicket": {}
     }
   }
 }

module/config/argument/args.json

@@ -162,6 +162,85 @@
       }
     }
   },
+  "DataUpdate": {
+    "Scheduler": {
+      "Enable": {
+        "type": "state",
+        "value": true,
+        "option": [
+          true
+        ],
+        "option_bold": [
+          true
+        ]
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "DataUpdate",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    },
+    "ItemStorage": {
+      "AP": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredAP",
+        "order": 1,
+        "color": "#62ea6e"
+      },
+      "Credit": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredInt",
+        "order": 2,
+        "color": "#fdec00"
+      },
+      "Pyroxene": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredInt",
+        "order": 3,
+        "color": "#21befc"
+      },
+      "BountyTicket": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredBountyTicket",
+        "order": 4,
+        "color": "#94cb44"
+      },
+      "ScrimmageTicket": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredScrimmageTicket",
+        "order": 5,
+        "color": "#f86c6a"
+      },
+      "TacticalChallengeTicket": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredTacticalChallengeTicket",
+        "order": 6,
+        "color": "#7ac8e5"
+      }
+    }
+  },
   "Cafe": {
     "Scheduler": {
       "Enable": {
@@ -239,11 +318,11 @@
       }
     }
   },
-  "Circle": {
+  "Shop": {
     "Scheduler": {
       "Enable": {
         "type": "checkbox",
-        "value": true,
+        "value": false,
         "option": [
           true,
           false
@@ -256,7 +335,7 @@
       },
       "Command": {
         "type": "input",
-        "value": "Circle",
+        "value": "Shop",
         "display": "hide"
       },
       "ServerUpdate": {
@@ -264,32 +343,177 @@
         "value": "04:00",
         "display": "hide"
       }
-    }
-  },
-  "Mail": {
-    "Scheduler": {
+    },
+    "NormalShop": {
       "Enable": {
         "type": "checkbox",
-        "value": true,
+        "value": false
+      },
+      "Purchases": {
+        "type": "select",
+        "value": 1,
         "option": [
-          true,
-          false
+          1,
+          2,
+          3,
+          4
         ]
       },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
+      "1": {
+        "type": "checkbox",
+        "value": false
       },
-      "Command": {
-        "type": "input",
-        "value": "Mail",
-        "display": "hide"
+      "2": {
+        "type": "checkbox",
+        "value": false
       },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "04:00",
-        "display": "hide"
+      "3": {
+        "type": "checkbox",
+        "value": false
+      },
+      "4": {
+        "type": "checkbox",
+        "value": false
+      },
+      "5": {
+        "type": "checkbox",
+        "value": false
+      },
+      "6": {
+        "type": "checkbox",
+        "value": false
+      },
+      "7": {
+        "type": "checkbox",
+        "value": false
+      },
+      "8": {
+        "type": "checkbox",
+        "value": false
+      },
+      "9": {
+        "type": "checkbox",
+        "value": false
+      },
+      "10": {
+        "type": "checkbox",
+        "value": false
+      },
+      "11": {
+        "type": "checkbox",
+        "value": false
+      },
+      "12": {
+        "type": "checkbox",
+        "value": false
+      },
+      "13": {
+        "type": "checkbox",
+        "value": false
+      },
+      "14": {
+        "type": "checkbox",
+        "value": false
+      },
+      "15": {
+        "type": "checkbox",
+        "value": false
+      },
+      "16": {
+        "type": "checkbox",
+        "value": false
+      },
+      "17": {
+        "type": "checkbox",
+        "value": false
+      },
+      "18": {
+        "type": "checkbox",
+        "value": false
+      },
+      "19": {
+        "type": "checkbox",
+        "value": false
+      },
+      "20": {
+        "type": "checkbox",
+        "value": false
+      }
+    },
+    "TacticalChallengeShop": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false
+      },
+      "Purchases": {
+        "type": "select",
+        "value": 1,
+        "option": [
+          1,
+          2,
+          3,
+          4
+        ]
+      },
+      "1": {
+        "type": "checkbox",
+        "value": false
+      },
+      "2": {
+        "type": "checkbox",
+        "value": false
+      },
+      "3": {
+        "type": "checkbox",
+        "value": false
+      },
+      "4": {
+        "type": "checkbox",
+        "value": false
+      },
+      "5": {
+        "type": "checkbox",
+        "value": false
+      },
+      "6": {
+        "type": "checkbox",
+        "value": false
+      },
+      "7": {
+        "type": "checkbox",
+        "value": false
+      },
+      "8": {
+        "type": "checkbox",
+        "value": false
+      },
+      "9": {
+        "type": "checkbox",
+        "value": false
+      },
+      "10": {
+        "type": "checkbox",
+        "value": false
+      },
+      "11": {
+        "type": "checkbox",
+        "value": false
+      },
+      "12": {
+        "type": "checkbox",
+        "value": false
+      },
+      "13": {
+        "type": "checkbox",
+        "value": false
+      },
+      "14": {
+        "type": "checkbox",
+        "value": false
+      },
+      "15": {
+        "type": "checkbox",
+        "value": false
       }
     }
   },
@@ -343,8 +567,7 @@
           6,
           7,
           8,
-          9,
-          10
+          9
         ]
       },
       "Count": {
@@ -366,8 +589,7 @@
           6,
           7,
           8,
-          9,
-          10
+          9
         ]
       },
       "Count": {
@@ -389,8 +611,7 @@
           6,
           7,
           8,
-          9,
-          10
+          9
         ]
       },
       "Count": {
@@ -526,16 +747,14 @@
       }
     }
   },
-  "DataUpdate": {
+  "Circle": {
     "Scheduler": {
       "Enable": {
-        "type": "state",
+        "type": "checkbox",
         "value": true,
         "option": [
-          true
-        ],
-        "option_bold": [
-          true
+          true,
+          false
         ]
       },
       "NextRun": {
@@ -545,7 +764,7 @@
       },
       "Command": {
         "type": "input",
-        "value": "DataUpdate",
+        "value": "Circle",
         "display": "hide"
       },
       "ServerUpdate": {
@@ -553,55 +772,86 @@
         "value": "04:00",
         "display": "hide"
       }
-    },
-    "ItemStorage": {
-      "AP": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredAP",
-        "order": 1,
-        "color": "#62ea6e"
+    }
+  },
+  "Task": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false,
+        "option": [
+          true,
+          false
+        ]
       },
-      "Credit": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 2,
-        "color": "#fdec00"
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
       },
-      "Pyroxene": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 3,
-        "color": "#21befc"
+      "Command": {
+        "type": "input",
+        "value": "Task",
+        "display": "hide"
       },
-      "BountyTicket": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredBountyTicket",
-        "order": 4,
-        "color": "#94cb44"
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    }
+  },
+  "Mail": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": true,
+        "option": [
+          true,
+          false
+        ]
       },
-      "ScrimmageTicket": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredScrimmageTicket",
-        "order": 5,
-        "color": "#f86c6a"
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
       },
-      "TacticalChallengeTicket": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredTacticalChallengeTicket",
-        "order": 6,
-        "color": "#7ac8e5"
+      "Command": {
+        "type": "input",
+        "value": "Mail",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    }
+  },
+  "Momotalk": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false,
+        "option": [
+          true,
+          false
+        ]
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "Momotalk",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
       }
     }
   }

module/config/argument/argument.yaml

@@ -101,17 +101,17 @@ Bounty:
 Highway:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
   Count: 2
 DesertRailroad:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
   Count: 2
 Schoolhouse:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
   Count: 2
 
 Scrimmage:
@@ -140,6 +140,53 @@ TacticalChallenge:
     value: 0
     option: [ 0, 1, 2, 3 ]
 
+NormalShop:
+  Enable: false
+  Purchases:
+    value: 1
+    option: [ 1, 2, 3, 4 ]
+  "1": false
+  "2": false
+  "3": false
+  "4": false
+  "5": false
+  "6": false
+  "7": false
+  "8": false
+  "9": false
+  "10": false
+  "11": false
+  "12": false
+  "13": false
+  "14": false
+  "15": false
+  "16": false
+  "17": false
+  "18": false
+  "19": false
+  "20": false
+
+TacticalChallengeShop:
+  Enable: false
+  Purchases:
+    value: 1
+    option: [ 1, 2, 3, 4 ]
+  "1": false
+  "2": false
+  "3": false
+  "4": false
+  "5": false
+  "6": false
+  "7": false
+  "8": false
+  "9": false
+  "10": false
+  "11": false
+  "12": false
+  "13": false
+  "14": false
+  "15": false
+
 ItemStorage:
   AP:
     stored: StoredAP

module/config/argument/menu.json

@@ -4,20 +4,35 @@
     "page": "setting",
     "tasks": [
       "Alas",
-      "Restart"
+      "Restart",
+      "DataUpdate"
     ]
   },
   "Daily": {
-    "menu": "list",
+    "menu": "collapse",
     "page": "setting",
     "tasks": [
       "Cafe",
-      "Circle",
-      "Mail",
+      "Shop"
+    ]
+  },
+  "Farm": {
+    "menu": "collapse",
+    "page": "setting",
+    "tasks": [
       "Bounty",
       "Scrimmage",
-      "TacticalChallenge",
-      "DataUpdate"
+      "TacticalChallenge"
+    ]
+  },
+  "Reward": {
+    "menu": "collapse",
+    "page": "setting",
+    "tasks": [
+      "Circle",
+      "Task",
+      "Mail",
+      "Momotalk"
     ]
   }
 }

module/config/argument/task.yaml

@@ -15,21 +15,31 @@ Alas:
       - Optimization
     Restart:
       - Scheduler
+    DataUpdate:
+      - Scheduler
+      - ItemStorage
 
 # ==================== Daily ====================
 
 Daily:
-  menu: 'list'
+  menu: 'collapse'
   page: 'setting'
   tasks:
     Cafe:
       - Scheduler
       - Cafe
       - Invitation
-    Circle:
-      - Scheduler
-    Mail:
+    Shop:
       - Scheduler
+      - NormalShop
+      - TacticalChallengeShop
+      
+# ==================== Farm ====================
+
+Farm:
+  menu: 'collapse'
+  page: 'setting'
+  tasks:
     Bounty:
       - Scheduler
       - Bounty
@@ -45,6 +55,18 @@ Daily:
     TacticalChallenge:
       - Scheduler
       - TacticalChallenge
-    DataUpdate:
+
+# ==================== Rewards ====================
+
+Reward:
+  menu: 'collapse'
+  page: 'setting'
+  tasks:
+    Circle:
       - Scheduler
-      - ItemStorage
+    Task:
+      - Scheduler
+    Mail:
+      - Scheduler
+    Momotalk:
+      - Scheduler

module/config/config_generated.py

@@ -56,15 +56,15 @@ class GeneratedConfig:
     Bounty_OnError = 'skip'  # stop, skip
 
     # Group `Highway`
-    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
     Highway_Count = 2
 
     # Group `DesertRailroad`
-    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
     DesertRailroad_Count = 2
 
     # Group `Schoolhouse`
-    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
     Schoolhouse_Count = 2
 
     # Group `Scrimmage`
@@ -85,6 +85,49 @@ class GeneratedConfig:
     # Group `TacticalChallenge`
     TacticalChallenge_PlayerSelect = 0  # 0, 1, 2, 3
 
+    # Group `NormalShop`
+    NormalShop_Enable = False
+    NormalShop_Purchases = 1  # 1, 2, 3, 4
+    NormalShop_1 = False
+    NormalShop_2 = False
+    NormalShop_3 = False
+    NormalShop_4 = False
+    NormalShop_5 = False
+    NormalShop_6 = False
+    NormalShop_7 = False
+    NormalShop_8 = False
+    NormalShop_9 = False
+    NormalShop_10 = False
+    NormalShop_11 = False
+    NormalShop_12 = False
+    NormalShop_13 = False
+    NormalShop_14 = False
+    NormalShop_15 = False
+    NormalShop_16 = False
+    NormalShop_17 = False
+    NormalShop_18 = False
+    NormalShop_19 = False
+    NormalShop_20 = False
+
+    # Group `TacticalChallengeShop`
+    TacticalChallengeShop_Enable = False
+    TacticalChallengeShop_Purchases = 1  # 1, 2, 3, 4
+    TacticalChallengeShop_1 = False
+    TacticalChallengeShop_2 = False
+    TacticalChallengeShop_3 = False
+    TacticalChallengeShop_4 = False
+    TacticalChallengeShop_5 = False
+    TacticalChallengeShop_6 = False
+    TacticalChallengeShop_7 = False
+    TacticalChallengeShop_8 = False
+    TacticalChallengeShop_9 = False
+    TacticalChallengeShop_10 = False
+    TacticalChallengeShop_11 = False
+    TacticalChallengeShop_12 = False
+    TacticalChallengeShop_13 = False
+    TacticalChallengeShop_14 = False
+    TacticalChallengeShop_15 = False
+
     # Group `ItemStorage`
     ItemStorage_AP = {}
     ItemStorage_Credit = {}

module/config/config_manual.py

@@ -8,8 +8,8 @@ class ManualConfig:
 
     SCHEDULER_PRIORITY = """
     Restart
-    > Cafe > Circle > Mail > DataUpdate > Bounty
-    > Scrimmage > TacticalChallenge
+    > Cafe > TacticalChallenge > Circle > Mail
+    > DataUpdate > Bounty > Scrimmage > Task > Shop > Momotalk
     """
 
     """