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, campaign module	2020-06-13 02:49:47 +09:00
campaign_base.py	Add: 增加处理被精英抓住	2020-05-23 14:30:07 +08:00
campaign_ocr.py	Add: [EN] New B2 battle logic thanks @justtesting	2020-05-30 05:41:06 -03:00
campaign_ui.py	Fix: [EN] Fix Miss detect lines as characters in Commission module	2020-06-08 07:54:21 -03:00
run.py	Fix: [EN] Fix Miss detect lines as characters in Commission module	2020-06-08 07:54:21 -03:00