Merge branch 'dev'

Browse Source

# Conflicts:
#	module/event/campaign_ab.py

...

This commit is contained in:

LmeSzinc

2021-11-01 21:11:25 +08:00

parent e8945eca1f 6fc50cafff

commit bca72819bd

14 changed files with 40 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/jp/research/DURATION_REMAIN.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.5 KiB

BIN

assets/jp/research/RESEARCH_LAB.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

assets/jp/research/RESEARCH_LAB_DURATION_REMAIN.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

assets/jp/research/RESEARCH_RUNNING.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 10 KiB