LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 17:29:24 +08:00
Code Activity
10,175 Commits 12 Branches 0 Tags
d86d75735869ea2bc23a6548c6f4e040256c380d
Commit Graph

110 Commits

Author SHA1 Message Date
Zuosizhu
d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor 
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py
 2026-01-24 14:18:46 +08:00
guoh064
36e998aed7 Upd: [JP] asset REWARD_2.BUTTON (#5465) 2026-01-23 02:47:59 +08:00
Zuosizhu
567e854546 Merge branch 'master_of_lme' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/gacha/gacha_reward.py
#	module/shop/shop_reward.py
#	module/ui/assets.py
 2025-09-01 16:07:45 +08:00
nEEtdo0d
a6e3706ae4 Opt: reduce downtime on select new ship for tactical lesson 2025-08-26 19:42:21 -04:00
0O0o0oOoO00
e453c4464a Merge branch 'Lme/master' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
 2025-08-25 23:46:48 +08:00
LmeSzinc
7c922b05ca Merge pull request #5047 from weeswelai/shop_ui_update_250814 
Upd: Update 250814 shop UI for server CN
 2025-08-25 10:41:26 +08:00
guoh064
f7d1eeab1b Fix: ocr after_process for SKILL_EXP (#5056) 2025-08-23 22:30:13 +08:00
weeswelai
0f14b7693d Upd: Update server CN 2025-08-14 new shop UI 2025-08-21 23:59:59 +08:00
0O0o0oOoO00
f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml
 2025-06-17 13:19:30 +08:00
LmeSzinc
2247d72bf7 ix: Handle TACTICAL_CHECK without black-blurred background (#4861) 2025-06-06 01:18:31 +08:00
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
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
4991cc7bd0 Opt: Fast enter _tactical_books_choose after RAPID_TRAINING 2025-04-25 01:25:03 +08:00
LmeSzinc
6462e68a16 Fix: Reset DOCK_CHECK interval after select_suitable_ship() 2025-04-07 00:53:14 +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
4a2eb4470c Opt: Combine dock filter operations to skip waiting dock loaded 2025-01-04 00:02:29 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
40b3c252dc Fix: Remove sleep in _tactical_book_select() 2024-12-09 12:45:38 +08:00
xhqss
fad84bb0fa Merge branch 'master_lme' 2024-11-15 17:14:11 +08:00
LmeSzinc
1c4857d653 Fix: Double clicking REWARD_GOTO_TACTICAL 2024-11-06 18:27:17 +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
guoh064
be856259a2 upd: [JP] ExpOnSkillSelect 2024-10-20 21:58:34 +08:00
guoh064
cc957fe92e upd: [JP] SKILL_EXP 2024-10-20 21:58:34 +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
d391e0b68e Fix: POPUP_CONFIRM was mis-detected as BOOK_EMPTY_POPUP 2024-06-12 12:28:25 +08:00
steelonion
502a932ae6 fix exception when tactical book is empty (#3880) 2024-06-12 12:22:41 +08:00
LmeSzinc
863458a23a Fix: Trying to handle books empty (#3753) 2024-06-11 23:38:43 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
xhqss
c0c4913353 Merge branch '20230309' into smallkai 
# Conflicts:
#	module/config/i18n/zh-CN.json
 2024-05-23 08:25:21 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
36f786ca53 Upd: [EN][JP] Assets in page_reward 2024-05-22 01:15:18 +08:00
xhqss
765eeed754 Merge branch '20230309' into smallkai 2024-04-11 22:12:34 +08:00
LmeSzinc
9077901820 Fix: Handle MISSION_POPUP_ACK when receiving tactical class 2024-04-10 21:37:08 +08:00
LA_DI_DA
259442c13b Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-06 21:48:59 +08:00
LmeSzinc
1750f31199 Fix: Handle missing / in tactical skill ocr 2024-02-06 20:29:10 +08:00
LA-DI-DA
c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 
# Conflicts:
#	module/device/device.py
 2023-12-23 11:07:19 +08:00
LmeSzinc
6bc87a9227 Fix: Rapid training triggers too many click between 2 buttons (#3349) 2023-12-14 19:26:44 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
Yingdong Yang
dffa87d5df Fix: tactical failed when the ship's all skills are leveled max (#3201) 2023-10-19 02:15:49 +08:00
LA-DI-DA
511334ed84 Merge branch 'lme-alas/master' into wait 2023-07-02 17:28:05 +08:00
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class 
Path findings in page class
 2023-07-02 15:24:40 +08:00
LA-DI-DA
2846c3cf42 Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/config_updater.py
 2023-06-20 22:42:40 +08:00
scdhh
889c6dd826 Fix: tactical selecting ship not reset filter (#2758) 
* Fix: tactical selecting ship not reset filter

* reorder code execution

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-06-12 18:38:55 +08:00
LA-DI-DA
e1a5ab0a45 Fix:select suitable ship problem(maybe?) 2023-05-20 15:17:54 +08:00
LmeSzinc
479f06399e Fix: Catch unexpected OCR result on empty skill slot 2023-04-12 12:55:36 +08:00
LmeSzinc
76c189cc6b Fix: Catch empty skill slot in tactical 2023-02-04 17:27:24 +08:00
LmeSzinc
e750c44c18 Upd: [TW] SKILL_CONFIRM 2023-01-09 21:01:45 +08:00
LmeSzinc
e3b9586a57 Fix: Loop clicking between RAPID_TRAINING and ADD_NEW_STUDENT 2022-12-07 01:30:19 +08:00
LmeSzinc
fbd092322e Fix: Missing button offset of TACTICAL_META when selecting ship in tactical (#1854) 2022-11-13 02:12:16 +08:00