LA-DI-DA
d0599ffeb3
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-29 12:18:18 +08:00
LA-DI-DA
7ea587b1cf
Adj: disable to lock to latest event
2023-10-29 12:09:36 +08:00
LA-DI-DA
5a8182256e
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
# module/config/argument/override.yaml
2023-10-29 12:03:28 +08:00
LA-DI-DA
5326fe7940
Revert "Add(tmp): Tempesta and the Fountain of Youth"
...
This reverts commit 9c0d07ae
2023-10-29 11:59:30 +08:00
Zuosizhu
8815928c27
Merge branch 'LmeSzinc:master' into 20230309
2023-10-29 07:01:00 +08:00
LmeSzinc
75a58f5640
Opt: [ALAS] Turn type lock to type state
2023-10-28 22:03:47 +08:00
LmeSzinc
74e631f431
Add: Event entrance of Tempesta and the Fountain of Youth (event_20231026_cn)
2023-10-28 21:01:26 +08:00
LA-DI-DA
b6fe697e66
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
...
# Conflicts:
# module/config/argument/args.json
2023-10-27 19:34:40 +08:00
LA-DI-DA
153dbdd79e
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# campaign/Readme.md
2023-10-27 19:28:33 +08:00
LA-DI-DA
9c0d07ae66
Add(tmp): Tempesta and the Fountain of Youth
2023-10-27 15:54:14 +08:00
LA-DI-DA
17e1f4c2f1
Add: exit when under maintenance
2023-10-26 17:22:52 +08:00
Zuosizhu
b842d27611
Merge branch 'master_lme'
...
# Conflicts:
# module/map/assets.py
2023-10-26 00:04:07 +08:00
LA-DI-DA
a577cab199
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-22 12:11:30 +08:00
LA-DI-DA
dc69ce0d79
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/map/assets.py
2023-10-22 12:07:37 +08:00
appleapple802
d7c748f420
Upd: [TW] Raid event Fight On, Royal Maids!
2023-10-21 15:39:44 +08:00
Zuosizhu
12e8a83005
Opt: Allow to set opsifleet in opsistronghold
2023-10-20 09:06:27 +08:00
LA-DI-DA
26327087c9
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
...
# Conflicts:
# module/shop/shop_reward.py
2023-10-19 23:03:07 +08:00
LA-DI-DA
a65f53b966
Merge branch 'lme-alas/master' into smallkai
...
# Conflicts:
# module/map/assets.py
2023-10-19 23:00:39 +08:00
Zuosizhu
526d26e6c6
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
LA-DI-DA
05c3585626
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-19 16:25:29 +08:00
LA-DI-DA
0f600f7b52
Add: timeout setting of changing ship's type and attribute
2023-10-19 16:20:30 +08:00
LA-DI-DA
bcd8dbc1ce
Revert "Add: user setting of scrolling dock and scrolling fleet"
...
This reverts commit 3f3da4ff85
2023-10-19 13:42:06 +08:00
LA-DI-DA
0c4e1228ea
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-15 22:11:11 +08:00
LA-DI-DA
8322140284
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/gg_handler/gg_handler.py
2023-10-15 22:08:23 +08:00
LmeSzinc
4f110c047b
Opt: Sort events in args.json and i18n
2023-10-14 22:58:57 +08:00
Ian Lee
e8b96eb55b
Upd:[TW] Event:Inverted Orthant Rerun ( #3192 )
2023-10-14 20:33:32 +08:00
LA-DI-DA
921b18edb0
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-13 11:49:38 +08:00
LA-DI-DA
3f3da4ff85
Add: user setting of scrolling dock and scrolling fleet
2023-10-13 11:46:10 +08:00
LA-DI-DA
4caa2e2aec
Add: timeout setting of enabling gg
2023-10-12 22:35:54 +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
249f1d4908
Upd: description of changing ship type
2023-10-05 19:32:04 +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
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
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
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
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
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
