Merge branch 'feature/json' into release

# Conflicts:
#	src/json/tuisonglibao.json
This commit is contained in:
dy 2023-12-21 13:34:27 +08:00
commit 825a056415
7 changed files with 2048 additions and 333 deletions

View File

@ -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, // 活动实际结束
@ -3849,25 +3849,31 @@
free: false,
payId: 'czlb_1',
buyNum: 1,
equal: 15000,
prize: [
{
"a": "item",
"t": "13",
"n": 600
"n": 601
}
],
"recPrize1": [
{
"a": "item",
"t": "13",
"t": "12",
"n": 600
},
{
"a": "attr",
"t": "rmbmoney",
"n": 333
}
],
"recPrize2": [
{
"a": "item",
"t": "13",
"n": 600
"t": "4",
"n": 10
}
]
},
@ -3878,25 +3884,60 @@
free: false,
payId: 'czlb_2',
buyNum: 1,
equal: 35000,
prize: [
{
"a": "item",
"t": "13",
"n": 600
"t": "1",
"n": 1200
}
],
"recPrize1": [
{
"a": "item",
"t": "13",
"n": 600
"t": "2",
"n": 4400
}
],
"recPrize2": [
{
"a": "item",
"t": "9",
"n": 63300
},
{
"a": "attr",
"t": "jinbi",
"n": 114514
},
{
"a": "attr",
"t": "rmbmoney",
"n": 31313
},
{
"a": "item",
"t": "2",
"n": 111
},
{
"a": "item",
"t": "13",
"n": 600
"n": 515
},{
"a": "item",
"t": "601",
"n": 1
},
{
"a": "item",
"t": "633",
"n": 2
},
{
"a": "hero",
"t": "5001",
"n": 1
}
]
},
@ -3907,25 +3948,26 @@
free: false,
payId: 'czlb_3',
buyNum: 1,
equal: 65000,
prize: [
{
"a": "item",
"t": "13",
"n": 600
"n": 123
}
],
"recPrize1": [
{
"a": "item",
"t": "13",
"n": 600
"n": 321
}
],
"recPrize2": [
{
"a": "item",
"t": "13",
"n": 600
"n": 548
}
]
}
@ -3986,5 +4028,201 @@
}
]
}
},
{
"hdid" : 12000, // 唯一活动id 累计购买礼包
"htype" : 12, // 后端唯一识别标识
"stype" : 1200, // 前端唯一识别标识(看前端需要是否修改)
"ttype" : 0, // 0 按照开服时间计算1 玩家注册时间计算 4 屏蔽此活动
"stime" : 0, // 活动开始天数
"rtime" : 30, // 活动显示结束天数
"etime" : 30, // 活动实际结束
"name": "ljlibao",
"icon": "icon_ljlibao",
"showtime" : "仅供参考,会复写正确值", // 自选礼包,如果存在多个活动,计费点不要设置一样;如果是一样,可能会存在付费一次,购买多次。
"data" : {
//活动文本描述
intr: "ljlibaotips_1",
intr: "ljlibaotips_2",
//礼包
gift: [
{
id: '1',
name: 'ljlibaotips_3',
need:[],
free: false,
payId: 'ljlibao_1',
scale: 200,
buynum: 1,
prize:[
{
"a": "item",
"t": "13",
"n": 123
}
]
},
{
id: '2',
name: 'ljlibaotips_4',
need:[],
free: false,
payId: 'ljlibao_2',
buynum: 1,
scale: 201,
prize:[
{
"a": "item",
"t": "12",
"n": 111
}
]
},
{
id: '3',
name: 'ljlibaotips_5',
need:[],
free: false,
payId: 'ljlibao_3',
buynum: 1,
scale: 203,
prize:[
{
"a": "item",
"t": "1",
"n": 111111
}
]
},
{
id: '4',
name: 'ljlibaotips_6',
need:[],
free: false,
payId: 'ljlibao_4',
buynum: 1,
scale: 204,
prize:[
{
"a": "item",
"t": "13",
"n": 123
},
{
"a": "item",
"t": "2",
"n": 123
}
]
},
{
id: '5',
name: 'ljlibaotips_7',
need:[],
free: false,
payId: 'ljlibao_5',
buynum: 1,
scale: 201,
prize:[
{
"a": "item",
"t": "13",
"n": 12
},
{
"a": "item",
"t": "1",
"n": 31
}
]
},
{
id: '6',
name: 'ljlibaotips_8',
need:[],
free: false,
payId: 'ljlibao_6',
buynum: 1,
scale: 200,
prize:[
{
"a": "item",
"t": "1",
"n": 123
},
{
"a": "item",
"t": "2",
"n": 123
}
]
},
{
id: '7',
name: 'ljlibaotips_9',
need:[],
free: false,
payId: 'ljlibao_7',
buynum: 1,
scale: 300,
prize:[
{
"a": "item",
"t": "4",
"n": 123
},
{
"a": "item",
"t": "2",
"n": 123
}
]
},
],
//自选框掉落池
dlz: [
{
"1": {"a": "item", "t":"600", "n": 20},
"2": {"a": "item", "t":"5002", "n": 10},
"3": {"a": "item", "t":"5004", "n": 10}
},
{
"1": {"a": "item", "t":"600", "n": 20},
"2": {"a": "item", "t":"5002", "n": 10},
"3": {"a": "item", "t":"5004", "n": 10}
},
{
"1": {"a": "item", "t":"1", "n": 10000000},
"2": {"a": "item", "t":"12", "n": 1000},
"3": {"a": "item", "t":"2", "n": 2000},
"4": {"a": "item", "t":"18", "n": 500}
},
{
"1": {"a": "item", "t":"600", "n": 20},
"2": {"a": "item", "t":"5002", "n": 10},
"3": {"a": "item", "t":"5004", "n": 10}
},
{
"1": {"a": "item", "t":"600", "n": 20},
"2": {"a": "item", "t":"5002", "n": 10},
"3": {"a": "item", "t":"5004", "n": 10}
},
{
"1": {"a": "item", "t":"600", "n": 20},
"2": {"a": "item", "t":"5002", "n": 10},
"3": {"a": "item", "t":"5004", "n": 10}
},
{
"1": {"a": "item", "t":"600", "n": 20},
"2": {"a": "item", "t":"5002", "n": 10},
"3": {"a": "item", "t":"5004", "n": 10}
},
{
"1": {"a": "item", "t":"600", "n": 20},
"2": {"a": "item", "t":"5002", "n": 10},
"3": {"a": "item", "t":"5004", "n": 10}
}
]
}
}
]

