LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 17:19:25 +08:00
Code Activity
8,876 Commits 12 Branches 0 Tags
fce2f7b9e00b41eb7da131d262dff262fef4f55c
Commit Graph

127 Commits

Author SHA1 Message Date
0O0o0oOoO00
e38ec5aa81 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	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
 2026-04-18 15:54:19 +08:00
heipen
5cf249c8e7 Merge pull request #5595 from Heipen/ui_update 
Upd: Battle UI ElvenVine
 2026-04-03 22:44:37 +08:00
xhqss
1af31e1d91 Merge branch 'master_LME' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/zh-TW.json
 2026-03-12 22:15:51 +08:00
heipen
dbc5fe42e8 Upd: Battle UI SpringInn (#5541) 2026-03-04 12:32:12 +08:00
0O0o0oOoO00
f5172b27f1 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	module/config/argument/args.json
 2026-02-14 13:50:42 +08:00
LmeSzinc
7d9e77e4fd Upd: Battle UI Ancient 2026-02-09 23:31:47 +08:00
0O0o0oOoO00
8d17eeb803 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
 2026-01-23 10:21:18 +08:00
LmeSzinc
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00
0O0o0oOoO00
15f4898f3c Merge remote-tracking branch 'LmeSzinc/master' into refactor 
# Conflicts:
#	module/config/argument/args.json
 2026-01-08 12:34:24 +08:00
LmeSzinc
99de5e0d34 Upd: Battle UI MaidCafe 2026-01-01 23:36:25 +08:00
0O0o0oOoO00
5d2c46973c Merge remote-tracking branch 'LmeSzinc/master' into refactor 
# Conflicts:
#	module/config/argument/args.json
 2025-12-21 18:46:41 +08:00
MikuSoft
1297908d89 Add:[CN] assets combat ui ShadowPuppetry (#5377) 2025-12-09 12:24:33 +08:00
0O0o0oOoO00
c6de0daf66 Merge remote-tracking branch 'LmeSzinc/master' into refactor 
# Conflicts:
#	module/config/argument/args.json
 2025-10-24 17:13:48 +08:00
LmeSzinc
d4142afa22 Refactor: Timer class 2025-10-22 01:09:45 +08:00
0O0o0oOoO00
d1256f3866 Merge remote-tracking branch 'LmeSzinc/master' into refactor 
# Conflicts:
#	module/config/argument/args.json
#	module/shop/shop_reward.py
 2025-10-16 23:05:15 +08:00
LmeSzinc
06a8ec167e Fix: Click safe-click-area in exercise combat (#5213) 2025-10-14 23:26:32 +08:00
0O0o0oOoO00
04c43fbc09 Merge remote-tracking branch 'LmeSzinc/master' into refactor 
# Conflicts:
#	module/config/argument/args.json
 2025-10-01 19:43:59 +08:00
LmeSzinc
9a819b738d Fix: Battle UI Ninja in _at_low_hp 2025-09-27 01:47:50 +08:00
0O0o0oOoO00
e4323b6c77 add: migrate exercise delay implementation 2025-09-15 18:01:01 +08:00
0O0o0oOoO00
9c68c804a4 ref: use a wrap class to control scheduler watcher 2025-09-13 21:44:20 +08:00
0O0o0oOoO00
998cf9c65f add: add scheduler watcher support 2025-09-12 22:35:00 +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
LmeSzinc
ad10cd4c72 Upd: Battle UI Star 2025-07-04 23:41:29 +08:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +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
LmeSzinc
eaf008f555 Upd: Battle UI Nurse 2025-03-29 00:47:51 +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
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
guoh064
256e069dd7 Tmp: resume low hp detection after false BATTLE_STATUS 2024-12-19 14:48:34 +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
LmeSzinc
d1eeb02bd2 Add: Support Battle UI theme 2024-09-15 04:34:14 +08:00
LmeSzinc
3e6bd999e2 Upd: [EN] QUIT_CONFIRM 2024-09-13 18:47:41 +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
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class 
Path findings in page class
 2023-07-02 15:24:40 +08:00
LmeSzinc
c6df09e170 Upd: EXP_INFO_* and the exercise one 2023-05-25 21:45:19 +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