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

487 Commits

Author SHA1 Message Date
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
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
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
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
Zuosizhu
c6f1e43f8b Fix: Handle retirement while changing ships in Hard Gems farming 2024-01-12 09:50:21 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LmeSzinc
3eaaefb0ca Upd: [TW] Disable OpsiShop before rework done 2024-01-11 12:06:10 +08:00
Zuosizhu
0a6d26ed66 Fix: Catch errors during handling RequestHumanTakeover in GemsFarming 2023-12-29 14:38:30 +08:00
Zuosizhu
9d7d0474ce Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming (#3387) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-12-29 09:59:09 +08:00
Zuosizhu
9a2dd88b80 Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming 2023-12-28 15:52:21 +08:00
Zuosizhu
4e69b65533 Opt: Gemsfarming return to 14-1 instead of 2-4 if gg is on. 2023-12-28 00:32:02 +08:00
Zuosizhu
bcb6c20ce9 Fix: Raise RequestHumanTakeover too fast when retiring ships 
at hard entry
 2023-12-25 12:42:05 +08:00
Zuosizhu
252c021a49 Fix: Handle retirement when changing ships in hard mode. Handle no flagships after retirement. 2023-12-25 01:10:30 +08:00
Zuosizhu
50aef0ec0f Fix: Same ships are black when changing hard mode flagships 2023-12-24 18:57:53 +08:00
Zuosizhu
395090785f Merge branch 'LmeSzinc:master' into 20230309 2023-11-24 07:58:05 +08:00
LmeSzinc
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +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
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
d3c8221e14 Fix: Unknown stage name should not be considered as any chapter 2023-11-01 01:36:52 +08:00
LmeSzinc
ab014c86a7 Fix: handle story skip in emotion withdraw 2023-10-29 23:10:49 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
f4277912cb Fix: Stage name convert 2023-10-29 01:58: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
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
Zuosizhu
7fdba38b75 Fix: Get value error while creating new enemies 
(cherry picked from commit 41a17dd0d2)
 2023-09-15 08:51:24 +08:00
Zuosizhu
dfa815645d Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
 2023-09-15 08:26:53 +08:00
LmeSzinc
686b7fb921 Fix: Adaptive OCR_OIL to handle black overlay 2023-09-14 22:44:28 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	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/webui/app.py
 2023-09-02 17:47:24 +08:00
LmeSzinc
100ba7a441 Fix: Disable OpsiShop before assets update 2023-09-01 00:54:51 +08:00
LmeSzinc
1a7d74493d Fix: Story stages before A1 2023-08-23 12:46:05 +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
b451096fb8 Add: Handle stories before event maps in chapter BD 2023-08-18 22:23:20 +08:00
LmeSzinc
b3c59c0cca Add: Handle stories before event maps 2023-08-18 13:25:51 +08:00
Zuosizhu
1e1661f4bb Merge branch 'LmeSzinc:master' into 20230309 2023-07-29 22:04:54 +08:00
LmeSzinc
61aca93cfb Add: Stage increase in TSS maps 2023-07-26 19:57:14 +08:00