Merge branch 'develop' into release

update excel
2024-08-20 14:52:21 +08:00 · 2024-08-20 14:41:38 +08:00
6 changed files with 2 additions and 4 deletions
--- a/data/DB_PropExchange.dat
+++ b/data/DB_PropExchange.dat
--- a/data/DB_Task.dat
+++ b/data/DB_Task.dat
--- a/data/DB_VIP.dat
+++ b/data/DB_VIP.dat
--- a/data/DB_VIP.json
+++ b/data/DB_VIP.json
@ -30,11 +30,9 @@
 				"更多VIP功能正待开发"
 			],
 			"Privilege9": [
 				0,
 				0,
 				0
 			],
-			"PrivilegeShow": 1000
+			"PrivilegeShow": 100
 		},
 		{
 			"Id": 1,
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit fc20f707697bffbac116ad93e1c94cc530fd0cf3
+Subproject commit 5436469c04056f83ab69b52b7cdeb5d21832fa94
--- a/xlsx/DB_VIP.xlsx
+++ b/xlsx/DB_VIP.xlsx
Author	SHA1	Message	Date
sk	e419902ac1	Merge branch 'develop' into release	2024-08-20 14:52:21 +08:00
sk	cd321a3f55	update excel	2024-08-20 14:41:38 +08:00
		`@ -1 +1 @@`
			`Subproject commit fc20f707697bffbac116ad93e1c94cc530fd0cf3`				`Subproject commit 5436469c04056f83ab69b52b7cdeb5d21832fa94`