LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 06:09:27 +08:00
Code Activity
10,175 Commits 12 Branches 0 Tags
d86d75735869ea2bc23a6548c6f4e040256c380d
Commit Graph

61 Commits

Author SHA1 Message Date
Zuosizhu
0affcacb26 Fix: Exercise power limit 2026-01-24 15:52:22 +08:00
Zuosizhu
d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor 
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py
 2026-01-24 14:18:46 +08:00
LmeSzinc
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00
xhqss
90c881fda0 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/ui/assets.py
 2025-10-17 00:30:43 +08:00
LmeSzinc
06a8ec167e Fix: Click safe-click-area in exercise combat (#5213) 2025-10-14 23:26:32 +08:00
0O0o0oOoO00
e453c4464a Merge branch 'Lme/master' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
 2025-08-25 23:46:48 +08:00
dragonheart107
6d3acaaddb Fix: Exercise item during battle (#5059) 
* Fix: event log

* Fix: random artefacts during exercise mistaken as Items

* Fix: small tweak
 2025-08-23 22:26:48 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	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
#	module/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
LmeSzinc
1d617abb20 Fix: Sync bunch of popup handlers to all combat 2025-05-15 15:42:54 +08:00
LmeSzinc
ff425a4ebe Fix: Check exercise combat end before handlers 2025-04-07 01:01:46 +08:00
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
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
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
Zuosizhu
3ff90bc0c6 Remake: Encapsulation of GG Handler 
* Remake: Encapsulation of GG Handler

* Fix: Unstoppable restart
 2023-01-28 15:46:53 +08:00
Zuosizhu
8b6b3c00b2 Feature: Configurable power-limit 2023-01-24 20:31:12 +08:00
Zuosizhu
f02a9cd0e3 Fix: Unnecessary power-check for normal campaign 2023-01-21 22:54:26 +08:00
Zuosizhu
a496f8b39e Feature: Auto restart in unsafe situations when GG is on 2023-01-21 05:06:56 +08:00
LmeSzinc
c7df5345d3 Fix: Missing offset on BATTLE_PREPARATION 2023-01-19 02:37:33 +08:00
LmeSzinc
c570d96555 Fix: Double clicked BATTLE_PREPARATION in exercise 2022-12-07 12:59:33 +08:00
LmeSzinc
42123852f9 Fix: Exercise failed to quit on slow PCs because of fast clicks 2022-09-01 22:34:12 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
eff42d07d9 Fix: Handle Exercise.OpponentTrial < 1 
- Opt: Add skipping the first screenshot in exercise combat to be faster
 2022-02-25 18:29:23 +08:00
LmeSzinc
35f296b2eb Merge branch 'master' into dev 2022-01-25 01:04:19 +08:00
LmeSzinc
a2b48ee0c5 Fix: Add click interval in exercise combat to avoid GameTooManyClickError 2022-01-25 00:59:18 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
85101590b7 Merge branch 'master' into app 
# Conflicts:
#	module/config/event.py
 2021-10-11 12:58:52 +08:00
LmeSzinc
3a6593a3ad Fix: Allow exercise combat ends without end conditions detected (#640) 2021-10-11 12:58:25 +08:00
LmeSzinc
0e4159c06d Merge branch 'master' into app 2021-10-06 17:04:40 +08:00
LmeSzinc
2c98cc8dc2 Fix: Failed end combat_execute in exercise if BATTLE_STATUS_D is missing but OPTS_INFO_D appears (#439) 2021-10-06 17:04:03 +08:00
LmeSzinc
019ce4f1dd Del: Remove the use of tinydb and notifypy 2021-09-26 05:00:10 +08:00
LmeSzinc
e607c920cf Refactor: Exercise module, mode easiest_else_exp might have issues 2021-09-23 02:35:22 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
LmeSzinc
9bfa8165f9 Fix: QUIT_CONFIRM in exercise 
- Modify offset to avoid replacing assets
 2020-12-29 17:39:59 +08:00
LmeSzinc
3a91da8ca6 Fix: Avoid entering shop after exercise (#272) 2020-12-23 16:35:20 +08:00