Merge branch 'dev-json' into dev

This commit is contained in:
dy 2023-12-18 14:47:30 +08:00
commit b615f5d4fc
5 changed files with 423 additions and 32 deletions

View File

@ -0,0 +1,62 @@
{
"1": {
"id": 1,
"jieji": 0,
"ewai_buff": 0
},
"2": {
"id": 2,
"jieji": 1,
"ewai_buff": 0
},
"3": {
"id": 3,
"jieji": 2,
"ewai_buff": 0
},
"4": {
"id": 4,
"jieji": 3,
"ewai_buff": 0
},
"5": {
"id": 5,
"jieji": 4,
"ewai_buff": 0.4
},
"6": {
"id": 6,
"jieji": 5,
"ewai_buff": 0.5
},
"7": {
"id": 7,
"jieji": 6,
"ewai_buff": 0.6
},
"8": {
"id": 8,
"jieji": 7,
"ewai_buff": 0.8
},
"9": {
"id": 9,
"jieji": 8,
"ewai_buff": 1
},
"10": {
"id": 10,
"jieji": 9,
"ewai_buff": 1.2
},
"11": {
"id": 11,
"jieji": 10,
"ewai_buff": 1.4
},
"12": {
"id": 12,
"jieji": 11,
"ewai_buff": 1.8
}
}

View File

@ -3332,17 +3332,17 @@
//玩游戏需要消耗
"gameneed": [{"a": "attr", "t":"jinbi", "n": 1}],
//玩游戏拿分
"game": [0,1,2,3,4,5],
"game": [5,10,20,30,50],
//战令
"zhanling":[
{
"val": 1,
"pt": [{"a": "attr", "t":"jinbi", "n": 1}],
"gj": [{"a": "attr", "t":"jinbi", "n": 1}]
"val": 2500,
"pt": [{"a": "item", "t":"1", "n": 200000}],
"gj": [{"a": "item", "t":"50101", "n": 1},{"a": "item", "t":"1", "n": 500000}]
},
{
"val": 2,
"pt": [{"a": "attr", "t":"jinbi", "n": 1}],
"pt": [{"a": "attr", "t":"rmbmoney", "n": 500}],
"gj": [{"a": "attr", "t":"jinbi", "n": 1}]
},
{
@ -3351,6 +3351,7 @@
"gj": [{"a": "attr", "t":"jinbi", "n": 1}]
}
],
//战令PayID
"zlpayid":"ycmb_1_1",
//活动礼包
"libao": {
@ -3475,6 +3476,7 @@
intr: "czlbtips_1",
intr: "czlbtips_2",
//礼包
//礼包
gift: [
{
id: '1',
@ -3483,7 +3485,10 @@
free: false,
payId: 'czlb_1',
buyNum: 1,
prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}]
prize:{"1":[{'a': 'item', 't': '13', 'n': 600}],
"2":[{'a': 'item', 't': '13', 'n': 600}],
"3":[{'a': 'item', 't': '13', 'n': 600}]
}
},
{
id: '2',
@ -3492,7 +3497,10 @@
free: false,
payId: 'czlb_2',
buyNum: 1,
prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}]
prize: {"1":[{'a': 'item', 't': '13', 'n': 600}],
"2":[{'a': 'item', 't': '13', 'n': 600}],
"3":[{'a': 'item', 't': '13', 'n': 600}]
}
},
{
id: '3',
@ -3501,7 +3509,10 @@
free: false,
payId: 'czlb_3',
buyNum: 1,
prize: [{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600},{'a': 'item', 't': '13', 'n': 600}]
prize: {"1":[{'a': 'item', 't': '13', 'n': 600}],
"2":[{'a': 'item', 't': '13', 'n': 600}],
"3":[{'a': 'item', 't': '13', 'n': 600}]
}
}
]
}

View File

