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
LmeSzinc
532e4c2eee
Merge branch 'bug_fix' into dev
2025-07-11 00:14:29 +08:00
LmeSzinc
6a80e8c190
Upd: [TW] assets for _reward_wait_mission_list
2025-07-10 02:41:31 +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
f6f7b7779d
Upd: UI page switching
2025-06-27 00:10:44 +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
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
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
c4189ee9e1
Upd: [TW] hospital assets ( #4819 )
2025-05-23 20:57:31 +08:00
LmeSzinc
23d4bd308e
Merge branch 'master' into dev
2025-05-22 14:23:40 +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
fad7c027a3
Fix: enter minigame ended at minigame menu ( #4758 )
2025-05-19 01:48:29 +08:00
LmeSzinc
ef61702057
Upd: [TW] QUIT_Cyber and QUIT_New in different font weight ( fixed #4798 )
2025-05-18 16:16:05 +08:00
LmeSzinc
79d72c4fa0
Merge branch 'master' into dev
...
# Conflicts:
# module/device/method/pool.py
2025-05-18 03:15:41 +08:00
LmeSzinc
7f54ae8234
Upd: [TW] ENHANCE_CONFIRM and ENHANCE_RECOMMEND
2025-05-18 03:12:30 +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
silvergundam
73eaab8ace
Merge remote-tracking branch 'lme/master' into dev
2025-04-03 11:57:44 +08:00
LmeSzinc
c4013aaea9
Upd: [TW] QUIT_New
2025-03-29 01:09:54 +08:00
guoh064
e8afd8a5a9
Merge remote-tracking branch 'guoh064/shop_event_3' into dev
2025-03-23 21:32:39 +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
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
hephooey
419f2ed6d5
[TW] Event: Spring Fashion Festa ( #4539 )
2025-01-27 17:56:45 +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
2bf1894ca7
Upd: [TW] Battle pass assets
2025-01-16 18:30:19 +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
LmeSzinc
b72095e39f
Upd: [TW] Raid assets of raid_20240130
2025-01-04 22:33:31 +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
xhqss
d8d70b2607
Merge branch 'master_lme'
2024-11-23 00:08:44 +08:00
LmeSzinc
64b3122127
Add: Chapter T
2024-11-22 21:25:41 +08:00
LA_DI_DA
07d61ec68b
Merge branch 'refs/heads/LmeSzinc/master' into dev
2024-10-25 23:28:19 +08:00
LmeSzinc
847dcd847b
Add: Chapter T
2024-10-25 19:37:55 +08:00
LA_DI_DA
a2e6986dcd
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/campaign/campaign_status.py
# module/exercise/combat.py
# module/retire/dock.py
# module/retire/enhancement.py
2024-10-25 12:01:29 +08:00
Air111
98e6d1397c
Upd: [TW] Assets for COALITION_ACADEMY
2024-10-20 22:36:01 +08:00
Air111
b5dd289e44
Opt: search archives entrance ( #4284 )
...
* Upd: re-crop war_archives templates to reduce height
* Opt: full scan archives_entrance twice
2024-10-16 12:50:23 +08:00
LmeSzinc
32f118f653
Upd: Exercise HP daemon on new battle UI theme
...
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com >
2024-09-25 14:27:49 +08:00
