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

1481 Commits

Author SHA1 Message Date
LA-DI-DA
0c4e1228ea Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-15 22:11:11 +08:00
LA-DI-DA
8322140284 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/gg_handler/gg_handler.py
 2023-10-15 22:08:23 +08:00
LA-DI-DA
921b18edb0 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-13 11:49:38 +08:00
LA-DI-DA
3f3da4ff85 Add: user setting of scrolling dock and scrolling fleet 2023-10-13 11:46:10 +08:00
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
LA-DI-DA
1a66d96f92 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 11:23:13 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
d336ae8e44 Fns: research farming 2023-10-06 22:12:57 +08:00
LA-DI-DA
788facdfd8 Add: oil limitation for ResearchFarmingSetting 2023-10-05 22:07:21 +08:00
LA-DI-DA
249f1d4908 Upd: description of changing ship type 2023-10-05 19:32:04 +08:00
LA-DI-DA
2853b9eb57 Fix: lack override for ResearchFarm 2023-10-05 15:07:26 +08:00
LA-DI-DA
6b269de8a2 Rmv: campaign event name locked to latest 2023-10-05 15:00:33 +08:00
LA-DI-DA
6f2a3b6dcf Rmv: useless condition and describe of change ship and others login detection 2023-10-05 14:57:09 +08:00
LA-DI-DA
de2c563000 Add: research farming(half-finished) 2023-10-05 14:42:06 +08:00
LA-DI-DA
bb2af0d976 Add: set first campaign name for event auto farming 2023-10-03 21:52:09 +08:00
LA-DI-DA
f08f05089c Add: select event for event auto farming 2023-10-03 21:30:32 +08:00
LA-DI-DA
02a1cfe3fa Add: event auto farming 2023-10-03 12:37:51 +08:00
LA-DI-DA
8031b83ef3 Fix: lack of setting 2023-09-30 19:56:17 +08:00
LA-DI-DA
ae25417a88 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-30 19:46:14 +08:00
LA-DI-DA
e3db31de2e Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-09-30 16:50:09 +08:00
LA-DI-DA
b077bf9719 Add: change ship type for GemsFarming when set C or D map 2023-09-30 16:50:01 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00
Torther
69df0c26e4 Upd: Screenshot method DroidCast_raw update (#2881) 
* Upd: Screenshot method DroidCast_raw update

* Opt: Refactor module/device/method/droidcast.py for improved functionality

The module/device/method/droidcast.py has been refactored to improve its functionality and remove unnecessary code. Here are the key changes:

- Removed the unnecessary droidcast_raw_port attribute.
- Updated the droidcast_url method to use '/preview' as the default URL for DroidCast.
- Rename droidcast_init and droidcast_raw_init to droidcast_start and droidcast_raw_start.
- Add droidcast_init to reuse the common parts of droidcast_start and droidcast_raw_start.
- Removed the droidcast_raw_wait_startup method as it is no longer needed.
- Updated the droidcast_uninstall method to remove the deletion of DroidCast APK.

These changes aim to simplify the DroidCast class and improve its overall functionality.

* Opt: Refactor module/device/method/droidcast.py for improved functionality

The module/device/method/droidcast.py has been refactored to improve its functionality and remove unnecessary code. Here are the key changes:

- Removed the unnecessary droidcast_raw_port attribute.
- Updated the droidcast_url method to use '/preview' as the default URL for DroidCast.
- Rename droidcast_init and droidcast_raw_init to droidcast_start and droidcast_raw_start.
- Add droidcast_init to reuse the common parts of droidcast_start and droidcast_raw_start.
- Removed the droidcast_raw_wait_startup method as it is no longer needed.
- Updated the droidcast_uninstall method to remove the deletion of DroidCast APK.

These changes aim to simplify the DroidCast class and improve its overall functionality.

* Fix: Droidcast cannot start due to port occupation
 2023-09-25 18:51:56 +08:00
LA-DI-DA
354e252c5f Fix: arg 2023-09-24 00:18:15 +08:00
LA-DI-DA
75a3fc9e25 Merge branch 'zuosizhu-alas/20230309' into dev 
# Conflicts:
#	module/config/argument/task.yaml
#	module/device/device.py
 2023-09-23 22:41:37 +08:00
LA-DI-DA
09f4a227bb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-23 22:30:37 +08:00
LA-DI-DA
d7d01ba062 Add: scheduler priority for more Event and Main 2023-09-22 21:09:51 +08:00
LA-DI-DA
9f449acfb8 Add: more Main 2023-09-22 21:06:52 +08:00
LA-DI-DA
e510aa4536 Add: more Event 2023-09-22 21:03:54 +08:00
LA-DI-DA
0ae82e61ef Add: account's owner login detection 2023-09-22 12:24:08 +08:00
LA-DI-DA
036c4a8850 Add: remark 2023-09-21 13:42:41 +08:00
LA-DI-DA
e498ddc432 Add: enable option for every shop in shop once 2023-09-20 13:36:43 +08:00
LA-DI-DA
1bdb8c842a Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2023-09-15 11:17:08 +08:00
Tipsy Fisher
dcf5075926 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 09:55:03 +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
Zuosizhu
5dd82fb419 Merge branch 'master_lme' into merged_origin_feature 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/campaign_status.py
#	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
 2023-09-15 08:16:37 +08:00
Tipsy Fisher
c2551f5c8e Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 01:07:00 +08:00
LmeSzinc
51d08a5419 Fix: STORY_ALLOW_SKIP should be True by default 2023-09-15 01:06:43 +08:00
LmeSzinc
4d50f15f3b Add: Event entrance of Effulgence Before Eclipse (event_20230914_cn) 2023-09-15 00:13:16 +08:00
Ian Lee
5474628561 Upd:[TW] Event:Violet Tempest Blooming Lycoris (#3118) 2023-09-14 22:43:35 +08:00
Zuosizhu
8bcb3808f8 Fix: Accidentally deleted Event-3 2023-09-13 07:55:49 +08:00
LA-DI-DA
6a33eda8f2 Fix: lack of event option 2023-09-12 11:57:59 +08:00
LA-DI-DA
36528d6403 Adj: enable to show all event 2023-09-12 11:51:34 +08:00
LA-DI-DA
1156a76e77 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-12 11:09:18 +08:00
LA-DI-DA
e9ae87d070 Fix: Accidentally deleted Event-3 2023-09-11 23:11:41 +08:00
LA-DI-DA
7a716a2e3c Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-11 21:48:50 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
yypsybs
369c80d991 Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-11 10:29:52 +08:00
Zuosizhu
f8a35cec1c Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-09-11 08:16:09 +08:00
LmeSzinc
39e3f8b221 Merge branch 'master' into feature 2023-09-10 16:35:45 +08:00