Merge branch 'develop' into release

Merge branch 'dev_pigbank' into develop
存钱罐数据修改
2024-05-07 16:04:08 +08:00 · 2024-05-07 16:03:25 +08:00 · 2024-05-07 16:02:58 +08:00
3 changed files with 2 additions and 2 deletions
--- a/data/DB_Pigbank_Prop.dat
+++ b/data/DB_Pigbank_Prop.dat
@ -1,4 +1,4 @@
-BankMaxCoinÀÃ“
+BankMaxCoin€â
 WinCoinRate
 LoseCoinRate
--- a/data/DB_Pigbank_Prop.json
+++ b/data/DB_Pigbank_Prop.json
@ -3,7 +3,7 @@
 		{
 			"Id": 1,
 			"PorpName": "BankMaxCoin",
-			"PropValue": 15000000
+			"PropValue": 10000000
 		},
 		{
 			"Id": 2,
--- a/xlsx/DB_Pigbank_Prop.xlsx
+++ b/xlsx/DB_Pigbank_Prop.xlsx
Author	SHA1	Message	Date
sk	e6240f1796	Merge branch 'develop' into release	2024-05-07 16:04:08 +08:00
kxdd	54eed8a7fc	Merge branch 'dev_pigbank' into develop	2024-05-07 16:03:25 +08:00
kxdd	28bfd15336	存钱罐数据修改	2024-05-07 16:02:58 +08:00