周任务 领取奖励后 自动发放宝箱奖励

This commit is contained in:
meixiongfeng 2023-04-26 20:00:02 +08:00
parent fae0e4b489
commit 83e26c8986
19 changed files with 1279 additions and 1005 deletions

View File

@ -6,11 +6,11 @@
"reword": [
{
"a": "item",
"t": "60001",
"t": "60002",
"n": 1
}
],
"action": "Skill_2",
"action": "25004_cheer_act",
"stage": 1
},
{
@ -24,7 +24,7 @@
"n": 2
}
],
"action": "Skill_2",
"action": "25004_cheer_act",
"stage": 2
},
{
@ -34,25 +34,11 @@
"reword": [
{
"a": "item",
"t": "60003",
"t": "60002",
"n": 3
}
],
"action": "Skill_2",
"action": "25004_cheer_act",
"stage": 3
},
{
"key": 4,
"id_tag": 2,
"active": 160,
"reword": [
{
"a": "item",
"t": "60003",
"n": 4
}
],
"action": "Skill_2",
"stage": 4
}
]

View File

@ -4,8 +4,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 3,
"rece": 1,
"id": "24001",
"rece": 2,
"id": "24004",
"weight": 1000
},
{
@ -13,8 +13,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"rece": 1,
"id": "25001",
"rece": 2,
"id": "24004",
"weight": 1000
},
{
@ -22,8 +22,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"rece": 1,
"id": "25001",
"rece": 2,
"id": "24004",
"weight": 1000
},
{
@ -31,8 +31,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 3,
"rece": 1,
"id": "44006",
"rece": 2,
"id": "25001",
"weight": 1000
},
{
@ -40,8 +40,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
"rece": 1,
"id": "44006",
"rece": 2,
"id": "25001",
"weight": 1000
},
{
@ -49,8 +49,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 5,
"rece": 1,
"id": "44006",
"rece": 2,
"id": "25001",
"weight": 1000
},
{
@ -58,8 +58,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 3,
"rece": 1,
"id": "14003",
"rece": 2,
"id": "25004",
"weight": 1000
},
{
@ -67,8 +67,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
"rece": 1,
"id": "14003",
"rece": 2,
"id": "25004",
"weight": 1000
},
{
@ -76,8 +76,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 5,
"rece": 1,
"id": "14003",
"rece": 2,
"id": "25004",
"weight": 1000
},
{
@ -85,8 +85,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 3,
"rece": 1,
"id": "34006",
"rece": 2,
"id": "24008",
"weight": 1000
},
{
@ -94,8 +94,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
"rece": 1,
"id": "34006",
"rece": 2,
"id": "24008",
"weight": 1000
},
{
@ -103,8 +103,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 5,
"rece": 1,
"id": "34006",
"rece": 2,
"id": "24008",
"weight": 1000
},
{
@ -112,7 +112,7 @@
"recruitment_type": 1,
"card_pool_type": "base_pool5",
"star": 3,
"rece": 1,
"rece": 2,
"id": "24003",
"weight": 1000
},
@ -121,7 +121,7 @@
"recruitment_type": 1,
"card_pool_type": "base_pool5",
"star": 4,
"rece": 1,
"rece": 2,
"id": "24003",
"weight": 1000
},
@ -130,7 +130,7 @@
"recruitment_type": 1,
"card_pool_type": "base_pool5",
"star": 5,
"rece": 1,
"rece": 2,
"id": "24003",
"weight": 1000
},
@ -167,182 +167,56 @@
"card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
"id": "24008",
"id": "24004",
"weight": 1000
},
{
"key": 20,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
"id": "24001",
"weight": 1000
},
{
"key": 21,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 4,
"id": "43006",
"weight": 1000
},
{
"key": 22,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 4,
"id": "43001",
"weight": 1000
},
{
"key": 23,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 3,
"id": "34008",
"weight": 1000
},
{
"key": 24,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 3,
"id": "34003",
"weight": 1000
},
{
"key": 25,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 1,
"id": "13001",
"weight": 1000
},
{
"key": 26,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 2,
"id": "33002",
"weight": 1000
},
{
"key": 27,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
"id": "24009",
"weight": 1000
},
{
"key": 28,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 1,
"id": "13005",
"weight": 1000
},
{
"key": 29,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 1,
"id": "15005",
"weight": 1000
},
{
"key": 30,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
"id": "24003",
"weight": 1000
},
{
"key": 31,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 3,
"id": "34006",
"weight": 1000
},
{
"key": 32,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 2,
"id": "35001",
"weight": 1000
},
{
"key": 33,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 1,
"id": "15004",
"weight": 1000
},
{
"key": 34,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 2,
"id": "24002",
"weight": 1000
},
{
"key": 35,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 4,
"id": "45003",
"weight": 1000
},
{
"key": 36,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 2,
"id": "25004",
"weight": 1000
},
{
"key": 37,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 3,
"id": "35002",
"weight": 1000
},
{
"key": 38,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 2,
"id": "25001",
"weight": 1000
},
{
"key": 39,
"key": 21,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 2,
"id": "25004",
"weight": 1000
},
{
"key": 22,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
"id": "24008",
"weight": 1000
},
{
"key": 23,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
"id": "24003",
"weight": 1000
},
{
"key": 24,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 1,
"id": "15005",
"weight": 1000
},
{
"key": 25,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
@ -351,61 +225,7 @@
"weight": 1000
},
{
"key": 40,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 4,
"id": "44006",
"weight": 1000
},
{
"key": 41,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 3,
"id": "35006",
"weight": 1000
},
{
"key": 42,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
"id": "24005",
"weight": 1000
},
{
"key": 43,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 1,
"id": "13003",
"weight": 1000
},
{
"key": 44,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 3,
"id": "34002",
"weight": 1000
},
{
"key": 45,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 4,
"id": "45001",
"weight": 1000
},
{
"key": 46,
"key": 26,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
@ -414,66 +234,66 @@
"weight": 1000
},
{
"key": 47,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 3,
"id": "35003",
"weight": 1000
},
{
"key": 48,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 3,
"id": "35005",
"weight": 1000
},
{
"key": 49,
"key": 27,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 1,
"id": "14005",
"rece": 3,
"id": "34006",
"weight": 1000
},
{
"key": 50,
"key": 28,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 3,
"id": "34002",
"weight": 1000
},
{
"key": 29,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"rece": 2,
"id": "24004",
"id": "24002",
"weight": 1000
},
{
"key": 51,
"key": 30,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 1,
"id": "14007",
"star": 5,
"rece": 2,
"id": "35001",
"weight": 1000
},
{
"key": 52,
"key": 31,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"rece": 1,
"id": "15002",
"id": "15004",
"weight": 1000
},
{
"key": 53,
"key": 32,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 4,
"id": "44002",
"id": "44005",
"weight": 1000
},
{
"key": 33,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"rece": 4,
"id": "44006",
"weight": 1000
},
{

View File

@ -42,7 +42,7 @@
"key": "atlas_13001",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10001",
@ -176,7 +176,7 @@
"type": 1,
"ip": 7,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "13003",
"rotation": "0|0|0",
"revolve": 0,
@ -206,7 +206,7 @@
"key": "atlas_13003",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10041",
@ -370,7 +370,7 @@
"key": "atlas_13005",
"text": ""
},
"enteranivalue": 10,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11021",
@ -750,7 +750,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "14005",
"rotation": "0|0|0",
"revolve": 0,
@ -780,7 +780,7 @@
"key": "atlas_14005",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11001",
@ -914,7 +914,7 @@
"type": 1,
"ip": 9,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "14007",
"rotation": "0|0|0",
"revolve": 0,
@ -944,7 +944,7 @@
"key": "atlas_14007",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11041",
@ -1078,7 +1078,7 @@
"type": 1,
"ip": 8,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "15002",
"rotation": "0|0|0",
"revolve": 0,
@ -1108,7 +1108,7 @@
"key": "atlas_15002",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10021",
@ -1682,7 +1682,7 @@
"key": "atlas_24001",
"text": ""
},
"enteranivalue": 30,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10041",
@ -1980,7 +1980,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "24005",
"rotation": "0|0|0",
"revolve": 0,
@ -2010,7 +2010,7 @@
"key": "atlas_24005",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10001",
@ -2338,7 +2338,7 @@
"key": "atlas_24009",
"text": ""
},
"enteranivalue": 10,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11021",
@ -2830,7 +2830,7 @@
"key": "atlas_33002",
"text": ""
},
"enteranivalue": 40,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11021",
@ -3404,7 +3404,7 @@
"key": "atlas_34003",
"text": ""
},
"enteranivalue": 70,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11041",
@ -3702,7 +3702,7 @@
"type": 1,
"ip": 5,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "34007",
"rotation": "0|0|0",
"revolve": 0,
@ -3732,7 +3732,7 @@
"key": "atlas_34007",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11001",
@ -3814,7 +3814,7 @@
"key": "atlas_34008",
"text": ""
},
"enteranivalue": 80,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11021",
@ -3948,7 +3948,7 @@
"type": 1,
"ip": 11,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "35002",
"rotation": "0|0|0",
"revolve": 0,
@ -3978,7 +3978,7 @@
"key": "atlas_35002",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10001",
@ -4030,7 +4030,7 @@
"type": 1,
"ip": 10,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "35003",
"rotation": "0|0|0",
"revolve": 0,
@ -4060,7 +4060,7 @@
"key": "atlas_35003",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10021",
@ -4194,7 +4194,7 @@
"type": 1,
"ip": 12,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "35005",
"rotation": "0|0|0",
"revolve": 0,
@ -4224,7 +4224,7 @@
"key": "atlas_35005",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11001",
@ -4276,7 +4276,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "35006",
"rotation": "0|0|0",
"revolve": 0,
@ -4306,7 +4306,7 @@
"key": "atlas_35006",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11021",
@ -4388,7 +4388,7 @@
"key": "atlas_43001",
"text": ""
},
"enteranivalue": 90,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11041",
@ -4798,7 +4798,7 @@
"key": "atlas_43006",
"text": ""
},
"enteranivalue": 40,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11021",
@ -5014,7 +5014,7 @@
"type": 1,
"ip": 6,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "44002",
"rotation": "0|0|0",
"revolve": 0,
@ -5044,7 +5044,7 @@
"key": "atlas_44002",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10021",
@ -5260,7 +5260,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "44006",
"rotation": "0|0|0",
"revolve": 0,
@ -5290,7 +5290,7 @@
"key": "atlas_44006",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11021",
@ -5342,7 +5342,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "45001",
"rotation": "0|0|0",
"revolve": 0,
@ -5372,7 +5372,7 @@
"key": "atlas_45001",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"11041",
@ -9280,7 +9280,7 @@
"type": 1,
"ip": 7,
"sd": 1,
"handbook": 1,
"handbook": -1,
"prefab": "13003",
"rotation": "0|0|0",
"revolve": 0,
@ -9310,7 +9310,7 @@
"key": "atlas_99999",
"text": ""
},
"enteranivalue": 50,
"enteranivalue": -1,
"camerainterval": 0,
"equiprcom": [
"10041",

File diff suppressed because it is too large Load Diff

View File

@ -16,7 +16,7 @@
"key": "newsmithy_make_quality_text1",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_2",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -68,7 +68,7 @@
"key": "newsmithy_make_quality_text2",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -121,7 +121,7 @@
"key": "newsmithy_make_quality_text3",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -175,7 +175,7 @@
"key": "newsmithy_make_quality_text4",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -228,7 +228,7 @@
"key": "newsmithy_make_quality_text5",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -282,7 +282,7 @@
"key": "newsmithy_make_quality_text6",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -335,7 +335,7 @@
"key": "newsmithy_make_quality_text7",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -389,7 +389,7 @@
"key": "newsmithy_make_quality_text8",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -442,7 +442,7 @@
"key": "newsmithy_make_quality_text9",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -496,7 +496,7 @@
"key": "newsmithy_make_quality_text10",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -554,7 +554,7 @@
"key": "newsmithy_make_quality_text11",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -611,7 +611,7 @@
"key": "newsmithy_make_quality_text12",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -668,7 +668,7 @@
"key": "newsmithy_make_quality_text13",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -725,7 +725,7 @@
"key": "newsmithy_make_quality_text14",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -782,7 +782,7 @@
"key": "newsmithy_make_quality_text15",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -839,7 +839,7 @@
"key": "newsmithy_make_quality_text16",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -896,7 +896,7 @@
"key": "newsmithy_make_quality_text17",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -953,7 +953,7 @@
"key": "newsmithy_make_quality_text18",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1010,7 +1010,7 @@
"key": "newsmithy_make_quality_text19",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1067,7 +1067,7 @@
"key": "newsmithy_make_quality_text20",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1129,7 +1129,7 @@
"key": "newsmithy_make_quality_text21",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1191,7 +1191,7 @@
"key": "newsmithy_make_quality_text22",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1253,7 +1253,7 @@
"key": "newsmithy_make_quality_text23",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1315,7 +1315,7 @@
"key": "newsmithy_make_quality_text24",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1377,7 +1377,7 @@
"key": "newsmithy_make_quality_text25",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_6",
"drawing_png": "tj_img_gjtz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1439,7 +1439,7 @@
"key": "newsmithy_make_quality_text26",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_11",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1491,7 +1491,7 @@
"key": "newsmithy_make_quality_text27",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_4",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1544,7 +1544,7 @@
"key": "newsmithy_make_quality_text28",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1598,7 +1598,7 @@
"key": "newsmithy_make_quality_text29",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1651,7 +1651,7 @@
"key": "newsmithy_make_quality_text30",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1705,7 +1705,7 @@
"key": "newsmithy_make_quality_text31",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1758,7 +1758,7 @@
"key": "newsmithy_make_quality_text32",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1812,7 +1812,7 @@
"key": "newsmithy_make_quality_text33",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1865,7 +1865,7 @@
"key": "newsmithy_make_quality_text34",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1919,7 +1919,7 @@
"key": "newsmithy_make_quality_text35",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -1977,7 +1977,7 @@
"key": "newsmithy_make_quality_text36",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2034,7 +2034,7 @@
"key": "newsmithy_make_quality_text37",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2091,7 +2091,7 @@
"key": "newsmithy_make_quality_text38",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2148,7 +2148,7 @@
"key": "newsmithy_make_quality_text39",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2205,7 +2205,7 @@
"key": "newsmithy_make_quality_text40",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2262,7 +2262,7 @@
"key": "newsmithy_make_quality_text41",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2319,7 +2319,7 @@
"key": "newsmithy_make_quality_text42",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2376,7 +2376,7 @@
"key": "newsmithy_make_quality_text43",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2433,7 +2433,7 @@
"key": "newsmithy_make_quality_text44",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2490,7 +2490,7 @@
"key": "newsmithy_make_quality_text45",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2552,7 +2552,7 @@
"key": "newsmithy_make_quality_text46",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2614,7 +2614,7 @@
"key": "newsmithy_make_quality_text47",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2676,7 +2676,7 @@
"key": "newsmithy_make_quality_text48",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2738,7 +2738,7 @@
"key": "newsmithy_make_quality_text49",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2800,7 +2800,7 @@
"key": "newsmithy_make_quality_text50",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_03",
"drawing_png": "tj_img_fytz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2862,7 +2862,7 @@
"key": "newsmithy_make_quality_text51",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_8",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2914,7 +2914,7 @@
"key": "newsmithy_make_quality_text52",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -2967,7 +2967,7 @@
"key": "newsmithy_make_quality_text53",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3021,7 +3021,7 @@
"key": "newsmithy_make_quality_text54",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3074,7 +3074,7 @@
"key": "newsmithy_make_quality_text55",
"text": "普通-稀有"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3128,7 +3128,7 @@
"key": "newsmithy_make_quality_text56",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3181,7 +3181,7 @@
"key": "newsmithy_make_quality_text57",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3235,7 +3235,7 @@
"key": "newsmithy_make_quality_text58",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3288,7 +3288,7 @@
"key": "newsmithy_make_quality_text59",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3342,7 +3342,7 @@
"key": "newsmithy_make_quality_text60",
"text": "普通-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3400,7 +3400,7 @@
"key": "newsmithy_make_quality_text61",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3457,7 +3457,7 @@
"key": "newsmithy_make_quality_text62",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3514,7 +3514,7 @@
"key": "newsmithy_make_quality_text63",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3571,7 +3571,7 @@
"key": "newsmithy_make_quality_text64",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3628,7 +3628,7 @@
"key": "newsmithy_make_quality_text65",
"text": "稀有-史诗"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3685,7 +3685,7 @@
"key": "newsmithy_make_quality_text66",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3742,7 +3742,7 @@
"key": "newsmithy_make_quality_text67",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3799,7 +3799,7 @@
"key": "newsmithy_make_quality_text68",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3856,7 +3856,7 @@
"key": "newsmithy_make_quality_text69",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3913,7 +3913,7 @@
"key": "newsmithy_make_quality_text70",
"text": "稀有-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -3975,7 +3975,7 @@
"key": "newsmithy_make_quality_text71",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -4037,7 +4037,7 @@
"key": "newsmithy_make_quality_text72",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -4099,7 +4099,7 @@
"key": "newsmithy_make_quality_text73",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -4161,7 +4161,7 @@
"key": "newsmithy_make_quality_text74",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{
@ -4223,7 +4223,7 @@
"key": "newsmithy_make_quality_text75",
"text": "史诗-传说"
},
"drawing_png": "tjp_zb_12",
"drawing_png": "tj_img_fztz",
"basic_drop": 1004,
"basic_cos": [
{

View File

@ -1638,7 +1638,7 @@
]
},
{
"id": "practice_Kick",
"id": "practice_kick",
"name": {
"key": "",
"text": ""
@ -1679,5 +1679,53 @@
"uiid": 10005,
"activateType": 0,
"notify": []
},
{
"id": "heroic_teaching",
"name": {
"key": "panda_1002",
"text": "英雄教习"
},
"main": [
{
"key": 1,
"param": 10
}
],
"optional": "",
"wkqbx": 2,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
},
"uiid": 0,
"activateType": 0,
"notify": []
},
{
"id": "pavilion_kick",
"name": {
"key": "panda_1003",
"text": "踢馆"
},
"main": [
{
"key": 1,
"param": 10
}
],
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
},
"uiid": 0,
"activateType": 0,
"notify": []
}
]

