5487 Commits

Author	SHA1	Message	Date
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
LA-DI-DA	78fc586094	Revert "Fix(tmp): ui drift of map preparation" ... This reverts commit bfe3240c44.	2023-10-19 23:00:27 +08:00
LA-DI-DA	c4453e5d48	Merge branch '0O0o0oOoO00-alas/smallkai' into dev	2023-10-19 22:51:36 +08:00
LA-DI-DA	bfe3240c44	Fix(tmp): ui drift of map preparation	2023-10-19 22:47:36 +08:00
LmeSzinc	ec7facb7c1	Upd: Strategy open&close&switch	2023-10-19 22:42:53 +08:00
LmeSzinc	ce13aaa8b7	Upd: [CN] _fleet_sidebar	2023-10-19 22:30:06 +08:00
LmeSzinc	51d4efd4a6	Upd: [CN] AUTO_SEARCH_SET_*	2023-10-19 22:02:53 +08:00
LmeSzinc	4969dc01b0	Upd: [CN] Fleet preparation	2023-10-19 22:02:24 +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	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
Yingdong Yang	dffa87d5df	Fix: tactical failed when the ship's all skills are leveled max (#3201)	2023-10-19 02:15:49 +08:00
LmeSzinc	5e6ec95b37	Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT	2023-10-17 18:27:14 +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
LmeSzinc	cc777e71cc	Fix: Missing iris pattern in shop regex (#3075)	2023-10-14 22:32:01 +08:00
LmeSzinc	f5aa5b2d09	Fix: [TW] Shop nav without core limited (#3152)	2023-10-14 22:22:23 +08:00
LmeSzinc	1c06c5e2b0	Fix: [EN] Missing letter "N" in NA Ocean * zones	2023-10-14 21:54:12 +08:00
LmeSzinc	44197dba56	Upd: [EN] RETIRE_COIN (#3124)	2023-10-14 21:45:49 +08:00
LmeSzinc	f23c960b97	Fix: Actively clear stuck records in combat	2023-10-14 21:03:58 +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	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	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	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	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
Zuosizhu	2cf5f53e02	Merge branch 'LmeSzinc:master' into 20230309	2023-10-07 16:55:17 +08:00
LmeSzinc	e41658ad43	Fix: Accidentally entered daily when entering map	2023-10-07 09:26:50 +08:00
LA-DI-DA	d336ae8e44	Fns: research farming	2023-10-06 22:12:57 +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