refactor: gui

added tree view Farm and Reward.

config/template.json

@@ -54,20 +54,20 @@
       "Substitute": false
     }
   },
-  "Circle": {
+  "DataUpdate": {
     "Scheduler": {
       "Enable": true,
       "NextRun": "2020-01-01 00:00:00",
-      "Command": "Circle",
+      "Command": "DataUpdate",
-      "ServerUpdate": "04:00"
-    }
-  },
-  "Mail": {
-    "Scheduler": {
-      "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Mail",
       "ServerUpdate": "04:00"
+    },
+    "ItemStorage": {
+      "AP": {},
+      "Credit": {},
+      "Pyroxene": {},
+      "BountyTicket": {},
+      "ScrimmageTicket": {},
+      "TacticalChallengeTicket": {}
     }
   },
   "Bounty": {
@@ -127,6 +127,14 @@
       "PlayerSelect": 0
     }
   },
+  "Circle": {
+    "Scheduler": {
+      "Enable": true,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Circle",
+      "ServerUpdate": "04:00"
+    }
+  },
   "Task": {
     "Scheduler": {
       "Enable": false,
@@ -135,20 +143,12 @@
       "ServerUpdate": "04:00"
     }
   },
-  "DataUpdate": {
+  "Mail": {
     "Scheduler": {
       "Enable": true,
       "NextRun": "2020-01-01 00:00:00",
-      "Command": "DataUpdate",
+      "Command": "Mail",
       "ServerUpdate": "04:00"
-    },
-    "ItemStorage": {
-      "AP": {},
-      "Credit": {},
-      "Pyroxene": {},
-      "BountyTicket": {},
-      "ScrimmageTicket": {},
-      "TacticalChallengeTicket": {}
     }
   }
 }

module/config/argument/args.json

@@ -239,14 +239,16 @@
       }
     }
   },
-  "Circle": {
+  "DataUpdate": {
     "Scheduler": {
       "Enable": {
-        "type": "checkbox",
+        "type": "state",
         "value": true,
         "option": [
-          true,
+          true
-          false
+        ],
+        "option_bold": [
+          true
         ]
       },
       "NextRun": {
@@ -256,7 +258,7 @@
       },
       "Command": {
         "type": "input",
-        "value": "Circle",
+        "value": "DataUpdate",
         "display": "hide"
       },
       "ServerUpdate": {
@@ -264,32 +266,55 @@
         "value": "04:00",
         "display": "hide"
       }
-    }
+    },
-  },
+    "ItemStorage": {
-  "Mail": {
+      "AP": {
-    "Scheduler": {
+        "type": "stored",
-      "Enable": {
+        "value": {},
-        "type": "checkbox",
+        "display": "hide",
-        "value": true,
+        "stored": "StoredAP",
-        "option": [
+        "order": 1,
-          true,
+        "color": "#62ea6e"
-          false
-        ]
       },
-      "NextRun": {
+      "Credit": {
-        "type": "datetime",
+        "type": "stored",
-        "value": "2020-01-01 00:00:00",
+        "value": {},
-        "validate": "datetime"
+        "display": "hide",
+        "stored": "StoredInt",
+        "order": 2,
+        "color": "#fdec00"
       },
-      "Command": {
+      "Pyroxene": {
-        "type": "input",
+        "type": "stored",
-        "value": "Mail",
+        "value": {},
-        "display": "hide"
+        "display": "hide",
+        "stored": "StoredInt",
+        "order": 3,
+        "color": "#21befc"
       },
-      "ServerUpdate": {
+      "BountyTicket": {
-        "type": "input",
+        "type": "stored",
-        "value": "04:00",
+        "value": {},
-        "display": "hide"
+        "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"
       }
     }
   },
@@ -523,6 +548,33 @@
       }
     }
   },
+  "Circle": {
+    "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": "Circle",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    }
+  },
   "Task": {
     "Scheduler": {
       "Enable": {
@@ -550,16 +602,14 @@
       }
     }
   },
-  "DataUpdate": {
+  "Mail": {
     "Scheduler": {
       "Enable": {
-        "type": "state",
+        "type": "checkbox",
         "value": true,
         "option": [
-          true
+          true,
-        ],
+          false
-        "option_bold": [
-          true
         ]
       },
       "NextRun": {
@@ -569,7 +619,7 @@
       },
       "Command": {
         "type": "input",
-        "value": "DataUpdate",
+        "value": "Mail",
         "display": "hide"
       },
       "ServerUpdate": {
@@ -577,56 +627,6 @@
         "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"
-      }
     }
   }
 }

module/config/argument/menu.json

@@ -8,17 +8,29 @@
     ]
   },
   "Daily": {
-    "menu": "list",
+    "menu": "collapse",
     "page": "setting",
     "tasks": [
       "Cafe",
-      "Circle",
+      "DataUpdate"
-      "Mail",
+    ]
+  },
+  "Farm": {
+    "menu": "collapse",
+    "page": "setting",
+    "tasks": [
       "Bounty",
       "Scrimmage",
-      "TacticalChallenge",
+      "TacticalChallenge"
+    ]
+  },
+  "Reward": {
+    "menu": "collapse",
+    "page": "setting",
+    "tasks": [
+      "Circle",
       "Task",
-      "DataUpdate"
+      "Mail"
     ]
   }
 }

