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

154 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
LmeSzinc
99de5e0d34 Upd: Battle UI MaidCafe 2026-01-01 23:36:25 +08:00
xhqss
a5dc9328c9 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/os_shop/shop.py
 2025-12-19 15:13:21 +08:00
MikuSoft
1297908d89 Add:[CN] assets combat ui ShadowPuppetry (#5377) 2025-12-09 12:24:33 +08:00
xhqss
4137ff807c Merge branch 'master_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/map/assets.py
#	module/shop/shop_reward.py
#	module/ui/assets.py
 2025-10-24 11:10:21 +08:00
LmeSzinc
d4142afa22 Refactor: Timer class 2025-10-22 01:09:45 +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
Zuosizhu
31c99d8953 Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
 2025-10-12 11:28:13 +08:00
LmeSzinc
9a819b738d Fix: Battle UI Ninja in _at_low_hp 2025-09-27 01:47:50 +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
0O0o0oOoO00
10a62a79b5 add: add scheduler watcher to tasks 2025-08-06 18:12:49 +08:00
Zuosizhu
de303b492e Merge branch 'master_lme' into brocore_dev 
# Conflicts:
#	module/config/argument/override.yaml
#	module/research/selector.py
#	module/ui/ui.py
#	module/webui/app.py
 2025-07-11 23:03:05 +08:00
LmeSzinc
ad10cd4c72 Upd: Battle UI Star 2025-07-04 23:41:29 +08:00
xhqss
791f4bfd5a Merge branch 'master' into dev 2025-05-23 00:03:44 +08:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +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
18c7480e58 Upd: Battle UI Devil 2025-04-09 22:51:08 +08:00
LmeSzinc
ff425a4ebe Fix: Check exercise combat end before handlers 2025-04-07 01:01:46 +08:00
silvergundam
73eaab8ace Merge remote-tracking branch 'lme/master' into dev 2025-04-03 11:57:44 +08:00
LmeSzinc
eaf008f555 Upd: Battle UI Nurse 2025-03-29 00:47:51 +08:00
ZuoSiZhu
39c18d8103 Merge remote-tracking branch 'lme/master' into dev 
# Conflicts:
#	deploy/AidLux/0.92/requirements.txt
#	module/campaign/campaign_event.py
#	module/os/map.py
#	module/os_ash/ash.py
#	module/webui/config.py
 2025-02-28 11:01:23 +08:00
LmeSzinc
86ce8f8c47 Upd: Battle UI Pharaoh 
- TODO: [EN][JP][TW] Add Quit_Pharaoh
 2025-02-28 00:22:02 +08:00
霞飛
6e4601dd2b Fix bugs (#4569) 
* fix: add PAUSE_HolyLight at `_at_low_hp`

* fix: handle map file name
 2025-02-07 01:09:24 +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
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