Merge remote-tracking branch 'remotes/origin/revised_guild_reward' into guild_reward

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-01-05 17:21:54 -05:00

parent 7ab3d8c051 fe4d6801bd

commit 6def46191b

43 changed files with 14 additions and 14 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/guild/GUILD_AFFILIATION_CHECK_LOGISTICS.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_EXCHANGE_1.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_EXCHANGE_2.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_EXCHANGE_3.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_LOGISTICS_CHECK_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_LOGISTICS_CHECK_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_MISSION_ACCEPT_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_MISSION_ACCEPT_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_MISSION_REWARDS_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_MISSION_REWARDS_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_RED_DOT.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_SUPPLY_REWARDS_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/GUILD_SUPPLY_REWARDS_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/en/guild/OCR_GUILD_EXCHANGE_LIMIT.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_AFFILIATION_CHECK_LOGISTICS.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_EXCHANGE_1.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_EXCHANGE_2.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_EXCHANGE_3.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_LOGISTICS_CHECK_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_LOGISTICS_CHECK_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_MISSION_ACCEPT_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_MISSION_ACCEPT_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_MISSION_REWARDS_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_MISSION_REWARDS_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_RED_DOT.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_SUPPLY_REWARDS_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_SUPPLY_REWARDS_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/OCR_GUILD_EXCHANGE_LIMIT.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_AFFILIATION_CHECK_LOGISTICS.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_EXCHANGE_1.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_EXCHANGE_2.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_EXCHANGE_3.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_LOGISTICS_CHECK_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_LOGISTICS_CHECK_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_MISSION_ACCEPT_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_MISSION_ACCEPT_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_MISSION_REWARDS_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_MISSION_REWARDS_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_RED_DOT.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_SUPPLY_REWARDS_AXIS.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/GUILD_SUPPLY_REWARDS_AZUR.png Normal file

Binary file not shown.

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

BIN

assets/tw/guild/OCR_GUILD_EXCHANGE_LIMIT.png Normal file

Binary file not shown.

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