This commit is contained in:
parent
d824ab1082
commit
57f3375ff7
20 changed files with 454 additions and 35 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 6d9aea77022dbde3c8321e7dfe37a69584571d27
|
||||
Subproject commit 1542307f6e6819297553505a293478a129f3ff2f
|
|
@ -1 +1 @@
|
|||
Subproject commit 3b699712854782c80f99e9525b08447b5b4fabfa
|
||||
Subproject commit 3ce0cb2dcd70bf68b0d17c65e195bafa1e41bfac
|
|
@ -1 +1 @@
|
|||
Subproject commit 1af857efb47cf1ce5490046d8cd53c95581cb3b3
|
||||
Subproject commit ac8256a749266d1d6712938dd5e2d4b2c2fd6dd2
|
|
@ -46,7 +46,7 @@
|
|||
"skillname": "行动派",
|
||||
"buffer": false,
|
||||
"buffer_des": [],
|
||||
"des": "进驻制造站时,生产力<@cc.vup>+20%</>,仓库容量上限<@cc.vup>-8</>",
|
||||
"des": "进驻制造站时,生产力<@cc.vup>+20%</>,仓库容量上限<@cc.vdown>-8</>",
|
||||
"roomType": "制造站",
|
||||
"buffCategory": "OUTPUT",
|
||||
"skillIcon": "bskill_man_spd&limit6",
|
||||
|
|
BIN
mower/resources/navigation/activity/banner_ex.png
(Stored with Git LFS)
BIN
mower/resources/navigation/activity/banner_ex.png
(Stored with Git LFS)
Binary file not shown.
BIN
mower/resources/navigation/activity/entry_ex.png
(Stored with Git LFS)
BIN
mower/resources/navigation/activity/entry_ex.png
(Stored with Git LFS)
Binary file not shown.
|
@ -37,8 +37,18 @@ class ActivityNavigation(BaseSolver):
|
|||
"EA-6": [2167, -140],
|
||||
"EA-7": [2742, 409],
|
||||
"EA-8": [3058, -16],
|
||||
"EA-TR-1": [400, 0],
|
||||
},
|
||||
"ex": {
|
||||
"EA-EX-1": (0, 0),
|
||||
"EA-EX-2": [0, 384],
|
||||
"EA-EX-3": [339, 139],
|
||||
"EA-EX-4": [680, -123],
|
||||
"EA-EX-5": [680, 443],
|
||||
"EA-EX-6": [1087, 129],
|
||||
"EA-EX-7": [1437, 397],
|
||||
"EA-EX-8": [1437, -2],
|
||||
},
|
||||
"ex": {},
|
||||
}
|
||||
|
||||
@classproperty
|
||||
|
@ -54,7 +64,8 @@ class ActivityNavigation(BaseSolver):
|
|||
names = {}
|
||||
font_size = 37 if self.difficulty == "ex" else 40
|
||||
for name in self._location[self.difficulty].keys():
|
||||
names[name] = generate_name(name, font_size, pad_right=10)
|
||||
style = "dark" if "TR-" in self.name else "light"
|
||||
names[name] = generate_name(name, font_size, pad_right=10, style=style)
|
||||
self.names = names
|
||||
|
||||
def run(
|
||||
|
|
BIN
mower/static/CONSUME.pkl
(Stored with Git LFS)
BIN
mower/static/CONSUME.pkl
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/MATERIAL.pkl
(Stored with Git LFS)
BIN
mower/static/MATERIAL.pkl
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/NORMAL.pkl
(Stored with Git LFS)
BIN
mower/static/NORMAL.pkl
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/avatar_skill/死芒/1.png
(Stored with Git LFS)
BIN
mower/static/avatar_skill/死芒/1.png
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/avatar_skill/死芒/2.png
(Stored with Git LFS)
BIN
mower/static/avatar_skill/死芒/2.png
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/avatar_skill/死芒/3.png
(Stored with Git LFS)
BIN
mower/static/avatar_skill/死芒/3.png
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/avatar_skill/水灯心/1.png
(Stored with Git LFS)
BIN
mower/static/avatar_skill/水灯心/1.png
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/avatar_skill/水灯心/2.png
(Stored with Git LFS)
BIN
mower/static/avatar_skill/水灯心/2.png
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/avatar_skill/钼铅/2.png
(Stored with Git LFS)
BIN
mower/static/avatar_skill/钼铅/2.png
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/levels.pkl
(Stored with Git LFS)
BIN
mower/static/levels.pkl
(Stored with Git LFS)
Binary file not shown.
BIN
mower/static/recruit_result.pkl
(Stored with Git LFS)
BIN
mower/static/recruit_result.pkl
(Stored with Git LFS)
Binary file not shown.
|
@ -73,7 +73,7 @@ color = {
|
|||
"mission_trainee_on": (690, 17),
|
||||
"nav_bar": (655, 0),
|
||||
"nav_button": (26, 20),
|
||||
"navigation/activity/entry_ex": (1484, 671),
|
||||
"navigation/activity/entry_ex": (1540, 904),
|
||||
"navigation/activity/entry_normal": (1657, 753),
|
||||
"navigation/activity/entry_s": (1709, 804),
|
||||
"navigation/collection/AP-1": (203, 821),
|
||||
|
@ -320,7 +320,7 @@ template_matching = {
|
|||
"mission_daily_on": ((685, 15), (1910, 100)),
|
||||
"mission_weekly": ((685, 15), (1910, 100)),
|
||||
"mission_weekly_on": ((685, 15), (1910, 100)),
|
||||
"navigation/activity/banner_ex": (1581, 896),
|
||||
"navigation/activity/banner_ex": (1644, 941),
|
||||
"navigation/activity/banner_normal": (1377, 941),
|
||||
"navigation/activity/banner_s": (1735, 896),
|
||||
"navigation/collection/AP_entry": ((0, 170), (1920, 870)),
|
||||
|
|
|
@ -424,6 +424,414 @@
|
|||
"周日": 1,
|
||||
"key": 19
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-1",
|
||||
"id_key": "act41side_ex01",
|
||||
"name": "帷幕另一侧",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 10,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 20
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-1 突袭",
|
||||
"id_key": "act41side_ex01#f#",
|
||||
"name": "帷幕另一侧",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 10,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 21
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-2",
|
||||
"id_key": "act41side_ex02",
|
||||
"name": "以篝火占卜",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 10,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 22
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-2 突袭",
|
||||
"id_key": "act41side_ex02#f#",
|
||||
"name": "以篝火占卜",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 10,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 23
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-3",
|
||||
"id_key": "act41side_ex03",
|
||||
"name": "暖春游行",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 24
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-3 突袭",
|
||||
"id_key": "act41side_ex03#f#",
|
||||
"name": "暖春游行",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 25
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-4",
|
||||
"id_key": "act41side_ex04",
|
||||
"name": "窗边玩偶",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 26
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-4 突袭",
|
||||
"id_key": "act41side_ex04#f#",
|
||||
"name": "窗边玩偶",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 27
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-5",
|
||||
"id_key": "act41side_ex05",
|
||||
"name": "五月树",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 28
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-5 突袭",
|
||||
"id_key": "act41side_ex05#f#",
|
||||
"name": "五月树",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 29
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-6",
|
||||
"id_key": "act41side_ex06",
|
||||
"name": "歌唱时",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 30
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-6 突袭",
|
||||
"id_key": "act41side_ex06#f#",
|
||||
"name": "歌唱时",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 15,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 31
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-7",
|
||||
"id_key": "act41side_ex07",
|
||||
"name": "花环",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 20,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 32
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-7 突袭",
|
||||
"id_key": "act41side_ex07#f#",
|
||||
"name": "花环",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 20,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 33
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-8",
|
||||
"id_key": "act41side_ex08",
|
||||
"name": "冠冕",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"损坏的源石灯",
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 20,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 34
|
||||
},
|
||||
{
|
||||
"id": "EA-EX-8 突袭",
|
||||
"id_key": "act41side_ex08#f#",
|
||||
"name": "冠冕",
|
||||
"drop": {
|
||||
"突袭首次掉落": [],
|
||||
"常规掉落": [],
|
||||
"首次掉落": [
|
||||
"至纯源石"
|
||||
],
|
||||
"特殊掉落": [],
|
||||
"额外物资": []
|
||||
},
|
||||
"start": 1741939200,
|
||||
"end": 1742500799,
|
||||
"理智消耗": 20,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 35
|
||||
},
|
||||
{
|
||||
"id": "EA-ST-1",
|
||||
"id_key": "act41side_st01",
|
||||
|
@ -447,7 +855,7 @@
|
|||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 20
|
||||
"key": 36
|
||||
},
|
||||
{
|
||||
"id": "EA-ST-2",
|
||||
|
@ -472,7 +880,7 @@
|
|||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 21
|
||||
"key": 37
|
||||
},
|
||||
{
|
||||
"id": "EA-ST-3",
|
||||
|
@ -497,7 +905,7 @@
|
|||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 22
|
||||
"key": 38
|
||||
},
|
||||
{
|
||||
"id": "EA-TR-1",
|
||||
|
@ -522,6 +930,6 @@
|
|||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1,
|
||||
"key": 23
|
||||
"key": 39
|
||||
}
|
||||
]
|
Loading…
Add table
Add a link
Reference in a new issue