Merge branch 'feature/json' into release

This commit is contained in:
dy 2023-12-22 22:56:38 +08:00
commit 7fb7f952c7
8 changed files with 395 additions and 116 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,6 @@
},
//136礼包
'136Gift': [
{ payId: '136Gift1', prize: [], bonus: [{"a": "attr", "t": "jingxuanbi", "n": 10}] },
{ 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

@ -122,6 +122,88 @@
"ARS": 110,
"MOP": 8.99
},
"8": {
"CNY": 8,
"JPY": 160,
"USD": 1.49,
"AUD": 2.09,
"GBP": 1.09,
"CAD": 1.99,
"TWD": 40,
"EUR": 1.29,
"CHF": 1.49,
"CZK": 31,
"DKK": 9.09,
"HKD": 12,
"HUF": 470,
"NOK": 12.49,
"NZD": 2.09,
"PLN": 5.49,
"SEK": 12.99,
"SGD": 1.89,
"THB": 46.99,
"PHP": 72.99,
"MXN": 30.99,
"ILS": 4.79,
"RUB": 107.99,
"KRW": 1710,
"VND": 33600,
"IDR": 20900,
"CLP": 1150,
"MYR": 6.09,
"BRL": 7.49,
"AED": 5.49,
"BDT": 121.99,
"PEN": 5.99,
"RON": 6.09,
"SAR": 5.49,
"INR": 106.99,
"ISK": 190,
"BGN": 2.49,
"ARS": 320,
"MOP": 11.99
},
"10": {
"CNY": 10,
"JPY": 200,
"USD": 1.79,
"AUD": 2.69,
"GBP": 1.49,
"CAD": 2.39,
"TWD": 50,
"EUR": 1.59,
"CHF": 1.79,
"CZK": 38,
"DKK": 11.49,
"HKD": 14,
"HUF": 580,
"NOK": 15.99,
"NZD": 2.69,
"PLN": 6.99,
"SEK": 16.09,
"SGD": 2.29,
"THB": 58.99,
"PHP": 90.99,
"MXN": 38.99,
"ILS": 6.09,
"RUB": 134.99,
"KRW": 2130,
"VND": 41900,
"IDR": 26100,
"CLP": 1430,
"MYR": 7.49,
"BRL": 9.49,
"AED": 6.49,
"BDT": 152.99,
"PEN": 7.49,
"RON": 7.49,
"SAR": 6.99,
"INR": 133.99,
"ISK": 230,
"BGN": 3.09,
"ARS": 400,
"MOP": 14.99
},
"12": {
"CNY": 12,
"JPY": 240,

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": 1
}
],
"firstPayPrize": [],
@ -2581,42 +2591,6 @@
},
"136Gift3": {
"id": "136Gift3",
"money": 3,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 30
}
],
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 60
},
{
"a": "item",
"t": "12",
"n": 100
},
{
"a": "item",
"t": "600",
"n": 1
}
],
"firstPayPrize": [],
"name": "pay_name_136Gift4",
"undefined": "3元礼包",
"time": 86400,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"136Gift4": {
"id": "136Gift4",
"money": 6,
"payExp": [
{
@ -2640,6 +2614,52 @@
"a": "item",
"t": "600",
"n": 2
},
{
"a": "attr",
"t": "jingxuanbi",
"n": 3
}
],
"firstPayPrize": [],
"name": "pay_name_136Gift4",
"undefined": "3元礼包",
"time": 86400,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"136Gift4": {
"id": "136Gift4",
"money": 12,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 120
}
],
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 240
},
{
"a": "item",
"t": "12",
"n": 500
},
{
"a": "item",
"t": "600",
"n": 3
},
{
"a": "attr",
"t": "jingxuanbi",
"n": 8
}
],
"firstPayPrize": [],
@ -2653,12 +2673,12 @@
},
"136GiftAll": {
"id": "136GiftAll",
"money": 60,
"money": 18,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 600
"n": 180
}
],
"prize": [],
@ -2669,6 +2689,7 @@
"buys": 0,
"needVip": 0,
"front": {},
"fanLiBi": 900,
"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,11 @@
"shopItems": [
10001,
10002,
10003
10003,
10004,
10005,
10006,
10007
],
"showItem": [
{

View File

@ -6273,17 +6273,17 @@
{
"id": 10001,
"a": "item",
"t": 4,
"n": 10,
"t": 617,
"n": 1,
"p": 1,
"colour": 4,
"colour": 6,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 2800
"n": 150
}
],
"sale": 10,
@ -6300,17 +6300,17 @@
{
"id": 10002,
"a": "item",
"t": 1,
"n": 10000,
"t": 627,
"n": 1,
"p": 1,
"colour": 4,
"colour": 5,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 1000
"n": 60
}
],
"sale": 10,
@ -6327,8 +6327,62 @@
{
"id": 10003,
"a": "item",
"t": 2,
"n": 10000,
"t": 605,
"n": 1,
"p": 1,
"colour": 5,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 18
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10004": [
{
"id": 10004,
"a": "item",
"t": 24,
"n": 2,
"p": 1,
"colour": 5,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 6
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10005": [
{
"id": 10005,
"a": "item",
"t": 12,
"n": 200,
"p": 1,
"colour": 4,
"buyNum": -1,
@ -6337,7 +6391,61 @@
{
"a": "attr",
"t": "jingxuanbi",
"n": 1500
"n": 6
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10006": [
{
"id": 10006,
"a": "attr",
"t": "jinbi",
"n": 1000000,
"p": 1,
"colour": 3,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 3
}
],
"sale": 10,
"needVip": 0,
"needZCCG": 0,
"lv": [
1,
9999
],
"vipAddbuyNum": []
}
],
"10007": [
{
"id": 10007,
"a": "item",
"t": 1,
"n": 500000,
"p": 1,
"colour": 3,
"buyNum": -1,
"openDay": 1,
"buyNeed": [
{
"a": "attr",
"t": "jingxuanbi",
"n": 5
}
],
"sale": 10,

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",

View File

@ -8,11 +8,12 @@
],
"payId": [
"guanqialibao_1",
"guanqialibao_3"
"guanqialibao_2"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"2": {
"id": 2,
@ -23,11 +24,12 @@
],
"payId": [
"guanqialibao_1",
"guanqialibao_3"
"guanqialibao_2"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"3": {
"id": 3,
@ -43,7 +45,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"4": {
"id": 4,
@ -59,7 +62,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"5": {
"id": 5,
@ -75,7 +79,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"6": {
"id": 6,
@ -91,7 +96,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"7": {
"id": 7,
@ -107,7 +113,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"8": {
"id": 8,
@ -123,7 +130,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"9": {
"id": 9,
@ -139,7 +147,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"10": {
"id": 10,
@ -155,7 +164,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"11": {
"id": 11,
@ -171,7 +181,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"12": {
"id": 12,
@ -187,7 +198,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"13": {
"id": 13,
@ -203,7 +215,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"14": {
"id": 14,
@ -219,7 +232,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"15": {
"id": 15,
@ -235,7 +249,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"16": {
"id": 16,
@ -251,7 +266,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"17": {
"id": 17,
@ -267,7 +283,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"18": {
"id": 18,
@ -283,7 +300,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "gkts"
},
"101": {
"id": 101,
@ -302,7 +320,8 @@
],
"time": 3600,
"displayCD": 86400,
"scale": 3000
"scale": 3000,
"icon": "sclb"
},
"102": {
"id": 102,
@ -321,7 +340,8 @@
],
"time": 3600,
"displayCD": 86400,
"scale": 3000
"scale": 3000,
"icon": "sclb"
},
"103": {
"id": 103,
@ -340,7 +360,8 @@
],
"time": 3600,
"displayCD": 86400,
"scale": 3000
"scale": 3000,
"icon": "sclb"
},
"104": {
"id": 104,
@ -359,7 +380,8 @@
],
"time": 3600,
"displayCD": 86400,
"scale": 3000
"scale": 3000,
"icon": "sclb"
},
"401": {
"id": 401,
@ -373,7 +395,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"402": {
"id": 402,
@ -387,7 +410,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"403": {
"id": 403,
@ -402,7 +426,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"404": {
"id": 404,
@ -417,7 +442,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"405": {
"id": 405,
@ -432,7 +458,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"406": {
"id": 406,
@ -447,7 +474,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"407": {
"id": 407,
@ -462,7 +490,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"408": {
"id": 408,
@ -477,7 +506,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"409": {
"id": 409,
@ -492,7 +522,8 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"410": {
"id": 410,
@ -507,12 +538,45 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
},
"411": {
"id": 411,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
76
],
"payId": [
"lv76_1",
"lv76_2"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000,
"icon": "djlb"
},
"412": {
"id": 412,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
79
],
"payId": [
"lv79_1",
"lv79_2"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000,
"icon": "djlb"
},
"413": {
"id": 413,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
82
],
@ -522,6 +586,7 @@
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3000,
"icon": "djlb"
}
}