Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into new_skill_jp_asset

Browse Source

 Conflicts:

	module/tactical/assets.py

...

This commit is contained in:

bookbug666

2022-08-18 10:56:48 +08:00

parent b914f15656 0b235ac3e8

commit 474242ccea

4 changed files with 3 additions and 3 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/en/tactical/ADD_NEW_STUDENT.png Normal file

Binary file not shown.

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

BIN

assets/en/tactical/TACTICAL_META.png Normal file

Binary file not shown.

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

BIN

assets/en/tactical/TACTICAL_SKILL_LIST.png Normal file

Binary file not shown.

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