View File

@ -718,7 +718,7 @@
},
"or": {},
"time": 0,
"tips": "openCond_tips_53",
"tips": "openCond_tips_96",
"display": {
"lv": 15
}
@ -839,7 +839,7 @@
},
"or": {},
"time": 0,
"tips": "openCond_tips_60",
"tips": "openCond_tips_96",
"display": {
"lv": 15
}
@ -904,7 +904,7 @@
},
"or": {},
"time": 0,
"tips": "openCond_tips_65",
"tips": "openCond_tips_96",
"display": {
"lv": 15
}
@ -1339,5 +1339,31 @@
"display": {
"lv": 15
}
},
"czlibao": {
"name": "czlibao",
"undefined": "超值礼包破冰",
"and": {
"lv": 15
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
}
},
"xiaofeijingsai": {
"name": "xiaofeijingsai",
"undefined": "钻石消费竞赛",
"and": {
"lv": 15
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -499,8 +499,8 @@
"13": {
"id": 13,
"type": 12,
"name": "wsw_wz_dhsd",
"undefined": "兑换商店",
"name": "wsw_wz_mrjxdh",
"undefined": "每日精选兑换商店",
"openCond": [
"lv",
15
@ -511,7 +511,7 @@
"freeRefreshInterval": 0,
"freeRefreshNum": 0,
"shopItems": [
4001
10001
],
"showItem": [
{

View File

@ -3918,31 +3918,6 @@
9999
],
"vipAddbuyNum": []
},
{
"id": 4001,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "item",
"t": "15",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"4002": [
@ -6294,6 +6269,33 @@
"vipAddbuyNum": []
}
],
"10001": [
{
"id": 10001,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "item",
"t": "15",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"120001": [
{
"id": 120001,

View File

@ -198,5 +198,22 @@
"npcImg": "img_sd_3015",
"npcText": "intr_shopCom_text_10",
"helpText": "intr_shopCom_helpText_10"
},
"11": {
"id": 11,
"shopId": 13,
"shopType": 12,
"title": "wsw_wz_dhsd",
"undefined": "兑换商店",
"openCond": "shop_13",
"des": "intr_shop_des_13",
"img": "wsw_wz_dhsd",
"cost": [
{
"a": "attr",
"t": "rmbmoney",
"n": 1
}
]
}
}

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,