liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei 2023-07-04 16:56:16 +08:00
commit 92a08ee808
29 changed files with 2588 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bin/json/game_caravancity.json
View File

@ -33,15 +33,15 @@
"citytype": 1, "citytype": 1,
"citytypenum": 2, "citytypenum": 2,
"special": [ "special": [
1, "1",
2, "2",
4, "4",
6 "6"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
3, "21000002",
5 "21000001"
], ],
"exspecialnum": 1500, "exspecialnum": 1500,
"Orspecial": 1000, "Orspecial": 1000,
@ -52,7 +52,7 @@
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": [
1001 1
] ]
}, },
{ {
@ -89,15 +89,15 @@
"citytype": 1, "citytype": 1,
"citytypenum": 3, "citytypenum": 3,
"special": [ "special": [
3, "3",
4, "4",
5, "5",
6 "6"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
1, "1",
2 "2"
], ],
"exspecialnum": 1600, "exspecialnum": 1600,
"Orspecial": 1000, "Orspecial": 1000,
@ -108,7 +108,7 @@
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 100000, "cityeventpro": 100000,
"cityevent": [ "cityevent": [
1001 1
] ]
}, },
{ {
@ -146,15 +146,15 @@
"citytype": 1, "citytype": 1,
"citytypenum": 4, "citytypenum": 4,
"special": [ "special": [
2, "2",
3, "3",
4, "4",
6 "6"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
1, "1",
5 "5"
], ],
"exspecialnum": 1700, "exspecialnum": 1700,
"Orspecial": 1000, "Orspecial": 1000,
@ -165,7 +165,7 @@
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": [
1001 1
] ]
}, },
{ {
@ -203,15 +203,15 @@
"citytype": 1, "citytype": 1,
"citytypenum": 3, "citytypenum": 3,
"special": [ "special": [
1, "1",
2, "2",
4, "4",
5 "5"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
3, "3",
6 "6"
], ],
"exspecialnum": 1800, "exspecialnum": 1800,
"Orspecial": 1000, "Orspecial": 1000,
@ -222,7 +222,7 @@
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 100000, "cityeventpro": 100000,
"cityevent": [ "cityevent": [
1001 1
] ]
}, },
{ {
@ -259,15 +259,15 @@
"citytype": 1, "citytype": 1,
"citytypenum": 4, "citytypenum": 4,
"special": [ "special": [
1, "1",
3, "3",
4, "4",
6 "6"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
2, "2",
5 "5"
], ],
"exspecialnum": 1900, "exspecialnum": 1900,
"Orspecial": 1000, "Orspecial": 1000,
@ -278,7 +278,7 @@
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": [
1001 1
] ]
} }
] ]

12
bin/json/game_caravanevent.json
View File

