LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 00:39:28 +08:00
Code Activity
7,931 Commits 12 Branches 0 Tags
ce6cb8c4bfd1f105b054e4eaafeeaa2a8be99ee4
Commit Graph

319 Commits

Author SHA1 Message Date
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
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
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
LmeSzinc
f77f273329 Fix: Handle random OCR error on Downes' hair 2023-05-13 21:34:17 +08:00
Zuosizhu
b5256e8570 Fix: Lost status instructions in ship scanner 2023-03-28 17:22:45 +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
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.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
 2023-03-24 16:33:37 +08:00
LmeSzinc
806e15934f Fix: Lower threshold in StatusScanner 2023-03-19 22:38:42 +08:00
Zuosizhu
147c0a5214 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	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
 2023-03-01 14:26:11 +08:00
LmeSzinc
a0e00fc74d Upd: Add EN to server_support_quick_retire_setting_fallback 2023-03-01 00:12:19 +08:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +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
2d98ef73f2 Add: Re-add RetireAmount 2023-02-19 21:04:29 +08:00
LmeSzinc
b63cf43568 Opt: Re-organise retire settings 2023-02-18 00:48:40 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
LmeSzinc
ca3581a715 Upd: Dock filter grids 2023-02-16 22:06:56 +08:00
LmeSzinc
0690d6094e Opt: Treat too many state transitions as GameStuckError to catch logs 2023-01-28 17:14:34 +08:00
LmeSzinc
5566626d6f Fix: Deque index out of range in state_enhance_check state 2023-01-16 22:25:24 +08:00
LmeSzinc
93d75ed8f9 Fix: Handle port not found in port_goto() 2023-01-04 20:30:52 +08:00
LmeSzinc
e07e319ab2 Fix: Missing offset from ONE_CLICK_RETIREMENT 2022-12-29 22:26:34 +08:00