View File

@ -2,35 +2,7 @@
{
"id": 1,
"type": 1,
"url": "tx_js_24004",
"backname": "",
"isOpen": true
},
{
"id": 2,
"type": 1,
"url": "tx_js_25004",
"backname": "",
"isOpen": true
},
{
"id": 3,
"type": 1,
"url": "tx_js_34006",
"backname": "",
"isOpen": false
},
{
"id": 4,
"type": 1,
"url": "tx_js_35001",
"backname": "",
"isOpen": false
},
{
"id": 5,
"type": 1,
"url": "tx_js_25001",
"url": "ty_tx_nz",
"backname": "",
"isOpen": true
},

View File

@ -57,6 +57,11 @@
"a": "item",
"t": "14010101",
"n": 1
},
{
"a": "item",
"t": "14010102",
"n": 1
}
],
"standard_yield": [
@ -139,6 +144,11 @@
"a": "item",
"t": "14010203",
"n": 1
},
{
"a": "item",
"t": "14010204",
"n": 1
}
],
"standard_yield": [
@ -221,6 +231,11 @@
"a": "item",
"t": "14010305",
"n": 1
},
{
"a": "item",
"t": "14010306",
"n": 1
}
],
"standard_yield": [
@ -303,6 +318,11 @@
"a": "item",
"t": "14010407",
"n": 1
},
{
"a": "item",
"t": "14010408",
"n": 1
}
],
"standard_yield": [
@ -385,6 +405,11 @@
"a": "item",
"t": "14020101",
"n": 1
},
{
"a": "item",
"t": "14020102",
"n": 1
}
],
"standard_yield": [
@ -467,6 +492,11 @@
"a": "item",
"t": "14020203",
"n": 1
},
{
"a": "item",
"t": "14020204",
"n": 1
}
],
"standard_yield": [
@ -549,6 +579,11 @@
"a": "item",
"t": "14020305",
"n": 1
},
{
"a": "item",
"t": "14020306",
"n": 1
}
],
"standard_yield": [
@ -631,6 +666,11 @@
"a": "item",
"t": "14020407",
"n": 1
},
{
"a": "item",
"t": "14020408",
"n": 1
}
],
"standard_yield": [
@ -713,6 +753,11 @@
"a": "item",
"t": "14030101",
"n": 1
},
{
"a": "item",
"t": "14030102",
"n": 1
}
],
"standard_yield": [
@ -795,6 +840,11 @@
"a": "item",
"t": "14030203",
"n": 1
},
{
"a": "item",
"t": "14030204",
"n": 1
}
],
"standard_yield": [
@ -877,6 +927,11 @@
"a": "item",
"t": "14030305",
"n": 1
},
{
"a": "item",
"t": "14030306",
"n": 1
}
],
"standard_yield": [
@ -959,6 +1014,11 @@
"a": "item",
"t": "14030407",
"n": 1
},
{
"a": "item",
"t": "14030408",
"n": 1
}
],
"standard_yield": [

View File

@ -3107,8 +3107,8 @@
"id": 3024001,
"type_sp": 0,
"tasktxt": {
"key": "",
"text": ""
"key": "task_taskcond_tasktxt_3024001",
"text": "为任意英雄提升等级"
},
"type": 24,
"valid": 0,

View File

@ -59,9 +59,9 @@
"id": 10010,
"heroid": 25001,
"datas": [
"GameMain",
"CommandScene",
"20010_熊猫_1",
"901"
"905"
],
"event": [
2,
@ -73,9 +73,9 @@
"id": 10011,
"heroid": 44004,
"datas": [
"GameMain",
"CommandScene",
"20010_骇客蛛_1",
"901"
"905"
],
"event": [
2,
@ -87,9 +87,9 @@
"id": 10012,
"heroid": 25001,
"datas": [
"GameMain",
"20010_箱子_1",
"901"
"CommandScene",
"主线入口_原石",
"905"
],
"event": [
2,
@ -214,7 +214,7 @@
"heroid": 24004,
"datas": [
"WuGuanScene",
"20020_邦尼兔_1",
"20050_邦尼兔_1",
"137"
],
"event": [
@ -256,8 +256,8 @@
"heroid": 44004,
"datas": [
"GameMain",
"20010_骇客蛛_1",
"901"
"20070_骇客蛛_1",
"905"
],
"event": [
2,
@ -297,9 +297,9 @@
"id": 10090,
"heroid": 44004,
"datas": [
"GameMain",
"CommandScene",
"20010_骇客蛛_1",
"901"
"905"
],
"event": [
2,
@ -311,9 +311,9 @@
"id": 10100,
"heroid": 44004,
"datas": [
"GameMain",
"CommandScene",
"20010_骇客蛛_1",
"901"
"905"
],
"event": [
2,

View File

@ -8203,19 +8203,17 @@
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 2,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
300
1000
],
"FollowSK": [
215004112
],
"SucFollowSK": [
215004113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -8231,31 +8229,6 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
400
],
"FollowSK": [],
"SucFollowSK": [
215004113
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 215004113,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 14,
"Argu": [
100
@ -8283,10 +8256,10 @@
4,
400
],
"FollowSK": [],
"SucFollowSK": [
215004113
"FollowSK": [
215004112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -8308,10 +8281,10 @@
4,
400
],
"FollowSK": [],
"SucFollowSK": [
215004113
"FollowSK": [
215004112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -8333,10 +8306,10 @@
4,
400
],
"FollowSK": [],
"SucFollowSK": [
215004113
"FollowSK": [
215004112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -8358,7 +8331,9 @@
4,
700
],
"FollowSK": [],
"FollowSK": [
215004212
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -8405,7 +8380,9 @@
4,
750
],
"FollowSK": [],
"FollowSK": [
215004222
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -8452,7 +8429,9 @@
4,
750
],
"FollowSK": [],
"FollowSK": [
215004232
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -8499,7 +8478,9 @@
4,
800
],
"FollowSK": [],
"FollowSK": [
215004242
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -8539,15 +8520,15 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 2,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
300
1000
],
"FollowSK": [
215004313
215004312
],
"SucFollowSK": [],
"FailFollowSK": [],
@ -8565,31 +8546,6 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
300
],
"FollowSK": [
215004313
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 215004313,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
0,
@ -13978,12 +13934,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 3,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
450
900
],
"FollowSK": [],
"SucFollowSK": [

File diff suppressed because it is too large Load Diff

View File

@ -3224,7 +3224,7 @@
"RemoveType": false,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"golbalbufficon": "buff_gj_ts",
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点"
@ -3251,7 +3251,7 @@
"RemoveType": false,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"golbalbufficon": "buff_fy_ts",
"buffIcon": "ty_zd_buff_z003",
"buffeffect": "",
"buffpos": "根节点"
@ -3278,7 +3278,7 @@
"RemoveType": false,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"golbalbufficon": "buff_bj_ts",
"buffIcon": "ty_zd_buff_z006",
"buffeffect": "",
"buffpos": "根节点"
@ -3305,7 +3305,7 @@
"RemoveType": false,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"golbalbufficon": "buff_bj_dk",
"buffIcon": "ty_zd_buff_z008",
"buffeffect": "",
"buffpos": "根节点"
@ -3332,7 +3332,7 @@
"RemoveType": false,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"golbalbufficon": "buff_mz_ts",
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点"
@ -3359,7 +3359,7 @@
"RemoveType": false,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"golbalbufficon": "buff_dk_ts",
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点"

View File

@ -6,11 +6,11 @@
"reword": [
{
"a": "item",
"t": "60001",
"t": "60002",
"n": 1
}
],
"action": "Skill_2",
"action": "25004_cheer_act",
"stage": 1
},
{
@ -24,7 +24,7 @@
"n": 2
}
],
"action": "Skill_2",
"action": "25004_cheer_act",
"stage": 2
},
{
@ -34,25 +34,11 @@
"reword": [
{
"a": "item",
"t": "60003",
"t": "60002",
"n": 3
}
],
"action": "Skill_2",
"action": "25004_cheer_act",
"stage": 3
},
{
"key": 4,
"id_tag": 2,
"active": 160,
"reword": [
{
"a": "item",
"t": "60003",
"n": 4
}
],
"action": "Skill_2",
"stage": 4
}
]

View File

@ -5,7 +5,7 @@
"id_tag": 2,
"task_display": {
"key": "task_20001",
"text": "进行10次普通招募"
"text": "进行5次普通招募"
},
"type_id": 3018001,
"active": 40,
@ -26,7 +26,7 @@
"id_tag": 2,
"task_display": {
"key": "task_20002",
"text": "为任意英雄提升10次等级"
"text": "为任意英雄提升5次等级"
},
"type_id": 3024001,
"active": 40,
@ -47,7 +47,7 @@
"id_tag": 2,
"task_display": {
"key": "task_20003",
"text": "强化任意装备成功6次"
"text": "强化任意装备成功7次"
},
"type_id": 3047001,
"active": 40,

View File

@ -18,7 +18,7 @@
},
"npctxt": {
"key": "Mainline_Tasks1_1_Receiving",
"text": "寻找熊猫"
"text": "和阿宝聊聊"
},
"npc": 10010,
"completetasktxt": {
@ -62,7 +62,7 @@
},
"npctxt": {
"key": "Mainline_Tasks1_2_Receiving",
"text": "美好的风景总是让人流连,忍不住心向往之,倾心守护。"
"text": "去路口寻找阿宝"
},
"npc": 10020,
"completetasktxt": {
@ -238,7 +238,7 @@
},
"npctxt": {
"key": "Mainline_Tasks1_6_Receiving",
"text": "被月中人选中之人,终将为守护而生。"
"text": "和阿宝聊聊"
},
"npc": 10060,
"completetasktxt": {
@ -424,7 +424,7 @@
},
"npctxt": {
"key": "Mainline_Tasks1_10_Receiving",
"text": "月光原石回到了它应该在的位置。"
"text": "骇客蛛会教我怎么做"
},
"npc": 10100,
"completetasktxt": {
@ -556,7 +556,7 @@
},
"npctxt": {
"key": "Mainline_Tasks1_13_Receiving",
"text": "梦魇消失了,虽然危险的根源并未被根除,但至少现在我们安全了,暂时的。"
"text": "找骇客蛛指定战术"
},
"npc": 10130,
"completetasktxt": {
@ -673,7 +673,7 @@
"key": 40010,
"lock": 1,
"lockend": 0,
"ontxe": 20020,
"ontxe": 20090,
"id_after": 40020,
"group": 320,
"des": 3,
@ -761,7 +761,7 @@
"key": 50010,
"lock": 1,
"lockend": 0,
"ontxe": 20030,
"ontxe": 200600,
"id_after": 50011,
"group": 330,
"des": 3,
@ -849,7 +849,7 @@
"key": 60010,
"lock": 1,
"lockend": 0,
"ontxe": 20040,
"ontxe": 20100,
"id_after": 0,
"group": 340,
"des": 3,
@ -893,7 +893,7 @@
"key": 70010,
"lock": 1,
"lockend": 0,
"ontxe": 20050,
"ontxe": 20120,
"id_after": 0,
"group": 350,
"des": 3,
@ -981,7 +981,7 @@
"key": 100040,
"lock": 5,
"lockend": 20,
"ontxe": 20030,
"ontxe": 20110,
"id_after": 0,
"group": 113,
"des": 1,
@ -1025,7 +1025,7 @@
"key": 500010,
"lock": 9,
"lockend": 15,
"ontxe": 20090,
"ontxe": 20120,
"id_after": 0,
"group": 410,
"des": 4,

View File

@ -4,6 +4,7 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
//任务奖励领取
@ -85,6 +86,56 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
ue.Activeweek = ue.Activeweek + conf.Active
update["activeweek"] = ue.Activeweek
}
// 周任务 自动领取奖励
if comm.TaskTag(req.TaskTag) == comm.TASK_WEEKLY {
TaskActive := make(map[string]interface{})
activeList := this.moduleTask.modelTaskActive.getActiveList(uid)
var rewards []*cfg.Gameatn
var maxTaskId int32
for _, v := range activeList {
if v.Received != 1 {
conf := this.moduleTask.configure.getTaskActiveById(v.TaskId)
if conf == nil {
code = pb.ErrorCode_ConfigNoFound
return
}
if ue.Activeweek < conf.Active {
continue
}
v.Received = 1
rewards = append(rewards, conf.Reword...)
}
maxTaskId = v.TaskId
}
if len(rewards) > 0 {
TaskActive["activityList"] = activeList
if err := this.moduleTask.modelTaskActive.Change(session.GetUserId(), TaskActive); err != nil {
this.moduleTask.Errorf("updateReceive err %v", err)
code = pb.ErrorCode_DBError
return
}
//派发奖励
if code = this.moduleTask.DispenseRes(session, rewards, true); code != pb.ErrorCode_Success {
this.moduleTask.Error("活跃度奖励",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "rewards", Value: rewards},
log.Field{Key: "code", Value: code},
)
}
err := session.SendMsg(string(this.moduleTask.GetType()), "activereceive", &pb.TaskActiveReceivePush{
TaskTag: int32(comm.TASK_WEEKLY),
Id: maxTaskId,
})
if err != nil {
code = pb.ErrorCode_SystemError
return
}
}
}
}
if len(update) > 0 {

View File

@ -668,6 +668,61 @@ func (x *TaskFinishedPush) GetTaskId() int32 {
return 0
}
type TaskActiveReceivePush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TaskTag int32 `protobuf:"varint,1,opt,name=taskTag,proto3" json:"taskTag"`
Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id"`
}
func (x *TaskActiveReceivePush) Reset() {
*x = TaskActiveReceivePush{}
if protoimpl.UnsafeEnabled {
mi := &file_task_task_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *TaskActiveReceivePush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*TaskActiveReceivePush) ProtoMessage() {}
func (x *TaskActiveReceivePush) ProtoReflect() protoreflect.Message {
mi := &file_task_task_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use TaskActiveReceivePush.ProtoReflect.Descriptor instead.
func (*TaskActiveReceivePush) Descriptor() ([]byte, []int) {
return file_task_task_msg_proto_rawDescGZIP(), []int{13}
}
func (x *TaskActiveReceivePush) GetTaskTag() int32 {
if x != nil {
return x.TaskTag
}
return 0
}
func (x *TaskActiveReceivePush) GetId() int32 {
if x != nil {
return x.Id
}
return 0
}
var File_task_task_msg_proto protoreflect.FileDescriptor
var file_task_task_msg_proto_rawDesc = []byte{
@ -716,8 +771,12 @@ var file_task_task_msg_proto_rawDesc = []byte{
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x10, 0x54, 0x61, 0x73,
0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a,
0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
0x61, 0x73, 0x6b, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x41, 0x0a, 0x15, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74,
0x69, 0x76, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18,
0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -732,7 +791,7 @@ func file_task_task_msg_proto_rawDescGZIP() []byte {
return file_task_task_msg_proto_rawDescData
}
var file_task_task_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_task_task_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
var file_task_task_msg_proto_goTypes = []interface{}{
(*TaskGetrecordReq)(nil), // 0: TaskGetrecordReq
(*TaskGetrecordResp)(nil), // 1: TaskGetrecordResp
@ -747,14 +806,15 @@ var file_task_task_msg_proto_goTypes = []interface{}{
(*TaskActiveReceiveReq)(nil), // 10: TaskActiveReceiveReq
(*TaskActiveReceiveResp)(nil), // 11: TaskActiveReceiveResp
(*TaskFinishedPush)(nil), // 12: TaskFinishedPush
(*DBRtaskRecord)(nil), // 13: DBRtaskRecord
(*TaskData)(nil), // 14: TaskData
(*ActivityData)(nil), // 15: ActivityData
(*TaskActiveReceivePush)(nil), // 13: TaskActiveReceivePush
(*DBRtaskRecord)(nil), // 14: DBRtaskRecord
(*TaskData)(nil), // 15: TaskData
(*ActivityData)(nil), // 16: ActivityData
}
var file_task_task_msg_proto_depIdxs = []int32{
13, // 0: TaskGetrecordResp.record:type_name -> DBRtaskRecord
14, // 1: TaskListResp.list:type_name -> TaskData
15, // 2: TaskActiveListResp.list:type_name -> ActivityData
14, // 0: TaskGetrecordResp.record:type_name -> DBRtaskRecord
15, // 1: TaskListResp.list:type_name -> TaskData
16, // 2: TaskActiveListResp.list:type_name -> ActivityData
3, // [3:3] is the sub-list for method output_type
3, // [3:3] is the sub-list for method input_type
3, // [3:3] is the sub-list for extension type_name
@ -925,6 +985,18 @@ func file_task_task_msg_proto_init() {
return nil
}
}
file_task_task_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*TaskActiveReceivePush); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -932,7 +1004,7 @@ func file_task_task_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_task_task_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 13,
NumMessages: 14,
NumExtensions: 0,
NumServices: 0,
},

View File

@ -25,7 +25,7 @@ type GameLinestoryMainTaskData struct {
const TypeId_GameLinestoryMainTaskData = 1251904205
func (*GameLinestoryMainTaskData) GetTypeId() int32 {
return 1251904205
return 1251904205
}
func (_v *GameLinestoryMainTaskData)Deserialize(_buf map[string]interface{}) (err error) {
@ -42,10 +42,10 @@ func (_v *GameLinestoryMainTaskData)Deserialize(_buf map[string]interface{}) (er
}
func DeserializeGameLinestoryMainTaskData(_buf map[string]interface{}) (*GameLinestoryMainTaskData, error) {
v := &GameLinestoryMainTaskData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
v := &GameLinestoryMainTaskData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}