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
..
assets.py	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
combat_auto.py	Add: 增加战斗模式选择, 自律, 手操, 中路站桩	2020-04-11 21:12:54 +08:00
combat_manual.py	Add: 增加中路站桩时放空袭和鱼雷	2020-05-22 22:33:18 +08:00
combat.py	Add: Map 11-4 support, Columbia farm is real	2020-06-08 03:16:00 -03:00
emotion.py	Fix: add new day check to reward_loop	2020-06-06 21:53:31 +08:00
hp_balancer.py	Add: 增加先锋血量权重	2020-05-17 13:36:54 +08:00
submarine.py	Optimize: 战斗中放慢截图速度, 降低CPU使用	2020-04-28 12:53:24 +08:00