@ -1,6 +1,8 @@
[ [
{ {
"id": 1001, "id": 10010,
"eventgroup": 1,
"eventweight": 40000,
"eventtype": 1, "eventtype": 1,
"mustdo": 1, "mustdo": 1,
"citystory": 50020010, "citystory": 50020010,
@ -28,7 +30,9 @@
"eventtime": 500 "eventtime": 500
}, },
{ {
"id": 1002, "id": 10020,
"eventgroup": 1,
"eventweight": 40000,
"eventtype": 1, "eventtype": 1,
"mustdo": 2, "mustdo": 2,
"citystory": 50020011, "citystory": 50020011,
@ -56,7 +60,9 @@
"eventtime": 500 "eventtime": 500
}, },
{ {
"id": 1003, "id": 10030,
"eventgroup": 1,
"eventweight": 20000,
"eventtype": 1, "eventtype": 1,
"mustdo": 1, "mustdo": 1,
"citystory": 50020012, "citystory": 50020012,

504
bin/json/game_caravanthing.json
View File

@ -1,15 +1,6 @@
[ [
{ {
"id": 1, "itemid": "21000001",
"goodsname": {
"key": "caravan_caravan_city_goodsname_1",
"text": "番茄"
},
"goodsinfor": {
"key": "caravan_caravan_city_goodsinfor_1",
"text": "这是一个番茄"
},
"goodsicon": "clmsg_ll_01",
"goodsprice": 1000, "goodsprice": 1000,
"changeperiod": [ "changeperiod": [
5, 5,
@ -34,20 +25,10 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000, "pricemax": 3000
"goodsnum": 80
}, },
{ {
"id": 2, "itemid": "21000002",
"goodsname": {
"key": "caravan_caravan_city_goodsname_2",
"text": "苹果"
},
"goodsinfor": {
"key": "caravan_caravan_city_goodsinfor_2",
"text": "这是一个苹果"
},
"goodsicon": "clmsg_ll_02",
"goodsprice": 900, "goodsprice": 900,
"changeperiod": [ "changeperiod": [
5, 5,
@ -72,20 +53,10 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000, "pricemax": 3000
"goodsnum": 80
}, },
{ {
"id": 3, "itemid": "21000003",
"goodsname": {
"key": "caravan_caravan_city_goodsname_3",
"text": "手机"
},
"goodsinfor": {
"key": "caravan_caravan_city_goodsinfor_3",
"text": "这是一个手机"
},
"goodsicon": "clmsg_ll_03",
"goodsprice": 500, "goodsprice": 500,
"changeperiod": [ "changeperiod": [
5, 5,
@ -110,20 +81,10 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000, "pricemax": 3000
"goodsnum": 80
}, },
{ {
"id": 4, "itemid": "21000004",
"goodsname": {
"key": "caravan_caravan_city_goodsname_4",
"text": "干果"
},
"goodsinfor": {
"key": "caravan_caravan_city_goodsinfor_4",
"text": "这是一个干果"
},
"goodsicon": "clmsg_ll_04",
"goodsprice": 1500, "goodsprice": 1500,
"changeperiod": [ "changeperiod": [
5, 5,
@ -148,20 +109,10 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000, "pricemax": 3000
"goodsnum": 80
}, },
{ {
"id": 5, "itemid": "21000005",
"goodsname": {
"key": "caravan_caravan_city_goodsname_5",
"text": "矿石"
},
"goodsinfor": {
"key": "caravan_caravan_city_goodsinfor_5",
"text": "这是一个矿石"
},
"goodsicon": "clmsg_ll_05",
"goodsprice": 2300, "goodsprice": 2300,
"changeperiod": [ "changeperiod": [
5, 5,
@ -186,20 +137,10 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000, "pricemax": 3000
"goodsnum": 80
}, },
{ {
"id": 6, "itemid": "21000006",
"goodsname": {
"key": "caravan_caravan_city_goodsname_6",
"text": "饼干"
},
"goodsinfor": {
"key": "caravan_caravan_city_goodsinfor_6",
"text": "这是一个饼干"
},
"goodsicon": "clmsg_ll_06",
"goodsprice": 1130, "goodsprice": 1130,
"changeperiod": [ "changeperiod": [
5, 5,
@ -224,7 +165,426 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000, "pricemax": 3000
"goodsnum": 80 },
{
"itemid": "21000007",
"goodsprice": 1000,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000008",
"goodsprice": 900,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000009",
"goodsprice": 500,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000010",
"goodsprice": 1500,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000011",
"goodsprice": 2300,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000012",
"goodsprice": 1130,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000013",
"goodsprice": 1000,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000014",
"goodsprice": 900,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000015",
"goodsprice": 500,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000016",
"goodsprice": 1500,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000017",
"goodsprice": 2300,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000018",
"goodsprice": 1130,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000019",
"goodsprice": 1000,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000020",
"goodsprice": 900,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
},
{
"itemid": "21000021",
"goodsprice": 500,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000
} }
] ]

45
bin/json/game_dispatch_task.json
View File

@ -2,6 +2,7 @@
{ {
"id": 1, "id": 1,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_1", "key": "pandamas_pandamas_dispatch_taskname_1",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -51,6 +52,7 @@
{ {
"id": 2, "id": 2,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_2", "key": "pandamas_pandamas_dispatch_taskname_2",
"text": "波比的委托" "text": "波比的委托"
@ -100,6 +102,7 @@
{ {
"id": 3, "id": 3,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_3", "key": "pandamas_pandamas_dispatch_taskname_3",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -149,6 +152,7 @@
{ {
"id": 4, "id": 4,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_4", "key": "pandamas_pandamas_dispatch_taskname_4",
"text": "师父的委托" "text": "师父的委托"
@ -198,6 +202,7 @@
{ {
"id": 5, "id": 5,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_5", "key": "pandamas_pandamas_dispatch_taskname_5",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -247,6 +252,7 @@
{ {
"id": 6, "id": 6,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_6", "key": "pandamas_pandamas_dispatch_taskname_6",
"text": "波比的委托" "text": "波比的委托"
@ -296,6 +302,7 @@
{ {
"id": 7, "id": 7,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_7", "key": "pandamas_pandamas_dispatch_taskname_7",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -345,6 +352,7 @@
{ {
"id": 8, "id": 8,
"type": 1, "type": 1,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_8", "key": "pandamas_pandamas_dispatch_taskname_8",
"text": "师父的委托" "text": "师父的委托"
@ -394,6 +402,7 @@
{ {
"id": 19, "id": 19,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_19", "key": "pandamas_pandamas_dispatch_taskname_19",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -443,6 +452,7 @@
{ {
"id": 20, "id": 20,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_20", "key": "pandamas_pandamas_dispatch_taskname_20",
"text": "师父的委托" "text": "师父的委托"
@ -492,6 +502,7 @@
{ {
"id": 21, "id": 21,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_21", "key": "pandamas_pandamas_dispatch_taskname_21",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -541,6 +552,7 @@
{ {
"id": 22, "id": 22,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_22", "key": "pandamas_pandamas_dispatch_taskname_22",
"text": "波比的委托" "text": "波比的委托"
@ -590,6 +602,7 @@
{ {
"id": 23, "id": 23,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_23", "key": "pandamas_pandamas_dispatch_taskname_23",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -639,6 +652,7 @@
{ {
"id": 24, "id": 24,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_24", "key": "pandamas_pandamas_dispatch_taskname_24",
"text": "师父的委托" "text": "师父的委托"
@ -688,6 +702,7 @@
{ {
"id": 25, "id": 25,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_25", "key": "pandamas_pandamas_dispatch_taskname_25",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -737,6 +752,7 @@
{ {
"id": 26, "id": 26,
"type": 2, "type": 2,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_26", "key": "pandamas_pandamas_dispatch_taskname_26",
"text": "波比的委托" "text": "波比的委托"
@ -786,6 +802,7 @@
{ {
"id": 34, "id": 34,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_34", "key": "pandamas_pandamas_dispatch_taskname_34",
"text": "波比的委托" "text": "波比的委托"
@ -835,6 +852,7 @@
{ {
"id": 35, "id": 35,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_35", "key": "pandamas_pandamas_dispatch_taskname_35",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -884,6 +902,7 @@
{ {
"id": 36, "id": 36,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_36", "key": "pandamas_pandamas_dispatch_taskname_36",
"text": "师父的委托" "text": "师父的委托"
@ -933,6 +952,7 @@
{ {
"id": 37, "id": 37,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_37", "key": "pandamas_pandamas_dispatch_taskname_37",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -982,6 +1002,7 @@
{ {
"id": 38, "id": 38,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_38", "key": "pandamas_pandamas_dispatch_taskname_38",
"text": "波比的委托" "text": "波比的委托"
@ -1031,6 +1052,7 @@
{ {
"id": 39, "id": 39,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_39", "key": "pandamas_pandamas_dispatch_taskname_39",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -1080,6 +1102,7 @@
{ {
"id": 40, "id": 40,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_40", "key": "pandamas_pandamas_dispatch_taskname_40",
"text": "师父的委托" "text": "师父的委托"
@ -1129,6 +1152,7 @@
{ {
"id": 41, "id": 41,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_41", "key": "pandamas_pandamas_dispatch_taskname_41",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -1178,6 +1202,7 @@
{ {
"id": 42, "id": 42,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_42", "key": "pandamas_pandamas_dispatch_taskname_42",
"text": "波比的委托" "text": "波比的委托"
@ -1227,6 +1252,7 @@
{ {
"id": 43, "id": 43,
"type": 3, "type": 3,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_43", "key": "pandamas_pandamas_dispatch_taskname_43",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -1276,6 +1302,7 @@
{ {
"id": 60, "id": 60,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_60", "key": "pandamas_pandamas_dispatch_taskname_60",
"text": "师父的委托" "text": "师父的委托"
@ -1325,6 +1352,7 @@
{ {
"id": 61, "id": 61,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_61", "key": "pandamas_pandamas_dispatch_taskname_61",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -1374,6 +1402,7 @@
{ {
"id": 62, "id": 62,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_62", "key": "pandamas_pandamas_dispatch_taskname_62",
"text": "波比的委托" "text": "波比的委托"
@ -1423,6 +1452,7 @@
{ {
"id": 63, "id": 63,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_63", "key": "pandamas_pandamas_dispatch_taskname_63",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -1472,6 +1502,7 @@
{ {
"id": 64, "id": 64,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_64", "key": "pandamas_pandamas_dispatch_taskname_64",
"text": "师父的委托" "text": "师父的委托"
@ -1521,6 +1552,7 @@
{ {
"id": 65, "id": 65,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_65", "key": "pandamas_pandamas_dispatch_taskname_65",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -1570,6 +1602,7 @@
{ {
"id": 66, "id": 66,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_66", "key": "pandamas_pandamas_dispatch_taskname_66",
"text": "波比的委托" "text": "波比的委托"
@ -1619,6 +1652,7 @@
{ {
"id": 67, "id": 67,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_67", "key": "pandamas_pandamas_dispatch_taskname_67",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -1668,6 +1702,7 @@
{ {
"id": 68, "id": 68,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_68", "key": "pandamas_pandamas_dispatch_taskname_68",
"text": "师父的委托" "text": "师父的委托"
@ -1717,6 +1752,7 @@
{ {
"id": 69, "id": 69,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_69", "key": "pandamas_pandamas_dispatch_taskname_69",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -1766,6 +1802,7 @@
{ {
"id": 70, "id": 70,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_70", "key": "pandamas_pandamas_dispatch_taskname_70",
"text": "波比的委托" "text": "波比的委托"
@ -1815,6 +1852,7 @@
{ {
"id": 71, "id": 71,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_71", "key": "pandamas_pandamas_dispatch_taskname_71",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -1864,6 +1902,7 @@
{ {
"id": 72, "id": 72,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_72", "key": "pandamas_pandamas_dispatch_taskname_72",
"text": "师父的委托" "text": "师父的委托"
@ -1913,6 +1952,7 @@
{ {
"id": 73, "id": 73,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_73", "key": "pandamas_pandamas_dispatch_taskname_73",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -1962,6 +2002,7 @@
{ {
"id": 74, "id": 74,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_74", "key": "pandamas_pandamas_dispatch_taskname_74",
"text": "波比的委托" "text": "波比的委托"
@ -2011,6 +2052,7 @@
{ {
"id": 75, "id": 75,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_71", "key": "pandamas_pandamas_dispatch_taskname_71",
"text": "悍娇虎的委托" "text": "悍娇虎的委托"
@ -2060,6 +2102,7 @@
{ {
"id": 76, "id": 76,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_72", "key": "pandamas_pandamas_dispatch_taskname_72",
"text": "师父的委托" "text": "师父的委托"
@ -2109,6 +2152,7 @@
{ {
"id": 77, "id": 77,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_73", "key": "pandamas_pandamas_dispatch_taskname_73",
"text": "阿宝的委托" "text": "阿宝的委托"
@ -2158,6 +2202,7 @@
{ {
"id": 78, "id": 78,
"type": 4, "type": 4,
"weight": 1,
"taskname": { "taskname": {
"key": "pandamas_pandamas_dispatch_taskname_74", "key": "pandamas_pandamas_dispatch_taskname_74",
"text": "波比的委托" "text": "波比的委托"

292
bin/json/game_hero.json
View File

@ -10001,5 +10001,297 @@
} }
], ],
"expitemnum": 7 "expitemnum": 7
},
{
"hid": "51050",
"name": {
"key": "hero_main_name_134",
"text": "小蜘蛛A"
},
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "51050",
"rotation": "0|0|0",
"revolve": 0,
"icon": "51050",
"vocal": "51050",
"tujing": [
107
],
"intr": {
"key": "",
"text": ""
},
"events": "hero_51050",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": -0.69,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 151050111,
"skill2": 151050211,
"skill3": 0,
"txt": {
"key": "atlas_51050",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7
},
{
"hid": "51051",
"name": {
"key": "hero_main_name_135",
"text": "烟火灵"
},
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "51051",
"rotation": "0|0|0",
"revolve": 0,
"icon": "51051",
"vocal": "51051",
"tujing": [
107
],
"intr": {
"key": "",
"text": ""
},
"events": "hero_51051",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": -0.69,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 151051111,
"skill2": 151051211,
"skill3": 0,
"txt": {
"key": "atlas_51051",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7
},
{
"hid": "51052",
"name": {
"key": "hero_main_name_136",
"text": "小蜘蛛B"
},
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "51052",
"rotation": "0|0|0",
"revolve": 0,
"icon": "51052",
"vocal": "51052",
"tujing": [
107
],
"intr": {
"key": "",
"text": ""
},
"events": "hero_51052",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": -0.69,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 151052111,
"skill2": 151052211,
"skill3": 0,
"txt": {
"key": "atlas_51052",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7
},
{
"hid": "51053",
"name": {
"key": "hero_main_name_137",
"text": "华夫饼灵"
},
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "51053",
"rotation": "0|0|0",
"revolve": 0,
"icon": "51053",
"vocal": "51053",
"tujing": [
107
],
"intr": {
"key": "",
"text": ""
},
"events": "hero_51053",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": -0.69,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 151053111,
"skill2": 151053211,
"skill3": 0,
"txt": {
"key": "atlas_51053",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7
} }
] ]

634
bin/json/game_item.json
View File

@ -163,7 +163,7 @@
}, },
"usetype": 1, "usetype": 1,
"color": 4, "color": 4,
"bagtype": 0, "bagtype": 1,
"index": 99, "index": 99,
"special_type": 200, "special_type": 200,
"time": 0, "time": 0,
@ -196,7 +196,7 @@
}, },
"usetype": 1, "usetype": 1,
"color": 5, "color": 5,
"bagtype": 0, "bagtype": 1,
"index": 99, "index": 99,
"special_type": 150, "special_type": 150,
"time": 0, "time": 0,
@ -10953,7 +10953,7 @@
"reddottype": 0, "reddottype": 0,
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 17050001,
"synthetize_num": 0, "synthetize_num": 0,
"synthetize_deplete": [], "synthetize_deplete": [],
"synthetize_get": [], "synthetize_get": [],
@ -12685,18 +12685,632 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 0, "upper_limit": 80,
"img": "icon_mcs", "img": "icon_mcs",
"intr": { "intr": {
"key": "item_item_intr_356", "key": "item_item_intr_356",
"text": "用于巨怪商队内移动列车的消耗品" "text": "用于巨怪商队内移动列车的消耗品"
}, },
"sale": [ "sale": []
},
{ {
"a": "attr", "id": "21000002",
"t": "gold", "name": {
"n": 1000 "key": "item_item_name_349",
} "text": "鸟蛋"
] },
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "wp_icon_jjcq",
"intr": {
"key": "item_item_intr_357",
"text": "原始鸵鸟产的蛋，具有极高的营养价值。"
},
"sale": []
},
{
"id": "21000003",
"name": {
"key": "item_item_name_350",
"text": "海螺"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_358",
"text": "海螺响起时，可能是传递一种信号，也可能是传递一种思念。"
},
"sale": []
},
{
"id": "21000004",
"name": {
"key": "item_item_name_351",
"text": "颈枕"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_359",
"text": "长途旅行过程中，可以把颈枕放在脖子后，缓解疲劳感。"
},
"sale": []
},
{
"id": "21000005",
"name": {
"key": "item_item_name_352",
"text": "贝壳项链"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_360",
"text": "用原始世界各种造型的贝壳串联起来的项链。"
},
"sale": []
},
{
"id": "21000006",
"name": {
"key": "item_item_name_353",
"text": "阳春面"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_361",
"text": "平先生做的阳春面，深受和平谷居民的欢迎。"
},
"sale": []
},
{
"id": "21000007",
"name": {
"key": "item_item_name_354",
"text": "冲天椅"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_362",
"text": "一个绑满鞭炮的椅子，能够达到一飞冲天的效果。"
},
"sale": []
},
{
"id": "21000008",
"name": {
"key": "item_item_name_355",
"text": "熊猫立牌"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_363",
"text": "神龙大侠诞生之后，繁衍出的应援物。"
},
"sale": []
},
{
"id": "21000009",
"name": {
"key": "item_item_name_356",
"text": "灯笼"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_364",
"text": "传统手工艺品，逢年过节挂上灯笼，增添节日氛围。"
},
"sale": []
},
{
"id": "21000010",
"name": {
"key": "item_item_name_357",
"text": "美肚鲨的微笑"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_365",
"text": "闻名于坏蛋联盟的世界名画。"
},
"sale": []
},
{
"id": "21000011",
"name": {
"key": "item_item_name_358",
"text": "暗纹金杯"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_366",
"text": "用来提升室内装潢高级感的摆件。"
},
"sale": []
},
{
"id": "21000012",
"name": {
"key": "item_item_name_359",
"text": "奶油蛋糕"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_367",
"text": "用于庆祝一年中最重要的一天。"
},
"sale": []
},
{
"id": "21000013",
"name": {
"key": "item_item_name_360",
"text": "推推糖"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_368",
"text": "一种冰棒，吃完会让人心情愉悦。"
},
"sale": []
},
{
"id": "21000014",
"name": {
"key": "item_item_name_361",
"text": "魔法毯"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_369",
"text": "被赋予魔法的毛毯，把人带到想去的地方。"
},
"sale": []
},
{
"id": "21000015",
"name": {
"key": "item_item_name_362",
"text": "幸福药水"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_370",
"text": "传说，只要喝下幸福药水，就能和所爱之人幸福的生活在一起。"
},
"sale": []
},
{
"id": "21000016",
"name": {
"key": "item_item_name_363",
"text": "手鼓"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_371",
"text": "一种击打乐器，经常在具有地方特色的庆典活动中出现。"
},
"sale": []
},
{
"id": "21000017",
"name": {
"key": "item_item_name_364",
"text": "魔镜"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_372",
"text": "这是一面能窥探到人内心深处欲望的镜子。"
},
"sale": []
},
{
"id": "21000018",
"name": {
"key": "item_item_name_365",
"text": "龙宝典"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_373",
"text": "这本书里记载了各种龙的信息，爱龙人士的首选。"
},
"sale": []
},
{
"id": "21000019",
"name": {
"key": "item_item_name_366",
"text": "手工龙牙"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_374",
"text": "维京人纯手工打造的龙牙，坚硬无比。"
},
"sale": []
},
{
"id": "21000020",
"name": {
"key": "item_item_name_367",
"text": "葛林魔弩箭"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_375",
"text": "猎龙人研发的弩箭，是龙的天敌。"
},
"sale": []
},
{
"id": "21000021",
"name": {
"key": "item_item_name_368",
"text": "龙鞍"
},
"usetype": 2,
"color": 4,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 80,
"img": "icon_st03",
"intr": {
"key": "item_item_intr_376",
"text": "龙骑士驯龙时安置在龙身上的护具。"
},
"sale": []
} }
] ]

192
bin/json/game_lottery.json
View File

@ -23278,5 +23278,197 @@
"playerlvmin": 0, "playerlvmin": 0,
"playerlvmax": 0, "playerlvmax": 0,
"notice": 0 "notice": 0
},
{
"id": 971,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "13001",
"n": 1
},
"itemdes": "英雄1",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 1,
"VIPmax": 15,
"playerlvmin": 5,
"playerlvmax": 100,
"notice": 0
},
{
"id": 972,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "13002",
"n": 1
},
"itemdes": "英雄2",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 1,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 973,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "13003",
"n": 1
},
"itemdes": "英雄3",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 974,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "14005",
"n": 1
},
"itemdes": "英雄4",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 975,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 2,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "24002",
"n": 1
},
"itemdes": "英雄5",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 10,
"playerlvmax": 100,
"notice": 0
},
{
"id": 976,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 2,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "24003",
"n": 1
},
"itemdes": "英雄6",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 977,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 2,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "24004",
"n": 1
},
"itemdes": "英雄7",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 978,
"lotteryid": 17050001,
"description": "英雄自选宝箱（测试）",
"type": 3,
"groupwt": 0,
"groupid": 2,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "24005",
"n": 1
},
"itemdes": "英雄8",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
} }
] ]

140
bin/json/game_model.json
View File

@ -4898,5 +4898,145 @@
"y": 1, "y": 1,
"z": 1 "z": 1
} }
},
{
"id": "51050",
"preson": "51050",
"presonshow": "51050_exhibition",
"presonstory": "51050",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51050",
"fight": "tx_js_51050",
"img": "sbkp_js_51050",
"heroimg": "hbkp_js_51050",
"portrait": "portrait_51050",
"bust": "bust_51050",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{
"id": "51051",
"preson": "51051",
"presonshow": "51051_exhibition",
"presonstory": "51051",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51051",
"fight": "tx_js_51051",
"img": "sbkp_js_51051",
"heroimg": "hbkp_js_51051",
"portrait": "portrait_51051",
"bust": "bust_51051",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{
"id": "51052",
"preson": "51052",
"presonshow": "51052_exhibition",
"presonstory": "51052",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51052",
"fight": "tx_js_51052",
"img": "sbkp_js_51052",
"heroimg": "hbkp_js_51052",
"portrait": "portrait_51052",
"bust": "bust_51052",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{
"id": "51053",
"preson": "51053",
"presonshow": "51053_exhibition",
"presonstory": "51053",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51053",
"fight": "tx_js_51053",
"img": "sbkp_js_51053",
"heroimg": "hbkp_js_51053",
"portrait": "portrait_51053",
"bust": "bust_51053",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
} }
] ]

10
bin/json/game_pandamasjx.json
View File

@ -425,7 +425,7 @@
"ants": [ "ants": [
{ {
"a": "item", "a": "item",
"t": "30002", "t": "10000009",
"n": 1 "n": 1
} }
], ],
@ -473,7 +473,7 @@
"ants": [ "ants": [
{ {
"a": "item", "a": "item",
"t": "30002", "t": "10000009",
"n": 1 "n": 1
} }
], ],
@ -968,7 +968,7 @@
"ants": [ "ants": [
{ {
"a": "item", "a": "item",
"t": "30002", "t": "10000009",
"n": 1 "n": 1
} }
], ],
@ -1016,7 +1016,7 @@
"ants": [ "ants": [
{ {
"a": "item", "a": "item",
"t": "30002", "t": "10000009",
"n": 1 "n": 1
} }
], ],
@ -1064,7 +1064,7 @@
"ants": [ "ants": [
{ {
"a": "item", "a": "item",
"t": "30002", "t": "10000009",
"n": 1 "n": 1
} }
], ],

22
bin/json/game_playerlv.json
View File

@ -5,7 +5,7 @@
"reward": [], "reward": [],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 60, "cops_ps_ceiling": 60,
"hero_lv": 10 "hero_lv": 14
}, },
{ {
"lv": 2, "lv": 2,
@ -24,7 +24,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 62, "cops_ps_ceiling": 62,
"hero_lv": 12 "hero_lv": 14
}, },
{ {
"lv": 3, "lv": 3,
@ -62,7 +62,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 66, "cops_ps_ceiling": 66,
"hero_lv": 16 "hero_lv": 14
}, },
{ {
"lv": 5, "lv": 5,
@ -81,7 +81,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 68, "cops_ps_ceiling": 68,
"hero_lv": 18 "hero_lv": 20
}, },
{ {
"lv": 6, "lv": 6,
@ -119,7 +119,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 72, "cops_ps_ceiling": 72,
"hero_lv": 22 "hero_lv": 20
}, },
{ {
"lv": 8, "lv": 8,
@ -138,7 +138,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 74, "cops_ps_ceiling": 74,
"hero_lv": 24 "hero_lv": 20
}, },
{ {
"lv": 9, "lv": 9,
@ -157,7 +157,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 76, "cops_ps_ceiling": 76,
"hero_lv": 26 "hero_lv": 20
}, },
{ {
"lv": 10, "lv": 10,
@ -176,7 +176,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 78, "cops_ps_ceiling": 78,
"hero_lv": 28 "hero_lv": 20
}, },
{ {
"lv": 11, "lv": 11,
@ -195,7 +195,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 80, "cops_ps_ceiling": 80,
"hero_lv": 30 "hero_lv": 28
}, },
{ {
"lv": 12, "lv": 12,
@ -214,7 +214,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 82, "cops_ps_ceiling": 82,
"hero_lv": 32 "hero_lv": 28
}, },
{ {
"lv": 13, "lv": 13,
@ -233,7 +233,7 @@
], ],
"ps_ceiling": 180, "ps_ceiling": 180,
"cops_ps_ceiling": 84, "cops_ps_ceiling": 84,
"hero_lv": 34 "hero_lv": 28
}, },
{ {
"lv": 14, "lv": 14,

327
bin/json/game_skillafteratk.json
View File

@ -917,7 +917,7 @@
{ {
"Id": 235002213, "Id": 235002213,
"EmitPR": 1000, "EmitPR": 1000,
"From": 9, "From": 12,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -940,7 +940,7 @@
{ {
"Id": 235002214, "Id": 235002214,
"EmitPR": 1000, "EmitPR": 1000,
"From": 9, "From": 12,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -963,7 +963,7 @@
{ {
"Id": 235002215, "Id": 235002215,
"EmitPR": 1000, "EmitPR": 1000,
"From": 9, "From": 12,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -24274,10 +24274,10 @@
4, 4,
1000 1000
], ],
"FollowSK": [ "FollowSK": [],
233001113 "SucFollowSK": [
233001112
], ],
"SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -24293,31 +24293,6 @@
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1000
],
"FollowSK": [
233001113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 233001113,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
390001008, 390001008,
@ -24373,10 +24348,11 @@
3000 3000
], ],
"FollowSK": [ "FollowSK": [
233001312,
233001313 233001313
], ],
"SucFollowSK": [], "SucFollowSK": [
233001312
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -37812,5 +37788,290 @@
"DpsCondition": "", "DpsCondition": "",
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
},
{
"Id": 251050111,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251050211,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2500
],
"FollowSK": [],
"SucFollowSK": [
251050212
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251050212,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001401,
1000,
1,
2
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251051111,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251051211,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
451051211,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251051212,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 11,
"Argu": [
1,
4,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251052111,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251052211,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2500
],
"FollowSK": [],
"SucFollowSK": [
251052212
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251052212,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001006,
1000,
1,
2
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251053111,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251053211,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2500
],
"FollowSK": [],
"SucFollowSK": [
251053212
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 251053212,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001115,
150,
1,
2
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
} }
] ]

237
bin/json/game_skillatk.json
View File

@ -18453,13 +18453,12 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
233001111, 233001111
233001112
] ]
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_133001111_1", "key": "skill_skill_atk_Desc_133001111_1",
"text": "巫嘎对敌方1个目标发起2段攻击，每段可造成攻击力60%的伤害，并有50%概率附加2回合[color=#e5621b]速度下降[/color]状态。" "text": "巫嘎对敌方1个目标发起攻击，可造成攻击力60%的伤害，并有50%概率附加2回合[color=#e5621b]速度下降[/color]状态。"
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""
@ -26963,5 +26962,237 @@
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""
},
{
"id": 151050111,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151050111",
"text": "缠丝茧"
},
"ico": "jn_51050_1",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251050111
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151050111_1",
"text": "对敌方1个目标发起攻击，造成攻击力200%的伤害"
},
"buffid": [],
"map": ""
},
{
"id": 151050211,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151050211",
"text": "致命蛛网"
},
"ico": "jn_51050_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251050211
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151050211_1",
"text": "对敌方全体发起攻击造成攻击力250%的伤害，并施加2回合[color=#e5621b]中毒[/color] 状态"
},
"buffid": [],
"map": ""
},
{
"id": 151051111,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151051111",
"text": "轰天炮"
},
"ico": "jn_51051_1",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251051111
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151051111_1",
"text": "对敌方1个目标发起攻击，造成攻击力200%的伤害"
},
"buffid": [],
"map": ""
},
{
"id": 151051211,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151051211",
"text": "绚烂花火"
},
"ico": "jn_51051_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 0,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251051211
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151051211_1",
"text": "自身死亡时对敌方全体造成攻击力100%的无视防御伤害。"
},
"buffid": [],
"map": ""
},
{
"id": 151052111,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151052111",
"text": "盘丝茧"
},
"ico": "jn_51052_1",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251052111
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151052111_1",
"text": "对敌方1个目标发起攻击，造成攻击力200%的伤害"
},
"buffid": [],
"map": ""
},
{
"id": 151052211,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151052211",
"text": "丧魂蛛网"
},
"ico": "jn_51052_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251052211
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151052211_1",
"text": "对敌方全体发起攻击，造成攻击力250%的伤害，并附加2回合[color=#e5621b]攻击下降[/color] 状态。"
},
"buffid": [],
"map": ""
},
{
"id": 151053111,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151053111",
"text": "浓郁黄油"
},
"ico": "jn_51053_1",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251053111
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151053111_1",
"text": "对敌方1个目标发起攻击，造成攻击力200%的伤害"
},
"buffid": [],
"map": ""
},
{
"id": 151053211,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_151053211",
"text": "美味呼吸"
},
"ico": "jn_51053_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
251053211
]
},
"Desc": {
"key": "skill_skill_atk_Desc_151053211_1",
"text": "对敌方全体发起攻击，造成攻击力250%的伤害，有15%概率附加2回合[color=#e5621b]无法获得增益[/color] 的状态"
},
"buffid": [],
"map": ""
} }
] ]

2
bin/json/game_skillbuff.json
View File

@ -3338,7 +3338,7 @@
"Id": 390001426, "Id": 390001426,
"Name": { "Name": {
"key": "skill_skill_buff_Name_390001426", "key": "skill_skill_buff_Name_390001426",
"text": "[color=#37d8a9][荷鲁斯之眼][/color] " "text": "[color=#37d8a9]仇视[/color] "
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001426", "key": "skill_skill_buff_Desc_390001426",

28
bin/json/game_skillpassive.json
View File

@ -56,20 +56,22 @@
}, },
{ {
"Id": 435002211, "Id": 435002211,
"When": 3, "When": 18,
"FromCheck": "Target=2", "FromCheck": "Target=2",
"TargetCheck": "Target=2", "TargetCheck": "Target=2",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "Effect=1",
"AddCon": [], "AddCon": [],
"PasPr": 1000, "PasPr": 1000,
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0, "MaxEmitTimesInRoundByRole": 1,
"MaxEmitTimes": 0, "MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1, "MaxEmitTimesInRound": 1,
"Callback": [ "Callback": [
235002213 235002213,
235002214,
235002215
] ]
}, },
{ {
@ -3087,5 +3089,23 @@
4, 4,
255007314 255007314
] ]
},
{
"Id": 451051211,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251051212
]
} }
] ]

148
bin/json/game_worldtask.json
View File

@ -25,6 +25,7 @@
12070010 12070010
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 1, "auto_accept": 1,
"reword": [ "reword": [
{ {
@ -61,6 +62,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -97,6 +99,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -138,6 +141,7 @@
12070020 12070020
], ],
"deliver_npc": 10028, "deliver_npc": 10028,
"taskend_removeitem": [],
"auto_accept": 1, "auto_accept": 1,
"reword": [ "reword": [
{ {
@ -174,6 +178,7 @@
12070030 12070030
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -210,6 +215,7 @@
12070040 12070040
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 1, "auto_accept": 1,
"reword": [ "reword": [
{ {
@ -251,6 +257,7 @@
12070050 12070050
], ],
"deliver_npc": 10058, "deliver_npc": 10058,
"taskend_removeitem": [],
"auto_accept": 1, "auto_accept": 1,
"reword": [ "reword": [
{ {
@ -292,6 +299,7 @@
12070060 12070060
], ],
"deliver_npc": 10068, "deliver_npc": 10068,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -328,6 +336,7 @@
12070070 12070070
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -366,6 +375,7 @@
12070100 12070100
], ],
"deliver_npc": 10088, "deliver_npc": 10088,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -402,6 +412,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -443,6 +454,7 @@
12070120 12070120
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -504,6 +516,7 @@
12070130 12070130
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -540,6 +553,7 @@
12070140 12070140
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -576,6 +590,7 @@
12070150 12070150
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -612,6 +627,7 @@
12070160 12070160
], ],
"deliver_npc": 10148, "deliver_npc": 10148,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -673,6 +689,7 @@
12070170 12070170
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -709,6 +726,7 @@
12070180 12070180
], ],
"deliver_npc": 10168, "deliver_npc": 10168,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -745,6 +763,7 @@
12070190 12070190
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -786,6 +805,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -827,6 +847,7 @@
12070210 12070210
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -863,6 +884,7 @@
12070220 12070220
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -899,6 +921,7 @@
12070230 12070230
], ],
"deliver_npc": 10218, "deliver_npc": 10218,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -935,6 +958,7 @@
12070240 12070240
], ],
"deliver_npc": 10228, "deliver_npc": 10228,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -971,6 +995,7 @@
12070250 12070250
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1012,6 +1037,7 @@
12070260 12070260
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1048,6 +1074,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1109,6 +1136,7 @@
12070280 12070280
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1145,6 +1173,7 @@
12070290 12070290
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1181,6 +1210,7 @@
12070300 12070300
], ],
"deliver_npc": 10288, "deliver_npc": 10288,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1224,6 +1254,7 @@
12070312 12070312
], ],
"deliver_npc": 10298, "deliver_npc": 10298,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1260,6 +1291,7 @@
12070320 12070320
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1301,6 +1333,7 @@
12070330 12070330
], ],
"deliver_npc": 10318, "deliver_npc": 10318,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1337,6 +1370,7 @@
12070340 12070340
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1373,6 +1407,7 @@
12070350 12070350
], ],
"deliver_npc": 10338, "deliver_npc": 10338,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1409,6 +1444,7 @@
12070360 12070360
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1456,6 +1492,7 @@
12070371 12070371
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1492,6 +1529,7 @@
12070380 12070380
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1533,6 +1571,7 @@
12070390 12070390
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1574,6 +1613,7 @@
12070400 12070400
], ],
"deliver_npc": 10388, "deliver_npc": 10388,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1610,6 +1650,7 @@
12070410 12070410
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1646,6 +1687,7 @@
12070420 12070420
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1682,6 +1724,7 @@
12070430 12070430
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1718,6 +1761,7 @@
12070440 12070440
], ],
"deliver_npc": 10428, "deliver_npc": 10428,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1754,6 +1798,7 @@
12070450 12070450
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1795,6 +1840,7 @@
12070460 12070460
], ],
"deliver_npc": 10448, "deliver_npc": 10448,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1831,6 +1877,7 @@
12070470 12070470
], ],
"deliver_npc": 10458, "deliver_npc": 10458,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1867,6 +1914,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1903,6 +1951,7 @@
12070490 12070490
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 1, "auto_accept": 1,
"reword": [ "reword": [
{ {
@ -1939,6 +1988,7 @@
12070500 12070500
], ],
"deliver_npc": 10488, "deliver_npc": 10488,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -1975,6 +2025,7 @@
12070510 12070510
], ],
"deliver_npc": 10498, "deliver_npc": 10498,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2011,6 +2062,7 @@
12070520 12070520
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2052,6 +2104,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2088,6 +2141,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2124,6 +2178,7 @@
12070550 12070550
], ],
"deliver_npc": 10538, "deliver_npc": 10538,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2165,6 +2220,7 @@
12070560 12070560
], ],
"deliver_npc": 10548, "deliver_npc": 10548,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2201,6 +2257,7 @@
12070570 12070570
], ],
"deliver_npc": 10558, "deliver_npc": 10558,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2237,6 +2294,7 @@
12070580 12070580
], ],
"deliver_npc": 10568, "deliver_npc": 10568,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2273,6 +2331,7 @@
12070590 12070590
], ],
"deliver_npc": 10578, "deliver_npc": 10578,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2309,6 +2368,7 @@
12070600 12070600
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2345,6 +2405,7 @@
12070610 12070610
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2381,6 +2442,7 @@
12070620 12070620
], ],
"deliver_npc": 10608, "deliver_npc": 10608,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2417,6 +2479,7 @@
12070630 12070630
], ],
"deliver_npc": 10618, "deliver_npc": 10618,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2453,6 +2516,7 @@
0 0
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2489,6 +2553,7 @@
12070650 12070650
], ],
"deliver_npc": 10638, "deliver_npc": 10638,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2530,6 +2595,7 @@
12070660 12070660
], ],
"deliver_npc": 10648, "deliver_npc": 10648,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2566,6 +2632,7 @@
12070670 12070670
], ],
"deliver_npc": 10658, "deliver_npc": 10658,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2602,6 +2669,7 @@
12070680 12070680
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2638,6 +2706,7 @@
12070690 12070690
], ],
"deliver_npc": 10678, "deliver_npc": 10678,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2679,6 +2748,7 @@
12070700 12070700
], ],
"deliver_npc": 10688, "deliver_npc": 10688,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2720,6 +2790,7 @@
12070710 12070710
], ],
"deliver_npc": 10698, "deliver_npc": 10698,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2756,6 +2827,7 @@
12070720 12070720
], ],
"deliver_npc": 10708, "deliver_npc": 10708,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2792,6 +2864,7 @@
12070730 12070730
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2828,6 +2901,7 @@
12070740 12070740
], ],
"deliver_npc": 10728, "deliver_npc": 10728,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2864,6 +2938,7 @@
12070750 12070750
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2900,6 +2975,7 @@
12070760 12070760
], ],
"deliver_npc": 10748, "deliver_npc": 10748,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2936,6 +3012,7 @@
12070770 12070770
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -2972,6 +3049,7 @@
12070780 12070780
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3008,6 +3086,7 @@
12070790 12070790
], ],
"deliver_npc": 10778, "deliver_npc": 10778,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3049,6 +3128,7 @@
12070800 12070800
], ],
"deliver_npc": 10788, "deliver_npc": 10788,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3085,6 +3165,7 @@
12070810 12070810
], ],
"deliver_npc": 10798, "deliver_npc": 10798,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3121,6 +3202,7 @@
12070820 12070820
], ],
"deliver_npc": 10808, "deliver_npc": 10808,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3157,6 +3239,7 @@
12070830 12070830
], ],
"deliver_npc": 0, "deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3193,6 +3276,7 @@
12070840 12070840
], ],
"deliver_npc": 10828, "deliver_npc": 10828,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3234,6 +3318,7 @@
12070850 12070850
], ],
"deliver_npc": 10838, "deliver_npc": 10838,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3270,6 +3355,7 @@
12070860 12070860
], ],
"deliver_npc": 10848, "deliver_npc": 10848,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3311,6 +3397,7 @@
12070870 12070870
], ],
"deliver_npc": 10858, "deliver_npc": 10858,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3352,6 +3439,7 @@
12070880 12070880
], ],
"deliver_npc": 10868, "deliver_npc": 10868,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3388,6 +3476,7 @@
12070890 12070890
], ],
"deliver_npc": 10878, "deliver_npc": 10878,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3424,6 +3513,7 @@
12070900 12070900
], ],
"deliver_npc": 10888, "deliver_npc": 10888,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3465,6 +3555,7 @@
12070910 12070910
], ],
"deliver_npc": 10898, "deliver_npc": 10898,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3501,6 +3592,7 @@
12070920 12070920
], ],
"deliver_npc": 10908, "deliver_npc": 10908,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3537,6 +3629,7 @@
12070930 12070930
], ],
"deliver_npc": 10918, "deliver_npc": 10918,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3573,6 +3666,7 @@
12070940 12070940
], ],
"deliver_npc": 10928, "deliver_npc": 10928,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3609,6 +3703,7 @@
12070950 12070950
], ],
"deliver_npc": 10938, "deliver_npc": 10938,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3645,6 +3740,7 @@
12070960 12070960
], ],
"deliver_npc": 10948, "deliver_npc": 10948,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3681,6 +3777,7 @@
12070970 12070970
], ],
"deliver_npc": 10958, "deliver_npc": 10958,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3722,6 +3819,7 @@
12070980 12070980
], ],
"deliver_npc": 10968, "deliver_npc": 10968,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3758,6 +3856,7 @@
12070990 12070990
], ],
"deliver_npc": 10978, "deliver_npc": 10978,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3794,6 +3893,7 @@
12071000 12071000
], ],
"deliver_npc": 10988, "deliver_npc": 10988,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3830,6 +3930,7 @@
12071010 12071010
], ],
"deliver_npc": 10998, "deliver_npc": 10998,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3866,6 +3967,7 @@
12071020 12071020
], ],
"deliver_npc": 11008, "deliver_npc": 11008,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3902,6 +4004,7 @@
12071030 12071030
], ],
"deliver_npc": 11018, "deliver_npc": 11018,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3938,6 +4041,7 @@
12071040 12071040
], ],
"deliver_npc": 11028, "deliver_npc": 11028,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -3974,6 +4078,7 @@
12071050 12071050
], ],
"deliver_npc": 11038, "deliver_npc": 11038,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4010,6 +4115,7 @@
12071060 12071060
], ],
"deliver_npc": 11048, "deliver_npc": 11048,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4046,6 +4152,7 @@
12071070 12071070
], ],
"deliver_npc": 11058, "deliver_npc": 11058,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4082,6 +4189,7 @@
12071080 12071080
], ],
"deliver_npc": 11068, "deliver_npc": 11068,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4118,6 +4226,7 @@
12071090 12071090
], ],
"deliver_npc": 11078, "deliver_npc": 11078,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4154,6 +4263,7 @@
12071100 12071100
], ],
"deliver_npc": 11088, "deliver_npc": 11088,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4190,6 +4300,7 @@
12071110 12071110
], ],
"deliver_npc": 11098, "deliver_npc": 11098,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4226,6 +4337,7 @@
12071120 12071120
], ],
"deliver_npc": 11108, "deliver_npc": 11108,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4262,6 +4374,7 @@
12071130 12071130
], ],
"deliver_npc": 11118, "deliver_npc": 11118,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4298,6 +4411,7 @@
12071140 12071140
], ],
"deliver_npc": 11128, "deliver_npc": 11128,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4334,6 +4448,7 @@
12071150 12071150
], ],
"deliver_npc": 11138, "deliver_npc": 11138,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4370,6 +4485,7 @@
12071160 12071160
], ],
"deliver_npc": 11148, "deliver_npc": 11148,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4406,6 +4522,7 @@
12071170 12071170
], ],
"deliver_npc": 11158, "deliver_npc": 11158,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4442,6 +4559,7 @@
12071180 12071180
], ],
"deliver_npc": 11168, "deliver_npc": 11168,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4478,6 +4596,7 @@
12071190 12071190
], ],
"deliver_npc": 11178, "deliver_npc": 11178,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4514,6 +4633,7 @@
12071200 12071200
], ],
"deliver_npc": 11188, "deliver_npc": 11188,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4550,6 +4670,7 @@
12071210 12071210
], ],
"deliver_npc": 11198, "deliver_npc": 11198,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4586,6 +4707,7 @@
15000001 15000001
], ],
"deliver_npc": 50018, "deliver_npc": 50018,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4594,7 +4716,9 @@
"n": 8200 "n": 8200
} }
], ],
"module": [] "module": [
"caravan"
]
}, },
{ {
"key": 500020, "key": 500020,
@ -4622,6 +4746,7 @@
15000002 15000002
], ],
"deliver_npc": 50028, "deliver_npc": 50028,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4630,14 +4755,16 @@
"n": 8200 "n": 8200
} }
], ],
"module": [] "module": [
"caravan"
]
}, },
{ {
"key": 500030, "key": 500030,
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 500020, "ontxe": 500020,
"id_after": 500040, "id_after": 0,
"group": 500, "group": 500,
"des": 5, "des": 5,
"icon": "", "icon": "",
@ -4658,6 +4785,7 @@
15000003 15000003
], ],
"deliver_npc": 50038, "deliver_npc": 50038,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4666,7 +4794,9 @@
"n": 8200 "n": 8200
} }
], ],
"module": [] "module": [
"caravan"
]
}, },
{ {
"key": 500040, "key": 500040,
@ -4694,6 +4824,7 @@
15000004 15000004
], ],
"deliver_npc": 50048, "deliver_npc": 50048,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4702,7 +4833,9 @@
"n": 8200 "n": 8200
} }
], ],
"module": [] "module": [
"caravan"
]
}, },
{ {
"key": 500050, "key": 500050,
@ -4730,6 +4863,7 @@
15000005 15000005
], ],
"deliver_npc": 50058, "deliver_npc": 50058,
"taskend_removeitem": [],
"auto_accept": 0, "auto_accept": 0,
"reword": [ "reword": [
{ {
@ -4738,6 +4872,8 @@
"n": 8200 "n": 8200
} }
], ],
"module": [] "module": [
"caravan"
]
} }
] ]