@ -4183,7 +4183,33 @@
"n": 60
}
],
"prize": [],
"prize": [
{
"a": "hero",
"t": "4002",
"n": 1
},
{
"a": "attr",
"t": "rmbmoney",
"n": 120
},
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 50000
},
{
"a": "attr",
"t": "jinbi",
"n": 100000
}
],
"firstPayPrize": [],
"name": "pay_name_shouchong_1",
"undefined": "首充礼包_6",
@ -4203,7 +4229,33 @@
"n": 300
}
],
"prize": [],
"prize": [
{
"a": "hero",
"t": "5001",
"n": 1
},
{
"a": "attr",
"t": "rmbmoney",
"n": 600
},
{
"a": "item",
"t": "12",
"n": 1500
},
{
"a": "item",
"t": "1",
"n": 300000
},
{
"a": "attr",
"t": "jinbi",
"n": 300000
}
],
"firstPayPrize": [],
"name": "pay_name_shouchong_2",
"undefined": "首充礼包_30",
@ -4223,7 +4275,33 @@
"n": 980
}
],
"prize": [],
"prize": [
{
"a": "hero",
"t": "5001",
"n": 1
},
{
"a": "equip",
"t": "1009",
"n": 1
},
{
"a": "equip",
"t": "2009",
"n": 1
},
{
"a": "equip",
"t": "3009",
"n": 1
},
{
"a": "equip",
"t": "4009",
"n": 1
}
],
"firstPayPrize": [],
"name": "pay_name_shouchong_3",
"undefined": "首充礼包_98",
@ -4243,7 +4321,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 200000},{a: 'item', t: '1', n: 100000},{a: 'item', t: '4', n: 5}]",
"prize": [
{
"a": "item",
"t": "4",
"n": 5
},
{
"a": "item",
"t": "1",
"n": 100000
},
{
"a": "attr",
"t": "jinbi",
"n": 200000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_1",
"undefined": "积天礼包_6",
@ -4263,7 +4357,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 400000},{a: 'item', t: '1', n: 200000},{a: 'item', t: '607', n: 20}]",
"prize": [
{
"a": "item",
"t": "607",
"n": 20
},
{
"a": "item",
"t": "1",
"n": 200000
},
{
"a": "attr",
"t": "jinbi",
"n": 400000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_2",
"undefined": "积天礼包_6",
@ -4283,7 +4393,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 600000},{a: 'item', t: '1', n: 300000},{a: 'item', t: '4', n: 10}]",
"prize": [
{
"a": "item",
"t": "4",
"n": 10
},
{
"a": "item",
"t": "1",
"n": 300000
},
{
"a": "attr",
"t": "jinbi",
"n": 600000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_3",
"undefined": "积天礼包_6",
@ -4303,7 +4429,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 800000},{a: 'item', t: '1', n: 400000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 400000
},
{
"a": "attr",
"t": "jinbi",
"n": 800000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_4",
"undefined": "积天礼包_6",
@ -4323,7 +4465,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 1000000},{a: 'item', t: '1', n: 500000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 500000
},
{
"a": "attr",
"t": "jinbi",
"n": 1000000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_5",
"undefined": "积天礼包_6",
@ -4343,7 +4501,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 1200000},{a: 'item', t: '1', n: 600000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 600000
},
{
"a": "attr",
"t": "jinbi",
"n": 1200000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_6",
"undefined": "积天礼包_6",
@ -4363,7 +4537,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 1400000},{a: 'item', t: '1', n: 700000},{a: 'item', t: '600', n: 20}]",
"prize": [
{
"a": "item",
"t": "600",
"n": 20
},
{
"a": "item",
"t": "1",
"n": 700000
},
{
"a": "attr",
"t": "jinbi",
"n": 1400000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_7",
"undefined": "积天礼包_6",
@ -4383,7 +4573,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 1600000},{a: 'item', t: '1', n: 800000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 800000
},
{
"a": "attr",
"t": "jinbi",
"n": 1600000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_8",
"undefined": "积天礼包_6",
@ -4403,7 +4609,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 1800000},{a: 'item', t: '1', n: 900000},{a: 'item', t: '4', n: 10}]",
"prize": [
{
"a": "item",
"t": "4",
"n": 10
},
{
"a": "item",
"t": "1",
"n": 900000
},
{
"a": "attr",
"t": "jinbi",
"n": 1800000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_9",
"undefined": "积天礼包_6",
@ -4423,7 +4645,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 2000000},{a: 'item', t: '1', n: 1000000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 1000000
},
{
"a": "attr",
"t": "jinbi",
"n": 2000000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_10",
"undefined": "积天礼包_6",
@ -4443,7 +4681,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 2200000},{a: 'item', t: '1', n: 1100000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 1100000
},
{
"a": "attr",
"t": "jinbi",
"n": 2200000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_11",
"undefined": "积天礼包_6",
@ -4463,7 +4717,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 2400000},{a: 'item', t: '1', n: 1200000},{a: 'item', t: '4', n: 10}]",
"prize": [
{
"a": "item",
"t": "4",
"n": 10
},
{
"a": "item",
"t": "1",
"n": 1200000
},
{
"a": "attr",
"t": "jinbi",
"n": 2400000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_12",
"undefined": "积天礼包_6",
@ -4483,7 +4753,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 2600000},{a: 'item', t: '1', n: 1300000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 1300000
},
{
"a": "attr",
"t": "jinbi",
"n": 2600000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_13",
"undefined": "积天礼包_6",
@ -4503,7 +4789,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 2800000},{a: 'item', t: '1', n: 1400000},{a: 'item', t: '12', n: 500}]",
"prize": [
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "1",
"n": 1400000
},
{
"a": "attr",
"t": "jinbi",
"n": 2800000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_14",
"undefined": "积天礼包_6",
@ -4523,7 +4825,23 @@
"n": 60
}
],
"prize": "[{a: 'attr', t: 'jinbi', n: 3000000},{a: 'item', t: '1', n: 1500000},{a: 'item', t: '600', n: 20}]",
"prize": [
{
"a": "item",
"t": "600",
"n": 20
},
{
"a": "item",
"t": "1",
"n": 1500000
},
{
"a": "attr",
"t": "jinbi",
"n": 3000000
}
],
"firstPayPrize": [],
"name": "pay_name_jitianlibao_15",
"undefined": "积天礼包_6",

