Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修改开拓力上限至300 支持记忆主 #447

Merged
merged 2 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/setting_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def __initCard(self):
self.useReservedTrailblazePowerEnableCard = SwitchSettingCard1(
FIF.HEART,
self.tr('使用后备开拓力'),
"单次上限240点,全部使用需要将“任务完成后”选项修改为“循环”,然后点击“完整运行”",
"单次上限300点,全部使用需要将“任务完成后”选项修改为“循环”,然后点击“完整运行”",
"use_reserved_trailblaze_power"
)
self.useFuelEnableCard = SwitchSettingCard1(
Expand Down Expand Up @@ -571,7 +571,7 @@ def __initCard(self):
)
self.powerLimitCard = RangeSettingCard1(
"power_limit",
[10, 240],
[10, 300],
FIF.HEART,
# self.tr("循环运行再次启动所需开拓力(游戏刷新后优先级更高)"),
self.tr("循环运行再次启动所需开拓力"),
Expand Down
14 changes: 8 additions & 6 deletions assets/config/character_names.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@
"Natasha": "娜塔莎",
"Pela": "佩拉",
"Qingque": "青雀",
"CaelumPreservation": "穹(火)",
"CaelumDestruction": "穹(物理)",
"CaelumImaginary": "穹(虚数)",
"CaelumPreservation": "穹(存护)",
"CaelumDestruction": "穹(毁灭)",
"CaelumImaginary": "穹(同谐)",
"CaelumRemembrance": "穹(记忆)",
"Blade": "刃",
"RuanMei": "阮·梅",
"Sampo": "桑博",
Expand All @@ -52,9 +53,10 @@
"Serval": "希露瓦",
"Sunday": "星期日",
"Xueyi": "雪衣",
"StellePreservation": "星(火)",
"StelleDestruction": "星(物理)",
"StelleImaginary": "星(虚数)",
"StellePreservation": "星(存护)",
"StelleDestruction": "星(毁灭)",
"StelleImaginary": "星(同谐)",
"StelleRemembrance": "星(记忆)",
"Yukong": "驭空",
"SilverWolf": "银狼",
"Yunli": "云璃",
Expand Down
2 changes: 1 addition & 1 deletion assets/config/config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ notify_template:
Title: 三月七小助手|・ω・)
TestMessage: "这是一条测试消息"
ContinueTime: "将在{time}继续运行"
FullTime: "开拓力剩余{power}/240\n预计{time}回满"
FullTime: "开拓力剩余{power}/300\n预计{time}回满"
NewVersion: "发现新版本 {version}"
ErrorOccurred: "发生错误 {error}"
DailyPracticeCompleted: "每日实训已完成"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tasks/game/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ def get_wait_time(current_power):
def notify_after_finish_not_loop():

def get_wait_time(current_power):
# 距离体力到达240上限剩余秒数
wait_time_power_full = (240 - current_power) * 6 * 60
# 距离体力到达300上限剩余秒数
wait_time_power_full = (300 - current_power) * 6 * 60
return wait_time_power_full

current_power = Power.get()
Expand Down
4 changes: 2 additions & 2 deletions tasks/power/power.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def get_power(crop, type="trailblaze_power"):
if type == "trailblaze_power":
result = auto.get_single_line_text(
crop=crop, blacklist=['+', '米', '*'], max_retries=3)
power = int(result.replace("1240", "/240").replace("?", "").split('/')[0])
power = int(result.replace("1300", "/300").replace("?", "").split('/')[0])
return power if 0 <= power <= 999 else 0
elif type == "reserved_trailblaze_power":
result = auto.get_single_line_text(
Expand Down Expand Up @@ -195,7 +195,7 @@ def move_button_and_confirm():
screen.change_to('map')
trailblaze_power = get_power(trailblaze_power_crop)

log.info(f"🟣开拓力: {trailblaze_power}/240")
log.info(f"🟣开拓力: {trailblaze_power}/300")
return trailblaze_power

@staticmethod
Expand Down
2 changes: 2 additions & 0 deletions utils/date.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ def calculate_future_time(input_data):
return f"今天{future_time.hour}时{future_time.minute}分"
elif future_time.date() == current_time.date() + timedelta(days=1):
return f"明天{future_time.hour}时{future_time.minute}分"
elif future_time.date() == current_time.date() + timedelta(days=2):
return f"后天{future_time.hour}时{future_time.minute}分"
else:
return "输入秒数或时间超出范围"

Expand Down