qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/json' into dev

Browse Source 
# Conflicts:
#	src/json/pay.json
#	src/json/tuisonglibao.json
This commit is contained in:
dy 2023-12-21 14:57:47 +08:00
commit 36dc1e6f8c
2 changed files with 119 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/json/pay.json
View File

@ -5991,7 +5991,7 @@
{ {
"a": "attr", "a": "attr",
"t": "payExp", "t": "payExp",
"n": 30 "n": 300
} }
], ],
"prize": [], "prize": [],
@ -6047,7 +6047,13 @@
"sdhd_libao_6": { "sdhd_libao_6": {
"id": "sdhd_libao_6", "id": "sdhd_libao_6",
"money": 328, "money": 328,
"payExp": "[{\"a\": \"attr\", \"t\": \"payExp\", \"n\"3280}]", "payExp": [
{
"a": "attr",
"t": "payExp",
"n": 3280
}
],
"prize": [], "prize": [],
"firstPayPrize": [], "firstPayPrize": [],
"name": "pay_name_sdhd_libao_6", "name": "pay_name_sdhd_libao_6",

210
src/json/tuisonglibao.json
View File

@ -4,7 +4,37 @@
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
5 100
],
"payId": [
"guanqialibao_1",
"guanqialibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
},
"2": {
"id": 2,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
140
],
"payId": [
"guanqialibao_1",
"guanqialibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
},
"3": {
"id": 3,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
180
], ],
"payId": [ "payId": [
"guanqialibao_1", "guanqialibao_1",
@ -12,251 +42,232 @@
"guanqialibao_3" "guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 7200, "displayCD": 3600,
"scale": 500 "scale": 3000
},
"2": {
"id": 2,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
10
],
"payId": [
"guanqialibao_1",
"guanqialibao_2"
],
"time": 3600,
"displayCD": 7200,
"scale": 501
},
"3": {
"id": 3,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
20
],
"payId": [
"guanqialibao_1",
"guanqialibao_3"
],
"time": 3600,
"displayCD": 7200,
"scale": 502
}, },
"4": { "4": {
"id": 4, "id": 4,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
{ 240
"a": "item",
"t": "1"
}
], ],
"payId": [ "payId": [
"daojulibao_1", "guanqialibao_1",
"daojulibao_2" "guanqialibao_2",
"guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 7200, "displayCD": 3600,
"scale": 503 "scale": 3000
}, },
"5": { "5": {
"id": 5, "id": 5,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
{ 300
"a": "item",
"t": "2"
}
], ],
"payId": [ "payId": [
"daojulibao_1", "guanqialibao_1",
"daojulibao_3" "guanqialibao_2",
"guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 7200, "displayCD": 3600,
"scale": 504 "scale": 3000
}, },
"6": { "6": {
"id": 6, "id": 6,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
{ 360
"a": "attr",
"t": "jinbi"
}
], ],
"payId": [ "payId": [
"daojulibao_1", "guanqialibao_1",
"daojulibao_2", "guanqialibao_2",
"daojulibao_3" "guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 7200, "displayCD": 3600,
"scale": 505 "scale": 3000
}, },
"7": { "7": {
"id": 7, "id": 7,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
1 400
], ],
"payId": [ "payId": [
"zhanbailibao_1", "guanqialibao_1",
"zhanbailibao_2", "guanqialibao_2",
"zhanbailibao_3" "guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 7200, "displayCD": 3600,
"scale": 506 "scale": 3000
}, },
"8": { "8": {
"id": 8, "id": 8,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
3 460
], ],
"payId": [ "payId": [
"choukalibao_1", "guanqialibao_1",
"choukalibao_2", "guanqialibao_2",
"choukalibao_3" "guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 7200, "displayCD": 3600,
"scale": 507 "scale": 3000
}, },
"9": { "9": {
"id": 9, "id": 9,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
31 490
], ],
"payId": [ "payId": [
"lv30" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 3300 "scale": 3000
}, },
"10": { "10": {
"id": 10, "id": 10,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
45 520
], ],
"payId": [ "payId": [
"lv40" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 3300 "scale": 3000
}, },
"11": { "11": {
"id": 11, "id": 11,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
50 550
], ],
"payId": [ "payId": [
"lv55" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 2000 "scale": 3000
}, },
"12": { "12": {
"id": 12, "id": 12,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
53 580
], ],
"payId": [ "payId": [
"lv58" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 2000 "scale": 3000
}, },
"13": { "13": {
"id": 13, "id": 13,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
56 610
], ],
"payId": [ "payId": [
"lv60" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 2000 "scale": 3000
}, },
"14": { "14": {
"id": 14, "id": 14,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
60 640
], ],
"payId": [ "payId": [
"lv63" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 2000 "scale": 3000
}, },
"15": { "15": {
"id": 15, "id": 15,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
63 670
], ],
"payId": [ "payId": [
"lv66" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 2000 "scale": 3000
}, },
"16": { "16": {
"id": 16, "id": 16,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
66 700
], ],
"payId": [ "payId": [
"lv69" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 1800 "scale": 3000
}, },
"17": { "17": {
"id": 17, "id": 17,
"type": 1, "type": 1,
"typeName": "tuisonglibao_name_2", "typeName": "tuisonglibao_name_2",
"num": [ "num": [
68 730
], ],
"payId": [ "payId": [
"lv72" "guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,
"scale": 1800 "scale": 3000
}, },
"18": { "18": {
"id": 18, "id": 18,
@ -488,10 +499,11 @@
"type": 5, "type": 5,
"typeName": "tuisonglibao_name_1", "typeName": "tuisonglibao_name_1",
"num": [ "num": [
70 73
], ],
"payId": [ "payId": [
"lv75" "lv73_1",
"lv73_2"
], ],
"time": 3600, "time": 3600,
"displayCD": 3600, "displayCD": 3600,