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

1915 Commits

Author SHA1 Message Date
Zuosizhu
1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev
# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
2024-07-26 08:04:44 +08:00
LmeSzinc
34265d966d Upd: [JP] Mail assets 2024-07-26 03:01:04 +08:00
LmeSzinc
4a000745cc Upd: [JP] POPUP_CANCEL_WHITE and POPUP_CONFIRM_WHITE 2024-07-26 02:53:15 +08:00
LmeSzinc
19ba250bd4 Add: Chapter SP 2024-07-26 02:46:17 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
LmeSzinc
96647e6300 Add: Chapter T 2024-07-26 02:20:15 +08:00
LmeSzinc
2da2d58297 Fix: Handle yet another CLEAR icon 2024-07-26 02:20:05 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
Zuosizhu
185af2808f Merge Lme/Master into dev 2024-07-22 16:45:29 +08:00
LA_DI_DA
327225e74d Add: show player info in dashboard
commits:
Adj: rename update player info function

Fix: use play exp record to check time

Add: show exp and level of player in dashboard
2024-07-21 12:53:55 +08:00
LmeSzinc
39fceddb52 Upd: [EN] POPUP_CANCEL_WHITE and POPUP_CONFIRM_WHITE 2024-07-21 02:27:04 +08:00
guoh064
a2ebcbef1b Add: scroll retire comfirm page to find more common cv 2024-07-19 12:33:50 +08:00
LmeSzinc
eeb516146c Revert "Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6"
This reverts commit 9a920233
2024-07-19 12:27:34 +08:00
LA_DI_DA
a12a831419 Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
2024-07-18 23:12:53 +08:00
LmeSzinc
06143434a8 Add: Claim mail rewards 2024-07-18 22:20:50 +08:00
LmeSzinc
1f20da207b Upd: [JP] Research blueprint assets 2024-07-12 21:23:52 +08:00
LmeSzinc
c05e5f9d72 Fix: [JP] Invalid resolution on REWARD_*_WHITE 2024-07-12 21:17:30 +08:00
LmeSzinc
9a92023308 Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6 2024-07-12 12:48:30 +08:00
ReLU
fceeff25e0 Merge remote-tracking branch 'upstream/master' into dev 2024-07-12 03:54:22 +08:00
LmeSzinc
d161fc8cbf Upd: Series selecting page in shipyard 2024-07-12 00:31:34 +08:00
LmeSzinc
aeab621087 Upd: Detect research series 7 2024-07-12 00:07:25 +08:00
LmeSzinc
87cd4a5dd1 Upd: [TW] BATTLE_STATUS_CF (#3975) 2024-07-11 23:00:16 +08:00
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