209 埋点

This commit is contained in:
meixiongfeng 2023-08-30 17:03:18 +08:00
parent fe281176c6
commit afdc37a244
21 changed files with 2652 additions and 2555 deletions

View File

@ -110,7 +110,7 @@
},
"planC": {
"key": "ask_ask_library_planC_04",
"text": "熊猫"
"text": "李山"
},
"planD": {
"key": "ask_ask_library_planD_04",

View File

@ -24619,7 +24619,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_870",
"text": "城市移動"
"text": "前往功夫熊猫城市"
},
"type": 212,
"valid": 0,
@ -24643,7 +24643,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_871",
"text": "购买特产"
"text": "购买疯狂外星人特产"
},
"type": 209,
"valid": 0,
@ -24667,7 +24667,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_872",
"text": "贩卖货物"
"text": "出售货物给功夫熊猫"
},
"type": 210,
"valid": 0,
@ -24691,7 +24691,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_873",
"text": "贩卖特产"
"text": "特产出售给魔法精灵"
},
"type": 211,
"valid": 0,
@ -24703,8 +24703,7 @@
"NPC": -10041,
"value": 1000,
"filter": [
105,
1
105
],
"filter2": []
},

View File

@ -204,8 +204,7 @@
"id": 103,
"citylink": [
102,
101,
108
101
],
"cityticket": [
{
@ -316,7 +315,8 @@
"citylink": [
101,
113,
109
109,
105
],
"cityticket": [
{
@ -429,7 +429,8 @@
"id": 105,
"citylink": [
108,
106
106,
103
],
"cityticket": [
{
@ -656,7 +657,8 @@
"id": 107,
"citylink": [
113,
106
106,
108
],
"cityticket": [
{
@ -768,8 +770,8 @@
{
"id": 108,
"citylink": [
103,
105
105,
107
],
"cityticket": [
{

View File

@ -4,7 +4,7 @@
"eventgroup": 1,
"eventweight": 250,
"eventtype": 1,
"mustdo": 1,
"mustdo": 2,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
@ -64,7 +64,7 @@
"eventgroup": 1,
"eventweight": 250,
"eventtype": 1,
"mustdo": 1,
"mustdo": 2,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
@ -94,7 +94,7 @@
"eventgroup": 1,
"eventweight": 250,
"eventtype": 1,
"mustdo": 1,
"mustdo": 2,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,

View File

@ -3,7 +3,7 @@
"id": 1,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "25001",
"hero_replace": "15002",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
@ -16,7 +16,7 @@
"id": 2,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "24002",
"hero_replace": "15004",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
@ -29,7 +29,7 @@
"id": 3,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "13003",
"hero_replace": "25001",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
@ -40,6 +40,45 @@
},
{
"id": 4,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "25004",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 150
}
},
{
"id": 5,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "35004",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 180
}
},
{
"id": 6,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "35005",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 180
}
},
{
"id": 7,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "15002",
@ -52,7 +91,7 @@
}
},
{
"id": 5,
"id": 8,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "15004",
@ -65,7 +104,7 @@
}
},
{
"id": 6,
"id": 9,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "25001",
@ -78,7 +117,7 @@
}
},
{
"id": 7,
"id": 10,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "25004",
@ -91,7 +130,7 @@
}
},
{
"id": 8,
"id": 11,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "35004",
@ -104,7 +143,7 @@
}
},
{
"id": 9,
"id": 12,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "35005",

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -19032,7 +19032,7 @@
},
"describe": {
"key": "item_item_describe_391",
"text": "迷宫中的美丽水晶,波澜浮光的棕红,是石洞天然形成的瑰宝。它拥有特殊的能量,将它握在手中,能使感官大幅度增强。(注意要和巨怪商队中的画的不一样)"
"text": "秘境中的美丽水晶,波澜浮光的棕红,是石洞天然形成的瑰宝。它拥有特殊的能量,将它握在手中,能使感官大幅度增强。"
},
"dialogue": {
"key": "item_item_dialogue_389",

View File

@ -323,12 +323,12 @@
{
"id": "PeackReward",
"title": {
"key": "",
"key": "mail_mail_title_16",
"text": ""
},
"recipient": {
"key": "",
"text": ""
"key": "mail_mail_recipient_16",
"text": "亲爱的{0}"
},
"content": {
"key": "mail_mail_content_16",
@ -344,15 +344,15 @@
{
"id": "Venturegifts",
"title": {
"key": "mail_mail_title_16",
"key": "mail_mail_title_17",
"text": "转盘活动奖励转换"
},
"recipient": {
"key": "",
"text": ""
"key": "mail_mail_recipient_17",
"text": "亲爱的{0}"
},
"content": {
"key": "",
"key": "mail_mail_content_17",
"text": ""
},
"sender": {
@ -365,16 +365,16 @@
{
"id": "CaravanLvReward",
"title": {
"key": "mail_mail_title_17",
"key": "mail_mail_title_18",
"text": "商队等级奖励"
},
"recipient": {
"key": "",
"text": ""
"key": "mail_mail_recipient_18",
"text": "亲爱的{0}"
},
"content": {
"key": "mail_mail_content_18",
"text": "商队等级奖励"
"text": "这是的商队等级提升奖励,请查收。"
},
"sender": {
"key": "mail_mail_sender_18",
@ -382,5 +382,26 @@
},
"reword": [],
"duration": 720
},
{
"id": "CaravantReward",
"title": {
"key": "mail_mail_title_19",
"text": "商队进度奖励"
},
"recipient": {
"key": "mail_mail_recipient_19",
"text": "亲爱的{0}"
},
"content": {
"key": "mail_mail_content_19",
"text": "这是商队盈利进度"
},
"sender": {
"key": "mail_mail_sender_19",
"text": "系统"
},
"reword": [],
"duration": 720
}
]

File diff suppressed because it is too large Load Diff

View File

@ -304,5 +304,23 @@
],
"functionicon": "cgt_icon_hfsj",
"jumpId": 10019
},
{
"Id": 18,
"scene": "CaravanScene",
"scenename": {
"key": "navigation_Sheet1_scenename_18",
"text": "巨怪列车"
},
"sceneicon": "ty_qp_zhb",
"functionname": {
"key": "navigation_Sheet1_functionname_18",
"text": "巨怪商队"
},
"npcName": [
"列车长"
],
"functionicon": "cgt_icon_hfsj",
"jumpId": 11001
}
]

View File

@ -1857,10 +1857,6 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1101208
}
],
"wkqbx": 0,
@ -1880,12 +1876,7 @@
"key": "opencond_opencond_name_83",
"text": "无极塔"
},
"main": [
{
"key": 2,
"param": 1101008
}
],
"main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "",
@ -1930,10 +1921,6 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100408
}
],
"wkqbx": 2,

