1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 02:29:28 +08:00
Commit Graph

1365 Commits

Author SHA1 Message Date
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +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
Tipsy Fisher
dcf5075926 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 09:55:03 +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
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
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
18870
a4bd13b2bc Add: Config import/export 2023-08-29 19:56:47 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature
# Conflicts:
#	module/config/i18n/zh-TW.json
2023-08-28 18:12:08 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
Zuosizhu
f55daeaf45 Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes. 2023-08-27 22:14:28 +08:00
LmeSzinc
f86e37b16b Add: [ALAS][TW] Standardize zh-TW translation 2023-08-27 17:45:21 +08:00
Ian Lee
92b5cf85d2 Upd:[TW] Event:Frostfall (#3049) 2023-08-25 12:35:45 +08:00
LmeSzinc
15ef108d85 Opt: [EN] Operation coins in OpsiHazard1Leveling help text 2023-08-23 12:49:08 +08:00
Tipsy Fisher
0e5bebd25f Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-19 15:47:51 +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
guoh064
1c8589c104 Merge remote-tracking branch 'LmeSzinc/dev' into event_20230817_cn 2023-08-18 06:33:13 +08:00
Ian Lee
7c088ed5b7 Upd:[TW] Event:Aurora Noctis Rerun (#3024) 2023-08-17 23:48:42 +08:00
d233hj
c23e4fe804 Update zh-CN.json (#3020)
* Update en-US.json

* Update zh-CN.json

* Update zh-TW.json
2023-08-17 23:48:02 +08:00
guoh064
59b3a247bf Add: event entrance of The Fool's Scales (event_20230817_cn) 2023-08-17 13:27:08 +08:00
yypsybs
89e40134b4 Merge branch 'master' into dev-minigame-for-pr 2023-08-04 11:53:54 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
d389f75c5f Add: handle_map_walk_speedup() 2023-08-03 22:59:37 +08:00
LmeSzinc
29248bf6bf Add: Event entrance of Anthem of Remembrance (event_20230803_cn) 2023-08-03 20:41:13 +08:00
Ian Lee
d5c8c992f7 Upd:[TW] Event:World-spanning Arclight Rerun (#2961)
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun

* Upd:[TW] Event:World-spanning Arclight Rerun
2023-08-03 18:51:49 +08:00
Zuosizhu
1e1661f4bb Merge branch 'LmeSzinc:master' into 20230309 2023-07-29 22:04:54 +08:00
Ian Lee
c0dce237fd Upd:[TW] Event:Dreamwaker's Butterfly Rerun (#2938)
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun
2023-07-27 18:12:48 +08:00
Tipsy Fisher
842662288e Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-22 01:03:01 +08:00
LmeSzinc
3637d267ad Fix: ASSETS.ui_mask was released but never reloaded 2023-07-21 23:32:35 +08:00
Tipsy Fisher
6fca29e79c Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-21 00:07:41 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LmeSzinc
4ef7d12973 Add: Event entrance of World-spanning Arclight Rerun (event_20230720_cn) 2023-07-20 23:10:00 +08:00