LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 16:59:25 +08:00
Code Activity
10,173 Commits 12 Branches 0 Tags
6a6fa5bde3935bf7db788fb11d6ccd60c4c520b2
Commit Graph

135 Commits

Author SHA1 Message Date
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
6d47f626d1 Opt: Disable event if current event type is raid or coalition 2026-01-23 17:39:46 +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
8d040e9345 Opt: Reuse screenshots in combat_status 2025-10-24 00:21:41 +08:00
LA-DI-DA
62c33f27e0 Merge the remaining functions in MoreAlas 2025-04-24 23:30:50 +08:00
ZuoSiZhu
166b49f8f0 Merge branch 'master_lme' into dev 
# Conflicts:
#	alas.py
#	module/config/config_manual.py
#	module/ui/page.py
#	module/ui/ui.py
 2025-03-28 08:34:41 +08:00
LmeSzinc
d0d6dc8b54 Chore: Abstract OilExhausted as global internal exception 2025-03-28 02:10:52 +08:00
LmeSzinc
b0bf81daa3 Add: Basic hospital event 2025-03-28 00:22:21 +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
hephooey
419f2ed6d5 [TW] Event: Spring Fashion Festa (#4539) 2025-01-27 17:56:45 +08:00
xhqss
baa8d2ccd7 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/ui_white/assets.py
 2025-01-19 15:59:20 +08:00
LmeSzinc
372c3e74db Add: [EN][JP] Assets in raid_20250416 2025-01-17 13:25:59 +08:00
LmeSzinc
ee76c8925b Add: Assets in raid_20250416 2025-01-17 13:06:06 +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
b72095e39f Upd: [TW] Raid assets of raid_20240130 2025-01-04 22:33:31 +08:00
LmeSzinc
62b3bd1390 Chore: Log battle UI theme 2024-12-27 02:35:54 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
fe223d70bf Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL 2024-03-29 03:21:10 +08:00
LmeSzinc
8be7d9f794 Add: Enter stage in RPG raid 2024-03-29 02:27:36 +08:00
LmeSzinc
e8909f4d59 Add: UI switches in RPG raid 2024-03-29 02:17:47 +08:00
RilyLC
7a01eadcd2 Upd:[TW]Event:Reflections of the Oasis (#3574) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-03-21 19:33:21 +08:00
Zuosizhu
f8ce1d0395 Merge branch 'LmeSzinc:master' into 20230309 2024-02-07 01:42:58 +08:00
RilyLC
7968771265 Upd:[TW]Event assets (#3479) 2024-02-07 00:00:41 +08:00
Zuosizhu
73c29c9afd Merge branch 'LmeSzinc:master' into 20230309 2024-02-06 21:00:56 +08:00
weeswelai
b3521111f9 Upd: Update pt OCR recognition of Raid_20240130 2024-02-05 10:41:53 +08:00
Zuosizhu
edccf21374 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 22:10:18 +08:00
weeswelai
01dadb5456 Upd: Update raid_20240130 assets for CN sever. 2024-01-31 22:06:43 +08:00
Zuosizhu
62712d1864 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 13:10:56 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
appleapple802
d7c748f420 Upd: [TW] Raid event Fight On, Royal Maids! 2023-10-21 15:39:44 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +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
54d4920a63 Fix: Handle RAID_REWARDS at raid ocr (#2838) 2023-07-07 00:38:10 +08:00
Tarin_Chan
b9e5134464 Fix: add RAID_REWARDS.png to fix raid reward problem (#2829) 
* Add files via upload

* Update raid.py

更改了逻辑
特别感谢Alas群 莱森·何Horizon101011 的帮助

* Update raid.py

趁没人看见修点丢人bug

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-07-02 15:38:44 +08:00
Zuosizhu
68a2ba7c12 Merge branch 'LmeSzinc:master' into 20230309 2023-07-01 20:57:27 +08:00
LmeSzinc
688c6023e9 Opt: Wraps with multi_set() 2023-07-01 14:55:17 +08:00
Bookbug
e3d902a650 Add: [JP] Raid assets of Reflections of the Oasis (#2822) 2023-07-01 14:47:52 +08:00
nEEtdo0d
eafdf734cc Fix: Raid task non-stop loop for ex mode, use task name to differentiate Raid vs RaidDaily 2023-07-01 00:51:01 -04:00
nEEtdo0d
e0f79d13ca Add: Gorizia raid ex ocr clause and remain asset 2023-06-30 17:38:52 -04:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
LmeSzinc
b3f1461e37 Upd: [EN] Raid assets of Reflections of the Oasis 2023-06-30 16:16:24 +08:00
LmeSzinc
2c39f195f8 Add: [CN] Raid assets of Reflections of the Oasis 2023-06-30 16:05:15 +08:00
Zuosizhu
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.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
 2023-03-24 16:33:37 +08:00
LmeSzinc
d5ba9bbc83 Revert: [TW] Revert IRIS_OCR_PT 2023-03-24 05:14:03 +08:00
xzjjasper
802bb6c26e Upd: [TW] raid assets 2023-03-23 21:52:41 +08:00
xzjjasper
7175b3969e Upd:[TW] Angel of Iris 2023-03-23 20:36:48 +08:00
Zuosizhu
e1811c1ac0 Fix: value log error 2023-02-14 08:10:18 +08:00
Zuosizhu
db9443be2e Merge branch master_GUI 2023-02-08 08:02:39 +08:00