Merge branch 'develop' into release

2024-08-10 01:10:57 +08:00 · 2024-08-10 01:10:57 +08:00 · 6442841899
parent 0bff759477 731701832f
commit 6442841899
6 changed files with 2 additions and 2 deletions
--- a/data/DB_PropExchange.dat
+++ b/data/DB_PropExchange.dat
--- a/data/DB_Skin.dat
+++ b/data/DB_Skin.dat
--- a/data/DB_Skin.json
+++ b/data/DB_Skin.json
@ -19,7 +19,7 @@
 		},
 		{
 			"Id": 300002,
-			"SkinClass": 4,
+			"SkinClass": 2,
 			"Model": "juese",
 			"SkinPic": "icon_300002",
 			"SkinName": "财神送福",
--- a/data/DB_Task.dat
+++ b/data/DB_Task.dat
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 48ffb47573ebd2de02fbd50834ecddabd6fe20c5
+Subproject commit 13589ad17018a4a9d50fdc9d8223e3ccf492a0ce
--- a/xlsx/DB_Skin.xlsx
+++ b/xlsx/DB_Skin.xlsx