0O0o0oOoO00
fce2f7b9e0
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/config/i18n/zh-TW.json
2026-05-01 12:08:12 +08:00
LmeSzinc
be200d4a3f
Merge branch 'dev'
2026-05-01 04:34:12 +08:00
LmeSzinc
f36ae75ed3
Fix: Switch ui from other DOA events to event_20250424_cn
2026-05-01 04:15:35 +08:00
guoh064
96c1317887
Upd: [JP] assets REWARD_*.BUTTON ( #5644 )
...
to avoid collision with REWARD_*_WHITE and misclicking
2026-05-01 03:04:49 +08:00
guoh064
0c26c5a355
Upd: event entrance for dual event 20201126/20260417
2026-05-01 03:04:34 +08:00
LmeSzinc
0dbac1950a
Upd: [CN] EVENT_20201126_ENTRANCE_TEMP
2026-05-01 03:04:34 +08:00
LmeSzinc
7466a3882d
Upd: [CN] EVENT_20201126_ENTRANCE_TEMP
2026-04-26 05:49:31 +08:00
xhqss
523aebb767
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/config/argument/override.yaml
2026-04-25 15:09:43 +08:00
ArecaSapling
9e58a9d8d4
Upd: [EN] asset EVENT_20201126_ENTRANCE_TEMP ( #5630 )
2026-04-24 23:58:11 +08:00
LmeSzinc
2c938c9dbf
Merge pull request #5625 from guoh064/event_rerun
...
Add: event entrance for dual event 20201126/20260417
2026-04-24 18:53:06 +08:00
LmeSzinc
32ad98a79f
Upd: [EN] EVENT_LIST_CHECK ( #5623 )
2026-04-24 18:48:40 +08:00
guoh064
cb061d9a5e
Upd: [JP] asset MISSION_UNFINISH ( #5626 )
2026-04-24 18:33:11 +08:00
guoh064
f6b44d6582
Add: event entrance for dual event 20201126/20260417
2026-04-24 14:52:43 +08:00
xhqss
6b0eb81ec4
Add support build feature
2026-04-24 00:06:49 +08:00
LmeSzinc
4b83292c9e
Upd: opsi shop asset templates ( #5617 )
2026-04-21 23:56:47 +08:00
0O0o0oOoO00
e38ec5aa81
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/config/i18n/zh-TW.json
2026-04-18 15:54:19 +08:00
LmeSzinc
53d8ff8099
Upd: Shop cost icons
2026-04-18 03:28:45 +08:00
LmeSzinc
45faa7c46d
Add: Chapter SP
2026-04-18 02:54:46 +08:00
heipen
5cf249c8e7
Merge pull request #5595 from Heipen/ui_update
...
Upd: Battle UI ElvenVine
2026-04-03 22:44:37 +08:00
0O0o0oOoO00
ecd631965f
add: instance status icon
2026-04-01 17:16:44 +08:00
0O0o0oOoO00
ed21c2c4c1
del: remove april fool's day rotating icon
2026-04-01 16:32:26 +08:00
LmeSzinc
032b2c1931
Fix: Limit match area of SHOP_REFRESH
...
to handle spamming bulin character at bottom-right of shop page, at April 1st
2026-04-01 01:17:12 +08:00
0O0o0oOoO00
7b81911312
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-03-30 17:02:14 +08:00
LmeSzinc
33e812adb8
Merge pull request #5455 from guoh064/campaign_16_main
...
Add: W16 preparations
2026-03-29 19:26:04 +08:00
0O0o0oOoO00
8c6cb6de90
Revert "Add: hide_in_upper_left option for combat manual"
...
This commit was manually merged into this repository earlier, and later guoh064 merged this commit into LmeSzinc’s repository.
This reverts commit 13aba919a2
2026-03-13 10:44:35 +08:00
0O0o0oOoO00
ea306079e4
Revert "Upd: asset COMBAT_AUTO"
...
This commit was manually merged into this repository earlier, and later guoh064 merged this commit into LmeSzinc’s repository.
This reverts commit 947f66c915
2026-03-13 10:38:09 +08:00
xhqss
1af31e1d91
Merge branch 'master_LME' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/config/i18n/zh-TW.json
2026-03-12 22:15:51 +08:00
guoh064
3f9e7edf4e
Add: hide_in_upper_left option for combat manual
2026-03-12 18:46:50 +08:00
guoh064
5611dce94b
Upd: asset COMBAT_AUTO
2026-03-12 18:46:50 +08:00
0O0o0oOoO00
f2635d64ba
upd: update patched GUILD_DISPATCH_FLEET_UNFILLED for jp
2026-03-06 07:56:33 +08:00
heipen
dbc5fe42e8
Upd: Battle UI SpringInn ( #5541 )
2026-03-04 12:32:12 +08:00
0O0o0oOoO00
d797b30488
Revert "fix: Temporary New year Academy check"
...
This reverts commit e784b293f9
2026-02-26 16:52:05 +08:00
guoh064
947f66c915
Upd: asset COMBAT_AUTO
2026-02-19 23:55:40 +08:00
guoh064
13aba919a2
Add: hide_in_upper_left option for combat manual
2026-02-19 23:29:58 +08:00
guoh064
9b98060c4d
Add: Raid Scuttle function
2026-02-19 23:10:38 +08:00
0O0o0oOoO00
f5172b27f1
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
2026-02-14 13:50:42 +08:00
LmeSzinc
9bb8e191ac
Upd: [EN][JP][TW] Raid CHANGWU assets
2026-02-14 03:30:49 +08:00
0O0o0oOoO00
e784b293f9
fix: Temporary New year Academy check
2026-02-12 18:57:07 +08:00
sui-feng-cb
7e6b87bee8
Add: [CN] Spring Auction Adventure (raid_20260212)
2026-02-12 16:44:24 +08:00
LmeSzinc
7118c30fea
Upd: [EN] TEMPLATE_REVELATIONS_OF_DUST
2026-02-09 23:40:21 +08:00
LmeSzinc
7d9e77e4fd
Upd: Battle UI Ancient
2026-02-09 23:31:47 +08:00
ArecaSapling
5a32d9444c
Merge pull request #5500 from sui-feng-cb/event_update
...
Fix: raid_20240328 ex
2026-02-09 23:23:20 +08:00
0O0o0oOoO00
c76017a4dc
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
2026-02-06 21:57:03 +08:00
sui-feng-cb
7e1a2322a6
Fix: use _raid_has_oil_icon for new UI design
2026-02-05 21:44:55 +08:00
guoh064
eb33bdd747
Fix: slow retrial for MISSION_OVERVIEW_ACCEPT(_SINGLE) ( #5487 )
2026-02-04 18:26:41 +08:00
LmeSzinc
bb349af001
Upd: [TW] Coalition assets
2026-01-31 03:25:17 +08:00
ArecaSapling
52444569a4
Add: war_archives_20230223_cn ( #5479 )
2026-01-30 10:56:16 +08:00
0O0o0oOoO00
d4c3536af9
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-01-23 17:45:36 +08:00
LmeSzinc
f314caa862
Upd: [EN][JP] Coalition FASHION assets
2026-01-23 16:24:56 +08:00
guoh064
d8bba0331f
Upd: [CN] asset AIR_STRIKE_*
2026-01-23 16:12:50 +08:00
