Merge branch 'feature/json' into dev

# 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

View File

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

View File

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