Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop

# Conflicts: # data/DB_GameItem.dat # data/DB_PropExchange.dat # data/DB_Task.dat # public # xlsx/DB_GameItem.xlsx
更新配置表
2024-07-11 18:04:54 +08:00 · 2024-07-11 18:03:04 +08:00
2 changed files with 2 additions and 2 deletions
--- a/data/DB_GameItem.json
+++ b/data/DB_GameItem.json
@ -1276,7 +1276,7 @@
 				0,
 				0
 			],
-			"Type": 11,
+			"Type": 20,
 			"Effect0": [
 				0,
 				0,
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e23e35def8bf29736c1e4c3ed56781f51ed94773
+Subproject commit d789cca81a36ddbaf30e5414b6c4fe530e0631f6
Author	SHA1	Message	Date
by	e53e94eb4c	Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop # Conflicts: # data/DB_GameItem.dat # data/DB_PropExchange.dat # data/DB_Task.dat # public # xlsx/DB_GameItem.xlsx	2024-07-11 18:04:54 +08:00
by	e5a6ebfe76	更新配置表	2024-07-11 18:03:04 +08:00