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
..
ambush.py	Add: 适配复刻苍红的回响AB图	2020-04-24 15:26:11 +08:00
assets.py	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
enemy_searching.py	Fix: Timeout adjustment	2020-05-29 17:29:46 +08:00
fast_forward.py	Add: 适配穹顶下的圣咏曲AC图	2020-05-22 21:48:56 +08:00
info_handler.py	Fix: Re-check all timeout timer	2020-06-03 05:06:51 +08:00
login.py	Fix: add new day check to reward_loop	2020-06-06 21:53:31 +08:00
mystery.py	Add: 适配第三章	2020-04-15 15:14:35 +08:00
strategy.py	Fix: Disable submarine_view check because of icon bug of submarine zone	2020-06-06 15:43:38 +08:00