8414 Commits

Author SHA1 Message Date
W1NDes
37ba6f9965 Upd(Coalition):添加连战活动的舰队推荐和刷PT功能 2025-06-27 02:27:20 +08:00
W1NDes
474bdc3681 Merge remote-tracking branch 'upstream/master' 2025-06-27 00:57:54 +08:00
LmeSzinc
05f419fd13
Merge pull request #4909 from LmeSzinc/bug_fix
Add: Event Neon City Investigator (coalition_20250626)
2025-06-27 00:34:58 +08:00
LmeSzinc
7a773a4c02 Fix: Check empty fleets in coalition 2025-06-27 00:32:14 +08:00
LmeSzinc
cd86ef82ec Fix: Swapped switch states 2025-06-27 00:24:56 +08:00
LmeSzinc
f6f7b7779d Upd: UI page switching 2025-06-27 00:10:44 +08:00
LmeSzinc
37ad6c9d12 Upd: stage convert 2025-06-27 00:08:42 +08:00
LmeSzinc
118d80f61a Add: Assets for coalition NEONCITY 2025-06-26 23:49:31 +08:00
LmeSzinc
373cf7e919 Add: Event entrance of Neon City Investigator (coalition_20250626) 2025-06-26 23:46:41 +08:00
LmeSzinc
aa3f4338fe Chore: [ALAS] Reuse Switch.get() in Switch.appear() 2025-06-26 23:31:55 +08:00
LmeSzinc
e630e550eb
Merge pull request #4908 from LmeSzinc/bug_fix
Bug fix
2025-06-26 01:23:54 +08:00
LmeSzinc
d4f1a44d20 Pref: no copy of scrcpy screenshots 2025-06-26 01:09:56 +08:00
LmeSzinc
b65932b404 Fix: Mute handle_exp_info in META combat 2025-06-26 01:03:18 +08:00
W1NDes
2033f8fb98 Fix(CampaignRun): 修复OCR图像参数 2025-06-25 01:25:49 +08:00
LmeSzinc
3f49aa47ad Fix: [ALAS] ascreencap returns read-only images 2025-06-24 23:29:18 +08:00
W1NDes
871c7c418a Upd(EventStory):活动剧情添加时间约束 2025-06-24 04:02:32 +08:00
POLARme
1edc27b9a9 Fix(Emotion): 添加了角色名过长情况下的红脸判断 2025-06-24 03:40:33 +08:00
POLARme
1b96d8039d Fix(campaign_ui):修复了空报错情况下的异常处理 2025-06-23 00:59:51 +08:00
POLARme
3fb7fe8048 Fix(Event):修复在已通过一次性关卡后的关卡递进错误 2025-06-20 13:40:42 +08:00
POLARme
aaa0350dd7 Upd(Event):更新活动配置,调整阶段 2025-06-20 12:58:58 +08:00
POLARme
8834432c7e Merge remote-tracking branch 'upstream/master' 2025-06-20 01:41:55 +08:00
LmeSzinc
59c9503ce1
Bug fix (#4897)
* Merge pull request #4890 from dragonheart107/assets

Fix: Meta sync tap

* Upd: Event entrance of Confluence of Nothingness

---------

Co-authored-by: dragonheart107 <153553566+dragonheart107@users.noreply.github.com>
2025-06-19 22:53:06 +08:00
LmeSzinc
0934746701 Upd: Event entrance of Confluence of Nothingness 2025-06-19 22:51:39 +08:00
dragonheart107
0757f0aef8
Merge pull request #4890 from dragonheart107/assets
Fix: Meta sync tap
2025-06-18 18:26:29 +08:00
LmeSzinc
5fcf1aee95
Merge pull request #4882 from LmeSzinc/bug_fix
Bug fix
2025-06-14 01:33:39 +08:00
LmeSzinc
73a5ce7f02 Upd: [TW] Remove switches of storage disassemble, all server synced now 2025-06-14 01:31:44 +08:00
LmeSzinc
d1015d9e39 Upd: [TW] BOX assets (#4879) 2025-06-14 01:31:41 +08:00
LmeSzinc
3b4ac53d6c Fix: [ALAS] Ignore errors in brute force connect 2025-06-14 01:16:09 +08:00
LmeSzinc
b2724dca64 Fix: [ALAS] Add notice to disable network bridging 2025-06-14 01:10:22 +08:00
LmeSzinc
c15bce0ab5 Pref: [ALAS] Replace ThreadPoolExecutor with alas threadpool 2025-06-14 00:44:57 +08:00
LmeSzinc
eb084ed591 Fix: [ALAS] Match 7555 in vbox config with MuMu instance_id 2025-06-14 00:18:56 +08:00
LmeSzinc
ac3ce726a5 Add: [ALAS] Support MuMuPlayer12 5.0 2025-06-14 00:18:56 +08:00
LmeSzinc
999a121625 Fix: SSL fields in deploy templates 2025-06-13 22:46:07 +08:00
LmeSzinc
9014b9640b Upd: [TW] Event A Rose on the High Tower (event_20250520_cn) 2025-06-13 22:45:12 +08:00
POLARme
024b2ab559 Merge remote-tracking branch 'upstream/master' 2025-06-11 03:37:49 +08:00
LmeSzinc
370b44573b
Bug fix (#4872)
* Fix: [ALAS] close pillow Image object

* Merge pull request #4866 from dragonheart107/assets

Fix: Meta-sync asset change for EN

---------

Co-authored-by: dragonheart107 <153553566+dragonheart107@users.noreply.github.com>
2025-06-10 21:29:54 +08:00
dragonheart107
86eaac9375
Merge pull request #4866 from dragonheart107/assets
Fix: Meta-sync asset change for EN
2025-06-10 17:56:24 +08:00
LmeSzinc
25c81f08f4 Fix: [ALAS] close pillow Image object 2025-06-09 13:06:52 +08:00
POLARme
2132288867 Merge remote-tracking branch 'upstream/master' 2025-06-06 03:02:22 +08:00
LmeSzinc
6ef015a2ce
Merge pull request #4864 from LmeSzinc/bug_fix
Bug fix
2025-06-06 01:58:27 +08:00
guoh064
3b65dfe6f0 Add: check manjuu loading in os_mission_overview_accept 2025-06-06 01:57:43 +08:00
LmeSzinc
938d98a243 Fix: handle insufficient fund in guild operation 2025-06-06 01:39:18 +08:00
LmeSzinc
2247d72bf7 ix: Handle TACTICAL_CHECK without black-blurred background (#4861) 2025-06-06 01:18:31 +08:00
LmeSzinc
d7d729e198 Fix: handle empty rows from "ldconsole.exe list2" (#4846) 2025-06-05 16:20:45 +08:00
happyhappyhappy-arch
f9602be1ba
Add ssl support (#4840)
* Add: add ssl authentication

* Fix: unify the format for ssl config

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-06-05 15:36:17 +08:00
POLARme
340cbbb331 Merge remote-tracking branch 'upstream/master' 2025-06-01 00:24:28 +08:00
LmeSzinc
4453286a00
Bug fix (#4851)
* tmp: [JP] asset SUPPLY_PACK_CHECK (#4849)

* Upd: [EN] DOCK_SELECTED (#4850)

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
Co-authored-by: dragonheart107 <153553566+dragonheart107@users.noreply.github.com>
2025-05-30 22:11:46 +08:00
dragonheart107
4172356a9a
Upd: [EN] DOCK_SELECTED (#4850) 2025-05-30 22:09:46 +08:00
guoh064
bea88a6280
tmp: [JP] asset SUPPLY_PACK_CHECK (#4849) 2025-05-30 22:04:16 +08:00
POLARme
49d55d7b77 Merge remote-tracking branch 'upstream/master' 2025-05-29 23:36:32 +08:00