1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 11:09:29 +08:00
Commit Graph

7582 Commits

Author SHA1 Message Date
Zuosizhu
b6bc2cf5a6 Opt: Always disable GG in minigame in case of bugs 2023-09-28 18:42:34 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme'
# Conflicts:
#	module/device/method/droidcast.py
2023-09-28 18:09:13 +08:00
LmeSzinc
ce1cb8adcb Merge pull request #3163 from LmeSzinc/dev
Dev
2023-09-28 16:37:03 +08:00
LmeSzinc
ceebb216e0 Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING 2023-09-28 16:26:20 +08:00
LmeSzinc
14770e80b2 Opt: interval shouldn't be used at loop break 2023-09-28 16:20:12 +08:00
LmeSzinc
c14976951f Fix: Handle popup before choosing games 2023-09-28 16:09:16 +08:00
LmeSzinc
0dcdab461e Fix: Wait DroidCast server startup 2023-09-26 21:50:29 +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
LmeSzinc
28c52ac7b2 Merge pull request #2840 from yypsybs/dev-minigame-for-pr
Add: minigame
2023-09-25 18:49:25 +08:00
LmeSzinc
550798bdbb Merge pull request #2996 from guoh064/meta_reward
Add: Dossier Meta Reward Receive
2023-09-25 18:29:46 +08:00
Tipsy Fisher
78a7830f36 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-22 10:19:02 +08:00
Zuosizhu
a509b107bf Merge branch 'LmeSzinc:master' into 20230309 2023-09-22 08:15:14 +08:00
LmeSzinc
3e3f229dcd Merge pull request #3151 from LmeSzinc/dev
Bug fix
2023-09-22 03:13:41 +08:00
LmeSzinc
9a7c79732f Fix: [EN] Update AUTO_SEARCH_MENU_*.BUTTON.png 2023-09-22 02:28:01 +08:00
LmeSzinc
d28f43061e Opt: Faster image_color_count() 2023-09-21 10:28:56 +08:00
霞飛
67fe02a680 fix[TW]: Akashi shop buttom grid (#3147) 2023-09-21 10:26:30 +08:00
Zuosizhu
7bc96058c8 Merge branch 'master_lme'
# Conflicts:
#	deploy/Windows/config.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
2023-09-20 18:52:47 +08:00
Tipsy Fisher
15f930a6a4 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-20 18:32:09 +08:00
LmeSzinc
e5fa28d4a1 Merge pull request #3146 from LmeSzinc/dev
Bug fix
2023-09-19 23:26:57 +08:00
LmeSzinc
1b9fd01852 Add: git-over-cdn 2023-09-19 23:14:37 +08:00
LmeSzinc
a7f0a0231a Fix: Add pre-calculate HOMO_STORAGE in SP (#3130) 2023-09-19 22:16:52 +08:00
LmeSzinc
4b8d3add95 Fix: Binarilize story row colors 2023-09-19 22:16:16 +08:00
Zuosizhu
d7e225ea87 Fix: try to catch adb error in mumu12 2023-09-19 19:54:20 +08:00
Zuosizhu
3cdb081dd6 Merge Lme's branch feature to support emulator restart 2023-09-16 16:32:27 +08:00
Zuosizhu
b2ceb04baf Merge remote-tracking branch 'origin/merged_origin_feature' into merged_origin_feature 2023-09-16 16:30:01 +08:00
Zuosizhu
6f37d69031 Opt: Restart emulator in some cases 2023-09-16 16:29:12 +08:00
Zuosizhu
c18eea9f05 Merge branch 'LmeSzinc:master' into merged_origin_feature 2023-09-16 07:53:41 +08:00
Zuosizhu
07d5a9e79f Merge branch 'LmeSzinc:master' into 20230309 2023-09-16 07:53:31 +08:00
LmeSzinc
72dcbab1f8 Merge pull request #3128 from LmeSzinc/dev
Add: Effulgence Before Eclipse BD and SP
2023-09-15 23:45:55 +08:00
LmeSzinc
48dd665448 Opt: Effulgence Before Eclipse SP 2023-09-15 23:42:57 +08:00
霞飛
59f37b567b feat: Effulgence Before Eclipse chapter SP (#3127) 2023-09-15 23:01:25 +08:00
LmeSzinc
b2d74f680e Add: Effulgence Before Eclipse chapter BD 2023-09-15 22:05:13 +08:00
LmeSzinc
f68406f990 Fix: Disable STORY_ALLOW_SKIP in OpSi 2023-09-15 21:46:57 +08:00
LmeSzinc
802c1b6a08 Fix: Handle STORY_CLOSE after B3 2023-09-15 21:37:56 +08:00
Tipsy Fisher
dcf5075926 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 09:55:03 +08:00
Zuosizhu
8cdb5c6da0 Fix: Get value error while creating new enemies
(cherry picked from commit 41a17dd0d2)
2023-09-15 08:52:31 +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
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
LmeSzinc
b777529d7a Dev: Siren name translation in Effulgence Before Eclipse 2023-09-15 02:43:24 +08:00
LmeSzinc
5d49732358 Merge pull request #3122 from LmeSzinc/dev
Bug fix
2023-09-15 02:42:29 +08:00
LmeSzinc
b52da42d71 Add: TEMPLATE_SIREN_Zuiho 2023-09-15 02:37:23 +08:00
LmeSzinc
33f426d40d Fix: Different siren scales in A2 C2 2023-09-15 02:26:07 +08:00
LmeSzinc
e4355f9989 Merge pull request #3121 from LmeSzinc/dev
Add: Effulgence Before Eclipse chapter AC
2023-09-15 01:56:42 +08:00
LmeSzinc
16ecea7163 Add: Effulgence Before Eclipse chapter AC 2023-09-15 01:49:53 +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
LmeSzinc
1092371d8d Merge pull request #3120 from LmeSzinc/dev
Bug fix
2023-09-15 00:06:22 +08:00
LmeSzinc
7627a40bee Upd: [EN] AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2023-09-15 00:03:33 +08:00