6
modules/caravan/api_buyorsell.go
View File

@ -178,8 +178,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
caravan.Items[k].Price = totla / caravan.Items[k].Count caravan.Items[k].Price = totla / caravan.Items[k].Count
// 同步更新该城市的 出售货物信息 // 同步更新该城市的 出售货物信息
cityInfo.Count[k] += v cityInfo.Count[k] += v
if itemConf, err := this.configure.GetCaravanGoods(k); err == nil { // 更新商店库存 itemConf, err := this.module.configure.GetItemConfigureData(k)
if cityInfo.Count[k] > itemConf.Goodsnum { if err == nil {
//if itemConf, err := this.configure.GetCaravanGoods(k); err == nil { // 更新商店库存
if cityInfo.Count[k] > itemConf.UpperLimit {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_TrollBuyMax, // 商品数量不足 Code: pb.ErrorCode_TrollBuyMax, // 商品数量不足
Title: pb.ErrorCode_TrollBuyMax.ToString(), Title: pb.ErrorCode_TrollBuyMax.ToString(),

6
modules/caravan/api_getstory.go
View File

@ -21,7 +21,6 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
var ( var (
resp *pb.CaravanGetStoryResp resp *pb.CaravanGetStoryResp
update map[string]interface{} update map[string]interface{}
bAccept bool
) )
resp = &pb.CaravanGetStoryResp{} resp = &pb.CaravanGetStoryResp{}
update = make(map[string]interface{}) update = make(map[string]interface{})
@ -53,14 +52,14 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
} }
list.Taskid = resp.Task.TaskId list.Taskid = resp.Task.TaskId
if list.Taskid != 0 { // 任务接取成功 if list.Taskid != 0 { // 任务接取成功
bAccept = true resp.BSuccess = true
list.Tasktime = configure.Now().Unix() list.Tasktime = configure.Now().Unix()
update["taskid"] = list.Taskid update["taskid"] = list.Taskid
update["tasktime"] = list.Tasktime update["tasktime"] = list.Tasktime
} }
} }
} }
if !bAccept { // 拒绝剧情 重置 if !resp.BSuccess { // 拒绝剧情 重置
list.Eventid = 0 list.Eventid = 0
list.Taskid = 0 list.Taskid = 0
list.Tasktime = 0 list.Tasktime = 0
@ -70,7 +69,6 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
} }
this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update)
resp.Data = list resp.Data = list
session.SendMsg(string(this.module.GetType()), "getstory", resp) session.SendMsg(string(this.module.GetType()), "getstory", resp)
return return