module/config/argument/task.yaml

@@ -19,17 +19,23 @@ Alas:
 # ==================== Daily ====================
 
 Daily:
-  menu: 'list'
+  menu: 'collapse'
   page: 'setting'
   tasks:
     Cafe:
       - Scheduler
       - Cafe
       - Invitation
-    Circle:
+    DataUpdate:
-      - Scheduler
-    Mail:
       - Scheduler
+      - ItemStorage
+
+# ==================== Farm ====================
+
+Farm:
+  menu: 'collapse'
+  page: 'setting'
+  tasks:
     Bounty:
       - Scheduler
       - Bounty
@@ -45,8 +51,16 @@ Daily:
     TacticalChallenge:
       - Scheduler
       - TacticalChallenge
+
+# ==================== Rewards ====================
+
+Reward:
+  menu: 'collapse'
+  page: 'setting'
+  tasks:
+    Circle:
+      - Scheduler
     Task:
       - Scheduler
-    DataUpdate:
+    Mail:
-      - Scheduler
+      - Scheduler
-      - ItemStorage

module/config/i18n/en-US.json

@@ -7,6 +7,14 @@
     "Daily": {
       "name": "Daily",
       "help": ""
+    },
+    "Farm": {
+      "name": "Farm",
+      "help": ""
+    },
+    "Reward": {
+      "name": "Reward",
+      "help": ""
     }
   },
   "Task": {
@@ -22,12 +30,8 @@
       "name": "Cafe",
       "help": ""
     },
-    "Circle": {
+    "DataUpdate": {
-      "name": "Club",
+      "name": "Dashboard Upd",
-      "help": ""
-    },
-    "Mail": {
-      "name": "Mailbox",
       "help": ""
     },
     "Bounty": {
@@ -42,12 +46,16 @@
       "name": "Tactical Challenge",
       "help": ""
     },
+    "Circle": {
+      "name": "Club",
+      "help": ""
+    },
     "Task": {
       "name": "Tasks",
       "help": ""
     },
-    "DataUpdate": {
+    "Mail": {
-      "name": "Dashboard Upd",
+      "name": "Mailbox",
       "help": ""
     }
   },

module/config/i18n/zh-CN.json

@@ -7,6 +7,14 @@
     "Daily": {
       "name": "每日",
       "help": ""
+    },
+    "Farm": {
+      "name": "Menu.Farm.name",
+      "help": "Menu.Farm.help"
+    },
+    "Reward": {
+      "name": "Menu.Reward.name",
+      "help": "Menu.Reward.help"
     }
   },
   "Task": {
@@ -22,12 +30,8 @@
       "name": "咖啡厅",
       "help": ""
     },
-    "Circle": {
+    "DataUpdate": {
-      "name": "公会",
+      "name": "仪表盘更新",
-      "help": "社团 / 小组"
-    },
-    "Mail": {
-      "name": "邮箱",
       "help": ""
     },
     "Bounty": {
@@ -42,12 +46,16 @@
       "name": "战术对抗赛",
       "help": "战术大赛 / 竞技场"
     },
+    "Circle": {
+      "name": "公会",
+      "help": "社团 / 小组"
+    },
     "Task": {
       "name": "Task.Task.name",
       "help": "Task.Task.help"
     },
-    "DataUpdate": {
+    "Mail": {
-      "name": "仪表盘更新",
+      "name": "邮箱",
       "help": ""
     }
   },