LA_DI_DA 15dbb46cc3 Merge branch 'refs/heads/LmeSzinc/master' into dev ...

# Conflicts:
#	module/config/argument/args.json
#	module/exercise/combat.py
#	module/os/map.py

2024-09-15 18:06:15 +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

Add: Support Battle UI theme

2024-09-15 04:34:14 +08:00

combat_ui

Add: Support Battle UI theme

2024-09-15 04:34:14 +08:00

commission

Refactor: Rename main configs

2021-09-15 23:32:31 +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

Add: Maritime escort

2022-01-15 22:17:34 +08:00

exercise

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-15 18:06:15 +08:00

freebies

Fix: Select all mails to delete

2024-07-27 01:35:13 +08:00

gacha

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

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

guild

Upd: [TW] EXP_INFO_CF (#4164)

2024-09-11 01:42:47 +08:00

handler

Upd: [TW] MOB_MOVE_CANCEL (#3922)

2024-06-27 22:51:59 +08:00

hard

…

map

Add: Switch mode in map preparation

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

meowfficer

Upd:[TW]Update Meowfficer assets (#3341)

2023-12-08 18:02:31 +08:00

minigame

Opt: Choose minigame by scroll

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

os

Fix: [TW] MAP_NAME, it should as long as CN

2023-01-03 02:33:45 +08:00

os_ash

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

os_combat

fix:[tw]os_combat assets

2022-11-08 11:55:39 +08:00

os_handler

Fix: current ap blocked by info bar (#4100)

2024-08-20 02:25:44 +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

Merge Lme/Master into dev

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

shop

Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT

2023-10-17 18:27:14 +08:00

sos

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

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

statistics

…

storage

Upd: Copy static storage assets to all servers

2022-08-23 01:14:44 +08:00

tactical

Fix: Trying to handle books empty (#3753)

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

template

Upd: Update event Ode of Everblooming Crimson(event_20240912_cn)

2024-09-13 18:38:43 +08:00

ui

Upd: [TW] Dorm menu assets

2024-05-24 03:02:51 +08:00

ui_white

Fix: Leave memories tab (fixed #3956)

2024-07-03 22:46:41 +08:00

war_archives

Upd:[TW]war_archives assets (#3490)

2024-02-18 01:37:15 +08:00