2
modules/caravan/comp_configure.go
View File

@ -92,7 +92,7 @@ func (this *configureComp) GetCaravanLv(lv int32) (data *cfg.GameCaravanLvData,
return return
} }
func (this *configureComp) GetCaravanGoods(itemId int32) (data *cfg.GameCaravanThingData, err error) { func (this *configureComp) GetCaravanGoods(itemId string) (data *cfg.GameCaravanThingData, err error) {
var ( var (
v interface{} v interface{}
) )

6
modules/caravan/model_caravan.go
View File

@ -37,10 +37,10 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
Id: "", Id: "",
Uid: uid, Uid: uid,
UseCount: 0, UseCount: 0,
Items: map[int32]*pb.BagInfo{}, Items: map[string]*pb.BagInfo{},
Goods: map[int32]*pb.Goods{}, Goods: map[string]*pb.Goods{},
City: map[int32]*pb.CityInfo{}, City: map[int32]*pb.CityInfo{},
Oldprice: map[int32]int32{}, Oldprice: map[string]int32{},
} }
if err = this.Get(uid, result); err != nil && mgo.MongodbNil == err { if err = this.Get(uid, result); err != nil && mgo.MongodbNil == err {
// 创建一条数据 // 创建一条数据

19
modules/caravan/module.go
View File

@ -79,8 +79,8 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) {
data.City = make(map[int32]*pb.CityInfo, 0) data.City = make(map[int32]*pb.CityInfo, 0)
for _, v := range list { for _, v := range list {
city := &pb.CityInfo{ city := &pb.CityInfo{
Special: []int32{}, // 城市卖给玩家的商品 (注意 这里有库存 必须初始化 Count 字段数据) Special: []string{}, // 城市卖给玩家的商品 (注意 这里有库存 必须初始化 Count 字段数据)
Count: map[int32]int32{}, // key 货物ID Count: map[string]int32{}, // key 货物ID
} }
if len(v.Special) > int(v.Citytypenum) { if len(v.Special) > int(v.Citytypenum) {
@ -92,7 +92,6 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) {
} else { } else {
city.Special = append(city.Special, v.Special...) city.Special = append(city.Special, v.Special...)
} }
data.City[v.Id] = city data.City[v.Id] = city
} }
} }
@ -100,7 +99,7 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) {
// 初始化货物信息 // 初始化货物信息
func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) { func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) {
items := this.configure.GetAllCaravanItem() items := this.configure.GetAllCaravanItem()
data.Goods = make(map[int32]*pb.Goods, 0) data.Goods = make(map[string]*pb.Goods, 0)
for _, v := range items { for _, v := range items {
goods := &pb.Goods{ goods := &pb.Goods{
Period: 0, // 变动周期 Period: 0, // 变动周期
@ -110,9 +109,9 @@ func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) {
if len(v.Changeperiod) == 2 { if len(v.Changeperiod) == 2 {
goods.Period = comm.GetRandNum(v.Changeperiod[0], v.Changeperiod[1]) goods.Period = comm.GetRandNum(v.Changeperiod[0], v.Changeperiod[1])
goods.Price = v.Goodsprice goods.Price = v.Goodsprice
data.Goods[v.Id] = goods data.Goods[v.Itemid] = goods
} }
data.Oldprice[v.Id] = v.Goodsprice data.Oldprice[v.Itemid] = v.Goodsprice
} }
} }
@ -141,8 +140,8 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
bChange = true bChange = true
for k, v := range caravan.City { for k, v := range caravan.City {
if c, _ := this.configure.GetCaravanCity(k); c != nil { if c, _ := this.configure.GetCaravanCity(k); c != nil {
v.Count = make(map[int32]int32) // 初始化城市信息 v.Count = make(map[string]int32) // 初始化城市信息
v.Special = []int32{} v.Special = []string{}
if len(c.Special) > int(c.Citytypenum) { if len(c.Special) > int(c.Citytypenum) {
ids := utils.RandomNumbers(0, len(c.Special), int(c.Citytypenum)) ids := utils.RandomNumbers(0, len(c.Special), int(c.Citytypenum))
for _, id := range ids { for _, id := range ids {
@ -352,8 +351,8 @@ func (this *Caravan) TestFunc(session comm.IUserSession) {
this.modelCaravan.module.api.GetList(session, &pb.CaravanGetListReq{}) this.modelCaravan.module.api.GetList(session, &pb.CaravanGetListReq{})
this.modelCaravan.module.api.BuyOrSell(session, &pb.CaravanBuyOrSellReq{ this.modelCaravan.module.api.BuyOrSell(session, &pb.CaravanBuyOrSellReq{
City: 105, City: 105,
Items: map[int32]int32{ Items: map[string]int32{
6: 80, //6: 80,
}, },
IsBuy: true, IsBuy: true,
}) })

15
modules/dispatch/model_dispatch.go
View File

@ -7,7 +7,6 @@ import (
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
"go_dreamfactory/utils"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx" "go.mongodb.org/mongo-driver/x/bsonx"
@ -63,7 +62,9 @@ func (this *modelDispatch) getTasksWeight(dispatch *pb.DBDispatch) int32 {
confList, err := this.module.configure.getDispatchTaskConfByType(int32(i + 1)) confList, err := this.module.configure.getDispatchTaskConfByType(int32(i + 1))
var tIds []int32 var tIds []int32
var weights []int32
for _, v := range confList { for _, v := range confList {
weights = append(weights, v.Weight)
if v.Completecount == 0 { if v.Completecount == 0 {
tIds = append(tIds, v.Id) tIds = append(tIds, v.Id)
} else if v.Completecount > 0 { } else if v.Completecount > 0 {
@ -76,11 +77,13 @@ func (this *modelDispatch) getTasksWeight(dispatch *pb.DBDispatch) int32 {
} }
} }
} }
idex := utils.RandomNumbers(0, len(tIds), 1)
if len(idex) == 0 { idex := comm.GetRandW(weights)
return 0 // idex := utils.RandomNumbers(0, len(tIds), 1)
} // if len(idex) == 0 {
return tIds[idex[0]] // return 0
// }
return tIds[idex]
} }
// 随机任务 // 随机任务

30
pb/caravan_db.pb.go
View File

@ -88,8 +88,8 @@ type CityInfo struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Special []int32 `protobuf:"varint,1,rep,packed,name=special,proto3" json:"special"` // 城市卖给玩家的商品 Special []string `protobuf:"bytes,1,rep,name=special,proto3" json:"special"` // 城市卖给玩家的商品
Count map[int32]int32 `protobuf:"bytes,2,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 货物对应的数量 Count map[string]int32 `protobuf:"bytes,2,rep,name=count,proto3" json:"count" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 货物对应的数量
} }
func (x *CityInfo) Reset() { func (x *CityInfo) Reset() {
@ -124,14 +124,14 @@ func (*CityInfo) Descriptor() ([]byte, []int) {
return file_caravan_caravan_db_proto_rawDescGZIP(), []int{1} return file_caravan_caravan_db_proto_rawDescGZIP(), []int{1}
} }
func (x *CityInfo) GetSpecial() []int32 { func (x *CityInfo) GetSpecial() []string {
if x != nil { if x != nil {
return x.Special return x.Special
} }
return nil return nil
} }
func (x *CityInfo) GetCount() map[int32]int32 { func (x *CityInfo) GetCount() map[string]int32 {
if x != nil { if x != nil {
return x.Count return x.Count
} }
@ -201,8 +201,8 @@ type DBCaravan struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
UseCount int32 `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount" bson:"useCount"` //当前背包使用的数量 UseCount int32 `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount" bson:"useCount"` //当前背包使用的数量
Items map[int32]*BagInfo `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 背包数据 Items map[string]*BagInfo `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 背包数据
Goods map[int32]*Goods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID Goods map[string]*Goods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID
City map[int32]*CityInfo `protobuf:"bytes,6,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息 City map[int32]*CityInfo `protobuf:"bytes,6,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息
Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 商队等级 Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 商队等级
Profit int64 `protobuf:"varint,8,opt,name=profit,proto3" json:"profit"` // 虚拟货利润 Profit int64 `protobuf:"varint,8,opt,name=profit,proto3" json:"profit"` // 虚拟货利润
@ -213,7 +213,7 @@ type DBCaravan struct {
Tasktime int64 `protobuf:"varint,13,opt,name=tasktime,proto3" json:"tasktime"` // 任务触发时间 Tasktime int64 `protobuf:"varint,13,opt,name=tasktime,proto3" json:"tasktime"` // 任务触发时间
Baglimit int32 `protobuf:"varint,14,opt,name=baglimit,proto3" json:"baglimit"` // 背包上限 Baglimit int32 `protobuf:"varint,14,opt,name=baglimit,proto3" json:"baglimit"` // 背包上限
Citystime int64 `protobuf:"varint,15,opt,name=citystime,proto3" json:"citystime"` // 城市刷新时间 玩家身上的货物同时刷新 Citystime int64 `protobuf:"varint,15,opt,name=citystime,proto3" json:"citystime"` // 城市刷新时间 玩家身上的货物同时刷新
Oldprice map[int32]int32 `protobuf:"bytes,16,rep,name=oldprice,proto3" json:"oldprice" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 上一次价格 key 货物ID Oldprice map[string]int32 `protobuf:"bytes,16,rep,name=oldprice,proto3" json:"oldprice" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 上一次价格 key 货物ID
} }
func (x *DBCaravan) Reset() { func (x *DBCaravan) Reset() {
@ -269,14 +269,14 @@ func (x *DBCaravan) GetUseCount() int32 {
return 0 return 0
} }
func (x *DBCaravan) GetItems() map[int32]*BagInfo { func (x *DBCaravan) GetItems() map[string]*BagInfo {
if x != nil { if x != nil {
return x.Items return x.Items
} }
return nil return nil
} }
func (x *DBCaravan) GetGoods() map[int32]*Goods { func (x *DBCaravan) GetGoods() map[string]*Goods {
if x != nil { if x != nil {
return x.Goods return x.Goods
} }
@ -353,7 +353,7 @@ func (x *DBCaravan) GetCitystime() int64 {
return 0 return 0
} }
func (x *DBCaravan) GetOldprice() map[int32]int32 { func (x *DBCaravan) GetOldprice() map[string]int32 {
if x != nil { if x != nil {
return x.Oldprice return x.Oldprice
} }
@ -466,12 +466,12 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{
0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69,
0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22,
0x8a, 0x01, 0x0a, 0x08, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x8a, 0x01, 0x0a, 0x08, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07,
0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x73, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73,
0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x12, 0x2a, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x12, 0x2a, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f,
0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x63, 0x6f, 0x75,
0x6e, 0x74, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x6e, 0x74, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x35, 0x0a, 0x07, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x35, 0x0a, 0x07,
0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
@ -509,11 +509,11 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{
0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69,
0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63,
0x65, 0x1a, 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x65, 0x1a, 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x08, 0x2e, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x32, 0x08, 0x2e, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45,
@ -522,7 +522,7 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f,
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f,
0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72,
0x61, 0x76, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x76, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03,

18
pb/caravan_msg.pb.go
View File

@ -121,7 +121,7 @@ type CaravanBuyOrSellReq struct {
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
City int32 `protobuf:"varint,1,opt,name=city,proto3" json:"city"` // 城市id City int32 `protobuf:"varint,1,opt,name=city,proto3" json:"city"` // 城市id
Items map[int32]int32 `protobuf:"bytes,2,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` Items map[string]int32 `protobuf:"bytes,2,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
IsBuy bool `protobuf:"varint,3,opt,name=isBuy,proto3" json:"isBuy"` // true 为买入 false 为卖出 IsBuy bool `protobuf:"varint,3,opt,name=isBuy,proto3" json:"isBuy"` // true 为买入 false 为卖出
} }
@ -164,7 +164,7 @@ func (x *CaravanBuyOrSellReq) GetCity() int32 {
return 0 return 0
} }
func (x *CaravanBuyOrSellReq) GetItems() map[int32]int32 { func (x *CaravanBuyOrSellReq) GetItems() map[string]int32 {
if x != nil { if x != nil {
return x.Items return x.Items
} }
@ -656,9 +656,9 @@ type CaravanRefreshCityResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Goods map[int32]*Goods `protobuf:"bytes,1,rep,name=goods,proto3" json:"goods" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID Goods map[string]*Goods `protobuf:"bytes,1,rep,name=goods,proto3" json:"goods" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID
City map[int32]*CityInfo `protobuf:"bytes,2,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息 City map[int32]*CityInfo `protobuf:"bytes,2,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息
Oldprice map[int32]int32 `protobuf:"bytes,3,rep,name=Oldprice,proto3" json:"Oldprice" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` Oldprice map[string]int32 `protobuf:"bytes,3,rep,name=Oldprice,proto3" json:"Oldprice" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
Resettime int64 `protobuf:"varint,4,opt,name=resettime,proto3" json:"resettime"` // 赛季结算时间 Resettime int64 `protobuf:"varint,4,opt,name=resettime,proto3" json:"resettime"` // 赛季结算时间
} }
@ -694,7 +694,7 @@ func (*CaravanRefreshCityResp) Descriptor() ([]byte, []int) {
return file_caravan_caravan_msg_proto_rawDescGZIP(), []int{12} return file_caravan_caravan_msg_proto_rawDescGZIP(), []int{12}
} }
func (x *CaravanRefreshCityResp) GetGoods() map[int32]*Goods { func (x *CaravanRefreshCityResp) GetGoods() map[string]*Goods {
if x != nil { if x != nil {
return x.Goods return x.Goods
} }
@ -708,7 +708,7 @@ func (x *CaravanRefreshCityResp) GetCity() map[int32]*CityInfo {
return nil return nil
} }
func (x *CaravanRefreshCityResp) GetOldprice() map[int32]int32 { func (x *CaravanRefreshCityResp) GetOldprice() map[string]int32 {
if x != nil { if x != nil {
return x.Oldprice return x.Oldprice
} }
@ -746,7 +746,7 @@ var file_caravan_caravan_msg_proto_rawDesc = []byte{
0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12,
0x14, 0x0a, 0x05, 0x69, 0x73, 0x42, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x42, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
0x69, 0x73, 0x42, 0x75, 0x79, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x69, 0x73, 0x42, 0x75, 0x79, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
0x36, 0x0a, 0x14, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x42, 0x75, 0x79, 0x4f, 0x72, 0x53, 0x36, 0x0a, 0x14, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x42, 0x75, 0x79, 0x4f, 0x72, 0x53,
@ -807,7 +807,7 @@ var file_caravan_caravan_msg_proto_rawDesc = []byte{
0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x72, 0x65, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x72, 0x65, 0x73,
0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
@ -815,7 +815,7 @@ var file_caravan_caravan_msg_proto_rawDesc = []byte{
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66,
0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d,
0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,

16
sys/configure/structs/Game.CaravanCityData.go
View File

@ -23,9 +23,9 @@ type GameCaravanCityData struct {
Citytxt string Citytxt string
Citytype int32 Citytype int32
Citytypenum int32 Citytypenum int32
Special []int32 Special []string
Specialnum int32 Specialnum int32
Exspecial []int32 Exspecial []string
Exspecialnum int32 Exspecialnum int32
Orspecial int32 Orspecial int32
Checktime int32 Checktime int32
@ -100,11 +100,11 @@ func (_v *GameCaravanCityData)Deserialize(_buf map[string]interface{}) (err erro
var _ok_ bool var _ok_ bool
if _arr_, _ok_ = _buf["special"].([]interface{}); !_ok_ { err = errors.New("special error"); return } if _arr_, _ok_ = _buf["special"].([]interface{}); !_ok_ { err = errors.New("special error"); return }
_v.Special = make([]int32, 0, len(_arr_)) _v.Special = make([]string, 0, len(_arr_))
for _, _e_ := range _arr_ { for _, _e_ := range _arr_ {
var _list_v_ int32 var _list_v_ string
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.Special = append(_v.Special, _list_v_) _v.Special = append(_v.Special, _list_v_)
} }
} }
@ -115,11 +115,11 @@ func (_v *GameCaravanCityData)Deserialize(_buf map[string]interface{}) (err erro
var _ok_ bool var _ok_ bool
if _arr_, _ok_ = _buf["exspecial"].([]interface{}); !_ok_ { err = errors.New("exspecial error"); return } if _arr_, _ok_ = _buf["exspecial"].([]interface{}); !_ok_ { err = errors.New("exspecial error"); return }
_v.Exspecial = make([]int32, 0, len(_arr_)) _v.Exspecial = make([]string, 0, len(_arr_))
for _, _e_ := range _arr_ { for _, _e_ := range _arr_ {
var _list_v_ int32 var _list_v_ string
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.Exspecial = append(_v.Exspecial, _list_v_) _v.Exspecial = append(_v.Exspecial, _list_v_)
} }
} }

4
sys/configure/structs/Game.CaravanEventData.go
View File

@ -12,6 +12,8 @@ import "errors"
type GameCaravanEventData struct { type GameCaravanEventData struct {
Id int32 Id int32
Eventgroup int32
Eventweight int32
Eventtype int32 Eventtype int32
Mustdo int32 Mustdo int32
Citystory int32 Citystory int32
@ -36,6 +38,8 @@ func (*GameCaravanEventData) GetTypeId() int32 {
func (_v *GameCaravanEventData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameCaravanEventData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventgroup"].(float64); !_ok_ { err = errors.New("eventgroup error"); return }; _v.Eventgroup = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventweight"].(float64); !_ok_ { err = errors.New("eventweight error"); return }; _v.Eventweight = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtype"].(float64); !_ok_ { err = errors.New("eventtype error"); return }; _v.Eventtype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtype"].(float64); !_ok_ { err = errors.New("eventtype error"); return }; _v.Eventtype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mustdo"].(float64); !_ok_ { err = errors.New("mustdo error"); return }; _v.Mustdo = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mustdo"].(float64); !_ok_ { err = errors.New("mustdo error"); return }; _v.Mustdo = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citystory"].(float64); !_ok_ { err = errors.New("citystory error"); return }; _v.Citystory = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citystory"].(float64); !_ok_ { err = errors.New("citystory error"); return }; _v.Citystory = int32(_tempNum_) }

10
sys/configure/structs/Game.CaravanThing.go
View File

@ -9,25 +9,25 @@
package cfg package cfg
type GameCaravanThing struct { type GameCaravanThing struct {
_dataMap map[int32]*GameCaravanThingData _dataMap map[string]*GameCaravanThingData
_dataList []*GameCaravanThingData _dataList []*GameCaravanThingData
} }
func NewGameCaravanThing(_buf []map[string]interface{}) (*GameCaravanThing, error) { func NewGameCaravanThing(_buf []map[string]interface{}) (*GameCaravanThing, error) {
_dataList := make([]*GameCaravanThingData, 0, len(_buf)) _dataList := make([]*GameCaravanThingData, 0, len(_buf))
dataMap := make(map[int32]*GameCaravanThingData) dataMap := make(map[string]*GameCaravanThingData)
for _, _ele_ := range _buf { for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameCaravanThingData(_ele_); err2 != nil { if _v, err2 := DeserializeGameCaravanThingData(_ele_); err2 != nil {
return nil, err2 return nil, err2
} else { } else {
_dataList = append(_dataList, _v) _dataList = append(_dataList, _v)
dataMap[_v.Id] = _v dataMap[_v.Itemid] = _v
} }
} }
return &GameCaravanThing{_dataList:_dataList, _dataMap:dataMap}, nil return &GameCaravanThing{_dataList:_dataList, _dataMap:dataMap}, nil
} }
func (table *GameCaravanThing) GetDataMap() map[int32]*GameCaravanThingData { func (table *GameCaravanThing) GetDataMap() map[string]*GameCaravanThingData {
return table._dataMap return table._dataMap
} }
@ -35,7 +35,7 @@ func (table *GameCaravanThing) GetDataList() []*GameCaravanThingData {
return table._dataList return table._dataList
} }
func (table *GameCaravanThing) Get(key int32) *GameCaravanThingData { func (table *GameCaravanThing) Get(key string) *GameCaravanThingData {
return table._dataMap[key] return table._dataMap[key]
} }

12
sys/configure/structs/Game.CaravanThingData.go
View File

@ -11,10 +11,7 @@ package cfg
import "errors" import "errors"
type GameCaravanThingData struct { type GameCaravanThingData struct {
Id int32 Itemid string
Goodsname string
Goodsinfor string
Goodsicon string
Goodsprice int32 Goodsprice int32
Changeperiod []int32 Changeperiod []int32
PriceChangeWeight []int32 PriceChangeWeight []int32
@ -24,7 +21,6 @@ type GameCaravanThingData struct {
FluctuationRange int32 FluctuationRange int32
Pricemin int32 Pricemin int32
Pricemax int32 Pricemax int32
Goodsnum int32
} }
const TypeId_GameCaravanThingData = 638455774 const TypeId_GameCaravanThingData = 638455774
@ -34,10 +30,7 @@ func (*GameCaravanThingData) GetTypeId() int32 {
} }
func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; if _v.Itemid, _ok_ = _buf["itemid"].(string); !_ok_ { err = errors.New("itemid error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["goodsname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Goodsname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Goodsname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["goodsinfor"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Goodsinfor error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Goodsinfor, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Goodsicon, _ok_ = _buf["goodsicon"].(string); !_ok_ { err = errors.New("goodsicon error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsprice"].(float64); !_ok_ { err = errors.New("goodsprice error"); return }; _v.Goodsprice = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsprice"].(float64); !_ok_ { err = errors.New("goodsprice error"); return }; _v.Goodsprice = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}
@ -112,7 +105,6 @@ func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FluctuationRange"].(float64); !_ok_ { err = errors.New("FluctuationRange error"); return }; _v.FluctuationRange = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FluctuationRange"].(float64); !_ok_ { err = errors.New("FluctuationRange error"); return }; _v.FluctuationRange = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemin"].(float64); !_ok_ { err = errors.New("pricemin error"); return }; _v.Pricemin = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemin"].(float64); !_ok_ { err = errors.New("pricemin error"); return }; _v.Pricemin = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemax"].(float64); !_ok_ { err = errors.New("pricemax error"); return }; _v.Pricemax = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemax"].(float64); !_ok_ { err = errors.New("pricemax error"); return }; _v.Pricemax = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsnum"].(float64); !_ok_ { err = errors.New("goodsnum error"); return }; _v.Goodsnum = int32(_tempNum_) }
return return
} }

2
sys/configure/structs/Game.Dispatch_TaskData.go
View File

@ -13,6 +13,7 @@ import "errors"
type GameDispatch_TaskData struct { type GameDispatch_TaskData struct {
Id int32 Id int32
Type int32 Type int32
Weight int32
Taskname string Taskname string
Icon string Icon string
Taskcd int32 Taskcd int32
@ -37,6 +38,7 @@ func (*GameDispatch_TaskData) GetTypeId() int32 {
func (_v *GameDispatch_TaskData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameDispatch_TaskData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["taskname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Taskname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Taskname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["taskname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Taskname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Taskname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskcd"].(float64); !_ok_ { err = errors.New("taskcd error"); return }; _v.Taskcd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskcd"].(float64); !_ok_ { err = errors.New("taskcd error"); return }; _v.Taskcd = int32(_tempNum_) }

15
sys/configure/structs/Game.WorldTaskData.go
View File

@ -25,6 +25,7 @@ type GameWorldTaskData struct {
Npc int32 Npc int32
Completetask []int32 Completetask []int32
DeliverNpc int32 DeliverNpc int32
TaskendRemoveitem []*Gameatn
AutoAccept int32 AutoAccept int32
Reword []*Gameatn Reword []*Gameatn
Module []string Module []string
@ -64,6 +65,20 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_npc"].(float64); !_ok_ { err = errors.New("deliver_npc error"); return }; _v.DeliverNpc = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_npc"].(float64); !_ok_ { err = errors.New("deliver_npc error"); return }; _v.DeliverNpc = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["taskend_removeitem"].([]interface{}); !_ok_ { err = errors.New("taskend_removeitem error"); return }
_v.TaskendRemoveitem = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.TaskendRemoveitem = append(_v.TaskendRemoveitem, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}