Commit Graph

74 Commits

Author SHA1 Message Date
LmeSzinc
e128142678 Fix: Mis-detection
- Mis-detect BATTLE_STATUS_B when battle executing
- Mis-detect in_stage on potato device
- Optimize enemy_genre select for 12-2 leveling
2020-06-17 17:56:10 +08:00
LmeSzinc
6f8b449540 Fix: Click low emotion warn as story confirm when fleet lock disabled 2020-06-17 01:37:23 +08:00
LmeSzinc
20567ceba5 Merge remote-tracking branch 'origin/master' 2020-06-16 18:34:26 +08:00
whoamikyo
23aa33ce23 Asset: [EN] Updated MAP_ENEMY_SEARCHING 2020-06-16 06:51:34 -03:00
LmeSzinc
51f39be0ff Fix: [CN] LOGIN_CONFIRM different in different device
- Improve log appearance of login
2020-06-16 17:26:34 +08: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
9657141390 Add: [JP] add jp assets, handler module 2020-06-13 02:51:55 +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
kyO The NinjA
f49da62dce Fix: [EN[ Fix INFO_BAR assets 2020-06-11 15:52:15 -03:00
kyO The NinjA
ab18cf38bb Fix: [EN] Fix assets 2020-06-11 15:10:20 -03:00
LmeSzinc
c37fda242c Fix: [EN] POPUP assets now in 1280x720
- Add assets check to button_extract
2020-06-12 00:09:58 +08:00
Erik
2b58d4dd6a
Merge pull request #15 from LmeSzinc/master
Fix: Parameters for 3-4
2020-06-06 15:53:44 -03:00
kyO The NinjA
6d5ac959d4 Add: [EN] Ambush assets updated 2020-06-06 15:44:58 -03:00
LmeSzinc
3c35974bbe Fix: add new day check to reward_loop
- Fix emotion reduce when calculating recover
2020-06-06 21:53:31 +08:00
LmeSzinc
f9c37ea7e4 Fix: Disable submarine_view check because of icon bug of submarine zone 2020-06-06 15:43:38 +08:00
kyO The NinjA
524570d12c Fix: [EN] update assets.py 2020-06-03 14:27:09 -03:00
LmeSzinc
4094ab1f00 Fix: [CN] Login confirm 2020-06-03 15:21:20 +08: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
6eabcf6a35 Fix: [EN] Relogin is now working
Optimize: [EN] GUI improved
2020-05-31 04:48:22 -03:00
kyO The NinjA
c491fe7ec5 Add: [EN] New B2 battle logic thanks @justtesting
Add: [EN] New C1 battle logic
Add: [EN] New B3 battle logic
Add: [EN] New D3 battle logic
Add: [EN] New assets
2020-05-30 05:41:06 -03:00
Erik
1a369a68b7
Merge pull request #4 from LmeSzinc/master
Fix: using old api in Screen size check
2020-05-29 14:06:09 -03:00
LmeSzinc
c01a075554 Fix: Timeout adjustment
- increase walk_timeout
- increase in_stage_timer
2020-05-29 17:29:46 +08:00
kyO The NinjA
2154edefb1 Update assets.py 2020-05-28 22:20:19 -03:00
kyO The NinjA
5f55303421 FIx 3 Star Asset 2020-05-27 21:56:32 -03:00
kyO The NinjA
a3f0c0304e Fix assets for SHIP morale 2020-05-27 19:56:35 -03:00
kyO The NinjA
0645d5cb3f Added new EN assets and new maps support
- Added suport to 10-1 and 10-2
- Added suport to EN event Iris of Light and Dark Rerun, only D2 at the moment
- New EN assets
2020-05-27 13:49:26 -03: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
f32042fbd2 Fix: 修复调用错误心情对象的问题 2020-05-24 20:11:23 +08:00
LmeSzinc
8ec5099b58 Add: 适配穹顶下的圣咏曲AC图
- 修复UI导致的动态边缘识别出错
- 修复只识别出一队时的处理逻辑
- 修复处理战斗结束后跳出的剧情
- 修复辅助点击报CampaignEnd
- 修复游戏出现白屏bug时, 连续点击使用紧急维修
- 增加地图全清时, 使用二队打BOSS, 忽略FLEET_BOSS
- 增加被精英抓住的识别, 暂时还用不到
2020-05-22 21:48:56 +08:00
LmeSzinc
bd8090dff5 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错
- 未开启红脸出击时, 累计消耗100心情后重启游戏
2020-05-21 12:26:28 +08:00
LmeSzinc
75dab4db70 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错
- 未开启红脸出击时, 会每隔2小时重启游戏
2020-05-20 17:58:28 +08:00
LmeSzinc
9c77cdd058 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错
- 未开启红脸出击时, 会每隔两个半小时重启游戏
2020-05-19 22:58:25 +08:00
LmeSzinc
fa0a243df1 Refactor: 合并处理消息的类 2020-05-15 14:19:34 +08:00
LmeSzinc
65de042dd3 Add: 增加挂机收菜模式 2020-05-06 23:53:25 +08:00
LmeSzinc
fc7e16835f Fix: 纠正拼写错误 2020-05-05 02:54:23 +08:00
LmeSzinc
290e755432 Fix: 修复剧情跳过
- 增加黑屏带文字剧情的跳过
- 增加战斗开始时的剧情跳过
2020-05-01 01:02:32 +08:00
LmeSzinc
2c10f77e4d Fix: 调整了回出击界面时的判定, 修改了一些地图格子权重 2020-04-30 17:11:47 +08:00
LmeSzinc
2244ca3d8d Fix: 修复额外剧情出现时报错的问题 2020-04-29 17:45:35 +08:00
LmeSzinc
088aca3c95 Fix: 修复登录, 增加章节名OCR纠错 2020-04-28 22:51:32 +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
5284c1a390 Fix: 修复打完BOSS有时会卡住的问题
- 优化了苍红的回响C2, 大型航空对低耗队杀伤力太大了
2020-04-27 22:49:30 +08:00
LmeSzinc
fc84f5e610 Fix: 修复开荒
- 修复低级图出BOSS后报错的问题
- 修复了开荒进度0%时的章节名OCR
- 修复打完BOSS有时会卡住的问题
2020-04-27 19:32:58 +08:00
LmeSzinc
6b56215d71 Fix: 修复地图特效导致的章节名识别错误和进图等待
- 章节名识别错误时有20次重试的机会
- 进图时不再使用章节图标识别
- 更改了exception文件的位置
2020-04-25 17:10:22 +08:00
LmeSzinc
f5ee202934 Optimize: 优化复刻苍红的回响C2和D3
- 修改了绿海时的地图设置覆盖
2020-04-25 16:43:41 +08:00
LmeSzinc
4e58edadbd Fix: 修复登录 2020-04-25 00:11:44 +08:00
LmeSzinc
604cdf4005 Fix: 修复
- 优化章节名OCR, 防止地图特效影响识别
- 修复等待精英移动
- 修复回到出击界面
2020-04-24 17:57:40 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
2020-04-24 15:26:11 +08:00
LmeSzinc
b4054b579e Add: 增加行走步长设置
- 修复跨天重启重置队伍的问题
- 修复碰磁BOSS战斗结束卡住的问题
2020-04-23 01:58:35 +08:00