8227 Commits

Author SHA1 Message Date
POLAR me
ce9841f22b Opt(eventForward):调整活动刷PT选项的逻辑 2025-04-25 04:22:42 +08:00
POLAR me
7986d4c04c fix(oilKeep):添加设置单次石油最大获取以及设置识别时的截图刷新 2025-04-25 01:09:14 +08:00
POLAR me
b149e4bc22 Merge remote-tracking branch 'upstream/master' 2025-04-25 00:46:37 +08:00
LmeSzinc
3537a7bb47
Add: Event Toward Tulipa’s Seas (event_20250424_cn) (#4753)
* Add: Event entrance of Toward Tulipa’s Seas (event_20250424_cn)

* Add: MAP_CHAPTER_SWITCH_20241219_SP to handle sp events

* Fix: Avoid TooManyClickError when receiving lots of missions

* Fix: Handle forced map event on the top of action point popup

* Add: Chapter T

* Add: Chapter SP

* Fix: Leave ongoing battles in boss_leave()

* Chore: Log what triggers the click on CLICK_SAFE_AREA

* Fix: Avoid TooManyClickError when receiving abyssal progress rewards (#3664)

* Fix: round results when converting coordinates between globe and screen

* Add: Chapter HT

* Merge pull request #4750 from sui-feng-cb/war_archives_update

Add: war_archives_20220526_cn

* Opt: allow entering page_mail from page_main (#4752)

---------

Co-authored-by: sui_feng <115386623+sui-feng-cb@users.noreply.github.com>
Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2025-04-25 00:19:49 +08:00
guoh064
808be69e9e
Opt: allow entering page_mail from page_main (#4752) 2025-04-25 00:00:21 +08:00
sui_feng
978167218d
Merge pull request #4750 from sui-feng-cb/war_archives_update
Add: war_archives_20220526_cn
2025-04-25 00:00:02 +08:00
LmeSzinc
ce9bdd5e86 Add: Chapter HT 2025-04-24 23:53:50 +08:00
LmeSzinc
081b659023 Fix: round results when converting coordinates between globe and screen 2025-04-24 23:53:28 +08:00
LmeSzinc
3505fedb6a Fix: Avoid TooManyClickError when receiving abyssal progress rewards (#3664) 2025-04-24 23:51:55 +08:00
LmeSzinc
5b20d80b5b Chore: Log what triggers the click on CLICK_SAFE_AREA 2025-04-24 23:43:28 +08:00
LmeSzinc
adeeff9437 Fix: Leave ongoing battles in boss_leave() 2025-04-24 23:43:28 +08:00
LmeSzinc
221d6a4f5b Add: Chapter SP 2025-04-24 23:43:28 +08:00
LmeSzinc
c1eb1e47cc Add: Chapter T 2025-04-24 23:43:28 +08:00
LmeSzinc
85b82ce755 Fix: Handle forced map event on the top of action point popup 2025-04-24 23:43:28 +08:00
LmeSzinc
7687d20466 Fix: Avoid TooManyClickError when receiving lots of missions 2025-04-24 23:43:25 +08:00
LmeSzinc
c95816ecf7 Add: MAP_CHAPTER_SWITCH_20241219_SP to handle sp events 2025-04-24 22:49:31 +08:00
LmeSzinc
fe6e7e39fd Add: Event entrance of Toward Tulipa’s Seas (event_20250424_cn) 2025-04-24 21:48:13 +08:00
POLAR me
2b5fffd80b Merge remote-tracking branch 'upstream/master' 2025-04-22 17:03:01 +08:00
LmeSzinc
99e5baf2ee
Merge pull request #4748 from LmeSzinc/dev
Bug fix
2025-04-22 00:51:39 +08:00
LmeSzinc
445507d7d5 Fix: Keep in map_exit loop if MAP_EXIT still appears 2025-04-21 23:02:47 +08:00
LmeSzinc
e50c984211 Fix: Re-compress assets/jp/combat_ui/QUIT.png to fixup git hashing 2025-04-21 12:35:05 +08:00
POLAR me
6b7682561b Merge remote-tracking branch 'upstream/master' 2025-04-19 23:25:33 +08:00
LmeSzinc
32ece7a1a3 Fix: [MAA] Enum adblite_enabled get renamed 2025-04-19 23:12:37 +08:00
POLAR me
884f0d1e96 Merge remote-tracking branch 'upstream/master' 2025-04-19 22:16:15 +08:00
LmeSzinc
0ca916e185
Merge pull request #4746 from LmeSzinc/dev
Bug fix
2025-04-19 22:09:00 +08:00
LmeSzinc
644750917d Upd: [MAA] Update enum class (fixed #4723) 2025-04-19 22:05:27 +08:00
LmeSzinc
55ce5df582 Fix: Stop clicking BATTLE_STATUS after coalition reward 2025-04-19 21:55:09 +08:00
POLAR me
deb326c7be feat(gacha): 新增新船只掉落截图与OCR功能
- 添加新船只 OCR 识别方法配置(本地OCR和两种百度OCR识别方式)
- 添加相关配置项
2025-04-19 02:14:39 +08:00
POLAR me
ef96e7b78c Merge remote-tracking branch 'upstream/master' 2025-04-19 02:09:21 +08:00
LmeSzinc
8e571b9b8f
Merge pull request #4745 from LmeSzinc/dev
Bug fix
2025-04-18 23:30:25 +08:00
LmeSzinc
1a0b027db3 Fix: [EN][JP] Rename Frostfall assets 2025-04-18 23:24:04 +08:00
W1NDes
47bc6be8f1 fix(Frostfall): 添加 Frostfall 活动相关图片并调整按钮定义
- 新增 Frostfall 活动的英文和日文图片资源
2025-04-18 20:23:08 +08:00
LmeSzinc
15cf552963 Upd: Swap FROSTFALL_TC2 too 2025-04-18 19:47:00 +08:00
POLAR me
4b4a3d2f95 Opt(coalition): 新增极地风暴开荒以及部分bug修复和特性调整
- 极地风暴活动增加开荒模式;
- 增加战斗结束跳过延迟,防止误触排行榜或pt领取;
- 调换石油识别顺序,减少识别出错;(此次活动战斗准备界面的石油会被透明灰条挡一半)
- 修正复刻tc2关卡的图片位置
- 添加配队推荐选项
- 调整刷pt选项在此次活动的机制
- 添加sp图的多队推荐功能
2025-04-18 04:06:40 +08:00
POLAR me
3dcac97174 update(override):在 override.yaml 为多个任务隐藏刷pt选项 。 2025-04-18 01:10:58 +08:00
POLAR me
07a384cac8 Merge remote-tracking branch 'upstream/master' 2025-04-18 00:36:07 +08:00
LmeSzinc
f82dc5a2ef
Merge pull request #4737 from LmeSzinc/dev
Add: Frostfall rerun (coalition_20230323)
2025-04-17 22:33:46 +08:00
LmeSzinc
bc74e8c5e8 Chore: Air date of Frostfall rerun 2025-04-17 22:33:10 +08:00
LmeSzinc
62d260db02 Upd: FROSTFALL_TC3 and FROSTFALL_SP are swapped 2025-04-17 22:27:13 +08:00
LmeSzinc
216d355b91 Fix: Redirect coalition modes 2025-04-17 22:21:40 +08:00
LmeSzinc
84da230fd9 Upd: Toggle coalition to Frostfall 2025-04-17 22:13:06 +08:00
LmeSzinc
8ebda6268c Fix: [ALAS] FileNotFoundError in atomic_rmtree 2025-04-17 21:44:56 +08:00
LmeSzinc
bfbdbcc774 Fix: [ALAS] handle_app_login shouldn't handle startup retry, scheduler should 2025-04-17 21:38:29 +08:00
POLAR me
2661038fa0 Merge remote-tracking branch 'upstream/master' 2025-04-17 01:21:41 +08:00
LmeSzinc
93f58c7e6a
Merge pull request #4734 from LmeSzinc/dev
Bug fix
2025-04-15 00:50:02 +08:00
LmeSzinc
2b0020a79b Fix: Duplicate campaign_set_chapter_20241219 calls (#4728) 2025-04-15 00:41:45 +08:00
LmeSzinc
7fea068ee8 Sync: [ALAS] Sync atomic functions 2025-04-14 04:04:38 +08:00
LmeSzinc
8311652caa Pref: [ALAS] Improve performance on various utils functions 2025-04-14 00:48:44 +08:00
POLAR me
ddfa79f80b Merge remote-tracking branch 'upstream/master' 2025-04-13 00:13:13 +08:00
LmeSzinc
4f2a786d8c Add: [TW] Tempesta and the Sleeping Sea (event_20241024_cn) (#4722) 2025-04-12 03:28:26 +08:00