Merge branch 'LmeSzinc:master' into dev-minigame-for-pr

Browse Source

...

This commit is contained in:

Tipsy Fisher

2023-07-21 00:07:41 +08:00

committed by GitHub

parent f30c265a62 dc713f1985

commit 6fca29e79c

114 changed files with 148 additions and 101 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/research/SERIES_DETAIL.png

Binary file not shown.

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

BIN

assets/en/research/SERIES_DETAIL.png

Binary file not shown.

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

BIN

assets/jp/research/SERIES_DETAIL.png

Binary file not shown.

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

BIN

assets/shop/general/BoxIrisT2.png Normal file

Binary file not shown.

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

BIN

assets/shop/general/BoxT1_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/general/BoxT4_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BookT2.png

Binary file not shown.

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

BIN

assets/shop/guild/BookT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BookT2_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BookT3.png

Binary file not shown.

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

BIN

assets/shop/guild/BookT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BookT3_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BoxT3.png

Binary file not shown.

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

BIN

assets/shop/guild/BoxT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BoxT3_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BoxT4.png

Binary file not shown.

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

BIN

assets/shop/guild/BoxT4_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/BoxT4_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/CatT1.png

Binary file not shown.

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

BIN

assets/shop/guild/CatT1_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/CatT2.png

Binary file not shown.

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

BIN

assets/shop/guild/CatT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/CatT3.png

Binary file not shown.

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

BIN

assets/shop/guild/CatT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/Chip.png

Binary file not shown.

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

BIN

assets/shop/guild/Chip_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/FoodT5.png

Binary file not shown.

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

BIN

assets/shop/guild/FoodT5_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/FoodT6.png

Binary file not shown.

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

0

assets/shop/guild_cn/FoodT6_2.png → assets/shop/guild/FoodT6_2.png

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

BIN

assets/shop/guild/FoodT6_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/PR.png

Binary file not shown.

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

BIN

assets/shop/guild/PR_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/PlateT2.png

Binary file not shown.

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

BIN

assets/shop/guild/PlateT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/PlateT2_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/PlateT3.png

Binary file not shown.

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

BIN

assets/shop/guild/PlateT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/PlateT4.png

Binary file not shown.

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

BIN

assets/shop/guild/PlateT4_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/PlateT4_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/RetrofitT2.png

Binary file not shown.

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

BIN

assets/shop/guild/RetrofitT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/RetrofitT3.png

Binary file not shown.

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

BIN

assets/shop/guild/RetrofitT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild/ShipT2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild_cn/BookT2.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/BookT3.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/BoxT3.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/BoxT4.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/CatT1.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/CatT2.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/CatT3.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/Chip.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/FoodT5.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/FoodT6.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/PR.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/PlateT2.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/PlateT3.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/PlateT4.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/RetrofitT2.png

Binary file not shown.

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

BIN

assets/shop/guild_cn/RetrofitT3.png

Binary file not shown.

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

BIN

assets/shop/medal/BookBlueT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BookBlueT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BookRedT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BookRedT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BookYellowT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BookYellowT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BoxIrisT2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BoxIrisT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BulinT1_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/BulinT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/DRS5_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/FoodT5_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/FoodT6_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PRS5_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateAntiAirT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateAntiAirT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateGeneralT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateGeneralT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateGunT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateGunT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlatePlaneT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlatePlaneT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateTorpedoT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateTorpedoT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateWildT1_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateWildT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PlateWildT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/RetrofitT1_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/RetrofitT2_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/RetrofitT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/ShipT4.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/ShipT4_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/merit/BoxIrisT2.png Normal file

Binary file not shown.

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

BIN

assets/shop/merit/BoxT1_2.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/SERIES_DETAIL.png

Binary file not shown.

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