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

138 Commits

Author SHA1 Message Date
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
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
019a35a64c Fix: Reset interval of GET_SHIP after entering page_dorm 2024-07-03 23:24:18 +08:00
LmeSzinc
67073bad07 Fix: Leave memories tab (fixed #3956) 2024-07-03 22:46:41 +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
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18: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
LmeSzinc
33cefa9817 Pref: Remove rpg page definition since event was over 2024-06-05 02:55:47 +08:00
LmeSzinc
77d48937fc Fix: Handle mail full popup 2024-06-03 10:22:06 +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
d20886131e Fix: Typo on IDLE.match_luma 2024-05-23 02:15:19 +08:00
LmeSzinc
3513daf926 Fix: match_binary in idle page for various background 2024-05-23 01:17:31 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
ffe2a213ca Fix: Handle idle page 2024-05-22 01:44:45 +08:00
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
LmeSzinc
42af2e479f Chore: [ALAS] Abstract has_cached_image 2024-04-13 02:28:11 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
e8909f4d59 Add: UI switches in RPG raid 2024-03-29 02:17:47 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +08:00
Zuosizhu
ecf3c28454 Merge branch 'LmeSzinc:master' into 20230309 2023-12-28 16:05:02 +08:00
LmeSzinc
72197cc822 Fix: DORM_FURNITURE_COUNTDOWN is detected even if it's already purchased 2023-12-23 21:14:15 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme'
# Conflicts:
#	module/map/assets.py
2023-10-20 01:01:54 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +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
2f771d8ca5 Refactor: [ALAS] Page class
Path findings in page class
2023-07-02 15:24:40 +08:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
Zuosizhu
ee1ba9777e Merge branch 'LmeSzinc:master' into 20230309 2023-04-25 00:05:26 +08:00
guoh064
c85e69f0ce Fix: Change LOGIN_ANNOUNCE to MAINTENANCE_ANNOUNCE in ui_additional (#2509)
* Add: Handle LOGIN_ANNOUNCE in ui_additional

* Fix: Handle MAINTENANCE_ANNOUNCE in ui_additioal
2023-04-21 00:50:59 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme'
# Conflicts:
#	alas.py
2023-04-20 01:25:28 +08:00
guoh064
d86e8907a2 Add: Handle LOGIN_ANNOUNCE in ui_additional (#2494) 2023-04-14 23:14:44 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LmeSzinc
61c45028b1 Fix: Handle 2 rows of items at login 2023-04-04 03:41:43 +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
ebb28c056d Fix: Handle MEOWFFICER_BUY in ui switching 2023-03-24 03:17:05 +08:00
LmeSzinc
ff3f76897a Fix: Handle COALITION_FLEET_PREPARATION in ui switching 2023-03-24 03:14:16 +08:00
Zuosizhu
2728b60d28 Merge branch 'LmeSzinc:master' into master 2023-03-09 00:54:24 +08:00
LmeSzinc
a18baea780 Fix: Prevent clicking GET_SHIP when switching from page_main (#2320) 2023-03-07 23:39:49 +08:00
Zuosizhu
2bc586ce57 Merge branch 'master_lme'
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/campaign_status.py
2023-03-04 03:11:41 +08:00
LmeSzinc
2d2d605bbf Fix: Prevent clicking GET_SHIP after MAIN_GOTO_REWARD (#2320) 2023-03-03 18:51:48 +08:00
Zuosizhu
a94d7b58a5 Merge branch 'master_lme'
# Conflicts:
#	module/ui/ui.py
2023-02-26 17:35:50 +08:00
LmeSzinc
cca3de7e77 Fix: Handle EXERCISE_PREPARATION in ui switches 2023-02-26 17:20:37 +08:00
LmeSzinc
7908aa397e Fix: Increase unknown ui timeout
GET_SHIP interval is 5s, timeout should longer than it
2023-02-25 22:40:19 +08:00
Zuosizhu
3ff90bc0c6 Remake: Encapsulation of GG Handler
* Remake: Encapsulation of GG Handler

* Fix: Unstoppable restart
2023-01-28 15:46:53 +08:00
Zuosizhu
69519f96bd Add: Totally useful GG Handler 2023-01-19 01:45:56 +08:00
LmeSzinc
0249927d3e Fix: Use retry interval instead of bare sleep 2023-01-09 01:10:48 +08:00
LmeSzinc
bab2cb1df1 Fix: GET_SHIP being clicked after MEOWFFICER_INFO 2022-12-07 20:14:04 +08:00
nEEtdo0d
840eb4dc7f Mov: re-factor relevant modules and assets into freebies 2022-10-19 21:04:43 -04:00
LmeSzinc
b2533c19b2 Merge branch 'master' into dev 2022-10-07 01:23:22 +08:00
LmeSzinc
775717d77e Fix: Starting ALAS at AUTO_SEARCH_REWARD 2022-10-06 14:15:03 +08:00