72 Commits

Author	SHA1	Message	Date
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
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	b6bc2cf5a6	Opt: Always disable GG in minigame in case of bugs	2023-09-28 18:42:34 +08:00
LA-DI-DA	615044d98d	Fix: lack of new Event and Main in gg handler	2023-09-26 22:25:14 +08:00
Zuosizhu	6f37d69031	Opt: Restart emulator in some cases	2023-09-16 16:29:12 +08:00
Zuosizhu	f55daeaf45	Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes.	2023-08-27 22:14:28 +08:00
Zuosizhu	77df52da34	Fix: use config.server instead of choose another time in GG Handler	2023-04-08 17:15:31 +08:00
Zuosizhu	2ad20039d9	Fix: Catch GameStuckError in GG set	2023-04-01 12:31:53 +08:00
Zuosizhu	df1fcba2f8	Opt: restart u2 after GGStatus checked and before GG is set on to avoid U2 dies when using LDPlayer.	2023-03-29 23:36:16 +08:00
Zuosizhu	509514e8b4	Del: Remove support of screenshot. Forced restart before a task if GG is needed.	2023-03-28 17:07:48 +08:00
Zuosizhu	babac0fc00	Fix: Stop GG in coalition	2023-03-24 16:47:38 +08:00
Zuosizhu	0a80de07af	Fix: Auto handle game server maintenance	2023-03-09 14:07:57 +08:00
Zuosizhu	3abc102e36	Fix: crash in restart won't be handled.	2023-03-02 13:50:29 +08:00