1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 03:39:29 +08:00
Commit Graph

6553 Commits

Author SHA1 Message Date
LA_DI_DA
894f3f473f adj: rename hook method 2025-03-28 13:27:59 +08:00
ZuoSiZhu
27abf4edb1 Fix: Add Hospital to gg 2025-03-28 08:36:06 +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
silvergundam
238a815454 Fix: Meowfficer farming cd 2025-03-28 05:16:38 +08:00
LmeSzinc
ebbef98ff1 Fix: Use RAID_FLEET_PREPARATION instead of classic FLEET_PREPARATION 2025-03-28 04:33:29 +08:00
LmeSzinc
8321182fdc Fix: Disable task hospital when event is over 2025-03-28 04:00:17 +08:00
LmeSzinc
7e1f9d0c3e Upd: [JP] Hospital assets 2025-03-28 03:56:16 +08:00
LmeSzinc
7a0f4d029e Fix: ScriptEnd(emotion control) is delayed to next server update 2025-03-28 03:50:46 +08:00
LmeSzinc
f27a9994f3 Fix: aside button may change in retries 2025-03-28 03:50:02 +08:00
LmeSzinc
d6d0f1b705 Add: Iter invest in character tab 2025-03-28 03:49:04 +08:00
LmeSzinc
fd65a30722 Fix: Use RAID_FLEET_PREPARATION instead of classic FLEET_PREPARATION
because it's different in EN
2025-03-28 03:29:33 +08:00
LmeSzinc
38218ab5c4 Add: Receive hospital daily reward 2025-03-28 03:01:52 +08:00
LmeSzinc
ee3cc0a31f Fix: ScriptEnd don't need re-raise 2025-03-28 02:39:00 +08:00
LmeSzinc
d0d6dc8b54 Chore: Abstract OilExhausted as global internal exception 2025-03-28 02:10:52 +08:00
LmeSzinc
02b84dfb02 Upd: [EN] Hospital assets 2025-03-28 02:06:35 +08:00
LmeSzinc
eb5e477afe Fix: Searching remain times but image smaller than template 2025-03-28 01:58:56 +08:00
LmeSzinc
e035659180 Fix: Re-select aside after combat 2025-03-28 01:43:44 +08:00
LmeSzinc
6c4739fb60 Fix: Click GET_CLUE faster and safer 2025-03-28 01:43:09 +08:00
LmeSzinc
6ba14c4873 Fix: invest button may change in retries 2025-03-28 01:35:45 +08:00
LmeSzinc
a4233d4743 Fix: Exit from hospital pages 2025-03-28 01:26:17 +08:00
LmeSzinc
3e74a8888d Add: Task Hospital to scheduler 2025-03-28 01:25:55 +08:00
ZuoSiZhu
7e3e97a5d9 Fix: Shit from deep_get 2025-03-28 01:20:07 +08:00
ZuoSiZhu
4e6de1b4d4 Fix: unexcepted NoneType from deep_get 2025-03-28 01:07:18 +08:00
LmeSzinc
985f49279f Add: Configs for task Hospital 2025-03-28 01:05:09 +08:00
LmeSzinc
bf71d32b72 Add: Loop aside 2025-03-28 00:51:30 +08:00
LmeSzinc
4c14656319 Add: Claim invest reward 2025-03-28 00:31:24 +08:00
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
2025-03-28 00:23:16 +08:00
LmeSzinc
b0bf81daa3 Add: Basic hospital event 2025-03-28 00:22:21 +08:00
LmeSzinc
34e22491f8 Add: Fleet recommend 2025-03-28 00:19:33 +08:00
LA_DI_DA
3db1c13f36 add: close the modification attribute before enhancement, and open it after enhancement 2025-03-27 19:34:28 +08:00
LA_DI_DA
6b0da34768 fix: fix GG factor configuration key error 2025-03-27 19:14:23 +08:00
LA_DI_DA
3870182bfd fix: fix GG factor parameter type error 2025-03-27 18:32:50 +08:00
LA_DI_DA
098fc6b208 adj: do not throw exception when getting unsupported crack op 2025-03-27 18:07:32 +08:00
LA_DI_DA
61debe2dbb add: add python implementation for gg factor 2025-03-27 18:06:23 +08:00
LA_DI_DA
410f3baace tmp: temporary addition of support for GG factor operation without specific implementation of the operation 2025-03-27 16:13:44 +08:00
LA_DI_DA
276cba6cf1 add: add python interface for obtaining resource information and GG factor 2025-03-27 12:58:30 +08:00
guoh064
24fc8e8b15 Merge pull request #4684 from guoh064/jp_zone_name
Upd: ocr params for get_zone_name in JP server
2025-03-26 00:47:34 +08:00
LmeSzinc
6dfe9204c4 Chore: Abstract app_current() 2025-03-25 11:55:39 +08:00
LmeSzinc
3eaac0999f Fix: No compress in u2.dump_hierarchy
Donno why setting compressed=True may drop resource-id of nodes
2025-03-25 11:55:20 +08:00
guoh064
e8afd8a5a9 Merge remote-tracking branch 'guoh064/shop_event_3' into dev 2025-03-23 21:32:39 +08:00
LA_DI_DA
facd8f931b add: x86_64 architecture options 2025-03-22 22:46:32 +08:00
LA_DI_DA
d6428fb6b2 fix: use mkdir -p instead of mkdir 2025-03-21 20:33:03 +08:00
LA_DI_DA
9e4d229bcf opt: upload resource files to separate directories of different architectures 2025-03-21 20:30:26 +08:00
LA_DI_DA
93b7a2f54b fix: add adc_push timeout parameter to avoid timeout 2025-03-21 20:11:57 +08:00
LA_DI_DA
0a92bd10d4 fix: incorrect log location 2025-03-21 19:59:51 +08:00
LA_DI_DA
3d87557568 add: select arch manually 2025-03-21 19:42:04 +08:00
LA_DI_DA
cb2ecfa5af add: convert arch to arch with abi 2025-03-21 18:43:44 +08:00
LA_DI_DA
be203e3bfb upd: use uname -m to get architecture 2025-03-21 18:39:52 +08:00
silvergundam
121c621ab8 Fix: meowfficer farming and cl1 2025-03-21 15:53:53 +08:00
LA_DI_DA
3409e15362 Merge branch 'refs/heads/feature/luahook' into dev 2025-03-21 13:15:31 +08:00