Merge branch 'feature/json' into dev

src/json/huodong.json5

@@ -4257,36 +4257,42 @@
             //活动文本描述
             intr: "zuanshihongbao_5",
             //分红包所需最低钻石数
-			loglimit: 1000,
+			price: 1000,
+			reset: 0,
 			//奖池总数量
-			jackpot: 100000,
-			//档位
-            arr: [
-				{
-					//权重
-					"weight": 50,
-					//获得范围
-					"numrange": [1000,1500]
-				},
-				{
-					//权重
-					"weight": 30,
-					//获得范围
-					"numrange": [1500,2000]
-				},
-				{
-					//权重
-					"weight": 15,
-					//获得范围
-					"numrange": [2000,3000]
-				},
-				{
-					//权重
-					"weight": 5,
-					//获得范围
-					"numrange": [3000,8000]
+			totalmoney: 100000,
+			groupConf: {
+				//档位
+				base: {
+					loglimit:2000,
+					arr:[
+					{
+						//权重
+						"weight": 50,
+						//获得范围
+						"numrange": [1000,1500]
+					},
+					{
+						//权重
+						"weight": 30,
+						//获得范围
+						"numrange": [1500,2000]
+					},
+					{
+						//权重
+						"weight": 15,
+						//获得范围
+						"numrange": [2000,3000]
+					},
+					{
+						//权重
+						"weight": 5,
+						//获得范围
+						"numrange": [3000,8000]
+					}
+					]
 				}
-			]
+			}
         }
     }
 ]