LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 20:29:29 +08:00
Code Activity
7,818 Commits 12 Branches 0 Tags
24ee5f5fa2aa26c80bcf2294afdf0002f43c5fbf
Commit Graph

5444 Commits

Author SHA1 Message Date
LA-DI-DA
68e00b272e Fix: wrong click when checking ship's experience 2023-10-11 15:03:09 +08:00
LA-DI-DA
519b175549 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 13:45:59 +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
89632c9ee4 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 13:25:27 +08:00
LA-DI-DA
06b3251da8 Fix: push lua in ChangeShip and ChangeAttribute 2023-10-11 13:24:23 +08:00
LA-DI-DA
1a66d96f92 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 11:23:13 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
d336ae8e44 Fns: research farming 2023-10-06 22:12:57 +08:00
LA-DI-DA
788facdfd8 Add: oil limitation for ResearchFarmingSetting 2023-10-05 22:07:21 +08:00
LA-DI-DA
9b7dc96de7 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/gg_handler/change_ship.py
 2023-10-05 19:36:52 +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
LA-DI-DA
e60d01bd7d Fix: incorrect task command of research_farm in gg_handler 2023-10-05 17:19:40 +08:00
LA-DI-DA
2853b9eb57 Fix: lack override for ResearchFarm 2023-10-05 15:07:26 +08:00
LA-DI-DA
6b269de8a2 Rmv: campaign event name locked to latest 2023-10-05 15:00:33 +08:00
LA-DI-DA
6f2a3b6dcf Rmv: useless condition and describe of change ship and others login detection 2023-10-05 14:57:09 +08:00
LA-DI-DA
de2c563000 Add: research farming(half-finished) 2023-10-05 14:42:06 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LA-DI-DA
b4a9bc84db Fix: lack of setting emotion for auto event 2023-10-03 22:08:52 +08:00
LA-DI-DA
bb2af0d976 Add: set first campaign name for event auto farming 2023-10-03 21:52:09 +08:00
LA-DI-DA
f08f05089c Add: select event for event auto farming 2023-10-03 21:30:32 +08:00
LA-DI-DA
02a1cfe3fa Add: event auto farming 2023-10-03 12:37:51 +08:00
LA-DI-DA
3b2e6cda71 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-01 15:30:26 +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
LA-DI-DA
8031b83ef3 Fix: lack of setting 2023-09-30 19:56:17 +08:00
LA-DI-DA
ae25417a88 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-30 19:46:14 +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
LA-DI-DA
7da015e72e Add: waiting for response of device when switching to beacon assist page from meta page main 2023-09-26 22:48:02 +08:00
LA-DI-DA
615044d98d Fix: lack of new Event and Main in gg handler 2023-09-26 22:25:14 +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
41925591ca Fix: repeated clicks of BEACON_LIST when on cloud 2023-09-25 11:19:20 +08:00
LA-DI-DA
354e252c5f Fix: arg 2023-09-24 00:18:15 +08:00
LA-DI-DA
75a3fc9e25 Merge branch 'zuosizhu-alas/20230309' into dev 
# Conflicts:
#	module/config/argument/task.yaml
#	module/device/device.py
 2023-09-23 22:41:37 +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