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	Add: [JP] add jp assets, exercise module	2020-06-13 02:51:29 +09:00
combat.py	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
equipment.py	Initial commit	2020-03-29 01:41:34 +08:00
exercise.py	Initial commit	2020-03-29 01:41:34 +08:00
hp_daemon.py	Initial commit	2020-03-29 01:41:34 +08:00
opponent.py	Fix: 修复演习敌人排序, 现在相同权重时会优先最左	2020-05-13 11:05:26 +08:00