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

update DB_GameItem.xlsx
2024-05-10 15:15:08 +08:00 · 2024-05-10 15:14:53 +08:00
6 changed files with 9 additions and 9 deletions
--- a/data/DB_GameItem.dat
+++ b/data/DB_GameItem.dat
--- a/data/DB_GameItem.json
+++ b/data/DB_GameItem.json
@ -19,7 +19,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],
@ -49,7 +49,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],
@ -79,7 +79,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],
@ -109,7 +109,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],
--- a/data/DB_PropExchange.dat
+++ b/data/DB_PropExchange.dat
@ -1,5 +1,5 @@
-6т├у├ж├в├с├"║█ю└=
+6ж├в├с├т├у├"║█ю└=
-.ш├ь├ы├з├"║█ю└=
+.ь├ы├з├ш├"║█ю└=
-Wс├у├ж├ы├т├в├ь├з├ш├"	║█─╜Б
+Wы├з├ш├с├у├в├ь├т├ж├"	║█─╜Б
-]ш├с├ж├в├ь├э├т├у├ы├з├"╒█Т
+]у├ж├ш├ы├з├э├с├т├в├ь├"╒█Т
--- a/data/DB_Task.dat
+++ b/data/DB_Task.dat
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4ccd5acb111b25d6cf440fa1e390bc4614accbca
+Subproject commit 4736a4cac4352a63eb6965336eed31b17219f83e
--- a/xlsx/DB_GameItem.xlsx
+++ b/xlsx/DB_GameItem.xlsx
Author	SHA1	Message	Date
sk	65258fe07e	Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop	2024-05-10 15:15:08 +08:00
sk	085d1ef9b2	update DB_GameItem.xlsx	2024-05-10 15:14:53 +08:00
		`@ -1 +1 @@`
			`Subproject commit 4ccd5acb111b25d6cf440fa1e390bc4614accbca`				`Subproject commit 4736a4cac4352a63eb6965336eed31b17219f83e`