View File

@ -1011,7 +1011,7 @@
"mofa": 0,
"islong": 0
},
"describe": "普通攻击替换为随机攻击3个目标造成基础伤害95%的物理伤害"
"describe": "普通攻击替换为随机攻击2个目标造成基础伤害95%的物理伤害"
},
"4002201": {
"skillid": 4002201,
@ -1029,7 +1029,7 @@
"mofa": 0,
"islong": 0
},
"describe": "普通攻击替换为随机攻击3个目标造成基础伤害114%的物理伤害"
"describe": "普通攻击替换为随机攻击2个目标造成基础伤害114%的物理伤害"
},
"4003200": {
"skillid": 4003200,
@ -1202,7 +1202,7 @@
"order": "rand",
"limit": 6,
"data": {
"pro": 0.11
"pro": 0.13
},
"chkdata": {},
"ext": {},
@ -1217,7 +1217,7 @@
"order": "rand",
"limit": 6,
"data": {
"pro": 0.11
"pro": 0.13
},
"chkdata": {},
"ext": {},

View File

@ -739,7 +739,7 @@
"sxleixing": "zhongdu",
"buff_type": 2,
"xiaoguocanshu": {
"pro": 0.15,
"pro": 0.18,
"type": "hp"
},
"round": 2,
@ -759,7 +759,7 @@
"sxleixing": "zhongdu",
"buff_type": 2,
"xiaoguocanshu": {
"pro": 0.15,
"pro": 0.18,
"type": "hp"
},
"round": 2,