update

Merge branch 'release' into develop
拉霸奖池金额数据类型错误
2024-05-22 18:09:46 +08:00 · 2024-05-22 18:02:07 +08:00 · 2024-05-17 15:46:01 +08:00 · 2024-05-13 16:29:20 +08:00 · 2024-05-13 11:09:29 +08:00 · 2024-05-13 11:09:29 +08:00
9 changed files with 62 additions and 14 deletions
--- a/data/DB_PropExchange.dat
+++ b/data/DB_PropExchange.dat
--- a/data/DB_PropExchange.json
+++ b/data/DB_PropExchange.json
@ -63,6 +63,54 @@
 			"Gain": {
 				"100002": 500
 			}
-		}
+		},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{},
+		{}
 	]
 }
--- a/data/DB_Task.dat
+++ b/data/DB_Task.dat
--- a/data/DB_Task.json
+++ b/data/DB_Task.json
@ -207,8 +207,8 @@
 			"TargetTimes": 10,
 			"FinishTimes": 1,
 			"Award": {
-				"100001": 10000000,
-				"100002": 10
+				"100001": 250000,
+				"50001": 1
 			}
 		},
 		{
@ -219,8 +219,8 @@
 			"TargetTimes": 5,
 			"FinishTimes": 1,
 			"Award": {
-				"100001": 10000000,
-				"100002": 10
+				"100001": 2500000,
+				"50001": 2
 			}
 		},
 		{
@ -231,8 +231,8 @@
 			"TargetTimes": 10,
 			"FinishTimes": 1,
 			"Award": {
-				"100001": 10000000,
-				"100002": 10
+				"100001": 5000000,
+				"50001": 4
 			}
 		},
 		{
@ -243,8 +243,8 @@
 			"TargetTimes": 100,
 			"FinishTimes": 1,
 			"Award": {
-				"100001": 10000000,
-				"100002": 10
+				"100001": 2500000,
+				"50001": 2
 			}
 		},
 		{
@ -255,8 +255,8 @@
 			"TargetTimes": 500,
 			"FinishTimes": 1,
 			"Award": {
-				"100001": 10000000,
-				"100002": 10
+				"100001": 12500000,
+				"50001": 10
 			}
 		},
 		{
@ -267,8 +267,8 @@
 			"TargetTimes": 1000,
 			"FinishTimes": 1,
 			"Award": {
-				"100001": 10000000,
-				"100002": 10
+				"100001": 25000000,
+				"50001": 20
 			}
 		},
 		{
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7905e67e4fea8766ed5a82375aa5b7cc28b3d7ef
+Subproject commit a7fc5af077865e1daf27c8e04ff3247aa643a815
--- a/xlsx/DB_CollectBox.xlsx
+++ b/xlsx/DB_CollectBox.xlsx
--- a/xlsx/DB_CollectBoxGain.xlsx
+++ b/xlsx/DB_CollectBoxGain.xlsx
--- a/xlsx/DB_PropExchange.xlsx
+++ b/xlsx/DB_PropExchange.xlsx
--- a/xlsx/DB_Task.xlsx
+++ b/xlsx/DB_Task.xlsx
Author	SHA1	Message	Date
sk	eba76584ce	update	2024-05-22 18:09:46 +08:00
sk	e12bc1b03c	Merge branch 'release' into develop	2024-05-22 18:02:07 +08:00
sk	ed1aa36815	拉霸奖池金额数据类型错误	2024-05-17 15:46:01 +08:00
sk	bc81c3c204	tienlen记牌器问题	2024-05-13 16:29:20 +08:00
by	fb4a82d26f	等级榜修改	2024-05-13 11:09:29 +08:00
by	469a8279fc	等级榜删除无用代码	2024-05-13 11:09:29 +08:00
by	528bccfe0b	玩家等级榜log输出error修改	2024-05-13 11:09:28 +08:00
kxdd	45b05b1fe5	记牌器时间计算bug	2024-05-13 11:07:04 +08:00
sk	c09c059b79	重置水池	2024-05-08 18:48:27 +08:00
sk	7219ddaed8	重置水池	2024-05-08 18:34:02 +08:00
sk	1c80a73741	Merge branch 'develop' into release	2024-05-07 18:09:20 +08:00
sk	e6240f1796	Merge branch 'develop' into release	2024-05-07 16:04:08 +08:00
sk	71b5e2599d	Merge branch 'release' into 0507	2024-05-07 13:46:54 +08:00
sk	65d206eae0	水池添加调节赔率和新手池	2024-04-24 16:26:57 +08:00