Zuosizhu
d1174a7d88
Merge remote-tracking branch 'Lme/master' into unrefactor
...
# Conflicts:
# module/campaign/campaign_event.py
# module/campaign/os_run.py
# module/coalition/coalition.py
# 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/os/operation_siren.py
# module/os_handler/mission.py
# module/webui/app.py
2026-01-24 14:18:46 +08:00
LmeSzinc
b65a951ce4
Add: FASHION Coalition assets
2026-01-23 02:40:22 +08:00
Zuosizhu
5120649acb
Merge remote-tracking branch 'Lme/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/config/argument/menu.json
# module/config/argument/task.yaml
# module/config/i18n/en-US.json
2025-11-27 21:53:49 +08:00
guoh064
58ddb01976
Tmp: general config modification for coalition_20251120
2025-11-23 01:56:21 +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
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
LmeSzinc
f6f7b7779d
Upd: UI page switching
2025-06-27 00:10:44 +08:00
guoh064
e2b7590bc8
Opt: allow entering page_mail from page_main ( #4752 )
2025-05-17 10:07:51 +08:00
nEEtdo0d
09caf9704f
Add: [EN] Private Quarters support
2025-04-27 13:12:08 -04:00
guoh064
808be69e9e
Opt: allow entering page_mail from page_main ( #4752 )
2025-04-25 00:00:21 +08:00
xhqss
f35c9d289f
Brute-force porting of LME updates to the event_20250417 branch
2025-04-18 00:07:46 +08:00
LmeSzinc
84da230fd9
Upd: Toggle coalition to Frostfall
2025-04-17 22:13:06 +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
b0bf81daa3
Add: Basic hospital event
2025-03-28 00:22:21 +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
9ddbe2eadf
Fix: Leave page_channel during ui switching
2025-02-19 00:16:09 +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
35fbc03212
Upd: UI switches from page_main_white to page_raid
2025-01-17 13:29:46 +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
LmeSzinc
8366b71f81
Add: page_dock
2025-01-04 03:05:05 +08:00
LA_DI_DA
89be3580ec
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/ui/page.py
2024-08-17 21:48:52 +08:00
LmeSzinc
c5fa19dbb1
Fix: Goto page_rpg_stage from page_campaign_menu
2024-08-02 02:56:33 +08:00
LmeSzinc
d79859e6ed
Upd: [TW] rpg page definition
2024-08-01 23:33:47 +08:00
LA_DI_DA
327225e74d
Add: show player info in dashboard
...
commits:
Adj: rename update player info function
Fix: use play exp record to check time
Add: show exp and level of player in dashboard
2024-07-21 12:53:55 +08:00
LmeSzinc
06143434a8
Add: Claim mail rewards
2024-07-18 22:20:50 +08:00
LmeSzinc
752d4ea043
Add: UI switches to page_coalition
2024-06-28 00:28:03 +08:00
LmeSzinc
33cefa9817
Pref: Remove rpg page definition since event was over
2024-06-05 02:55:47 +08:00
LmeSzinc
77d48937fc
Fix: Handle mail full popup
2024-06-03 10:22:06 +08:00
LmeSzinc
ecfd5d50bf
Upd: [CN] Support UI in 2024.05.21
2024-05-23 01:16:41 +08:00
LmeSzinc
ba47dcce1a
Opt: Use MAIN_GOTO_FLEET instead of MAIN_GOTO_CAMPAIGN for faster switches with info_bar
2024-04-20 03:01:32 +08:00
LmeSzinc
e8909f4d59
Add: UI switches in RPG raid
2024-03-29 02:17:47 +08:00
yypsybs
c0b9045909
Add: minigame
2023-07-04 10:06:44 +08:00
LmeSzinc
2f771d8ca5
Refactor: [ALAS] Page class
...
Path findings in page class
2023-07-02 15:24:40 +08:00
LmeSzinc
2c39f195f8
Add: [CN] Raid assets of Reflections of the Oasis
2023-06-30 16:05:15 +08:00
LmeSzinc
ccb26acd99
Fix: Comment links of page_raid temporarily
...
since this event shares the same title with raid
2023-05-28 19:56:07 +08:00
LmeSzinc
14870c6807
Fix: ui switches to page_coalition
2023-03-24 05:31:26 +08:00
freesrz93
faf5a74e56
Add: Use tech box & Disassemble equipments
...
Opt: check GET_ITEMS_CONTINUE to disassemble faster
Fix: material_enter may enter disassemble
Fix: can't select equipments with info bar
Opt: no need to use OCR
Opt: Use less templates
Refactor: StorageHandler
Fix: threshold too low
2022-08-21 08:56:49 +08:00
LmeSzinc
1f1141a1f5
Fix: Clicked GET_SHIP when exiting page_meowfficer ( #1273 )
...
- Rename MEOWFFICER_GOTO_DORM to MEOWFFICER_GOTO_DORMMENU for clarity
2022-07-02 16:06:24 +08:00
LmeSzinc
9266f3b3fc
Add: Receive META rewards ( #863 )
2022-02-12 23:05:23 +08:00
LmeSzinc
ff7c875f3f
Add: Collect battle pass rewards
2021-12-03 17:32:10 +08:00
LmeSzinc
9d3917677e
Add: Buy free weekly supplies pack
2021-11-27 15:23:13 +08:00
LmeSzinc
e1f6df02bd
Opt: Faster switch between page_event and page_campaign
...
- Fix: Unable to run dev_tools because task not bind
2021-09-26 17:11:22 +08:00
nEEtdo0d
75cd81e7a1
Upd: commented with explanation
2021-07-18 10:07:44 -04:00
nEEtdo0d
0477870c41
Fix: Resolve merge conflict ui/ui.py and ui/assets.py
2021-07-18 10:05:21 -04:00
nEEtdo0d
5a26228082
Add: [EN] page support shipyard
...
TODO: [CN, JP, TW] update SHIPYARD_CHECK for respective server
2021-07-12 22:11:44 -04:00
nEEtdo0d
c1f299137b
Add: [EN] shop related pages support
...
TODO: [CN, TW, JP] replace with respective for their server
2021-07-10 22:52:29 -04:00
LmeSzinc
dc9b49b67b
Add: UI switches for page_os
2021-01-15 17:38:06 +08:00
