LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 18:09:28 +08:00
Code Activity
8,834 Commits 12 Branches 0 Tags
a2e6986dcd9f00a9e86c4e7887cca1d25e427c52
Commit Graph

366 Commits

Author SHA1 Message Date
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
65304fee2e upd: [JP] LevelOcr and EmotionDigit 2024-10-20 21:58:34 +08:00
guoh064
d1052df932 Revert "tmp: [JP] LevelOcr" 
This reverts commit a24a7fcfd1.
 2024-10-20 21:58:34 +08:00
guoh064
17a6da533e upd: [JP] OCR_DOCK_AMOUNT 2024-10-20 21:58:34 +08:00
guoh064
d13e852b92 upd: [JP] retire assets 2024-10-20 21:58:34 +08:00
guoh064
a24a7fcfd1 tmp: [JP] LevelOcr 2024-10-16 12:48:21 +08:00
LmeSzinc
ce4de6b4e9 Fix: Limit trials on _retire_select_one() 2024-10-13 17:44:56 +08:00
yulu901107
2bd90c8b4b Fix: Avoid too_many_click exception caused by enhancement failure on in-battle ships (#4217) 2024-09-29 12:13:50 +08:00
guoh064
4852d66be0 Upd: [JP] asset TEMPLATE_IN_COMMISSION (#4211) 2024-09-20 22:35:00 +08:00
LA_DI_DA
a9afa5487a Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:09:32 +08:00
LmeSzinc
4b07f5068c Fix: Reset map_cat_attack_timer after handling retirement 2024-09-10 01:14:18 +08:00
LmeSzinc
f5fa5b6901 Fix: Limit swipe times in retirement_get_common_rarity_cv (#4116) 2024-09-09 23:38:34 +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
e23e88748f Fix: Reset map_cat_attack_timer after clicking RETIRE_APPEAR_1 (#4055) 2024-08-04 09:57:04 +08:00
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
7644a4b7ef Opt: Skip waiting info_bar after _retirement_confirm() for faster 2024-07-26 02:47:01 +08:00
Zuosizhu
185af2808f Merge Lme/Master into dev 2024-07-22 16:45:29 +08:00
guoh064
11e3580c61 Opt: always keep common cv at retirement if GemsFarming enabled 2024-07-19 12:33:50 +08:00
guoh064
a2ebcbef1b Add: scroll retire comfirm page to find more common cv 2024-07-19 12:33:50 +08:00
Zuosizhu
cac07d48ab Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors 2024-07-18 08:58: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
6105801737 Upd: [EN][JP] RETIRE_SETTING_* 2024-07-06 02:07:05 +08:00
LmeSzinc
78600a323d Opt: Skip wait_loading at the last dock_filter_set 2024-07-03 23:14:26 +08:00
LmeSzinc
c3d20e9366 Opt: Retire once since game client retire all at one time 2024-07-03 23:11:40 +08:00
LmeSzinc
095c51d2f8 Upd: [CN] RETIRE_SETTING_* 2024-07-03 22:55:10 +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
8925abaa46 Fix: Reset map_cat_attack_timer after clicking enhance button (#3877) 2024-06-12 00:05:52 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LA_DI_DA
7970d5b3a3 Merge branch 'refs/heads/smallkai' into smallkai-dev 2024-05-25 19:45:50 +08:00
LA_DI_DA
219bcc2d76 Merge remote-tracking branch 'origin/smallkai' into smallkai 2024-05-25 19:45:31 +08:00
LA_DI_DA
6627c387fb Fix: retire flagship when gemsfarming and use change ship at the same time 2024-05-25 19:21:53 +08:00
LA_DI_DA
4cb76e1e04 Fix: redirect OpsiAshBeacon to inherit old version of Dock 2024-05-25 15:01:43 +08:00
LA_DI_DA
0f80364ed3 Fix: save global to a single file for cross-module use 2024-05-25 11:16:00 +08:00
LA_DI_DA
ea6ad05290 Fix: let all main and event class to inherit old class 2024-05-24 20:59:47 +08:00
LA_DI_DA
a168a0ed54 Add: add log for inherit redirection 2024-05-24 16:25:19 +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
0bb086c7c7 Upd: [TW] Dock favourite assets 2024-05-24 02:55:32 +08:00
LA_DI_DA
7289238d0b Revert "Add: add log for inherit redirection" 
This reverts commit c4665071db.
 2024-05-23 23:56:57 +08:00
LA_DI_DA
c4665071db Add: add log for inherit redirection 2024-05-23 23:29:12 +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
LA_DI_DA
551d10cdb8 fix: Adapt to new APIs in retire, exercise, hard 
# module/retire/dock.py
# module/exercise/equipment.py
# module/hard/equipment.py
 2024-05-22 10:33:49 +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
Air111
250cf4e1a2 Fix: rename equipment functions (#3665) 2024-04-22 23:11:45 +08:00
Air111
cddfea680d Fix: rename equip_enter 2024-04-19 14:13:18 +08:00
Air111
2507b0fa6b Upd: Flagship changing (#3556) 
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
 2024-04-19 01:40:40 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.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
#	module/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +08:00
霞飛
09fe301597 fix: ship template assets bit error (#3618) 2024-04-09 11:23:16 +08:00
ygrzxc
7d574dde8b Add: Change the designated vanguard combination (#3520) 
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
 2024-04-08 22:49:30 +08:00