Merge branch 'master' of LmeSzinc

Browse Source

...

This commit is contained in:

sui-feng-cb

2024-06-27 17:51:35 +08:00

parent 00839eabec 6ee037084b

commit 938ba056e3

123 changed files with 1239 additions and 387 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/os_shop/OS_SHOP_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_shop/OS_SHOP_PURPLE_COINS.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_shop/OS_SHOP_SAFE_AREA.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_shop/OS_SHOP_SCROLL_AREA.png Normal file

Binary file not shown.

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

0

assets/cn/os_handler/PORT_SUPPLY_CHECK.png → assets/cn/os_shop/PORT_SUPPLY_CHECK.png

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

0

assets/cn/os_handler/SHOP_BUY_CONFIRM.png → assets/cn/os_shop/SHOP_BUY_CONFIRM.png

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

0

assets/cn/os_handler/SHOP_PURPLE_COINS.png → assets/cn/os_shop/SHOP_PURPLE_COINS.png

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

0

assets/cn/os_handler/SHOP_YELLOW_COINS.png → assets/cn/os_shop/SHOP_YELLOW_COINS.png

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

BIN

assets/en/os_shop/OS_SHOP_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/en/os_shop/OS_SHOP_PURPLE_COINS.png Normal file

Binary file not shown.

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

BIN

assets/en/os_shop/OS_SHOP_SAFE_AREA.png Normal file

Binary file not shown.

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

BIN

assets/en/os_shop/OS_SHOP_SCROLL_AREA.png Normal file

Binary file not shown.

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

0

assets/en/os_handler/PORT_SUPPLY_CHECK.png → assets/en/os_shop/PORT_SUPPLY_CHECK.png

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

0

assets/en/os_handler/SHOP_BUY_CONFIRM.png → assets/en/os_shop/SHOP_BUY_CONFIRM.png

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

0

assets/en/os_handler/SHOP_PURPLE_COINS.png → assets/en/os_shop/SHOP_PURPLE_COINS.png

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

0

assets/en/os_handler/SHOP_YELLOW_COINS.png → assets/en/os_shop/SHOP_YELLOW_COINS.png

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

BIN

assets/jp/os_shop/OS_SHOP_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_shop/OS_SHOP_PURPLE_COINS.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_shop/OS_SHOP_SAFE_AREA.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_shop/OS_SHOP_SCROLL_AREA.png Normal file

Binary file not shown.

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

0

assets/jp/os_handler/PORT_SUPPLY_CHECK.png → assets/jp/os_shop/PORT_SUPPLY_CHECK.png

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

0

assets/jp/os_handler/SHOP_BUY_CONFIRM.gif → assets/jp/os_shop/SHOP_BUY_CONFIRM.gif

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

0

assets/jp/os_handler/SHOP_PURPLE_COINS.png → assets/jp/os_shop/SHOP_PURPLE_COINS.png

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

0

assets/jp/os_handler/SHOP_YELLOW_COINS.png → assets/jp/os_shop/SHOP_YELLOW_COINS.png

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

BIN

assets/shop/os/ActionPoint100_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/ActionPoint100_5.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/ActionPoint50_1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/DevelopmentMaterialT1_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/DevelopmentMaterialT2_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/EmptyT1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/EmptyT2.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/EmptyT3.png Normal file

Binary file not shown.

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

0

assets/shop/os/GearDesign PlanT2.png → assets/shop/os/GearDesignPlanT2.png

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

0

assets/shop/os/GearDesign PlanT2_2.png → assets/shop/os/GearDesignPlanT2_2.png

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

0

assets/shop/os/GearDesign PlanT3.png → assets/shop/os/GearDesignPlanT3.png

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

BIN

assets/shop/os/GearDesignPlanT3_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/GearPartSpecialized_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/GearPartSpecialized_2.png

Binary file not shown.

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

BIN

assets/shop/os/LoggerAbyssalT3_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/LoggerAbyssalT3_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/LoggerAbyssalT4_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/LoggerAbyssalT4_1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/METARedBookT1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/METARedBookT2.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/METARedBookT2_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/OrdnanceTestingReportT1_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/OrdnanceTestingReportT1_1.png Normal file

