Zuosizhu 1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev ...

# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py

2024-07-26 08:04:44 +08:00

..

campaign

Merge remote-tracking branch 'refs/remotes/Lme/master' into dev

2024-07-26 08:04:44 +08:00

coalition

Add: [EN] Assets for coalition_20240627

2024-06-28 03:00:47 +08:00

combat

Upd: [EN] BATTLE_PREPARATION

2024-03-29 09:23:46 +08:00

commission

Upd: [EN][JP] Assets in page_reward

2024-05-22 01:15:18 +08:00

daily

Add: Emergency module development daily

2023-03-17 00:34:02 +08:00

dorm

Add: Quick collection of coins and loves in the Dorm. (#3837)

2024-07-03 22:27:22 +08:00

equipment

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

event

Upd: [EN] remove alpha channel in assets

2022-04-12 22:59:48 -04:00

exercise

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

freebies

Add: Claim mail rewards

2024-07-18 22:20:50 +08:00

gacha

Fix: Error caused by empty build queue (#2816)

2023-06-30 15:32:41 +08:00

guild

Upd: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF

2023-06-10 01:39:23 +08:00

handler

Upd: [EN] MOB_MOVE_CANCEL

2024-06-28 09:12:18 +08:00

hard

…

map

Add: Switch mode in map preparation

2024-07-26 02:20:15 +08:00

meowfficer

Upd: Update EN meowfficer assets

2023-11-18 14:37:43 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Opt: Choose minigame by scroll

2023-08-08 00:03:41 +08:00

os

Fix: [EN] Update FLEET_* in OpSi

2022-12-16 21:42:36 +08:00

os_ash

Upd: [EN] various assets for server; war_archive, os_ash, template, and handler

2023-06-30 18:00:33 -04:00

os_combat

Upd: [EN] remove alpha channel in assets

2022-04-12 22:59:48 -04:00

os_handler

Feature: New OpsiShop. (#3086)

2024-06-17 11:24:40 +08:00

os_shop

Feature: New OpsiShop. (#3086)

2024-06-17 11:24:40 +08:00

raid

Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL

2024-03-29 03:21:10 +08:00

research

Upd: Detect research series 7

2024-07-12 00:07:25 +08:00

retire

Merge Lme/Master into dev

2024-07-22 16:45:29 +08:00

reward

Mov: reward mail support to separate module

2022-10-16 01:01:15 -04:00

shipyard

Upd: Series selecting page in shipyard

2024-07-12 00:31:34 +08:00

shop

fix: shop confirm amount buttom (#3001)

2023-08-11 19:05:52 +08:00

sos

Fix: [EN] Confirm button in SOS signal search list

2022-12-07 01:38:57 +08:00

statistics

…

storage

updata EN box button (fix#3015) (#3017)

2023-08-15 18:40:55 +08:00

tactical

Fix: Trying to handle books empty (#3753)

2024-06-11 23:38:43 +08:00

template

Add: Chapter SP

2024-07-26 02:46:17 +08:00

ui

Upd: [CN] Support UI in 2024.05.21

2024-05-23 01:16:41 +08:00

ui_white

Merge Lme/Master into dev

2024-07-22 16:45:29 +08:00

war_archives

Upd: [EN] various assets for server; war_archive, os_ash, template, and handler

2023-06-30 18:00:33 -04:00