LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 13:09:24 +08:00
Code Activity
8,834 Commits 12 Branches 0 Tags
a2e6986dcd9f00a9e86c4e7887cca1d25e427c52
Commit Graph

131 Commits

Author SHA1 Message Date
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
 2024-10-25 12:01:29 +08:00
LmeSzinc
b0561ae468 Fix: Wrong area to get combat paused 2024-09-15 23:18:21 +08:00
LA_DI_DA
15dbb46cc3 Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/exercise/combat.py
#	module/os/map.py
 2024-09-15 18:06:15 +08:00
LmeSzinc
d1eeb02bd2 Add: Support Battle UI theme 2024-09-15 04:34:14 +08:00
Zuosizhu
aef67541c5 Add: Option to disable Opsi repair 2024-08-02 17:23:36 +08:00
LA_DI_DA
d9c22966b8 Add: research farming for opsi hazard1 when task's auto search interrupted 2024-07-17 22:57:52 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
 2024-05-23 02:31:29 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
Zuosizhu
5123bd9949 Merge branch 'lme_master' 
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment_change.py
 2024-05-19 00:50:11 +08:00
LmeSzinc
4e469098e2 Fix: Handle another PAUSE and remove direct use of PAUSE 2024-05-09 18:50:32 +08:00
Zuosizhu
af1f0a9056 Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 12:58:36 +08:00
LmeSzinc
499639f657 Fix: Predict swipe end 2024-04-30 17:42:56 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
ceca042afc Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button 
- TODO: [EN][TW] Update AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED
 2024-03-21 18:35:48 +08:00
LmeSzinc
c5fb5a57c5 Revert "Fix: Handle bugged AP button before game devs get it fixed" 
This reverts commit b615ebf3
 2024-02-22 21:00:52 +08:00
LmeSzinc
b615ebf3cf Fix: Handle bugged AP button before game devs get it fixed 2024-02-22 16:36:32 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LmeSzinc
8b871e8c30 Fix: Don't click MAINTENANCE_ANNOUNCE while interrupting auto search 2024-01-11 10:50:41 +08:00
Zuosizhu
07d5a9e79f Merge branch 'LmeSzinc:master' into 20230309 2023-09-16 07:53:31 +08:00
LmeSzinc
f68406f990 Fix: Disable STORY_ALLOW_SKIP in OpSi 2023-09-15 21:46:57 +08:00
Zuosizhu
f8a35cec1c Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-09-11 08:16:09 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
Zuosizhu
11dc3471aa Merge branch 'LmeSzinc:master' into 20230309 2023-09-03 09:53:28 +08:00
LmeSzinc
b6e66b4a17 Fix: handle_fleet_emp_debuff in port (#3076) 2023-09-02 23:58:56 +08:00
Zuosizhu
fbcb8f5292 Merge branch 'LmeSzinc:master' into 20230309 2023-06-18 03:01:08 +08:00
guoh064
b929afeeea Opt: print loading only once in interrupting_auto_search (#2764) 
* Opt: print loading only once in interrupting_auto_search

* Fix: status of is_loading after executed
 2023-06-15 22:08:49 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
guoh064
9569435e58 Fix: result of map_rescan_current passed wrongly (#2657) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-28 19:54:22 +08:00
Zuosizhu
72e5e200ed Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-26 00:26:23 +08:00
guoh064
7f8769cda8 Fix: scanning tower skip should only operate in cl1 zones. (#2609) 
* Fix: scanning tower skip should only operate in cl1 zones.

* Fix: Change condition to is_in_task_cl1_leveling
 2023-05-23 23:50:01 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
LmeSzinc
dcfcd66dc3 Fix: Random loading screen hit EXP_INFO_C (#2567) 2023-05-12 22:10:50 +08:00
LmeSzinc
0a0c0ffc20 Fix: port_goto() loops between NY City and Gibraltar 2023-05-07 21:10:36 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme' 
# Conflicts:
#	alas.py
 2023-04-20 01:25:28 +08:00
LmeSzinc
2147059858 Opt: Rescan current map first perform full scan then 2023-04-19 22:24:08 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +08:00
LmeSzinc
44bd0e4e81 Fix: Treat is_question as is_port outside of OpSi ports 2023-04-11 21:48:09 +08:00
Zuosizhu
7d1f48878e Fix: Log word fix 2023-02-28 02:24:08 +08:00
梦念逍遥
f392d626f2 Merge branch 'LmeSzinc:master' into master 2023-02-22 10:10:52 +08:00
SarContDeli
6100999369 Fix: wrong value coding in get_action_point_limit 2023-02-21 18:04:52 +08:00
Zuosizhu
b072baa596 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.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/retire/retirement.py
 2023-02-20 12:35:43 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
梦念逍遥
f3c61ddcd6 Merge branch 'LmeSzinc:master' into master 2023-02-08 13:53:20 +08:00
LmeSzinc
702297d1c2 Fix: Handle map events in interrupt_auto_search() (fixed #2219) 2023-02-08 12:34:59 +08:00
梦念逍遥
2487b97c3b Merge branch 'LmeSzinc:master' into master 2023-02-01 12:20:22 +08:00
LmeSzinc
ef14eba859 Opt: CL1 Leveling optimization for more rewards 2023-02-01 02:03:50 +08:00
MengNianxiaoyao
fb5485e651 仪表盘优化更新 2023-01-31 20:49:28 +08:00
Zuosizhu
d07264269e Merge branch master from "github.com/LmeSzinc/AzurLaneAutoScript" 2023-01-31 00:01:24 +08:00
Zuosizhu
1071f2f3d0 Feature: Support for log resTime 2023-01-30 18:01:04 +08:00
LmeSzinc
6471d219fd Refactor: Abstract OSStatus class 2023-01-29 22:46:35 +08:00