diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 19b6b6ac1..972ddd2cd 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -525,6 +525,6 @@ "GuildBoss_MaxBuyNum": 5, "GuildBoss_troop2": 45, "GuildBoss_troop3": 60, - "zhayantime": 3 + "zhayantime": 5 } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 45b880292..4c96cbc7b 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -4363,10 +4363,10 @@ "y": 0, "z": 0 }, - "skill": 143901011, - "skill1": 143901111, - "skill2": 143901211, - "skill3": 143901311, + "skill": 0, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_43901", "text": "" @@ -4424,10 +4424,10 @@ "y": 0, "z": 0 }, - "skill": 143902011, - "skill1": 143902111, - "skill2": 143902211, - "skill3": 143902311, + "skill": 0, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_43902", "text": "" @@ -4485,10 +4485,10 @@ "y": 0, "z": 0 }, - "skill": 143903011, - "skill1": 143903111, - "skill2": 143903211, - "skill3": 143903311, + "skill": 0, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_43903", "text": "" @@ -4547,9 +4547,9 @@ "z": 0 }, "skill": 0, - "skill1": 142911111, - "skill2": 142911211, - "skill3": 142911311, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_42911", "text": "" @@ -4608,9 +4608,9 @@ "z": 0 }, "skill": 0, - "skill1": 143911111, - "skill2": 143911211, - "skill3": 143911311, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_43911", "text": "" @@ -4669,9 +4669,9 @@ "z": 0 }, "skill": 0, - "skill1": 144911111, - "skill2": 144911211, - "skill3": 144911311, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_44911", "text": "" @@ -4730,9 +4730,9 @@ "z": 0 }, "skill": 0, - "skill1": 143921111, - "skill2": 143921211, - "skill3": 143921311, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_43921", "text": "" @@ -4791,9 +4791,9 @@ "z": 0 }, "skill": 0, - "skill1": 144921111, - "skill2": 144921211, - "skill3": 144921311, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_44921", "text": "" @@ -4852,9 +4852,9 @@ "z": 0 }, "skill": 0, - "skill1": 145921111, - "skill2": 145921211, - "skill3": 145921311, + "skill1": 0, + "skill2": 0, + "skill3": 0, "txt": { "key": "atlas_45921", "text": "" diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index b06003ba5..85abc79d6 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -64,8 +64,7 @@ } ], "FormatList": [ - 101071, - 101072 + 101011 ], "captainId": 240025, "star": [ @@ -149,8 +148,7 @@ } ], "FormatList": [ - 101081, - 101082 + 101021 ], "captainId": 240025, "star": [ @@ -234,8 +232,8 @@ } ], "FormatList": [ - 101091, - 101092 + 101031, + 101032 ], "captainId": 240025, "star": [ @@ -319,8 +317,8 @@ } ], "FormatList": [ - 101101, - 101102 + 101041, + 101042 ], "captainId": 530013, "star": [ @@ -404,8 +402,8 @@ } ], "FormatList": [ - 102011, - 102021 + 101051, + 101052 ], "captainId": 440053, "star": [ @@ -489,8 +487,8 @@ } ], "FormatList": [ - 102031, - 102032 + 101061, + 101062 ], "captainId": 440063, "star": [ @@ -574,8 +572,7 @@ } ], "FormatList": [ - 102041, - 102042 + 102011 ], "captainId": 240025, "star": [ @@ -659,9 +656,7 @@ } ], "FormatList": [ - 102051, - 102052, - 102032 + 102021 ], "captainId": 240025, "star": [ @@ -745,8 +740,8 @@ } ], "FormatList": [ - 102061, - 102062 + 102031, + 102032 ], "captainId": 240025, "star": [ @@ -830,8 +825,8 @@ } ], "FormatList": [ - 102071, - 102072 + 102041, + 102042 ], "captainId": 530013, "star": [ @@ -915,8 +910,8 @@ } ], "FormatList": [ - 102081, - 102082 + 102051, + 102052 ], "captainId": 440053, "star": [ @@ -1000,8 +995,8 @@ } ], "FormatList": [ - 102091, - 102092 + 102061, + 102062 ], "captainId": 440063, "star": [ @@ -1085,8 +1080,7 @@ } ], "FormatList": [ - 102101, - 102102 + 103011 ], "captainId": 240025, "star": [ @@ -1170,7 +1164,6 @@ } ], "FormatList": [ - 103011, 103021 ], "captainId": 240025, @@ -1340,9 +1333,8 @@ } ], "FormatList": [ - 101101, - 101102, - 101103 + 103041, + 103042 ], "captainId": 530013, "star": [ @@ -1426,7 +1418,8 @@ } ], "FormatList": [ - 101011 + 103051, + 103052 ], "captainId": 440053, "star": [ @@ -1510,7 +1503,8 @@ } ], "FormatList": [ - 101011 + 103061, + 103062 ], "captainId": 440063, "star": [ @@ -1594,7 +1588,7 @@ } ], "FormatList": [ - 101021 + 104011 ], "captainId": 240025, "star": [ @@ -1678,8 +1672,7 @@ } ], "FormatList": [ - 101031, - 101032 + 104021 ], "captainId": 240025, "star": [ @@ -1763,8 +1756,8 @@ } ], "FormatList": [ - 101041, - 101042 + 104031, + 104032 ], "captainId": 240025, "star": [ @@ -1848,8 +1841,8 @@ } ], "FormatList": [ - 101051, - 101052 + 104041, + 104042 ], "captainId": 530013, "star": [ @@ -1933,8 +1926,8 @@ } ], "FormatList": [ - 101061, - 101062 + 104051, + 104052 ], "captainId": 440053, "star": [ @@ -2018,8 +2011,8 @@ } ], "FormatList": [ - 101071, - 101072 + 104061, + 104062 ], "captainId": 440063, "star": [ diff --git a/bin/json/game_newguide.json b/bin/json/game_newguide.json index 200dc5cce..f30b9bc0b 100644 --- a/bin/json/game_newguide.json +++ b/bin/json/game_newguide.json @@ -72,41 +72,6 @@ "skipgroup": 0, "reward": [] }, - { - "id": 30, - "group": 30, - "type": 3, - "startPar": "", - "parameter": "", - "interface": "", - "condition": "worldtask_20020", - "followtj": "", - "followguide": 0, - "finger": [], - "offset": { - "x": 0, - "y": 0 - }, - "fingerTime": 0, - "objSize": { - "x": 0, - "y": 0 - }, - "objOffset": { - "x": 0, - "y": 0 - }, - "txt": "502", - "speakerface": 0, - "sound": "", - "mask": 0, - "lock": 0, - "uishow": 0, - "skiptime": 10000, - "skip": 0, - "skipgroup": 0, - "reward": [] - }, { "id": 40, "group": 40, @@ -172,13 +137,739 @@ "mask": 0, "lock": 0, "uishow": 0, - "skiptime": 0, + "skiptime": 10000, "skip": 0, "skipgroup": 0, "reward": [] }, { "id": 60, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20170", + "followtj": "OpenRecruit", + "followguide": 70, + "finger": [ + "3d", + "Root/程序/EntityInteraction/Middle/Recruit" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 1, + "objSize": { + "x": 200, + "y": 200 + }, + "objOffset": { + "x": -100, + "y": -100 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 70, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "OpenRecruittendraw", + "followguide": 80, + "finger": [ + "recruit", + "btn_onedraw$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 1, + "reward": [] + }, + { + "id": 80, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 90, + "finger": [ + "recruittendraw", + "btn_return$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 90, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "OpenMaininterFace", + "followguide": 0, + "finger": [ + "recruit", + "btn_back$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 1, + "reward": [] + }, + { + "id": 120, + "group": 70, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20190", + "followtj": "", + "followguide": 130, + "finger": [ + "swipe", + "right" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 1, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 130, + "group": 70, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "OpenSmithyMain", + "followguide": 140, + "finger": [ + "3d", + "Root/程序/EntityInteraction/Right/GeBoTieJiangPu" + ], + "offset": { + "x": 0, + "y": -15 + }, + "fingerTime": 1, + "objSize": { + "x": 300, + "y": 300 + }, + "objOffset": { + "x": -150, + "y": -150 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 140, + "group": 70, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "3d", + "暴夫纳特铁匠铺" + ], + "offset": { + "x": 0, + "y": -15 + }, + "fingerTime": 1, + "objSize": { + "x": 300, + "y": 300 + }, + "objOffset": { + "x": -150, + "y": -150 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 150, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20200", + "followtj": "", + "followguide": 160, + "finger": [ + "3d", + "Root/程序/Interaction/Workbench0" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.8, + "objSize": { + "x": 200, + "y": 200 + }, + "objOffset": { + "x": -100, + "y": -100 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 160, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 170, + "finger": [ + "smithy", + "btn_order$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 170, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 180, + "finger": [ + "smithy", + "right$.listForgingTable$", + "0", + "laAdd$.btnPlus$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 180, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 190, + "finger": [ + "smithy", + "right$.btnUp$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 190, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 200, + "finger": [ + "smithy", + "comPrompt$.comPromptitem$.btnDetermine$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 200, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 210, + "finger": [ + "smithy", + "btn_back$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 210, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "3d", + "暴夫纳特铁匠铺" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 200, + "y": 200 + }, + "objOffset": { + "x": -100, + "y": -100 + }, + "txt": "303", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 1, + "reward": [] + }, + { + "id": 220, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20150", + "followtj": "", + "followguide": 230, + "finger": [ + "maininterface", + "btn_card$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 230, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 240, + "finger": [ + "herocard", + "roleListCom$.heroList$", + "1" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 1, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 240, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 250, + "finger": [ + "herocard", + "com_heroInfo$.upenter" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 250, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 260, + "finger": [ + "herocard", + "heroInfoCom$.chooselistgcom$.list", + "0" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 260, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "herocard", + "heroInfoCom$.upbtn$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 270, "group": 100, "type": 3, "startPar": "", @@ -186,7 +877,7 @@ "interface": "", "condition": "worldtask_30090", "followtj": "OpenBattleReady", - "followguide": 70, + "followguide": 280, "finger": [ "3d", "新手引导-杰克第一幕1" @@ -216,7 +907,7 @@ "reward": [] }, { - "id": 70, + "id": 280, "group": 100, "type": 3, "startPar": "", @@ -224,7 +915,7 @@ "interface": "", "condition": "", "followtj": "", - "followguide": 80, + "followguide": 290, "finger": [ "battleready", "herolist$", @@ -255,7 +946,7 @@ "reward": [] }, { - "id": 80, + "id": 290, "group": 100, "type": 3, "startPar": "", @@ -263,7 +954,7 @@ "interface": "", "condition": "", "followtj": "battle", - "followguide": 90, + "followguide": 300, "finger": [ "battleready", "btn_start$" @@ -293,7 +984,7 @@ "reward": [] }, { - "id": 90, + "id": 300, "group": 100, "type": 3, "startPar": "", @@ -301,7 +992,7 @@ "interface": "", "condition": "", "followtj": "FightEnd", - "followguide": 100, + "followguide": 310, "finger": [ "zhandou", "skilllist$", @@ -333,7 +1024,7 @@ "reward": [] }, { - "id": 100, + "id": 310, "group": 100, "type": 3, "startPar": "StopSettlement", @@ -341,7 +1032,7 @@ "interface": "", "condition": "", "followtj": "OpenSettlement", - "followguide": 110, + "followguide": 320, "finger": [], "offset": { "x": 0, @@ -368,7 +1059,7 @@ "reward": [] }, { - "id": 110, + "id": 320, "group": 100, "type": 3, "startPar": "", diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index cc95de0e0..242811a0a 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -242,7 +242,7 @@ "main": [ { "key": "platlv", - "param": 1 + "param": 2 }, { "key": "maxmapid", @@ -736,10 +736,6 @@ "main": [ { "key": "platlv", - "param": 10 - }, - { - "key": "maxmapid", "param": 1 } ], @@ -1582,7 +1578,7 @@ "main": [ { "key": "worldtaskid", - "param": 20060 + "param": 20010 } ], "optional": "", @@ -1604,7 +1600,7 @@ "main": [ { "key": "worldtaskid", - "param": 20060 + "param": 20010 } ], "optional": "", @@ -1626,7 +1622,7 @@ "main": [ { "key": "worldtaskid", - "param": 20060 + "param": 20010 } ], "optional": "", diff --git a/bin/json/game_show.json b/bin/json/game_show.json index 1eefbdc59..a371ace75 100644 --- a/bin/json/game_show.json +++ b/bin/json/game_show.json @@ -8,7 +8,8 @@ "access": 0, "position": "", "sex": 1, - "resources": "10000_Mexplore" + "resources": "10000_Mexplore", + "vague": "10000MT" }, { "id": 100002, @@ -19,7 +20,8 @@ "access": 0, "position": "", "sex": 1, - "resources": "10000_Mexplore" + "resources": "10000_Mexplore", + "vague": "10000MT" }, { "id": 100003, @@ -30,7 +32,8 @@ "access": 0, "position": "", "sex": 1, - "resources": "10000_Mexplore" + "resources": "10000_Mexplore", + "vague": "10000MT" }, { "id": 200001, @@ -41,7 +44,8 @@ "access": 0, "position": "", "sex": 2, - "resources": "10000_Mexplore" + "resources": "10000_Mexplore", + "vague": "10000MT" }, { "id": 200002, @@ -52,7 +56,8 @@ "access": 0, "position": "", "sex": 2, - "resources": "10000_Mexplore" + "resources": "10000_Mexplore", + "vague": "10000MT" }, { "id": 200003, @@ -63,6 +68,7 @@ "access": 0, "position": "", "sex": 2, - "resources": "10000_Mexplore" + "resources": "10000_Mexplore", + "vague": "10000MT" } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index ced9f5dac..1cc5ef9cd 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -10670,7 +10670,9 @@ 4, 550 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003122 ], @@ -10716,7 +10718,9 @@ 4, 550 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003132 ], @@ -10762,7 +10766,9 @@ 4, 600 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003142 ], @@ -10808,7 +10814,9 @@ 4, 700 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003152 ], @@ -10894,14 +10902,16 @@ "Where": [], "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, 4, - 1500 + 75 + ], + "FollowSK": [ + 214003113 ], - "FollowSK": [], "SucFollowSK": [ 214003214 ], @@ -10943,14 +10953,16 @@ "Where": [], "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, 4, - 1600 + 800 + ], + "FollowSK": [ + 214003113 ], - "FollowSK": [], "SucFollowSK": [ 214003224 ], @@ -10992,14 +11004,16 @@ "Where": [], "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, 4, - 1600 + 800 + ], + "FollowSK": [ + 214003113 ], - "FollowSK": [], "SucFollowSK": [ 214003234 ], @@ -11041,14 +11055,16 @@ "Where": [], "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, 4, - 1800 + 900 + ], + "FollowSK": [ + 214003113 ], - "FollowSK": [], "SucFollowSK": [ 214003244 ], @@ -11097,7 +11113,9 @@ 4, 500 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003312 ], @@ -11143,7 +11161,9 @@ 4, 550 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003322 ], @@ -11189,7 +11209,9 @@ 4, 550 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003332 ], @@ -11235,7 +11257,9 @@ 4, 600 ], - "FollowSK": [], + "FollowSK": [ + 214003113 + ], "SucFollowSK": [ 214003342 ], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 5cd63d944..42608a77b 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -7022,7 +7022,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003111 ] }, @@ -7051,7 +7050,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003121 ] }, @@ -7080,7 +7078,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003131 ] }, @@ -7109,7 +7106,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003141 ] }, @@ -7138,7 +7134,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003151 ] }, @@ -7167,7 +7162,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003211, 214003213 ] @@ -7197,7 +7191,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003211, 214003223 ] @@ -7227,7 +7220,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003211, 214003233 ] @@ -7257,7 +7249,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003211, 214003243 ] @@ -7287,7 +7278,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003211, 214003243 ] @@ -7317,7 +7307,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003311 ] }, @@ -7346,7 +7335,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003321 ] }, @@ -7375,7 +7363,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003331 ] }, @@ -7404,7 +7391,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003341 ] }, @@ -7433,7 +7419,6 @@ "Target": 2, "ChildSkill": { "Id": [ - 214003113, 214003341 ] }, @@ -8021,7 +8006,7 @@ "key": "skillname_113003111", "text": "冲击之拳" }, - "ico": "jn_icon_054", + "ico": "jn_13003_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -8049,7 +8034,7 @@ "key": "skillname_113003211", "text": "能量窃取" }, - "ico": "jn_icon_055", + "ico": "jn_13003_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -8080,7 +8065,7 @@ "key": "skillname_113003311", "text": "灵魂吞噬" }, - "ico": "jn_icon_056", + "ico": "jn_13003_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -8138,7 +8123,7 @@ "key": "skillname_135005111", "text": "策马扬鞭" }, - "ico": "jn_icon_054", + "ico": "jn_35005_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -8167,7 +8152,7 @@ "key": "skillname_135005211", "text": "金苹果" }, - "ico": "jn_icon_055", + "ico": "jn_35005_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -8196,7 +8181,7 @@ "key": "skillname_135005311", "text": "荒野飞渡" }, - "ico": "jn_icon_056", + "ico": "jn_35005_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -8254,7 +8239,7 @@ "key": "skillname_115001111", "text": "猎魂砍击" }, - "ico": "jn_icon_054", + "ico": "jn_15001_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -8283,7 +8268,7 @@ "key": "skillname_115001211", "text": "奥术护身符" }, - "ico": "jn_icon_055", + "ico": "jn_15001_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_2", @@ -8313,7 +8298,7 @@ "key": "skillname_115001311", "text": "清算时刻" }, - "ico": "jn_icon_056", + "ico": "jn_15001_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -8372,7 +8357,7 @@ "key": "skillname_145001111", "text": "厚德载物" }, - "ico": "jn_icon_054", + "ico": "jn_45001_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -8401,7 +8386,7 @@ "key": "skillname_145001211", "text": "抱朴守真" }, - "ico": "jn_icon_055", + "ico": "jn_45001_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -8430,7 +8415,7 @@ "key": "skillname_145001311", "text": "负阴冲阳" }, - "ico": "jn_icon_056", + "ico": "jn_45001_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -8460,7 +8445,7 @@ "key": "skillname_114001111", "text": "破釜千钧" }, - "ico": "jn_icon_054", + "ico": "jn_14001_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -8488,7 +8473,7 @@ "key": "skillname_114001211", "text": "万夫莫开" }, - "ico": "jn_icon_055", + "ico": "jn_14001_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -8516,7 +8501,7 @@ "key": "skillname_114001311", "text": "我意天下" }, - "ico": "jn_icon_056", + "ico": "jn_14001_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -8574,7 +8559,7 @@ "key": "skillname_124008111", "text": "其利断金" }, - "ico": "jn_icon_054", + "ico": "jn_24008_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -8603,7 +8588,7 @@ "key": "skillname_124008211", "text": "威慑回马扫" }, - "ico": "jn_icon_055", + "ico": "jn_24008_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_2", @@ -8632,7 +8617,7 @@ "key": "skillname_124008311", "text": "破甲之枪" }, - "ico": "jn_icon_056", + "ico": "jn_24008_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -8776,7 +8761,7 @@ "key": "skillname_113002111", "text": "食人之咬" }, - "ico": "jn_icon_054", + "ico": "jn_13002_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -8805,7 +8790,7 @@ "key": "skillname_113002211", "text": "锯齿拉链" }, - "ico": "jn_icon_055", + "ico": "jn_13002_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_2", @@ -8833,7 +8818,7 @@ "key": "skillname_113002311", "text": "生化武器" }, - "ico": "jn_icon_056", + "ico": "jn_13002_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -9004,7 +8989,7 @@ "key": "skillname_114006111", "text": "夺魂之击" }, - "ico": "jn_icon_054", + "ico": "jn_14006_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -9033,7 +9018,7 @@ "key": "skillname_114006211", "text": "静止之舞" }, - "ico": "jn_icon_055", + "ico": "jn_14006_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_2", @@ -9061,7 +9046,7 @@ "key": "skillname_114006311", "text": "无尽催眠曲" }, - "ico": "jn_icon_056", + "ico": "jn_14006_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -9119,7 +9104,7 @@ "key": "skillname_135006111", "text": "冲云天" }, - "ico": "jn_icon_054", + "ico": "jn_35006_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -9147,7 +9132,7 @@ "key": "skillname_135006211", "text": "蒸扇笼" }, - "ico": "jn_icon_055", + "ico": "jn_35006_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -9176,7 +9161,7 @@ "key": "skillname_135006311", "text": "饮汤饼" }, - "ico": "jn_icon_056", + "ico": "jn_35006_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -9233,7 +9218,7 @@ "key": "skillname_134002111", "text": "玩具·锋刃" }, - "ico": "jn_icon_054", + "ico": "jn_34002_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -9261,7 +9246,7 @@ "key": "skillname_134002211", "text": "信仰·勇气" }, - "ico": "jn_icon_055", + "ico": "jn_34002_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -9290,7 +9275,7 @@ "key": "skillname_134002311", "text": "奶瓶·爱心" }, - "ico": "jn_icon_056", + "ico": "jn_34002_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -9347,7 +9332,7 @@ "key": "skillname_124005111", "text": "猿猱欲度" }, - "ico": "jn_icon_054", + "ico": "jn_24005_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -9375,7 +9360,7 @@ "key": "skillname_124005211", "text": "水中取月" }, - "ico": "jn_icon_055", + "ico": "jn_24005_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -9403,7 +9388,7 @@ "key": "skillname_124005311", "text": "猿声啼岸" }, - "ico": "jn_icon_056", + "ico": "jn_24005_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -9461,7 +9446,7 @@ "key": "skillname_125003111", "text": "参星" }, - "ico": "jn_icon_054", + "ico": "jn_25003_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -9489,7 +9474,7 @@ "key": "skillname_125003211", "text": "奉道" }, - "ico": "jn_icon_055", + "ico": "jn_25003_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -9517,7 +9502,7 @@ "key": "skillname_125003311", "text": "拜斗知命" }, - "ico": "jn_icon_056", + "ico": "jn_25003_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -9659,7 +9644,7 @@ "key": "skillname_133003111", "text": "淬毒箭矢" }, - "ico": "jn_icon_054", + "ico": "jn_33003_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -9687,7 +9672,7 @@ "key": "skillname_133003211", "text": "猎手习性" }, - "ico": "jn_icon_055", + "ico": "jn_33003_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -9715,7 +9700,7 @@ "key": "skillname_133003311", "text": "破甲连珠箭" }, - "ico": "jn_icon_056", + "ico": "jn_33003_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -9969,7 +9954,7 @@ "key": "skillname_144004111", "text": "U盘投掷" }, - "ico": "jn_icon_054", + "ico": "jn_44004_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -9997,7 +9982,7 @@ "key": "skillname_144004211", "text": "芯片清算" }, - "ico": "jn_icon_055", + "ico": "jn_44004_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -10026,7 +10011,7 @@ "key": "skillname_144004311", "text": "骇客光波" }, - "ico": "jn_icon_056", + "ico": "jn_44004_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -10083,7 +10068,7 @@ "key": "skillname_134007111", "text": "跳跃华尔兹" }, - "ico": "jn_icon_054", + "ico": "jn_34007_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -10112,7 +10097,7 @@ "key": "skillname_134007211", "text": "回旋圆舞曲" }, - "ico": "jn_icon_055", + "ico": "jn_34007_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_2", @@ -10142,7 +10127,7 @@ "key": "skillname_134007311", "text": "绿荫咏叹调" }, - "ico": "jn_icon_056", + "ico": "jn_34007_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -10397,7 +10382,7 @@ "key": "skillname_114005111", "text": "松风鹤鸣" }, - "ico": "jn_icon_054", + "ico": "jn_14005_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -10426,7 +10411,7 @@ "key": "skillname_114005211", "text": "仙鹤亮翅" }, - "ico": "jn_icon_055", + "ico": "jn_14005_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_2", @@ -10457,7 +10442,7 @@ "key": "skillname_114005311", "text": "高天鹤唳" }, - "ico": "jn_icon_056", + "ico": "jn_14005_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -10600,7 +10585,7 @@ "key": "skillname_143003111", "text": "帕丘克剑术" }, - "ico": "jn_icon_054", + "ico": "jn_43003_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -10628,7 +10613,7 @@ "key": "skillname_143003211", "text": "骑士精神" }, - "ico": "jn_icon_055", + "ico": "jn_43003_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -10656,7 +10641,7 @@ "key": "skillname_143003311", "text": "信仰念力" }, - "ico": "jn_icon_056", + "ico": "jn_43003_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -10685,7 +10670,7 @@ "key": "skillname_143005111", "text": "凶悍锤击" }, - "ico": "jn_icon_054", + "ico": "jn_43005_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -10713,7 +10698,7 @@ "key": "skillname_143005211", "text": "瞄准弱点" }, - "ico": "jn_icon_055", + "ico": "jn_43005_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -10743,7 +10728,7 @@ "key": "skillname_143005311", "text": "威严震慑" }, - "ico": "jn_icon_056", + "ico": "jn_43005_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -10799,7 +10784,7 @@ "key": "skillname_115002111", "text": "冒险精神" }, - "ico": "jn_icon_054", + "ico": "jn_15002_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -10827,7 +10812,7 @@ "key": "skillname_115002211", "text": "临场妙算" }, - "ico": "jn_icon_055", + "ico": "jn_15002_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -10856,7 +10841,7 @@ "key": "skillname_115002311", "text": "领袖才能" }, - "ico": "jn_icon_056", + "ico": "jn_15002_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -10918,7 +10903,7 @@ "key": "skillname_113005111", "text": "前冲:肚皮顶" }, - "ico": "jn_icon_054", + "ico": "jn_13005_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -10947,7 +10932,7 @@ "key": "skillname_113005211", "text": "附魔:小指头" }, - "ico": "jn_icon_055", + "ico": "jn_13005_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -10979,7 +10964,7 @@ "key": "skillname_113005311", "text": "舞蹈狂欢夜" }, - "ico": "jn_icon_056", + "ico": "jn_13005_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -11037,7 +11022,7 @@ "key": "skillname_124009111", "text": "积雨云" }, - "ico": "jn_icon_054", + "ico": "jn_24009_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -11067,7 +11052,7 @@ "key": "skillname_124009211", "text": "碎冰云" }, - "ico": "jn_icon_055", + "ico": "jn_24009_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -11098,7 +11083,7 @@ "key": "skillname_124009311", "text": "雷暴冻云" }, - "ico": "jn_icon_056", + "ico": "jn_24009_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -11243,7 +11228,7 @@ "key": "skillname_151006111", "text": "横冲直撞" }, - "ico": "jn_icon_054", + "ico": "jn_51006_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -11271,7 +11256,7 @@ "key": "skillname_151006211", "text": "矢气排放" }, - "ico": "jn_icon_055", + "ico": "jn_51006_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -11523,7 +11508,7 @@ "key": "skillname_145004111", "text": "宫廷之花剑" }, - "ico": "jn_icon_054", + "ico": "jn_45004_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -11551,7 +11536,7 @@ "key": "skillname_145004211", "text": "薛定谔连斩" }, - "ico": "jn_icon_055", + "ico": "jn_45004_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -11581,7 +11566,7 @@ "key": "skillname_145004311", "text": "飞刺芭蕾舞" }, - "ico": "jn_icon_056", + "ico": "jn_45004_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -12133,7 +12118,7 @@ "key": "skillname_153003111", "text": "针棘之刺" }, - "ico": "jn_icon_054", + "ico": "jn_53003_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -12161,7 +12146,7 @@ "key": "skillname_153003211", "text": "御敌本能" }, - "ico": "jn_icon_055", + "ico": "jn_53003_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -12448,7 +12433,7 @@ "key": "skillname_134004111", "text": "顾此及彼" }, - "ico": "jn_icon_054", + "ico": "jn_34004_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -12476,7 +12461,7 @@ "key": "skillname_134004211", "text": "穴居习性" }, - "ico": "jn_icon_055", + "ico": "jn_34004_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_2", @@ -12504,7 +12489,7 @@ "key": "skillname_134004311", "text": "追猎嗥叫" }, - "ico": "jn_icon_056", + "ico": "jn_34004_3", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", @@ -12785,7 +12770,7 @@ "key": "skillname_123001111", "text": "波波光束" }, - "ico": "jn_icon_054", + "ico": "jn_23001_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -12813,7 +12798,7 @@ "key": "skillname_123001211", "text": "船长关怀" }, - "ico": "jn_icon_055", + "ico": "jn_23001_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -12841,7 +12826,7 @@ "key": "skillname_123001311", "text": "全员鼓舞" }, - "ico": "jn_icon_056", + "ico": "jn_23001_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -12897,7 +12882,7 @@ "key": "skillname_124007111", "text": "奇幻肥皂泡" }, - "ico": "jn_icon_054", + "ico": "jn_24007_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -12925,7 +12910,7 @@ "key": "skillname_124007211", "text": "冰冻妙脆角" }, - "ico": "jn_icon_055", + "ico": "jn_24007_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -12955,7 +12940,7 @@ "key": "skillname_124007311", "text": "勇往飞星盘" }, - "ico": "jn_icon_056", + "ico": "jn_24007_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -15192,7 +15177,7 @@ "key": "skillname_144002111", "text": "蛇咬" }, - "ico": "jn_icon_054", + "ico": "jn_44002_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -15220,7 +15205,7 @@ "key": "skillname_144002211", "text": "推推糖馈赠" }, - "ico": "jn_icon_055", + "ico": "jn_44002_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -15248,7 +15233,7 @@ "key": "skillname_144002311", "text": "失乐园" }, - "ico": "jn_icon_056", + "ico": "jn_44002_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 53fdc66c0..db9561657 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -261,13 +261,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "hero", - "t": "44911", - "n": 2 - } - ] + "reword": [] }, { "key": 20011, @@ -353,7 +347,7 @@ 406 ], "completetask": 0, - "auto_accept": 0, + "auto_accept": 1, "overtips": 1, "reword": [] }, @@ -675,7 +669,13 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [] + "reword": [ + { + "a": "item", + "t": "120001", + "n": 3 + } + ] }, { "key": 20190, @@ -714,7 +714,7 @@ ], "getafter_event": [ 2, - 427 + 428 ], "completetask": 0, "auto_accept": 0, @@ -736,7 +736,7 @@ ], "getafter_event": [ 2, - 427 + 429 ], "completetask": 301, "auto_accept": 0, @@ -758,7 +758,7 @@ ], "getafter_event": [ 2, - 427 + 430 ], "completetask": 302, "auto_accept": 0, @@ -780,7 +780,7 @@ ], "getafter_event": [ 2, - 427 + 431 ], "completetask": 303, "auto_accept": 0, diff --git a/sys/configure/structs/Game.ShowData.go b/sys/configure/structs/Game.ShowData.go index 7d66584da..cff75177d 100644 --- a/sys/configure/structs/Game.ShowData.go +++ b/sys/configure/structs/Game.ShowData.go @@ -17,6 +17,7 @@ type GameShowData struct { Position string Sex int32 Resources string + Vague string } const TypeId_GameShowData = 1793917635 @@ -32,6 +33,7 @@ func (_v *GameShowData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Position, _ok_ = _buf["position"].(string); !_ok_ { err = errors.New("position error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sex"].(float64); !_ok_ { err = errors.New("sex error"); return }; _v.Sex = int32(_tempNum_) } { var _ok_ bool; if _v.Resources, _ok_ = _buf["resources"].(string); !_ok_ { err = errors.New("resources error"); return } } + { var _ok_ bool; if _v.Vague, _ok_ = _buf["vague"].(string); !_ok_ { err = errors.New("vague error"); return } } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index db735d2b3..6b499b1b0 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -168,6 +168,7 @@ type GameGlobalData struct { GuildBossMaxBuyNum int32 GuildBossTroop2 int32 GuildBossTroop3 int32 + Zhayantime float32 } const TypeId_GameGlobalData = 477542761 @@ -698,6 +699,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_MaxBuyNum"].(float64); !_ok_ { err = errors.New("GuildBoss_MaxBuyNum error"); return }; _v.GuildBossMaxBuyNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_troop2"].(float64); !_ok_ { err = errors.New("GuildBoss_troop2 error"); return }; _v.GuildBossTroop2 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_troop3"].(float64); !_ok_ { err = errors.New("GuildBoss_troop3 error"); return }; _v.GuildBossTroop3 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["zhayantime"].(float64); !_ok_ { err = errors.New("zhayantime error"); return }; _v.Zhayantime = float32(_tempNum_) } return } diff --git a/sys/configure/structs/game.heroStarup.go b/sys/configure/structs/game.heroStarup.go index fa7823c34..18903d7b2 100644 --- a/sys/configure/structs/game.heroStarup.go +++ b/sys/configure/structs/game.heroStarup.go @@ -9,34 +9,26 @@ package cfg type GameHeroStarup struct { - _dataMap map[int32]*GameHeroStarupData _dataList []*GameHeroStarupData } func NewGameHeroStarup(_buf []map[string]interface{}) (*GameHeroStarup, error) { _dataList := make([]*GameHeroStarupData, 0, len(_buf)) - dataMap := make(map[int32]*GameHeroStarupData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameHeroStarupData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Key] = _v } } - return &GameHeroStarup{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameHeroStarup) GetDataMap() map[int32]*GameHeroStarupData { - return table._dataMap + return &GameHeroStarup{_dataList:_dataList}, nil } func (table *GameHeroStarup) GetDataList() []*GameHeroStarupData { return table._dataList } -func (table *GameHeroStarup) Get(key int32) *GameHeroStarupData { - return table._dataMap[key] +func (table *GameHeroStarup) Get(index int) *GameHeroStarupData { + return table._dataList[index] } -