LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 19:19:25 +08:00
Code Activity
9,052 Commits 12 Branches 0 Tags
7b70ee8f57e245ddc23f745fa3c04400d4e2f73a
Commit Graph

126 Commits

Author SHA1 Message Date
xhqss
2ddc7fff1c Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config_manual.py
#	module/handler/assets.py
#	module/retire/retirement.py
#	module/tactical/tactical_class.py
 2025-01-16 08:52:42 +08:00
LmeSzinc
0973cbc6f8 Upd: _at_low_hp() in various battle UI 2024-12-27 21:32:14 +08:00
LmeSzinc
62b3bd1390 Chore: Log battle UI theme 2024-12-27 02:35:54 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
guoh064
256e069dd7 Tmp: resume low hp detection after false BATTLE_STATUS 2024-12-19 14:48:34 +08:00
Zuosizhu
81a708f888 Fix: Exercise Merge Shit 2024-10-28 02:33:21 +08:00
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
83b59cbc86 Fix: Handle early quit on backline skills 
Exercise_LowHpConfirmWait is unused now, because skill animation lasts much longer
 2024-09-25 14:31:31 +08:00
LmeSzinc
32f118f653 Upd: Exercise HP daemon on new battle UI theme 
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2024-09-25 14:27:49 +08:00
LmeSzinc
b0561ae468 Fix: Wrong area to get combat paused 2024-09-15 23:18:21 +08:00
LA_DI_DA
e8525ffaf0 fix: merge mistake in module/exercise/combat.py 2024-09-15 22:14:03 +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
LA_DI_DA
a9afa5487a Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:09:32 +08:00
LmeSzinc
3e6bd999e2 Upd: [EN] QUIT_CONFIRM 2024-09-13 18:47:41 +08:00
Zuosizhu
cac07d48ab Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors 2024-07-18 08:58:55 +08:00
LA_DI_DA
0f80364ed3 Fix: save global to a single file for cross-module use 2024-05-25 11:16:00 +08:00
LA_DI_DA
a168a0ed54 Add: add log for inherit redirection 2024-05-24 16:25:19 +08:00
LA_DI_DA
7289238d0b Revert "Add: add log for inherit redirection" 
This reverts commit c4665071db.
 2024-05-23 23:56:57 +08:00
LA_DI_DA
c4665071db Add: add log for inherit redirection 2024-05-23 23:29:12 +08:00
LA_DI_DA
8d8fc78735 add: add log for switching assets 2024-05-22 20:19:48 +08:00
LA_DI_DA
551d10cdb8 fix: Adapt to new APIs in retire, exercise, hard 
# module/retire/dock.py
# module/exercise/equipment.py
# module/hard/equipment.py
 2024-05-22 10:33:49 +08:00
LA_DI_DA
0101eaf3e3 fix: Adapt to new APIs from upstream 
# fuck LmeSzinc/AzurLaneAutoScript#3556
# fuck @Air111
 2024-05-19 19:59:03 +08:00
LA_DI_DA
85e4f8e15e Merge branch 'refs/heads/lme-alas/master' into smallkai 
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py
 2024-05-17 18:38:32 +08:00
LmeSzinc
4e469098e2 Fix: Handle another PAUSE and remove direct use of PAUSE 2024-05-09 18:50:32 +08:00
Air111
2507b0fa6b Upd: Flagship changing (#3556) 
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
 2024-04-19 01:40:40 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
LA-DI-DA
5711665c38 Del: useless small game 2023-08-18 20:34:54 +08:00
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class 
Path findings in page class
 2023-07-02 15:24:40 +08:00
Zuosizhu
72e5e200ed Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-26 00:26:23 +08:00
LmeSzinc
c6df09e170 Upd: EXP_INFO_* and the exercise one 2023-05-25 21:45:19 +08:00
Zuosizhu
c467ebea56 Fix: Not delaying exercise time when strategy is aggressive 2023-04-14 00:20:31 +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
ed02e89bc0 Opt: Code formatting 2023-04-11 22:08:38 +08:00
guoh064
600c253309 Merge branch 'dev' into exercise_period_ocr 2023-04-09 14:09:35 +08:00
guoh064
118d2424ca Fix: Wrong log levels 2023-04-09 13:11:23 +08:00
guoh064
814aa9a41c Opt: Refactor ExercisePreserve settings 2023-04-09 12:52:35 +08:00
guoh064
fd118e6aef Opt: Move Class DatedDuration to exercise.py 2023-04-09 09:09:49 +08:00
guoh064
8ecc71369a Opt: refine needs_restore to backup is none 2023-04-09 09:01:39 +08:00
guoh064
3235791659 Opt: Arrange import order of exercise.py 2023-04-05 13:36:23 +08:00
guoh064
9e5811d3cb Add: Optional time for admiral achievement 2023-04-05 12:30:06 +08:00
guoh064
74c67976cc Del: Unused asset OCR_PERIOD_DAY 2023-04-05 12:29:21 +08:00
guoh064
afd80415de Opt: Ocr full exercise remain period 2023-04-03 16:34:56 +08:00
guoh064
2308ed5232 Opt: Refactor method to get exercise remain time 2023-03-30 22:03:02 +08:00
guoh064
956543672c New: Asset for exercise period ocr 2023-03-30 21:32:31 +08:00
guoh064
d69af8955f Opt: Clear exercise attempts after final recovery 2023-03-30 20:47:38 +08:00
Zuosizhu
a5c8488a09 Fix: 12day in ocr cause empty preserved exercise times 2023-03-14 19:13:40 +08:00
Zuosizhu
aad20f1572 Add: choice to empty exercise tries on the second Friday of Exercise season. Fix multi_server issues caused by ocr in exercise days by simply limit it to CN only. 2023-03-09 00:51:25 +08:00