Merge branch 'feature/dev-json' into dev

src/json/dixiaheishi.json5

@@ -33,10 +33,10 @@
     },
     //136礼包
     '136Gift': [
-        { payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] },
+        { payId: '136Gift1', prize: [] },
         { prize: [{"a": "attr", "t": "rmbmoney", "n": 10},{"a": "item", "t": "12", "n": 10},{"a": "attr", "t": "jinbi", "n": 10000}] },
-        { payId: '136Gift2', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] },
+        { payId: '136Gift2', prize: [] },
-        { payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] },
+        { payId: '136Gift3', prize: [] },
-        { payId: '136Gift4', prize: [], bonus: [{"a": "attr", "t": "rmbmoney", "n": 10}] },
+        { payId: '136Gift4', prize: [] },
     ],
 }

src/json/huodong.json5

@@ -3828,7 +3828,7 @@
         "hdid" : 10000,   // 唯一活动id   超值好礼
         "htype" : 10,  // 后端唯一识别标识
         "stype" : 1000,  // 前端唯一识别标识（看前端需要是否修改）
-        "ttype" : 0,    // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
+        "ttype" : 4,    // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
         "stime" : 0,  // 活动开始天数
         "rtime" : 30,   // 活动显示结束天数
         "etime" : 30,   // 活动实际结束
@@ -4052,8 +4052,15 @@
                     need:[],
 					free: false,
                     payId: 'ljlibao_1',
+					scale: 200,
                     buynum: 1,
-                    prize:[]
+                    prize:[
+					{
+                        "a": "item",
+                        "t": "13",
+                        "n": 123
+                    }
+					]
                 },
                 {
                     id: '2',
@@ -4062,7 +4069,14 @@
 					free: false,
                     payId: 'ljlibao_2',
                     buynum: 1,
-                    prize:[]
+					scale: 201,
+                    prize:[
+					{
+                        "a": "item",
+                        "t": "12",
+                        "n": 111
+                    }
+					]
                 },
                 {
                     id: '3',
@@ -4071,7 +4085,14 @@
 					free: false,
                     payId: 'ljlibao_3',
                     buynum: 1,
-                    prize:[]
+					scale: 203,
+                    prize:[
+					{
+                        "a": "item",
+                        "t": "1",
+                        "n": 111111
+                    }
+					]
                 },
                 {
                     id: '4',
@@ -4080,7 +4101,19 @@
 					free: false,
                     payId: 'ljlibao_4',
                     buynum: 1,
-                    prize:[]
+					scale: 204,
+                    prize:[
+					{
+                        "a": "item",
+                        "t": "13",
+                        "n": 123
+                    },
+					{
+                        "a": "item",
+                        "t": "2",
+                        "n": 123
+                    }
+					]
                 },
                 {
                     id: '5',
@@ -4089,7 +4122,19 @@
 					free: false,
                     payId: 'ljlibao_5',
                     buynum: 1,
-                    prize:[]
+					scale: 201,
+                    prize:[
+					{
+                        "a": "item",
+                        "t": "13",
+                        "n": 12
+                    },
+					{
+                        "a": "item",
+                        "t": "1",
+                        "n": 31
+                    }
+					]
                 },
                 {
                     id: '6',
@@ -4098,7 +4143,19 @@
 					free: false,
                     payId: 'ljlibao_6',
                     buynum: 1,
-                    prize:[]
+					scale: 200,
+                    prize:[
+					{
+                        "a": "item",
+                        "t": "1",
+                        "n": 123
+                    },
+					{
+                        "a": "item",
+                        "t": "2",
+                        "n": 123
+                    }
+					]
                 },
                 {
                     id: '7',
@@ -4107,7 +4164,19 @@
 					free: false,
                     payId: 'ljlibao_7',
                     buynum: 1,
-                    prize:[]
+					scale: 300,
+                    prize:[
+					{
+                        "a": "item",
+                        "t": "4",
+                        "n": 123
+                    },
+					{
+                        "a": "item",
+                        "t": "2",
+                        "n": 123
+                    }
+					]
                 },
             ],
             //自选框掉落池

src/json/pay.json

@@ -5951,7 +5951,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 1280
+        "n": 5
       }
     ],
     "prize": [],
@@ -5971,7 +5971,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 1280
+        "n": 60
       }
     ],
     "prize": [],
@@ -5991,7 +5991,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 1280
+        "n": 30
       }
     ],
     "prize": [],
@@ -6011,7 +6011,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 1280
+        "n": 680
       }
     ],
     "prize": [],
@@ -6047,13 +6047,7 @@
   "sdhd_libao_6": {
     "id": "sdhd_libao_6",
     "money": 328,
-    "payExp": [
+    "payExp": "[{\"a\": \"attr\", \"t\": \"payExp\", \"n\"3280}]",
-      {
-        "a": "attr",
-        "t": "payExp",
-        "n": 1280
-      }
-    ],
     "prize": [],
     "firstPayPrize": [],
     "name": "pay_name_sdhd_libao_6",
@@ -6071,7 +6065,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 1280
+        "n": 6480
       }
     ],
     "prize": [],