LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 03:39:29 +08:00
Code Activity
9,611 Commits 12 Branches 0 Tags
bff32b75e7eb316b48ea7f05a0ee8cf00a2b3ca5
Commit Graph

164 Commits

Author SHA1 Message Date
0O0o0oOoO00
45ac6bdf45 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	module/retire/assets.py
#	module/retire/dock.py
 2025-06-05 23:53:43 +08:00
LmeSzinc
6d7e43974a Fix: handle game tips that infos skin feature when entering dock 2025-05-29 22:48:01 +08:00
xhqss
0339fe9dcc Merge branch 'master_lme' into dev 
# Conflicts:
#	module/event_hospital/assets.py
 2025-05-25 15:18:10 +08:00
LmeSzinc
8d61802fd1 Fix: continuously check rotation on unknown UI (#4729) 2025-05-24 00:42:13 +08:00
LmeSzinc
0abb1fdff7 Fix: Avoid clicking GET_SHIP after dismiss MEOWFFICER_BUY 2025-05-24 00:17:52 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
LmeSzinc
535a6ad243 Fix: More IDLE buttons to handle 2025-05-11 01:34:10 +08:00
0O0o0oOoO00
a37763aad1 fix: check last updated time of player info is None 2025-04-24 21:24:29 +08:00
POLAR me
90cad18acd update(event_hospital):深谷来信添加记录档案领取 2025-03-31 00:12:49 +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
LmeSzinc
a4233d4743 Fix: Exit from hospital pages 2025-03-28 01:26:17 +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
xhqss
2ddc7fff1c Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config_manual.py
#	module/handler/assets.py
#	module/retire/retirement.py
#	module/tactical/tactical_class.py
 2025-01-16 08:52:42 +08:00
LmeSzinc
0052dc470f Fix: Subpress get_ship in dorm (#4488) 2025-01-04 22:44:56 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
164db6f4da Chore: Rename "threshold" in template matching to "similarity" 
to be differ from the "threshold" in color matching
 2024-12-09 15:37:25 +08:00
xhqss
fad84bb0fa Merge branch 'master_lme' 2024-11-15 17:14:11 +08:00
LmeSzinc
9a31f709c0 Fix: Double clicking REWARD_GOTO_TACTICAL (#4328) 2024-10-30 14:37:58 +08:00
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
 2024-10-25 12:01:29 +08:00
LmeSzinc
95ac640fb8 Fix: Clicking GET_SHIP after MAIN_GOTO_REWARD 
because random ship background triggers GET_SHIP
 2024-10-13 17:33:19 +08:00
LmeSzinc
fc555128a2 Fix: Set page checkers to interval=5 (fixed #4236) 2024-09-25 18:38:09 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/ui/page.py
 2024-08-17 21:48:52 +08:00
LmeSzinc
8dd6ec7811 Fix: Slowly appeared WITHDRAW button (#4044) 2024-08-02 01:02:05 +08:00
LmeSzinc
d79859e6ed Upd: [TW] rpg page definition 2024-08-01 23:33:47 +08:00
guoh064
5ef353a507 Fix: unrecognized ui page after empty mail receive (#4039) 
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Fix: unrecognized ui page after empty mail receive

* Upd: [JP] Asset MAIL_CHECK

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
 2024-07-28 13:32:03 +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
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