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

1893 Commits

Author SHA1 Message Date
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +08:00
LA_DI_DA
5ab8cfdee5 Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	README.md
2024-07-06 19:17:11 +08:00
LmeSzinc
6105801737 Upd: [EN][JP] RETIRE_SETTING_* 2024-07-06 02:07:05 +08:00
LmeSzinc
095c51d2f8 Upd: [CN] RETIRE_SETTING_* 2024-07-03 22:55:10 +08:00
LmeSzinc
67073bad07 Fix: Leave memories tab (fixed #3956) 2024-07-03 22:46:41 +08:00
zuak110
4333b97d36 Add: Quick collection of coins and loves in the Dorm. (#3837)
* Add: Quick collection of coins and loves in the Dorm.

* Upd: dorm coins and loves quick collect.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

---------

Co-authored-by: Yoshino <zuak.8235790@gmail.com>
2024-07-03 22:27:22 +08:00
霞飛
cb9114c7bd Fix: none cost (#3947)
* fix: none cost

* upd: assets
2024-07-01 13:45:21 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
2024-06-28 16:01:16 +08:00
guoh064
3f0a6908c6 Upd: [JP] Assets for page_coalition 2024-06-28 12:16:25 +08:00
guoh064
ee8e2ff57f Add: [JP] Assets for coalition_20240627 2024-06-28 12:16:25 +08:00
LmeSzinc
ec5f0f92a6 Upd: [EN] MOB_MOVE_CANCEL 2024-06-28 09:12:18 +08:00
LmeSzinc
c45c80c147 Add: [EN] Assets for coalition_20240627 2024-06-28 03:00:47 +08:00
LmeSzinc
7fba50035c Upd: [EN] Assets for page_coalition 2024-06-28 02:42:38 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
LmeSzinc
752d4ea043 Add: UI switches to page_coalition 2024-06-28 00:28:03 +08:00
LmeSzinc
3958373fc4 Upd: [TW] MOB_MOVE_CANCEL (#3922) 2024-06-27 22:51:59 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
#	module/os/fleet.py
2024-06-22 20:31:35 +08:00
霞飛
38b549a9e5 fix: add asset (#3894) 2024-06-17 17:55:24 +08:00
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
LmeSzinc
b5a9816782 Fix: Re-crop OPSI IN_MAP, leave letters only (#3871) 2024-06-11 23:56:31 +08:00
LmeSzinc
863458a23a Fix: Trying to handle books empty (#3753) 2024-06-11 23:38:43 +08:00
LmeSzinc
77d48937fc Fix: Handle mail full popup 2024-06-03 10:22:06 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
rilylc
445e6c61e7 Upd:[TW]dorm assets 2024-05-30 21:45:08 +08:00
Air111
fdf28b2032 Fix: update offset and EN assets of rewards 2024-05-27 00:33:24 +08:00
pull[bot]
8ca2805cc2 Merge pull request #16 from LmeSzinc/master
[pull] smallkai from LmeSzinc:master
2024-05-24 13:10:43 +00:00
LmeSzinc
234fd8d00a Upd: MISSION_NOTICE_WHITE 2024-05-24 15:59:56 +08:00
pull[bot]
c85c6582e1 Merge pull request #15 from LmeSzinc/master
[pull] smallkai from LmeSzinc:master
2024-05-24 03:30:45 +00:00
LmeSzinc
9ba3d2e732 Upd: [TW] Dorm menu assets 2024-05-24 03:02:51 +08:00
LmeSzinc
0bb086c7c7 Upd: [TW] Dock favourite assets 2024-05-24 02:55:32 +08:00
LmeSzinc
d4dec4ed55 Upd: [TW] UI assets 2024-05-24 02:49:39 +08:00
LmeSzinc
b8613b30fb Upd: [JP] UI assets 2024-05-24 02:35:35 +08:00
LmeSzinc
e2bf7e2997 Upd: [EN] UI assets 2024-05-24 02:33:40 +08:00
LA_DI_DA
880a1834ec Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai-dev
# Conflicts:
#	README.md
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py
2024-05-23 12:51:24 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme'
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
2024-05-23 02:31:29 +08:00
LmeSzinc
f5f2112442 Upd: [CN][EN][JP] Dock favourite assets 2024-05-23 01:42:19 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
339530c5d3 Add: Chapter B 2024-05-23 01:16:41 +08:00
LmeSzinc
a79562aebc Add: Chapter AC 2024-05-22 02:29:23 +08:00
LmeSzinc
ffe2a213ca Fix: Handle idle page 2024-05-22 01:44:45 +08:00
LmeSzinc
36f786ca53 Upd: [EN][JP] Assets in page_reward 2024-05-22 01:15:18 +08:00
LA_DI_DA
0101eaf3e3 fix: Adapt to new APIs from upstream
# fuck LmeSzinc/AzurLaneAutoScript#3556
# fuck @Air111
2024-05-19 19:59:03 +08:00
LA_DI_DA
4481519a82 Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai 2024-05-17 18:09:32 +08:00
Zuosizhu
a3e1d994bb Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 19:58:18 +08:00
下面我簡單喵兩句
81b8ae1512 Upd:[TW]research assets (#3721) 2024-05-03 14:49:42 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge'
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
2024-04-27 13:00:39 +08:00
Zuosizhu
e99c8ad341 Revert "Upd: Flagship changing (#3556)"
This reverts commit 2507b0fa
2024-04-27 12:58:56 +08:00
Zuosizhu
f4245fef77 Revert "Fix: update [CN/JP/TW] asset EQUIPPING_ON to handle cat claw"
This reverts commit 932cd6c370.
2024-04-27 12:57:34 +08:00
LmeSzinc
7a45fed67f Fix: Duplicated SheffieldIdol template 2024-04-26 04:01:06 +08:00