Merge branch 'feature/json' into dev

This commit is contained in:
dy 2023-12-22 18:01:45 +08:00
commit 2d9d577f8b
6 changed files with 333 additions and 32 deletions

View File

@ -134,8 +134,8 @@
"name": "intr_attr_name_15",
"undefined": "每日精选兑换币",
"colour": 4,
"icon": "icon_chegaipq",
"sicon": "icon_chegaipq",
"icon": "icon_hspj",
"sicon": "icon_hspj",
"describe": "intr_attr_describe_15",
"advancedEffects": ""
}

View File

@ -33,7 +33,7 @@
},
//136礼包
'136Gift': [
{ payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] },
{ payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] , discount: 60},
{ 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": "jingxuanbi", "n": 10}] },
{ payId: '136Gift3', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] },

View File

@ -933,7 +933,7 @@
},
{
"a": "hero",
"t": "4006",
"t": "4013",
"n": 1
},
{
@ -975,7 +975,7 @@
{
"a": "item",
"t": "4",
"n": 100
"n": 10
}
],
"firstPayPrize": [],
@ -2537,6 +2537,11 @@
"a": "item",
"t": "14",
"n": 50
},
{
"a": "attr",
"t": "jingxuanbi",
"n": 10
}
],
"firstPayPrize": [],
@ -2568,6 +2573,11 @@
"a": "item",
"t": "12",
"n": 100
},
{
"a": "attr",
"t": "jingxuanbi",
"n": 10
}
],
"firstPayPrize": [],
@ -2604,6 +2614,11 @@
"a": "item",
"t": "600",
"n": 1
},
{
"a": "attr",
"t": "jingxuanbi",
"n": 10
}
],
"firstPayPrize": [],
@ -2640,6 +2655,11 @@
"a": "item",
"t": "600",
"n": 2
},
{
"a": "attr",
"t": "jingxuanbi",
"n": 10
}
],
"firstPayPrize": [],
@ -2669,6 +2689,7 @@
"buys": 0,
"needVip": 0,
"front": {},
"fanLiBi": 300,
"currency": "CNY"
},
"xianshizhaomu_gift_1": {
@ -4433,7 +4454,7 @@
"name": "pay_name_guanqialibao_1",
"undefined": "关卡礼包_6",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4469,7 +4490,7 @@
"name": "pay_name_guanqialibao_2",
"undefined": "关卡礼包_30",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4505,7 +4526,7 @@
"name": "pay_name_guanqialibao_3",
"undefined": "关卡礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4541,7 +4562,7 @@
"name": "pay_name_guanqialibao_4",
"undefined": "关卡礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4582,7 +4603,7 @@
"name": "pay_name_daojulibao_1",
"undefined": "专属润滑剂不足_30",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4623,7 +4644,7 @@
"name": "pay_name_daojulibao_2",
"undefined": "专属润滑剂不足_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4664,7 +4685,7 @@
"name": "pay_name_daojulibao_3",
"undefined": "专属润滑剂不足_128",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4705,7 +4726,7 @@
"name": "pay_name_daojulibao_4",
"undefined": "配件零件不足_30",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4746,7 +4767,7 @@
"name": "pay_name_daojulibao_5",
"undefined": "配件零件不足_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4787,7 +4808,7 @@
"name": "pay_name_daojulibao_6",
"undefined": "配件零件不足_128",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4828,7 +4849,7 @@
"name": "pay_name_daojulibao_7",
"undefined": "装备蓝图不足_30",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4869,7 +4890,7 @@
"name": "pay_name_daojulibao_8",
"undefined": "装备蓝图不足_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4910,7 +4931,7 @@
"name": "pay_name_daojulibao_9",
"undefined": "装备蓝图不足_128",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4951,7 +4972,7 @@
"name": "pay_name_daojulibao_10",
"undefined": "调校合金不足_30",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -4992,7 +5013,7 @@
"name": "pay_name_daojulibao_11",
"undefined": "调校合金不足_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5033,7 +5054,7 @@
"name": "pay_name_daojulibao_12",
"undefined": "调校合金不足_128",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5064,7 +5085,7 @@
"name": "pay_name_zhanbailibao_1",
"undefined": "战败礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5095,7 +5116,7 @@
"name": "pay_name_zhanbailibao_2",
"undefined": "战败礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5126,7 +5147,7 @@
"name": "pay_name_zhanbailibao_3",
"undefined": "战败礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5157,7 +5178,7 @@
"name": "pay_name_choukalibao_1",
"undefined": "抽卡礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5188,7 +5209,7 @@
"name": "pay_name_choukalibao_2",
"undefined": "抽卡礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5219,7 +5240,7 @@
"name": "pay_name_choukalibao_3",
"undefined": "抽卡礼包_68",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5239,7 +5260,7 @@
"name": "pay_name_shouchong_1",
"undefined": "首充礼包_6",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5259,7 +5280,7 @@
"name": "pay_name_shouchong_2",
"undefined": "首充礼包_30",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
@ -5279,7 +5300,7 @@
"name": "pay_name_shouchong_3",
"undefined": "首充礼包_98",
"time": -1,
"buys": 0,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"

View File

@ -513,7 +513,17 @@
"shopItems": [
10001,
10002,
10003
10003,
10004,
10005,
10006,
10007,
10008,
10009,
10010,
10011,
10012,
10013
],
"showItem": [
{

View File

@ -6350,6 +6350,276 @@
"vipAddbuyNum": []
}
],
"10004": [
{
"id": 10004,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10005": [
{
"id": 10005,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10006": [
{
"id": 10006,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10007": [
{
"id": 10007,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10008": [
{
"id": 10008,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10009": [
{
"id": 10009,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10010": [
{
"id": 10010,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10011": [
{
"id": 10011,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10012": [
{
"id": 10012,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10013": [
{
"id": 10013,
"a": "item",
"t": 4,
"n": 10,
"p": 1,
"colour": 4,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"120001": [
{
"id": 120001,

View File

@ -203,7 +203,7 @@
"id": 11,
"shopId": 13,
"shopType": 12,
"title": "wsw_wz_dhsd",
"title": "wsw_wz_mrjxdh",
"undefined": "兑换商店",
"openCond": "shop_13",
"des": "intr_shop_des_13",