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
f552360951
Fix: Startup at coalition fleet preparation
2026-01-23 17:43:04 +08:00
LmeSzinc
b65a951ce4
Add: FASHION Coalition assets
2026-01-23 02:40:22 +08:00
xhqss
a5dc9328c9
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/coalition/coalition.py
# module/config/argument/args.json
# module/config/argument/menu.json
# module/config/argument/task.yaml
# module/config/config_generated.py
# module/os_shop/shop.py
2025-12-19 15:13:21 +08:00
whjhs1010203
9261630f77
Upd:[tw] research E ( #5382 )
...
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com >
2025-12-12 19:22:49 +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
369a12abfb
Fix: ui misclick in coalition_20251120
2025-11-25 12:53:26 +08:00
guoh064
58ddb01976
Tmp: general config modification for coalition_20251120
2025-11-23 01:56:21 +08:00
whjhs1010203
9563e149dc
Upd: [TW] PRIVATE_QUARTERS_CHECK ( #5317 )
...
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com >
2025-11-16 00:21:42 +08:00
xhqss
ad07ec150b
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/shop/ui.py
2025-11-07 18:11:22 +08:00
LmeSzinc
cd18378ad4
Fix: Avoid clicking GET_SHIP after entering page_meowfficer
2025-11-04 23:06:01 +08:00
xhqss
4137ff807c
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/map/assets.py
# module/shop/shop_reward.py
# module/ui/assets.py
2025-10-24 11:10:21 +08:00
whjhs1010203
ae9224f79e
Upd: [TW] BATTLE_PASS assets
2025-10-20 22:20:58 +08:00
whjhs1010203
bd4852a356
Upd: [TW] supply_pack
2025-10-20 10:42:03 +08:00
whjhs1010203
cac507229f
Upd: [TW] shop assets
2025-10-19 17:05:55 +08:00
dragonheart107
f9c25961bb
Fix: EN commission + mission reward ( #5230 )
...
* Revert "Tmp: [EN] Temp fix for bugged UI"
This reverts commit c06773e586
2025-10-18 02:25:24 +08:00
LmeSzinc
c06773e586
Tmp: [EN] Temp fix for bugged UI
2025-10-17 04:13:16 +08:00
xhqss
90c881fda0
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/coalition/coalition.py
# module/config/argument/args.json
# module/ui/assets.py
2025-10-17 00:30:43 +08:00
LmeSzinc
d0159db710
Upd: [JP] SUPPLY_PACK_CHECK
2025-10-14 22:05:26 +08:00
Compeador
20f4f64708
fix: shop MUNITIONS_CHECK ( #5210 )
2025-10-14 19:07:21 +08:00
Zuosizhu
65df98ba36
Fix: shop
2025-10-12 12:35:42 +08:00
Zuosizhu
31c99d8953
Merge remote-tracking branch 'Lme/master' into dev
...
# Conflicts:
# module/campaign/os_run.py
# module/config/argument/args.json
# module/os/operation_siren.py
# module/retire/assets.py
# module/shop/shop_reward.py
# module/shop/ui.py
# module/ui/assets.py
2025-10-12 11:28:13 +08:00
Zuosizhu
f64f777631
Upd: assets
2025-10-12 01:28:32 +08:00
nEEtdo0d
a61e93942d
Upd: [EN] UI, ShopUI, Freebies assets ( #5202 )
2025-10-10 21:20:18 +08:00
LmeSzinc
f5b92dae34
Upd: [CN] MUNITIONS_CHECK
2025-10-09 19:17:06 +08:00
LmeSzinc
e1b5ff7ba2
Upd: [CN] SUPPLY_PACK_CHECK
2025-10-09 18:33:35 +08:00
weeswelai
1f909110a5
Upd: Update shop UI, supply pack for server TW
2025-10-01 02:42:22 +08:00
0O0o0oOoO00
f65933e89a
Merge branch 'Lme/master' into dev
...
# Conflicts:
# README.md
# module/config/argument/args.json
2025-09-13 23:04:47 +08:00
LmeSzinc
4b5039fabf
Chore: Expose Switch timers
2025-09-13 20:34:22 +08:00
Zuosizhu
567e854546
Merge branch 'master_of_lme' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/gacha/gacha_reward.py
# module/shop/shop_reward.py
# module/ui/assets.py
2025-09-01 16:07:45 +08:00
nEEtdo0d
3d947fc72e
Fix: [EN] shop task; grid now uniform with other servers ( #5081 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2025-08-29 21:36:37 +08:00
nEEtdo0d
5a9a227ff8
Fix: [EN] shop and supply pack tasks
2025-08-26 21:23:14 -04:00
0O0o0oOoO00
e453c4464a
Merge branch 'Lme/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/shop/shop_reward.py
# module/shop/ui.py
# module/ui/assets.py
2025-08-25 23:46:48 +08:00
weeswelai
87257e65a8
Upd: Update new UI 20250814 for server JP, update CN assets
2025-08-21 23:59:59 +08:00
weeswelai
7562c8287c
Upd: Update server JP supply pack
2025-08-21 23:59:59 +08:00
weeswelai
b2f94c1685
Upd: Update server CN assets SUPPLY_PACK_CHECK
2025-08-21 23:59:59 +08:00
weeswelai
bb7d12c3cc
Upd: Update server TW assets
2025-08-21 23:59:59 +08:00
weeswelai
0f14b7693d
Upd: Update server CN 2025-08-14 new shop UI
2025-08-21 23:59:59 +08:00
0O0o0oOoO00
f96b13fea2
Merge branch 'Lme/master' into dev
...
# Conflicts:
# assets/cn/campaign/EVENT_20221124_ENTRANCE.png
# campaign/event_20221124_cn/campaign_base.py
# module/campaign/assets.py
# module/config/argument/override.yaml
# module/config/config_updater.py
# module/retire/assets.py
# module/shop/shop_reward.py
2025-08-16 14:24:45 +08:00
nEEtdo0d
a05403efda
Opt: Private Quarters refactor
...
Fix: addresses stale roses sold out reported bug (#4943 )
Fix: limited retry ocr read on daily count (#4969 )
Add: capability to purchase cake through config toggle
2025-07-26 03:27:10 +08: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
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
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
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
