LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 11:49:28 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

346 Commits

Author SHA1 Message Date
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
Zuosizhu
dac4d62f17 Merge branch 'LmeSzinc:master' into 20230309 2024-02-23 00:58:31 +08:00
huangjiule
6af48d7be9 Update retirement.py (#3500) 
* Upd:[TW]Event assets (#3479)

* Upd:[TW]war_archives assets (#3490)

* Update retirement.py

选择更换任意白皮航母时，能够正确保留退役

---------

Co-authored-by: RilyLC <94281898+RilyLC@users.noreply.github.com>
 2024-02-22 16:30:00 +08:00
Zuosizhu
50aef0ec0f Fix: Same ships are black when changing hard mode flagships 2023-12-24 18:57:53 +08:00
Zuosizhu
94c5fb4858 Merge branch 'LmeSzinc:master' into 20230309 2023-11-17 08:01:26 +08:00
RilyLC
d84010bfb1 Fix:[TW]support server_support_status_fleet in campaign\gems_farming (#3285) 
* Fix:[TW]support server_support_status_fleet in campaign\gems_farming

* Fix:[TW]ship scan asset

* Fix:[TW]remove server_support in retirement and gems_farming

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-15 18:28:47 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
Jiahao Yuan
1d6bf0547f Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +08:00
guoh064
4ae8438338 Upd: [JP] RETIRE_COIN (#3267) 2023-11-09 15:35:31 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
44197dba56 Upd: [EN] RETIRE_COIN (#3124) 2023-10-14 21:45:49 +08:00
Zuosizhu
6550a56b2b Merge branch 'master_lme' 
# Conflicts:
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-08-19 09:23:28 +08:00
LmeSzinc
e25e8e3680 Fix: Increase max trial of ONE_CLICK_RETIREMENT 
Game client on slow devices may take a long time to select ships in dock
 2023-08-18 12:12:37 +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
Horizon101011
70987e1712 Fix: Retire get stuck if nothing can be retired (#2837) 2023-07-04 18:34:24 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LmeSzinc
4aeb859153 Fix: Retire confirm end at EQUIP_CONFIRM cause game is slow to process 2023-06-14 12:25:34 +08:00
guoh064
6dde835ce1 Upd: [JP] DOCK_SELECTED (#2750) 2023-06-11 01:41:02 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
166fa65ecc Upd: [EN] DOCK_SELECTED 2023-06-08 23:54:48 +08:00