Binary file not shown.

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

0

assets/shop/os/OrdnanceTestingReportT2_2.png → assets/shop/os/OrdnanceTestingReportT2_0.png

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

BIN

assets/shop/os/OrdnanceTestingReportT2_1.png Normal file

Binary file not shown.

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

0

assets/shop/os/OrdnanceTestingReportT3_2.png → assets/shop/os/OrdnanceTestingReportT3_0.png

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

BIN

assets/shop/os/OrdnanceTestingReportT3_3.png

Binary file not shown.

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

BIN

assets/shop/os/OrdnanceTestingReportT3_4.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/OrdnanceTestingReportT3_5.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/PlateRandomT4_1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/PurpleCoins_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/RepairPackFull2_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/RepairPackFull_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/RepairPackTriple2_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/TuningCombatT2_1.png Normal file

Binary file not shown.

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

0

assets/shop/os/TuringSampleCombat.png → assets/shop/os/TuningSampleCombat.png

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

BIN

assets/shop/os/TuningSampleCombat_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os/TuningSampleCombat_1.png Normal file

Binary file not shown.

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

0

assets/shop/os/TuringSampleCombat_2.png → assets/shop/os/TuningSampleCombat_2.png

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

0

assets/shop/os/TuringSampleCombat_3.png → assets/shop/os/TuningSampleCombat_3.png

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

0

assets/shop/os/TuringSampleCombat_4.png → assets/shop/os/TuningSampleCombat_4.png

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

0

assets/shop/os/TuringSampleCombat_5.png → assets/shop/os/TuningSampleCombat_5.png

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

0

assets/shop/os/TuringSampleOffence.png → assets/shop/os/TuningSampleOffence.png

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

0

assets/shop/os/TuringSampleOffence_2.png → assets/shop/os/TuningSampleOffence_2.png

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

0

assets/shop/os/TuringSampleOffence_3.png → assets/shop/os/TuningSampleOffence_3.png

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

0

assets/shop/os/TuringSampleSurvival.png → assets/shop/os/TuningSampleSurvival.png

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

0

assets/shop/os/TuringSampleSurvival_2.png → assets/shop/os/TuningSampleSurvival_2.png

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

0

assets/shop/os/TuringSampleSurvival_3.png → assets/shop/os/TuningSampleSurvival_3.png

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

0

assets/shop/os/TuringSampleSurvival_4.png → assets/shop/os/TuningSampleSurvival_4.png

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

BIN

assets/shop/os/TuningSurvivalT2_0.png Normal file

Binary file not shown.

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

BIN

assets/shop/os_cost/EnergyStorage_1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os_cost/PurpleCoins_1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os_cost/PurpleCoins_3.png Normal file

Binary file not shown.

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

BIN

assets/shop/os_cost/YellowCoins_1.png Normal file

Binary file not shown.

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

BIN

assets/shop/os_cost_sold_out/EnergyStorage.png Normal file

Binary file not shown.

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

BIN

assets/shop/os_cost_sold_out/PurpleCoins.png Normal file

Binary file not shown.

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

BIN

assets/shop/os_cost_sold_out/YellowCoins.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_shop/OS_SHOP_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_shop/OS_SHOP_PURPLE_COINS.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_shop/OS_SHOP_SAFE_AREA.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_shop/OS_SHOP_SCROLL_AREA.png Normal file

Binary file not shown.

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

0

assets/tw/os_handler/PORT_SUPPLY_CHECK.png → assets/tw/os_shop/PORT_SUPPLY_CHECK.png

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

0

assets/tw/os_handler/SHOP_BUY_CONFIRM.png → assets/tw/os_shop/SHOP_BUY_CONFIRM.png

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

0

assets/tw/os_handler/SHOP_PURPLE_COINS.png → assets/tw/os_shop/SHOP_PURPLE_COINS.png

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

0

assets/tw/os_handler/SHOP_YELLOW_COINS.png → assets/tw/os_shop/SHOP_YELLOW_COINS.png

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