LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 18:59:26 +08:00
Code Activity
8,876 Commits 12 Branches 0 Tags
fce2f7b9e00b41eb7da131d262dff262fef4f55c
Commit Graph

313 Commits

Author SHA1 Message Date
0O0o0oOoO00
e38ec5aa81 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-04-18 15:54:19 +08:00
heipen
5cf249c8e7 Merge pull request #5595 from Heipen/ui_update 
Upd: Battle UI ElvenVine
 2026-04-03 22:44:37 +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
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
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
heipen
dbc5fe42e8 Upd: Battle UI SpringInn (#5541) 2026-03-04 12:32:12 +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
guoh064
13aba919a2 Add: hide_in_upper_left option for combat manual 2026-02-19 23:29:58 +08:00
LmeSzinc
7d9e77e4fd Upd: Battle UI Ancient 2026-02-09 23:31:47 +08:00
LmeSzinc
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00
LmeSzinc
6ae47a39e4 Upd: [TW] TEMPLATE_COMBAT_LOADING 2026-01-04 02:29:43 +08:00
LmeSzinc
99de5e0d34 Upd: Battle UI MaidCafe 2026-01-01 23:36:25 +08:00
LmeSzinc
c36586f8c5 Upd: TEMPLATE_COMBAT_LOADING 2025-12-19 02:48:11 +08:00
LmeSzinc
4a21f2e4e7 Fix: fallback interval set if is_combat_loading() not detected 2025-12-19 02:37:12 +08:00
MikuSoft
1297908d89 Add:[CN] assets combat ui ShadowPuppetry (#5377) 2025-12-09 12:24:33 +08:00
LmeSzinc
8d040e9345 Opt: Reuse screenshots in combat_status 2025-10-24 00:21:41 +08:00
LmeSzinc
4f6ab60db7 Upd: Battle UI Ninja 2025-09-27 00:56:18 +08:00
LmeSzinc
b23a7d6ea1 Upd: [TW] ALCHEMIST_MATERIAL_CONFIRM 2025-08-10 18:01:55 +08:00
LmeSzinc
f793b47008 Upd: [JP] ALCHEMIST_MATERIAL_CONFIRM 2025-07-26 02:39:53 +08:00
LmeSzinc
77f362f8bd Upd: [EN] ALCHEMIST_MATERIAL_CONFIRM 2025-07-25 02:01:42 +08:00
LmeSzinc
4bd51e41f8 Upd: button extract (fixed #4975) 2025-07-25 01:54:40 +08:00
LmeSzinc
ad10cd4c72 Upd: Battle UI Star 2025-07-04 23:41:29 +08:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +08:00
LmeSzinc
ef61702057 Upd: [TW] QUIT_Cyber and QUIT_New in different font weight (fixed #4798) 2025-05-18 16:16:05 +08:00
LmeSzinc
1d617abb20 Fix: Sync bunch of popup handlers to all combat 2025-05-15 15:42:54 +08:00
LmeSzinc
18c7480e58 Upd: Battle UI Devil 2025-04-09 22:51:08 +08:00
LmeSzinc
eaf008f555 Upd: Battle UI Nurse 2025-03-29 00:47:51 +08:00
LmeSzinc
86ce8f8c47 Upd: Battle UI Pharaoh 
- TODO: [EN][JP][TW] Add Quit_Pharaoh
 2025-02-28 00:22:02 +08:00
LmeSzinc
655b2fb361 Upd: Assets for battle UI Holy Light 2025-02-06 23:01:04 +08:00
LmeSzinc
c711584fa6 Opt: Reduce one extra screenshot call after retirement in auto search 2025-01-17 12:41:39 +08:00
LmeSzinc
156a988cf5 Fix: Skip using emergency repair if all HP is 0 (#4501) 2025-01-10 02:39:46 +08:00
LmeSzinc
62b3bd1390 Chore: Log battle UI theme 2024-12-27 02:35:54 +08:00
LmeSzinc
76fcfdf42a Upd: Battle UI Christmas, Cyber, Neon 
- TODO: [EN][JP][TW] add QUIT_Christmas
 2024-12-27 02:26:15 +08:00
LmeSzinc
c9fff1efa2 Fix: Handle mis-clicked to page_exercise (#4434) 2024-12-20 22:58:34 +08:00
guoh064
a24a7fcfd1 tmp: [JP] LevelOcr 2024-10-16 12:48:21 +08:00
LmeSzinc
b0561ae468 Fix: Wrong area to get combat paused 2024-09-15 23:18:21 +08:00
LmeSzinc
d1eeb02bd2 Add: Support Battle UI theme 2024-09-15 04:34:14 +08:00
LmeSzinc
14b01ff9a0 Upd: [EN] PAUSE 2024-09-13 02:09:12 +08:00
LmeSzinc
12bd302deb Reverts test code in commit ea68f68d 2024-06-28 03:23:28 +08:00
LmeSzinc
ea68f68dc9 Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917) 2024-06-27 22:20:09 +08:00
LmeSzinc
79747e86ab Fix: Fleet switch is never watched in auto search (#3866) 2024-06-12 00:14:16 +08:00
LmeSzinc
a668840ee9 Pref: Faster is_combat_loading() 2024-06-05 02:24:47 +08:00
LmeSzinc
eada57f97d Pref: Reduce CPU usage during auto search daemon 2024-06-05 01:15:42 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LmeSzinc
254e9422ed Fix: auto_search_moving ends with is_combat_executing 2024-05-23 01:44:31 +08:00
LmeSzinc
382980ca06 Fix: Add PAUSE in stuck record since is_combat_executing() bypassed appear() 2024-05-09 21:40:37 +08:00
LmeSzinc
4e469098e2 Fix: Handle another PAUSE and remove direct use of PAUSE 2024-05-09 18:50:32 +08:00