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
f6f7b7779d
Upd: UI page switching
2025-06-27 00:10:44 +08: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
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
91b8bf856d
Upd: [EN] BUILD_CHECK, it reverts back again ( #4811 )
2025-05-21 03:15:15 +08:00
LmeSzinc
79d72c4fa0
Merge branch 'master' into dev
...
# Conflicts:
# module/device/method/pool.py
2025-05-18 03:15:41 +08:00
LmeSzinc
535a6ad243
Fix: More IDLE buttons to handle
2025-05-11 01:34:10 +08:00
LmeSzinc
5611f6a726
Upd: [EN] BUILD_CHECK
2025-05-11 00:00:15 +08:00
nEEtdo0d
01a17d7677
Add: [CN][JP][TW] Private Quarters placeholder assets; replace as needed
2025-04-27 13:12:52 -04:00
nEEtdo0d
09caf9704f
Add: [EN] Private Quarters support
2025-04-27 13:12:08 -04: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
guoh064
bfcc847389
Upd: asset SHOP_GOTO_MUNITIONS
2025-02-23 10:55:35 +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
372c3e74db
Add: [EN][JP] Assets in raid_20250416
2025-01-17 13:25:59 +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
LmeSzinc
8366b71f81
Add: page_dock
2025-01-04 03:05:05 +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
LmeSzinc
8f83c07eb9
Upd: Battle pass assets
2024-10-01 17:34:13 +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
9ba3d2e732
Upd: [TW] Dorm menu assets
2024-05-24 03:02:51 +08:00
LmeSzinc
ecfd5d50bf
Upd: [CN] Support UI in 2024.05.21
2024-05-23 01:16:41 +08:00
LmeSzinc
ffe2a213ca
Fix: Handle idle page
2024-05-22 01:44:45 +08:00
LmeSzinc
36f786ca53
Upd: [EN][JP] Assets in page_reward
2024-05-22 01:15:18 +08:00
RilyLC
7a01eadcd2
Upd:[TW]Event:Reflections of the Oasis ( #3574 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2024-03-21 19:33:21 +08:00
RilyLC
7968771265
Upd:[TW]Event assets ( #3479 )
2024-02-07 00:00:41 +08:00
LmeSzinc
a8a5f5b888
Upd: [EN][JP] Sync DORMMENU assets
2024-02-06 19:22:22 +08:00
