LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 06:29:30 +08:00
Code Activity
8,965 Commits 12 Branches 0 Tags
f3a2ee56e90ba19b11e2b61ef71d28af26387bf3
Commit Graph

6305 Commits

Author SHA1 Message Date
LA_DI_DA
f3a2ee56e9 Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:13:31 +08:00
LA_DI_DA
1bdaa5aa47 fix: merge mistake, lack of function in app.py 2024-09-13 23:07:29 +08:00
xhqss
98b75acd16 upd config:args.json 2024-09-13 20:18:46 +08:00
xhqss
48ba0f043e Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-09-13 20:17:43 +08:00
LmeSzinc
3e6bd999e2 Upd: [EN] QUIT_CONFIRM 2024-09-13 18:47:41 +08:00
weeswelai
1c9534d7a4 Upd: Update event Ode of Everblooming Crimson(event_20240912_cn) 2024-09-13 18:38:43 +08:00
LmeSzinc
14b01ff9a0 Upd: [EN] PAUSE 2024-09-13 02:09:12 +08:00
LmeSzinc
093009d5cb I18n: Rename META tasks to be clearer 2024-09-13 01:10:49 +08:00
SarContDeli
aa79cc05dd Upd: improve ldopengl performance (#4173) 2024-09-12 22:26:17 +08:00
LmeSzinc
a66760b743 Opt: Patch aiofiles to reduce thread pool size 2024-09-11 22:47:58 +08:00
xhqss
9c6eee6335 Merge branch 'master_lme' 2024-09-11 20:45:36 +08:00
LmeSzinc
3d262a5703 Fix: Share screenshot_method_override across tasks 2024-09-11 19:02:03 +08:00
LmeSzinc
9350273533 Upd: [TW] EXP_INFO_CF (#4164) 2024-09-11 01:42:47 +08:00
LmeSzinc
4b07f5068c Fix: Reset map_cat_attack_timer after handling retirement 2024-09-10 01:14:18 +08:00
LmeSzinc
e1bb483aaa Fix: [ALAS] Limit pool size when using run_in_executor() 2024-09-10 01:14:15 +08:00
guoh064
34acf7ed3a Add: mask for ui_white_main (#4145) 2024-09-09 23:44:48 +08:00
LmeSzinc
f5fa5b6901 Fix: Limit swipe times in retirement_get_common_rarity_cv (#4116) 2024-09-09 23:38:34 +08:00
LA_DI_DA
c89281fa1f Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 2024-08-31 11:33:21 +08:00
LA_DI_DA
881b2e1115 Merge branch 'refs/heads/dev' 2024-08-31 11:26:22 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
SarContDeli
7c574ceaf5 Fix: ldopengl screenshot reverse color (#4136) 2024-08-31 10:59:44 +08:00
LmeSzinc
782c8d0752 Opt: Skip waiting map clear percentage in SP 2024-08-30 23:04:36 +08:00
LmeSzinc
87cb525b58 Add: Chapter T 2024-08-30 22:49:07 +08:00
LmeSzinc
7428485487 Add: Event entrance of Whence Flowers Bear No Fruit (event_20240829_cn) 2024-08-30 18:57:36 +08:00
LmeSzinc
dc530e7538 Fix: [ALAS] Catch OSError when iter running emulators 2024-08-30 18:50:53 +08:00
Air111
78c59bb490 Fix: refresh current zone first if OpsiMeoTargetZone!=0 (#4121) 2024-08-30 18:45:21 +08:00
guoh064
9abc30dbdb Fix: wrong popup dealing in minigame (#4135) 2024-08-30 17:49:59 +08:00
LmeSzinc
ffc956d3c7 Opt: Reduce 2x book confirm timer for faster 2024-08-23 03:00:16 +08:00
LmeSzinc
918e700831 Fix: Enlarge strategy search area since they are shown in 2x4 now (#4108) 2024-08-23 02:59:40 +08:00
LmeSzinc
7eadaa7d8a Fix: [JP] Handle mail empty (#4114) 2024-08-23 02:34:40 +08:00
LmeSzinc
b8c89285c1 Fix: [ALAS] Predict MuMu12 serial from instance id if it was missing in vbox file 2024-08-23 02:22:30 +08:00
LmeSzinc
714c1ce455 Fix: Wait is_current_ap_visible with timeout 2024-08-20 02:33:25 +08:00
guoh064
6a10ddf8df Fix: current ap blocked by info bar (#4100) 2024-08-20 02:25:44 +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
LmeSzinc
3740ab7164 Fix: ensure_campaign_ui should have timeout instead of loop count 2024-08-20 01:35:10 +08:00
LmeSzinc
c9349b1bba Fix: _get_stage_name should before handle_get_chapter_additional (#4094) 
so loop can be break
 2024-08-20 01:31:50 +08:00
LmeSzinc
f12ccb87ef Fix: [ALAS] MuMu12 v4.0.4, default instance of which has no forward record in vbox config 2024-08-20 01:23:01 +08:00
LA_DI_DA
396e567b57 Fix: update new event for event2 2024-08-17 22:58:37 +08:00
LA_DI_DA
3423600508 Fix: reduplicated i18n 2024-08-17 22:54:17 +08:00
LA_DI_DA
dc51c4c56d Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 
# Conflicts:
#	config/template.json
#	module/campaign/run.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/dashboard.yaml
#	module/config/argument/gui.yaml
#	module/config/argument/menu.json
#	module/config/argument/override.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/config/config_manual.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/research_farming/farming.py
 2024-08-17 22:33:23 +08:00
LA_DI_DA
f490410411 Merge branch 'refs/heads/dev' 
# Conflicts:
#	bin/Lua/ShipChanger.lua
#	module/config/argument/args.json
#	module/device/screenshot.py
 2024-08-17 22:02:06 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/ui/page.py
 2024-08-17 21:48:52 +08:00
xhqss
14d1b739f3 Fix:Missing s in the directory of customer config,json 2024-08-17 13:35:27 +08:00
LmeSzinc
c98f2dc825 Fix: Missing s in the directory of customer_config.json 2024-08-17 03:16:15 +08:00
xhqss
60c21b930f Upd config:event_20240815 2024-08-17 02:57:20 +08:00
xhqss
eb83dcb403 Merge branch 'master_lme' 2024-08-17 02:54:22 +08:00
guoh064
c79d84e174 Opt: Check total ap to prevent meaningless ap box usage (#4020) 
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Opt: Check total ap to prevent meaningless ap box usage

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
 2024-08-17 00:43:25 +08:00
LmeSzinc
95eb23de32 Opt: Show Map_clear_percentage as percentage instead of full float 2024-08-17 00:29:55 +08:00
LmeSzinc
d1b41367cb Fix: Check app keep alive on mumu >= 4.0 2024-08-17 00:29:55 +08:00