161 Commits

Author SHA1 Message Date
W1NDes
42ca63c840 Merge remote-tracking branch 'upstream/master' into dev 2026-02-14 17:33:29 +08:00
LmeSzinc
11405cf0c3 Fix: [EN] check other buttons for page_academy 2026-02-14 03:00:01 +08:00
sui-feng-cb
9fd62b7840 Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 18:39:59 +08:00
sui-feng-cb
7e6b87bee8 Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 16:44:24 +08:00
W1NDes
ad1c8ad311 Merge remote-tracking branch 'upstream/master' into dev 2026-02-07 01:44:52 +08:00
sui-feng-cb
7e1a2322a6 Fix: use _raid_has_oil_icon for new UI design 2026-02-05 21:44:55 +08:00
W1NDes
1884f0e434 Fix: 修复merge中的重构问题 2026-01-29 23:07:29 +08:00
W1NDes
063c06e950 Merge remote-tracking branch 'upstream/master' into dev 2026-01-29 20:51:12 +08:00
LmeSzinc
f552360951 Fix: Startup at coalition fleet preparation 2026-01-23 17:43:04 +08:00
sui-feng-cb
6450cc5cda Upd(Coalition): merge coalition 20260122 from suifeng 2026-01-22 22:54:00 +08:00
W1NDes
761616006e Merge remote-tracking branch 'upstream/master' into dev 2025-12-01 04:46:35 +08:00
guoh064
369a12abfb Fix: ui misclick in coalition_20251120 2025-11-25 12:53:26 +08:00
W1NDes
418211223f Merge remote-tracking branch 'upstream/master' into dev 2025-11-08 19:17:30 +08:00
LmeSzinc
cd18378ad4 Fix: Avoid clicking GET_SHIP after entering page_meowfficer 2025-11-04 23:06:01 +08:00
W1NDes
66ef786ff2 Merge remote-tracking branch 'upstream/master' into dev 2025-10-18 02:33:40 +08:00
dragonheart107
f9c25961bb
Fix: EN commission + mission reward (#5230)
* Revert "Tmp: [EN] Temp fix for bugged UI"

This reverts commit c06773e586004c30c969ade48457630234bb566f.

* Fix: EN post maintenance UI bugs

* duplicate removal
2025-10-18 02:25:24 +08:00
W1NDes
ab7b31fb2e Merge remote-tracking branch 'upstream/master' into dev 2025-10-18 01:37:45 +08:00
LmeSzinc
c06773e586 Tmp: [EN] Temp fix for bugged UI 2025-10-17 04:13:16 +08:00
W1NDes
5abd9ecc3e Merge remote-tracking branch 'upstream/master' 2025-07-11 02:08:11 +08:00
nEEtdo0d
b85b47d67c Merge branch 'master' into dev 2025-06-28 16:11:37 -04:00
W1NDes
3befa5862c Merge remote-tracking branch 'upstream/master' 2025-06-28 20:21:05 +08:00
LmeSzinc
9e256ce249 Fix: NEONCITY UI back and home 2025-06-28 19:36:07 +08:00
nEEtdo0d
64c5b5e30f Merge branch 'master' into dev 2025-06-15 16:59:21 -04:00
POLARme
49d55d7b77 Merge remote-tracking branch 'upstream/master' 2025-05-29 23:36:32 +08:00
LmeSzinc
6d7e43974a Fix: handle game tips that infos skin feature when entering dock 2025-05-29 22:48:01 +08:00
POLARme
23aa3443c9 Merge remote-tracking branch 'upstream/master' 2025-05-24 13:17:45 +08:00
LmeSzinc
8d61802fd1 Fix: continuously check rotation on unknown UI (#4729) 2025-05-24 00:42:13 +08:00
LmeSzinc
0abb1fdff7 Fix: Avoid clicking GET_SHIP after dismiss MEOWFFICER_BUY 2025-05-24 00:17:52 +08:00
LmeSzinc
79d72c4fa0 Merge branch 'master' into dev
# Conflicts:
#	module/device/method/pool.py
2025-05-18 03:15:41 +08:00
POLARme
2e4f7f5111 Merge remote-tracking branch 'upstream/master' 2025-05-11 22:24:51 +08:00
LmeSzinc
535a6ad243 Fix: More IDLE buttons to handle 2025-05-11 01:34:10 +08:00
nEEtdo0d
0a9027a762 Fix: [EN] Private Quarters observable lag in appearance of roses in shop
Upd: get_ship toggle for ui_goto, bridge from ui_additional; private quarters page overlaps with the asset
2025-04-29 00:30:38 -04:00
POLAR me
66105a1f00 update(event_hospital):深谷来信添加记录档案领取 2025-03-28 17:29:55 +08:00
LmeSzinc
a4233d4743 Fix: Exit from hospital pages 2025-03-28 01:26:17 +08:00
LmeSzinc
0052dc470f Fix: Subpress get_ship in dorm (#4488) 2025-01-04 22:44:56 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
LmeSzinc
164db6f4da Chore: Rename "threshold" in template matching to "similarity"
to be differ from the "threshold" in color matching
2024-12-09 15:37:25 +08:00
LmeSzinc
9a31f709c0 Fix: Double clicking REWARD_GOTO_TACTICAL (#4328) 2024-10-30 14:37:58 +08:00
LmeSzinc
95ac640fb8 Fix: Clicking GET_SHIP after MAIN_GOTO_REWARD
because random ship background triggers GET_SHIP
2024-10-13 17:33:19 +08:00
LmeSzinc
fc555128a2 Fix: Set page checkers to interval=5 (fixed #4236) 2024-09-25 18:38:09 +08:00
LmeSzinc
8dd6ec7811 Fix: Slowly appeared WITHDRAW button (#4044) 2024-08-02 01:02:05 +08:00
LmeSzinc
d79859e6ed Upd: [TW] rpg page definition 2024-08-01 23:33:47 +08:00
guoh064
5ef353a507
Fix: unrecognized ui page after empty mail receive (#4039)
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Fix: unrecognized ui page after empty mail receive

* Upd: [JP] Asset MAIL_CHECK

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
2024-07-28 13:32:03 +08:00
LmeSzinc
019a35a64c Fix: Reset interval of GET_SHIP after entering page_dorm 2024-07-03 23:24:18 +08:00
LmeSzinc
67073bad07 Fix: Leave memories tab (fixed #3956) 2024-07-03 22:46:41 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +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
d20886131e Fix: Typo on IDLE.match_luma 2024-05-23 02:15:19 +08:00
LmeSzinc
3513daf926 Fix: match_binary in idle page for various background 2024-05-23 01:17:31 +08:00