guoh064
1ac5298fb0
tmp: goto event 20221124 cn correctly
2025-07-26 13:30:49 +09:00
Zuosizhu
b8d12c405f
Merge branch 'master_lme' into brocore_dev
...
# Conflicts:
# config/template.json
# module/awaken/awaken.py
# module/config/argument/args.json
# module/config/argument/argument.yaml
# module/config/argument/menu.json
# module/config/config_generated.py
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/config/i18n/zh-TW.json
2025-07-25 11:46:23 +08:00
LmeSzinc
77f362f8bd
Upd: [EN] ALCHEMIST_MATERIAL_CONFIRM
2025-07-25 02:01:42 +08:00
LmeSzinc
7e6487487b
Merge pull request #4973 from LmeSzinc/dev
...
Add: The Alchemist and the Tower of Horizons (event_20250724_cn)
2025-07-25 00:50:17 +08:00
LmeSzinc
8bde7017d3
Upd: Handle event stories in event_20250724_cn
2025-07-25 00:41:53 +08:00
LmeSzinc
b13e92694b
Add: Chapter TS
2025-07-25 00:17:30 +08:00
LmeSzinc
021cc4e26d
Add: Chapter T
2025-07-24 23:35:47 +08:00
sui-feng-cb
6b49b92185
Add: war_archives_20220428_cn
2025-07-24 21:31:08 +08:00
LmeSzinc
310ccbae81
Bug fix ( #4965 )
...
* Fix: handle get items in research queue quit
* Fix: missing interval
* Opt: Awaken Favourite Ships Only (#4957 )
* Feature: Add 121 strategy for 15-4 | 给15-4添加121策略 (#4946 )
* Add 15-4 121 strategy
* Assign a different CampaignMap::name so load_campaign can differentiate 15-4 and 15-4(121)
* Fix campaign map name again to prevent unnecessary reloading
* Inherit map
* Fix: [ALAS] remove warnings from multiscreen devices
* Fix: [ALAS] Worker might graceful exited after killing
it cleaned up itself, so main thread can't delete it
* Fix: [CN] PRIVATE_QUARTERS_INTERACT button (#4964 )
---------
Co-authored-by: sui_feng <115386623+sui-feng-cb@users.noreply.github.com >
Co-authored-by: MetricVoid <21335640+Metric-Void@users.noreply.github.com >
2025-07-17 22:45:02 +08:00
HexatomicRing
4f0f2a2c87
Fix: Emulator no respond ( #4947 )
...
* Fix Leidian Emulator no respond
* [fix] assets name
* [fix] Avoid clearing stuck record
2025-07-17 22:44:28 +08:00
sui_feng
eef5249d18
Fix: [CN] PRIVATE_QUARTERS_INTERACT button ( #4964 )
2025-07-17 22:42:33 +08:00
Zuosizhu
de303b492e
Merge branch 'master_lme' into brocore_dev
...
# Conflicts:
# module/config/argument/override.yaml
# module/research/selector.py
# module/ui/ui.py
# module/webui/app.py
2025-07-11 23:03:05 +08:00
dragonheart107
4c016a7830
Fix: PQ home button moved ( #4942 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2025-07-11 21:49:37 +08:00
guoh064
a94dee218a
Merge pull request #4945 from guoh064/private_quarters
...
Add: [JP] assets for private quarters
2025-07-11 21:48:03 +08:00
LmeSzinc
532e4c2eee
Merge branch 'bug_fix' into dev
2025-07-11 00:14:29 +08:00
ChthoIly
9e91543a14
Add: [CN] Private Quarters localization ( #4933 )
...
* Upd: [CN] Private Quarters localization
Add: Add CN server asset for Private Quarters
Fix: Stuck in Private Quarters Shop when not enough gold coins
Changed DigitCounter OCR parameters for CN server to fix unexpected ocr result when reading daily intimacy count
* re-compress asset images using `image_fixup()` from #4849 (comment)
2025-07-11 00:04:28 +08:00
LmeSzinc
da837c391e
Upd: Research S8 series assets
2025-07-11 00:02:48 +08:00
LmeSzinc
6a80e8c190
Upd: [TW] assets for _reward_wait_mission_list
2025-07-10 02:41:31 +08:00
sui-feng-cb
3001ae011a
Add: war_archives_20220728_cn
2025-07-07 18:00:53 +08:00
LmeSzinc
ad10cd4c72
Upd: Battle UI Star
2025-07-04 23:41:29 +08:00
nEEtdo0d
b85b47d67c
Merge branch 'master' into dev
2025-06-28 16:11:37 -04:00
0O0o0oOoO00
171520adfb
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# config/template.json
# module/config/argument/args.json
# module/config/argument/menu.json
# module/config/argument/task.yaml
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/ui/ui.py
2025-06-28 23:09:47 +08:00
LmeSzinc
9e256ce249
Fix: NEONCITY UI back and home
2025-06-28 19:36:07 +08:00
dragonheart107
9b63eaee7c
Fix: assets for EN and JP
2025-06-27 22:18:08 +02:00
LmeSzinc
7a773a4c02
Fix: Check empty fleets in coalition
2025-06-27 00:32:14 +08:00
LmeSzinc
f6f7b7779d
Upd: UI page switching
2025-06-27 00:10:44 +08:00
LmeSzinc
118d80f61a
Add: Assets for coalition NEONCITY
2025-06-26 23:49:31 +08:00
0O0o0oOoO00
f64bc96bb2
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# config/deploy.template-AidLux-cn.yaml
# config/deploy.template-AidLux.yaml
# config/deploy.template-cn.yaml
# config/deploy.template-docker-cn.yaml
# config/deploy.template-docker.yaml
# config/deploy.template-linux-cn.yaml
# config/deploy.template-linux.yaml
# config/deploy.template.yaml
2025-06-17 13:19:30 +08:00
nEEtdo0d
f77aec689e
Add: [EN] Private Quarters support New Jersey; implement _pq_goto_room_seek and adapt asset's varying y-position for pq_interact
2025-06-15 17:09:52 -04:00
nEEtdo0d
64c5b5e30f
Merge branch 'master' into dev
2025-06-15 16:59:21 -04:00
LmeSzinc
d1015d9e39
Upd: [TW] BOX assets ( #4879 )
2025-06-14 01:31:41 +08:00
dragonheart107
86eaac9375
Merge pull request #4866 from dragonheart107/assets
...
Fix: Meta-sync asset change for EN
2025-06-10 17:56:24 +08:00
guoh064
7cef54d350
Add: check leveling in cl1 daily
2025-06-08 13:08:19 +09:00
ZuoSiZhu
573582a452
fix: color of icon stop_all change with style
2025-06-08 02:15:31 +08:00
guoh064
3b65dfe6f0
Add: check manjuu loading in os_mission_overview_accept
2025-06-06 01:57:43 +08:00
LmeSzinc
938d98a243
Fix: handle insufficient fund in guild operation
2025-06-06 01:39:18 +08:00
0O0o0oOoO00
45ac6bdf45
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/retire/assets.py
# module/retire/dock.py
2025-06-05 23:53:43 +08:00
dragonheart107
4172356a9a
Upd: [EN] DOCK_SELECTED ( #4850 )
2025-05-30 22:09:46 +08:00
guoh064
bea88a6280
tmp: [JP] asset SUPPLY_PACK_CHECK ( #4849 )
2025-05-30 22:04:16 +08:00
guoh064
fe44724016
tmp: [JP] asset DOCK_CHECK
2025-05-29 22:29:54 +08:00
LmeSzinc
98f14f41fe
Upd: [TW] Add BOX_USE
...
assets already update in previous commit
2025-05-27 00:16:39 +08:00
LmeSzinc
8426330813
Fix: [TW] Keep disassemble as before
2025-05-27 00:00:53 +08:00
xhqss
0339fe9dcc
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/event_hospital/assets.py
2025-05-25 15:18:10 +08:00
LmeSzinc
7b2bee4ba7
Fix: [TW] handle clue popup with text only ( #4819 )
2025-05-24 23:36:12 +08:00
LmeSzinc
4a625e8990
Fix: TEMPLATE_MOONLIT_OVERTURE is not defined in assets
2025-05-24 23:12:01 +08:00
LmeSzinc
9acdac8089
Chore: cleanup unused assets
2025-05-24 23:08:43 +08:00
LmeSzinc
c4189ee9e1
Upd: [TW] hospital assets ( #4819 )
2025-05-23 20:57:31 +08:00
xhqss
791f4bfd5a
Merge branch 'master' into dev
2025-05-23 00:03:44 +08:00
LmeSzinc
23d4bd308e
Merge branch 'master' into dev
2025-05-22 14:23:40 +08:00
LmeSzinc
06fc46147f
Upd: Battle UI Seaside
2025-05-22 00:30:26 +08:00
