Compare commits

...

2 commits

Author SHA1 Message Date
ce3499ef40 解包更新
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful
2025-04-28 12:13:50 +08:00
4d02d26917 活动推荐月卡领取
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful
2025-04-27 13:09:04 +08:00
23 changed files with 297 additions and 156 deletions

@ -1 +1 @@
Subproject commit 1c84b814e08ddea21bd73b70eb374d0e48145298
Subproject commit 3f45fa146d1bde327a98bb2be0e79edaa0ea07da

@ -1 +1 @@
Subproject commit af4bd9e65bb844286d0ee0fcdef0fe3826622a3c
Subproject commit 593c25418416159748534d95b2526e35be617fa8

@ -1 +1 @@
Subproject commit f8e06cafd8020bc1c8138b0cdc42b5d889d7b0cb
Subproject commit f4bf36f82c46013e0d6dde3027395da8ec439c4d

View file

@ -426,6 +426,13 @@
"CONSUME",
50017
],
"voucher_levelmax_4": [
"voucher_levelmax_4",
"voucher_levelmax_4",
"专业干员特训装置",
"CONSUME",
50018
],
"voucher_elite_II_6": [
"voucher_elite_II_6",
"voucher_elite_II_6",
@ -5479,12 +5486,5 @@
"高级材料提货券",
"CONSUME",
30201
],
"SINGLE_60_0_1_GACHA": [
"SINGLE_60_0_1_GACHA",
"SINGLE_60_0_1_GACHA",
"指令重构寻访凭证",
"NORMAL",
40003
]
}

View file

