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

1469 Commits

Author SHA1 Message Date
LA-DI-DA
9c0d07ae66 Add(tmp): Tempesta and the Fountain of Youth 2023-10-27 15:54:14 +08:00
LA-DI-DA
dc69ce0d79 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-22 12:07:37 +08:00
Zuosizhu
12e8a83005 Opt: Allow to set opsifleet in opsistronghold 2023-10-20 09:06:27 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LA-DI-DA
0f600f7b52 Add: timeout setting of changing ship's type and attribute 2023-10-19 16:20:30 +08:00
LA-DI-DA
bcd8dbc1ce Revert "Add: user setting of scrolling dock and scrolling fleet" 
This reverts commit 3f3da4ff85.
 2023-10-19 13:42:06 +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
LmeSzinc
4f110c047b Opt: Sort events in args.json and i18n 2023-10-14 22:58:57 +08:00
Ian Lee
e8b96eb55b Upd:[TW] Event:Inverted Orthant Rerun (#3192) 2023-10-14 20:33:32 +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
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
249f1d4908 Upd: description of changing ship type 2023-10-05 19:32:04 +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
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
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
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
LmeSzinc
4e6f51ed7c Sync: [SRC] Emulator settings 2023-09-10 15:04:32 +08:00
LmeSzinc
73bc7b44a2 Add: Auto-update deploy.yaml.tpl 2023-09-09 20:03:50 +08:00
LmeSzinc
08a6d4611c Fix: Event schedule 2023-09-09 19:49:09 +08:00
Zuosizhu
f3af2347e9 Merge branch 'LmeSzinc:master' into 20230309 2023-09-08 08:06:00 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +08:00
somegituser
17b13f6c6c add war_archive: Inverted orthant (#3089) 
新增作战档案：负象限作战
 2023-09-08 01:14:18 +08:00
LA_DI_DA
8368cce3fb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
 2023-09-03 19:13:52 +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
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-01 17:58:39 +08:00
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
18870
23d845b69a Opt: Move New config to manage page 2023-08-29 21:08:29 +08:00