8797 Commits

Author SHA1 Message Date
W1NDes
ab7b31fb2e Merge remote-tracking branch 'upstream/master' into dev 2025-10-18 01:37:45 +08:00
LmeSzinc
c9fdefdf90
Merge pull request #5225 from LmeSzinc/dev
Bug fix
2025-10-17 04:20:20 +08:00
LmeSzinc
61b0745750 Fix: Use ui_page_appear instead of check button directly 2025-10-17 04:14:01 +08:00
LmeSzinc
c06773e586 Tmp: [EN] Temp fix for bugged UI 2025-10-17 04:13:16 +08:00
W1NDes
2ca81abe04 Upd(RconfigUpdate): regular config update 2025-10-16 20:23:02 +08:00
W1NDes
0a00fc29ab Upd(event): 修改推图顺序和刷pt选项 2025-10-16 20:21:57 +08:00
W1NDes
5aff8637c6 Upd(event3): regular config update 2025-10-16 20:18:08 +08:00
W1NDes
c54f03b29d Merge remote-tracking branch 'upstream/master' into dev 2025-10-16 20:15:54 +08:00
LmeSzinc
d91abd8470
Merge pull request #5222 from LmeSzinc/dev
Dev
2025-10-16 19:46:55 +08:00
sui_feng
d89094b396
Add: war_archives_20231026_cn (#5221) 2025-10-16 19:46:24 +08:00
LmeSzinc
dc41d544b3
Merge pull request #5220 from sui-feng-cb/event
Upd: Event The Fool's Scales Rerun (event_20230817_cn)
2025-10-16 19:46:08 +08:00
sui-feng-cb
bbfc049bdb Fix: handle_get_items in event_20230817_story 2025-10-16 18:57:57 +08:00
sui-feng-cb
2359b2fd82 Fix: expand search area of EVENT_20230817_STORY 2025-10-16 18:57:50 +08:00
sui-feng-cb
1805a6d8ee Upd: Event The Fool's Scales Rerun (event_20230817_cn) 2025-10-16 02:35:24 +08:00
W1NDes
739001d953 Merge remote-tracking branch 'upstream/master' into dev 2025-10-16 00:20:58 +08:00
whjhs1010203
59e5a39d64
Fix: Can't get oil amount for TW server (#5217)
* Fix: Can't get oil amount for TW server

* fix condition

forgot parameter

* delete unnecessary part

remove return main page
2025-10-15 18:21:37 +08:00
LmeSzinc
c99b104f8f
Bug fix (#5218)
* fix: shop MUNITIONS_CHECK (#5210)

* Fix: reward weekly undetected (#5215)

* Upd: [JP] SUPPLY_PACK_CHECK

* Fix: Click safe-click-area in exercise combat (#5213)

---------

Co-authored-by: Compeador <qj6w94g0q@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
2025-10-14 23:43:22 +08:00
LmeSzinc
06a8ec167e Fix: Click safe-click-area in exercise combat (#5213) 2025-10-14 23:26:32 +08:00
LmeSzinc
d0159db710 Upd: [JP] SUPPLY_PACK_CHECK 2025-10-14 22:05:26 +08:00
Air111
8814413bfe
Fix: reward weekly undetected (#5215) 2025-10-14 19:07:40 +08:00
Compeador
20f4f64708
fix: shop MUNITIONS_CHECK (#5210) 2025-10-14 19:07:21 +08:00
W1NDes
084fd0f1d2 Merge remote-tracking branch 'upstream/master' into dev 2025-10-11 19:06:34 +08:00
W1NDes
a423af9d35 Fix(shop): 撤销商店推迟 2025-10-11 19:06:10 +08:00
LmeSzinc
7dd3479e66
Merge pull request #5207 from LmeSzinc/dev
Bug fix
2025-10-11 01:16:47 +08:00
LmeSzinc
80fe33d9c4 Upd: [JP] shop navigation assets
- TODO: update FREE_SUPPLY_PACK
2025-10-11 01:12:31 +08:00
LmeSzinc
40876858ae Upd: [TW] Neoncity assets
TODO: add NEONCITY_SWITCH_SINGLE, NEONCITY_SWITCH_MULTI (#5201)
2025-10-11 01:03:04 +08:00
LmeSzinc
c0f6c52597 Fix: reverted local remote in _adb_reverse_transport (#5200) 2025-10-11 00:54:31 +08:00
LmeSzinc
4347616d55
Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins (#5020)
* Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins

* Revert "Add: continue cl1 if enabled after meowfficerfarming finished. (#2805)"

This reverts commit 4c48b019bc4a2d3af9efcf744e5b788e92ceee8c.
2025-10-11 00:42:05 +08:00
nEEtdo0d
a61e93942d
Upd: [EN] UI, ShopUI, Freebies assets (#5202) 2025-10-10 21:20:18 +08:00
下面我簡單喵兩句
04cea16725
Upd:[TW]Event:The Neon City Investigator (#5201)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: tonyhom <tonyhom0727@gmail.com>
2025-10-10 21:19:12 +08:00
W1NDes
5e5412b85b Merge remote-tracking branch 'upstream/master' into dev 2025-10-09 22:32:38 +08:00
LmeSzinc
a1282a03fa
Merge pull request #5198 from LmeSzinc/dev
Bug fix
2025-10-09 22:04:26 +08:00
LmeSzinc
2267203305 Upd: ShopUI from #5197 2025-10-09 21:59:37 +08:00
LmeSzinc
470babfe80 Refactor: shop ui navigation 2025-10-09 21:44:27 +08:00
LmeSzinc
5df0383395 Tmp: Disable shop before assets updated 2025-10-09 21:16:08 +08:00
LmeSzinc
a1b9fffb16 Chore: Cleanup code and assets of old UI 2025-10-09 21:12:33 +08:00
LmeSzinc
f5b92dae34 Upd: [CN] MUNITIONS_CHECK 2025-10-09 19:17:06 +08:00
LmeSzinc
073464a298 Opt: clear interval of pages after collecting data keys 2025-10-09 18:38:26 +08:00
LmeSzinc
e1b5ff7ba2 Upd: [CN] SUPPLY_PACK_CHECK 2025-10-09 18:33:35 +08:00
LmeSzinc
21c83983d6 Fix: Expand search area of FREE_SUPPLY_PACK
so we don't need to bother minor shift
2025-10-09 18:28:26 +08:00
LmeSzinc
f9eff1fe2d Fix: [ALAS] adb reverse 2025-10-09 18:10:49 +08:00
W1NDes
33a3cc6830 Fix(shop): 推迟商店内容的执行 2025-10-09 16:30:20 +08:00
W1NDes
14c383f76e Upd(Login): 降低登录过程方向检测的频率 2025-10-05 03:14:35 +08:00
W1NDes
8178041e50 Upd(Login): 宽松游戏登录的超时及点击和网络异常处理 2025-10-05 03:11:21 +08:00
W1NDes
6740e3757e Upd(eventStory): updateEventTime 2025-10-03 00:30:47 +08:00
W1NDes
71e9f332ef Merge remote-tracking branch 'upstream/master' into dev 2025-10-01 21:24:10 +08:00
LmeSzinc
e06c24f222
Merge pull request #5185 from LmeSzinc/dev
Bug fix
2025-10-01 03:44:23 +08:00
LmeSzinc
5b68cf7afe
Upd: Shop UI update 250814 for server tw (#5184)
* Upd: Update shop_tab_250814 for server CN, TW

* Upd: Update shop UI, supply pack for server TW

* Del: Delete old shop ui assets

* Upd: Update supply pack run for server TW
2025-10-01 03:42:07 +08:00
weeswelai
1cddb09f85 Upd: Update supply pack run for server TW 2025-10-01 03:35:17 +08:00
LmeSzinc
5e6df53e90 Fix: Double check background color of GUILD_DISPATCH_FLEET (#5173) 2025-10-01 03:25:00 +08:00