mulaikurisu 0067321df9 Merge remote-tracking branch '0O0o0oOoO00-alas/smallkai' into dev ...

# Conflicts:
#	module/config/argument/args.json

2024-01-31 18:40:47 +08:00

..

campaign

Merge branch 'master_lme'

2023-08-19 09:23:28 +08:00

coalition

Fix: [JP] Asset problem caused by UI hotfix (#2400)

2023-03-24 22:46:18 +08:00

combat

Upd: BATTLE_STATUS_*

2023-05-26 00:55:35 +08:00

commission

…

daily

Add: Emergency module development daily

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

device

Add: others' login check for jp

2023-12-15 23:19:57 +08:00

dorm

Fix: Accidentally entered dorm manage and shop

2023-12-23 00:50:25 +08:00

equipment

…

event

…

exercise

Upd: EXP_INFO_* and the exercise one

2023-05-25 21:45:19 +08:00

freebies

…

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: [JP] SUBMARINE_MOVE_*

2023-12-14 19:16:23 +08:00

hard

…

map

Fix: [JP] SUBMARINE_BAR

2023-10-22 21:51:52 +08:00

meowfficer

Upd: [JP] Meowfficer assets (#3291)

2023-11-19 18:55:51 +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

…

os_ash

…

os_combat

…

os_handler

Fix(JP): Asset of SHOP_BUY_CONFIRM (#3097)

2023-09-10 14:44:47 +08:00

raid

Add: Add raid event Spring Festive Fiasco(raid_20240130)

2024-01-31 10:57:34 +08:00

research

Fix: get_research_series() (#2975)

2023-08-06 17:40:43 +08:00

retire

Upd: [JP] RETIRE_COIN (#3267)

2023-11-09 15:35:31 +08:00

reward

…

shipyard

…

shop

fix: shop confirm amount buttom (#3001)

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

sos

…

statistics

…

storage

…

tactical

…

template

Upd: Siren templates

2023-12-23 00:38:13 +08:00

ui

Add: Add raid event Spring Festive Fiasco(raid_20240130)

2024-01-31 10:57:34 +08:00

war_archives

…