Commit Graph

14 Commits

Author SHA1 Message Date
nEEtdo0d
8cb55f699d Add new exercise option "easiest" and alternative priority calculation for this specific mode. May alter at a later date but for time being the behavior seems to be consistent in prioritizing the lowest average level based on all 6 ship slots (filled or empty) and lowest average overall power based on number of actual ships (only filled) in the team. 2020-06-14 12:27:13 -04:00
ferina8-14
dea0a02245 Merge remote-tracking branch 'upstream/master' 2020-06-14 02:30:12 +09:00
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
2020-06-13 03:29:35 +09:00
ferina8-14
b82388a8a2 Add: [JP] add jp assets, exercise module 2020-06-13 02:51:29 +09:00
LmeSzinc
a623e7d082 Fix: rare bugs
- Fix roadblocks in 6-4
- Fix mis-detect BATTLE_STATUS_D when battle executing
- Add call details to popup
2020-06-12 19:29:13 +08:00
nEEtdo0d
0e8e25de18 Fixed EN rank D assets, CN so those needs to be updated since I don't play CN I've only inserted dummy files so that button_extract module would run. Also added extra conditions for the exercise loop so that it exits the rank D screens 2020-06-08 17:06:39 -04:00
LmeSzinc
30e11c6caf Fix: Re-check all timeout timer
- Fix tactical class get stuck when skill level reach to max.
2020-06-03 05:06:51 +08:00
kyO The NinjA
10b53f80ba Localization for EN version
- Updated assets for EN version
- Created EN dictionary
- Fix Stage OCR recognition Thanks @LmeSzinc
2020-05-27 10:32:05 -03:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
10b43b44fa Fix: 修复演习敌人排序, 现在相同权重时会优先最左 2020-05-13 11:05:26 +08:00
LmeSzinc
61aa7d8340 Fix: 修复截图速度过慢时出现的问题
当使用像以下结构的代码时, 需要增加触发计数
否则当截图耗时大于计时器触发时间时, 会触发错误的结果
if self.appear(MAIN_CHECK):
    if confirm_timer.reached():
        pass
    else:
        confirm_timer.reset()
2020-04-28 14:37:13 +08:00
LmeSzinc
91e83271a4 Add: 增加了使用一键退役的支持
- 增加了根据设置选择切换函数的装饰器
- 增加了ADB截图和点击的设置, 默认使用ADB截图, uiautomator2点击
- 更新了assets.py文件, 上次commit忘记了
2020-04-14 12:26:57 +08:00
LmeSzinc
ad73de92dd Refactor: 抽象出处理确认弹窗的逻辑
- 删除了一些无用的assets
- 纠正了一些拼写错误
2020-04-13 23:00:19 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00