1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 21:09:31 +08:00
Commit Graph

9160 Commits

Author SHA1 Message Date
silvergundam
f4fdde0228 Remove the 71 AP_preserve during OsExplore,because now 71 can't run before OsExplore finished by Lme/master(#4602) 2025-03-14 01:39:26 +08:00
ZuoSiZhu
b82b79988d Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
#	module/config/argument/override.yaml
2025-03-14 00:57:23 +08:00
LmeSzinc
f1c5d96a50 Merge pull request #4657 from LmeSzinc/dev
Bug fix
2025-03-13 18:18:45 +08:00
LmeSzinc
817cdc50db Fix: [CN] SYNC_ENTER should be enter button not receive button 2025-03-13 18:03:59 +08:00
LmeSzinc
fd4e936ea3 Fix: SYNC_ENTER should be clicked 2025-03-13 17:54:24 +08:00
LmeSzinc
35c931d450 Merge pull request #4655 from LmeSzinc/dev
Bug fix
2025-03-10 23:35:00 +08:00
guoh064
edb8bcb5c7 Fix: vanguard_change logic (#4636)
* Add: support list types limitations in Ship class

* Opt: get_common_rarity_dd logic

get_common_rarity_dd should always check all available
ships and not just the ones in the current fleet.
2025-03-10 23:30:02 +08:00
qinsgit
c857ed4e22 Fix: spelling mistakes (#4648)
Co-authored-by: qinsgit <123123123@qq.com>
2025-03-10 23:28:12 +08:00
LmeSzinc
c5f1d6e18b Add: Tools to do event story 2025-03-10 23:02:16 +08:00
silvergundam
d7035ca98b Add: Set AP limit to 2000 when Opsi reset less than 6 days 2025-03-07 05:03:40 +08:00
silvergundam
77b124c2d6 Revert: Call abyssal,stronghold,obscure when yellow coins below 35000 2025-03-07 03:48:01 +08:00
silvergundam
1818f5862c Revert: Abyssal,stronghold,obscure AP preserve change 2025-03-07 03:40:16 +08:00
LmeSzinc
6a104a7f62 Merge pull request #4646 from LmeSzinc/dev
Bug fix
2025-03-06 00:50:32 +08:00
hgjazhgj
50ad05030f [fpy] Fix: PEP540 & SpecialDrop & interval regex (#4645) 2025-03-06 00:40:25 +08:00
guoh064
9c3bfc7e8d Opt: delay cl1 before os_explore finishes (#4602) 2025-03-05 17:08:16 +08:00
silvergundam
95b1b07062 Fix: Yellow coins preserve in OS Shop 2025-03-04 20:26:31 +08:00
guoh064
a08e346609 Opt: search for common CV at retirement from bottom to top (#4638) 2025-03-04 12:42:17 +08:00
silvergundam
b9dff3e177 Add: Call abyssal,strongholdo,obscure when yellow coins below 35000 2025-03-03 18:35:56 +08:00
dragonheart107
1a43d7d08f Revert commit ca0f483 for en only (#4629)
* Add files via upload

* asset
2025-03-02 15:42:08 +08:00
silvergundam
6a9da7c890 fix: 71 shouldn't check rest AP during OsExplore 2025-03-02 12:14:35 +08:00
ZuoSiZhu
337ff1d550 Add: choice to do_nothing in type-changer 2025-03-01 15:09:25 +08:00
silvergundam
b05f808e3e fix: Yellow coins preserve fix 2025-02-28 16:45:48 +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
ZuoSiZhu
449f77f58c Fix: No multiply when using multiplier+type-changer 2025-02-28 10:53:28 +08:00
LmeSzinc
5f5fb22268 Merge pull request #4619 from LmeSzinc/dev
Bug fix
2025-02-28 02:13:47 +08:00
LmeSzinc
9e74c43c93 Fix: [ALAS] Don't redirect 5555 to MuMu serials on MAC as BlueStacks Air would use it 2025-02-28 02:05:06 +08:00
LmeSzinc
be90d02e52 Upd: Increase from chapter C to D also 2025-02-28 01:58:29 +08:00
LmeSzinc
c548e4b960 Merge pull request #4618 from LmeSzinc/dev
Add: Event Paradiso of Shackled Light (event_20250227_cn)
2025-02-28 00:29:59 +08:00
LmeSzinc
f79781250c Fix: Avoid potential duplicate STAGE_INCREASE inserting 2025-02-28 00:26:28 +08:00
LmeSzinc
86ce8f8c47 Upd: Battle UI Pharaoh
- TODO: [EN][JP][TW] Add Quit_Pharaoh
2025-02-28 00:22:02 +08:00
ZuoSiZhu
a98d5e1f83 Fix: Unexcepted multiple type-changing 2025-02-27 23:44:49 +08:00
LmeSzinc
4bc278b00e Add: Chapter SP 2025-02-27 23:40:47 +08:00
LmeSzinc
fba0dd9875 Dev: Convert siren names 2025-02-27 23:31:00 +08:00
LmeSzinc
e222c31fb7 Add: Auto increase from chapter A to B 2025-02-27 23:30:13 +08:00
LmeSzinc
852fe6fbf8 Add: Chapter CD 2025-02-27 23:19:14 +08:00
ZuoSiZhu
d5b03f8222 Merge remote-tracking branch 'origin/dev' into dev 2025-02-27 23:09:45 +08:00
LmeSzinc
b7e5bcf49c Add: Chapter B 2025-02-27 23:03:27 +08:00
ZuoSiZhu
be9b00e938 Fix: Catch Xpath time_out to run following codes 2025-02-27 22:55:54 +08:00
LmeSzinc
48448e96b3 Add: Chapter A 2025-02-27 21:49:54 +08:00
LmeSzinc
8109b8c0be Add: Event entrance of Paradiso of Shackled Light (event_20250227_cn) 2025-02-27 21:14:14 +08:00
silvergundam
31b621163b fix: 71 shouldn't run before OsExplore finished even AshBeacon didn't fully collected 2025-02-26 17:54:55 +08:00
LmeSzinc
c14c08b6be Fix: Override PypiMirror if it's tsinghua 2025-02-26 15:16:06 +08:00
LmeSzinc
9a3c0de101 Merge pull request #4611 from LmeSzinc/dev
Bug fix
2025-02-26 13:24:43 +08:00
LmeSzinc
443aab2cb2 Fix: Lower similarity of AWAKENING to handle random background 2025-02-26 13:20:48 +08:00
silvergundam
baf60da44a remove: delay 71 when 71 AP overmuch 2025-02-26 00:26:03 +08:00
silvergundam
962ef52001 revert: call 71 when MF AP limit in os_run 2025-02-26 00:26:02 +08:00
silvergundam
0bf95ff63b 71 won't run when os explore didnt finish except AP overmuch 2025-02-25 21:09:42 +08:00
silvergundam
4d515d69c9 call abyssal,strongholdo,obscure when AP overmuch 2025-02-25 21:00:19 +08:00
silvergundam
9c152fb5d4 abyssal,strongholdo,obscure AP preserve to MF AP preserve 2025-02-25 20:54:54 +08:00
silvergundam
282cdb028d change meowfficer farming AP preserve to 1000~10000 2025-02-25 20:39:31 +08:00