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

533 Commits

Author SHA1 Message Date
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +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
2995c5408d Fix: Add Coalition as task requires balance (#3941) 2024-07-01 17:00:20 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
 2024-06-28 16:01:16 +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
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086) 
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
 2024-06-17 11:24:40 +08:00
Air111
a70d4c4675 Upd: add CommonDD option (#3786) 
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
 2024-06-14 03:39:20 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LA_DI_DA
cd64d084b2 Fix: set gemsfarming's ship filter to default after this task is set to campaign_main 2024-05-25 19:43:00 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge' 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
 2024-04-27 13:00:39 +08:00
Zuosizhu
e99c8ad341 Revert "Upd: Flagship changing (#3556)" 
This reverts commit 2507b0fa
 2024-04-27 12:58:56 +08:00
Zuosizhu
4fcb955168 Revert "Fix: rename equip_enter" 
This reverts commit cddfea680d.
 2024-04-27 12:57:37 +08:00
Zuosizhu
7e75b7fdd7 Revert "Fix: scan ships in correct fleet" 
This reverts commit 0eee91a891.
 2024-04-27 12:57:29 +08:00
Zuosizhu
d43b218a0f Revert "Fix: lower SIM_VALUE in ship matching of GemsFarming" 
This reverts commit 194ec3e234.
 2024-04-27 12:57:26 +08:00
LmeSzinc
bfb9bd0d61 Fix: Convert stage names in event_20240425_cn 2024-04-26 04:07:31 +08:00
LmeSzinc
bbef93c03d Add: Heart-Linking Harmony chapter ISP 2024-04-26 03:25:58 +08:00
Air111
194ec3e234 Fix: lower SIM_VALUE in ship matching of GemsFarming 2024-04-19 21:48:50 +08:00
Air111
0eee91a891 Fix: scan ships in correct fleet 2024-04-19 21:46:26 +08:00
Air111
cddfea680d Fix: rename equip_enter 2024-04-19 14:13:18 +08:00
Zuosizhu
0b2f9ed81c Merge branch 'dev' 
# Conflicts:
#	campaign/campaign_main/campaign_15_1.py
#	campaign/campaign_main/campaign_15_2.py
#	campaign/campaign_main/campaign_15_3.py
#	campaign/campaign_main/campaign_15_4.py
 2024-04-19 02:17:51 +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
guoh064
9388666d1d Fix: fall back to all union DDs when not specifying DD (#3648) 2024-04-18 12:14:57 +08:00
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
LmeSzinc
42af2e479f Chore: [ALAS] Abstract has_cached_image 2024-04-13 02:28:11 +08:00
LmeSzinc
7321af9e8f Opt: [CN] Remove temp fixes of rendering bugs on game client 2024-04-13 01:43:30 +08:00
Zuosizhu
d9d5db0ca5 Merge remote-tracking branch 'origin/20230309' 2024-04-12 23:46:26 +08:00
Zuosizhu
8aba12c7a5 Fix: Unable to retire when retire method set to enhance when entering hard event 2024-04-12 23:46:14 +08:00
Zuosizhu
c547c7ab86 Merge branch 'LmeSzinc:master' into 20230309 2024-04-12 23:41:14 +08:00
xhqss
7e1fd52ba6 Merge branch '20230309' into smallkai 2024-04-12 18:48:45 +08:00
Zuosizhu
07e9d88b71 Fix: Merge mistakes(Stuck when changing flagship at hard event) 2024-04-12 13:50:55 +08:00
LmeSzinc
b3ca33fc2f Fix: Add half percent template also 2024-04-12 00:35:35 +08:00
Zuosizhu
f5b3d11eac Merge branch 'LmeSzinc:master' into 20230309 2024-04-11 23:14:52 +08:00
xhqss
8226564773 Merge branch '20230309' into smallkai 2024-04-11 22:27:31 +08:00
xhqss
df2bfe0a06 Merge branch 'master1' into 20230309 2024-04-11 22:27:03 +08:00
xhqss
765eeed754 Merge branch '20230309' into smallkai 2024-04-11 22:12:34 +08:00
LmeSzinc
dba2309f9d Upd: [CN] Add TEMPLATE_STAGE_CLEAR_SMALL to handle bugged game client 2024-04-11 21:59:29 +08:00
LmeSzinc
92a9761d1b Upd: [CN] Smaller SWITCH_2_EX to handle game client bug 2024-04-11 21:48:58 +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
LmeSzinc
010d4aa812 Chore: Raise error when receiving invalid CommonDD setting 2024-04-08 22:54:44 +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
Air111
1decd3d6a1 Fix: Reset dock sorting after changing ship (#3608) 2024-04-04 19:31:26 +08:00
LmeSzinc
31462288bd Opt: Reset dock sorting after changing flagship (#3532) 2024-04-04 00:02:19 +08:00
LA_DI_DA
3dba1cf7f9 Add: ship filter for GemsFarming 2024-03-04 22:35:19 +08:00
mulaikurisu
4f60d70f9b Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:27:04 +08:00
Zuosizhu
9dd7d5b2b6 Add: Campaign_15 
Adj: GemsFarming return to 15-1 if gg_on
 2024-01-27 00:32:31 +08:00
Zuosizhu
356496af2c Merge branch 'LmeSzinc:master' into 20230309 2024-01-24 00:47:13 +08:00
somegituser
d29f93c1c1 add: wararchive Dreamwaker's Butterfly & Mirror Involution 
新增作战档案: 蝶海梦花&镜位螺旋
 2024-01-23 14:05:05 +08:00
LA-DI-DA
0252b8bcc0 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-12 10:31:19 +08:00
Zuosizhu
c6f1e43f8b Fix: Handle retirement while changing ships in Hard Gems farming 2024-01-12 09:50:21 +08:00