Commit Graph

7 Commits

Author SHA1 Message Date
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
f589ecfaa1 Add: [JP] add jp server support, copy assets from cn 2020-06-13 02:35:40 +09:00
LmeSzinc
c37fda242c Fix: [EN] POPUP assets now in 1280x720
- Add assets check to button_extract
2020-06-12 00:09:58 +08:00
LmeSzinc
56992b1d7f Fix: dev_tools import error
- Use `python -m dev_tools.button_extract` to run
2020-05-27 03:40:24 +08:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
8eab19ab04 Refactor: 统一了模板的写法
- 修复了没有阵容锁定选项时会卡住的问题
- 修复了非周回时频繁报Arrive with unexpected result的问题
- 清理了一些无用的asset
2020-04-09 16:30:40 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00