1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 06:39:25 +08:00

8778 Commits

Author SHA1 Message Date
0O0o0oOoO00
d27b4647cb add: skip commission notice check at campaign when do not run commission to avoid recursive calls between tasks 2026-03-21 20:39:14 +08:00
0O0o0oOoO00
501be3448e add(tmp): add 16-4 for gamsfarming use 2026-03-20 23:16:03 +08:00
0O0o0oOoO00
b777b9656d add: keep 1 level white flagship when auto retire 2026-03-20 23:15:39 +08:00
0O0o0oOoO00
289652382a fix: do AUTO_RETIRE before SKIP_BATTLE_RESULT 2026-03-16 20:31:08 +08:00
0O0o0oOoO00
896fe153ac fix: do AUTO_RETIRE before SKIP_SHIP_GAIN_SHOW to avoid incorrect process flow when the game undergoes battle settlement 2026-03-16 20:30:20 +08:00
0O0o0oOoO00
8c6cb6de90 Revert "Add: hide_in_upper_left option for combat manual"
This commit was manually merged into this repository earlier, and later guoh064 merged this commit into LmeSzinc’s repository.
This reverts commit 13aba919a2.
2026-03-13 10:44:35 +08:00
0O0o0oOoO00
ea306079e4 Revert "Upd: asset COMBAT_AUTO"
This commit was manually merged into this repository earlier, and later guoh064 merged this commit into LmeSzinc’s repository.
This reverts commit 947f66c915.
2026-03-13 10:38:09 +08:00
xhqss
01562da545 UPD:event_20240229_cn 2026-03-12 22:18:50 +08:00
xhqss
1af31e1d91 Merge branch 'master_LME' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/zh-TW.json
2026-03-12 22:15:51 +08:00
LmeSzinc
a6f1695de5 Merge pull request #5555 from LmeSzinc/dev
Add: event entrance for event_20240229_cn rerun
2026-03-12 19:34:30 +08:00
guoh064
9a9454df26 Add: event entrance for event_20240229_cn rerun (#5552) 2026-03-12 18:47:15 +08:00
guoh064
3f9e7edf4e Add: hide_in_upper_left option for combat manual 2026-03-12 18:46:50 +08:00
guoh064
5611dce94b Upd: asset COMBAT_AUTO 2026-03-12 18:46:50 +08:00
0O0o0oOoO00
f2635d64ba upd: update patched GUILD_DISPATCH_FLEET_UNFILLED for jp 2026-03-06 07:56:33 +08:00
LmeSzinc
b687048405 Merge pull request #5545 from LmeSzinc/dev
Bug fix
2026-03-06 01:13:28 +08:00
LmeSzinc
c9e95702dc Fix: Skip event story in event_20260226_cn 2026-03-06 01:12:54 +08:00
LmeSzinc
b24d09f1a0 Upd: [TW] Event event_20260226_cn (fixed #5544) 2026-03-06 01:11:10 +08:00
LmeSzinc
8618ea2352 Upd: Battle UI SpringInn (#5541) (#5543)
Co-authored-by: heipen <126669219+Heipen@users.noreply.github.com>
2026-03-05 22:42:45 +08:00
heipen
dbc5fe42e8 Upd: Battle UI SpringInn (#5541) 2026-03-04 12:32:12 +08:00
0O0o0oOoO00
76b6435ee6 Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
2026-02-28 12:16:28 +08:00
LmeSzinc
2a2901d218 Merge pull request #5533 from LmeSzinc/dev
Add: Event Springtide Inn Online (event_20260226_cn)
2026-02-28 04:43:01 +08:00
LmeSzinc
66fa598e75 Fix: Abyssal combat with handle_map_event (#5328) 2026-02-28 04:37:52 +08:00
LmeSzinc
bfe67e2922 Opt: swipe multiply in event_20260226_cn 2026-02-28 04:17:37 +08:00
LmeSzinc
bd108dc35f Fix: Clicking BACK_ARROW at combat loading 2026-02-28 04:09:49 +08:00
LmeSzinc
07bf9d9947 Fix: Handle wrong OCR error like "I4-4" (#5532) 2026-02-28 03:42:27 +08:00
guoh064
c8e8d0b2fe Add: Event Springtide Inn Online (event_20260226_cn) 2026-02-28 02:50:22 +08:00
0O0o0oOoO00
d797b30488 Revert "fix: Temporary New year Academy check"
This reverts commit e784b293f9.
2026-02-26 16:52:05 +08:00
0O0o0oOoO00
bbc27b1460 add: event general for cn gems farming 2026-02-26 16:51:39 +08:00
guoh064
aa47cc9b3e fix: AUTOMATION_ON needs offset in combat 2026-02-20 11:29:39 +08:00
guoh064
947f66c915 Upd: asset COMBAT_AUTO 2026-02-19 23:55:40 +08:00
0O0o0oOoO00
44d5ee7fe7 add: button assets patch 2026-02-19 23:54:38 +08:00
guoh064
13aba919a2 Add: hide_in_upper_left option for combat manual 2026-02-19 23:29:58 +08:00
guoh064
9b98060c4d Add: Raid Scuttle function 2026-02-19 23:10:38 +08:00
LmeSzinc
5c7f57f3b2 Fix: patch_mimetype 2026-02-19 10:19:42 +08:00
LmeSzinc
ad623f6332 Merge pull request #5525 from LmeSzinc/dev
Bug fix
2026-02-19 03:18:06 +08:00
LmeSzinc
c014140c6e Fix: [CN] Remove more dash-like characters (fixed #5522) 2026-02-19 03:14:09 +08:00
gepotumu
a538739910 Fix: infinite loop in _handle_use_box_amount when box count insufficient (#5516)
When requesting more boxes than available (e.g. requesting 8 but only 3
in stack), the amount-setting loop would never exit because the UI caps
at the available count while the script keeps clicking AMOUNT_PLUS.

Added click_count tracking: if multi_click() has been called 2 times
without the amount reaching the target, treat it as the UI cap and break.
Also changed the return value from bool to the actual amount set, so
_storage_use_one_box tracks the correct number of boxes used.
2026-02-19 02:19:08 +08:00
LmeSzinc
0a4f2a89fc Fix: handle raid remain like "915/", "1515" 2026-02-19 02:15:25 +08:00
LmeSzinc
986d825a81 Fix: [EN] UI switch to page_game_room 2026-02-19 01:58:20 +08:00
LmeSzinc
74bbaf8395 Fix: first ui switch must be ui_ensure 2026-02-18 09:10:55 +08:00
LmeSzinc
d99b759a08 Fix: no poor sleep in fleet_preparation_sidebar_ensure 2026-02-18 09:10:55 +08:00
ArecaSapling
102b7eeaf7 Upd: blueprint purchase for DR5 & PR6 (#5518) 2026-02-18 09:10:41 +08:00
0O0o0oOoO00
f5172b27f1 Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	module/config/argument/args.json
2026-02-14 13:50:42 +08:00
LmeSzinc
cc089b6223 Merge pull request #5515 from LmeSzinc/dev
Add: Spring Auction Adventure (raid_20260212)
2026-02-14 03:44:51 +08:00
LmeSzinc
7eb80ca6f4 Upd: [CN] game server 裁决协议 2026-02-14 03:32:47 +08:00
LmeSzinc
9bb8e191ac Upd: [EN][JP][TW] Raid CHANGWU assets 2026-02-14 03:30:49 +08:00
LmeSzinc
efeb222764 Upd: [TW] Event entrance of raid_20260212 2026-02-14 03:06:07 +08:00
LmeSzinc
11405cf0c3 Fix: [EN] check other buttons for page_academy 2026-02-14 03:00:01 +08:00
LmeSzinc
3623d4c70a Merge pull request #5508 from sui-feng-cb/event_update
Add: [CN] Spring Auction Adventure (raid_20260212)
2026-02-14 02:32:28 +08:00
sui-feng-cb
5ab18b27fd Fix: use cnocr for CHANGWU_OCR_REMAIN_* 2026-02-12 20:28:24 +08:00