LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 22:19:27 +08:00
Code Activity
7,619 Commits 12 Branches 0 Tags
e2f7cd544ff7e34afeb9379be79d3f1ffadb9d3b
Commit Graph

5275 Commits

Author SHA1 Message Date
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
ec7facb7c1 Upd: Strategy open&close&switch 2023-10-19 22:42:53 +08:00
LmeSzinc
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
51d4efd4a6 Upd: [CN] AUTO_SEARCH_SET_* 2023-10-19 22:02:53 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
Yingdong Yang
dffa87d5df Fix: tactical failed when the ship's all skills are leveled max (#3201) 2023-10-19 02:15:49 +08:00
LmeSzinc
5e6ec95b37 Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT 2023-10-17 18:27:14 +08:00
LmeSzinc
4f110c047b Opt: Sort events in args.json and i18n 2023-10-14 22:58:57 +08:00
LmeSzinc
cc777e71cc Fix: Missing iris pattern in shop regex (#3075) 2023-10-14 22:32:01 +08:00
LmeSzinc
f5aa5b2d09 Fix: [TW] Shop nav without core limited (#3152) 2023-10-14 22:22:23 +08:00
LmeSzinc
1c06c5e2b0 Fix: [EN] Missing letter "N" in NA Ocean * zones 2023-10-14 21:54:12 +08:00
LmeSzinc
44197dba56 Upd: [EN] RETIRE_COIN (#3124) 2023-10-14 21:45:49 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
Ian Lee
e8b96eb55b Upd:[TW] Event:Inverted Orthant Rerun (#3192) 2023-10-14 20:33:32 +08:00
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
LA-DI-DA
b1d8fdd032 Fix: repush lua 2023-10-11 11:58:33 +08:00
Zuosizhu
2cf5f53e02 Merge branch 'LmeSzinc:master' into 20230309 2023-10-07 16:55:17 +08:00
LmeSzinc
e41658ad43 Fix: Accidentally entered daily when entering map 2023-10-07 09:26:50 +08:00
LmeSzinc
07fa439690 Fix: Increase threshold at empty slot of meowfficer enhance (#3155) 
which is just 221
 2023-10-06 00:15:34 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LmeSzinc
35c109a648 Fix: Revised serial should starts with 127 2023-10-01 01:51:22 +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
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
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
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
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