diff --git a/config/template.json b/config/template.json index 138db4a..814cffd 100644 --- a/config/template.json +++ b/config/template.json @@ -84,7 +84,10 @@ "ItemStorage": { "AP": {}, "Credit": {}, - "Pyroxene": {} + "Pyroxene": {}, + "BountyTicket": {}, + "ScrimmageTicket": {}, + "TacticalChallengeTicket": {} } } } \ No newline at end of file diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 3b5c3d0..33106ea 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -348,6 +348,30 @@ "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" } } } diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 6412674..819919c 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -99,3 +99,15 @@ ItemStorage: stored: StoredInt order: 3 color: "#21befc" + BountyTicket: + stored: StoredBountyTicket + order: 4 + color: "#94cb44" + ScrimmageTicket: + stored: StoredScrimmageTicket + order: 5 + color: "#f86c6a" + TacticalChallengeTicket: + stored: StoredTacticalChallengeTicket + order: 6 + color: "#7ac8e5" diff --git a/module/config/argument/stored.json b/module/config/argument/stored.json index 950d84b..5468a6d 100644 --- a/module/config/argument/stored.json +++ b/module/config/argument/stored.json @@ -35,5 +35,44 @@ }, "order": 3, "color": "#21befc" + }, + "BountyTicket": { + "name": "BountyTicket", + "path": "DataUpdate.ItemStorage.BountyTicket", + "i18n": "ItemStorage.BountyTicket.name", + "stored": "StoredBountyTicket", + "attrs": { + "time": "2020-01-01 00:00:00", + "total": 6, + "value": 0 + }, + "order": 4, + "color": "#94cb44" + }, + "ScrimmageTicket": { + "name": "ScrimmageTicket", + "path": "DataUpdate.ItemStorage.ScrimmageTicket", + "i18n": "ItemStorage.ScrimmageTicket.name", + "stored": "StoredScrimmageTicket", + "attrs": { + "time": "2020-01-01 00:00:00", + "total": 6, + "value": 0 + }, + "order": 5, + "color": "#f86c6a" + }, + "TacticalChallengeTicket": { + "name": "TacticalChallengeTicket", + "path": "DataUpdate.ItemStorage.TacticalChallengeTicket", + "i18n": "ItemStorage.TacticalChallengeTicket.name", + "stored": "StoredTacticalChallengeTicket", + "attrs": { + "time": "2020-01-01 00:00:00", + "total": 5, + "value": 0 + }, + "order": 6, + "color": "#7ac8e5" } } \ No newline at end of file diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 0af1766..80537d9 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -52,3 +52,6 @@ class GeneratedConfig: ItemStorage_AP = {} ItemStorage_Credit = {} ItemStorage_Pyroxene = {} + ItemStorage_BountyTicket = {} + ItemStorage_ScrimmageTicket = {} + ItemStorage_TacticalChallengeTicket = {} diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 341e6e9..54272f5 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -239,6 +239,18 @@ "Pyroxene": { "name": "Pyroxene", "help": "" + }, + "BountyTicket": { + "name": "Bounty Ticket", + "help": "" + }, + "ScrimmageTicket": { + "name": "Scrimmage Ticket", + "help": "" + }, + "TacticalChallengeTicket": { + "name": "Tactical Challenge Ticket", + "help": "" } }, "Gui": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 8170e3b..834b797 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -239,6 +239,18 @@ "Pyroxene": { "name": "青辉石", "help": "" + }, + "BountyTicket": { + "name": "悬赏通缉票券", + "help": "" + }, + "ScrimmageTicket": { + "name": "学院交流会票券", + "help": "" + }, + "TacticalChallengeTicket": { + "name": "战术对抗赛票券", + "help": "" } }, "Gui": { diff --git a/module/config/stored/classes.py b/module/config/stored/classes.py index ef515b2..792e2cd 100644 --- a/module/config/stored/classes.py +++ b/module/config/stored/classes.py @@ -3,6 +3,8 @@ from functools import cached_property as functools_cached_property from module.base.decorator import cached_property from module.config.utils import DEFAULT_TIME, deep_get, get_server_last_monday_update, get_server_last_update + + # from module.exception import ScriptError @@ -173,6 +175,20 @@ class StoredCounter(StoredBase): class StoredAP(StoredCounter): pass + +class StoredBountyTicket(StoredCounter, StoredExpiredAt0400): + FIXED_TOTAL = 6 + pass + + +class StoredScrimmageTicket(StoredCounter, StoredExpiredAt0400): + FIXED_TOTAL = 6 + + +class StoredTacticalChallengeTicket(StoredCounter, StoredExpiredAt0400): + FIXED_TOTAL = 5 + + # class StoredDailyActivity(StoredCounter, StoredExpiredAt0400): # FIXED_TOTAL = 500 # diff --git a/module/config/stored/stored_generated.py b/module/config/stored/stored_generated.py index 6ff610f..64feb48 100644 --- a/module/config/stored/stored_generated.py +++ b/module/config/stored/stored_generated.py @@ -1,10 +1,9 @@ from module.config.stored.classes import ( StoredAP, - StoredBase, - StoredCounter, - StoredExpiredAt0400, - StoredExpiredAtMonday0400, + StoredBountyTicket, StoredInt, + StoredScrimmageTicket, + StoredTacticalChallengeTicket, ) @@ -15,3 +14,6 @@ class StoredGenerated: AP = StoredAP("DataUpdate.ItemStorage.AP") Credit = StoredInt("DataUpdate.ItemStorage.Credit") Pyroxene = StoredInt("DataUpdate.ItemStorage.Pyroxene") + BountyTicket = StoredBountyTicket("DataUpdate.ItemStorage.BountyTicket") + ScrimmageTicket = StoredScrimmageTicket("DataUpdate.ItemStorage.ScrimmageTicket") + TacticalChallengeTicket = StoredTacticalChallengeTicket("DataUpdate.ItemStorage.TacticalChallengeTicket")