View File

@ -994,7 +994,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001108,
390001008,
1000,
1,
1
@ -1015,12 +1015,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 8,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
350
4500
],
"FollowSK": [],
"SucFollowSK": [
@ -1095,7 +1095,7 @@
"Argu": [
1,
4,
400
4700
],
"FollowSK": [],
"SucFollowSK": [
@ -1145,7 +1145,7 @@
"Argu": [
1,
4,
400
5000
],
"FollowSK": [],
"SucFollowSK": [
@ -6121,7 +6121,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -6135,7 +6135,7 @@
{
"Id": 244006213,
"EmitPR": 1000,
"From": 8,
"From": 12,
"Where": [],
"Order": "",
"Limit": 1,
@ -6240,7 +6240,7 @@
390001117,
1000,
1,
0
1
],
"FollowSK": [],
"SucFollowSK": [],
@ -6815,7 +6815,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 29,
"Type": 30,
"Argu": [
390001112,
1000,
@ -9921,7 +9921,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
1000
],
@ -10077,7 +10077,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 31,
"Type": 32,
"Argu": [
150
],
@ -10496,7 +10496,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
2,
@ -10691,7 +10691,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 31,
"Type": 32,
"Argu": [
10
],
@ -10784,7 +10784,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
1,
@ -10832,7 +10832,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
300
],
@ -11368,7 +11368,7 @@
],
"FollowSK": [],
"SucFollowSK": [
213003212
213003214
],
"FailFollowSK": [],
"MustHit": false,
@ -11403,7 +11403,7 @@
{
"Id": 213003213,
"EmitPR": 1000,
"From": 4,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
@ -11485,7 +11485,7 @@
],
"FollowSK": [],
"SucFollowSK": [
213003212
213003214
],
"FailFollowSK": [],
"MustHit": false,
@ -11510,7 +11510,7 @@
],
"FollowSK": [],
"SucFollowSK": [
213003212
213003214
],
"FailFollowSK": [],
"MustHit": false,
@ -11535,7 +11535,7 @@
],
"FollowSK": [],
"SucFollowSK": [
213003212
213003214
],
"FailFollowSK": [],
"MustHit": false,
@ -11560,7 +11560,7 @@
],
"FollowSK": [],
"SucFollowSK": [
213003212
213003214
],
"FailFollowSK": [],
"MustHit": false,
@ -12306,7 +12306,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
500
],
@ -12447,7 +12447,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -12612,7 +12612,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
1,
@ -12839,7 +12839,7 @@
"ExecuteCnt": 1,
"Type": 19,
"Argu": [
390001406,
391000066,
1000,
1,
-1,
@ -13391,7 +13391,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -13506,7 +13506,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 34,
"Type": 35,
"Argu": [
1,
2,
@ -15117,7 +15117,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -15512,7 +15512,7 @@
"Argu": [
1,
4,
3100
3300
],
"FollowSK": [],
"SucFollowSK": [
@ -15538,7 +15538,7 @@
"Argu": [
1,
4,
3200
3600
],
"FollowSK": [],
"SucFollowSK": [
@ -15564,7 +15564,7 @@
"Argu": [
1,
4,
3300
3900
],
"FollowSK": [],
"SucFollowSK": [
@ -15590,7 +15590,7 @@
"Argu": [
1,
4,
3400
4300
],
"FollowSK": [],
"SucFollowSK": [
@ -15792,12 +15792,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 5,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1050
5300
],
"FollowSK": [],
"SucFollowSK": [
@ -15817,12 +15817,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 5,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1100
5600
],
"FollowSK": [],
"SucFollowSK": [
@ -15842,12 +15842,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 5,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1150
5900
],
"FollowSK": [],
"SucFollowSK": [
@ -15867,12 +15867,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 5,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1200
6300
],
"FollowSK": [],
"SucFollowSK": [
@ -16037,7 +16037,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [
1,
1,
@ -18259,7 +18259,7 @@
"Type": 3,
"Argu": [
390001401,
1000,
400,
1,
1
],
@ -18283,7 +18283,7 @@
"Type": 3,
"Argu": [
390001006,
1000,
400,
1,
2
],
@ -18486,7 +18486,7 @@
390001401,
1000,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -19304,7 +19304,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 36,
"Type": 37,
"Argu": [
250
],
@ -19454,7 +19454,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
-1,
@ -19479,7 +19479,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 39,
"Type": 40,
"Argu": [
300
],
@ -20099,7 +20099,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -20213,7 +20213,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -20327,7 +20327,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -21194,7 +21194,7 @@
"Type": 3,
"Argu": [
390001006,
1000,
700,
1,
2
],
@ -21219,7 +21219,7 @@
"Argu": [
1,
4,
3100
3300
],
"FollowSK": [],
"SucFollowSK": [
@ -21244,7 +21244,7 @@
"Argu": [
1,
4,
3200
3600
],
"FollowSK": [],
"SucFollowSK": [
@ -21269,7 +21269,7 @@
"Argu": [
1,
4,
3300
3900
],
"FollowSK": [],
"SucFollowSK": [
@ -21294,7 +21294,7 @@
"Argu": [
1,
4,
3400
4300
],
"FollowSK": [],
"SucFollowSK": [
@ -22154,7 +22154,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
1,
@ -22341,7 +22341,7 @@
{
"Id": 214005214,
"EmitPR": 1000,
"From": 4,
"From": 12,
"Where": [],
"Order": "",
"Limit": 1,
@ -22511,7 +22511,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
2,
@ -22704,7 +22704,7 @@
"From": 1,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@ -23165,7 +23165,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 31,
"Type": 32,
"Argu": [
200
],
@ -23188,7 +23188,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -23619,7 +23619,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
1,
@ -23864,7 +23864,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 38,
"Type": 39,
"Argu": [
215002312,
215002313,
@ -25181,7 +25181,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -25319,7 +25319,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
300
],
@ -26342,7 +26342,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -26766,7 +26766,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -26930,7 +26930,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -27094,7 +27094,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -28243,7 +28243,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -28695,7 +28695,7 @@
"Order": "PropertyUp=20",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
300
],
@ -28899,7 +28899,7 @@
"Type": 3,
"Argu": [
390001110,
300,
500,
1,
1
],
@ -29166,7 +29166,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 5,
"Type": 32,
"Type": 33,
"Argu": [
3,
1,
@ -29838,7 +29838,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 35,
"Type": 36,
"Argu": [
1,
1
@ -30550,7 +30550,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
1,
@ -30974,7 +30974,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
300
],
@ -31603,7 +31603,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
500
],
@ -34785,7 +34785,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
1000
],
@ -34952,7 +34952,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
50
],
@ -35575,7 +35575,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
200
],
@ -38186,7 +38186,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
150
],
@ -43577,7 +43577,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -43619,7 +43619,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -52336,7 +52336,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 32,
"Type": 33,
"Argu": [
3,
1
@ -52731,7 +52731,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -53224,7 +53224,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 30,
"Type": 31,
"Argu": [
500
],
@ -54404,7 +54404,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -54494,7 +54494,7 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 29,
"Type": 30,
"Argu": [
390001112,
1000,
@ -55796,7 +55796,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
@ -56976,7 +56976,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 28,
"Type": 29,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],

View File

@ -720,10 +720,10 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_135002211_1",
"text": "自身[color=#37d8a9]不会失手[/color]。敌方使其友方减益提前结束时扣除其目前生命值30%驱散其全部增益为其附加1回合[color=#e5621b]【石化】[/color]。"
"text": "自身[color=#37d8a9]不会失手[/color]。敌方使其友方减益提前结束时扣除其目前生命值30%驱散其全部增益为其附加1回合[color=#e5621b]速度下降[/color]。"
},
"buffid": [
390001114
390001008
],
"map": ""
},
@ -752,7 +752,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_135002311_1",
"text": "攻击敌方8次每次伤害为自身攻击力35%有80%概率驱散目标1个增益并附加2回合[color=#e5621b]失手率提升[/color]。"
"text": "攻击全体敌方1次伤害为自身攻击力450%有80%概率驱散目标1个增益并附加2回合[color=#e5621b]失手率提升[/color]。"
},
"buffid": [
390001102
@ -784,7 +784,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_135002311_2",
"text": "伤害提升至40%。"
"text": "伤害提升至470%。"
},
"buffid": [],
"map": ""
@ -844,7 +844,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_135002311_4",
"text": "伤害提升至50%。"
"text": "伤害提升至500%。"
},
"buffid": [],
"map": ""
@ -2548,7 +2548,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144005111_1",
"text": "小伊对敌方1个目标攻击2次每次造成攻击力200%的伤害,并有50%概率吸收目标15%行动值。"
"text": "小伊对敌方1个目标攻击2次每次造成攻击力200%的伤害,并有30%概率吸收目标15%行动值。"
},
"buffid": [],
"map": ""
@ -4216,7 +4216,6 @@
244006311,
244006312,
244006313,
244006314,
244006316
]
},
@ -4253,7 +4252,6 @@
244006311,
244006312,
244006323,
244006314,
244006316
]
},
@ -4287,7 +4285,6 @@
244006311,
244006312,
244006333,
244006314,
244006316
]
},
@ -4321,7 +4318,6 @@
244006311,
244006312,
244006343,
244006314,
244006316
]
},
@ -4355,7 +4351,6 @@
244006311,
244006312,
244006353,
244006314,
244006316
]
},
@ -4389,7 +4384,6 @@
244006311,
244006312,
244006353,
244006314,
244006316
]
},
@ -7750,15 +7744,13 @@
"ChildSkill": {
"Id": [
213003211,
213003212,
213003213,
213003214
213003212
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_113003211_1",
"text": "啊啊对敌方1个目标造成攻击力400%的伤害随后为自身恢复最大生命值5%生命并有100%概率驱散目标全部增益状态每驱散1个增益状态可为自身恢复最大生命值3%的生命。"
"text": "啊啊对敌方1个目标造成攻击力400%的伤害随后为自身恢复最大生命值5%生命并有100%概率驱散目标全部增益状态。"
},
"buffid": [],
"map": ""
@ -7783,9 +7775,7 @@
"ChildSkill": {
"Id": [
213003221,
213003212,
213003213,
213003214
213003212
]
},
"passSkill": [],
@ -7816,9 +7806,7 @@
"ChildSkill": {
"Id": [
213003231,
213003212,
213003213,
213003214
213003212
]
},
"passSkill": [],
@ -7849,9 +7837,7 @@
"ChildSkill": {
"Id": [
213003241,
213003212,
213003213,
213003214
213003212
]
},
"passSkill": [],
@ -7882,9 +7868,7 @@
"ChildSkill": {
"Id": [
213003251,
213003212,
213003213,
213003214
213003212
]
},
"passSkill": [],
@ -13481,10 +13465,11 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_133003111_1",
"text": "胡德先生对敌方1个目标造成攻击力300%的伤害并有40%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
"text": "胡德先生对敌方1个目标造成攻击力300%的伤害并有40%概率附加2回合[color=#e5621b]攻击下降[/color]状态和1回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001006
390001006,
390001007
],
"map": ""
},
@ -13633,7 +13618,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_133003211_1",
"text": "胡德先生当队友向敌方任意1个目标发起攻击时都会跟随队友对目标造成攻击并附加1回合[color=#e5621b]中毒[/color]状态。"
"text": "胡德先生当队友向敌方任意1个目标发起攻击时都会跟随队友对目标造成攻击。"
},
"buffid": [
390001401
@ -13665,7 +13650,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_133003311_1",
"text": "胡德先生对敌方随机2个目标造成2次攻击力200%的伤害并有80%概率附加2回合[color=#e5621b]防御下降[/color][color=#e5621b]中毒[/color]。"
"text": "胡德先生对敌方随机2个目标造成2次攻击力200%的伤害并有80%概率附加2回合[color=#e5621b]防御下降[/color][color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001401,
@ -16626,7 +16611,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_114005111_1",
"text": "鹤大师对敌方1个目标发起攻击可造成攻击力310%伤害并有50%概率夺取目标1个增益状态。"
"text": "鹤大师对敌方1个目标发起攻击可造成攻击力200%伤害并有50%概率夺取目标1个增益状态。"
},
"buffid": [],
"map": ""
@ -16656,7 +16641,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_114005111_2",
"text": "伤害提升至340%。"
"text": "伤害提升至210%。"
},
"buffid": [],
"map": ""
@ -16686,7 +16671,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_114005111_3",
"text": "伤害提升至370%。"
"text": "伤害提升至220%。"
},
"buffid": [],
"map": ""
@ -16716,7 +16701,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_114005111_4",
"text": "伤害提升至400%。"
"text": "伤害提升至230%。"
},
"buffid": [],
"map": ""
@ -16746,7 +16731,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_114005111_5",
"text": "伤害提升至440%。"
"text": "伤害提升至240%。"
},
"buffid": [],
"map": ""
@ -16778,7 +16763,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_114005211_1",
"text": "鹤大师对敌方目标发起3次攻击每次攻击造成攻击力130%的伤害。并延长自身全部增益状态1回合。"
"text": "鹤大师对敌方目标发起3次攻击每次攻击造成攻击力130%的伤害。并延长自身全部增益状态1回合。若目标未存在增益状态则对目标附加2回合【无法获得增益效果】状态。"
},
"buffid": [],
"map": ""
@ -21342,9 +21327,11 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_114002111_1",
"text": "大龙对敌方1个目标造成攻击力30%的伤害追加自身最大生命值6%的伤害并有50%概率附加1回合[color=#e5621b]挑衅[/color] 状态。"
"text": "大龙对敌方1个目标造成攻击力100%的伤害追加自身最大生命值4.5%的伤害并有50%概率附加1回合[color=#e5621b]挑衅[/color] 状态。"
},
"buffid": [],
"buffid": [
390001110
],
"map": ""
},
{
@ -21375,7 +21362,9 @@
"key": "skill_skill_atk_Desc_114002211_1",
"text": "攻击时为目标附加1回合[color=#37d8a9]仇视[/color] 。己方除自身外任意目标遭到携带该标记的目标攻击时自身有60%概率进行反击攻击者自身受击时有15%概率使用嚣张气焰反击并为自身回复最大生命值10%的生命。"
},
"buffid": [],
"buffid": [
390001426
],
"map": ""
},
{
@ -21405,7 +21394,9 @@
"key": "skill_skill_atk_Desc_114002311_1",
"text": "攻击敌方伤害为自身攻击力100%和自身已损失生命值15%70%概率为目标附加2回合[color=#e5621b]攻击下降[/color]。"
},
"buffid": [],
"buffid": [
390001426
],
"map": ""
},
{

View File

@ -2583,7 +2583,7 @@
"key": "skill_skill_buff_Desc_390001327",
"text": "抵抗提升40%。"
},
"BuffType": 20,
"BuffType": 0,
"EffectArgu": [
76,
500
@ -3592,7 +3592,7 @@
"Id": 390001426,
"Name": {
"key": "skill_skill_buff_Name_390001426",
"text": "[color=#37d8a9]仇视[/color] "
"text": "[color=#e5621b]仇视[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001426",
@ -10567,5 +10567,41 @@
"buffeffect": "",
"buffpos": "根节点",
"forbidFloat": 0
},
{
"Id": 391000066,
"Name": {
"key": "skill_skill_buff_Name_391000066",
"text": "[color=#e5621b]最大生命值上限下降[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_391000066",
"text": "最大生命值上限下降。"
},
"BuffType": 128,
"EffectArgu": [
112,
1000,
1,
500
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
1,
6
],
"AddEffect": false,
"RemoveType": false,
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
"forbidFloat": 0
}
]

