xhqss
523aebb767
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/config/argument/override.yaml
2026-04-25 15:09:43 +08:00
LmeSzinc
32ad98a79f
Upd: [EN] EVENT_LIST_CHECK ( #5623 )
2026-04-24 18:48:40 +08:00
0O0o0oOoO00
e38ec5aa81
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# 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
2026-04-18 15:54:19 +08:00
LmeSzinc
8ce450a42b
Add: MAP_CHAPTER_SWITCH_20241219_SPEX
2026-04-18 00:57:22 +08:00
0O0o0oOoO00
d797b30488
Revert "fix: Temporary New year Academy check"
...
This reverts commit e784b293f9
2026-02-26 16:52:05 +08:00
0O0o0oOoO00
f5172b27f1
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
2026-02-14 13:50:42 +08:00
LmeSzinc
11405cf0c3
Fix: [EN] check other buttons for page_academy
2026-02-14 03:00:01 +08:00
0O0o0oOoO00
e784b293f9
fix: Temporary New year Academy check
2026-02-12 18:57:07 +08:00
sui-feng-cb
7e6b87bee8
Add: [CN] Spring Auction Adventure (raid_20260212)
2026-02-12 16:44:24 +08:00
0O0o0oOoO00
c76017a4dc
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
2026-02-06 21:57:03 +08:00
sui-feng-cb
7e1a2322a6
Fix: use _raid_has_oil_icon for new UI design
2026-02-05 21:44:55 +08:00
0O0o0oOoO00
d4c3536af9
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-01-23 17:45:36 +08:00
LmeSzinc
f552360951
Fix: Startup at coalition fleet preparation
2026-01-23 17:43:04 +08:00
0O0o0oOoO00
8d17eeb803
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/coalition/coalition.py
# module/config/argument/args.json
2026-01-23 10:21:18 +08:00
LmeSzinc
b65a951ce4
Add: FASHION Coalition assets
2026-01-23 02:40:22 +08:00
0O0o0oOoO00
5d2c46973c
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2025-12-21 18:46:41 +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
0O0o0oOoO00
bc8666976f
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2025-11-26 17:09:45 +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
0O0o0oOoO00
a99746fba1
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2025-11-08 16:44:56 +08:00
LmeSzinc
cd18378ad4
Fix: Avoid clicking GET_SHIP after entering page_meowfficer
2025-11-04 23:06:01 +08:00
guoh064
753e676152
Add: event shop
2025-10-29 16:17:37 +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
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
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
LmeSzinc
4b5039fabf
Chore: Expose Switch timers
2025-09-13 20:34:22 +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
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
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
sui_feng
eef5249d18
Fix: [CN] PRIVATE_QUARTERS_INTERACT button ( #4964 )
2025-07-17 22:42:33 +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
LmeSzinc
9e256ce249
Fix: NEONCITY UI back and home
2025-06-28 19:36:07 +08:00
