447 Commits

Author SHA1 Message Date
W1NDes
5db1b8b8ff Merge remote-tracking branch 'upstream/master' into dev 2025-12-11 16:35:04 +08:00
LmeSzinc
32d36cd06d Fix: No submarine in hard campaign if team not prepared 2025-12-09 12:40:52 +08:00
W1NDes
84180c679b Merge remote-tracking branch 'upstream/master' into dev 2025-10-24 01:32:49 +08:00
LmeSzinc
b56ab2d555 Fix: Add W15 spesific FLEET_2_IN_USE that does not intersect with info_bar 2025-10-24 01:11:52 +08:00
LmeSzinc
ebe5ca794b Fix: [TW] FLEET_2_IN_USE should not intersect with info_bar 2025-10-24 00:48:42 +08:00
W1NDes
6e1357f056 Merge remote-tracking branch 'upstream/master' into dev 2025-10-21 04:15:57 +08:00
guoh064
c6957dcee2
Fix: load offset of AUTO_SEARCH_SETTINGS first to avoid click effects masking buttons (#5238) 2025-10-20 11:57:28 +08:00
W1NDes
5710a0a2b9 Merge remote-tracking branch 'upstream/master' into dev 2025-09-22 23:04:02 +08:00
LmeSzinc
076996a76a Fix: Fixup submarine spawn point on init scan (#5117)
If a grid is_submarine, the lower grid may detected as is_fleet, because they have the same ammo icon
2025-09-22 04:29:46 +08:00
W1NDes
b521ea1055 Merge remote-tracking branch 'upstream/master' into dev 2025-09-13 23:14:40 +08:00
LmeSzinc
44b3ae1884 Opt: Avoid extra clicking MAP_MODE_SWITCH_HARD on appear animation 2025-09-13 20:53:12 +08:00
LmeSzinc
a7434026a9 Fix: check CLEAR button to avoid early stopped at popup showing animation 2025-09-13 19:57:29 +08:00
W1NDes
edd39486a8 Merge remote-tracking branch 'upstream/master' into dev 2025-09-13 19:25:29 +08:00
LmeSzinc
ac63403cb3 Fix: handle flare animation upon MAP_MODE_SWITCH_HARD 2025-09-13 02:19:14 +08:00
W1NDes
74f9fa91e7 feat(eventSp): 处理今日SP图次数已到上限的情况 2025-08-15 21:31:01 +08:00
W1NDes
bfd7bcd2b7 Merge remote-tracking branch 'upstream/master' 2025-08-08 02:13:18 +08:00
LmeSzinc
f6cfe110bd Fix: Expand GET_ITEMS_1_RYZA to handle multiple drop rows 2025-08-03 03:05:41 +08:00
POLARme
23aa3443c9 Merge remote-tracking branch 'upstream/master' 2025-05-24 13:17:45 +08:00
LmeSzinc
1bbd26c2b4 Fix: Inconsistent map_allow_submarine after choosing fleet_2 (#4824) 2025-05-24 00:29:03 +08:00
POLARme
b47e239707 Merge remote-tracking branch 'upstream/master' 2025-05-21 10:54:49 +08:00
LmeSzinc
3c5eea5fb0 Fix: Keep untracked enemies if MAP_HAS_MOVABLE_NORMAL_ENEMY 2025-05-21 01:48:29 +08:00
POLARme
c24847fdd6 Merge remote-tracking branch 'upstream/master' 2025-05-19 03:55:10 +08:00
LmeSzinc
c8b6f11382 Fix: When handing GAME_TIPS in perspective error it should check app_is_running 2025-05-11 18:28:45 +08:00
POLAR me
6c8fcb80f0 Opt(OtherLogin): 优化异地登录处理逻辑
- 根据冲突次数调整冷却时间
- 补全相关异常处理
2025-04-25 20:01:25 +08:00
POLAR me
c76b1f6f83 Merge remote-tracking branch 'upstream/master' 2025-03-28 02:25:36 +08:00
LmeSzinc
34e22491f8 Add: Fleet recommend 2025-03-28 00:19:33 +08:00
POLAR me
de9421e4a6 Merge remote-tracking branch 'upstream/master' 2025-03-20 23:25:16 +08:00
LmeSzinc
a55d7504f7 Fix: Override to disable submarine if stage don't allow submarine (#4668) 2025-03-20 18:06:22 +08:00
POLAR me
16c44d1458 Merge remote-tracking branch 'upstream/master' 2025-01-17 14:14:05 +08:00
LmeSzinc
22fedfefab Chore: Comments in catch_camera_repositioning 2025-01-17 12:37:49 +08:00
POLAR me
dcb7912e93 feat(campaign): SP图、活动图3还有WalkStep
- 添加了SP图的配置文件
- 添加了活动图3的配置文件
- 修改了舰队行走错误处理逻辑
2024-12-24 22:10:34 +08:00
POLARme
283782cf35
Merge pull request #60 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-12-21 12:58:01 +08:00
POLAR me
bd6a8896af Merge branch 'dev' into _master 2024-12-20 22:46:49 +08:00
LmeSzinc
cc2cf0d046 Refactor: Abstract chapter switches from 20240725 to 20241219 2024-12-20 22:24:47 +08:00
POLAR me
98d5066ea8
Merge branch 'LmeSzinc:master' into master 2024-12-09 23:46:08 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00
POLAR me
23095d31e9
Merge pull request #44 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-08-31 01:11:11 +08:00
LmeSzinc
782c8d0752 Opt: Skip waiting map clear percentage in SP 2024-08-30 23:04:36 +08:00
POLAR me
be997b7520
Merge branch 'LmeSzinc:master' into master 2024-08-20 23:05:46 +08:00
LmeSzinc
80baf3ee0c Opt: Ignore enemy filter if MAP_HAS_MOVABLE_NORMAL_ENEMY (#4095) 2024-08-20 02:19:52 +08:00
LmeSzinc
edbbc7b8cb Fix: Avoid turning_optimize in event maps 2024-08-20 02:14:00 +08:00
POLAR me
a10bdcbdca
Merge branch 'LmeSzinc:master' into master 2024-08-17 11:13:40 +08:00
LmeSzinc
95eb23de32 Opt: Show Map_clear_percentage as percentage instead of full float 2024-08-17 00:29:55 +08:00
POLAR me
0901555cfc
Merge pull request #38 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-07-28 14:20:31 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
POLAR me
9525217da5 Merge branch 'master' into _master 2024-06-26 23:49:58 +08:00
POLAR me
7ef3aa1495 Update map_fleet_preparation.py 2024-06-21 02:46:38 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
POLAR me
42bd5305c2 Merge branch 'master' into 0master 2024-06-10 01:08:45 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00