View File

@ -74,7 +74,7 @@
"BaseTerms": 40,
"ExtraTerms": 48,
"PerTerms": 87,
"FixTerms": 88
"FixTerms": 32
},
{
"ProType": 7,
@ -85,7 +85,7 @@
"BaseTerms": 41,
"ExtraTerms": 49,
"PerTerms": 90,
"FixTerms": 91
"FixTerms": 33
},
{
"ProType": 8,
@ -96,7 +96,7 @@
"BaseTerms": 42,
"ExtraTerms": 50,
"PerTerms": 93,
"FixTerms": 94
"FixTerms": 34
},
{
"ProType": 9,
@ -107,7 +107,7 @@
"BaseTerms": 43,
"ExtraTerms": 51,
"PerTerms": 96,
"FixTerms": 97
"FixTerms": 35
},
{
"ProType": 10,

View File

@ -232,13 +232,20 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
// 任务统计
var szTask []*pb.BuriedParam
var opCount int32
for _, v := range req.Items {
opCount += v
}
if req.IsBuy {
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype209, req.City, opCount))
if req.IsBuy {
// 209购买指定城市的急需货物X个
for k, v := range caravan.City { // 找城市
for _, v1 := range v.Exspecial { // 急需的货物
for k2, v2 := range req.Items {
if k2 == v1 {
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype209, v2, k))
break
}
}
}
}
// szTask = append(szTask, comm.GetBuriedParam(comm.Rtype209, req.City, opCount))
} else { // 卖
//向指定X城市贩卖货物贩卖货物价值需要X虚拟币以上
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype210, req.City, sellValue))