@ -715,6 +715,10 @@
"label": "ACTIVITY_SHOP_BUY",
"comment": "活动商店购买物品"
},
"1407": {
"label": "ACTIVITY_SPECIAL_ACCESS",
"comment": "活动推荐月卡"
},
"1501": {
"label": "MOON_FESTIVAL",
"comment": "月饼"

BIN
mower/resources/sign_in/special_access/banner.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
mower/resources/sign_in/special_access/collect.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
mower/resources/sign_in/special_access/entry.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
from datetime import datetime
from .shop import Shop
from .special_access import SpecialAccess
from .task import Task
@ -32,6 +33,8 @@ class SignInManager:
now = datetime.now()
if now < datetime(2025, 5, 5):
solver_list += [Task(), Shop()]
if now < datetime(2025, 6, 9):
solver_list += [SpecialAccess()]
for solver in solver_list:
solver.scheduler_stop_time = self.scheduler_stop_time
result = result and solver.run()

View file

@ -0,0 +1,63 @@
"""
Copyright (c) 2025 zhbaor <zhbaor@zhaozuohong.vip>
This file is part of mower-ng (https://git.zhaozuohong.vip/mower-ng/mower-ng).
Mower-ng is free software: you may copy, redistribute and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, version 3 or later.
This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
from datetime import timedelta
from mower.utils.email import notify
from mower.utils.scene import Scene
from mower.utils.solver import BaseSolver
from .utils import index_entry
class SpecialAccess(BaseSolver):
solver_name = "活动推荐月卡"
solver_max_duration = timedelta(minutes=2)
def run(self):
self.materiel_email = False
self.finish_email = True
return super().run()
def transition(self) -> bool:
if (scene := self.scene()) == Scene.MATERIEL:
if self.materiel_email:
self.materiel_email = False
self.finish_email = False
self.sleep()
notify(f"{self.solver_name}领取")
self.scene_graph_step(Scene.INDEX)
elif scene == Scene.INDEX:
if pos := index_entry("sign_in/special_access/entry", self.solver_name):
self.ctap(pos)
return
notify(f"未找到{self.solver_name}入口")
return True
elif scene == Scene.ACTIVITY_SPECIAL_ACCESS:
if self.animation():
return
if pos := self.find("sign_in/special_access/collect"):
if self.ctap(pos, 5):
self.materiel_email = True
self.finish_email = False
return
if self.finish_email:
notify(f"{self.solver_name}奖励已领完")
return True
else:
self.scene_graph_step(Scene.INDEX)

BIN
mower/static/CONSUME.pkl (Stored with Git LFS)

Binary file not shown.

BIN
mower/static/MATERIAL.pkl (Stored with Git LFS)

Binary file not shown.

BIN
mower/static/NORMAL.pkl (Stored with Git LFS)

Binary file not shown.

BIN
mower/static/avatar.pkl (Stored with Git LFS)

Binary file not shown.

BIN
mower/static/levels.pkl (Stored with Git LFS)

Binary file not shown.

BIN
mower/static/portrait.pkl (Stored with Git LFS)

Binary file not shown.

BIN
mower/static/recruit_result.pkl (Stored with Git LFS)

Binary file not shown.

View file

@ -25,6 +25,7 @@ from .utils import edge
@edge(Scene.MAIL, Scene.INDEX)
@edge(Scene.INDEX_ORIGINITE, Scene.INDEX)
@edge(Scene.INDEX_SANITY, Scene.INDEX)
@edge(Scene.ACTIVITY_SPECIAL_ACCESS, Scene.INDEX)
def back_to_index(solver: BaseSolver):
solver.cback(1, id="back_to_index")

View file

@ -401,6 +401,8 @@ class Recognizer:
self.scene = Scene.ACTIVITY_SHOP_BUY
elif self.find("sign_in/shop/banner"):
self.scene = Scene.ACTIVITY_SHOP
elif self.find("sign_in/special_access/banner"):
self.scene = Scene.ACTIVITY_SPECIAL_ACCESS
elif self.find("rogue/theme_select"):
self.scene = Scene.ROGUE_THEME_SELECT
elif (

View file

@ -357,6 +357,8 @@ class Scene:
"活动商店"
ACTIVITY_SHOP_BUY = 1406
"活动商店购买物品"
ACTIVITY_SPECIAL_ACCESS = 1407
"活动推荐月卡"
MOON_FESTIVAL = 1501
"月饼"
OPERATOR_MANAGEMENT = 1601
@ -617,6 +619,7 @@ SceneComment = {
1404: "活动任务",
1405: "活动商店",
1406: "活动商店购买物品",
1407: "活动推荐月卡",
1501: "月饼",
1601: "干员列表",
1602: "干员详情",

View file

@ -628,6 +628,9 @@ Res = Literal[
"sign_in/shop/owned",
"sign_in/shop/price_black",
"sign_in/shop/price_white",
"sign_in/special_access/banner",
"sign_in/special_access/collect",
"sign_in/special_access/entry",
"sign_in/spring_festival/collect",
"sign_in/spring_festival/done",
"sign_in/spring_festival/entry",

BIN
ui/public/depot/专业干员特训装置.webp (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -180,30 +180,21 @@
"key": 11
},
{
"id": "BB-1",
"id_key": "act33side_01",
"name": "宏伟愿景",
"id": "VS-1",
"id_key": "act1enemyduel_01a",
"name": "争锋试炼!",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"酯原料",
"破损装置",
"异铁碎片",
"双酮",
"代糖",
"源岩"
],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
"start": 1745222400,
"end": 1746043199,
"理智消耗": 9,
"start": 1745674200,
"end": 1746071999,
"理智消耗": 0,
"周一": 1,
"周二": 1,
"周三": 1,
@ -214,13 +205,38 @@
"key": 12
},
{
"id": "BB-2",
"id_key": "act33side_02",
"name": "命途何在",
"id": "VS-2",
"id_key": "act1enemyduel_02a",
"name": "争锋对决!",
"drop": {
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
"start": 1745674200,
"end": 1746071999,
"理智消耗": 0,
"周一": 1,
"周二": 1,
"周三": 1,
"周四": 1,
"周五": 1,
"周六": 1,
"周日": 1,
"key": 13
},
{
"id": "BB-1",
"id_key": "act33side_01",
"name": "宏伟愿景",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"酯原料",
"破损装置",
"异铁碎片",
@ -229,7 +245,7 @@
"源岩"
],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -245,51 +261,25 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 13
},
{
"id": "BB-3",
"id_key": "act33side_03",
"name": "无声破裂",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"异铁",
"酮凝集"
],
"首次掉落": [
"act33side_token_sugar_rep_1",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
"start": 1745222400,
"end": 1746043199,
"理智消耗": 12,
"周一": 1,
"周二": 1,
"周三": 1,
"周四": 1,
"周五": 1,
"周六": 1,
"周日": 1,
"key": 14
},
{
"id": "BB-4",
"id_key": "act33side_04",
"name": "悠长的旅途",
"id": "BB-2",
"id_key": "act33side_02",
"name": "命途何在",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"糖",
"固源岩"
"粗制糖块",
"酯原料",
"破损装置",
"异铁碎片",
"双酮",
"代糖",
"源岩"
],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -297,7 +287,7 @@
},
"start": 1745222400,
"end": 1746043199,
"理智消耗": 12,
"理智消耗": 9,
"周一": 1,
"周二": 1,
"周三": 1,
@ -308,18 +298,18 @@
"key": 15
},
{
"id": "BB-5",
"id_key": "act33side_05",
"name": "激变烽烟",
"id": "BB-3",
"id_key": "act33side_03",
"name": "无声破裂",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"聚酸酯",
"装置"
"粗制糖块",
"异铁",
"酮凝集"
],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -338,17 +328,18 @@
"key": 16
},
{
"id": "BB-6",
"id_key": "act33side_06",
"name": "灯火闪烁不定",
"id": "BB-4",
"id_key": "act33side_04",
"name": "悠长的旅途",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"固源岩组"
"粗制糖块",
"糖",
"固源岩"
],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -356,7 +347,7 @@
},
"start": 1745222400,
"end": 1746043199,
"理智消耗": 21,
"理智消耗": 12,
"周一": 1,
"周二": 1,
"周三": 1,
@ -367,17 +358,18 @@
"key": 17
},
{
"id": "BB-7",
"id_key": "act33side_07",
"name": "阴影显现",
"id": "BB-5",
"id_key": "act33side_05",
"name": "激变烽烟",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"异铁组"
"粗制糖块",
"聚酸酯",
"装置"
],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -385,7 +377,7 @@
},
"start": 1745222400,
"end": 1746043199,
"理智消耗": 21,
"理智消耗": 12,
"周一": 1,
"周二": 1,
"周三": 1,
@ -396,17 +388,17 @@
"key": 18
},
{
"id": "BB-8",
"id_key": "act33side_08",
"name": "终局倒计时",
"id": "BB-6",
"id_key": "act33side_06",
"name": "灯火闪烁不定",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"act33side_token_sugar_rep_1",
"凝胶"
"粗制糖块",
"固源岩组"
],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -424,6 +416,64 @@
"周日": 1,
"key": 19
},
{
"id": "BB-7",
"id_key": "act33side_07",
"name": "阴影显现",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"粗制糖块",
"异铁组"
],
"首次掉落": [
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
"start": 1745222400,
"end": 1746043199,
"理智消耗": 21,
"周一": 1,
"周二": 1,
"周三": 1,
"周四": 1,
"周五": 1,
"周六": 1,
"周日": 1,
"key": 20
},
{
"id": "BB-8",
"id_key": "act33side_08",
"name": "终局倒计时",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
"粗制糖块",
"凝胶"
],
"首次掉落": [
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
"start": 1745222400,
"end": 1746043199,
"理智消耗": 21,
"周一": 1,
"周二": 1,
"周三": 1,
"周四": 1,
"周五": 1,
"周六": 1,
"周日": 1,
"key": 21
},
{
"id": "BB-9",
"id_key": "act33side_09",
@ -432,7 +482,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -448,7 +498,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 20
"key": 22
},
{
"id": "BB-10",
@ -458,7 +508,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -474,7 +524,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 21
"key": 23
},
{
"id": "BB-EX-1",
@ -484,7 +534,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -500,7 +550,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 22
"key": 24
},
{
"id": "BB-EX-1 突袭",
@ -525,7 +575,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 23
"key": 25
},
{
"id": "BB-EX-2",
@ -535,7 +585,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -551,7 +601,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 24
"key": 26
},
{
"id": "BB-EX-2 突袭",
@ -576,7 +626,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 25
"key": 27
},
{
"id": "BB-EX-3",
@ -586,7 +636,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -602,7 +652,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 26
"key": 28
},
{
"id": "BB-EX-3 突袭",
@ -627,7 +677,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 27
"key": 29
},
{
"id": "BB-EX-4",
@ -637,7 +687,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -653,7 +703,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 28
"key": 30
},
{
"id": "BB-EX-4 突袭",
@ -678,7 +728,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 29
"key": 31
},
{
"id": "BB-EX-5",
@ -688,7 +738,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -704,7 +754,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 30
"key": 32
},
{
"id": "BB-EX-5 突袭",
@ -729,7 +779,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 31
"key": 33
},
{
"id": "BB-EX-6",
@ -739,7 +789,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -755,7 +805,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 32
"key": 34
},
{
"id": "BB-EX-6 突袭",
@ -780,7 +830,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 33
"key": 35
},
{
"id": "BB-EX-7",
@ -790,7 +840,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -806,7 +856,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 34
"key": 36
},
{
"id": "BB-EX-7 突袭",
@ -831,7 +881,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 35
"key": 37
},
{
"id": "BB-EX-8",
@ -841,7 +891,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -857,7 +907,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 36
"key": 38
},
{
"id": "BB-EX-8 突袭",
@ -882,7 +932,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 37
"key": 39
},
{
"id": "BB-MO-1",
@ -892,7 +942,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -908,7 +958,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 38
"key": 40
},
{
"id": "BB-S-1",
@ -918,7 +968,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -934,7 +984,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 39
"key": 41
},
{
"id": "BB-S-1 突袭",
@ -959,7 +1009,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 40
"key": 42
},
{
"id": "BB-S-2",
@ -969,7 +1019,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -985,7 +1035,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 41
"key": 43
},
{
"id": "BB-S-2 突袭",
@ -1010,7 +1060,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 42
"key": 44
},
{
"id": "BB-S-3",
@ -1020,7 +1070,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -1036,7 +1086,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 43
"key": 45
},
{
"id": "BB-S-3 突袭",
@ -1061,7 +1111,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 44
"key": 46
},
{
"id": "BB-S-4",
@ -1071,7 +1121,7 @@
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
"act33side_token_sugar_rep_1",
"粗制糖块",
"至纯源石"
],
"特殊掉落": [],
@ -1087,7 +1137,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 45
"key": 47
},
{
"id": "BB-S-4 突袭",
@ -1112,7 +1162,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 46
"key": 48
},
{
"id": "BB-ST-1",
@ -1137,7 +1187,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 47
"key": 49
},
{
"id": "BB-ST-2",
@ -1162,7 +1212,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 48
"key": 50
},
{
"id": "BB-ST-3",
@ -1187,7 +1237,7 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 49
"key": 51
},
{
"id": "BB-TR-1",
@ -1212,6 +1262,6 @@
"周五": 1,
"周六": 1,
"周日": 1,
"key": 50
"key": 52
}
]