7806 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	4842bf8992	Revert "Add: meta panel page" ... This reverts commit 30cbc7fadc.	2023-10-19 13:42:09 +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	8322140284	Merge branch 'zuosizhu-alas/20230309' into smallkai ... # Conflicts: # module/gg_handler/gg_handler.py	2023-10-15 22:08:23 +08:00
Zuosizhu	b6aec9a5b1	Merge pull request #7 from 0O0o0oOoO00/more-timeout-for-gg ... Add: timeout setting of enabling gg	2023-10-14 20:24:36 +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	30cbc7fadc	Add: meta panel page	2023-10-13 10:47:21 +08:00
LA-DI-DA	4caa2e2aec	Add: timeout setting of enabling gg	2023-10-12 22:35:54 +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	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
Zuosizhu	97783288c6	Merge pull request #6 from 0O0o0oOoO00/repush-lua-fix ... Fix: repush lua in linux	2023-10-12 07:51:14 +08:00
LA-DI-DA	e9d03356b5	Upd: lua scripts	2023-10-11 22:40:49 +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	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	afa68adf00	Add: change ship's attribute	2023-10-11 11:19:21 +08:00
Zuosizhu	2cf5f53e02	Merge branch 'LmeSzinc:master' into 20230309	2023-10-07 16:55:17 +08:00
LmeSzinc	fa0182ac6a	Merge pull request #3180 from LmeSzinc/dev ... Bug fix	2023-10-06 00:26:24 +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
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
Zuosizhu	934e05a87a	Merge branch 'LmeSzinc:master' into 20230309	2023-10-04 17:10:01 +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	35c109a648	Fix: Revised serial should starts with 127	2023-10-01 01:51:22 +08:00
LmeSzinc	b31864f64a	Merge pull request #3169 from LmeSzinc/dev ... Bug fix	2023-10-01 01:02:17 +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	ba3777ca4f	Merge pull request #3168 from Torther/master ... Fix: An issue that screenshot method DroidCast_raw could not be used on Android10 and Android11.	2023-09-30 23:27:09 +08:00
Torther	e88697a341	Fixed an issue that could not be used on Android10 and Android11.	2023-09-30 22:59:30 +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	4d2d8d12da	Merge pull request #5 from 0O0o0oOoO00/gg-package-check ... Add: GG Package Check	2023-09-30 13:14:23 +08:00
Zuosizhu	e59ae7d732	Fix: Droidcast_raw no longer has a separate apk.	2023-09-30 13:12:52 +08:00
LA-DI-DA	bb1de7b7fe	Add: gg package check	2023-09-30 12:38:34 +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	ce1cb8adcb	Merge pull request #3163 from LmeSzinc/dev ... Dev	2023-09-28 16:37:03 +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