LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 05:49:30 +08:00
Code Activity
7,785 Commits 12 Branches 0 Tags
293060445dff2a8c9cce8b8d5e2c601f9f8a5e37
Commit Graph

5416 Commits

Author SHA1 Message Date
LA-DI-DA
293060445d Add: scroll dock to load all ship's data for changing attribute 2023-10-12 19:43:42 +08:00
LA-DI-DA
2792c68dba Fix: lack of checking whether enable or not of ChangeShip and ChangeAttribute 2023-10-11 13:44:28 +08:00
LA-DI-DA
06b3251da8 Fix: push lua in ChangeShip and ChangeAttribute 2023-10-11 13:24:23 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
4791bb378d Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-05 19:33:20 +08:00
LA-DI-DA
249f1d4908 Upd: description of changing ship type 2023-10-05 19:32:04 +08:00
LA-DI-DA
96812cfbdf Fix: condition to change flagship in GemsFarming 2023-10-05 19:29:45 +08:00
LA-DI-DA
bffa0b75dc Fix: condition to enable change ship 2023-10-05 19:29:05 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LA-DI-DA
d1f6154a31 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-01 15:27:45 +08:00
LA-DI-DA
3dd8c83253 Fix: exit dock when changing flagship and when GemsFarming is set to normal map 2023-10-01 14:37:39 +08:00
LmeSzinc
3c3462174a Upd: [JP] AUTO_SEARCH_SET_SUB_AUTO and AUTO_SEARCH_SET_SUB_STANDBY 2023-10-01 00:54:13 +08:00
LmeSzinc
b91bf31bc3 Fix: Update check fallback to classic git pull if git-over-cdn fails (#3164) 2023-10-01 00:34:02 +08:00
LmeSzinc
f6c56e1940 Fix: Log unexpected droidcast response 2023-09-30 17:04:36 +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
e59ae7d732 Fix: Droidcast_raw no longer has a separate apk. 2023-09-30 13:12:52 +08:00
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
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
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
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
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
1b9fd01852 Add: git-over-cdn 2023-09-19 23:14:37 +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
LA-DI-DA
e92826c90a Bug fix 2023-09-16 21:03:38 +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
LA-DI-DA
79e449a258 Add: handle retirement when map preparation after clicking MAP_PREPARATION 2023-09-16 12:28:28 +08:00
Zuosizhu
c18eea9f05 Merge branch 'LmeSzinc:master' into merged_origin_feature 2023-09-16 07:53:41 +08:00
LA-DI-DA
dbe45c498d Merge branch 'lme-alas/master' into smallkai 2023-09-16 00:07:17 +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
LA-DI-DA
833a80b584 Fix(tmp): inappropriate lv32 trigger when using "GemsFarming" which set to hard mode map 2023-09-15 20:09:52 +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
8cdb5c6da0 Fix: Get value error while creating new enemies 
(cherry picked from commit 41a17dd0d2)
 2023-09-15 08:52:31 +08:00