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
guoh064
a94dee218a
Merge pull request #4945 from guoh064/private_quarters
...
Add: [JP] assets for private quarters
2025-07-11 21:48:03 +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
dragonheart107
9b63eaee7c
Fix: assets for EN and JP
2025-06-27 22:18:08 +02:00
LmeSzinc
f6f7b7779d
Upd: UI page switching
2025-06-27 00:10:44 +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
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
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
xhqss
0339fe9dcc
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/event_hospital/assets.py
2025-05-25 15:18:10 +08:00
LmeSzinc
9acdac8089
Chore: cleanup unused assets
2025-05-24 23:08:43 +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
242b964981
Upd: [JP] BOX assets ( #4814 )
2025-05-21 23:44:58 +08:00
ZuoSiZhu
dee0c1484f
Merge branch 'master_lme' into dev
...
# Conflicts:
# campaign/Readme.md
# module/base/utils.py
# module/coalition/assets.py
# 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
# module/handler/login.py
# module/retire/dock.py
# module/retire/enhancement.py
# module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
LmeSzinc
fe1606bb0d
Upd: [EN][JP] MISSION_EMPTY MISSION_UNFINISH
2025-05-20 23:55:12 +08:00
LmeSzinc
fad7c027a3
Fix: enter minigame ended at minigame menu ( #4758 )
2025-05-19 01:48:29 +08:00
nEEtdo0d
3eb37033a1
Opt: Private Quarters white click safe area, reduces asset file size
...
Opt: ui_click toggle to skip_first_screenshot=True
Opt: extra condition to ensure interact sequence finished and can be exited under normal circumstances
2025-05-02 16:58:46 -04:00
nEEtdo0d
01a17d7677
Add: [CN][JP][TW] Private Quarters placeholder assets; replace as needed
2025-04-27 13:12:52 -04:00
LA-DI-DA
62c33f27e0
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
LmeSzinc
e50c984211
Fix: Re-compress assets/jp/combat_ui/QUIT.png to fixup git hashing
2025-04-21 12:35:05 +08:00
LmeSzinc
1a0b027db3
Fix: [EN][JP] Rename Frostfall assets
2025-04-18 23:24:04 +08:00
LmeSzinc
15cf552963
Upd: Swap FROSTFALL_TC2 too
2025-04-18 19:47:00 +08:00
xhqss
f35c9d289f
Brute-force porting of LME updates to the event_20250417 branch
2025-04-18 00:07:46 +08:00
LmeSzinc
62d260db02
Upd: FROSTFALL_TC3 and FROSTFALL_SP are swapped
2025-04-17 22:27:13 +08:00
ZuoSiZhu
166b49f8f0
Merge branch 'master_lme' into dev
...
# Conflicts:
# alas.py
# module/config/config_manual.py
# module/ui/page.py
# module/ui/ui.py
2025-03-28 08:34:41 +08:00
LmeSzinc
7e1f9d0c3e
Upd: [JP] Hospital assets
2025-03-28 03:56:16 +08:00
ZuoSiZhu
58a217d98f
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/webui/app.py
# module/webui/config.py
2025-03-28 00:23:16 +08:00
guoh064
e8afd8a5a9
Merge remote-tracking branch 'guoh064/shop_event_3' into dev
2025-03-23 21:32:39 +08:00
LmeSzinc
b151c4292b
Upd: [JP] SYNC_ENTER
2025-03-16 11:40:46 +08:00
ZuoSiZhu
39c18d8103
Merge remote-tracking branch 'lme/master' into dev
...
# Conflicts:
# deploy/AidLux/0.92/requirements.txt
# module/campaign/campaign_event.py
# module/os/map.py
# module/os_ash/ash.py
# module/webui/config.py
2025-02-28 11:01:23 +08:00
LmeSzinc
b7e5bcf49c
Add: Chapter B
2025-02-27 23:03:27 +08:00
guoh064
bfcc847389
Upd: asset SHOP_GOTO_MUNITIONS
2025-02-23 10:55:35 +08:00
LmeSzinc
054a218574
Upd: [JP] Assets for Meta sync
2025-02-23 01:29:16 +08:00
LmeSzinc
ca0f483487
Upd: OCR_GUILD_OPERATIONS_PROGRESS ( fixed #4549 )
...
- TODO: [EN][JP][TW] Update OCR_GUILD_OPERATIONS_PROGRESS
2025-02-12 01:53:08 +08:00
guoh064
09b6bc179b
Upd: [JP] ash_collect_status ( #4554 )
2025-02-03 22:53:24 +08:00
guoh064
eb3f18b99d
Upd: asset COMBAT_AUTO
2025-01-26 21:49:34 +08:00
xhqss
baa8d2ccd7
Merge branch 'master_lme'
...
# Conflicts:
# README.md
# module/ui_white/assets.py
2025-01-19 15:59:20 +08:00
LmeSzinc
4582cb516b
Upd: [JP][TW] Awaken assets
2025-01-19 03:19:28 +08:00
LmeSzinc
372c3e74db
Add: [EN][JP] Assets in raid_20250416
2025-01-17 13:25:59 +08:00
xhqss
2ddc7fff1c
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/config/config_manual.py
# module/handler/assets.py
# module/retire/retirement.py
# module/tactical/tactical_class.py
2025-01-16 08:52:42 +08:00
dragonheart107
40961382f9
remove outdated EN -Mail assets, enable EN AUTO-Dossier ( #4478 )
...
* Add files via upload
* Delete assets/cn/freebies/assets.py
* Delete assets/cn/freebies/campaign_14_4.py
* Add files via upload
* Add files via upload
* fix mail
* replaced/removed old EN Mail assets; add EN for AUTO-Dossier; need assets for JP (maybe TW?)
* Better differentiation between META_AUTO-ATTACK_START and META_AUTO-ATTACKING for EN
* revert 14-4 changes due to further testing needed
* Add missing picture for the new UI py function
* updated button extract
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2025-01-15 23:28:41 +08:00
guoh064
ab9f2892dc
Upd: [JP] Opsi assets ( #4492 )
2025-01-06 18:31:52 +08:00
guoh064
e60ea81095
Add: [JP] asset GUILD_MISSION_NEW ( #4493 )
2025-01-06 18:31:26 +08:00
LmeSzinc
8366b71f81
Add: page_dock
2025-01-04 03:05:05 +08:00
LmeSzinc
b23ff47c50
Fix: Expand search area of MISSION_WEEKLY_RED_DOT
2025-01-01 21:39:54 +08:00
xhqss
e7f93d8efe
Merge branch 'master_lme'
...
# Conflicts:
# module/equipment/equipment.py
2024-12-20 23:51:48 +08:00
LmeSzinc
cc2cf0d046
Refactor: Abstract chapter switches from 20240725 to 20241219
2024-12-20 22:24:47 +08:00
