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

128 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
095c51d2f8 Upd: [CN] RETIRE_SETTING_* 2024-07-03 22:55:10 +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
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
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
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
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +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
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
LmeSzinc
454e308702 Upd: [CN][TW] DOCK_SELECTED (#2729) 2023-06-08 16:33:31 +08:00
Zuosizhu
8606f2af24 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/retire/assets.py
#	module/retire/scanner.py
 2023-03-28 16:50:00 +08:00
Horizon101011
3e47c8a4f3 Fix: New ship status 'in_event_fleet' 2023-03-27 21:56:01 +08:00
Zuosizhu
ddc94bf109 Merge branch 'LmeSzinc:master' into master 2023-02-28 01:42:07 +08:00
LmeSzinc
9ce0755d31 Merge pull request #2297 from kmou424/sync-python-exe 
Fix: sync python executable with python 3.7 slim image
 2023-02-27 23:51:50 +08:00
Zuosizhu
58082e29e0 Merge branch 'LmeSzinc:master' into master 2023-02-27 14:18:41 +08:00
nEEtdo0d
a61e9b5e62 Fix: [EN] DOCK_AMOUNT position shift; frequent inaccurate read 
Upd: [EN] RETIRE_SETTING_* assets
 2023-02-26 14:45:00 -05:00
LmeSzinc
b9d2b264a1 Upd: EQUIP_CONFIRM 2023-02-26 20:53:56 +08:00
Zuosizhu
db8aede987 Feature: Change flagship and vanguard in Event hard mode when GemsFarming 2023-02-24 18:37:14 +08:00
LmeSzinc
b99d978935 Fix: [EN] Update retire assets (#1967) 2022-12-09 23:00:16 +08:00
bookbug666
0cdc4cfff0 Unlock server restrictions, update assets.py 2022-12-06 00:05:31 +08:00
nEEtdo0d
27fabf7b9f Add: [EN] asset support for ship scan (#1776) 2022-10-27 01:13:39 -04:00
Horizon101011
1f71f5bafb Add: Status 'battle' 2022-10-13 21:13:50 +08:00
Horizon101011
e1f50c64cb Merge branch 'dev' into dockScanner 2022-09-14 10:32:54 +08:00
Horizon101011
bee28c5321 [Refactor] Using template matching instead of feature matching 2022-09-13 09:31:01 +08:00
LmeSzinc
e8dcdeaf65 Add: Quick retire options fallback to avoid user mistakes 2022-09-10 18:11:07 +08:00
Horizon101011
2369581794 Upd: Add support for commission status 2022-09-06 21:36:35 +08:00
nEEtdo0d
2b21309d71 Upd: re-run button_extract; detected cloned server asset 2022-08-14 12:47:21 -04:00
Horizon101011
07a14849d9 Upd: More accurate asset for enhancement 2022-08-13 19:43:27 +08:00
Horizon101011
070f280821 Upd: Retire assets for all servers 2022-07-28 16:57:09 +08:00
LmeSzinc
95d5987f1a Upd: [CN] SR_SSR_CONFIRM 2022-06-30 19:03:56 +08:00
LmeSzinc
c69de7594b Revert "Upd: [JP] DOCK_SELECTED" cause AL revert the changes 
This reverts commit 802dd160
 2022-06-19 21:27:26 +08:00
LmeSzinc
802dd16029 Upd: [JP] DOCK_SELECTED 2022-06-12 01:13:17 +08:00
nEEtdo0d
3be54837d4 Upd: [EN] *_PASS_NOTICE assets 
Fix: [EN] DOCK_AMOUNT area too wide; re-crop
Fix: [EN] MAP_ARCHIVES text intersects into area; re-crop
Upd: [EN] clarify enhance config description
 2022-05-29 15:10:45 -04:00
LmeSzinc
32f939f2bb Fix: Siren scanning tower and logging device are not detected if they are covered by other fleets 2022-05-16 19:54:51 +08:00
Horizon101011
771c9167d8 Opt: Use OCR to improve accuracy 2022-05-14 11:02:26 +08:00