View File

@ -36,7 +36,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe
}
if conf, _ := this.module.configure.GetCaravanLv(list.Lv); conf != nil {
if errdata = this.module.InitCaravanTicket(session, conf); errdata != nil {
return
}

View File

@ -42,10 +42,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.LoadConfigure(game_caravan_rank, cfg.NewGameCaravanRank)
configure.RegisterConfigure(game_caravan_event, cfg.NewGameCaravanRank, func() {
this.lock.Lock()
if v, err := this.GetConfigure(game_caravan_event); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
if v, err := this.GetConfigure(game_caravan_event); err == nil {
this.event = make(map[int32][]*cfg.GameCaravanEventData, 0)
for _, v := range v.(*cfg.GameCaravanEvent).GetDataList() {
this.event[v.Eventgroup] = append(this.event[v.Eventgroup], v)
@ -54,10 +51,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.lock.Unlock()
})
configure.RegisterConfigure(game_caravan_reward, cfg.NewGameCaravanReward, func() {
if v, err := this.GetConfigure(game_caravan_reward); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
if v, err := this.GetConfigure(game_caravan_reward); err == nil {
for _, v := range v.(*cfg.GameCaravanReward).GetDataList() {
if v.Key < 0 {
this.overflow = v.Id
@ -188,7 +182,6 @@ func (this *configureComp) GetCaravanInitCity() (initcity int32) {
for _, v := range configure.GetDataList() {
return v.Id
}
}
} else {
log.Errorf("get GetCaravanInitCity conf err:%v", err)

View File

@ -118,4 +118,8 @@ const (
GameBuffType_ADJUST_PRO_FULL_EMIT_SKILL = 125
GameBuffType_APPEND_DMG = 126
GameBuffType_PRO_HIGH_IGNORE_IMMUNITY = 127
GameBuffType_ADJUST_PRO_BY_PARAM = 128
GameBuffType_VIKING_INTUITION = 129
GameBuffType_VIKING_ROAR = 130
GameBuffType_VIKING_FLAG = 131
)

View File

@ -36,18 +36,19 @@ const (
GameSkillEffectType_ExtraDmg_2 = 25
GameSkillEffectType_ExtraDmg_3 = 26
GameSkillEffectType_ExtraDmg_4 = 27
GameSkillEffectType_Round = 28
GameSkillEffectType_TreBeyondByAddBuff = 29
GameSkillEffectType_DpsByTre = 30
GameSkillEffectType_Rebirth = 31
GameSkillEffectType_StealBuff = 32
GameSkillEffectType_BuffDmg = 33
GameSkillEffectType_BuffTre = 34
GameSkillEffectType_ShiftOurAllBuff = 35
GameSkillEffectType_DrawActValueToTeam = 36
GameSkillEffectType_SpecialTre = 37
GameSkillEffectType_RandChildSkill = 38
GameSkillEffectType_AddActValueByEffect = 39
GameSkillEffectType_TreByBuffNum = 40
GameSkillEffectType_GetTargetBuffNum = 41
GameSkillEffectType_ExtraDmg_5 = 28
GameSkillEffectType_Round = 29
GameSkillEffectType_TreBeyondByAddBuff = 30
GameSkillEffectType_DpsByTre = 31
GameSkillEffectType_Rebirth = 32
GameSkillEffectType_StealBuff = 33
GameSkillEffectType_BuffDmg = 34
GameSkillEffectType_BuffTre = 35
GameSkillEffectType_ShiftOurAllBuff = 36
GameSkillEffectType_DrawActValueToTeam = 37
GameSkillEffectType_SpecialTre = 38
GameSkillEffectType_RandChildSkill = 39
GameSkillEffectType_AddActValueByEffect = 40
GameSkillEffectType_TreByBuffNum = 41
GameSkillEffectType_GetTargetBuffNum = 42
)