LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 12:49:26 +08:00
Code Activity
9,139 Commits 12 Branches 0 Tags
ca22f21108cc0daaa2ab4dc7b994f47d5df19a4d
Commit Graph

86 Commits

Author SHA1 Message Date
LA_DI_DA
dc51c4c56d Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 
# Conflicts:
#	config/template.json
#	module/campaign/run.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/dashboard.yaml
#	module/config/argument/gui.yaml
#	module/config/argument/menu.json
#	module/config/argument/override.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/config/config_manual.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/research_farming/farming.py
 2024-08-17 22:33:23 +08:00
LA_DI_DA
7ea67e514e Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 2024-07-26 12:25:03 +08:00
Zuosizhu
ef9f51d719 Fix: skip change ship in most situation 2024-07-26 01:26:58 +08:00
Zuosizhu
3a66eceabf Fix: Not changing ship 2024-07-23 08:05:48 +08:00
Zuosizhu
b9b2d0646f Fix: Accelerate gg_handler 2024-07-22 19:28:17 +08:00
Zuosizhu
0f9b648614 Fix: Multiple GG restarts. Polish codes 2024-07-21 14:09:21 +08:00
Zuosizhu
90bf70f578 Adj: Only enable ShipChanger in GemsFarming 2024-07-21 04:18:53 +08:00
Zuosizhu
275f76dc51 Fix: Cvl to bc/bb with common bb problem about Nevada 2024-07-20 15:31:37 +08:00
Zuosizhu
d9d39e686e Add: Options for an easier way of changing ShipType 2024-07-20 15:31:19 +08:00
Zuosizhu
a560e66cb0 Fix: An more accurate way to change ShipType 2024-07-20 15:30:54 +08:00
Zuosizhu
4ad4b064ee Fix: Cvl to bc/bb with common bb problem about Nevada 2024-07-20 12:56:32 +08:00
Zuosizhu
ad6d508013 Add: Options for an easier way of changing ShipType 2024-07-19 19:27:52 +08:00
Zuosizhu
4ee74710c4 Fix: An more accurate way to change ShipType 2024-07-19 01:29:47 +08:00
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +08:00
LA-DI-DA
fb9dd37914 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2024-01-12 12:23:22 +08:00
LA-DI-DA
b5df205257 Fix: gg ui display incomplete 2024-01-12 12:19:04 +08:00
LA-DI-DA
1669d9ee5d Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-01-12 10:41:40 +08:00
LA-DI-DA
b335329c3c Rmv: lock limit of change ship's type 2024-01-12 00:32:29 +08:00
LA-DI-DA
ab502f0e77 Fix: wrong command name in gg handler 2023-11-11 15:58:40 +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
fdf049a179 Revert "Add: scroll dock to load all ship's data for changing attribute" 
This reverts commit 293060445d.
 2023-10-19 13:42:22 +08:00
LA-DI-DA
8391f0cee3 Revert "Fix: inappropriate scroll dock" 
This reverts commit 4febb71500.
 2023-10-19 13:42:18 +08:00
LA-DI-DA
9ed0ed6986 Revert "Add: scroll fleet to load all fleet data" 
This reverts commit 842fba0391.
 2023-10-19 13:42:14 +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
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
02a0aa5c25 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-12 21:57:43 +08:00
LA-DI-DA
842fba0391 Add: scroll fleet to load all fleet data 2023-10-12 21:53:46 +08:00
LA-DI-DA
82aba4b8a8 Adj: timeout of enabling gg 2023-10-12 21:53:07 +08:00
LA-DI-DA
64f3711dc6 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-12 20:53:59 +08:00
LA-DI-DA
4febb71500 Fix: inappropriate scroll dock 2023-10-12 20:32:20 +08:00
LA-DI-DA
1cbc141d10 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-12 19:43:57 +08:00
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
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
b1d8fdd032 Fix: repush lua 2023-10-11 11:58:33 +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
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
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
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
02a1cfe3fa Add: event auto farming 2023-10-03 12:37:51 +08:00