593 Commits

Author SHA1 Message Date
W1NDes
b4f08afa3b Merge remote-tracking branch 'upstream/master' into dev 2026-04-18 23:38:12 +08:00
LmeSzinc
d1e3653c4a Fix: [CN] Skip user agreement 2026-04-18 00:02:26 +08:00
W1NDes
96cbcba71d Merge remote-tracking branch 'upstream/master' into dev 2026-03-31 12:53:48 +08:00
LmeSzinc
9ca4b263ad Fix: Reset no searching timeout if not in map 2026-03-31 12:47:37 +08:00
LmeSzinc
33e812adb8
Merge pull request #5455 from guoh064/campaign_16_main
Add: W16 preparations
2026-03-29 19:26:04 +08:00
W1NDes
92d1543985 Merge remote-tracking branch 'upstream/master' into dev 2026-02-20 01:43:18 +08:00
LmeSzinc
d99b759a08 Fix: no poor sleep in fleet_preparation_sidebar_ensure 2026-02-18 09:10:55 +08:00
guoh064
d8bba0331f Upd: [CN] asset AIR_STRIKE_* 2026-01-23 16:12:50 +08:00
guoh064
1158a0535a Add: W16 preparations 2026-01-18 21:27:25 +08:00
W1NDes
5c3d0c73d1 Merge remote-tracking branch 'upstream/master' into dev 2026-01-08 01:01:33 +08:00
sui-feng-cb
83f167ccc1 Upd: [EN] USE_DATA_KEY_NOTIFIED asset 2025-12-29 19:04:08 +08:00
W1NDes
062860370d Merge remote-tracking branch 'upstream/master' into dev 2025-11-14 14:26:42 +08:00
guoh064
1a29d642a0
Upd: [JP] USE_DATA_KEY_NOTIFIED asset (#5303) 2025-11-13 17:50:50 +08:00
W1NDes
418211223f Merge remote-tracking branch 'upstream/master' into dev 2025-11-08 19:17:30 +08:00
sui-feng-cb
b14ab02c97 Upd: [CN] USE_DATA_KEY_NOTIFIED asset 2025-11-06 17:11:57 +08:00
W1NDes
84180c679b Merge remote-tracking branch 'upstream/master' into dev 2025-10-24 01:32:49 +08:00
LmeSzinc
d4142afa22 Refactor: Timer class 2025-10-22 01:09:45 +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
5710a0a2b9 Merge remote-tracking branch 'upstream/master' into dev 2025-09-22 23:04:02 +08:00
LmeSzinc
c5908433bf Fix: fleet role settings is unlocked after clear mode 2025-09-22 04:48:43 +08:00
W1NDes
b521ea1055 Merge remote-tracking branch 'upstream/master' into dev 2025-09-13 23:14:40 +08:00
sui_feng
4d5c855e3a
Fix: FAST_FORWARD for minor icon shift (#5131) 2025-09-13 20:17:26 +08:00
W1NDes
edd39486a8 Merge remote-tracking branch 'upstream/master' into dev 2025-09-13 19:25:29 +08:00
LmeSzinc
913b019ee7 Fix: AUTO_SEARCH_OFF4 should in cn folder 2025-09-13 03:21:35 +08:00
LmeSzinc
88fc235a24 Upd: [EN] AUTO_SEARCH_ON AUTO_SEARCH_OFF 2025-09-13 03:09:06 +08:00
LmeSzinc
69e99e6692 Upd: [EN] MAP_STAR_* 2025-09-13 03:04:36 +08:00
LmeSzinc
59393d6d31 Fix: AUTO_SEARCH for minor icon shift (#5126) 2025-09-13 01:09:58 +08:00
W1NDes
0c8b5c766a Merge remote-tracking branch 'upstream/master' into dev 2025-09-13 00:41:14 +08:00
LmeSzinc
d113f71a3d Fix: Use template matching in MAP_GREEN 2025-09-13 00:04:24 +08:00
LmeSzinc
2028b7426c Fix: MAP_STAR detection for minor icon shift
- TODO: [EN] Update MAP_STAR_*
2025-09-12 23:46:08 +08:00
LmeSzinc
776bd56e30 Fix: Check GAME_TIPS using matched area 2025-09-12 00:45:47 +08:00
guoh064
5e027ec923
Fix: handle_game_tips if only the background is dark (#5103) 2025-09-11 22:30:37 +08:00
nEEtdo0d
b4cceb7f8e Upd: [EN] event current and rerun check icons; other button_extract output 2025-08-02 13:32:52 -04:00
W1NDes
e646586c32 Merge remote-tracking branch 'upstream/master' 2025-07-25 01:59:57 +08:00
LmeSzinc
7e6487487b
Merge pull request #4973 from LmeSzinc/dev
Add: The Alchemist and the Tower of Horizons (event_20250724_cn)
2025-07-25 00:50:17 +08:00
LmeSzinc
021cc4e26d Add: Chapter T 2025-07-24 23:35:47 +08:00
W1NDes
983d67e50a Fix(ResearchInspect): 添加任务提交图片 2025-07-22 22:24:36 +08:00
W1NDes
bd27896399 Merge remote-tracking branch 'upstream/master' 2025-07-17 22:48:07 +08:00
HexatomicRing
4f0f2a2c87
Fix: Emulator no respond (#4947)
* Fix Leidian Emulator no respond

* [fix] assets name

* [fix] Avoid clearing stuck record
2025-07-17 22:44:28 +08:00
POLARme
aaa0350dd7 Upd(Event):更新活动配置,调整阶段 2025-06-20 12:58:58 +08:00
POLARme
2132288867 Merge remote-tracking branch 'upstream/master' 2025-06-06 03:02:22 +08:00
guoh064
3b65dfe6f0 Add: check manjuu loading in os_mission_overview_accept 2025-06-06 01:57:43 +08:00
POLARme
49d55d7b77 Merge remote-tracking branch 'upstream/master' 2025-05-29 23:36:32 +08:00
LmeSzinc
4e7e2444d5 Fix: handle appear animation of AUTO_SEARCH after enabling clear mode 2025-05-29 23:28:38 +08:00
POLARme
b47e239707 Merge remote-tracking branch 'upstream/master' 2025-05-21 10:54:49 +08:00
LmeSzinc
653601aa4f Chore: Add MAP_CLEAR_PERCENTAGE_SHORT 2025-05-21 00:45:32 +08:00
POLARme
53fcd1e00b fix(otherLogin): 在重启任务中添加对异地登录的处理
- 添加ocr来处理异地登录时的蛮啾gif动画遮挡
- 在restart中添加异地登录的处理
2025-05-05 17:49:58 +08:00
W1NDes
e929c56d7d refactor(OS_handler): 修改自律寻敌死循环报错的提醒消息 2025-04-30 21:18:49 +08:00
W1NDes
c67330bc5b fix(OS_handler): 添加大世界自律寻敌死循环的报错 2025-04-30 21:09:25 +08:00