diff --git a/bin/json/game_annulartask_library.json b/bin/json/game_annulartask_library.json index cc2c4e155..75bfb379f 100644 --- a/bin/json/game_annulartask_library.json +++ b/bin/json/game_annulartask_library.json @@ -1,11 +1,11 @@ [ { - "id": 1, + "id": 2, "assembleid": 60000010, "lvstart": 1, "lvend": 999, - "itemid": 1010, - "itemwt": 1000, + "itemid": 1130, + "itemwt": 10000, "min": 0 }, { @@ -13,26 +13,26 @@ "assembleid": 60000010, "lvstart": 1, "lvend": 999, - "itemid": 1030, - "itemwt": 1000, + "itemid": 1180, + "itemwt": 30000, "min": 0 }, { - "id": 5, + "id": 6, "assembleid": 60000010, "lvstart": 1, "lvend": 999, - "itemid": 1050, - "itemwt": 1000, + "itemid": 1290, + "itemwt": 30000, "min": 0 }, { - "id": 8, + "id": 7, "assembleid": 60000020, "lvstart": 1, "lvend": 999, - "itemid": 1080, - "itemwt": 1000, + "itemid": 1020, + "itemwt": 10000, "min": 0 }, { @@ -40,26 +40,8 @@ "assembleid": 60000020, "lvstart": 1, "lvend": 999, - "itemid": 1090, - "itemwt": 1000, - "min": 0 - }, - { - "id": 10, - "assembleid": 60000020, - "lvstart": 1, - "lvend": 999, - "itemid": 1100, - "itemwt": 1000, - "min": 0 - }, - { - "id": 11, - "assembleid": 60000020, - "lvstart": 1, - "lvend": 999, - "itemid": 1110, - "itemwt": 1000, + "itemid": 1190, + "itemwt": 30000, "min": 0 }, { @@ -67,26 +49,8 @@ "assembleid": 60000020, "lvstart": 1, "lvend": 999, - "itemid": 1120, - "itemwt": 1000, - "min": 0 - }, - { - "id": 13, - "assembleid": 60000030, - "lvstart": 1, - "lvend": 999, - "itemid": 1130, - "itemwt": 1000, - "min": 0 - }, - { - "id": 14, - "assembleid": 60000030, - "lvstart": 1, - "lvend": 999, - "itemid": 1140, - "itemwt": 1000, + "itemid": 1300, + "itemwt": 30000, "min": 0 }, { @@ -94,8 +58,8 @@ "assembleid": 60000030, "lvstart": 1, "lvend": 999, - "itemid": 1150, - "itemwt": 1000, + "itemid": 1200, + "itemwt": 30000, "min": 0 }, { @@ -103,44 +67,17 @@ "assembleid": 60000030, "lvstart": 1, "lvend": 999, - "itemid": 1160, - "itemwt": 1000, - "min": 0 - }, - { - "id": 17, - "assembleid": 60000030, - "lvstart": 1, - "lvend": 999, - "itemid": 1170, - "itemwt": 1000, + "itemid": 1260, + "itemwt": 10000, "min": 0 }, { "id": 18, - "assembleid": 60000040, + "assembleid": 60000030, "lvstart": 1, "lvend": 999, - "itemid": 1180, - "itemwt": 1000, - "min": 0 - }, - { - "id": 19, - "assembleid": 60000040, - "lvstart": 1, - "lvend": 999, - "itemid": 1190, - "itemwt": 1000, - "min": 0 - }, - { - "id": 20, - "assembleid": 60000040, - "lvstart": 1, - "lvend": 999, - "itemid": 1200, - "itemwt": 1000, + "itemid": 1310, + "itemwt": 30000, "min": 0 }, { @@ -149,16 +86,7 @@ "lvstart": 1, "lvend": 999, "itemid": 1210, - "itemwt": 1000, - "min": 0 - }, - { - "id": 22, - "assembleid": 60000040, - "lvstart": 1, - "lvend": 999, - "itemid": 1220, - "itemwt": 1000, + "itemwt": 30000, "min": 0 }, { @@ -166,35 +94,35 @@ "assembleid": 60000040, "lvstart": 1, "lvend": 999, - "itemid": 1230, - "itemwt": 1000, + "itemid": 1110, + "itemwt": 10000, "min": 0 }, { "id": 24, - "assembleid": 60000050, + "assembleid": 60000040, "lvstart": 1, "lvend": 999, - "itemid": 1240, - "itemwt": 1000, + "itemid": 1320, + "itemwt": 30000, "min": 0 }, { - "id": 25, + "id": 27, "assembleid": 60000050, "lvstart": 1, "lvend": 999, - "itemid": 1250, - "itemwt": 1000, + "itemid": 1220, + "itemwt": 30000, "min": 0 }, { - "id": 26, + "id": 30, "assembleid": 60000050, "lvstart": 1, "lvend": 999, - "itemid": 1260, - "itemwt": 1000, + "itemid": 1330, + "itemwt": 30000, "min": 0 } ] \ No newline at end of file diff --git a/bin/json/game_annulartaskall.json b/bin/json/game_annulartaskall.json index f80a913cc..5384e2f8b 100644 --- a/bin/json/game_annulartaskall.json +++ b/bin/json/game_annulartaskall.json @@ -12,8 +12,13 @@ "reward": [ { "a": "attr", - "t": "gold", - "n": 8200 + "t": "diamond", + "n": 50 + }, + { + "a": "attr", + "t": "ps", + "n": 50 } ] }, @@ -30,8 +35,13 @@ "reward": [ { "a": "attr", - "t": "gold", - "n": 8300 + "t": "diamond", + "n": 50 + }, + { + "a": "attr", + "t": "ps", + "n": 50 } ] }, @@ -48,8 +58,13 @@ "reward": [ { "a": "attr", - "t": "gold", - "n": 8400 + "t": "diamond", + "n": 50 + }, + { + "a": "attr", + "t": "ps", + "n": 50 } ] }, @@ -66,8 +81,13 @@ "reward": [ { "a": "attr", - "t": "gold", - "n": 8500 + "t": "diamond", + "n": 50 + }, + { + "a": "attr", + "t": "ps", + "n": 50 } ] } diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 20d892662..7d02f119f 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -25128,7 +25128,7 @@ "head": { "a": "attr", "t": "gold", - "n": 2 + "n": 1 }, "NPC": 60081, "value": 1, @@ -25152,7 +25152,7 @@ "head": { "a": "attr", "t": "gold", - "n": 3 + "n": 1 }, "NPC": 60081, "value": 1, @@ -25176,7 +25176,7 @@ "head": { "a": "attr", "t": "gold", - "n": 4 + "n": 1 }, "NPC": 60081, "value": 1, @@ -25200,7 +25200,7 @@ "head": { "a": "attr", "t": "gold", - "n": 5 + "n": 1 }, "NPC": 60081, "value": 1, @@ -25224,7 +25224,7 @@ "head": { "a": "attr", "t": "gold", - "n": 6 + "n": 1 }, "NPC": 0, "value": 2, @@ -25246,7 +25246,7 @@ "head": { "a": "attr", "t": "gold", - "n": 2 + "n": 1 }, "NPC": 0, "value": 2, @@ -25268,7 +25268,7 @@ "head": { "a": "attr", "t": "gold", - "n": 3 + "n": 1 }, "NPC": 0, "value": 2, @@ -25290,7 +25290,7 @@ "head": { "a": "attr", "t": "gold", - "n": 4 + "n": 1 }, "NPC": 0, "value": 2, @@ -25312,7 +25312,7 @@ "head": { "a": "attr", "t": "gold", - "n": 5 + "n": 1 }, "NPC": 0, "value": 2, @@ -25334,7 +25334,7 @@ "head": { "a": "attr", "t": "gold", - "n": 6 + "n": 1 }, "NPC": 60181, "value": 1, @@ -25358,7 +25358,7 @@ "head": { "a": "attr", "t": "gold", - "n": 7 + "n": 1 }, "NPC": 60191, "value": 1, @@ -25382,7 +25382,7 @@ "head": { "a": "attr", "t": "gold", - "n": 8 + "n": 1 }, "NPC": 60201, "value": 1, @@ -25406,7 +25406,7 @@ "head": { "a": "attr", "t": "gold", - "n": 9 + "n": 1 }, "NPC": 60211, "value": 1, @@ -25430,7 +25430,7 @@ "head": { "a": "attr", "t": "gold", - "n": 10 + "n": 1 }, "NPC": 60221, "value": 1, @@ -25454,7 +25454,7 @@ "head": { "a": "attr", "t": "gold", - "n": 11 + "n": 1 }, "NPC": 60231, "value": 1, @@ -25478,7 +25478,7 @@ "head": { "a": "attr", "t": "gold", - "n": 12 + "n": 1 }, "NPC": 60241, "value": 1, @@ -25500,7 +25500,7 @@ "head": { "a": "attr", "t": "gold", - "n": 13 + "n": 1 }, "NPC": 60251, "value": 1, @@ -25522,11 +25522,391 @@ "head": { "a": "attr", "t": "gold", - "n": 14 + "n": 1 }, "NPC": 60261, "value": 1, "filter": [], "filter2": [] + }, + { + "id": 50000037, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_905", + "text": "检查所有可疑点4" + }, + "type": 206, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60271, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 50000039, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_906", + "text": "检查所有可疑点5" + }, + "type": 206, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60281, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 50000040, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_907", + "text": "找对象聊天1" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60291, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000041, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_908", + "text": "找对象聊天2" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60301, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000042, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_909", + "text": "找对象聊天3" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60311, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000043, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_910", + "text": "找对象聊天4" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60321, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000044, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_911", + "text": "找对象聊天5" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60331, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000045, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_912", + "text": "找对象聊天6" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60341, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000046, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_913", + "text": "找对象聊天7" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60351, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000047, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_914", + "text": "找对象聊天8" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60361, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000048, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_915", + "text": "找对象聊天9" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60371, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000049, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_916", + "text": "找对象聊天10" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60381, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000050, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_917", + "text": "找对象聊天11" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60391, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000051, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_918", + "text": "找对象聊天12" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60401, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000052, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_919", + "text": "找对象聊天13" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60411, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] + }, + { + "id": 50000053, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_920", + "text": "找对象聊天14" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 60421, + "value": 1, + "filter": [ + 12870 + ], + "filter2": [] } ] \ No newline at end of file diff --git a/bin/json/game_equipattrlibrarys.json b/bin/json/game_equipattrlibrarys.json index 6b4023b85..32d953969 100644 --- a/bin/json/game_equipattrlibrarys.json +++ b/bin/json/game_equipattrlibrarys.json @@ -78,7 +78,7 @@ "key": 6, "libraryid": 1101, "attrkey": "atkpro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 200, "Addition": [ @@ -93,7 +93,7 @@ "key": 7, "libraryid": 1101, "attrkey": "defpro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 200, "Addition": [ @@ -108,7 +108,7 @@ "key": 8, "libraryid": 1101, "attrkey": "hppro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 200, "Addition": [ @@ -183,7 +183,7 @@ "key": 13, "libraryid": 1301, "attrkey": "atkpro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 250, "Addition": [ @@ -198,7 +198,7 @@ "key": 14, "libraryid": 1301, "attrkey": "defpro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -213,7 +213,7 @@ "key": 15, "libraryid": 1301, "attrkey": "hppro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -243,7 +243,7 @@ "key": 17, "libraryid": 1301, "attrkey": "cridam", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 60, "Addition": [ @@ -318,7 +318,7 @@ "key": 22, "libraryid": 1501, "attrkey": "atkpro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -333,7 +333,7 @@ "key": 23, "libraryid": 1501, "attrkey": "defpro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -348,7 +348,7 @@ "key": 24, "libraryid": 1501, "attrkey": "hppro", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 250, "Addition": [ @@ -363,7 +363,7 @@ "key": 25, "libraryid": 1501, "attrkey": "effhit", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -378,7 +378,7 @@ "key": 26, "libraryid": 1501, "attrkey": "effre", - "attrvar": 42, + "attrvar": 39, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -468,7 +468,7 @@ "key": 32, "libraryid": 1102, "attrkey": "atkpro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -483,7 +483,7 @@ "key": 33, "libraryid": 1102, "attrkey": "defpro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 200, "Addition": [ @@ -498,7 +498,7 @@ "key": 34, "libraryid": 1102, "attrkey": "hppro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 200, "Addition": [ @@ -573,7 +573,7 @@ "key": 39, "libraryid": 1302, "attrkey": "atkpro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -588,7 +588,7 @@ "key": 40, "libraryid": 1302, "attrkey": "defpro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 250, "Addition": [ @@ -603,7 +603,7 @@ "key": 41, "libraryid": 1302, "attrkey": "hppro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -633,7 +633,7 @@ "key": 43, "libraryid": 1302, "attrkey": "cridam", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 90, "Addition": [ @@ -708,7 +708,7 @@ "key": 48, "libraryid": 1502, "attrkey": "atkpro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -723,7 +723,7 @@ "key": 49, "libraryid": 1502, "attrkey": "defpro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -738,7 +738,7 @@ "key": 50, "libraryid": 1502, "attrkey": "hppro", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -753,7 +753,7 @@ "key": 51, "libraryid": 1502, "attrkey": "effhit", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 250, "Addition": [ @@ -768,7 +768,7 @@ "key": 52, "libraryid": 1502, "attrkey": "effre", - "attrvar": 51, + "attrvar": 46, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -858,7 +858,7 @@ "key": 58, "libraryid": 1103, "attrkey": "atkpro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -873,7 +873,7 @@ "key": 59, "libraryid": 1103, "attrkey": "defpro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -888,7 +888,7 @@ "key": 60, "libraryid": 1103, "attrkey": "hppro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 200, "Addition": [ @@ -963,7 +963,7 @@ "key": 65, "libraryid": 1303, "attrkey": "atkpro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -978,7 +978,7 @@ "key": 66, "libraryid": 1303, "attrkey": "defpro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -993,7 +993,7 @@ "key": 67, "libraryid": 1303, "attrkey": "hppro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 250, "Addition": [ @@ -1023,7 +1023,7 @@ "key": 69, "libraryid": 1303, "attrkey": "cridam", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -1098,7 +1098,7 @@ "key": 74, "libraryid": 1503, "attrkey": "atkpro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1113,7 +1113,7 @@ "key": 75, "libraryid": 1503, "attrkey": "defpro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1128,7 +1128,7 @@ "key": 76, "libraryid": 1503, "attrkey": "hppro", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -1143,7 +1143,7 @@ "key": 77, "libraryid": 1503, "attrkey": "effhit", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -1158,7 +1158,7 @@ "key": 78, "libraryid": 1503, "attrkey": "effre", - "attrvar": 59, + "attrvar": 54, "attrvar_correct": 1000, "probability": 250, "Addition": [ @@ -1248,7 +1248,7 @@ "key": 84, "libraryid": 1104, "attrkey": "atkpro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1263,7 +1263,7 @@ "key": 85, "libraryid": 1104, "attrkey": "defpro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1278,7 +1278,7 @@ "key": 86, "libraryid": 1104, "attrkey": "hppro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1353,7 +1353,7 @@ "key": 91, "libraryid": 1304, "attrkey": "atkpro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1368,7 +1368,7 @@ "key": 92, "libraryid": 1304, "attrkey": "defpro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1383,7 +1383,7 @@ "key": 93, "libraryid": 1304, "attrkey": "hppro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1413,7 +1413,7 @@ "key": 95, "libraryid": 1304, "attrkey": "cridam", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -1488,7 +1488,7 @@ "key": 100, "libraryid": 1504, "attrkey": "atkpro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1503,7 +1503,7 @@ "key": 101, "libraryid": 1504, "attrkey": "defpro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1518,7 +1518,7 @@ "key": 102, "libraryid": 1504, "attrkey": "hppro", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -1533,7 +1533,7 @@ "key": 103, "libraryid": 1504, "attrkey": "effhit", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -1548,7 +1548,7 @@ "key": 104, "libraryid": 1504, "attrkey": "effre", - "attrvar": 68, + "attrvar": 62, "attrvar_correct": 1000, "probability": 125, "Addition": [ @@ -2028,7 +2028,7 @@ "key": 136, "libraryid": 1106, "attrkey": "atkpro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 1, "Addition": [ @@ -2043,7 +2043,7 @@ "key": 137, "libraryid": 1106, "attrkey": "defpro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -2058,7 +2058,7 @@ "key": 138, "libraryid": 1106, "attrkey": "hppro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -2133,7 +2133,7 @@ "key": 143, "libraryid": 1306, "attrkey": "atkpro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 200, "Addition": [ @@ -2148,7 +2148,7 @@ "key": 144, "libraryid": 1306, "attrkey": "defpro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 1, "Addition": [ @@ -2163,7 +2163,7 @@ "key": 145, "libraryid": 1306, "attrkey": "hppro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -2193,7 +2193,7 @@ "key": 147, "libraryid": 1306, "attrkey": "cridam", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -2268,7 +2268,7 @@ "key": 152, "libraryid": 1506, "attrkey": "atkpro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 60, "Addition": [ @@ -2283,7 +2283,7 @@ "key": 153, "libraryid": 1506, "attrkey": "defpro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 3, "Addition": [ @@ -2298,7 +2298,7 @@ "key": 154, "libraryid": 1506, "attrkey": "hppro", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -2313,7 +2313,7 @@ "key": 155, "libraryid": 1506, "attrkey": "effhit", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 100, "Addition": [ @@ -2328,7 +2328,7 @@ "key": 156, "libraryid": 1506, "attrkey": "effre", - "attrvar": 85, + "attrvar": 78, "attrvar_correct": 1000, "probability": 100, "Addition": [ diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index dcfa192de..2b34a7c07 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -17,7 +17,7 @@ "layer": 1, "name": { "key": "gamesummary_fathernode_name_2", - "text": "冒险关卡" + "text": "冒险之旅" }, "mapPos": { "x": -2363, @@ -95,7 +95,7 @@ "layer": 0, "name": { "key": "gamesummary_fathernode_name_11", - "text": "迷宫玩法" + "text": "石阵秘境" }, "mapPos": { "x": -1037, diff --git a/bin/json/game_guidance.json b/bin/json/game_guidance.json index 190997131..58c569e2f 100644 --- a/bin/json/game_guidance.json +++ b/bin/json/game_guidance.json @@ -3,78 +3,130 @@ "id": 1, "exp": "日常任务", "jumpid": 109, - "index": 20 + "index": 20, + "intr": { + "key": "guidance_1", + "text": "今日剩余任务：{0}/{1}" + } }, { "id": 2, "exp": "每日一练", "jumpid": 10002, - "index": 21 + "index": 21, + "intr": { + "key": "guidance_2", + "text": "今日完成进度：{0}/{1}" + } }, { "id": 3, "exp": "云朵先生签到", "jumpid": 719, - "index": 22 + "index": 22, + "intr": { + "key": "guidance_3", + "text": "今日完成进度：{0}/{1}" + } }, { "id": 4, "exp": "巨怪商队跑商", "jumpid": 11001, - "index": 23 + "index": 23, + "intr": { + "key": "guidance_4", + "text": "今日剩余车票：{0}" + } }, { "id": 5, "exp": "公会签到", "jumpid": 804, - "index": 24 + "index": 24, + "intr": { + "key": "guidance_5", + "text": "今日剩余签到：{0}" + } }, { "id": 6, "exp": "公会副本", "jumpid": 11005, - "index": 25 + "index": 25, + "intr": { + "key": "guidance_6", + "text": "今日剩余挑战次数：{0}" + } }, { "id": 7, "exp": "公会任务", "jumpid": 161, - "index": 26 + "index": 26, + "intr": { + "key": "guidance_7", + "text": "今日剩余任务：{0}" + } }, { "id": 8, "exp": "竞技挑战", "jumpid": 156, - "index": 27 + "index": 27, + "intr": { + "key": "guidance_8", + "text": "今日剩余挑战券：{0}" + } }, { "id": 9, "exp": "熊猫武馆训练", "jumpid": 10002, - "index": 28 + "index": 28, + "intr": { + "key": "guidance_9", + "text": "今日剩余训练次数：{0}" + } }, { "id": 10, "exp": "种族塔", "jumpid": 10018, - "index": 29 + "index": 29, + "intr": { + "key": "guidance_10", + "text": "今日剩余可挑战关卡：{0}" + } }, { "id": 11, "exp": "维京远征", "jumpid": 11012, - "index": 30 + "index": 30, + "intr": { + "key": "guidance_11", + "text": "今日剩余体力：{0}/{1}" + } }, { "id": 12, "exp": "狩猎", "jumpid": 168, - "index": 31 + "index": 31, + "intr": { + "key": "guidance_12", + "text": "今日剩余体力：{0}/{1}" + } }, { "id": 13, "exp": "经验副本", "jumpid": 10013, - "index": 32 + "index": 32, + "intr": { + "key": "guidance_13", + "text": "今日剩余体力：{0}/{1}" + } } ] \ No newline at end of file diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json index 3e69b2563..daa8bfb39 100644 --- a/bin/json/game_horoscope.json +++ b/bin/json/game_horoscope.json @@ -524,7 +524,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -557,7 +557,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -617,7 +617,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -650,7 +650,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -710,7 +710,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -743,7 +743,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1181,7 +1181,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1214,7 +1214,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1274,7 +1274,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1307,7 +1307,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1367,7 +1367,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1400,7 +1400,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1838,7 +1838,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1871,7 +1871,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1931,7 +1931,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -1964,7 +1964,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2024,7 +2024,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2057,7 +2057,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2495,7 +2495,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2528,7 +2528,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2588,7 +2588,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2621,7 +2621,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2681,7 +2681,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, @@ -2714,7 +2714,7 @@ { "a": "attr", "t": "starcoin", - "n": 1 + "n": 2 } ], "AddGroup": 1, diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index 84d216bef..e97103103 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -1047,7 +1047,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 16000, + "min": 8000, "max": 16000, "VIPmin": 0, "VIPmax": 15, @@ -1095,7 +1095,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 19800, + "min": 9900, "max": 19800, "VIPmin": 0, "VIPmax": 15, @@ -1167,7 +1167,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 24000, + "min": 12000, "max": 24000, "VIPmin": 0, "VIPmax": 15, @@ -1239,7 +1239,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 28600, + "min": 14300, "max": 28600, "VIPmin": 0, "VIPmax": 15, @@ -1311,7 +1311,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 33600, + "min": 16800, "max": 33600, "VIPmin": 0, "VIPmax": 15, @@ -1383,7 +1383,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 39000, + "min": 19500, "max": 39000, "VIPmin": 0, "VIPmax": 15, @@ -1479,7 +1479,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 44800, + "min": 22400, "max": 44800, "VIPmin": 0, "VIPmax": 15, @@ -1575,7 +1575,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 51000, + "min": 25500, "max": 51000, "VIPmin": 0, "VIPmax": 15, @@ -1671,7 +1671,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 57600, + "min": 28800, "max": 57600, "VIPmin": 0, "VIPmax": 15, @@ -1767,7 +1767,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 64600, + "min": 32300, "max": 64600, "VIPmin": 0, "VIPmax": 15, @@ -1863,7 +1863,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 72000, + "min": 36000, "max": 72000, "VIPmin": 0, "VIPmax": 15, @@ -1959,7 +1959,7 @@ }, "itemdes": "阵营觉醒材料", "itemwt": 1000, - "min": 80000, + "min": 40000, "max": 80000, "VIPmin": 0, "VIPmax": 15, diff --git a/bin/json/game_namelibrary.json b/bin/json/game_namelibrary.json index ca589b9c9..6880ecbb1 100644 --- a/bin/json/game_namelibrary.json +++ b/bin/json/game_namelibrary.json @@ -807,7 +807,7 @@ "id": 68, "surname": { "key": "name_name_surname_68", - "text": "随性的" + "text": "随意的" }, "name": { "key": "name_name_name_68", @@ -1371,7 +1371,7 @@ "id": 115, "surname": { "key": "name_name_surname_115", - "text": "率性的" + "text": "率真的" }, "name": { "key": "name_name_name_115", @@ -1507,7 +1507,7 @@ }, "name": { "key": "name_name_name_126", - "text": "维基" + "text": "维级" }, "sex": 1 } diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index 25ac01f04..7807aa9ef 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -135,7 +135,7 @@ "sceneicon": "ty_qp_zhb", "functionname": { "key": "navigation_Sheet1_functionname_8", - "text": "冒险关卡" + "text": "冒险之旅" }, "npcName": [ "功能入口_主线" diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index fd3b48ab9..8c368c7e8 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -6610,8 +6610,8 @@ "901" ], "event": [ - 2, - 12960 + 10, + 140 ], "goto": 0 }, @@ -6655,8 +6655,8 @@ "901" ], "event": [ - 2, - 12960 + 10, + 140 ], "goto": 0 }, @@ -6700,8 +6700,8 @@ "901" ], "event": [ - 2, - 12960 + 10, + 140 ], "goto": 0 }, @@ -6745,8 +6745,8 @@ "901" ], "event": [ - 2, - 12960 + 10, + 140 ], "goto": 0 }, @@ -6790,8 +6790,8 @@ "901" ], "event": [ - 2, - 12960 + 10, + 140 ], "goto": 0 }, @@ -7529,5 +7529,680 @@ 13010 ], "goto": 0 + }, + { + "id": 60290, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-商人", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60291, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-公告", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60298, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-邮件", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60300, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-维京远征", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60301, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-招募", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60308, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-狩猎", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60310, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-藏书馆", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60311, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-魔药", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60318, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-剧情副本(旧时光)", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60320, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-竞技场", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60321, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-招募", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60328, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-烹饪", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60330, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-浇水拼图", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60331, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "阿宝", + "137" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60338, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "总教习", + "137" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60340, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-商人", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60341, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-公告", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60348, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-邮件", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60350, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-维京远征", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60351, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-招募", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60358, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-狩猎", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60360, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-藏书馆", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60361, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-魔药", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60368, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-剧情副本(旧时光)", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60370, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-竞技场", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60371, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-招募", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60378, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-烹饪", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60380, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-浇水拼图", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60381, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "阿宝", + "137" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60388, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "总教习", + "137" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60390, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-商人", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60391, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-公告", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60398, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-邮件", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60400, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-维京远征", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60401, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-招募", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60408, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-狩猎", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60410, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-藏书馆", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60411, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-魔药", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60418, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-剧情副本(旧时光)", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60420, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-竞技场", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60421, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-招募", + "901" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60428, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-烹饪", + "901" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 + }, + { + "id": 60430, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-浇水拼图", + "901" + ], + "event": [ + 2, + 12930 + ], + "goto": 0 + }, + { + "id": 60431, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "阿宝", + "137" + ], + "event": [ + 2, + 12870 + ], + "goto": 0 + }, + { + "id": 60438, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "总教习", + "137" + ], + "event": [ + 2, + 12950 + ], + "goto": 0 } ] \ No newline at end of file diff --git a/bin/json/game_reddot.json b/bin/json/game_reddot.json index 23dab7db3..1ec10993a 100644 --- a/bin/json/game_reddot.json +++ b/bin/json/game_reddot.json @@ -691,5 +691,14 @@ "group": "", "path": "", "header": "红点出现：当聊天系统中公会，私聊，跨服，系统存在玩家未接受消息时，触发聊天红点。" + }, + { + "id": 29101, + "msg_type": 2, + "show_type": 1, + "count_type": 1, + "group": "", + "path": "", + "header": "" } ] \ No newline at end of file diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index 23c127304..68d8d5b34 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -135,11 +135,11 @@ "id": 10013, "title": { "key": "ruledesc_ruledesc_title_13", - "text": "冒险关卡说明" + "text": "冒险之旅说明" }, "content": { "key": "ruledesc_ruledesc_content_13", - "text": "这里可以挑战冒险关卡并赢取巨量奖励。" + "text": "这里可以挑战冒险之旅并赢取巨量奖励。" } }, { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index a6e3a83e5..ef638b98d 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -9,6 +9,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -27,6 +28,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 500, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -45,6 +47,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -64,6 +67,7 @@ "BuffCheck": "Effect=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 1, "MaxEmitTimes": 0, @@ -84,6 +88,7 @@ "BuffCheck": "BuffID=390002003", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -102,6 +107,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -120,6 +126,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -138,6 +145,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -156,6 +164,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -174,6 +183,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -192,6 +202,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -210,6 +221,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -228,6 +240,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -246,6 +259,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -264,6 +278,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -282,6 +297,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -300,6 +316,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -318,6 +335,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -336,6 +354,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -354,6 +373,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -372,6 +392,7 @@ "BuffCheck": "Effect=3,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -390,6 +411,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -408,6 +430,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -426,6 +449,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -445,6 +469,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -463,6 +488,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -481,6 +507,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -499,6 +526,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -517,6 +545,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -535,6 +564,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -553,6 +583,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -571,6 +602,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -589,6 +621,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 500, + "PasCorrection": 0, "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -608,6 +641,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -627,6 +661,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -645,6 +680,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -665,6 +701,7 @@ "BuffCheck": "Effect=0", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -683,6 +720,7 @@ "BuffCheck": "Effect=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -703,6 +741,7 @@ "LeftSelf=1" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -722,6 +761,7 @@ "BuffCheck": "Effect=3,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -740,6 +780,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -758,6 +799,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -776,6 +818,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -794,6 +837,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -812,6 +856,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -830,6 +875,7 @@ "BuffCheck": "Effect=3,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -848,6 +894,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -866,6 +913,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -884,6 +932,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -902,6 +951,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -920,6 +970,7 @@ "BuffCheck": "BuffID=390001202,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -938,6 +989,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -956,6 +1008,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -974,6 +1027,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -992,6 +1046,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1010,6 +1065,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1028,6 +1084,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1046,6 +1103,7 @@ "BuffCheck": "Effect=1,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1064,6 +1122,7 @@ "BuffCheck": "BuffID=390001214", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1082,6 +1141,7 @@ "BuffCheck": "BuffID=390001214", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1100,6 +1160,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1118,6 +1179,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1136,6 +1198,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1154,6 +1217,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1172,6 +1236,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1192,6 +1257,7 @@ "SelfHpproless=500" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1212,6 +1278,7 @@ "FriendHpproless=500" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1231,6 +1298,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1251,6 +1319,7 @@ "EffType=0,Result=1" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1267,6 +1336,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1285,6 +1355,7 @@ "BuffCheck": "Effect=3,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1303,6 +1374,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1321,6 +1393,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1339,6 +1412,7 @@ "BuffCheck": "Effect=3,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1357,6 +1431,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1375,6 +1450,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1393,6 +1469,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1411,6 +1488,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1429,6 +1507,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1447,6 +1526,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1465,6 +1545,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1483,6 +1564,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1501,6 +1583,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1519,6 +1602,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1537,6 +1621,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1555,6 +1640,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1573,6 +1659,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1591,6 +1678,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1609,6 +1697,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1625,6 +1714,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1643,6 +1733,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1661,6 +1752,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "RepeatSkill", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1677,6 +1769,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1695,6 +1788,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1713,6 +1807,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1731,6 +1826,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1749,6 +1845,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1767,6 +1864,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1785,6 +1883,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1805,6 +1904,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1824,6 +1924,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1844,6 +1945,7 @@ "EffType=0,Result=1" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1864,6 +1966,7 @@ "HasBuff=390001415" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1882,6 +1985,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1900,6 +2004,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1919,6 +2024,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1937,6 +2043,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1955,6 +2062,7 @@ "BuffCheck": "BuffID=390001122,OverlayNumUp=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1973,6 +2081,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "DetonateBuff", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -1994,6 +2103,7 @@ "SelfNoBuff=390001448" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2012,6 +2122,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2028,6 +2139,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 150, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2046,6 +2158,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 600, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2064,6 +2177,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2082,6 +2196,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2102,6 +2217,7 @@ "EnemyHasBuff=390001008" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2120,6 +2236,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2138,6 +2255,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2158,6 +2276,7 @@ "EffType=1,Result=1" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2176,6 +2295,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2194,6 +2314,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2212,6 +2333,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2230,6 +2352,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2248,6 +2371,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2266,6 +2390,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2284,6 +2409,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2304,6 +2430,7 @@ "Alive=0" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2322,6 +2449,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2340,6 +2468,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2358,6 +2487,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2376,6 +2506,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2394,6 +2525,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2412,6 +2544,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2430,6 +2563,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2448,6 +2582,7 @@ "BuffCheck": "BuffID=390001122", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2466,6 +2601,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2484,6 +2620,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2502,6 +2639,7 @@ "BuffCheck": "Effect=1,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2520,6 +2658,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2538,6 +2677,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2556,6 +2696,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2574,6 +2715,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2592,6 +2734,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2610,6 +2753,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2628,6 +2772,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 250, + "PasCorrection": 0, "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2647,6 +2792,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2665,6 +2811,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2683,6 +2830,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2701,6 +2849,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2719,6 +2868,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2737,6 +2887,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2755,6 +2906,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2773,6 +2925,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2793,6 +2946,7 @@ "Hpproless=300" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2811,6 +2965,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2829,6 +2984,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "DetonateBuff", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2848,6 +3004,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2866,6 +3023,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2884,6 +3042,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2902,6 +3061,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2920,6 +3080,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2938,6 +3099,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2956,6 +3118,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2974,6 +3137,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -2992,6 +3156,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3012,6 +3177,7 @@ "RoleALive=34008,HasFriendRole=34008" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3032,6 +3198,7 @@ "RoleALive=34008,HasFriendRole=34008" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3052,6 +3219,7 @@ "RoleALive=24008,HasFriendRole=24008" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3072,6 +3240,7 @@ "RoleALive=24008,HasFriendRole=24008" ], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3090,6 +3259,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "FightHpChangePas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3109,6 +3279,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3127,6 +3298,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3145,6 +3317,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3163,6 +3336,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 1, @@ -3181,6 +3355,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 1, @@ -3199,6 +3374,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 1, @@ -3217,6 +3393,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 150, + "PasCorrection": 0, "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3236,6 +3413,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 150, + "PasCorrection": 0, "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3255,6 +3433,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3273,6 +3452,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3291,6 +3471,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3309,6 +3490,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3327,6 +3509,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3345,6 +3528,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3363,6 +3547,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3381,6 +3566,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3399,6 +3585,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3417,6 +3604,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3436,6 +3624,7 @@ "BuffCheck": "BuffType=SHIELD,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3454,6 +3643,7 @@ "BuffCheck": "BuffType=SHIELD,Succ=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3472,6 +3662,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3490,6 +3681,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3508,6 +3700,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3526,6 +3719,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3544,6 +3738,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 300, + "PasCorrection": 0, "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3563,6 +3758,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 400, + "PasCorrection": 0, "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3582,6 +3778,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3600,6 +3797,7 @@ "BuffCheck": "", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3618,6 +3816,7 @@ "BuffCheck": "EffType=3", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3636,6 +3835,7 @@ "BuffCheck": "EffType=3", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3655,6 +3855,7 @@ "BuffCheck": "EffType=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3673,6 +3874,7 @@ "BuffCheck": "EffType=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3692,6 +3894,7 @@ "BuffCheck": "EffType=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, @@ -3710,6 +3913,7 @@ "BuffCheck": "EffType=1", "AddCon": [], "PasPr": 1000, + "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 9a5d4e400..5ee548acf 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -444,5 +444,96 @@ "text": "" }, "reword": [] + }, + { + "id": 1270, + "name": { + "key": "worldtask_world_all_name_37", + "text": "日常测试27" + }, + "task_icon": "", + "task_txt": { + "key": "", + "text": "" + }, + "reword": [] + }, + { + "id": 1280, + "name": { + "key": "worldtask_world_all_name_38", + "text": "日常测试28" + }, + "task_icon": "", + "task_txt": { + "key": "", + "text": "" + }, + "reword": [] + }, + { + "id": 1290, + "name": { + "key": "worldtask_world_all_name_39", + "text": "日常测试29" + }, + "task_icon": "", + "task_txt": { + "key": "", + "text": "" + }, + "reword": [] + }, + { + "id": 1300, + "name": { + "key": "worldtask_world_all_name_40", + "text": "日常测试30" + }, + "task_icon": "", + "task_txt": { + "key": "", + "text": "" + }, + "reword": [] + }, + { + "id": 1310, + "name": { + "key": "worldtask_world_all_name_41", + "text": "日常测试31" + }, + "task_icon": "", + "task_txt": { + "key": "", + "text": "" + }, + "reword": [] + }, + { + "id": 1320, + "name": { + "key": "worldtask_world_all_name_42", + "text": "日常测试32" + }, + "task_icon": "", + "task_txt": { + "key": "", + "text": "" + }, + "reword": [] + }, + { + "id": 1330, + "name": { + "key": "worldtask_world_all_name_43", + "text": "日常测试33" + }, + "task_icon": "", + "task_txt": { + "key": "", + "text": "" + }, + "reword": [] } ] \ No newline at end of file diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 874cd654a..4e98f5615 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -376,5 +376,89 @@ "n": 0 }, "carexe": 500 + }, + { + "id": 501, + "FormatList": [ + 700011 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 500 + }, + { + "id": 502, + "FormatList": [ + 700011 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 500 + }, + { + "id": 503, + "FormatList": [ + 700011 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 500 + }, + { + "id": 504, + "FormatList": [ + 700011 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 500 + }, + { + "id": 505, + "FormatList": [ + 700011 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 500 + }, + { + "id": 506, + "FormatList": [ + 700011 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 500 } ] \ No newline at end of file diff --git a/bin/json/game_worldrd.json b/bin/json/game_worldrd.json index 602d8ed9c..3f07a9bf5 100644 --- a/bin/json/game_worldrd.json +++ b/bin/json/game_worldrd.json @@ -89,7 +89,7 @@ "key": "eventname_6", "text": "无事发生" }, - "eventweight": 1000, + "eventweight": 40000, "eventtype": 0, "battleready": 0, "battleid": 0, @@ -102,7 +102,7 @@ "key": "eventname_7", "text": "打怪" }, - "eventweight": 1000, + "eventweight": 30000, "eventtype": 1, "battleready": 126, "battleid": 101011, @@ -111,37 +111,11 @@ { "id": 8, "group": 1002, - "eventname": { - "key": "eventname_8", - "text": "打怪" - }, - "eventweight": 1000, - "eventtype": 1, - "battleready": 126, - "battleid": 101011, - "getitem": [] - }, - { - "id": 9, - "group": 1002, - "eventname": { - "key": "eventname_9", - "text": "打怪" - }, - "eventweight": 1000, - "eventtype": 1, - "battleready": 126, - "battleid": 101011, - "getitem": [] - }, - { - "id": 10, - "group": 1002, "eventname": { "key": "eventname_10", "text": "获取金币" }, - "eventweight": 1000, + "eventweight": 10000, "eventtype": 2, "battleready": 0, "battleid": 0, @@ -154,13 +128,13 @@ ] }, { - "id": 11, + "id": 9, "group": 1002, "eventname": { "key": "eventname_11", "text": "获取金币" }, - "eventweight": 1000, + "eventweight": 10000, "eventtype": 2, "battleready": 0, "battleid": 0, @@ -168,7 +142,7 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 44004 } ] } diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index cb8dad978..e4e7dfa0a 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -5533,7 +5533,7 @@ "lock": 1, "lockend": 999, "ontxe": 300010, - "id_after": 300030, + "id_after": 0, "group": 301, "exgroup": 310, "des": 3, @@ -5787,7 +5787,7 @@ "lock": 1, "lockend": 999, "ontxe": 300061, - "id_after": 300070, + "id_after": 0, "group": 301, "exgroup": 310, "des": 3, @@ -5827,7 +5827,7 @@ "lock": 1, "lockend": 999, "ontxe": 300062, - "id_after": 300080, + "id_after": 0, "group": 301, "exgroup": 310, "des": 3, @@ -7252,5 +7252,889 @@ } ], "module": [] + }, + { + "key": 100270, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 0, + "group": 1270, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_163", + "text": "检查所有可疑点4" + }, + "task_details": { + "key": "worldtask_world_task_task_details_163", + "text": "检查所有可疑点4" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_163", + "text": "检查所有可疑点4" + }, + "get_item": [], + "trigger": 0, + "npc": 60270, + "completetask": [ + 50000037 + ], + "deliver_npc": 60278, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100280, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 0, + "group": 1280, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_164", + "text": "检查所有可疑点5" + }, + "task_details": { + "key": "worldtask_world_task_task_details_164", + "text": "检查所有可疑点5" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_164", + "text": "检查所有可疑点5" + }, + "get_item": [], + "trigger": 0, + "npc": 60280, + "completetask": [ + 50000038 + ], + "deliver_npc": 60288, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100290, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 100300, + "group": 1290, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_165", + "text": "1号连环第1个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_165", + "text": "1号连环第1个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_165", + "text": "1号连环第1个" + }, + "get_item": [], + "trigger": 0, + "npc": 60290, + "completetask": [ + 50000039 + ], + "deliver_npc": 60298, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100300, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100290, + "id_after": 100310, + "group": 1290, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_166", + "text": "1号连环第2个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_166", + "text": "1号连环第2个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_166", + "text": "1号连环第2个" + }, + "get_item": [], + "trigger": 0, + "npc": 60300, + "completetask": [ + 50000040 + ], + "deliver_npc": 60308, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100310, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100300, + "id_after": 0, + "group": 1290, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_167", + "text": "1号连环第3个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_167", + "text": "1号连环第3个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_167", + "text": "1号连环第3个" + }, + "get_item": [], + "trigger": 0, + "npc": 60310, + "completetask": [ + 50000041 + ], + "deliver_npc": 60318, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100320, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 100330, + "group": 1300, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_168", + "text": "2号连环第1个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_168", + "text": "2号连环第1个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_168", + "text": "2号连环第1个" + }, + "get_item": [], + "trigger": 0, + "npc": 60320, + "completetask": [ + 50000042 + ], + "deliver_npc": 60328, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100330, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100320, + "id_after": 100340, + "group": 1300, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_169", + "text": "2号连环第2个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_169", + "text": "2号连环第2个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_169", + "text": "2号连环第2个" + }, + "get_item": [], + "trigger": 0, + "npc": 60330, + "completetask": [ + 50000043 + ], + "deliver_npc": 60338, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100340, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100330, + "id_after": 0, + "group": 1300, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_170", + "text": "2号连环第3个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_170", + "text": "2号连环第3个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_170", + "text": "2号连环第3个" + }, + "get_item": [], + "trigger": 0, + "npc": 60340, + "completetask": [ + 50000044 + ], + "deliver_npc": 60348, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100350, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 100360, + "group": 1310, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_171", + "text": "3号连环第1个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_171", + "text": "3号连环第1个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_171", + "text": "3号连环第1个" + }, + "get_item": [], + "trigger": 0, + "npc": 60350, + "completetask": [ + 50000045 + ], + "deliver_npc": 60358, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100360, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100350, + "id_after": 100370, + "group": 1310, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_172", + "text": "3号连环第2个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_172", + "text": "3号连环第2个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_172", + "text": "3号连环第2个" + }, + "get_item": [], + "trigger": 0, + "npc": 60360, + "completetask": [ + 50000046 + ], + "deliver_npc": 60368, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100370, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100360, + "id_after": 0, + "group": 1310, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_173", + "text": "3号连环第3个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_173", + "text": "3号连环第3个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_173", + "text": "3号连环第3个" + }, + "get_item": [], + "trigger": 0, + "npc": 60370, + "completetask": [ + 50000047 + ], + "deliver_npc": 60378, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100380, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 100390, + "group": 1320, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_174", + "text": "4号连环第1个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_174", + "text": "4号连环第1个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_174", + "text": "4号连环第1个" + }, + "get_item": [], + "trigger": 0, + "npc": 60380, + "completetask": [ + 50000048 + ], + "deliver_npc": 60388, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100390, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100380, + "id_after": 100400, + "group": 1320, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_175", + "text": "4号连环第2个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_175", + "text": "4号连环第2个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_175", + "text": "4号连环第2个" + }, + "get_item": [], + "trigger": 0, + "npc": 60390, + "completetask": [ + 50000049 + ], + "deliver_npc": 60398, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100400, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100390, + "id_after": 0, + "group": 1320, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_176", + "text": "4号连环第3个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_176", + "text": "4号连环第3个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_176", + "text": "4号连环第3个" + }, + "get_item": [], + "trigger": 0, + "npc": 60400, + "completetask": [ + 50000050 + ], + "deliver_npc": 60408, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100410, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 100420, + "group": 1330, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_177", + "text": "5号连环第1个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_177", + "text": "5号连环第1个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_177", + "text": "5号连环第1个" + }, + "get_item": [], + "trigger": 0, + "npc": 60410, + "completetask": [ + 50000051 + ], + "deliver_npc": 60418, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100420, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100410, + "id_after": 100430, + "group": 1330, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_178", + "text": "5号连环第2个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_178", + "text": "5号连环第2个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_178", + "text": "5号连环第2个" + }, + "get_item": [], + "trigger": 0, + "npc": 60420, + "completetask": [ + 50000052 + ], + "deliver_npc": 60428, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] + }, + { + "key": 100430, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 100420, + "id_after": 0, + "group": 1330, + "exgroup": 110, + "des": 1, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_179", + "text": "5号连环第3个" + }, + "task_details": { + "key": "worldtask_world_task_task_details_179", + "text": "5号连环第3个" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_179", + "text": "5号连环第3个" + }, + "get_item": [], + "trigger": 0, + "npc": 60430, + "completetask": [ + 50000053 + ], + "deliver_npc": 60438, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "module": [] } ] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 9eab31467..b441fff63 100644 --- a/comm/const.go +++ b/comm/const.go @@ -985,12 +985,13 @@ const ( ) const ( - HdTypeWarorder = 1 // 圣桃战令类型 - HdTypePay = 2 // 圣桃充值礼包 - KFSevenTask = 3 //开服任务 - XSFundPhysical = 4 //现时活动 体力基金 - XSFundRecruit = 5 //现时活动 招募基金 - XSFundExp = 6 //现时活动 经验基金 - HdLevel = 7 //开服等级活动 - HdTypeSign = 8 // 七日签到 + HdTypeWarorder = 1 // 圣桃战令类型 + HdTypePay = 2 // 圣桃充值礼包 + KFSevenTask = 3 //开服任务 + XSFundPhysical = 4 //现时活动 体力基金 + XSFundRecruit = 5 //现时活动 招募基金 + XSFundExp = 6 //现时活动 经验基金 + HdLevel = 7 //开服等级活动 + HdTypeSign = 8 // 七日签到 + HdTypeTurntable = 9 // 大转盘 ) diff --git a/comm/imodule.go b/comm/imodule.go index c3d6a9d61..f23646bbf 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -546,7 +546,6 @@ type ( ICaravan interface { ITaskComplete - TestFunc(session IUserSession) TaskGroupComplete(session IUserSession, group int32) } //埋点中心 diff --git a/modules/activity/api_gethddata.go b/modules/activity/api_gethddata.go index 9a601fe81..fd868127d 100644 --- a/modules/activity/api_gethddata.go +++ b/modules/activity/api_gethddata.go @@ -38,6 +38,20 @@ func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdD update["val"] = list.Val this.module.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) } + + // 开服等级活动 + if activity.Itype == comm.HdLevel { + if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { + if list.Val != user.Lv { + list.Val = user.Lv + list.Lasttime = curTime + update := make(map[string]interface{}) + update["lasttime"] = list.Lasttime + update["val"] = list.Val + this.module.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) + } + } + } result = append(result, list) } diff --git a/modules/activity/api_getreward.go b/modules/activity/api_getreward.go index 5e460c846..87fa93514 100644 --- a/modules/activity/api_getreward.go +++ b/modules/activity/api_getreward.go @@ -48,7 +48,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ActivityGetRew } return } - if data.Val <= req.Val { //没达到领奖条件 + if data.Val < req.Val { //没达到领奖条件 errdata = &pb.ErrorData{ Code: pb.ErrorCode_ActivityCantReward, Title: pb.ErrorCode_ActivityCantReward.ToString(), diff --git a/modules/activity/api_turntable.go b/modules/activity/api_turntable.go new file mode 100644 index 000000000..53079305b --- /dev/null +++ b/modules/activity/api_turntable.go @@ -0,0 +1,68 @@ +package activity + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" +) + +//参数校验 +func (this *apiComp) TurntableRewardCheck(session comm.IUserSession, req *pb.ActivityTurntableRewardReq) (errdata *pb.ErrorData) { + if req.Oid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + return +} + +// 大转盘抽奖 +func (this *apiComp) TurntableReward(session comm.IUserSession, req *pb.ActivityTurntableRewardReq) (errdata *pb.ErrorData) { + if errdata = this.TurntableRewardCheck(session, req); errdata != nil { + return + } + var ( + activity *pb.DBHuodong // 活动数据 + err error + atno []*pb.UserAtno + ) + key := fmt.Sprintf("%s:%s", session.GetUserId(), req.Oid) + data, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), key) + if err == nil { + if activity, err = this.module.modelhdList.getHdListByHdId(req.Oid); err == nil { + curTime := configure.Now().Unix() + if activity.Stime > curTime || curTime > activity.Etime { //不在活动时间范围内 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityNotIntime, + Title: pb.ErrorCode_ActivityNotIntime.ToString(), + } + return + } + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityInvalid, + Title: pb.ErrorCode_ActivityInvalid.ToString(), + } + return + } + + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + } + return + } + // 发奖 + + update := make(map[string]interface{}) + update["gotarr"] = data.Gotarr + this.module.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update) + session.SendMsg(string(this.module.GetType()), "turntablereward", &pb.ActivityTurntableRewardResp{ + Data: data, + Atno: atno, + }) + return +} diff --git a/modules/caravan/module.go b/modules/caravan/module.go index f01004625..4f069d83b 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -429,17 +429,6 @@ func (this *Caravan) CheckCaravavLvUp(data *pb.DBCaravan) (curLv int32) { return curLv } -func (this *Caravan) TestFunc(session comm.IUserSession) { - this.modelCaravan.module.api.GetList(session, &pb.CaravanGetListReq{}) - this.modelCaravan.module.api.BuyOrSell(session, &pb.CaravanBuyOrSellReq{ - City: 105, - Items: map[string]int32{ - //6: 80, - }, - IsBuy: true, - }) -} - // 赛季结算 func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) (err error) { this.Debug("Rpc_ModuleCaravanSettlement", diff --git a/pb/activity_msg.pb.go b/pb/activity_msg.pb.go index d701152fc..003aa4c90 100644 --- a/pb/activity_msg.pb.go +++ b/pb/activity_msg.pb.go @@ -314,6 +314,110 @@ func (x *ActivityGetRewardResp) GetAtno() []*UserAtno { return nil } +// 大转盘活动领奖 +type ActivityTurntableRewardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` +} + +func (x *ActivityTurntableRewardReq) Reset() { + *x = ActivityTurntableRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_activity_activity_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ActivityTurntableRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ActivityTurntableRewardReq) ProtoMessage() {} + +func (x *ActivityTurntableRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_activity_activity_msg_proto_msgTypes[6] + 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 ActivityTurntableRewardReq.ProtoReflect.Descriptor instead. +func (*ActivityTurntableRewardReq) Descriptor() ([]byte, []int) { + return file_activity_activity_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *ActivityTurntableRewardReq) GetOid() string { + if x != nil { + return x.Oid + } + return "" +} + +// 领取奖励数据返回 +type ActivityTurntableRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBActivityData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` +} + +func (x *ActivityTurntableRewardResp) Reset() { + *x = ActivityTurntableRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_activity_activity_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ActivityTurntableRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ActivityTurntableRewardResp) ProtoMessage() {} + +func (x *ActivityTurntableRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_activity_activity_msg_proto_msgTypes[7] + 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 ActivityTurntableRewardResp.ProtoReflect.Descriptor instead. +func (*ActivityTurntableRewardResp) Descriptor() ([]byte, []int) { + return file_activity_activity_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *ActivityTurntableRewardResp) GetData() *DBActivityData { + if x != nil { + return x.Data + } + return nil +} + +func (x *ActivityTurntableRewardResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + var File_activity_activity_msg_proto protoreflect.FileDescriptor var file_activity_activity_msg_proto_rawDesc = []byte{ @@ -342,8 +446,17 @@ var file_activity_activity_msg_proto_rawDesc = []byte{ 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, - 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x74, 0x6e, 0x6f, 0x22, 0x2e, 0x0a, 0x1a, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x54, + 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6f, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x1b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x54, + 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, + 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -358,28 +471,32 @@ func file_activity_activity_msg_proto_rawDescGZIP() []byte { return file_activity_activity_msg_proto_rawDescData } -var file_activity_activity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_activity_activity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_activity_activity_msg_proto_goTypes = []interface{}{ - (*ActivityGetListReq)(nil), // 0: ActivityGetListReq - (*ActivityGetListResp)(nil), // 1: ActivityGetListResp - (*ActivityGetHdDataReq)(nil), // 2: ActivityGetHdDataReq - (*ActivityGetHdDataResp)(nil), // 3: ActivityGetHdDataResp - (*ActivityGetRewardReq)(nil), // 4: ActivityGetRewardReq - (*ActivityGetRewardResp)(nil), // 5: ActivityGetRewardResp - (*DBHuodong)(nil), // 6: DBHuodong - (*DBActivityData)(nil), // 7: DBActivityData - (*UserAtno)(nil), // 8: UserAtno + (*ActivityGetListReq)(nil), // 0: ActivityGetListReq + (*ActivityGetListResp)(nil), // 1: ActivityGetListResp + (*ActivityGetHdDataReq)(nil), // 2: ActivityGetHdDataReq + (*ActivityGetHdDataResp)(nil), // 3: ActivityGetHdDataResp + (*ActivityGetRewardReq)(nil), // 4: ActivityGetRewardReq + (*ActivityGetRewardResp)(nil), // 5: ActivityGetRewardResp + (*ActivityTurntableRewardReq)(nil), // 6: ActivityTurntableRewardReq + (*ActivityTurntableRewardResp)(nil), // 7: ActivityTurntableRewardResp + (*DBHuodong)(nil), // 8: DBHuodong + (*DBActivityData)(nil), // 9: DBActivityData + (*UserAtno)(nil), // 10: UserAtno } var file_activity_activity_msg_proto_depIdxs = []int32{ - 6, // 0: ActivityGetListResp.data:type_name -> DBHuodong - 7, // 1: ActivityGetHdDataResp.data:type_name -> DBActivityData - 7, // 2: ActivityGetRewardResp.data:type_name -> DBActivityData - 8, // 3: ActivityGetRewardResp.atno:type_name -> UserAtno - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 8, // 0: ActivityGetListResp.data:type_name -> DBHuodong + 9, // 1: ActivityGetHdDataResp.data:type_name -> DBActivityData + 9, // 2: ActivityGetRewardResp.data:type_name -> DBActivityData + 10, // 3: ActivityGetRewardResp.atno:type_name -> UserAtno + 9, // 4: ActivityTurntableRewardResp.data:type_name -> DBActivityData + 10, // 5: ActivityTurntableRewardResp.atno:type_name -> UserAtno + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_activity_activity_msg_proto_init() } @@ -462,6 +579,30 @@ func file_activity_activity_msg_proto_init() { return nil } } + file_activity_activity_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ActivityTurntableRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_activity_activity_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ActivityTurntableRewardResp); 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{ @@ -469,7 +610,7 @@ func file_activity_activity_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_activity_activity_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 6, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go index 073dedd38..a5ade2ebe 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -93,4 +93,6 @@ const ( GameBuffType_IMMDOT = 81 GameBuffType_NO_BUFFEFFECT_ADD_DMG = 82 GameBuffType_BE_CRIT_ADD_THIS_TIME_DMG = 83 + GameBuffType_EFFMUSTHIT = 84 + GameBuffType_PROPERTY_LOW_ADD_DMG = 85 ) diff --git a/sys/configure/structs/Game.GuidanceData.go b/sys/configure/structs/Game.GuidanceData.go index b63e93d1a..bb198b667 100644 --- a/sys/configure/structs/Game.GuidanceData.go +++ b/sys/configure/structs/Game.GuidanceData.go @@ -15,6 +15,7 @@ type GameGuidanceData struct { Exp string Jumpid int32 Index int32 + Intr string } const TypeId_GameGuidanceData = 593350558 @@ -28,6 +29,7 @@ func (_v *GameGuidanceData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; if _v.Exp, _ok_ = _buf["exp"].(string); !_ok_ { err = errors.New("exp error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpid"].(float64); !_ok_ { err = errors.New("jumpid error"); return }; _v.Jumpid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/game.skillPassiveData.go b/sys/configure/structs/game.skillPassiveData.go index b75bb43b9..271f26f26 100644 --- a/sys/configure/structs/game.skillPassiveData.go +++ b/sys/configure/structs/game.skillPassiveData.go @@ -20,6 +20,7 @@ type GameSkillPassiveData struct { BuffCheck string AddCon []string PasPr int32 + PasCorrection int32 Type string MaxEmitTimesInRoundByRole int32 MaxEmitTimes int32 @@ -56,6 +57,7 @@ func (_v *GameSkillPassiveData)Deserialize(_buf map[string]interface{}) (err err } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasPr"].(float64); !_ok_ { err = errors.New("PasPr error"); return }; _v.PasPr = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasCorrection"].(float64); !_ok_ { err = errors.New("PasCorrection error"); return }; _v.PasCorrection = int32(_tempNum_) } { var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimesInRoundByRole"].(float64); !_ok_ { err = errors.New("MaxEmitTimesInRoundByRole error"); return }; _v.MaxEmitTimesInRoundByRole = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimes"].(float64); !_ok_ { err = errors.New("MaxEmitTimes error"); return }; _v.MaxEmitTimes = int32(_tempNum_) }