Merge pull request #891 from nEEtdo0d/shop_revamp_clean

Browse Source

Opt: shop revamp final; shift to generic alias, no longer passing in unique strings across funcs; redirect shop filter config from old to new format

...

This commit is contained in:

nEEtdo0d

2022-01-23 10:41:39 -05:00

committed by GitHub

parent 7845a5b122 f379f70213

commit 433391bf3b

59 changed files with 697 additions and 538 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/cn/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 9.3 KiB

BIN

assets/en/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 9.3 KiB

BIN

assets/jp/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 9.3 KiB

0

assets/shop/guild/PRBP.png → assets/shop/guild/PR.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

assets/shop/guild/ShipT2.png

Binary file not shown.

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

BIN

assets/shop/guild/ShipT3.png

Binary file not shown.

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

0

assets/shop/guild_cn/PRBP.png → assets/shop/guild_cn/PR.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

assets/shop/guild_cn/ShipT2.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/ShipT3.png

Binary file not shown.

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

0

assets/shop/medal/DRAgirBP.png → assets/shop/medal/DRAgirS4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/DRAzumaBP.png → assets/shop/medal/DRAzumaS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 21 KiB

0

assets/shop/medal/DRDrakeBP.png → assets/shop/medal/DRDrakeS3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/DRFriedrichBP.png → assets/shop/medal/DRFriedrichS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 21 KiB

0

assets/shop/medal/DRHakuryuBP.png → assets/shop/medal/DRHakuryuS4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 23 KiB

0

assets/shop/medal/DR2BP.png → assets/shop/medal/DRS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

assets/shop/medal/DR3BP.png → assets/shop/medal/DRS3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

assets/shop/medal/DR4BP.png → assets/shop/medal/DRS4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

assets/shop/medal/PRAnchorageBP.png → assets/shop/medal/PRAnchorageS4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRAugustBP.png → assets/shop/medal/PRAugustS4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRChampagneBP.png → assets/shop/medal/PRChampagneS3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRCheshireBP.png → assets/shop/medal/PRCheshireS3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRGascogneBP.png → assets/shop/medal/PRGascogneS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 21 KiB

0

assets/shop/medal/PRGeorgiaBP.png → assets/shop/medal/PRGeorgiaS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRIbukiBP.png → assets/shop/medal/PRIbukiS1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRIzumoBP.png → assets/shop/medal/PRIzumoS1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRKitakazeBP.png → assets/shop/medal/PRKitakazeS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 21 KiB

0

assets/shop/medal/PRMainzBP.png → assets/shop/medal/PRMainzS3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 21 KiB

0

assets/shop/medal/PRMarcoPoloBP.png → assets/shop/medal/PRMarcoPoloS4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRMonarchBP.png → assets/shop/medal/PRMonarchS1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRNeptuneBP.png → assets/shop/medal/PRNeptuneS1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PROdinBP.png → assets/shop/medal/PROdinS3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRRoonBP.png → assets/shop/medal/PRRoonS1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PR1BP.png → assets/shop/medal/PRS1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

assets/shop/medal/PR2BP.png → assets/shop/medal/PRS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

assets/shop/medal/PR3BP.png → assets/shop/medal/PRS3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

assets/shop/medal/PR4BP.png → assets/shop/medal/PRS4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

assets/shop/medal/PRSaintLouisBP.png → assets/shop/medal/PRSaintLouisS1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

assets/shop/medal/PRSeattleBP.png → assets/shop/medal/PRSeattleS2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

BIN

assets/tw/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 9.3 KiB