From 9d893b37ad900f1436558dc5756288a1a06a8aad Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 7 Dec 2021 18:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/BattleMain.lua | 3 - .../Modules/Battle/Config/Data/HardStage.lua | 46 +- .../Config/Data/PassiveSkillLogicConfig.lua | 26 +- luafight/Modules/Battle/Logic/Base/Buff.lua | 2 + luafight/Modules/Battle/Logic/Base/Effect.lua | 300 ++++++++++- .../Battle/Logic/Base/EffectCaster.lua | 44 +- .../Modules/Battle/Logic/Base/Passivity.lua | 476 +++++++++++++++++- luafight/Modules/Battle/Logic/BattleLogic.lua | 5 +- .../Modules/Battle/Logic/Buff/BanBlood.lua | 33 ++ luafight/Modules/Battle/Logic/Buff/Blood.lua | 14 +- .../Modules/Battle/Logic/Buff/CommonSign.lua | 57 +++ luafight/Modules/Battle/Logic/Buff/DOT.lua | 1 - luafight/Modules/Battle/Logic/Buff/Immune.lua | 39 +- luafight/Modules/Battle/Logic/Buff/NoDead.lua | 21 +- .../Modules/Battle/Logic/Buff/SigilSign.lua | 33 ++ .../Battle/Logic/HardStageCondition.lua | 14 +- .../Battle/Logic/HardStageEventManager.lua | 5 +- .../Battle/Logic/Misc/BattleDefine.lua | 3 + .../Modules/Battle/Logic/Misc/BattleUtil.lua | 56 ++- .../Modules/Battle/Logic/Monster/Monster.lua | 1 + .../Logic/Monster/MonsterSkill/MCondition.lua | 7 + .../Logic/Monster/MonsterSkill/MTrigger.lua | 24 +- .../Modules/Battle/Logic/Role/RoleLogic.lua | 52 +- .../Modules/Battle/Logic/Role/RoleManager.lua | 7 + luafight/Modules/Battle/Readme.txt | 160 +++--- .../src/main/resources/application.properties | 6 +- test/src/main/java/ExcelUtils.java | 5 +- 27 files changed, 1197 insertions(+), 243 deletions(-) create mode 100644 luafight/Modules/Battle/Logic/Buff/BanBlood.lua create mode 100644 luafight/Modules/Battle/Logic/Buff/CommonSign.lua create mode 100644 luafight/Modules/Battle/Logic/Buff/SigilSign.lua diff --git a/luafight/BattleMain.lua b/luafight/BattleMain.lua index f91ea138e..9efdbeaa7 100644 --- a/luafight/BattleMain.lua +++ b/luafight/BattleMain.lua @@ -144,8 +144,6 @@ end function BattleMain.Execute(args, fightData, optionData) _seed = args.seed _type = args.type - - print("战斗服type=="..args.type) _maxRound = args.maxRound _fightData = fightData _optionData = optionData or {} @@ -226,7 +224,6 @@ function BattleMain.Execute(args, fightData, optionData) -- 结果为2 resultList.result = 2 else - print("使用战斗结果===================") resultList.result = BattleLogic.Result end resultList.curRound=curRound diff --git a/luafight/Modules/Battle/Config/Data/HardStage.lua b/luafight/Modules/Battle/Config/Data/HardStage.lua index 10ec56fac..256345a70 100644 --- a/luafight/Modules/Battle/Config/Data/HardStage.lua +++ b/luafight/Modules/Battle/Config/Data/HardStage.lua @@ -1,8 +1,8 @@ local HardStage = { -__count = 570, -__indexs = {1.91,82,1.81,2.1,4.1,8.1,16.1,26.1}, -__values = {-719,-2.2,3,10,5,10,4,6,3,5,16,2,5,-6.2,36,1,10,29,8,41,39,3,17,3,9,3,1,3,1,5,1,-2.2,4,-2.2,7,2,1,4,1,3,3.1,1,9.4,12,1,4,2,7,1,5,30.3,2,13,1,9,3,7,2,12,4,6,1,7,2,6,22.3,4,3,4,2,6,8,5,6,1,5,2,58.3,2,5,53.3,3,1,14,-2.2,49.3,6,1,2,4,1.5,4,7,3,1,11,5,8,1,3,1.2,4,3,8,12,4,7,-4.2,2,10,1,9,13,40.3,1.603,2,1.2,-2.5,4,1,6,23.2,2,7,6,7,43.3,5,10,1,6,-4.3,1.2,-2.4,1.2,23.2,68.3,2,8,5.3,4,6,10,4,3,21,7,3,-2.9,4,8,2,10,12,4,14,13,3,12,1.4,-2.7,82,3.1,3.1,-2.9,8,74,-2.5,1.8,6.2,2.1,4.1,8.1,16.1,6.5,-2.8,788,6295,1.42,2,1.9,86.3,1.5,27,1.3,10,1,2,1,2,3911,1,3,7,988,1005,996,1.3,32994,-5000.2,10000,-5000.6,20000,10000,6,4,996,3994,5000,-2500.2,5000,40000,20000,-10000.2,7500,2500,10000,55000,1.973,621,-2.9,1,2.1,4.1,8.1,16.1,8.7,40.1,40.1,21621,40000,-20000.2,17500,2500,20000,140000,70000,-35000.2,30000,5000,35000,160000,80000,-40000.2,-20000.2,40000,80000,40000,-10000.2,-20000.3,4.2,-20000.4,120000,60000,25000,5000,-30000.3,17.2,40000,22.2,-40000.2,6.2,25000,15000,-40000.3,180000,90000,-22500.2,-45000.3,4.2,-45000.4,180000,67500,22500,4.2,-45000.6,180000,22500,67500,6.2,13.2,157500,22500,4.2,40000,100000,70000,-35000.4,22500,117500,4.2,292000,74000,72000,-73000.4,996000,498000,-249000.2,9500,239500,249000,1012000,506000,253000,144000,109000,-253000.2,1028000,514000,257000,27500,229500,-257000.2,1052000,526000,177000,86000,-263000.3,1068000,534000,59500,207500,-267000.3,1084000,482000,60000,-271000.4,1104000,374000,178000,-276000.4,1124000,263500,298500,-281000.4,1560001,-100.51,8500,2.1,4.1,8.1,16.1,28.72,328499,1090000,-545000.4,11100300,50}, -__exVals = {375,nil,-183.56,-685.71,-552.79,-664.62,-450.46,-443.08,-400.88,-310.15,-37.98,-92.84,130.81,217.32,417.76,352.35,409.32,620.31,607.65,450.46,-630.1,-645.7,-722.6,605.54,262.68,7.38,-366.07,-119.21,-341.80,123.43,368.18,289.05,48.53,-401.93,-79.12,-425.14,-197.27,13.71,297.49,213.10,340.75,169.85,-152.97,-262.68,-7.38,366.07,119.21,-341.8,-123.43,-368.18,-289.05,-48.53,401.93,79.12,425.14,197.27,-13.71,-297.49,213.1,-340.75,-169.85,152.97,86.5,-77.2,-184.4,-237.3,-298.9,458.9,29.54,-86.5,77.2,184.4,237.3,298.9,-458.9,-29.54,'1-1','1-2','1-3','1-4','1-5','1-6','1-7','1-8','1-9','2-1','2-2','2-3','2-4','2-5','2-6','2-7','2-8','2-9','3-1','3-2','3-3','3-4','3-5','3-6','3-7','3-8','3-9','4-1','4-2','4-3','4-4','4-5','4-6','4-7','4-8','4-9','5-1','5-2','5-3','5-4','5-5','5-6','5-7','5-8','5-9','6-1','6-2','6-3','6-4','6-5','6-6','6-7','6-8','6-9','7-1','7-2','7-3','7-4','7-5','7-6','7-7','7-8','7-9','8-1','8-2','8-3','8-4','8-5','8-6','8-7','8-8','8-9','9-1','9-2','9-3','9-4','9-5','9-6','9-7','9-8','9-9','10-1','10-2','10-3','10-4','10-5','10-6','10-7','10-8','10-9','11-1','11-2','11-3','11-4','11-5','11-6','11-7','11-8','11-9','12-1','12-2','12-3','12-4','12-5','12-6','12-7','12-8','12-9','13-1','13-2','13-3','13-4','13-5','13-6','13-7','13-8','13-9','14-1','14-2','14-3','14-4','14-5','14-6','14-7','14-8','14-9','15-1','15-2','15-3','15-4','15-5','15-6','15-7','15-8','15-9','16-1','16-2','16-3','16-4','16-5','16-6','16-7','16-8','16-9','17-1','17-2','17-3','17-4','17-5','17-6','17-7','17-8','17-9','18-1','18-2','18-3','18-4','18-5','18-6','18-7','18-8','18-9','19-1','19-2','19-3','19-4','19-5','19-6','19-7','19-8','19-9','20-1','20-2','20-3','20-4','20-5','20-6','20-7','20-8','20-9','21-1','21-2','21-3','21-4','21-5','21-6','21-7','21-8','21-9','22-1','22-2','22-3','22-4','22-5','22-6','22-7','22-8','22-9','23-1','23-2','23-3','23-4','23-5','23-6','23-7','23-8','23-9','24-1','24-2','24-3','24-4','24-5','24-6','24-7','24-8','24-9','25-1','25-2','25-3','25-4','25-5','25-6','25-7','25-8','25-9','26-1','26-2','26-3','26-4','26-5','26-6','26-7','26-8','26-9','27-1','27-2','27-3','27-4','27-5','27-6','27-7','27-8','27-9','28-1','28-2','28-3','28-4','28-5','28-6','28-7','28-8','28-9','29-1','29-2','29-3','29-4','29-5','29-6','29-7','29-8','29-9','30-1','30-2','30-3','30-4','30-5','30-6','30-7','30-8','30-9','1-10','2-10','3-10','4-10','5-10','6-10','7-10','8-10','9-10','10-10','11-10','12-10','13-10','14-10','15-10','16-10','17-10','18-10','19-10','20-10','21-10','22-10','23-10','24-10','25-10','26-10','27-10','28-10','29-10','30-10'}, +__count = 665, +__indexs = {1.91,82,1.81,2.1,4.1,8.1,16.1,32.1,4.1}, +__values = {-719,-2.2,3,10,5,10,4,6,3,5,16,2,5,-6.2,36,1,10,29,8,41,39,3,17,3,9,3,1,3,1,5,1,-2.2,4,-2.2,7,2,1,4,1,3,3.1,1,9.4,12,1,4,2,7,1,5,30.3,2,13,1,9,3,7,2,12,4,6,1,7,2,6,22.3,4,3,4,2,6,8,5,6,1,5,2,58.3,2,5,53.3,3,1,14,-2.2,49.3,6,1,2,4,1.5,4,7,3,1,11,5,8,1,3,1.2,4,3,8,12,4,7,-4.2,2,10,1,9,13,40.3,1.253,7,32.3,5,10,1,6,-4.3,1.2,-2.4,1.2,2,2.1,60.3,8,5.3,4,6,10,4,3,21,7,3,-2.9,4,8,2,10,12,4,14,13,3,12,1.4,-2.7,82,3.1,3.1,-2.9,8,2,72,-2.5,1.8,7.2,2.1,4.1,8.1,16.1,16.51,-2.8,288,6295,1.42,2,1.9,97.3,1.5,27,1.3,9,1.7,3911,1,3,7,988,1005,996,1.3,32994,-5000.2,10000,-5000.6,20000,10000,6,4,996,3994,5000,-2500.2,5000,40000,20000,-10000.2,7500,2500,10000,55000,1.973,621,-2.9,1,2.1,4.1,8.1,16.1,8.7,40.1,40.1,21621,40000,-20000.2,17500,2500,20000,140000,70000,-35000.2,30000,5000,35000,160000,80000,-40000.2,-20000.2,40000,80000,40000,-10000.2,-20000.3,4.2,-20000.4,120000,60000,25000,5000,-30000.3,17.2,40000,22.2,-40000.2,6.2,25000,15000,-40000.3,180000,90000,-22500.2,-45000.3,4.2,-45000.4,180000,67500,22500,4.2,-45000.6,180000,22500,67500,6.2,13.2,157500,22500,4.2,40000,100000,70000,-35000.4,22500,117500,4.2,292000,74000,72000,-73000.4,996000,498000,-249000.2,9500,239500,249000,1012000,506000,253000,144000,109000,-253000.2,1028000,514000,257000,27500,229500,-257000.2,1052000,526000,177000,86000,-263000.3,1068000,534000,59500,207500,-267000.3,1084000,482000,60000,-271000.4,1104000,374000,178000,-276000.4,1124000,263500,298500,-281000.4,1560001,-100.51,8500,2.1,4.1,8.1,16.1,32.1,6.5,278499,1090000,485000,60000,-545000.3,3240000,1620000,810000,330000,480000,-810000.2,3000300,50,1799650,2400000,1200000,900000,300000,-1200000.2,5600000,2800000,1400000,800000,600000,-1400000.2,8800000,4400000,2200000,2100000,100000,-2200000.2,14000000,7000000,-3500000.4}, +__exVals = {425,nil,-183.56,-685.71,-552.79,-664.62,-450.46,-443.08,-400.88,-310.15,-37.98,-92.84,130.81,217.32,417.76,352.35,409.32,620.31,607.65,450.46,-630.1,-645.7,-722.6,605.54,262.68,7.38,-366.07,-119.21,-341.80,123.43,368.18,289.05,48.53,-401.93,-79.12,-425.14,-197.27,13.71,297.49,213.10,340.75,169.85,-152.97,86.5,-77.2,-184.4,-237.3,-298.9,458.9,29.54,-262.68,-7.38,366.07,119.21,-341.8,-123.43,-368.18,-289.05,-48.53,401.93,79.12,425.14,197.27,-13.71,-297.49,213.1,-340.75,-169.85,152.97,-86.5,77.2,184.4,237.3,298.9,-458.9,-29.54,'1-1','1-2','1-3','1-4','1-5','1-6','1-7','1-8','1-9','2-1','2-2','2-3','2-4','2-5','2-6','2-7','2-8','2-9','3-1','3-2','3-3','3-4','3-5','3-6','3-7','3-8','3-9','4-1','4-2','4-3','4-4','4-5','4-6','4-7','4-8','4-9','5-1','5-2','5-3','5-4','5-5','5-6','5-7','5-8','5-9','6-1','6-2','6-3','6-4','6-5','6-6','6-7','6-8','6-9','7-1','7-2','7-3','7-4','7-5','7-6','7-7','7-8','7-9','8-1','8-2','8-3','8-4','8-5','8-6','8-7','8-8','8-9','9-1','9-2','9-3','9-4','9-5','9-6','9-7','9-8','9-9','10-1','10-2','10-3','10-4','10-5','10-6','10-7','10-8','10-9','11-1','11-2','11-3','11-4','11-5','11-6','11-7','11-8','11-9','12-1','12-2','12-3','12-4','12-5','12-6','12-7','12-8','12-9','13-1','13-2','13-3','13-4','13-5','13-6','13-7','13-8','13-9','14-1','14-2','14-3','14-4','14-5','14-6','14-7','14-8','14-9','15-1','15-2','15-3','15-4','15-5','15-6','15-7','15-8','15-9','16-1','16-2','16-3','16-4','16-5','16-6','16-7','16-8','16-9','17-1','17-2','17-3','17-4','17-5','17-6','17-7','17-8','17-9','18-1','18-2','18-3','18-4','18-5','18-6','18-7','18-8','18-9','19-1','19-2','19-3','19-4','19-5','19-6','19-7','19-8','19-9','20-1','20-2','20-3','20-4','20-5','20-6','20-7','20-8','20-9','21-1','21-2','21-3','21-4','21-5','21-6','21-7','21-8','21-9','22-1','22-2','22-3','22-4','22-5','22-6','22-7','22-8','22-9','23-1','23-2','23-3','23-4','23-5','23-6','23-7','23-8','23-9','24-1','24-2','24-3','24-4','24-5','24-6','24-7','24-8','24-9','25-1','25-2','25-3','25-4','25-5','25-6','25-7','25-8','25-9','26-1','26-2','26-3','26-4','26-5','26-6','26-7','26-8','26-9','27-1','27-2','27-3','27-4','27-5','27-6','27-7','27-8','27-9','28-1','28-2','28-3','28-4','28-5','28-6','28-7','28-8','28-9','29-1','29-2','29-3','29-4','29-5','29-6','29-7','29-8','29-9','30-1','30-2','30-3','30-4','30-5','30-6','30-7','30-8','30-9','31-1','31-2','31-3','31-4','31-5','31-6','31-7','31-8','31-9','32-1','32-2','32-3','32-4','32-5','32-6','32-7','32-8','32-9','33-1','33-2','33-3','33-4','33-5','33-6','33-7','33-8','33-9','34-1','34-2','34-3','34-4','34-5','34-6','34-7','34-8','34-9','35-1','35-2','35-3','35-4','35-5','35-6','35-7','35-8','35-9','1-10','2-10','3-10','4-10','5-10','6-10','7-10','8-10','9-10','10-10','11-10','12-10','13-10','14-10','15-10','16-10','17-10','18-10','19-10','20-10','21-10','22-10','23-10','24-10','25-10','26-10','27-10','28-10','29-10','30-10','31-10','32-10','33-10','34-10','35-10'}, __fields = { 'Id', 'Chapter', @@ -47,25 +47,25 @@ __defaults = { nil }, __refs = { - {144,.81,1,2.1,4.1,8.1,16.1,28.72}, - {144,1.81,-18,2.1,4.1,8.1,16.1,28.72}, - {144,-1,2,-2,3,-3,4,-4,5,-5,6,-6,7,-7,8,-8,9,-9,10,1,-11,12,-12,13,-13,14,-14,15,-15,16,-16,17,-17,18,-18,19,-19,20,1,-21,22,-22,23,-23,24,-24,25,-25,26,-26,27,-27,28,-28,29,-29,30,1,-31,32,-32,33,-33,34,-34,35,-35,36,-36,37,-37,38,-38,39,-39,40,1,-41,42,-42,43,-43,44,-44,45,-45,46,-46,47,-47,48,-48,49,-49,50,1,-51,52,-52,53,-53,54,-54,55,-55,56,-56,57,-57,58,-58,59,-59,60,1,-61,62,-62,63,-63,64,-64,65,-65,66,-66,67,-67,68,-68,69,-69,70,1,-71,72,-72,73,-73,74,-74,75,-75,76,-76,77,-77,78,-78,79,-79,80,1,-81,82,-82,83,-83,84,-84,85,-85,86,-86,87,-87,88,-88,89,-89,90,1,-91,92,-92,93,-93,94,-94,95,-95,96,-96,97,-97,98,-98,99,-99,100,1,-101,102,-102,103,-103,104,-104,105,-105,106,-106,107,-107,108,-108,109,-109,110,1,-111,112,-112,113,-113,114,-114,115,-115,116,-116,117,-117,118,-118,119,-119,120,1,-121,122,-122,123,-123,124,-124,125,-125,126,-126,127,-127,128,-128,129,-129,130,1,-131,132,-132,133,-133,134,-134,135,-135,136,-136,137,-137,138,-138,139,-139,140,1,-141,142,-142,143,-143,144,-144,145,-145,146,-146,147,-147,148,-148,149,-149,150,1,-151,152,-152,153,-153,154,-154,155,-155,156,-156,157,-157,158,-158,159,-159,160,1,-161,162,-162,163,-163,164,-164,165,-165,166,-166,167,-167,168,-168,169,-169,170,1,-171,172,-172,173,-173,174,-174,175,-175,176,-176,177,-177,178,-178,179,-179,180,1,-181,182,-182,183,-183,184,-184,185,-185,186,-186,187,-187,188,-188,189,-189,190,1,-191,192,-192,193,-193,194,-194,195,-195,196,-196,197,-197,198,-198,199,-199,200,1,-201,202,-202,203,-203,204,-204,205,-205,206,-206,207,-207,208,-208,209,-209,210,1,-211,212,-212,213,-213,214,-214,215,-215,216,-216,217,-217,218,-218,219,-219,220,1,-221,222,-222,223,-223,224,-224,225,-225,226,-226,227,-227,228,-228,229,-229,230,1,-231,232,-232,233,-233,234,-234,235,-235,236,-236,237,-237,238,-238,239,-239,240,1,-241,242,-242,243,-243,244,-244,245,-245,246,-246,247,-247,248,-248,249,-249,250,1,-251,252,-252,253,-253,254,-254,255,-255,256,-256,257,-257,258,-258,259,-259,260,1,-261,262,-262,263,-263,264,-264,265,-265,266,-266,267,-267,268,-268,269,-269,270,1,-271,272,-272,273,-273,274,-274,275,-275,276,-276,277,-277,278,-278,279,-279,280,1,-281,282,-282,283,-283,284,-284,285,-285,286,-286,287,-287,288,-288,289,-289,290,1,-291,292,-292,293,-293,294,-294,295,-295,296,-296,297,-297,298,-298,299,-299,300}, - {2585,0,1,0,1,4.1,8.1,0,262,-261,19.71,254,-253,19.71,246,-245,19.71,238,-237,19.71,230,-229,19.71,222,-221,19.71,214,-213,19.71,206,-205,19.71,198,-197,19.71,190,-189,19.71,182,-181,19.71,174,-173,19.71,166,-165,19.71,158,-157,19.71,150,-149,19.71,142,-141,19.71,134,-133,19.71,126,-125,19.71,118,-117,19.71,110,-109,19.71,102,-101,19.71,94,-93,19.71,86,-85,19.71,78,-77,19.71,70,-69,19.71,62,-61,19.71,54,-53,19.71,46,-45,19.71,38,-37,19.71,30}, - {{{1},{2533,1.2,-20,21,2,1.3,-2437,2438,1.5,2,1.5,-26,27,9.2,-2258,2259,9.2,1.2,-37,20.1,40.1,80.1,40.92,1.2,-2494,69,152,199,-57,-264,-68,-61,56,112,265,-202,-133,189,160,-122,-218,-61,-32,2511,1.2,41.1,82.1,41.9}},{{2},{2512,1.2,2,21,-20,1.3,-2398,2389,10,1.3,24,-23,1.2,-15,13.2,40,-39,13.5,43,-42,13.4,26.1,52.1,104.1,52.63,-2516,1,4,3,20,19,-6,26,54,-20,23,141,112,71,36,27,-4,-16,-52,2062,45.1,90.1,45.21}}}, - {{{1,1},{361,2211,-2536,7,88,216,136,-142,-203,-57,-25,44,-54,71,121,230,-36,-197,-149,2493,-2093,-11,-273,-112,-52,54,73,221,80,-145,152,-206,-144,-70,17,54,237,36.1,72.1,144.1,72.35,-159,66,211,144,-176,-195,-57,-18,58,182,132,-237,-47,270,52,-219,-131,-46,21,54.1,108.1,54.71},{1,-19.92}},{{1,2},{2,2528,-2523,20,10,-6,29,58,-14,-6,2413,-2266,98,121,-65,-60,133,48,-518,18.1,36.1,72.1,144.1,54.35,-516,768,-764,10,11,4,1,46,35,-13,97,65,99,73,57,21,-16,-29,-467,54.1,108.1,36.71},{1,-19.92}},{{2,1},{338,-222,-90,31,82,267,2122,-2232,-167,-58,-7,21,-31,74,152,198,-57,2156,-2483,180,222,-31,-313,-76,2439,-2409,112,210,29,-91,101,-241,-113,-73,33,2511,-2246,36.1,72.1,144.1,72.35,-2486,106,215,77,-219,-158,-51,-2,62,237,19,-238,63,254,-21,-256,-83,-41,39,54.1,108.1,54.71},{1,-19.92}},{{2,2},{10,-1,5,25,-10,9,29,46,-8,-18,32,156,124,51,-82,9,114,2041,-2522,18.1,36.1,72.1,144.1,54.35,-2531,-4.2,12,14,-5,15,46,12,7,31,139,104,74,43,11,-18,-38,-446,53.1,106.1,35.71},{1,-19.92}},{{3,1},{290,2283,-2549,44,117,268,2123,-2324,-190,12,-2,-8,72,193,161,-84,-269,-30,2473,-2081,-53,-311,-69,2517,-2463,343,-49,8,35,-282,-78,-65,44,98,116,34.1,68.1,136.1,68.05,318,15,-426,24,65,187,-213,40.1,80.1,40.61},{1,9,10,2.1,4.1,8.1,16.1,6.1,1.2,3,1,4,2,1.7,10.1,20.1,9}},{{3,2},{15,-9,11,30,-22,23,33,27,-26,48,156,160,-9,-97,93,66,22,-506,17.1,34.1,68.1,136.1,51.05,-508,9,32,47,-2,77,-161,40.1,80.1,23.61},{1,9,10,2.1,4.1,8.1,16.1,6.1,1.2,3,1,4,2,1.7,10.1,20.1,9}},{{4,1},{2571,3,-2551,56,413,-403,-26,12,299,28,-275,2451,3,-2081,-107,-365,321,113,-50,-328,-7,152,2342,22.1,44.1,88.1,110.901},{1,5,1,2,1.2,4,2,3,7.1,14.1,28.1,56.1,21.1,1.91,15.1,30.1,8.6}},{{4,2},{2529,-2526,17,29,46,45,148,173,-136,183,11,2010,11.1,22.1,44.1,88.1,110.901},{1,5,1,2,1.2,4,2,3,7.1,14.1,28.1,56.1,21.1,1.91,15.1,30.1,8.6}},{{5,1},{2575,-2482,378,-363,274,2200,-2242,-290,239,-207,2493,10.1,20.1,40.1,50.94},{3,2,3,4,6,4,5.1,10.1,20.1,40.1,15.41,23,10.1,20.1,5.4}},{{5,2},{2531,-2489,72,59,344,2014,5.1,10.1,20.1,40.1,50.94},{3,2,3,4,6,4,5.1,10.1,20.1,40.1,15.41,23,10.1,20.1,5.4}}}, - {818,0,1,-1,-21,21,-31,31,-13,13,-1,1,-33,33,2,-2,-5,5,-32,0,32,-7,7,-43,43,-19,19,-35,35,-26,26,-9,9,-42,42,-40,40,-36,17,19,-37,37,4,-4,-23,23,38.2,-4,4,46.2,-5,5,-18,18,-29,-11,40,34.2,-11,11,-39,39,-41,41,-32,32,42.2,-20,20,-22,22,-13,-13,26,-17,17,-30,30,17.2,4.2,-24,24,44.2,23.2,-7,7,-42,4,38,-29,29,53.2,89.2,53.2,27.2,4,-4,-36,36,-15,15,-30,-1,31,-27,27,83.2,-16,16,93.2,36.2,57.2,55.2,-5,5,-31,-2,33,4,-4,-6,6,-28,28,-44,44,59.2,105.2,25.2,40.2,-39,36,3,93.2,123.2,15.2,-38,38,8.2,93.2,69.4,-18,11,7,91.2,51.2,17.2,-34,34,-5,5,44.2,-7,7,-3,3,-36,-6,42,15.2,135.2,190.2,95.2,25.2,61.2,181.2,57.2,-17,4,13,-5,5,-7,7,99.2,97.4,-5,5,-9,9,67.2,-11,-17,28,74.2,127.2,-7,7,-5,5,175.2,34.2,4,-4,-4,4,-23,-18,41,6,-6,106.2,-25,25,-10,10,61.2,169.2,93.2,6,-6,-3,-21,180.3,87.2,-6,6,57.2,222.2,48.2,-3,3,5,-5,-21,-21,42,36.2,-5,5,30.2,101.2,129.2,57.2,-2,2,86.2,-25,-6,31,28.2,-8,8,220.4,59.2,25.2,50.2,122.2,-30,20,10,28.2,123.2,-6,6,245.2,-14,14,207.2,12.2,-4,4,-7,-19,26,106.2,-2,2,55.2,34.2,63.4,230.2,133.2,-26,-13,39,49.2,-5,5,47.2,38.2,76.2,25.2,211.2,-3,3,-37,2,35,-6,6,182.2,76.2,-5,5,72.2,34.2,137.2,8.2,-30,4,26,114.2,3,-3,186.2,-12,12,4.2,76.2,7,-7,371.3,-29,42,114.2,36.2,224.4,-7,7,6,-6,12.2,90.2,-23,-19,42,-7,-7.2,-7,31.2,20.2,39.2,4.2,-6,6,30.2,-31,5,26,86.2,9.2,86.2,69.2,39.2,66.2,8.2,218.2,-38,27,11,139.2,6,-6,316.4,115.2,10.2,115.2,58.2,-25,-17,42,194.2,396.2,47.2,21.2,13.3,25,4.2,423.3,-8,49.3,337.2,-7,7,34.2,360.2,29.2,379.4,-17,82.2,377.4,11.2,-7,7,4.1,42.4,-26,-16,132.3,13.2,4.2,314.3,23,120.2,101.2,78.2,-17}, - {144,-1,1,2.1,4.1,8.1,2.1,0,19.1,38.1,76.1,152.1,266.562}, - {143,1,0,2,0,2,4.1,8.1,0,2,82,19.1,38.42,63.4,1,6.3,4.1,1,20,13.11,27.7,15,30.01,8.1,10,57.7,19.01,1.2,18.1,36.91,73.71,33.21,149.7,36.71,56.91,18.1,36.1,72.1,144.1,36.1}, - {161,.73,2,.81,2.1,4.1,8.1,16.1,24.1}, + {144,.81,1,2.1,4.1,8.1,16.1,32.1,6.5}, + {144,1.81,-18,2.1,4.1,8.1,16.1,32.1,6.5}, + {144,-1,2,-2,3,-3,4,-4,5,-5,6,-6,7,-7,8,-8,9,-9,10,1,-11,12,-12,13,-13,14,-14,15,-15,16,-16,17,-17,18,-18,19,-19,20,1,-21,22,-22,23,-23,24,-24,25,-25,26,-26,27,-27,28,-28,29,-29,30,1,-31,32,-32,33,-33,34,-34,35,-35,36,-36,37,-37,38,-38,39,-39,40,1,-41,42,-42,43,-43,44,-44,45,-45,46,-46,47,-47,48,-48,49,-49,50,1,-51,52,-52,53,-53,54,-54,55,-55,56,-56,57,-57,58,-58,59,-59,60,1,-61,62,-62,63,-63,64,-64,65,-65,66,-66,67,-67,68,-68,69,-69,70,1,-71,72,-72,73,-73,74,-74,75,-75,76,-76,77,-77,78,-78,79,-79,80,1,-81,82,-82,83,-83,84,-84,85,-85,86,-86,87,-87,88,-88,89,-89,90,1,-91,92,-92,93,-93,94,-94,95,-95,96,-96,97,-97,98,-98,99,-99,100,1,-101,102,-102,103,-103,104,-104,105,-105,106,-106,107,-107,108,-108,109,-109,110,1,-111,112,-112,113,-113,114,-114,115,-115,116,-116,117,-117,118,-118,119,-119,120,1,-121,122,-122,123,-123,124,-124,125,-125,126,-126,127,-127,128,-128,129,-129,130,1,-131,132,-132,133,-133,134,-134,135,-135,136,-136,137,-137,138,-138,139,-139,140,1,-141,142,-142,143,-143,144,-144,145,-145,146,-146,147,-147,148,-148,149,-149,150,1,-151,152,-152,153,-153,154,-154,155,-155,156,-156,157,-157,158,-158,159,-159,160,1,-161,162,-162,163,-163,164,-164,165,-165,166,-166,167,-167,168,-168,169,-169,170,1,-171,172,-172,173,-173,174,-174,175,-175,176,-176,177,-177,178,-178,179,-179,180,1,-181,182,-182,183,-183,184,-184,185,-185,186,-186,187,-187,188,-188,189,-189,190,1,-191,192,-192,193,-193,194,-194,195,-195,196,-196,197,-197,198,-198,199,-199,200,1,-201,202,-202,203,-203,204,-204,205,-205,206,-206,207,-207,208,-208,209,-209,210,1,-211,212,-212,213,-213,214,-214,215,-215,216,-216,217,-217,218,-218,219,-219,220,1,-221,222,-222,223,-223,224,-224,225,-225,226,-226,227,-227,228,-228,229,-229,230,1,-231,232,-232,233,-233,234,-234,235,-235,236,-236,237,-237,238,-238,239,-239,240,1,-241,242,-242,243,-243,244,-244,245,-245,246,-246,247,-247,248,-248,249,-249,250,1,-251,252,-252,253,-253,254,-254,255,-255,256,-256,257,-257,258,-258,259,-259,260,1,-261,262,-262,263,-263,264,-264,265,-265,266,-266,267,-267,268,-268,269,-269,270,1,-271,272,-272,273,-273,274,-274,275,-275,276,-276,277,-277,278,-278,279,-279,280,1,-281,282,-282,283,-283,284,-284,285,-285,286,-286,287,-287,288,-288,289,-289,290,1,-291,292,-292,293,-293,294,-294,295,-295,296,-296,297,-297,298,-298,299,-299,300,1,-301,302,-302,303,-303,304,-304,305,-305,306,-306,307,-307,308,-308,309,-309,310,1,-311,312,-312,313,-313,314,-314,315,-315,316,-316,317,-317,318,-318,319,-319,320,1,-321,322,-322,323,-323,324,-324,325,-325,326,-326,327,-327,328,-328,329,-329,330,1,-331,332,-332,333,-333,334,-334,335,-335,336,-336,337,-337,338,-338,339,-339,340,1,-341,342,-342,343,-343,344,-344,345,-345,346,-346,347,-347,348,-348,349,-349,350}, + {2783,0,1,0,1,4.1,8.1,0,307,-306,19.71,299,-298,19.71,291,-290,19.71,283,-282,19.71,275,-274,19.71,267,-266,19.71,259,-258,19.71,251,-250,19.71,243,-242,19.71,235,-234,19.71,227,-226,19.71,219,-218,19.71,211,-210,19.71,203,-202,19.71,195,-194,19.71,187,-186,19.71,179,-178,19.71,171,-170,19.71,163,-162,19.71,155,-154,19.71,147,-146,19.71,139,-138,19.71,131,-130,19.71,123,-122,19.71,115,-114,19.71,107,-106,19.71,99,-98,19.71,91,-90,19.71,83,-82,19.71,75,-74,19.71,67,-66,19.71,59,-58,19.71,51,-50,19.71,43,-42,19.71,35}, + {{{1},{2731,1.2,-20,21,2,1.3,-2635,2636,1.5,2,1.2,8,1.2,-33,34,11.2,-2463,2464,11.3,-44,22.1,44.1,88.1,44.23,-2692,69,152,228,-86,-264,-68,-61,56,112,279,-216,-133,-189.2,-151,-218,-61,-32,2716,40.1,80.1,80.97}},{{2},{2710,1.2,2,21,-20,1.3,-2596,2587,10,1.3,24,-23,1.2,-15,13.2,47,-46,13.5,50,-49,13.4,26.1,52.1,104.1,52.63,-2714,1,4,3,20,19,-6,26,54,-20,23,141,112,85,51,27,-4,-16,-80,2259,45.1,90.1,90.98}}}, + {{{1,1},{361,2390,-2715,7,88,216,165,-171,-203,-57,-25,44,-54,71,121,259,-65,-197,-149,2691,-2262,-11,-302,-112,-52,54,73,221,109,-174,181,-235,-144,-70,17,54,237,36.1,72.1,144.1,72.35,-159,66,211,173,-205,-195,-57,-18,58,182,132,-237,-47,270,66,-233,-131,-46,21,54.1,108.1,108.701},{1,-19.43}},{{1,2},{2,2726,-2721,20,10,-6,29,58,-14,-6,2611,-2464,98,145,-89,-60,162,48,-547,18.1,36.1,72.1,144.1,54.35,-545,848,-844,10,11,4,1,46,35,-13,97,65,99,73,86,21,-16,-29,-496,54.1,108.1,108.701},{1,-19.43}},{{2,1},{338,-222,-90,31,82,267,2320,-2430,-167,-58,-7,21,-31,74,152,227,-86,2335,-2662,180,251,-31,-342,-76,2637,-2607,112,210,38,-100,130,-270,-113,-73,33,2709,-2444,36.1,72.1,144.1,72.35,-2665,106,215,106,-248,-158,-51,-2,62,237,19,-238,63,260,-27,-256,-83,-41,39,54.1,108.1,108.701},{1,-19.43}},{{2,2},{10,-1,5,25,-10,9,29,46,-8,-18,32,156,124,52,-83,9,143,2210,-2720,18.1,36.1,72.1,144.1,54.35,-2729,-4.2,12,14,-5,15,46,12,7,31,139,104,83,63,11,-18,-61,-452,53.1,106.1,106.501},{1,-19.43}},{{3,1},{290,2462,-2728,44,117,271,2299,-2503,-190,12,-2,-8,72,193,190,-113,-269,-30,2671,-2250,-82,-311,-69,2715,-2661,361,-67,8,44,-291,-78,-65,44,98,116,34.1,68.1,136.1,68.05,323,39,-455,24,65,187,-213,40.1,80.1,80.97},{1,9,10,2.1,4.1,8.1,16.1,6.1,1.2,3,1,4,2,1.7,10.1,20.1,20.91,1.6}},{{3,2},{15,-9,11,30,-22,23,33,27,-26,48,156,160,-9,-97,93,95,22,-535,17.1,34.1,68.1,136.1,51.05,-537,9,32,47,-2,77,-161,40.1,80.1,80.97},{1,9,10,2.1,4.1,8.1,16.1,6.1,1.2,3,1,4,2,1.7,10.1,20.1,20.91,1.6}},{{4,1},{2750,3,-2730,56,442,-432,-26,12,299,28,-275,2649,3,-2250,-136,-365,321,130,-67,-328,-7,152,2521,22.1,44.1,88.1,154.241},{2,1.3,3,4,1.2,-2.2,1,7.1,14.1,28.1,56.1,21.1,21,14.1,28.1,28.72}},{{4,2},{2727,-2724,17,29,46,45,148,187,-150,212,11,2179,11.1,22.1,44.1,88.1,143.241},{2,1.3,3,4,1.2,-2.2,1,7.1,14.1,28.1,56.1,21.1,21,14.1,28.1,28.72}},{{5,1},{2754,-2661,407,-392,274,2398,-2440,-290,239,-207,2672,10.1,20.1,40.1,70.46},{3,2,3,4,6,4,5.1,10.1,20.1,40.1,15.41,23,10.1,20.1,20.91}},{{5,2},{2729,-2687,72,59,373,2183,5.1,10.1,20.1,40.1,65.46},{3,2,3,4,6,4,5.1,10.1,20.1,40.1,15.41,23,10.1,20.1,20.91}}}, + {898,0,1,-1,-21,21,-31,31,-13,13,-1,1,-33,33,2,-2,-5,5,-32,0,32,-7,7,-43,43,-19,19,-35,35,-26,26,-9,9,-42,42,-40,40,-36,17,19,-37,37,5,-5,-23,23,38.2,-4,4,46.2,-5,5,-18,18,-29,-11,40,34.2,-11,11,-39,39,-41,41,-32,32,42.2,-20,20,-22,22,-13,-13,26,-17,17,-30,30,17.2,4.2,-24,24,44.2,23.2,-7,7,-42,4,38,-29,29,53.2,89.2,53.2,27.2,5,-5,-36,36,-15,15,-30,-1,31,-27,27,83.2,-16,16,93.2,36.2,57.2,55.2,-5,5,-31,-2,33,5,-5,-6,6,-28,28,-44,44,59.2,105.2,25.2,40.2,-39,36,3,93.2,123.2,15.2,-38,38,8.2,93.2,69.4,-18,11,7,91.2,51.2,17.2,-34,34,-5,5,44.2,-7,7,-3,3,-36,-6,42,15.2,135.2,190.2,95.2,25.2,61.2,181.2,57.2,-17,4,13,-5,5,-7,7,99.2,97.4,-5,5,-9,9,67.2,-11,-17,28,74.2,127.2,-7,7,-5,5,175.2,34.2,5,-5,-4,4,-23,-18,41,8,-8,106.2,-25,25,-10,10,61.2,169.2,93.2,8,-8,-3,-21,180.3,87.2,-6,6,57.2,222.2,48.2,-3,3,7,-7,-21,-21,42,36.2,-5,5,30.2,101.2,129.2,57.2,-2,2,86.2,-25,-6,31,28.2,-8,8,220.4,59.2,25.2,50.2,122.2,-30,20,10,28.2,123.2,-6,6,245.2,-14,14,207.2,12.2,-4,4,-7,-19,26,106.2,-2,2,55.2,34.2,63.4,230.2,133.2,-26,-13,39,49.2,-5,5,47.2,38.2,76.2,25.2,211.2,-3,3,-37,2,35,-6,6,182.2,76.2,-5,5,72.2,34.2,137.2,8.2,-30,4,26,114.2,4,-4,186.2,-12,12,4.2,76.2,10,-10,371.3,-29,42,114.2,36.2,224.4,-7,7,8,-8,12.2,90.2,-23,-19,42,-7,7,28.2,32.2,21.2,40.2,4.2,-6,6,31.2,-31,5,26,87.2,9.2,87.2,70.2,40.2,67.2,8.2,219.2,-38,27,11,140.2,8,-8,317.4,116.2,10.2,116.2,59.2,-25,-17,42,195.2,397.2,47.2,21.2,13.3,25,4.2,424.3,-8,49.3,338.2,-7,7,34.2,361.2,29.2,380.4,-17,25,102.3,178.3,26,-7,7,4.1,42.4,-26,-16,133.3,13.2,4.2,315.3,23,120.2,101.2,78.2,-17,27,-10,70.2,218.2,47.2,302.2,-7,7,72.2,48.2,29.2,-29,22,45.5,21.2,365.2,116.2,46.2,103.2,428.3,-8,378.3,3,-3,281.2,11.2,-7,7,509.2,154.2,48.2,-42,49,-7,30.2,6,-6,32.2,70.2,519.2,44.2,9,-9,128.2,-36,41,-5,15.2,7,-7,61.2,-6,6,17.2,29.2,390.2,517.3}, + {144,-1,1,2.1,4.1,8.1,2.1,0,19.1,38.1,76.1,152.1,304.1,57.65}, + {143,1,0,2,0,2,4.1,8.1,0,2,82,19.1,38.73,43,5.3,1,0,1,4.1,10.5,4.3,15,17.9,8.1,1,10,45.5,19.21,1.2,18.1,36.91,73.71,3,13.11,130.7,36.71,56.91,18.1,36.1,72.1,144.1,126.1}, + {161,.73,2,.81,2.1,4.1,8.1,16.1,24.1,12,10.9}, nil, - {2022,1.2,-1881,1882,1.4,-1886,1887,1.4,-1891,1892,1.5,-1897,1898,1.4,-1902,1903,1.4,-1907,1908,1.5,-1913,1914,1.4,-1918,1919,1.4,-1923,1924,1.5,-1929,1930,1.4,-1934,1935,1.4,-1939,1940,1.5,-1945,1946,1.4,-1950,1951,1.4,-1955,1956,1.5,-1961,1962,1.4,-1966,1967,1.4,-1971,1972,1.5,-1977,1978,1.4,-1982,1983,1.4,-1987,1988,1.5,-1993,1994,1.4,-1998,1999,1.4,-2003,2004,1.5,-2009,2010,1.4,-2014,2015,1.4,-2019,2020,1.5,-2025,2026,1.4,-2030,2031,1.4,-2035,2036,1.5,-2041,2042,1.4,-2046,2047,1.4,-2051,2052,1.5,-2057,2058,1.4,-2062,2063,1.4,-2067,2068,1.5,-2073,2074,1.4,-2078,2079,1.4,-2083,2084,1.5,-2089,2090,1.4,-2094,2095,1.4,-2099,2100,1.5,-2105,2106,1.4,-2110,2111,1.4,-2115,2116,1.5,-2121,2122,1.4,-2126,2127,1.4,-2131,2132,1.5,-2137,2138,1.4,-2142,2143,1.4,-2147,2148,1.5,-2153,2154,1.4,-2158,2159,1.4,-2163,2164,1.5,-2169,2170,1.4,-2174,2175,1.4,-2179,2180,1.5,-2185,2186,1.4,-2190,2191,1.4,-2195,2196,1.5,-2201,2202,1.4,-2206,2207,1.4,-2211,2212,1.5,-2217,2218,1.4,-2222,2223,1.4,-2227,2228,1.5,-2233,2234,1.4,-2238,2239,1.4,-2243,2244,1.5,-2249,2250,1.4,-2254,2255,1.4,-2259,2260,1.5,-2265,2266,1.4,-2270,2271,1.4,-2275,2276,1.5,-2281,2282,1.4,-2286,2287,1.4,-2291,2292,1.5,-2297,2298,1.4,-2302,2303,1.4,-2307,2308,1.5,-2313,2314,1.4,-2318,2319,1.4,-2323,2324,1.5,-2329,2330,1.4,-2334,2335,1.4,-2339,2340,1.5,-2345,2346,1.4,-2350,2351,1.4,-2355,2356,1.2}, - {774,5,-202,-3,200,-198,197,-195,196,0,5,-198,194,-196,196,-198,-1,4,-5,199,2,-202,203,1,-4,6,-6,7,1.3,.2,-5,5,2.1,5.1,10.1,5.1,7,-7,-5,10,-10,5,3,-3,-5,14,-14,5,8,-8,12.4,1,-1,-5,12,-12,-5.2,-5,-5,8,-8,17.4,7,-7,29.4,23.2,17.3,13,-13,5,-209,209,-5,-202,202,5,-208,208,-5,-205,205,17.2,-206,207,5,-6,2,-2,-205,195,17,-7,6,-6,-204,209,-14,9,8,-8,-203,206,-13,10,-210,210,-206,215,-4,-5,41.2,24.4,41.2,-204,212,-7,-1,-207,207,-203,193,15,-5,9,-9,-5,6,3,-4,-10,10,93.2,-1}, - {836,0,1,-694,695,0,1,0,1,-697,698,6.4,-700,701,0,1,-1,0,1,-702,703,13.3,5,-709,704,0,4,0,1,-709,711,0,1,-2,0,2,-712,713,19.3,2,-716,714,38.4,-716,718,19.5,-719,1700,19.4,-1703,1701,19.4,-1703,1705,19.5,-1706,1707,19.4,-1710,1708,19.4,-1710,1712,19.5,-1713,1714,19.4,-1717,1715,19.4,-1717,1719,19.5,-1720,1721,13.3,3,-1725,1722,0,2,0,1,-1725,1726,0,1,-4,0,4,-1727,1728,38.4,-1731,1729,38.4,-1731,1732,19.5,-1733,1734,38.4,-1738,1735,38.4,-1738,1739,19.5,-1740,1741,19.4,-1745,1742,44.4,-1745,1746,0,1,-3,0,3,-1747,1748,19.4,-1752,1749,38.4,-1752,1753,38.5,-1754,1755,19.4,-1759,1756,19.4,-1759,1760,19.5,-1761,1762,51.4,-1765,1763,95.4,-1765,1766,19.5,-1767,1768,32.3,2,-1772,1770,19.4,-1772,1773,0,1,-5,0,5,-1774,1775,19.4,-1779,1777,19.4,-1779,1780,19.5,-1781,1782,19.4,-1786,1784,19.4,-1786,1787,19.5,-1788,1789,76.4,-1792,1790,19.4,-1792,1793,19.5,-1794,1796,19.4,-1799,1797,19.4,-1799,1800,0,1,-6,0,6,-1801,1803,19.4,-1806,1804,19.4,-1806,1807,19.5,-1808,1810,19.4,-1813,1811,19.4,-1813,1814,19.5,-1815,1816,95.4,-1820,1818,19.4,-1820,1821,76.5,-1822,1823,38.4,-1826,1824,19.4,-1826,1828,304.5,-1829,1830,209.4,-1834,1831,25.4,-1834,1835,247.5,-1836,1837,19.4,-1841,1838,19.4,-1841,1842,19.5,-1843,1844,19.4,-1848,1845,247.4,-1848,1849,228.5,-1850,1851,19.4,-1855,1852,19.4,-1855,1856,19.5,-1857,1858,114.4,-1862,1860,95.4,-1862,1863,114.5,-1864,1865,19.4,-1869,1867,19.4,-1869,1870,19.5,-1871,1872,19.4,-1876,1874,19.4,-1876,1877,19.5,-1878,2359,108.4,-2362,2360,19.4,-2362,2363,4.2}, - {{{1},{863,1.973,-18,1.81,2.1,4.1,8.1,4.1}}}, - {144,2,-2,1,-1,4.2,6.1,6.1,0,19.1,38.1,76.1,152.1,266.562}, - {146,-3,3,2.1,4.1,8.1,2.1,0,19.1,38.1,76.1,152.1,266.562}, - {{{1},{243,.4,105,.4,-105,.4,104,.4,201,.4,-201,.4,200,.4,-200,.4,202,.4,-13,.3,23,-212,0,176,-176,0,178,0,-1,1,0,-9,0,7,-7,0,1992,0,-1984,1984,1,-2163,0,177,-177,0,502,0,-502,3.1,10.4,483,0,-483,3.1,10.4,504,0,-504,3.1,10.4,482,0,-482,3.1,10.4,489,0,-489,3.1,10.4,485,0,-485,3.1,10.4,488,0,-488,3.1,10.4,481,0,-481,3.1,10.4,487,0,-487,3.1,10.4,503,0,-503,3.1,10.4,484,0,-484,3.1,10.4,486,0,-486,3.1,120.47,480,0,-480,3.1,120.92},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,26.1}},{{2},{347,.4,178,.4,-178,.4,100,.4,69,.4,21,.4,-22,.4,20,.4,12,.4,2,.4,-3,0,-101,101,0,-99,0,-1,1,0,136,0,-138,138,.3,-137,137,0,-136,0,-2,2,0,-100,179,-80,80,-179,100,10.1,20.41,-101,180,10.2,-180,55.2,10.1,20.1,40.1,80.1,40.83},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,26.1}},{{3},{525,.4,10,.4,1,.4,-12,.4,2,.4,-79,.4,79,4.3,-100,.4,179,6.2,0,-100,100,3.2,.9,179,0,-179,3.2,-13,0,-166,166,0,22,0,-11,11,0,-26,0,-162,162,0,37,0,289,-289,0,-31,0,-168,168,0,33,0,-24,24,0,-32,0,-169,169,0,20,0,299,-299,0,-23,40.4,34,7.2,23,0,-38,40.4,25,0,301,-301,0,-19,40.4,34,0,-25,25,0,-33,40.4,21,0,298,-298,53.2,80.8,.2,-26,79.34,28,59.4,-22,79.41,-68,0,387,-387,0,65,159.41,119.01,-67,30.4,68,40.7,-267,-120,40.5,70,0,-59,59,0,-74,199.41,22,0,-13,13,0},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,26.1}}}, - {{{1},{1243,1.991,-9,1.9,2.1,4.1,2.1,-109,-1190,1191,-1191,1192,-1192,1193,-1193,1194,-1194,1195,-1195,1196,-1196,1197,-1197,1198,-1198,1199,-9,19.1,38.1,19.81},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,16.1}},{{2},{1443,1.991,-9,1.9,2.1,4.1,2.1,-109,10.9},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,26.1}},{{3},{1643,1.991,-9,1.9,2.1,4.1,2.1,-109,10.9},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,26.1}}} + {2105,1.2,-1964,1965,1.4,-1969,1970,1.4,-1974,1975,1.5,-1980,1981,1.4,-1985,1986,1.4,-1990,1991,1.5,-1996,1997,1.4,-2001,2002,1.4,-2006,2007,1.5,-2012,2013,1.4,-2017,2018,1.4,-2022,2023,1.5,-2028,2029,1.4,-2033,2034,1.4,-2038,2039,1.5,-2044,2045,1.4,-2049,2050,1.4,-2054,2055,1.5,-2060,2061,1.4,-2065,2066,1.4,-2070,2071,1.5,-2076,2077,1.4,-2081,2082,1.4,-2086,2087,1.5,-2092,2093,1.4,-2097,2098,1.4,-2102,2103,1.5,-2108,2109,1.4,-2113,2114,1.4,-2118,2119,1.5,-2124,2125,1.4,-2129,2130,1.4,-2134,2135,1.5,-2140,2141,1.4,-2145,2146,1.4,-2150,2151,1.5,-2156,2157,1.4,-2161,2162,1.4,-2166,2167,1.5,-2172,2173,1.4,-2177,2178,1.4,-2182,2183,1.5,-2188,2189,1.4,-2193,2194,1.4,-2198,2199,1.5,-2204,2205,1.4,-2209,2210,1.4,-2214,2215,1.5,-2220,2221,1.4,-2225,2226,1.4,-2230,2231,1.5,-2236,2237,1.4,-2241,2242,1.4,-2246,2247,1.5,-2252,2253,1.4,-2257,2258,1.4,-2262,2263,1.5,-2268,2269,1.4,-2273,2274,1.4,-2278,2279,1.5,-2284,2285,1.4,-2289,2290,1.4,-2294,2295,1.5,-2300,2301,1.4,-2305,2306,1.4,-2310,2311,1.5,-2316,2317,1.4,-2321,2322,1.4,-2326,2327,1.5,-2332,2333,1.4,-2337,2338,1.4,-2342,2343,1.5,-2348,2349,1.4,-2353,2354,1.4,-2358,2359,1.5,-2364,2365,1.4,-2369,2370,1.4,-2374,2375,1.5,-2380,2381,1.4,-2385,2386,1.4,-2390,2391,1.5,-2396,2397,1.4,-2401,2402,1.4,-2406,2407,1.5,-2412,2413,1.4,-2417,2418,1.4,-2422,2423,1.5,-2428,2429,1.4,-2433,2434,1.4,-2438,2439,1.5,-2444,2445,1.4,-2449,2450,1.4,-2454,2455,1.5,-2460,2461,1.4,-2465,2466,1.4,-2470,2471,1.5,-2476,2477,1.4,-2481,2482,1.4,-2486,2487,1.5,-2492,2493,1.4,-2497,2498,1.4,-2502,2503,1.5,-2508,2509,1.4,-2513,2514,1.4,-2518,2519,1.2}, + {854,5,-252,-3,250,-248,247,-245,246,0,5,-248,244,-246,246,-248,-1,4,-5,249,2,-252,253,1,-4,6,-6,7,1.3,.2,-5,5,2.1,5.1,10.1,5.1,7,-7,-5,10,-10,5,3,-3,-5,14,-14,5,8,-8,12.4,1,-1,-5,12,-12,-5.2,-5,-5,8,-8,17.4,7,-7,29.4,23.2,17.3,13,-13,5,-259,259,-5,-252,252,5,-258,258,-5,-255,255,17.2,-256,257,5,-6,2,-2,-255,245,17,-7,6,-6,-254,259,-14,9,8,-8,-253,256,-13,10,-260,260,-256,265,-4,-5,41.2,24.4,41.2,-254,262,-7,-1,-257,257,-253,243,15,-5,9,-9,-5,6,3,-4,-10,10,93.2,-1,54.3,77.2,85.2,12.3,14,-2,-7,4,45.2,7,-12,10,-9,9,3,5,1,-9,5,118.3,-13}, + {919,0,1,-777,778,0,1,0,1,-780,781,6.4,-783,784,0,1,-1,0,1,-785,786,13.3,5,-792,787,0,4,0,1,-792,794,0,1,-2,0,2,-795,796,19.3,2,-799,797,38.4,-799,801,19.5,-802,1783,19.4,-1786,1784,19.4,-1786,1788,19.5,-1789,1790,19.4,-1793,1791,19.4,-1793,1795,19.5,-1796,1797,19.4,-1800,1798,19.4,-1800,1802,19.5,-1803,1804,13.3,3,-1808,1805,0,2,0,1,-1808,1809,0,1,-4,0,4,-1810,1811,38.4,-1814,1812,38.4,-1814,1815,19.5,-1816,1817,38.4,-1821,1818,38.4,-1821,1822,19.5,-1823,1824,19.4,-1828,1825,44.4,-1828,1829,0,1,-3,0,3,-1830,1831,19.4,-1835,1832,38.4,-1835,1836,38.5,-1837,1838,19.4,-1842,1839,19.4,-1842,1843,19.5,-1844,1845,51.4,-1848,1846,95.4,-1848,1849,19.5,-1850,1851,32.3,2,-1855,1853,19.4,-1855,1856,0,1,-5,0,5,-1857,1858,19.4,-1862,1860,19.4,-1862,1863,19.5,-1864,1865,19.4,-1869,1867,19.4,-1869,1870,19.5,-1871,1872,76.4,-1875,1873,19.4,-1875,1876,19.5,-1877,1879,19.4,-1882,1880,19.4,-1882,1883,0,1,-6,0,6,-1884,1886,19.4,-1889,1887,19.4,-1889,1890,19.5,-1891,1893,19.4,-1896,1894,19.4,-1896,1897,19.5,-1898,1899,95.4,-1903,1901,19.4,-1903,1904,76.5,-1905,1906,38.4,-1909,1907,19.4,-1909,1911,304.5,-1912,1913,209.4,-1917,1914,25.4,-1917,1918,247.5,-1919,1920,19.4,-1924,1921,19.4,-1924,1925,19.5,-1926,1927,19.4,-1931,1928,247.4,-1931,1932,228.5,-1933,1934,19.4,-1938,1935,19.4,-1938,1939,19.5,-1940,1941,114.4,-1945,1943,95.4,-1945,1946,114.5,-1947,1948,19.4,-1952,1950,19.4,-1952,1953,19.5,-1954,1955,19.4,-1959,1957,19.4,-1959,1960,19.5,-1961,2522,76.4,-2526,2523,76.4,-2526,2527,76.5,-2528,2529,19.4,-2533,2530,133.4,-2533,2534,133.5,-2535,2538,19.4,-2542,2539,19.4,-2542,2543,19.5,-2544,2545,19.4,-2549,2546,19.4,-2549,2550,19.5,-2551,2552,19.4,-2556,2553,19.4,-2556,2557,19.5,-2558,2559,13.4,-2562,2560,114.4,-2562,2563,4.2}, + {{{1},{946,1.973,-18,1.81,2.1,4.1,8.1,14.1}}}, + {144,2,-2,1,-1,4.2,6.1,6.1,0,19.1,38.1,76.1,152.1,304.1,57.65}, + {146,-3,3,2.1,4.1,8.1,2.1,0,19.1,38.1,76.1,152.1,304.1,57.65}, + {{{1},{243,.4,105,.4,-105,.4,104,.4,230,.4,-230,.4,229,.4,-229,.4,231,.4,-13,.3,23,-241,0,205,-205,0,207,0,-1,1,0,-9,0,7,-7,0,2134,0,-2126,2126,1,-2334,0,206,-206,0,585,0,-585,3.1,10.4,566,0,-566,3.1,10.4,587,0,-587,3.1,10.4,565,0,-565,3.1,10.4,572,0,-572,3.1,10.4,568,0,-568,3.1,10.4,571,0,-571,3.1,10.4,564,0,-564,3.1,10.4,570,0,-570,3.1,10.4,586,0,-586,3.1,10.4,567,0,-567,3.1,10.4,569,0,-569,3.1,120.47,563,0,-563,3.1,120.97},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,32.1,4.1}},{{2},{347,.4,207,.4,-207,.4,100,.4,98,.4,21,.4,-22,.4,20,.4,12,.4,2,.4,-3,0,-130,130,0,-128,0,-1,1,0,166,0,-168,168,.3,-167,167,0,-166,0,-2,2,0,-100,208,-109,109,-208,100,10.1,20.41,-101,209,10.2,-209,101,10.1,20.1,40.1,80.1,90.98},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,32.1,4.1}},{{3},{554,.4,10,.4,1,.4,-12,.4,2,.4,-108,.4,108,4.3,-100,.4,208,6.2,0,-100,100,3.2,.9,208,0,-208,3.2,-13,0,-195,195,0,22,0,-11,11,0,-26,0,-191,191,0,37,0,343,-343,0,-31,0,-197,197,0,33,0,-24,24,0,-32,0,-198,198,0,20,0,353,-353,0,-23,40.4,34,7.2,23,0,-38,40.4,25,0,355,-355,0,-19,40.4,34,0,-25,25,0,-33,40.4,21,0,352,-352,53.2,80.8,.2,-26,79.34,28,59.4,-22,79.41,-97,0,470,-470,0,94,159.41,119.01,-96,30.4,97,40.7,-321,-149,40.5,71,0,-60,60,0,-75,199.41,22,0,-13,13,0,-21,80.41,120.01,-90,20.4,96,40.4,20,100.4,90.2,40.6,-320,-150},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,32.1,4.1}}}, + {{{1},{1326,1.991,-9,1.9,2.1,4.1,2.1,-109,-1273,1274,-1274,1275,-1275,1276,-1276,1277,-1277,1278,-1278,1279,-1279,1280,-1280,1281,-1281,1282,-9,19.1,38.1,76.1,38.73},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,16.1}},{{2},{1526,1.991,-9,1.9,2.1,4.1,2.1,-109,10.9,20.01},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,32.1,4.1}},{{3},{1726,1.991,-9,1.9,2.1,4.1,2.1,-109,10.9,20.01},{-2.9,3,-2.8,2.1,4.1,8.1,16.1,32.1,4.1}}} }, __refPoss = { nil, @@ -80,7 +80,7 @@ __refPoss = { nil, nil, nil, - {2,4,2.1,2,4,3,6.1,12.1,24.1,48.1,84.38}, + {2,4,2.1,2,4,3,6.1,12.1,24.1,48.1,96.1,18.71}, nil, nil, nil, diff --git a/luafight/Modules/Battle/Config/Data/PassiveSkillLogicConfig.lua b/luafight/Modules/Battle/Config/Data/PassiveSkillLogicConfig.lua index a01d8f392..dc3bf5708 100644 --- a/luafight/Modules/Battle/Config/Data/PassiveSkillLogicConfig.lua +++ b/luafight/Modules/Battle/Config/Data/PassiveSkillLogicConfig.lua @@ -1,8 +1,8 @@ local PassiveSkillLogicConfig = { -__count = 3309, -__indexs = {1.7,94,1,899,1.42,8976,1.7,13,2.1,4.1,2.1,1.6,14,2.1,4.1,2.1,1.5,15,2.1,4.1,4.3,89695,1100,1.01,90,1.41,886,4.1,8.1,16.1,1.9,91,4.1,8.1,28.41,1.11,89,52.02,1.51,885,52.81,20.2,56.61,60.61,104.82,156.34,47786,1.5,5,1.5,9985,1.2,99998,1.3,90097,100,1.4,96,1.5,95,1,9699,300,600,1.6,194,1,199,5.2,994,2.1,1.6,294,1.3,97,9.2,394,4600,1.8,9992,1.3,9997,1.2,298,9800,300,1,49699,33.2,1.6,94,1.2,98,1,99,6.2,62.2,1.11,1789,800,1.5,195,52.2,900,16.2,5500,200,1.51,85,1.4,196,400,1.01,190,1.3,197,1.4,596,1.01,990,2.1,1.01,290,33.2,600,1.01,390,4600,1.01,9990,1.9,9991,1.8,292,57.2,200,449400,1.27,-2.2,1.2,2,1.9,2,1.7,2,1,19,41.2,1.4,396,54.2,1.4,296,6.3,8.4,2.1,4.1,20.2,2.1,596,1.4,896,6.3,6585,-10.6,1,9,-10.3,1,9899,-10.9,1,9,5.2,11.3,-10.2,8.4,13.5,5.1,-10.01,9900,20.6,7.1,1,18898,1.05,5,1,30945,39.8,8.1,16.11,1,9,10,55.21,36.12,8.4,49899,94.3,36.4,-10.3,1.2,9898,128.6,-10.01,63.7,29.2,35.8,9,9890,52.41,47.5,57.2,21.8,-10.5,11,89.41,81.8,203.8,1.2,8,31.8,19.3,59.21,478890,1.22,99979,1.55,199945,1.61,9984,1.2,9,1,2,9986,1.2,79998,353.2,2.1,4.1,8.1,10.9,609804,49.2,9,9960,-10.4,10051,10,90,2.1,1,9,1.2,88,8.3,5.2,81.3,89,4.3,389,21.1,42.14,16298,-10.4,88.2,19960,94.3,49960,98.5,2.1,4.1,2.1,1,29959,15.3,59960,25.2,15.7,69960,6.4,33.4,37.5,22.2,2.1,528951,1.42,999976,1.63,64,1.14,59,1.24,5000538,30,1.2,8,1.3,17,1,29,50,1,19,56160,1.5,995,2.1,4.1,8.1,16.51,18995,1.31,87,727.5,907785,1.9,999992,538.2,1.7,989992,1.72,999973,1.6,27000118,200,-400.2,-200.2,300,-100.2,300,59908686,318.2,1,8,10,4.2,9,1.3,9896,-10.8,363.4}, -__values = {0,1.23,2,1.32,3,2,1.3,2.1,2.1,3,12,1,7.3,1.51,-2.2,1.7,-2.2,1.01,2,1.7,2,1.71,2,1,2,1.31,2,1.02,2,1.9,32.2,2,1.8,4,1.83,8.5,1.52,6.3,1.12,20,1.4,5,-10.2,60,11,5.4,200,100,60,40,1.52,27,10,20,18,32,-10.5,18,12,60,20,-10.3,28,42,8,2,-10.3,-20.2,28,100,-200.3,-300.2,-200.2,-300.2,200,1.4,96,1,3,8,2,29,1,10,249,97,1,3,496,1.7,18,8,2,1,9,1,55,85.3,6,21.5,98,3,2,494,3600,401,1.7,3,-2.2,3,1.01,5,8,1.7,13,2.1,2.1,1.6,14,2.1,4.1,2.1,1.5,15,2.1,4.1,4.3,89694,2107,3000,1000,10000,4004,11996,8000,6.2,55893,321,199679,600027,17,40,8,11019,9990,10,29959,10000,20031,49969,1,20000,-30000.2,29,1,89999,99971,40,9959,1,7.2,9,1,9999,9960,40,9960,10041,11548890,1.7,999993,1.4,85999995}, -__exVals = {89,.05,.1,.2,.5,.4,.08,.3,.15,.25,.12,.06,.6,.8,nil,.35,.16,.03,.18,.04,.7,.24,.14,.09,.36,.20,.32,.10,.07,.30,.01,.72,.9,.02,.45,.48,1.2,2.62,1.9,.64,.21,.13,.75,2.5,1.12,.95,.26,1.6,.28,.55,.96,3.2,3.6,.17,.34,.33,2.73,.66,.42,.65,.015,.23,.29,.50,.40,1.75,1.5,2.8,4.8,.11,2.1,2.4,2.7,4.5,2.9,4.3,5.4,1.1,3.5,1.22,.025,1.98,2.15,3.85,2.09,1.37,4.02,2.12,.85,.075}, +__count = 3385, +__indexs = {1.7,94,1,899,1.42,8976,1.7,13,2.1,4.1,2.1,1.6,14,2.1,4.1,2.1,1.5,15,2.1,4.1,4.3,89695,1100,1.01,90,1.41,886,4.1,8.1,16.1,1.9,91,4.1,8.1,28.41,1.11,89,52.02,1.51,885,52.81,20.2,56.61,60.61,104.82,156.34,47786,1.5,5,1.5,9985,1.2,99998,1.3,90097,100,1.4,96,1.5,95,1,9699,300,600,1.6,194,1,199,5.2,994,2.1,1.6,294,1.3,97,9.2,394,4600,1.8,9992,1.3,9997,1.2,298,9800,300,1,49699,33.2,1.6,94,1.2,98,1,99,6.2,62.2,1.11,1789,800,1.5,195,52.2,900,16.2,5500,200,1.51,85,1.4,196,400,1.01,190,1.3,197,1.4,596,1.01,990,2.1,1.01,290,33.2,600,1.01,390,4600,1.01,9990,1.9,9991,1.8,292,57.2,200,449400,1.27,-2.2,1.2,2,1.9,2,1.7,2,1,19,41.2,1.4,396,54.2,1.4,296,6.3,8.4,2.1,4.1,20.2,2.1,596,1.4,896,6.3,6585,-10.6,1,9,-10.3,1,9899,-10.9,1,9,5.2,11.3,-10.2,8.4,13.5,5.1,-10.01,9900,20.6,7.1,1,18898,1.05,5,1,30945,39.8,8.1,16.11,1,9,10,55.21,36.12,8.4,49899,94.3,36.4,-10.3,1.2,9898,128.6,-10.01,63.7,29.2,35.8,9,9890,52.41,47.5,57.2,21.8,-10.5,11,89.41,81.8,203.8,1.2,8,31.8,19.3,59.21,478890,1.22,99979,1.55,199945,1.61,9984,1.2,9,1,2,9986,1.2,79998,353.2,2.1,4.1,8.1,10.9,609804,49.2,9,9960,-10.4,9960,6.3,51,10,90,2.1,1,9,1.2,88,8.3,5.2,85.3,89,4.3,389,21.1,42.14,6298,94.6,2.1,98.5,49960,14.01,4.3,1,9959,15.3,5.2,26.6,22.9,8.1,18.5,48.4,52.7,41.4,23.5,1,478950,1.42,999976,1.63,64,1.14,59,1.24,5000538,30,1.2,8,1.3,17,1,29,50,1,19,56160,1.5,995,2.1,4.1,8.1,16.51,18995,1.31,87,760.5,907785,1.9,999992,571.2,1.7,989992,1.72,999973,1.6,27000118,200,-400.2,-200.2,300,-100.2,300,59908686,351.2,1,8,10,4.2,9,1.3,9896,-10.8,396.4,199989900,99.3}, +__values = {0,1.23,2,1.32,3,2,1.3,2.1,2.1,3,12,1,7.3,1.51,-2.2,1.7,-2.2,1.01,2,1.7,2,1.71,2,1,2,1.31,2,1.02,2,1.9,32.2,2,1.8,4,1.83,8.5,1.52,6.3,1.13,10,1.4,5,-10.2,60,11,5.4,200,100,60,40,1.52,7,-10.5,18,32,-10.6,8,2,10,50,-10.8,8,42,8,2,-10.7,28,22,78,-200.3,-300.2,-200.2,-300.2,200,1.4,96,1,3,8,2,29,1,10,249,97,1,3,496,1.7,18,8,2,1,9,1,55,84.3,6,21.5,98,3,2,494,3600,401,1.7,3,-2.2,3,1.01,5,8,1.7,13,2.1,2.1,1.6,14,2.1,4.1,2.1,1.5,15,2.1,4.1,4.3,89694,912,10,1185,3000,1000,10000,4004,11996,8000,6.2,55893,321,199679,600027,17,40,8,11019,9990,10,9960,19999,10000,20031,49969,1,20000,30000,10030,19970,29,1,50009,39990,99971,40,9959,1,8.2,9,1,9999,9960,40,9960,10041,69999,11478891,1.7,999993,1.4,85999995}, +__exVals = {92,.05,.1,.2,.5,.4,.08,.3,.15,.25,.12,.6,.06,.8,nil,.35,.16,.03,.18,.04,.7,.24,.14,.09,.36,.20,.32,.10,.01,.07,.30,.02,.72,.9,1.2,2.62,1.9,3.85,.45,.48,.64,.21,.13,.75,2.5,1.98,1.12,.95,.26,1.6,.28,.55,1.75,.96,3.2,3.6,.17,.34,.33,.85,2.73,.66,.42,.65,.015,.23,.29,.50,.40,1.5,2.8,4.8,.11,2.1,2.4,2.7,4.5,2.9,4.3,5.4,1.1,3.5,1.22,.025,3.82,2.15,2.09,1.37,4.02,1.32,2.12,.075,1.85}, __fields = { 'Id', 'Type', @@ -21,19 +21,19 @@ __defaults = { nil }, __refs = { - {45,.2,5,1.2,-7,-6,8,.4,1,-1,.4,-23,15,8,.9,-8,6,0,-5,.93,-1,.6,-5,.6,-19,.31,9,.6,5,.5,-7,.5,22,.5,-27,.5,-2,.11,55,2,.5,141,-138,-3,1,3,-4,.3,139,-139,.51,6,-3,-3,7,-1,-6,.3,3,-3,.51,1,2,-3,10,26,-36,.3,4,-4,.51,12,-9,-3,3,10,-13,20.4,14,-11,-3,15,-1,-14,.3,2,-2,.51,16,-13,-3,0,16,-16,.3,17,-17,.51,15,-12,-3,9,-3,50.2,15,-15,10.4,18,-9,-9,.3,19,-19,.51,20,-17,-3,11,-11,.3,1,-1,.51,21,-18,-3,143,-143,.3,141,-141,.51,22,-19,-3,144,-144,.3,23,-23,.51,13,-10,67.2,-15,.3,105,-105,36.2,13,-33,141,-117,-24,.3,149,-149,.51,25,-22,19.2,-5,-10,.3,41.2,76.5,130,-139,.3,18,-18,.51,26,-23,-3,27,-25,1,-3,.3,26,-26,.51,28,-25,-3,0,29,-29,.02,3,0,-3,30,-27,17.2,134.3,10.3,105,-102,10.2,13,-13,104.4,1,144,-145,96.4,67,-64,-3,31,110,-141,.3,31,-31,.61,10,-7,-3,5,-5,77.4,193.3,22,-22,.3,70,-70,.51,27,-24,-3,82.2,.3,9,-9,.51,32,-29,9.4,170.3,67,-34,124.2,-107,-34,46.7,35,-31,-4,.3,37,-37,.51,38,-35,-3,39,-24,154.2,40,-40,.31,66,-66,41,-38,-3,42,-36,-6,.3,192,-192,.51,43,-40,-3,44,1,-42,-3,.3,43,-43,119.4,189.2,4.2,.3,69,-69,.51,46,-43,-3,47,21,-68,.3,46,-46,.51,52,-49,-3,141,-93,-48,.3,49,-49,188.4,50,-11,-39,.3,38,-38,74.5,9.2,73.2,.51,49,-46,236.4,147,-147,38.4,9.3,10,-10,130.4,9.3,32,-32,18.4,51,92,282.2,53,-53,.51,54,-51,-3,32,-14,150.2,54,-54,.51,23,-20,-3,18,-8,264.2,148,-148,.51,2,1,96.2,9,-56,.3,57,-57,.51,58,-55,-3,0,58,-58,.3,59,-59,.51,18,-15,-3,13,5,190.5,69.3,3,57,-60,324.4,116.3,1,17,219.5,61,-58,-3,62,-44,10.2,126.3,371.3,229.3,69.3,89.3,.5,46.6,27,-27,339.4,45.3,61,-61,9.4,281.3,63,1,-64,.3,65,-65,.9,243,.5,-2,.5,-279,5,-2.2,-1,-8,5,0,-37,9,4,-4,4,29,.2,-26,.2,-8,3,21,-31,-1,25,-24,44,.3,-32,0,-6,28,-35,27,18,.3,-42,9,-5,38,0,1,-1,-15,-7,-4,26,.3,-40,.3,-1,3,-4,1,41,.3,-41,3,2,1,12,16,-1,-1,9,1,-27,1,25,1,-4,4,0,-4,-10,-31,0,36,1,.4,-38,70.4,2,0,16,3,2,-28,14,-3,4,1,21,.2,1,-25,14,0,8,.3,1,.2,-38,4,10,.2,7,0,1,0,5,.2,12,-3,-39,14,0,12,0,-11,27,.3,-24,24,0,-15,13,-11,24.2,116.2,-14,1,.2,14,25.2,.2,-28,0,24,1,14,-1,-39,2,-1,44,112.3,.4,-32,0,-13,0,7,4,-4,5,0,9,-21,28,17,.2,1,-1,.3,-45,12,-12,45,25.3,11.3,-15,-6,-5,26,18.4,143.2,37,-25,30,-43,-4,5,1,39,49.4,149.9,.2,1,-28,1.2,23,0,1.2,7.2,-4,3,4.2,.4,155.3,38,31,71,.2,-71,.3,72,1,31,37,-67,1,-75,0,71,5,-5,1,0,5,-6,-71,78,1.2,-80,78,3,1,-82,83,1,101,-100,1.2,-9,10,1.2,-6,7,1.5,8,-7,-97,98,1,-99,100,1.3,-32,0,-71,0,186,8,-110,-15,-35,-21,-1,-6,-6,195,-177,0,26,8,-11,43,-49,-9,5,59,-61,-20,-9,16,-2,44,-2,107,-103,-51,44,86,-139,195,-208,.4,2,.4,-1,.4,8,245.2,.4,35,.4,-3,.4,-4,.4,5,.4,-34,.4,28,.4,9,.2,-65,0,44,.2,-44,0,68,.2,-68,0,63,.2,-63,0,66,.2,-66,0,71,866.2,5,-143,867.3,198,-202,.5,865.4,165,1.2,-174,.5,1,149,-147,-3,10,141,-115,123,-159,.5,863.4,172,-162,158,-171,.5,862.4,174,-175,176,-190,.5,861.6,.5,15,57,-69,-3,9,145,-148,-6,9.2,137,-149,-3,18,138,-147,152,-89,193.14,83,8,-194,.5,20,2,11,742.2,86,-203,-40,16,.5,25,0,866.3,173,-178,141,-151,74.2,141,-153,-3,9,45,85,77,-216,.5,26,172,-195,0,-3,27,172,-197,198,-200,.5,170,-167,-3,0,171,127.2,-3.2,-3,-3,30,-23,-4,30,-33,.5,3,.2,864.2,64,-166,165,-168,66.3,950.2,1,94,50,4,-149,.5,67,84,-148,-3,31,124,-14,1,-142,.5,31,2,85.2,74,-181,-34,.5,10,17,854.2,826.2,-3,212,-213,.5,38,12,-47,826.3,152,-167,.3,824.7,181,-187,.5,43,121,-161,0,-3,165,-120,121,-166,76.4,13,163,-173,215,-215,-3,.5,46,168,-211,-3,47,167,-146,-23,-45,.5,52,43,-92,821.2,101,-194,-48,.5,15,139,-151,-3,158,-119,123,-162,18.2,-37,668.2,51,93,-1,58,-201,.5,156,160.2,32,185,-199,142,-160,.5,23,130,-150,-3,18,139,-147,265,-275,.5,781.4,144,-135,-56,.5,58,119,-174,780.3,119,-177,.5,778.4,163,-158,5.2,.5,32,-17,12,133.2,3,30,27,116,-176,75.2,148,-160,779.3,56.3,61,-46,75.2,778.2,-17,-1,.5,1,4,-2,-3,63,140,-139,141,1.7,14,-211,210,-3,1.2,4,1,5,-4,1.3,-170,172,-91,52,.9,-185,56,170,-84,-147,234,.9,-225,43,-33,0,-10,136,-56,-80,3,102,44,-9,0,-103,6,0,178,.3,3,-1,.3,-17,-256,274,-212,-10,-17,.22,244,1,0,-245,.74,251,.5,26,.5,70.2,2,.5,1,802.2,246,-142,-104,202,46,-248,246,10,-4,0,-277,0,-8,0,-18,-11,11,-11,17,-14,0,34,.3,-6,-3,3,-3,9,-33,33,2.1,21.1,42.14,58,89.2,-3,4,-257,5.2,6,1,-263,105.2,148,-92,110,-270,6.3,0,19,-271,6.2,142,3,-249,11.3,17,-269,27.2,3,-61,-198,5.2,8,1,-265,131.3,-84,4,-172,21.3,.2,-252,5.2,-67,213,-250,16.2,-5,7,-258,246,-10.2,-14,14.2,10,4,1,-261,19.2,110,53,-267,24.3,231,-268,66.4,34.3,169,1,-22,26.3,-2,1,-199,-56,6.2,-319,121,-58,5.2,16,-96,-176,246,1,-186,190,-322,.42,177,0,1.2,2.1,3,2,-116,117,2,1.4,0,2,1.3,-152,.4,153,1.4,.3,2,1.2,-30,21.81,3,1,-25,6,21,-15,10,4,-31,27.21,1.2,-151,27.21,-25,2,51,-123,-1,1,8,108,-119,0,159,-172,3,-15,0,42,-56,.101,142,-139,-3,55,128,-4,1.2,-181,.3,10,168,-178,1133.4,197,-42,-155,.3,195,-195,.9,-35,175,56,.5,-41,41,-196,.81,204,-204,.7,196,.3,-109,109,14,-210,16,83,-49,-49,55,163,88.2,-68,20,31,-204,.4,215,-228,2,-1,-30,27,8,-12,9,-4,5,9,.5,182,-40,67.6,3,-184,.5,64.3,3,194,-4,-38}, - {{{1},{1,.2,3,657,-1,-656,0,3,-5,8,0,-8,11,-6,-1,-4,8,-5,-3,0,5,1,3,-6,3,7,-7,-2,-4,3,-3,-1,0,1,.7,2.1,4.1,2.1,5,.2,-2,0,-3,0,364,1,2,29,-7.2,9,237,.2,-1,.2,8,-7,5.4,-656,.6,656,0,-8,.2,11,-666,0,-1,2.1,-1,655,0,5,0,-4,.3,6,0,-5,0,2,28.2,0,33.4,0,8,-589,-78,6,-6,11,-3,7,-14,665,-666,662,-661,-1,99.3,656,-660,5,6,-7,11,-15,5.1,7,4.2,0,4,645,6,-652,646,34,-694,26.3,658,-662,26.01,82.2,-3,7,649,-3,-655,-6,671,-671,150.4,0,25.01,14,-14,11,-4,8,-15,661,-656,653,-658,0,26.3,654,-658,26.01,11,-11,2.1,15,656,-10,-653,-8,676,-676,26.3,660,-664,26.31,-5,9,644,2,-648,-2,657,-668,78.51,129.3,-5,9,-15,656,-642,-13,661,-662,26.51,181.3,104.3,656,-651,-5,.2,25.81,-3,7,25.2,-656,658,-658,102.51,179.4,-6,652,179.2,152.4,49.21,8,-8,100.5,-648,654,99.4,-2,-2,254.51,125.3,-14,50.61,99.6,2,-2,1,658,-659,26.3,-3,-1,100.41,-15,678,-672,-5,-1,51.91,-4,8,356.2,-661,-5,660,-660,26.51,253.3,3,1,650,-4,-650,-11,664,-3,-661,27.3,669,-673,129.31,-6,10,129.3,-3,-11,79.4,9,-13,358.51,643,-2,254.2,230.5,358.21,181.5,26.2,181.2,26.5,281.02,664,-655,-9,26.51,182.4,642,4,-655,651,-657,103.4,653,-657,25.01,0,52.8,659,233.4,309.71,649,-8,-648,-8,51.4,657,-661,408.91,258.61,459.8,334.71,126.5,-656,5,-6,1,638.4,126.11,-6,-9,334.7,-4,-2,385.22,666,-666,660,-659,52.4,664,-668,281.31,650,-646,639.2,-654,-7,662,561.61,462.6,661,-647,-14,0,661,360.4,692.71,643,3,-656,334.2,3,27.61,615.52,156.5,661,590.2,639.42,457.2,716.61,26.8,668,25.4,655,-659,75.81,665.42,356.5,331.14,-15,665,-659,656,-662,50.12,674,-23,-652,-14,175.4,671,-675,50.41,-13,676,-672,199.5,713.61,479.2,-645,-11,24.4,530.21,299.3,659.3,661,-650,2,-12,378.4,352.81,149.3,456.5,26.02,644,1043.5,350.02,659,-664,26.4,2,-6,301.51,-14,655,633.3,26.4,154.21,278.5,-6,647,278.81,77.5,653,-12,-651,0,-5,303.54,377.2,-5,177.61,24.4,658,-8,-659,658,-6,835.4,254.11,646,4,6,9,-4,27,-692,.5,67,-78,688,-687,656,-488,-169,4,692,-33,-3,3,-3,-2,.2,-658,1.2,658,36,-325,289,0,7,-9,903.2,3,-2,658,0,-6,-649,651,7,-658,-6,5,-8,1,656,0,-651,7,-2,-6,653,1,-659,6,-3,1,-4,664,.2,-4,2,-2,-657,659,-662,10,-2,-5,659,-2,0,-2,-658,4,-4,0,4,7,-11,-2.2,7,649,-649,0,646,-290,293,0,-656,-4,1.4,654,0,9,-9,9,-10,0,-657,19,-10,658,-656,-10,666,-7,-660,1.2,9,657,-659,10,-20,.3,1.3,665,-5,-661,-2.2,655,15,-7,2,-661,10,-5,-11,660,-654,-1,1,2.1,653,-654,1.2,3,647,-656,7.2,-659,424,247,-10,10,-670,1.2,660,-662,1.2,-2,2.1,1.2,665,.3,-7,-1,0,1,2,-655,6,-2,3,-14,137.3,661,-7,3,0,-1,-4,-2.2,.2,5,-5,18.2,-9,136.3,5,-8,659,8,-667,84.2,3,-8,148.5,-656,4,6,-8,6,-5,152.3,660,7,-7,7,-10,-654,654,32,-30,9,-6,-655,-1,5,58.2,160.3,686,-22,0,115.2,3,-4,0,7,56.3,647,-657,1,-3,.2,8,9.3,996.2,5.3,.4,646,-286,296,-5,-653,-9,11,-10,13,-6,-4,1,-4,661,3,-665,673,31,-690,1,-15,679,-668,-11,6,1564.2,7,-9,657,298.2,-4,-1,1,7,-7,0,609,-610,0,665,-665,0,12,661,-673,6,675,-681,0,450.2,673,-674,16,644,1,358.2,1169.2,675,-673,.3,-2,.2,170.2,1,-1,4,-4,.2,5.2,.2,2,674,-19,13,-670,0,4,655,12,-671,1,915.2,5,-6,667,-659,162.2,.4,1,-1,8,30,-10,-687,.4,657,8,12,31,-50,.3,4,0,15,-6,2,3,8,41,1.2,-20,21,-60,.3,822.2,61.2,658,.2,-8,1,-2,6,319.3,2,-2,7,-666,1,2,658,6.2,-8,.2,-659,.3,556.6,670,-10,-661,690,-689,675,-676,621.5,679,-33,-647,646,-660,-1,3,-2,710.5,-5,1319.2,33.2,660,-669,-2,1690.6,657,-652,311.2,1,1675.4,1677.3,686,-44,-649,-8,0,709,-707,-2,1664.5,653,-11,-644,-2,-11,0,556.6,1,682,-669,-13,0,689,-690,671.6,6,672,-673,-5,.3,1,666,9,-675,678,53,-718,1,-15,686,-675,-11,6,531.2,7,-9,206.2,237.8,-609,-1,1745.2,0,12,667,-679,6,688,-693,-1,.2,679,-680,16,-15,668,-663,1510.3,.4,1007.6,0,2,239.3,497.2,-657,619.5,0,923.2,-5,0,-1,110.2,1549.6,-1,1829.2,523.2,1,-660,0,1537.6,-8,.2,-646,-11,0,664,-663,-1,1524.5,666,2,-669,-3,0,-11,1175.6,4,21,-678,-5,662,-4,-657,25.4,1497.3,-1,26,-669,-14,1,536.2,1,94.7,678,-678,664,-5,-650,-5,-4,1347.5,-646,646,-651,1474.3,664,-664,1360.8,9,-8,-1,118.8,-4,-2,673,-14,646.2,51.6,363.2,697,-696,-1,0,92.3,646,-642,269.2,-650,1320.3,244.4,928.3,0,657,0,-643,-14,.3,116.6,-1,0,-652,-5,0,226.2,465.2,258.6,0,683,131.2,3,-3,.4,63.4,203.2,333.2,369.6,74.4,670,-2,-668,.3,11.4,1,670,-665,654,-3,733.2,-659,318.6,1380.3,.6,1111.4,1,662,-659,-6,3,-3,223.2,134.4,645,23,-672,370.3,119.4,1087.3,0,657,-646,2,-12,0,210.6,1426.5,1,656,338.2,13.5,.2,683,-669,644,-655,-3,.2,119.6,662,250.2,655,-660,6,-6,479.6,-1,235.2,1337.2,673,-673,76.4,664,7,-15,-665,624.2,658,314.2,1356.2,1,0,-1,167.2,79.2,-657,5.2,656,-645,645,-656,17.3,656,709.2,0,-2.9,641,368.2,3,665,-668,-2.9,-18,2,-2,0,2,9,648,32.2,-1,.5,1,-1,1.3,-2,1,-3.3,-11,-1,1.2,-1,11,.2,144.2,5,.2,2,0,4,0,516.4,1,.5,-1,-11,.7,11,.5,-10,.5,9.2,4,4.3,2,.5,15,.5,-25,.5,673,-6,12,-13,-2,10,-673,.5,672,8.5,-1,14.6,383,274,1216.2,-657,9,382,-390,613,1,-612,.3,-2,882.2,662,-663,657,938.2,0,8,1,647,-637,653,-653,-14,-5,5,654,-654,21.1,42.14,-648,386,-394,8,971.2,387,-395,655,-647,-11,399,258,-37,-620,1,-1,401,256,-36,1,-620,-2,402,255,-255,-401,-1,403,254,-34,-622,10,393,-401,6,648,-646,394,-402,-3,603,-592,395,-403,621,-625,1,0,408,249,-31,1,-2,-625,409,248,-657,660,-649,399,-407,0,-4,12,400,-408,-1,626,-617,401,-409,711,-713,-1,413,244,1060.2,-2,415,242,-657,670,-670,417,240,-28,1,-630,418,239,-655,1,633,-625,408,-416,605,0,-607,10,409,-417,656,1992.2,410,-418,2,-5,0,422,-420,-1,1,665.3,1,2.1,699,-42,13,329.2,648,.2,1,14,0,-663,647,-6.2,-663,-2,-1,4,1,-8,-1,3,-1,-1,4.3,479.2,713,-715,35.6,-38,41,-692,35.4,6,0,2083.2,8,-11,-652,36.21,0,686,-688,666,-9,0,5,-2,-660,41.6,-41,1,-649,41.3,1.2,0,-650,648,577.2,39.31,670,-671,656,6,0,-4,9,-668,2,14.2,.2,-1,671,-2,0,-10,21,-679,676,33,-708,514.4,560.3,507.6,12.1,1786.6,518.6,12.1,6.1,726.5,11.1,5.1,39.6,11.1,567.5,642,8,-665,735.3,.3,1504.4,494.2,1630.51,658,-8,-665,5,2214.61,-16,1,-3.5,2,-17,6,-6,5,1.3,4,-4,69.2,4,0,-15,.7,663,-663,.7,4,-5.2,2,666,-673,-9,15,-15,687,-687,371,-370,-1,1,658,8,-664,-4,663,-662,.5,663,4,-667,662,-3,-1,40,-697,1205.2,-9,77.5,647,9,0,-671,106.3,1014.6,664,-21,655.2,-651,6,-11},{1936,1,4,1,4,4.1,1,937,1.42}},{{2},{1.3,656,1,-659,452,208,-2,-1,0,1,.4,-1,-591,595,-491,511,-2.2,-601,599,-2,2,-2,-22,-575,275,-357,-1,371,36,9,8,1.4,-57,5.1,10.1,5.4,2,1.3,6,9,3,-451,.31,658,58,-15,16,-36,-11,-10,-4,5,4,6,-13,0,-2,1,8,-2,-5,6,-661,.5,-2,.11,1,.5,46,214,399,-399,168,227,-656,5,652,-657,366,111,178,0,-656,656,.3,3.1,-656,262,20.3,233,-662,4,660,-298,19.3,-648,648,19.9,231,-660,0,-1,657,-657,367,21.2,.5,18.5,404,-404,18.4,10,646,18.4,39.21,235,-664,11,-1,646,-645,355,21.3,-655,655,60.11,41.2,5,-295,59.31,4,116.2,76.41,5,651,75.5,133.8,20.6,665,-663,359,74.61,133.2,-290,56.31,658,-655,653,17.3,56.21,131.2,93.2,19.4,3,-3,75.11,656,14,-670,228.4,-657,657,20.6,395,-395,248.3,656,-657,665,229.3,76.6,265.6,659,-665,2,365,18.11,226.3,670,-670,1,18.9,73.5,-1,5,652,5,3,284.4,95.31,-1,14,643,-653,363,266.11,135.6,0,652,1,-647,356,230.41,665,135.4,97.21,208.2,-649,228.4,192.7,656,-394,39.71,362.6,3,653,2,-292,287.71,651,250.51,343.4,286.9,227.5,0,656,8,-6,56.4,-647,647,37.5,674,-412,22.5,-1,665,-665,439.51,20.3,6,652,-658,385.51,-430,1,657,-647,646,24,-314,21.3,25,-25,215.11,2,-2,656,2,-657,277.3,0,-653,653,258.21,1,656,-649,-6,299.51,6,651,11,-301,601.41,432.3,-659,241.6,12,-12,489.31,-1,-670,510.71,-1,6,665,-671,21.21,63.5,667,-668,512.4,381.41,515.6,605.31,16.9,403,-403,220.3,116.2,241.6,2,-2,241.21,5,739.5,94.8,281.6,0,530.31,376.3,6,664,-12,376.71,10,660,20.5,78.8,627.01,131.9,16.4,-657,3,364,169.61,5,651,-656,873.21,230.8,666.5,21.31,3,209.51,330.3,-658,368,227.42,791.7,848.01,506.6,485.2,223.4,420.7,.6,666,12,-13,-2,10,22,-676,29,-47,32,396,-428,-1,1,-1,2,-2,1.2,853.2,6,1,-662,655,9.2,0,-1,124.2,0,11,-2,-8,661,-643,27,-42,653,-488,-168,10,-7,5,648,-648,-7,660,-662,4,42,-37,648,-657,.5,65,-65,657,-648,-5,42,-46,.3,660,-302,-189,487,-647,16.2,662,-653,648,-654,654,0,-654,655,0,-207,-23,.4,-427,71.4,4.2,655,-657,0,663,-662,-1,.2,663,0,-5,0,-658,9,5,-13,1.3,658,-662,657,7,-4,-2,12,-7,-3,4,0,-4,-620,-32,676,-2,-2,2,36,-36,37,-35,0,-684,680,0,-673,-7,0,1.2,661,.2,61.2,.2,-7,.5,3,0,-2,-658,672,-619,-46,661,-659,10,639,-639,2.1,-10,0,-9,.3,11,653,-664,1.2,-2,2,668,-661,10,0,639,-629,54,-74,649,146.2,3,653,.2,25.2,31.3,-17,139.2,9,21.3,-649,74,-64,639,-658,.3,3,37,-37,-3,5,-5,134.2,0,649,55.4,74,-83,1,.2,666,-244,-65,298,-652,15,32.2,-658,659,-658,-1,4,8.3,-655,1,5.3,.4,-655,659,-6,-648,48,-54,659,148.3,30,-685,224.3,658,-658,26,-26,150,540,-4,-21,1022.2,2,3,-5,2,0,-9,-658,720,-717,702,-705,663,-663,1.2,-1,669,-669,672,-11,-662,675,-673,6,70,184,395,22,-679,66.2,662,-659,655,-1,-658,0,9,649,-658,663,-651,647,-656,-3,658,-656,660,-658,-4,.4,724,-28,-33,-5,6,-2,8,-10,0,-1,3,.4,-661,.4,697,31,-23,24,1,-63,.2,-668,0,660,-1,8,.2,-664,.2,1,0,-4,.2,-1,6.2,.2,11,.2,647,4,-3,-290,288,-287,109,186,-664,-1,6,670,-675,0,368,11.3,229,-707,4,672,-677,-1,370,10.3,178,397.4,-2,-663,656,-287,292,-291,12.4,10,654,-665,2,660,-293,24.3,198,-676,11,-1,654,338.2,-291,35.5,22.2,-6,-290,32.5,662,-658,660,-665,0,369,43.6,5,200.2,-659,189.2,1,195.3,660,-659,51,-52,319,386,-705,676,-659,659,-676,659,6,2,24,-31,-659,732,-730,-3,1,661,-662,195.2,674,-672,676,-12,-667,675,-17,28,-317,50.5,-1,662,3,-7,-657,368,296,-295,137.3,656,9,-666,677,-677,663,-294,149.5,709,-704,671,-677,0,2,-1,151.4,106.3,-10,1,1274.2,0,-1,99.7,4,660,-6,14,-304,60.6,14,651,-661,661,-296,11.3,152.2,4,1,-1,660,72.2,10,-11,36.6,663,-658,717.2,0,-2,202.7,116.2,665,-657,-4,0,365,99.5,3,661,12,-676,658,-290,11.5,-1,0,671,-671,1,84.2,259.6,670,-664,670,-676,59.4,-479,1089.3,654,16,-681,11.4,84.2,2,-3,1.2,663,-6,0,-659,83.6,-1,4,-3,664,-666,9,-6,367,13.6,0,6,1401.2,668,-9,320.4,13.2,374.2,-3,97.2,254,399,24.5,1171.3,.2,369,294,-293,61.3,962.2,95.2,0,94.6,709,-705,672,-675,-2,369,117.6,1,-1,227.2,657,-288,153.6,6,651,15,-14,322.6,658,-648,647,10,-6,-293,201.6,660,-666,5,365,10.7,-665,665,-662,-4,370,33.5,5,659,59.2,136.7,99.2,219.2,304.6,.2,76.3,-1,659,5,-663,841.2,656,-651,-1,681,-685,11,-11,.9,4,-3,0,658,-8.2,-7,19,-687,.4,658,7,-7,42.2,-1,4,1,654,-659,.3,668,-1,-7,-2,-580,585,-1,-3,4,3.2,-1,12,5,-12,-1,1,-5,-1,0,770.3,17.3,9.3,-653,1,651,1,6,558.3,-6,6.1,12.1,26,-19,17,-16,20,-28,6.4,12.6,24.4,18.3,-685,.5,1,.71,658,-581,-76,.2,10,653,-663,664,-659,-5,659,3,-185,-44,-434,662,-662,295.2,5,-4,4,1,-5,1,-2,-1,1,140.2,645.2,21.1,42.14,664,-641,640,-5,-658,664,-655,654,-7,2,-657,.2,778.3,505.3,2,9,647,595.2,89,-90,11.2,16.2,29.3,-663,890.2,-582,581,-4,22,-17,128.2,-665,.2,30.3,2,-1,0,656,-575,-82,8,650,5,26.2,-664,4,661,-664,805.2,0,664,-573,574,-1,11,-17,-567,-90,61.3,-572,-85,8,651,953.2,1,0,1,656,-571,-86,-1,0,2,662,36.2,-661,0,657,5,63.2,-652,-11,664,-583,584,-665,317.2,93.3,1,662,0,661.2,8,652,-663,666,-3,2,0,-664,659,-649,-11,671,572.2,.4,7,-15,-646,652,9,.3,-667,658,-652,647,299.2,28.2,1001.2,678,-14,7,0,-670,666,-656,-11,676,-663,660,.4,-17,7,-652,653,-8,.3,8,-653,-7,0,-4,664,0,914.2,8,659,-670,663,7,-12,39.2,-1,383.2,679,-15,.4,-3,3,-653,659,-9,.3,9,-659,29.3,657,1.2,22,-23,23,-11,-670,.2,11,20,-19,0,647,-537,550,-550,301,251,-673,121,6.3,238,-660,6.4,12.1,12.6,233,-655,12.1,12.7,552,-552,12.1,12.4,6.3,36.9,12.11,261,1569.5,8,-9,628.2,1590.4,9,-9,1590.11,0,-1,671,-672,5,2026.4,-652,652,22.5,78,-78,.5,4,-4,666,-5,5,8,-8,4.2,1432.2,-429,-1,0,1,661.3,4.3,630,25,2,6,.2,-4,-1,752.2,.3,3,-3,3,166,-169,1,25.3,649,7,1,0,1,0,-658,10,670,-22,1125.2,691,-24,-298,717.5,8,-9,658,-647,-11,370,293,739.2,11.2,0,-1,289.2,-7,745,-740},{5,77,1.6,65,4,22,3,1,25,6,21,25,23,4,5,17,3.1,3,23,25,3,5,20,22,3,2.1,26,1,5,17,9,17,3,7,46,32,24.3,21,23,8,42,20.3,5,20,24,4,-26.2,25,27,7,20,26,23,54,25,45.3,5,56.2,1,2.1,5,20,23,70.4,5,17,26,4,26,36.3,25,24.3,17,8,20,1,28,2,3,16,63,35,1.2,20,10,22,85,5,15,2,12,14,4,-3.2,1,3,1.2,4,3,4,1,5,8,-2.2,9.2,5,2,4,-2.2,12,1.4,6,1.4,39,1,4,1,4,4.1,1,7,5,8,3,2,9,3,15,11,1,9,4,7,6,7,4,7,50.11,13,1,2,11,2,8,14,5,103.3,23,6,14,11,9,5,14,1,11,26,3,84.2,1,8,14,4,1,11,2,12,2,19.3,62.3,8,1.2,13,1,4,9,4,12,1.7,2,7,1,5,1,3,13,2,11,1,67.2,6,1,-5.2,2,1.2,99,1.5,27,2,21,2.1,4.3,14,108,1.42,9,10,1,26,3.2,17,3,1,-10.2,1,16,3,1,13,110,31.2,5,39,45,1,4,1,-2.2,9,3,2,10,6,1.3}},{{3},{2,1,-1,0,1,0,4.3,-1,.9,3.2,657,6,-5,6,-2,8,-11,-2,7.6,29,-16,2,-8,-5,0,2,12.5,4,6.1,6.5,-621,-38,.6,1,-1,.3,-1,2,-1,59.4,5.3,.5,3.2,.7,8.4,13.5,.2,27.3,3.2,.4,16.9,26.5,15.01,31.3,8.3,2,-1,3.2,-2,39.3,52.31,5.1,18.7,.9,664,-664,13.1,65.01,.8,78.51,109.31,.41,657,-656,149.12,.7,4,-3,93.11,54.4,17.3,55.01,97.31,84.5,.2,140.21,207.51,87.01,100.3,26.3,42.01,156.3,102.41,656,-655,36.3,0,18.8,5.3,313.4,174.01,27.01,.31,664,-663,11.9,66.41,-651,-5,3,-3,127.01,61.3,3.1,70.3,143.8,186.2,69.3,.3,73.01,.6,11.5,100.01,163.3,660,-659,18.4,97.01,.7,495.6,36.01,.51,252.41,0,-1,659,-659,82.11,213.3,22.3,679,-678,63.9,679,-679,115.41,53.7,292.31,119.3,207.12,93.6,659,-658,123.22,663,-662,476.41,13.3,.4,323.3,184.11,31.01,98.3,263.01,13.3,47.6,117.8,658,-657,54.9,667,-667,1,701,-702,192.11,145.01,125.01,165.51,-1,689,-689,669.61,.4,82.01,0,7,655,.4,2,.2,-655,.2,-6,-2,-1,21.2,.2,32.2,662,0,-6,2,-658,.2,1,6,651,8,-666,49.7,663,.2,26,-33,3,-656,653,652.2,.2,657,5,-4,0,57.4,1,64,-64,0,655,-656,1,658,.6,-652,652,-2,-652,657,-4,-657,.3,6,652,-640,19,-24,-14,656,-649,.4,-7,.3,19,-19,0,660,.2,-649,.2,656,-660,.8,-7,1,-1,662,-662,68.3,71.6,659,0,1,0,-3,-656,666,-8,0,-650,653,-662,133.3,3.2,17.2,25,-684,112.3,149.7,16.3,.2,25,-24,-654,649,2,-2,29,-685,49.6,658,4,.2,-661,26.6,82,-83,4.2,314.2,-657,.91,2,-2,26.3,.2,6,-3,-3,0,675,-675,.6,3,6.2,1.2,-2,0,721,-721,5,-5,0,668,-668,.2,722,-16,1,16,-718,6,.4,649,-1,8,30,-10,-685,.4,-2,.4,1,697,-696,.2,-3,.2,10,.2,650,.2,-659,677.6,104.5,8.3,751.4,3,-2,-2,952.9,3.2,572.7,.8,595.3,640.3,.11,101.9,.21,853.3,859.4,1,-4,28.3,-664,0,673,-673,403.4,.2,5,-5,529.7,10.3,700.5,0,834.6,731.2,-657,2,-1,0,663,-663,61.3,.4,5,741.3,109.6,56.3,487.4,1057.5,464.3,660,-660,47.8,143.3,.6,183.2,768.5,0,-1,9.2,508.4,746.6,6.2,220.2,.8,-1,1.2,574.3,16,484.2,8.3,54.3,100.4,7.3,.2,3,-2,201.6,3,-1,-3,.7,-1,1,.5,522.5,103.5,0,-1,3,43.2,3.2,654,1,6,-659,.9,-4,656,-654,2,1,665,-670,662,-5,-656,667,.3,96.2,4,-3,.5,59.2,3,.3,-2,482.3,-3,.2,1,.32,-1,.32,1,.5,658,.5,13,-6,12,-13,-2,10,-672,.6,-1,0,735,-734,4.2,681,-22,-659,0,3,0,-3,1,.3,41.2,657,-657,2.1,12.1,24.32,-656,812.7,668,-669,661,908.3,0,655,723.4,2.1,712,-711,.2,577.2,-653,-4,-1,0,598,-597,913.3,659,-660,187.2,657,1,-1,564.2,10.2,-658,47.3,-2,284.3,9.4,0,63.2,1333.6,274.3,712,-701,-10,-1,783.2,656,78.3,195.4,793.3,0,662,-659,-2,-1,2,95.2,2,202.2,95.3,46.2,4,1,658,575.3,-2,.5,666,-666,7,1,6,-8,-6,11,-10,4,97.2,267.3,20.2,4,1,659,360.2,-1,.6,678,-678,24.4,5,70.2,0,1,4,-1,655,5,0,-5,201.2,4,1,665,-669,0,-1,.5,665,-665,26.9,724.2,631.3,0,2,0,-2,32.3,.01,1,-1,3.1,.13,6.5,337.3,6.3,.61,1020.4,7,-6,916.11,664,-665,888.01,0,4,.5,159.2,1387.5,387.3,1,0,1,0,667,-669,.7,3,.3,-4,.2,371,-368,-3,205.2,266.2,-647,649,-657,-3,2,-2,27.3,694,-684,-11,.5,1,.2,672},{1.8,12,1,11,1.65,15,1.81,32,3,1,22,3.1,3,1,5,17,4,25,6,4.2,7.3,3.2,3,23,8,4.2,5,20,22,3,24.4,20,27.3,9,17,3,1,29.3,25,32,8.3,5,21,23,3,5,17,25,28.3,5,20,24,4,26,20,6,34.3,26,7,4.2,25,23,54,5,20,60.3,5,21,25,1,2.1,69.4,74.4,88.4,70.3,26,46.3,25,28.3,17,89.3,1,16,1.41,2,1.3,14,12,2,2.1,21,1.2,4,1,7,3,1.5,12,1,8,1.9,2,1.6,11,8,1.2,21,1,23,20,2,19,13,1.2,6,1.5,15,2,10,1.4,4,8,4,3,1,2,1.2,26.2,4.2,8.3,3,7,12.3,3,2.1,-2.2,1,3.1,11,1.4,6,1.9,21,1.9,4,1.6,4,1,4.2,7,1,22.2,7,3,2,1,8.3,1.3,12,11,1,9,4,7,6,11.3,1,4,64.61,9,4,1.3,11,1.3,7,1,13,5,2,8,4,8,3,1,23,15.2,13,11,1,8,1,4,1.2,12,1,5,6,13,1,12,3,12,2,1,24.3,8,1,13,19.2,80.3,12,1.2,13.5,161.4,2,8,1.2,5,8,83.3,9,13.3,1,3,1.9,7,1.2,33.2,2,13,2,1.21,3,1.4,6,1,-5.2,92.2,99,1.5,3,2,9,17.2,9,38.3,5.1,10.8,9,60.3,3,-6.2,5,21,6,20,-5.3,14,11,1.42,67.3,3,82.2,17,6.5,9,75.3,9.4,7,9.3,-2.2,9,1,109,1.4,5,18,3,17,1,41,215.2,2.1,-2.2,7,4.2,2,10,6,1.3,7,60.2}},{{4},{14,-11,.6,1,.6,2,0,2,.2,2,-8,.71,38,-37,0,-2,1,6,-7,4,653,0,-655,2,-3,674,-11,5,-668,0,658,1,-659,1,.2,-2,2,1,-2,1,-1,2,-2,9,.2,-6,.2,-3,2,-1,1,-2,0,12,-12,1.2,-2,4,-4,4,0,-3,0,11,0,-9,9,0,-7,-5,31.4,.2,1,.2,11,-5,-7,.2,2,0,7,40.3,-2,.5,2,.2,1,50,-42,-11,1,-1,2.1,11,-11,0,11,.2,-12,1.3,4,-7,5,-1,-3,3,8,-8,-2,17.2,0,-8,8,.4,43.2,0,657,0,6,0,-7,2,-654,3,.3,653,.4,-658,.4,658,.4,-653,.2,-5,-2,2,-2,0,658,0,-657,-1,6,0,603,-609,6,70.2,1,2,-4,657,-655,655,-656,676,-675,10,-5,-6,24.2,-658,.3,1,32.3,4,-3,0,7.4,1,0,656,-656,42.2,4,.3,-2,8,166.2,-3.2,0,57.2,0,1,.3,2.1,684,0,-685,.5,8,.5,726,2,-733,-2,0,73.3,3.1,3.1,736,-26,0,-712,1,692,0,-29,-662,692,-693,699,-699,713,-713,692,-692,-1,694,-690,690,-31,37,-36,-660,735,-736,691,-694,3,689,-691,664,28,-30,-662,739,-736,737,-740,656,-653,696,-696,657,-660,741,-741,1,741,-742,659,-659,0,5,-1,1,-4,0,3,0,-3,-1,.4,664,-663,714,-715,15.11,1,687,-22,-9,-655,-2,17.21,671,-15,6,-661,-2,11,-9,-2,3,658,-662,658,10,1,-668,.3,-1,692,-58,27,15,-7,-668,655,-654,650,-647,656,-658,658,35,-696},{14,75,1.31,20,1.42,265,8,25,18,25,134,49,3,6,46,72,1,8,21,6,69,10,44,9,21,25,126,49,113,46,158,5,1.01,5,1,6,1,3,6,5,9,1.4,2,1,5,2,5,2,4,1.4,10,1.9,9,24,1.5,12,1.5,2,1.8,3,4,5,6,1.3,7,-5.2,2,3,4,8,5,1.9,4,6,2,5,4,10,1,4,1.5,-30.2,7,1,8,7,2,15,1.5,26,1.41,26,1.2,31,27,2,70,30,3,1,8,1,12,1,18,15,2,25,11,3,8,13,1,3,1,9,1,15,11,15,2,7,19,46.3,9.2,13,16,-7.2,12,24,15,2,13,11,23,-2.2,5,1,7,1.9,2,16,1,6,2,1,4,1.3,2,1.3,30,1,49,1.5,7,1.5,14,6,12,8,2,13,3.1,6.5,6,-5.2,3,1,2,32.3,2,3,-2.2,3,2,-3.2,1,2,4,7.3,1,4.1,-2.2,2.1,21.4,1.2,18.6,33.3,26,1.4,2,7,2,1,10,-2.2,1.11,7.6,1.5,2,1,3,4.2,11.3,9,11.5,2,4,1.2,8,116,21,5,13,1.7,20,9,1.3,2,5,9,-7.2,1.2,12,17}},{{5},{659,-652,0,2,.2,2,0,-4,6.5,-8,.5,3,8.4,-3,0,2,0,19.5,6.3,-6,-3,9,-8,8,-8,.2,8,0,648,-648,.3,-9,656,1,0,-657,657,0,-656,-1,19.3,.2,20,-21,650,-658,1,.2,657,-649,0,649,.3,-649,.3,-8,2,655,-658,656,2,0,-658,658,.4,-657,0,-1,0,3,1,.2,5,0,-5,661,-664,-1,0,7,-6,2,5,653,-655,3,-9,0,658,-659,1.2,-1,-1,1,0,19,.9,640,.3,-660,.7,1,.5,-1,4.2,0,663,-658,-5,9,676,-685,664,-664,.3,1,655,-655,-1,73.2,90.2,.2,4,659,-663,663,0,-663,.2,19.2,5,0,653,76.2,.2,670,-670,70.4,-3,-658,19,.6,640,-640,.4,656,-666},{14,75,1.31,20,1.32,528,836,1.6,15,1,14,9,1.3,11,5,2,4,1.4,11,1.5,2,1,9,24,17,1.2,25,6,1,14,10,4,8,5,1.4,2,7,8,5,4,10,1,4,1.5,-30.2,7,18,51,1.4,64,27,72,30,3,58,39,25,10,42,2,26,11,4,26,29,26,43.2,13,38,5,8,1.9,37,1.3,30,1,49,1.5,7,1.5,40,2,21,2.1,4.3,19,1,16,9,6,1,6,9,1,4,5,1,4,1,10,-6.2,10,5,26,1.4,30,1.7,30,1,2,1,99.2,29,6.3,5,4,2,8,155,1.5,2,20,9,1.3,2,14,15}},{{6},{3,-1,.6,1,.6,-1,.5,1,.5,-1,1,2.1,0,4.2,.3,6.2,655,-655,0,5.2,.5,1,25.2,5,659,-5,.4,-660,19,-13,670,-676,1,-2,20,.3,653,-6,12,-13,-2,10,-14,.5,-659,.7,77,582,-659,0,-1,2,-1,0,8,-1,1,-8,0,1,6,5.2,1,-1,0,7,6.5,2,633,17,8},{14,75,1.31,32,1.11,1365,2,18,1,14,28,2,4,2,1,13,2,5,9,68,6,1,14,10,4,8,18,13,4,10,5,1.4,31,37,69,1.4,64,27,72,33,132,111,96,110,1.3,80,1.5,7,1.5,40,2,21,2.1,4.3,20,25,7,20,5,1,4,1,32,31,1,33,1.4,33,1,2,11.4,6.3,11,190,28,15}},{{7},{3,-1,1,670,-15,-657,1,.41,2,655,1,-658,6,-6,.3,660,-659,8,-9,0,1,4.1,8,666,-7},{1573,29,151,228,264,207,205,1.5,40,2,21,2.1,4.3,20,25,7,20,5,1,5,32,31,1,33,1.4,33,1,7,1,32,1,204,28}},{{8},{11,-5,5,-8,-2,3,.7,-1,-1,1,-1,7,651,-650,624,21},{1573,29,151,228,471,250,2,21,2.1,4.3,20,32,20,5,1,37,65,283,28}},{{9},{1,7,-5,0,-1,675,12},{2452,341,57,38,65,283,28}},{{10},{1,8,-5,7,625,20},{2452,341,57,38,348,28}},{{11},{1.2,675},{2452,436,348}},{{12},{1,659,-22},{2452,436,348}},{{13},{1,2,655},{2452,436,348}},{{14},{644},{3236}},{{15},{665},{3236}},{{16},{645},{3236}},{{17},{664},{3236}},{{18},{646},{3236}},{{19},{672},{3236}},{{20},{647},{3236}},{{21},{715},{3236}},{{22},{648},{3236}},{{23},{706},{3236}},{{24},{649},{3236}},{{25},{716},{3236}},{{26},{650},{3236}},{{27},{745},{3236}},{{28},{651},{3236}}}, - {374,1.42,84,1.7,7,1.7,2,1.49,-419,.2,93,.3,164,1,.4,1,.5,1,0,2,1,-91,.6,92,0,1,-92,.6,1,2.1,.6,91,.2,-435,436,15.3,-91,.8,1,.3,1,.2,90,2,30.3,.5,23.3,.2,1,0,6.3,.9,1,.11,1.2,.5,1,.4,1.2,.2,1.3,.51,58.3,-109,.01,110,.3,7.2,-110,.01,1,2.1,.01,109,.2,-462,462,2.1,19.4,3.2,39.3,.8,108,1.3,3,.4,2,.4,4,.4,39.3,8.3,2.1,8.4,12.5,.2,2.1,4.1,2.1,-155,129,2,4,2,1.5,3}, - {80,.531,521,1.3,2,1.3,-529,.082,540,1,-8,27,2,-28,27,.2,-561,537,22,4,-28,1,0}, - {2,.893}, - {2,.541,1,.4,-1,0,2,-1,4.2,1,.3,-1,3.1,6.4,17.9,1,-1,17.51,34.31,1,-2,34.23,0,14.8,34.52,119.81,16.1,32.1,98.05,34.81,4.2,184.71,.8,14.7,2,0,32.2,31.3,232.01,17.7,100.24,.5,215.08,81.6,115.82,3.2,.2,232.43,201.5,4.2,319.66,434.611,617.94,685.4,217.221,.392,1,.7,-1,.5,1,-1,2.1,2.1,.2,1,0,4.3,3.1,-1,.12,597.3,28.3,.13,7.2,.08,49.3,434.4,.2,57.7,.3,16.7,8.4,188.5,25.21,239.6,49.01,8.4,.9,92.91,.5,69.11,8.1,16.01,509.3,77.21,2,-2,544.5,0,-1,11.3,.2,10.4,-2,54.91,130.4,114.8,24.8,.2,621.7,24.6,86.3,9.4,67.7,2,78.3,44.41,182.41,84.8,100.32,0,321.3,17.7,74.4,.3,265.3,0,-2,19.4,76.02,.701,1,.74,-1,.92,1,39.2,3.2,.59,343.4,946.4,12.3,3.1,12.6,18.1,24.21,27.51,.461,84.3,3.1,6.1,12.1,24.1,167.7,.4,268.3,500.8,514.61,.81,1,13.3,.7,-1,3.1,.91,28.3,.01,182.7,420.4,481.6} + {45,.2,5,1.2,-7,-6,8,.4,1,-1,.4,-23,15,8,.9,-8,6,0,-5,.93,-1,.6,-5,.6,-19,.31,9,.6,5,.5,-7,.5,22,.5,-27,.5,-2,.11,55,2,.5,141,-138,-3,1,3,-4,.3,139,-139,.51,6,-3,-3,7,-1,-6,.3,3,-3,.51,1,2,-3,10,26,-36,.3,4,-4,.51,12,-9,-3,3,10,-13,20.4,14,-11,-3,15,-1,-14,.3,2,-2,.51,16,-13,-3,0,16,-16,.3,17,-17,.51,15,-12,-3,9,-3,50.2,15,-15,10.4,18,-9,-9,.3,19,-19,.51,20,-17,-3,11,-11,.3,1,-1,.51,21,-18,-3,143,-143,.3,141,-141,.51,22,-19,-3,144,-144,.3,23,-23,.51,13,-10,67.2,-15,.3,105,-105,36.2,13,-33,141,-117,-24,.3,149,-149,.51,25,-22,19.2,-5,-10,.3,41.2,76.5,130,-139,.3,18,-18,.51,26,-23,-3,27,-25,1,-3,.3,26,-26,.51,28,-25,-3,0,29,-29,.02,3,0,-3,30,-27,17.2,134.3,10.3,105,-102,10.2,13,-13,104.4,1,144,-145,96.4,67,-64,-3,31,110,-141,.3,31,-31,.61,10,-7,-3,5,-5,77.4,193.3,22,-22,.3,70,-70,.51,27,-24,-3,82.2,.3,9,-9,.51,32,-29,9.4,170.3,67,-34,124.2,-107,-34,46.7,35,-31,-4,.3,37,-37,.51,38,-35,-3,39,-24,154.2,40,-40,.31,66,-66,41,-38,-3,42,-36,-6,.3,192,-192,.51,43,-40,-3,44,1,-42,-3,.3,43,-43,119.4,189.2,4.2,.3,69,-69,.51,46,-43,-3,47,21,-68,.3,46,-46,.51,52,-49,-3,141,-93,-48,.3,49,-49,188.4,50,-11,-39,.3,38,-38,74.5,9.2,73.2,.51,49,-46,236.4,147,-147,38.4,9.3,10,-10,130.4,9.3,32,-32,18.4,51,92,282.2,53,-53,.51,54,-51,-3,32,-14,150.2,54,-54,.51,23,-20,-3,18,-8,264.2,148,-148,.51,2,1,96.2,9,-56,.3,57,-57,.51,58,-55,-3,0,58,-58,.3,59,-59,.51,18,-15,-3,13,5,190.5,69.3,3,57,-60,324.4,116.3,1,17,219.5,61,-58,-3,62,-44,10.2,126.3,371.3,229.3,69.3,89.3,.5,46.6,27,-27,339.4,45.3,61,-61,9.4,281.3,63,1,-64,.3,65,-65,.9,243,.5,-2,.5,-279,5,-2.2,-1,-8,5,0,-37,9,4,-4,4,29,.2,-26,.2,-8,3,21,-31,-1,25,-24,44,.3,-32,0,-6,28,-35,27,18,.3,-42,9,-5,38,0,1,-1,-15,-7,-4,26,.3,-40,.3,-1,3,-4,1,41,.3,-41,3,2,1,12,16,-1,-1,9,1,-27,1,25,1,-4,4,0,-4,-10,-31,0,36,1,.4,-38,70.4,2,0,16,3,2,-28,14,-3,4,1,21,.2,1,-25,14,0,8,.3,1,.2,-38,4,10,.2,7,0,1,0,5,.2,12,-3,-39,14,0,12,0,-11,27,.3,-24,24,0,-15,13,-11,24.2,116.2,-14,1,.2,14,25.2,.2,-28,0,24,1,14,-1,-39,2,-1,44,112.3,.4,-32,0,-13,0,7,4,-4,5,0,9,-21,28,17,.2,1,-1,.3,-45,12,-12,45,25.3,11.3,-15,-6,-5,26,18.4,143.2,37,-25,30,-43,-4,5,1,39,49.4,149.9,.2,1,-28,1.2,23,0,1.2,7.2,-4,3,4.2,.4,155.3,38,31,71,.2,-71,.3,72,1,31,37,-67,1,-75,0,71,5,-5,1,0,5,-6,-71,78,1.2,-80,78,3,1,-82,83,1,101,-100,1.2,-9,10,1.2,-6,7,1.5,8,-7,-97,98,1,-99,100,1.3,-32,0,-71,0,186,8,-110,-15,-35,-21,-1,-6,-6,195,-177,0,26,8,-11,43,-49,-9,5,59,-61,-20,-9,16,-2,44,-2,107,-103,-51,44,86,-139,195,-208,.4,2,.4,-1,.4,8,245.2,.4,35,.4,-3,.4,-4,.4,5,.4,-34,.4,28,.4,9,.2,-65,0,44,.2,-44,0,68,.2,-68,0,63,.2,-63,0,66,.2,-66,0,71,866.2,5,-143,867.3,198,-202,.5,865.4,165,1.2,-174,.5,1,149,-147,-3,10,141,-115,123,-159,.5,863.4,172,-162,158,-171,.5,862.4,174,-175,176,-190,.5,861.6,.5,15,57,-69,-3,9,145,-148,-6,9.2,137,-149,-3,18,138,-147,152,-89,193.14,83,8,-194,.5,20,2,11,742.2,86,-203,-40,16,.5,25,0,866.3,173,-178,141,-151,74.2,141,-153,-3,9,45,85,77,-216,.5,26,172,-195,0,-3,27,172,-197,198,-200,.5,170,-167,-3,0,171,127.2,-3.2,-3,-3,30,-23,-4,30,-33,.5,3,.2,864.2,64,-166,165,-168,66.3,950.2,1,94,50,4,-149,.5,67,84,-148,-3,31,124,-14,1,-142,.5,31,2,85.2,74,-181,-34,.5,10,17,854.2,826.2,-3,212,-213,.5,38,12,-47,826.3,152,-167,.3,824.7,181,-187,.5,43,121,-161,0,-3,165,-120,121,-166,76.4,13,163,-173,215,-215,-3,.5,46,168,-211,-3,47,167,-146,-23,-45,.5,52,43,-92,821.2,101,-194,-48,.5,15,139,-151,-3,158,-119,123,-162,18.2,-37,668.2,51,93,-1,58,-201,.5,156,160.2,32,185,-199,142,-160,.5,23,130,-150,-3,18,139,-147,265,-275,.5,781.4,144,-135,-56,.5,58,119,-174,780.3,119,-177,.5,778.4,163,-158,5.2,.5,32,-17,12,133.2,3,30,27,116,-176,75.2,148,-160,779.3,56.3,61,-46,75.2,778.2,-17,-1,.5,1,4,-2,-3,63,140,-139,141,1.7,14,-211,210,-3,1.2,4,1,5,-4,1.3,-170,172,-91,52,.9,-185,56,170,-84,-147,234,.9,-225,43,-33,0,-10,136,-56,-80,3,102,44,-9,0,-103,6,0,178,.3,3,-1,.3,-17,-256,274,-212,-10,-17,.22,244,1,0,-245,.74,251,.5,26,.5,70.2,2,.5,1,802.2,246,-142,-104,202,46,-248,246,10,-4,0,-252,11.2,148,0,32,-309,0,-8,0,-18,-11,11,-11,17,-14,0,34,.3,-6,-3,3,-3,9,-33,33,2.1,21.1,42.14,58,95.2,-124,0,153,-285,6.2,-3,4,-257,5.2,6,1,-263,106.2,.2,-104,110.3,-92,110,-270,116.4,19,-271,6.2,142,3,-249,11.3,17,-269,31.2,3,-61,-198,5.2,8,1,-265,147.3,-84,4,-172,6.2,-253,0,249,31,-283,49.7,.2,164.5,5.3,-67,213,-250,26.2,33,-9,-280,5.2,-5,7,-258,246,-10.2,-14,19.2,10,4,1,-261,24.2,110,53,-267,5.2,177,1,-282,15.2,-152,0,49.3,-67,231,-268,49.7,169,1,-22,36.3,-2,1,-199,-56,6.2,-319,121,-58,5.2,16,15,1,-288,6.3,-96,-176,91.5,1,-186,190,-251,9.2,-103,251,34,-357,.42,177,0,1.2,2.1,3,2,-116,117,2,1.4,0,2,1.3,-152,.4,153,1.4,.3,2,1.2,-30,21.81,3,1,-25,6,21,-15,10,4,-31,27.21,1.2,-151,27.21,-25,2,51,-123,-1,1,8,108,-119,0,159,-172,3,-15,0,42,-56,.101,142,-139,-3,55,128,-4,1.2,-181,.3,10,168,-178,1196.4,197,-42,-155,.3,195,-195,.9,-35,175,56,.5,-41,41,-196,.81,204,-204,.7,196,.3,-109,109,14,-210,16,83,-49,-49,55,163,88.2,-68,20,31,-204,.4,215,-228,2,-1,-30,27,8,-12,9,-4,5,9,.5,182,-40,67.6,3,-184,.5,64.3,3,194,-4,-38,-155,285.6,.2}, + {{{1},{1,.2,3,685,-1,-684,0,3,-5,8,0,-8,11,-6,-1,-4,8,-5,-3,0,5,1,3,-6,3,7,-7,-2,-4,3,-3,-1,0,1,.7,2.1,4.1,2.1,5,.2,-2,0,-3,0,374,1,2,32,8,12,11,244,.2,-1,.2,7,-6,5.4,-683,.6,683,0,-7,.2,11,-694,0,-1,2.1,-1,11.2,5,0,-4,.3,6,0,-5,0,2,28.2,0,33.4,0,7,-616,-78,6,-6,11,-3,7,-14,694,-695,690,-689,-1,100.3,684,-688,5,6,-7,11,-15,5.1,7,4.2,0,4,673,7,-681,674,35,-723,26.3,686,-690,26.01,82.2,-3,7,677,-3,-683,-6,699,-699,151.4,0,25.01,14,-14,11,-4,8,-15,689,-684,681,-686,0,26.3,682,-686,26.01,11,-11,2.1,15,684,-10,-681,-8,704,-704,26.3,688,-692,26.31,-5,9,672,2,-676,-2,685,-696,78.51,129.3,-5,9,-15,684,-670,-13,689,-690,26.51,181.3,104.3,684,-679,-5,.2,25.81,-3,7,25.2,-684,686,-686,102.51,179.4,-6,680,179.2,152.4,49.21,8,-8,100.5,-676,682,99.4,-2,-2,254.51,125.3,-14,50.61,99.6,2,-2,1,686,-687,26.3,-3,-1,100.41,-15,706,-700,-5,-1,51.91,-4,8,356.2,-690,-5,688,-688,26.51,253.3,3,1,678,-4,-678,-11,692,-3,-689,27.3,697,-701,129.31,-6,10,129.3,-3,-11,79.4,9,-13,358.51,671,-2,254.2,230.5,358.21,181.5,26.2,181.2,26.5,281.02,692,-683,-9,26.51,182.4,670,4,-683,679,-685,103.4,681,-685,25.01,0,52.8,687,233.4,309.71,677,-8,-676,-8,51.4,685,-689,408.91,258.61,459.8,334.71,126.5,-684,5,-6,1,638.4,126.11,-6,-9,334.7,-4,-2,385.22,695,-695,688,-687,52.4,692,-696,281.31,678,-674,639.2,-682,-7,690,561.61,462.6,689,-675,-14,0,689,360.4,692.71,671,3,-684,334.2,3,27.61,615.52,156.5,689,590.2,639.42,457.2,716.61,26.8,696,25.4,683,-687,75.81,665.42,356.5,331.14,-15,693,-687,684,-690,50.12,706,-26,-681,-14,175.4,699,-703,50.41,-13,704,-700,199.5,713.61,479.2,-673,-11,24.4,530.21,299.3,659.3,689,-678,2,-12,378.4,352.81,149.3,456.5,26.02,672,1043.5,350.02,687,-692,26.4,2,-6,301.51,-14,683,633.3,26.4,154.21,278.5,-6,675,278.81,77.5,681,-12,-679,0,-5,303.54,377.2,-5,177.61,24.4,686,-8,-687,686,-6,835.4,254.11,674,4,6,9,-4,29,-722,.5,67,-78,714,-713,684,-516,-169,4,721,-34,-3,3,-3,-2,.2,-686,1.2,686,37,-344,307,0,6,-8,903.2,3,-2,686,0,-6,-677,679,6,-685,-6,5,-8,1,684,0,-679,7,-2,-6,681,1,-687,6,-3,1,-4,692,.2,-4,2,-2,-685,687,-690,10,-2,-5,687,-2,0,-2,-686,4,-4,0,4,7,-11,-2.2,7,677,-677,0,674,-308,311,0,-684,-4,1.4,682,0,8,-8,8,-9,0,-685,19,-10,685,-683,-10,693,-6,-688,1.2,9,685,-687,10,-20,.3,1.3,692,-4,-689,-2.2,683,15,-7,2,-689,10,-5,-11,688,-682,-1,1,2.1,681,-682,1.2,3,675,-684,7.2,-687,445,254,-10,10,-698,1.2,688,-690,1.2,-2,2.1,1.2,692,.3,-6,-1,0,1,2,-683,6,-2,3,-14,137.3,688,-6,3,0,-1,-4,-2.2,.2,4,-4,18.2,-9,136.3,5,-8,687,7,-694,84.2,3,-8,148.5,-684,4,6,-8,6,-5,152.3,688,6,-6,6,-9,-682,682,36,-34,9,-6,-683,-1,5,58.2,160.3,718,-27,0,115.2,3,-4,0,7,56.3,675,-685,1,-3,.2,8,9.3,996.2,5.3,.4,674,-304,313,-4,-681,-9,11,-10,13,-6,-4,1,-4,689,3,-693,701,33,-720,1,-15,707,-696,-11,6,1564.2,7,-9,685,298.2,-4,-1,1,7,-7,0,633,-634,0,693,-693,0,12,689,-701,6,703,-709,0,450.2,701,-702,16,672,1,358.2,1169.2,703,-701,.3,-2,.2,170.2,1,-1,4,-4,.2,5.2,.2,2,702,-19,13,-698,0,4,683,12,-699,1,915.2,5,-6,694,-686,162.2,.4,1,-1,7,32,-10,-716,.4,685,8,12,34,-53,.3,4,0,15,-6,2,3,9,43,1.2,-20,21,-63,.3,822.2,61.2,685,.2,-7,1,-2,6,319.3,2,6.2,-693,1,2,686,6.2,-7,.2,-687,.3,556.6,698,-10,-689,722,-721,703,-704,621.5,708,-34,-675,674,-688,-1,3,-2,710.5,-5,1319.2,33.2,688,-697,-2,1690.6,685,-680,311.2,1,1675.4,1677.3,716,-46,-677,-8,0,740,-738,-2,1664.5,681,-11,-672,-2,-11,0,556.6,1,711,-698,-13,0,721,-722,671.6,6,700,-701,-5,.3,1,693,10,-703,706,56,-749,1,-15,715,-704,-11,6,531.2,7,-9,206.2,237.8,-633,-1,1745.2,0,12,695,-707,6,717,-722,-1,.2,707,-708,16,-15,696,-691,1510.3,.4,1007.6,0,2,239.3,497.2,-685,619.5,0,923.2,-5,0,-1,110.2,1549.6,-1,1829.2,523.2,1,-688,0,1537.6,-8,.2,-674,-11,0,692,-691,-1,1524.5,694,3,-698,-3,0,-11,1175.6,4,22,-707,-5,690,-4,-685,25.4,1497.3,-1,27,-698,-14,1,536.2,1,94.7,706,-706,692,-5,-678,-5,-4,1347.5,-674,674,-679,1474.3,692,-692,1360.8,9,-8,-1,118.8,-4,-2,701,-14,646.2,51.6,363.2,726,-725,-1,0,92.3,674,-670,269.2,-678,1320.3,244.4,928.3,0,685,0,-671,-14,.3,116.6,-1,0,-680,-5,0,226.2,465.2,258.6,0,712,131.2,3,-3,.4,63.4,203.2,333.2,369.6,74.4,698,-2,-696,.3,11.4,1,698,-693,682,-3,733.2,-687,318.6,1380.3,.6,1111.4,1,690,-687,-6,3,-3,223.2,134.4,673,24,-701,370.3,119.4,1087.3,0,685,-674,2,-12,0,210.6,1426.5,1,684,338.2,13.5,.2,712,-698,672,-683,-3,.2,119.6,690,250.2,683,-688,671.3,479.5,-1,235.2,1337.2,701,-701,76.4,692,8,-16,-693,624.2,686,314.2,1356.2,1,0,-1,167.2,79.2,-685,5.2,684,-673,673,-684,17.3,684,709.2,0,-2.9,669,368.2,3,693,-696,-2.9,-18,2,-2,0,2,9,676,32.2,-1,.5,1,-1,1.3,-2,1,-3.3,-11,-1,1.2,-1,11,.2,144.2,5,.2,2,0,4,0,516.4,1,.5,-1,-11,.7,11,.5,-10,.5,9.2,4,4.3,2,.5,15,.5,-25,.5,701,-5,11,-13,-2,10,-701,.5,700,8.5,-1,14.6,393,292,1216.2,-685,9,392,-400,637,1,-641,407,278,-43,0,-641,4,.3,866.2,-690,690,-691,685,944.2,0,8,1,675,-665,681,1371.2,-5,5,682,-682,21.1,42.14,-676,397,-405,-1,0,2,7,398,-406,8,983.2,399,-407,683,-675,-11,411,274,.2,-685,412,273,-40,-645,1,-1,414,271,-39,1,-645,-2,415,270,-270,-414,-1,416,269,-37,-647,10,406,-414,6,676,-674,407,-415,-3,627,-616,408,-416,646,-650,1,11,409,-417,681,1,-35,-649,-1,422,263,49.2,423,262,-33,1,-2,-651,424,261,-31,0,-654,425,260,-685,688,-677,415,-423,687,-688,9,416,-424,0,-4,12,417,-425,-1,653,-644,418,-426,743,-745,-1,430,255,1097.2,-2,431,254,-685,11,0,421,-429,682,132.2,434,251,-685,698,-698,436,249,-29,1,-657,437,248,-683,1,660,-652,427,-435,629,0,-631,10,428,-436,684,2039.2,429,-437,11,-14,14,-3,430,-438,2,-5,0,442,243,93.2,443,-441,-1,1,-2,445,240,5,-21,-663,1968.3,1,2.1,729,-44,13,392.2,676,.2,1,14,0,-691,675,-6.2,-691,-2,-1,4,1,-8,-1,3,-1,-1,4.3,542.2,745,-747,35.6,-40,43,-722,35.4,7,0,-684,679,8,-11,-680,36.21,0,712,-714,695,-10,0,5,-2,-688,41.6,-43,1,-677,41.3,1.2,0,-678,676,640.2,39.31,698,-699,684,6,0,-4,9,-696,2,14.2,.2,-1,699,-2,0,-10,21,-707,704,36,-739,577.4,623.3,570.6,12.1,1849.6,581.6,12.1,6.1,789.5,11.1,5.1,39.6,11.1,630.5,670,8,-693,798.3,.3,1567.4,557.2,1693.51,686,-8,-693,5,2277.61,-16,1,-3.5,2,-17,6,-6,5,1.3,4,-4,69.2,4,0,-15,.7,691,-691,.7,4,-5.2,2,694,-701,-9,15,-15,716,-716,381,-380,-1,1,686,7,-691,-4,691,-690,.5,691,3,-694,690,-3,-1,41,-726,695,-687,-9,77.5,675,9,0,-699,106.3,1077.6,692,-21,718.2,-679,6,-11,0,621,64,368.2,622,63,.2},{1936,1,4,1,4,4.1,1,1003,1.42}},{{2},{1.3,684,1,-687,474,214,-2,-1,0,1,.4,-1,-619,623,-519,539,2,3,-630,627,-2,2,-2,-22,-603,285,-367,-1,381,40,14,11,1.4,-69,5.1,10.1,5.4,2,1.3,6,9,3,-473,.31,686,62,-17,18,-40,-11,-10,-4,5,4,6,-13,0,-2,1,8,-2,-5,6,-689,.5,-2,.11,1,.5,46,214,427,-427,190,233,-684,5,680,-685,376,123,184,0,-684,684,.3,3.1,-684,262,20.3,239,-690,4,688,-316,19.3,-676,676,19.9,237,-688,0,-1,685,-685,377,21.2,.5,18.5,433,-433,18.4,10,674,18.4,39.21,241,-692,11,-1,674,-673,365,21.3,-683,683,60.11,41.2,5,-313,59.31,4,116.2,76.41,5,679,75.5,133.8,20.6,693,-691,369,74.61,133.2,-308,56.31,686,-683,681,17.3,56.21,131.2,93.2,19.4,3,-3,75.11,684,14,-698,228.4,-685,685,20.6,423,-423,248.3,684,-685,693,229.3,76.6,265.6,687,-693,2,375,18.11,226.3,698,-698,1,18.9,73.5,-1,5,680,5,3,284.4,95.31,-1,14,671,-681,373,266.11,135.6,0,680,1,-675,366,230.41,693,135.4,97.21,208.2,-677,228.4,192.7,684,-422,39.71,362.6,3,681,2,-310,287.71,679,250.51,343.4,286.9,227.5,0,684,8,-6,56.4,-675,675,37.5,702,-440,22.5,-1,693,-693,439.51,20.3,6,680,-686,385.51,-452,1,685,-675,674,24,-332,21.3,25,-25,215.11,2,-2,684,2,-685,277.3,0,-681,681,258.21,1,684,-677,-6,299.51,6,679,11,-319,601.41,432.3,-687,241.6,12,-12,489.31,-1,-698,510.71,-1,6,693,-699,21.21,63.5,695,-696,512.4,381.41,515.6,605.31,16.9,431,-431,220.3,116.2,241.6,2,-2,241.21,5,739.5,94.8,281.6,0,530.31,376.3,6,692,-12,376.71,10,688,20.5,78.8,627.01,131.9,16.4,-685,3,374,169.61,5,679,-684,873.21,230.8,666.5,21.31,3,209.51,330.3,-686,378,227.42,791.7,848.01,506.6,485.2,223.4,420.7,.6,695,11,-13,-2,10,23,-705,29,-47,32,418,-450,-1,1,-1,2,-2,1.2,853.2,6,1,-690,683,9.2,0,-1,124.2,0,11,-2,-8,689,-671,27,-42,681,-516,-168,10,-7,5,676,-676,-7,688,-690,4,42,-37,676,-685,.5,65,-65,685,-676,-5,42,-46,.3,688,-320,-199,515,-675,16.2,690,-681,676,-682,682,0,-682,683,0,-213,-23,.4,-449,71.4,4.2,683,-685,0,691,-690,-1,.2,691,0,-5,0,-686,9,5,-13,1.3,686,-690,685,7,-4,-2,12,-7,-3,4,0,-4,-648,-32,705,-3,-2,2,40,-40,41,-38,0,-713,708,0,-701,-7,0,1.2,689,.2,61.2,.2,-7,.5,3,0,-2,-686,700,-647,-46,689,-687,10,667,-667,2.1,-10,0,-9,.3,11,681,-692,1.2,-2,2,696,-689,10,0,667,-657,54,-74,677,146.2,3,681,.2,25.2,31.3,-17,139.2,9,21.3,-677,74,-64,667,-686,.3,3,37,-37,-3,5,-5,134.2,0,677,55.4,74,-83,1,.2,693,-250,-76,316,-680,15,32.2,-686,687,-686,-1,4,8.3,-683,1,5.3,.4,-683,687,-6,-676,48,-54,687,148.3,31,-714,224.3,686,-686,26,-26,150,572,-7,-22,1022.2,1,4,-5,1,0,-8,-686,735,-732,733,-736,691,-691,1.2,-1,697,-697,700,-11,-690,703,-701,6,70,184,423,22,-707,66.2,690,-687,683,-1,-686,0,9,677,-686,691,-679,675,-684,-3,686,-684,688,-686,-4,.4,755,-30,-34,-5,6,-2,8,-10,0,-1,3,.4,-689,.4,726,33,-23,24,1,-66,.2,-696,0,688,-1,7,.2,-691,.2,1,0,-4,.2,-1,6.2,.2,11,.2,675,4,-3,-308,306,-305,121,192,-692,-1,6,698,-703,0,378,11.3,238,-738,4,700,-705,-1,380,10.3,184,206.2,-2,1,693,-2,-691,684,-305,310,-309,13.4,10,682,-693,2,688,-311,25.3,204,-704,11,-1,682,339.2,-309,36.5,22.2,-6,-308,32.5,690,-686,688,-693,0,379,43.6,5,201.2,-687,190.2,1,196.3,688,-687,51,-52,319,417,-736,704,-687,687,-704,687,6,1,23,-29,-687,763,-761,-3,1,689,-690,196.2,702,-700,704,-13,-694,703,-17,29,-336,50.5,-1,690,3,-7,-685,378,314,-313,138.3,684,10,-695,705,-705,691,-312,150.5,740,-735,699,-705,0,2,-1,152.4,106.3,-10,1,1275.2,0,-1,99.7,4,688,-6,14,-322,60.6,14,679,-689,689,-314,11.3,152.2,4,1,-1,688,72.2,10,-11,36.6,691,-686,718.2,0,-2,203.7,116.2,693,-685,-4,0,375,99.5,3,689,12,-704,686,-308,11.5,-1,0,699,-699,1,84.2,260.6,698,-692,698,-704,59.4,-501,1090.3,682,16,-709,11.4,84.2,2,-3,1.2,691,-6,0,-687,83.6,-1,4,-3,692,-694,9,-6,377,13.6,0,6,1402.2,696,-9,321.4,13.2,375.2,-3,97.2,254,427,24.5,1172.3,.2,379,312,-311,61.3,963.2,95.2,0,94.6,740,-736,700,-703,-2,379,117.6,1,-1,227.2,685,-306,153.6,6,679,15,-14,322.6,686,-676,675,10,-6,-311,201.6,688,-694,5,375,10.7,-693,693,-690,-4,380,33.5,5,687,59.2,136.7,99.2,219.2,304.6,.2,76.3,-1,687,5,-691,842.2,684,-679,-1,707,-711,11,-11,.9,4,-3,0,686,7,9,-7,20,-716,.4,7.2,-7,43.2,-1,4,1,682,-687,.3,696,-2,-6,-2,-608,613,-1,-3,4,3.2,-1,12,5,-12,-1,1,-5,-1,0,772.3,17.3,9.3,-681,1,679,1,6,560.3,-6,6.1,12.1,26,-19,17,-16,21,-29,6.4,12.6,24.4,18.3,-714,.5,1,.71,686,-609,-76,.2,10,681,-691,692,-687,-5,685,492.4,685,-3.2,-191,-44,-456,690,-690,301.2,5,-4,4,1,-5,1,-2,-1,1,146.2,652.2,3,21.1,42.04,692,-692,693,9,0,-700,690,-669,668,-5,-686,692,-683,682,-7,2,-685,.3,231.2,.2,794.3,520.3,2,9,675,118.2,89,-90,11.2,16.2,692,32.2,-691,906.2,-610,609,-4,22,-17,142.2,-693,.2,692,-611,612,-688,1,-4,-2,641.3,.2,46.2,575.3,0,567.3,4,-4,685,-603,-82,8,678,295.2,32.2,0,47.3,-692,4,689,-692,842.2,10.2,-601,602,-1,11,-17,-595,-90,876.4,1.2,0,690,109.2,-692,0,685,-600,-85,8,679,999.2,1,0,1,684,-599,-86,-1,0,2,124.3,-689,21.2,5,93.2,-680,-11,141.3,-693,14,-14,94.3,-693,368.2,92.6,-1,1,250.5,0,691,0,722.2,8,680,-691,695,-4,2,0,-692,687,-677,-11,699,633.2,.4,7,-15,-674,680,9,.3,-695,686,-680,675,359.2,28.2,1063.2,706,-14,7,0,-698,693,-683,-11,704,-691,688,.4,-17,7,-680,681,-8,.3,8,-681,-7,0,-4,692,0,976.2,8,687,-698,691,7,-12,39.2,-1,444.2,707,-15,.4,-3,3,-681,687,-9,.3,9,-687,29.3,685,1.2,22,-23,23,-11,-698,.2,11,20,-19,0,675,-565,578,-578,322,258,-701,121,6.3,245,-688,6.4,12.1,12.6,240,-683,12.1,12.7,580,-580,12.1,12.4,6.3,36.9,12.11,261,1631.5,8,-9,689.2,1652.4,9,-9,1652.11,0,-1,699,-700,5,2088.4,-680,680,22.5,78,-78,.5,4,-4,695,-6,6,7,-7,4.2,1494.2,-451,-1,0,1,722.3,4.3,657,26,2,6,.2,-4,-1,813.2,.3,3,-3,3,166,-169,1,25.3,677,7,1,0,1,0,-686,10,698,-22,1187.2,717,-23,-315,778.5,8,-9,686,-675,-11,380,311,800.2,11.2,0,-1,289.2,-7,775,-770,682,-590,-95,335.2,-585,-100,.2},{5,77,1.6,65,4,22,3,1,25,6,21,25,23,4,5,17,3.1,3,23,25,3,5,20,22,3,2.1,26,1,5,17,9,17,3,7,46,32,24.3,21,23,8,42,20.3,5,20,24,4,-26.2,25,27,7,20,26,23,54,25,45.3,5,56.2,1,2.1,5,20,23,70.4,5,17,26,4,26,36.3,25,24.3,17,8,20,1,28,2,3,16,63,35,1.2,20,10,22,85,5,15,2,12,14,4,-3.2,1,3,1.2,4,3,4,1,5,8,-2.2,9.2,5,2,4,-2.2,12,1.4,6,1.4,39,1,4,1,4,4.1,1,7,5,8,3,2,12,15,11,1,9,4,7,6,7,4,7,49.11,13,1,2,11,2,8,14,5,102.3,23,6,14,11,9,5,14,1,11,26,3,83.2,1,8,14,4,1,11,2,12,2,19.3,61.3,8,1.2,13,1,4,9,4,12,1.7,2,7,1,5,1,3,13,2,11,1,67.2,6,1,-5.2,2,1.2,99,1.5,33,2,21,2.1,4.3,20,162,1.42,9,10,1,26,3.2,17,3,1,-10.2,1,16,3,1,13,110,31.2,5,39,45,1,4,1,-2.2,9,3,2,10,6,1.3}},{{3},{2,1,-1,0,1,0,4.3,-1,.9,3.2,685,6,-5,6,-2,8,-11,-2,7.6,27,-14,2,-7,-6,0,2,12.5,4,6.1,6.5,-649,-38,.6,1,-1,.3,-1,2,-1,59.4,5.3,.5,3.2,.7,8.4,13.5,.2,27.3,3.2,.4,16.9,26.5,15.01,31.3,8.3,2,-1,3.2,-2,39.3,52.31,5.1,18.7,.9,692,-692,13.1,65.01,.8,78.51,109.31,.41,685,-684,149.12,.7,4,-3,93.11,54.4,17.3,55.01,97.31,84.5,.2,140.21,207.51,87.01,100.3,26.3,42.01,156.3,102.41,684,-683,36.3,0,18.8,5.3,313.4,174.01,27.01,.31,692,-691,11.9,66.41,-679,-5,3,-3,127.01,61.3,3.1,70.3,143.8,186.2,69.3,.3,73.01,.6,11.5,100.01,163.3,688,-687,18.4,97.01,.7,495.6,36.01,.51,252.41,0,-1,687,-687,82.11,213.3,22.3,707,-706,63.9,707,-707,115.41,53.7,292.31,119.3,207.12,93.6,687,-686,123.22,691,-690,476.41,13.3,.4,323.3,184.11,31.01,98.3,263.01,13.3,47.6,117.8,686,-685,54.9,694,-694,1,731,-732,192.11,145.01,125.01,165.51,-1,721,-721,669.61,.4,82.01,0,7,683,.4,2,.2,-683,.2,-6,-2,-1,21.2,.2,32.2,690,0,-6,2,-686,.2,1,6,679,9,-695,49.7,691,.2,30,-37,3,-684,681,652.2,.2,685,5,-4,0,57.4,1,64,-64,0,683,-684,1,686,.6,-680,680,-2,-680,685,-4,-685,.3,6,680,-668,19,-24,-14,684,-677,.4,-7,.3,19,-19,0,688,.2,-677,.2,683,-687,.8,-7,1,-1,690,-690,68.3,71.6,687,0,1,0,-3,-684,693,-7,0,-678,681,-690,133.3,3.2,17.2,23,-710,112.3,149.7,16.3,.2,23,-22,-682,677,2,-2,27,-711,49.6,686,4,.2,-689,26.6,82,-83,4.2,314.2,-685,.91,2,-2,26.3,.2,6,-3,-3,0,703,-703,.6,3,6.2,1.2,-2,0,752,-752,5,-5,0,696,-696,.2,753,-16,1,16,-749,6,.4,677,-1,7,32,-10,-714,.4,-2,.4,1,726,-725,.2,-3,.2,10,.2,678,.2,-687,677.6,104.5,433.4,752.4,3,-2,-2,953.9,3.2,573.7,.8,596.3,641.3,.11,102.9,.21,854.3,860.4,1,-4,28.3,-692,0,701,-701,404.4,.2,5,-5,530.7,10.3,701.5,83.6,732.3,-685,2,-1,0,691,-691,61.3,.4,5,742.3,86.5,80.3,1167.4,.4,1058.5,465.3,688,-688,47.8,144.3,.6,184.2,769.5,0,-1,9.2,509.4,747.6,6.2,221.2,.8,-1,1.2,575.3,16,485.2,8.3,54.3,100.4,7.3,.2,3,-2,202.6,3,-1,-3,.7,-1,1,.5,523.5,103.5,0,-1,3,43.2,3.2,682,1,6,-687,.9,-4,684,-682,2,1,693,-698,690,-5,-684,695,.3,96.2,4,-3,.5,59.2,3,.3,-2,483.3,-3,.2,1,.32,-1,.32,1,.5,686,.5,13,-5,11,-13,-2,10,-700,.6,-1,0,766,-765,4.2,709,-22,704.3,741,-742,.2,3,0,-3,1,.3,45.2,685,-685,2.1,0,12.1,24.22,526.2,0,11,1,-12,823.01,696,-697,689,921.3,0,683,736.4,2.1,744,-743,.2,590.2,-681,-4,-1,0,620,-619,926.3,687,-688,207.3,23.4,1427.3,3.2,58.2,691,-692,298.3,822.3,0,70.2,39.2,1,-2,13.5,39.3,86.2,522.7,82.4,0,307.3,744,-733,-10,-1,817.2,684,-684,928.4,-1,0,827.3,0,686,-686,260.3,0,690,-687,5.2,445.3,62.2,7.2,694,-683,-6,247.2,48.3,64.2,4,1,686,621.3,-2,.5,695,-695,7,1,6,-8,-6,11,-10,4,130.2,159.3,20.2,4,1,687,405.2,-1,.6,706,-706,24.4,5,82.2,0,1,4,-1,683,5,0,-5,-687,26.3,693,-697,0,-1,.5,693,-693,26.9,770.2,677.3,0,2,0,-2,32.3,.01,1,-1,3.1,.13,6.5,382.3,6.3,.61,1066.4,7,-6,962.11,692,-693,934.01,0,4,.5,171.2,1433.5,432.3,1,0,1,0,695,-697,.7,3,.3,-4,.2,381,-378,-3,223.2,307.2,-675,677,-685,-3,2,-2,27.3,723,-713,-11,.5,1,.2,700,-700,3,44.2},{1.8,12,1,11,1.65,15,1.81,32,3,1,22,3.1,3,1,5,17,4,25,6,4.2,7.3,3.2,3,23,8,4.2,5,20,22,3,24.4,20,27.3,9,17,3,1,29.3,25,32,8.3,5,21,23,3,5,17,25,28.3,5,20,24,4,26,20,6,34.3,26,7,4.2,25,23,54,5,20,60.3,5,21,25,1,2.1,69.4,74.4,88.4,70.3,26,46.3,25,28.3,17,89.3,1,16,1.41,2,1.3,14,12,2,2.1,21,1.2,4,1,7,3,1.5,12,1,8,1.9,2,1.6,11,8,1.2,21,1,23,20,2,19,13,1.2,6,1.5,15,2,10,1.4,4,8,4,3,1,2,1.2,26.2,4.2,8.3,3,7,12.3,3,2.1,-2.2,1,3.1,11,1.4,6,1.9,21,1.9,4,1.6,4,1,4.2,7,1,22.2,7,3,2,1,7,4,1.3,12,11,1,9,4,7,6,18.3,1,4,63.61,9,31.2,11,1.3,7,1,13,5,2,8,4,8,3,1,23,15.2,13,11,1,8,1,4,1.2,12,1,5,6,13,1,12,3,12,2,1,24.3,8,1,13,19.2,79.3,12,1.2,13.5,160.4,2,8,1.2,5,8,83.3,9,13.3,1,3,1.9,7,1.2,33.2,2,13,2,1.21,3,1.4,6,1,-5.2,92.2,99,1.5,3,2,9,6,18.2,9,39.3,5.1,10.8,15,61.3,176.3,-6.2,5,28,5.2,6,5,25,5,6,1,3,-5.2,-14.2,86.2,1,3,1.42,80.3,25.2,8,17,6.5,9,88.3,9.4,7,9.3,-2.2,9,1,109,1.4,5,18,3,17,1,41,227.2,2.1,-2.2,7,4.2,2,10,6,1.3,7,4,166.3,34.2}},{{4},{14,-11,.6,1,.6,2,0,2,.2,2,-8,.71,38,-37,0,-2,1,6,-7,4,681,0,-683,2,-3,702,-11,5,-696,0,686,1,-687,1,.2,-2,2,1,-2,1,-1,2,-2,9,.2,-6,.2,-3,2,-1,1,-2,0,12,-12,1.2,-2,4,-4,4,0,-3,0,11,0,-9,9,0,-7,-5,31.4,.2,1,.2,11,-5,-7,.2,2,0,7,40.3,-2,.5,2,.2,1,50,-42,-11,1,-1,2.1,11,-11,0,11,.2,-12,1.3,4,-7,5,-1,-3,3,8,-8,-2,17.2,0,-8,8,.4,43.2,0,685,0,6,0,-7,2,-682,3,.3,681,.4,-686,.4,686,.4,-681,.2,-5,-2,2,-2,0,686,0,-685,-1,6,0,627,-633,6,70.2,1,2,-4,685,-683,683,-684,-1,705,-703,10,-5,-6,25.2,-686,.3,1,33.3,4,-3,0,7.4,1,0,684,-684,43.2,4,.3,-2,8,167.2,-3.2,0,58.2,0,1,.3,2.1,710,0,-711,.5,8,.5,757,-37,0,-725,-2,0,75.3,3.1,3.1,766,-766,0,7,760,-25,-15,15,-744,1,718,0,-27,-690,718,-719,729,-729,745,-745,718,-718,-1,721,0,-1,-716,715,-715,716,-29,27,-716,683,45,-38,-688,717,-718,717,-720,3,715,-717,692,28,-35,26,8,-1,-28,-690,769,-766,767,-770,684,-681,726,-726,685,-688,720,-718,-2,3,768,-771,1,771,1,-773,687,48,-44,-691,0,5,-1,1,-4,0,3,0,-3,-1,.4,692,-691,746,-747,15.11,1,713,-19,-10,-683,-2,17.21,699,-15,6,-689,-2,11,-9,-2,3,686,-690,686,9,2,-696,.3,-1,718,-57,28,15,-7,-696,683,-682,678,-675,684,-686,686,36,-725,695,81},{14,75,1.31,20,1.42,265,8,25,18,25,134,49,3,6,46,72,1,8,21,6,69,10,44,9,21,25,126,49,113,46,158,5,1.01,5,1,6,1,3,6,5,9,1.4,2,1,5,2,5,2,4,1.4,10,1.9,9,24,1.5,12,1.5,2,1.8,3,4,5,6,1.3,7,-5.2,2,3,4,8,5,1.9,4,6,2,5,4,10,1,4,1.5,-30.2,7,1,8,7,2,15,1.5,26,1.41,26,1.2,31,27,2,70,30,3,1,8,1,12,1,18,15,2,25,11,3,8,13,1,3,1,9,1,4,-11.2,15,2,7,19,46.3,15,11,13,16,-7.2,12,24,15,2,13,11,23,-2.2,5,1,7,1.9,2,16,1,6,2,1,4,1.3,2,1.3,30,1,49,1.5,7,1.5,14,6,5,13,8,2,3.1,6.1,6,2,1.2,2,-5.3,3,1,8.3,1,2,3,-2.2,3,2,-3.2,1,2,7,5,4,11.5,1,-2.2,2.1,6.1,1,2,5,31.5,43.2,4,18.3,1.2,16.4,21.2,4,26,1.4,2,7,2,1,10,-2.2,1.11,7.6,1.5,2,1,3,4.2,11.3,9,11.5,2,4,1.2,8,116,21,5,13,1.7,20,9,1.3,2,5,9,-7.2,1.2,12,17,7.2}},{{5},{687,-680,0,2,.2,2,0,-4,6.5,-8,.5,3,8.4,-3,0,2,0,19.5,6.3,-6,-3,9,-8,8,-8,.2,8,0,676,-676,.3,-9,684,1,0,-685,685,0,-684,-1,19.3,.2,20,-21,678,-686,1,.2,685,-677,0,677,.3,-677,.3,-8,2,683,-686,684,2,0,-686,686,.4,-685,0,-1,0,3,1,.2,5,0,-5,689,-692,-1,0,7,-6,2,5,679,2,-683,3,-9,0,686,-687,1.2,-1,-1,1,0,19,.9,668,.3,-688,.7,1,.5,-1,.7,715,-715,687,-686,0,691,-686,-5,9,702,-24,-685,-2,692,-692,.3,1,683,-683,-1,.4,93.2,-685,.2,4,687,-691,691,0,-691,.2,19.2,5,0,681,82.2,.2,698,-698,76.4,-3,-686,19,.6,668,-668,.4,684,-694},{14,75,1.31,20,1.32,528,836,1.6,15,1,14,9,1.3,11,5,2,4,1.4,11,1.5,2,1,9,24,17,1.2,25,6,1,14,10,4,8,5,1.4,2,7,8,5,4,10,1,4,1.5,-30.2,7,18,51,1.4,64,27,72,30,3,58,39,25,10,5,37,2,26,11,4,26,29,26,44.2,13,38,5,8,1.9,37,1.3,30,1,49,1.5,7,1.5,46,2,21,2.1,4.3,8,1.2,20,1,16,9,6,1,18,5,9,5,1,4,3.1,1,20,-6.2,9,2,5,10,32,1.4,30,1.7,30,1,2,1,4,1.4,29,6.3,5,4,2,8,155,1.5,2,20,9,1.3,2,14,15}},{{6},{3,-1,.6,1,.6,-1,.5,1,.5,-1,1,2.1,0,4.2,.3,6.2,683,-683,0,5.2,.5,1,25.2,5,687,-5,.4,-688,19,-13,698,-704,685,-684,-2,20,.3,681,-5,11,-13,-2,10,-14,.5,-687,.7,5,-6,3,75,610,-687,.2,-1,2,-1,0,3,5,-1,1,-8,0,1,6,5.2,1,-1,0,7,6.5,2,660,18,8},{14,75,1.31,32,1.11,1365,2,18,1,14,28,2,4,2,1,13,2,5,9,68,6,1,14,10,4,8,18,13,4,10,5,1.4,31,37,69,1.4,64,27,72,33,132,5,106,96,110,1.3,80,1.5,7,1.5,46,2,21,2.1,4.3,8,1.2,21,25,7,32,10,5,1,4,1,43,5,42,1,33,1.4,33,1,2,12.3,32,6.3,11,190,28,15}},{{7},{3,-1,1,698,-15,-685,1,.41,-1,3,-2,2,683,1,-686,6,-6,3,-3,.2,688,-687,8,-9,0,1,4.1,8,694,-7},{1573,29,151,228,264,207,205,1.5,46,2,21,2.1,4.3,8,1.2,21,25,7,42,5,1,5,43,5,42,1,33,1.4,33,1,7,1,32,1,204,28}},{{8},{11,-5,5,-8,-2,3,.7,-2,-1,1.2,-1,1,-1,7,-7,686,-678,651,22},{1573,29,151,228,471,256,2,21,2.1,4.3,8,1.2,21,32,42,5,1,48,5,76,283,28}},{{9},{1,10,-3,-5,686,-686,-1,703,13},{2452,337,21,79,49,5,76,283,28}},{{10},{1,686,-678,-5,7,652,21},{2452,337,21,79,54,359,28}},{{11},{1,3,-2,703},{2452,337,154,359}},{{12},{1,687,-23},{2452,491,359}},{{13},{1,2,683},{2452,491,359}},{{14},{672},{3302}},{{15},{693},{3302}},{{16},{673},{3302}},{{17},{692},{3302}},{{18},{674},{3302}},{{19},{700},{3302}},{{20},{675},{3302}},{{21},{747},{3302}},{{22},{676},{3302}},{{23},{736},{3302}},{{24},{677},{3302}},{{25},{748},{3302}},{{26},{678},{3302}},{{27},{744},{3302}},{{28},{679},{3302}}}, + {384,1.42,96,1.7,7,1.7,2,1.49,-441,.2,93,.3,186,1,.4,1,.5,1,0,2,1,-103,.6,104,0,1,-104,.6,1,2.1,.6,103,.2,-457,458,15.3,-103,.8,1,.3,1,.2,102,2,30.3,.5,23.3,.2,1,0,6.3,.9,1,.11,1.2,.5,1,.4,1.2,.2,1.3,.51,58.3,-121,.01,122,.3,7.2,-122,.01,1,2.1,.01,121,.2,-484,484,2.1,19.4,3.2,39.3,.8,120,1.3,3,.4,2,.4,4,.4,39.3,8.3,2.1,8.4,12.5,.2,2.1,4.1,2.1,-167,141,2,4,2,1.5,3}, + {80,.531,545,1.3,2,1.3,-553,.082,565,1,-9,30,2,-31,30,.2,-588,561,25,4,-31,1,0}, + {2,.993}, + {2,.541,1,.4,-1,0,2,-1,4.2,1,.3,-1,3.1,6.4,17.9,1,-1,17.51,34.31,1,-2,34.23,0,14.8,34.52,119.81,16.1,32.1,98.05,34.81,4.2,184.71,.8,14.7,2,0,32.2,31.3,232.01,17.7,100.24,.5,215.08,81.6,115.82,3.2,.2,232.43,201.5,4.2,319.66,434.611,617.94,685.4,217.221,.392,1,.7,-1,.5,1,-1,2.1,2.1,.2,1,0,4.3,3.1,-1,.12,597.3,28.3,.13,7.2,.08,49.3,434.4,.2,57.7,.3,16.7,8.4,188.5,25.21,239.6,49.01,8.4,.9,92.91,.5,69.11,8.1,16.01,509.3,77.21,2,-2,544.5,0,-1,11.3,.2,10.4,-2,54.91,130.4,114.8,24.8,.2,621.7,24.6,86.3,9.4,67.7,2,78.3,44.41,182.41,84.8,100.32,0,321.3,17.7,74.4,.3,265.3,0,-2,19.4,76.02,.701,1,.74,-1,.92,1,39.2,340.4,-1,.69,9.8,952.4,12.5,15.21,18.6,0,2,77.4,13.7,28.21,12.1,67.81,45.21,.561,124.3,3.1,6.1,12.1,24.1,207.7,.4,308.3,540.8,554.61,.81,154.3,557.3,3.1,.91,28.3,.01,222.7,460.4,521.7,124.5} }, __refPoss = { nil, nil, - {10,1.531,1355,1.082,98,1.75,3,1.2,2.1,4.1,612,704,1.9}, - {10,1.531,38,78,26,262,416,204,73,26,232,1.082,242,12,46,343,13,64,42,13,1,11,112,199,10,162,2,1}, - {153,3,1,22,3.1,6.1,12.1,3,2.1,4.1,20.21,23,35.41,5,18,36.01,12.3,40.31,43.11,72.81,107.62,376,2,1,5,1.2,3,1,2,1,2,1.5,3,89,1,3,1.2,7,3,1.3,7,1,4.3,3.1,6.4,1,13.3,20.2,17.3,60,21.4,4.1,8.5,4,27.7,19.11,46.4,42.5,50.5,11.4,4,15.5,8,19.8,73.7,97.9,18.6,10.3,1.2,33.31,1.2,24,34,2,1.3,125,130,46,23,10,4,149,1.8,10.2,103,3,1.4,218.3,62,3,1,13,17,1,3,1.5,7,84.2}, + {10,1.531,1355,1.082,98,1.75,3,1.2,2.1,4.1,612,770,1.9}, + {10,1.531,38,78,26,262,416,204,73,26,232,1.082,242,12,46,343,13,64,42,13,1,11,112,248,16,173,2,1}, + {153,3,1,22,3.1,6.1,12.1,3,2.1,4.1,20.21,23,35.41,5,18,36.01,12.3,40.31,43.11,72.81,107.62,376,2,1,5,1.2,3,1,2,1,2,1.5,3,89,1,3,1.2,7,3,1.3,7,4,3.2,6.3,3.1,3,1,7,19.4,1,11.2,60,4.3,8.4,4.1,7,1,33.4,27.4,19.11,46.4,42.5,50.5,11.4,4,15.5,8,19.8,73.7,87.4,45.9,110.5,1.2,33.31,1.2,24,34,2,1.3,125,147,20,1,47,33,16,9,155,1.8,12.2,103,3,1.4,219.3,62,3,1,13,17,1,3,1.5,7,86.2}, nil }, } diff --git a/luafight/Modules/Battle/Logic/Base/Buff.lua b/luafight/Modules/Battle/Logic/Base/Buff.lua index 38fd72ddd..8ba1be4fd 100644 --- a/luafight/Modules/Battle/Logic/Base/Buff.lua +++ b/luafight/Modules/Battle/Logic/Base/Buff.lua @@ -17,6 +17,8 @@ local BuffRegister = { [BuffName.Brand] = "Brand", [BuffName.Blood] = "Blood", [BuffName.BanBlood] = "BanBlood", + [BuffName.SigilSign] = "SigilSign", + [BuffName.CommonSign] = "CommonSign", } diff --git a/luafight/Modules/Battle/Logic/Base/Effect.lua b/luafight/Modules/Battle/Logic/Base/Effect.lua index e59d75d04..4124f28eb 100644 --- a/luafight/Modules/Battle/Logic/Base/Effect.lua +++ b/luafight/Modules/Battle/Logic/Base/Effect.lua @@ -84,7 +84,7 @@ local effectList = { BattleUtil.RandomControl(f1, cb1, caster, target, f2,skill) end) end, - --[d]改变[a]属性[b]%,持续[c]秒 + --[a]属性[b]%,持续[c]秒[d]改变 --a[属性],b[float],c[int],d[改变类型] [4] = function(caster, target, args, interval, skill) local pro1 = args[1] @@ -2517,6 +2517,304 @@ local effectList = { target:AddBuff(buff) end) end, + --造成主角[a]*[b]攻击伤害 + --a[int 1:等级 2.战斗力],b[int] + [132] = function(caster, target, args, interval, skill) + local type = args[1] + local pro = args[2] + + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + local damage=floor(value*pro) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + end) + end, + --对目标造成玩家[a]*[b]的伤害，伤害的[c]%转化为生命，治疗生命百分比最[d]的英雄 + --a[int 1:等级 2.战斗力],b[int],c[float],d[int 1:低 0:高] + [133] = function(caster, target, args, interval, skill) + local type=args[1] + local f1 = args[2] + local f2 = args[3] + local sort = args[4] + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + local damage=floor(value*f1) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + local hp=floor(damage*f2) + local arr = RoleManager.NoOrder(function (r) return r.camp == caster.camp end,false,true) + BattleUtil.SortByHpFactor(arr,sort) + BattleUtil.CalTreatNoCrit(caster, arr[1],hp,1,skill) + + end) + end, + --对目标造成主角[a]*[b]的伤害，并有[c]%概率给目标上[d]类型[e]效果buff持续[f]回合,buff具体参数1 [g] + --a[int 1:等级 2.战斗力],b[int],c[float],d[int],e[int],f[int],g[int] + [134] = function(caster, target, args, interval, skill) + local type=args[1] + local v1 = args[2] + local p1 = args[3] + local t1 = args[4] + local t2 = args[5] + local r1 = args[6] + local v2 = args[7] + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + local damage=floor(value*v1) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + if t1==BuffName.Control then + BattleUtil.RandomControl(p1,t2,caster,target,r1,skill) + elseif t1==BuffName.DOT then + BattleUtil.RandomDot(p1,t2,caster,target,r1,1,value*v2,skill) + end + end) + end, + --对目标造成主角[a]*[b]的伤害，如果目标处于[c]类型[d]效果,则[e]%概率给目标添加[f]类型[g]效果，持续[h]回合 + --a[int 1:等级 2.战斗力],b[int],c[int],d[int],e[float],f[int],g[int],h[int] + [135] = function(caster, target, args, interval, skill) + local type=args[1] + local v1 = args[2] + local t1 = args[3] + local t2 = args[4] + local pro = args[5] + local t3 = args[6] + local t4 = args[7] + local r1 =args[8] + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + local damage=floor(value*v1) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + if BattleLogic.BuffMgr:HasBuff(target, t1, function (buff) + if t1==BuffName.DOT then + return buff.damageType==t2 + end + end) then + if t3==BuffName.Control then + BattleUtil.RandomControl(pro,t4,caster,target,r1,skill) + end + end + end) + end, + --对目标造成主角[a]*[b]攻击伤害,目标每减少[c]个伤害增加[d]% + --a[int 1:等级 2.战斗力],b[int],c[int],d[float] + [136] = function(caster, target, args, interval, skill) + local type = args[1] + local pro = args[2] + local i1 = args[3] + local v1 = args[4] + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + -- 改变值 = 技能最大目标数 - 当前目标数 + local maxNum = skill:GetMaxTargetNum() + local curNum = #skill:GetDirectTargets() + local lessNum = max(maxNum - curNum, 0) + local level = math.floor(lessNum/i1) + local extra = BattleUtil.ErrorCorrection(level * v1) + local damage=floor(value*pro*(1+extra)) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + end) + end, + --对目标造成主角[a]*[b]攻击伤害,如果击杀目标，随机减少敌方[c]个神将[d]点怒气 + --a[int 1:等级 2.战斗力],b[int],c[int],d[float] + [137] = function(caster, target, args, interval, skill) + local type = args[1] + local pro = args[2] + local i1 = args[3] + local v1 = args[4] + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + local damage=floor(value*pro) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + if target.isDead then + BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime,function() + local arr = RoleManager.Query(function (r) return r.camp == target.camp end) + if arr and #arr>0 then + for i = 1, i1 do + local count = Random.RangeInt(1,#arr) + BattleUtil.CalRage(caster,arr[count],v1,CountTypeName.Sub) + end + end + end) + end + end) + end, + --技能目标如果大于[a]，改变[b]目标[c]点怒气 + --a[int],b[int],c[int] + [138] = function(caster, target, args, interval, skill) + local num = args[1] + local ct = args[2] + local v1 = args[3] + BattleLogic.WaitForTrigger(interval, function () + local curNum = #skill:GetDirectTargets() + if curNum>num then + BattleUtil.CalRage(caster,target,v1,ct) + end + end) + end, + --对目标造成主角[a]*[b]的伤害，如果目标处于[c]类型[d]效果,则伤害改变[e][f]% + --a[int 1:等级 2.战斗力],b[int],c[int],d[int],e[int],f[float] + [139] = function(caster, target, args, interval, skill) + local type=args[1] + local v1 = args[2] + local t1 = args[3] + local t2 = args[4] + local ct = args[5] + local v2 = args[6] + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + local add=0 + if BattleLogic.BuffMgr:HasBuff(target, t1, function (buff) + if t1==BuffName.DOT then + return buff.damageType==t2 + end + end) then + add=v2 + end + local damage=floor(value*v1) + damage=floor(BattleUtil.CountValue(damage,add,ct)) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + end) + end, + --造成主角[a]*[b]攻击伤害，概率[c]改变[d]目标[e]点怒气 + --a[int 1:等级 2.战斗力],b[int],c[float],d[int],e[int] + [140] = function(caster, target, args, interval, skill) + local type = args[1] + local pro = args[2] + local p1 = args[3] + local ct = args[4] + local v1 = args[5] + BattleLogic.WaitForTrigger(interval, function () + local value=0 + if type==1 then + value=caster.star + elseif type==2 then + value=caster.teamDamage + end + local damage=floor(value*pro) + BattleUtil.FinalDamageCountShield(nil,caster, target,damage) + BattleUtil.RandomAction(p1, function () + BattleUtil.CalRage(caster,target,v1,ct) + end) + end) + end, + --概率[a]添加[b]类型[c]效果,[d]%概率无视免疫，持续[e]回合，参数1[f],参数2[g],参数3[h] + --a[float],b[int],c[int],d[float],e[int],f[int/float],g[int/float],h[int/float] + [141] = function(caster, target, args, interval, skill) + local pro=args[1] + local t1=args[2] + local t2=args[3] + local pro2=args[4] + local r1=args[5] + local v1=args[6] + local v2=args[7] + local v3=args[8] + BattleLogic.WaitForTrigger(interval, function () + BattleUtil.RandomAction(pro,function() + local buff=nil + if t1==BuffName.Control then + buff=Buff.Create(caster, t1, r1,t2) + elseif t1==BuffName.Immune then + if t2==4 then --自定义免疫 + local imms={} + if v1 then + table.insert(imms,v1) + end + if v2 then + table.insert(imms,v2) + end + if v3 then + table.insert(imms,v3) + end + local emmune=function(buff) + return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(imms,buff.ctrlType)),caster + end + buff=Buff.Create(caster, t1, r1,t2,emmune) + else + buff=Buff.Create(caster, t1, r1,t2) + end + else + buff=Buff.Create(caster, t1, r1,t2) + end + target:AddBuff(buff,pro2) + end) + + end) + + end, + --概率[a]%为[b]阵营非[c]职业添加[d]类型[e]效果,[f]%概率无视免疫，持续[g]回合，参数1[h],参数2[i],参数3[j] + --a[float],b[int],c[int],d[int],e[int],f[float],g[int],h[int/float],i[int/float] + [142] = function(caster, target, args, interval, skill) + local pro=args[1] + local ele=args[2] + local job=args[3] + local t1=args[4] + local t2=args[5] + local pro2=args[6] + local r1=args[7] + local v1=args[8] + local v2=args[9] + local v3=args[10] + BattleLogic.WaitForTrigger(interval, function () + if target.element~=ele and ele~=0 then + return + end + if target.job==job and job~=0 then + return + end + if t1==BuffName.CommonSign then + BattleUtil.RandomAction(pro,function() + local buff=Buff.Create(caster, t1, r1) + target:AddBuff(buff,pro2) + end) + end + end) + + end, + --回复目标[a]属性[b]%的生命（最终治疗 不暴击，不受被动影响） + --a[int],b[float] + [143] = function(caster, target, args, interval, skill) + local pro=args[1] + local v1=args[2] + BattleLogic.WaitForTrigger(interval, function () + local treat=floor(target:GetRoleData(RoleDataName.MaxHp)*v1) + BattleUtil.FinalTreat(caster,target,treat,1,skill) + end) + end, + } return effectList \ No newline at end of file diff --git a/luafight/Modules/Battle/Logic/Base/EffectCaster.lua b/luafight/Modules/Battle/Logic/Base/EffectCaster.lua index e06f815f4..d313ced39 100644 --- a/luafight/Modules/Battle/Logic/Base/EffectCaster.lua +++ b/luafight/Modules/Battle/Logic/Base/EffectCaster.lua @@ -50,7 +50,7 @@ function EffectCaster:DoEffect(caster, target, eff, duration, skill) e.args[i] = eff.args[i] end - -- ⱻܶԼܲӰ + -- 检测被动技能对技能参数的影响 local function _PassiveCheck(pe) if pe then e = pe @@ -77,7 +77,7 @@ end function EffectCaster:takeEffect(caster, target, effects, effectIndex, duration, skill) for k=1, #effects do - -- ǵһЧеĵһЧжǷ + -- 如果不是第一个效果对列的第一个效果则判断是否命中 if k ~= 1 and effectIndex == 1 then if self:CheckTargetIsHit(target) then self:DoEffect(caster, target, effects[k], duration, skill) @@ -93,25 +93,25 @@ function EffectCaster:ChooseTarget() -- self.effectTargets = {} self.targetIsHit = {} - -- ȼܵĿ + -- 先计算出技能的目标 for i=1, #self.effectList do - -- ǷѡĿ + -- 是否重新选择目标 local isReTarget = true if self.targets and self.targets[i] then self.effectTargets[i] = self.targets[i] - -- жǷЧĿ + -- 判断是否有有效目标 for _, role in ipairs(self.effectTargets[i]) do if not role:IsRealDead() then isReTarget = false end end end - -- ѡĿ + -- 重新选择目标 if isReTarget then local effectGroup = self.effectList[i] local chooseId = effectGroup.chooseId self.effectTargets[i] = BattleUtil.ChooseTarget(self.skill.owner, chooseId) - -- ⱻԹĿӰ + -- 检测被动对攻击目标的影响 if i == 1 then local function _PassiveTarget(targets) self.effectTargets[i] = targets @@ -122,19 +122,19 @@ function EffectCaster:ChooseTarget() end end --- ͷż --- func ͷɻص +-- 释放技能 +-- func 技能释放完成回调 function EffectCaster:Cast() - -- ѡĿ + -- 选择目标 self:ChooseTarget() - -- ĿӦЧ + -- 对目标造成相应的效果 for i=1, #self.effectList do local effectGroup = self.effectList[i] local chooseId = effectGroup.chooseId local arr = self.effectTargets[i] if arr and #arr > 0 then - -- Чӳ1֡Ч + -- 效果延迟1帧生效 BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function() local effects = effectGroup.effects local weight = math.floor(chooseId % 10000 / 100) @@ -145,10 +145,10 @@ function EffectCaster:Cast() table.sort(arr, function(a, b) return a.position < b.position end) - -- ȫͬʱЧ + -- 全部同时生效 for j=1, count do if arr[j] and not arr[j]:IsRealDead() then - -- Ƿ + -- 检测是否命中 if i == 1 then self.targetIsHit[arr[j]] = BattleUtil.CheckIsHit(self.skill.owner, arr[j],self.skill) end @@ -160,7 +160,7 @@ function EffectCaster:Cast() end end --- Ŀ +-- 遍历技能命中目标 function EffectCaster:ForeachTargets(func) local targets = self:GetDirectTargets() for _, role in ipairs(targets) do @@ -170,7 +170,7 @@ function EffectCaster:ForeachTargets(func) end end --- ȡֱѡĿId +-- 获取直接选择目标Id function EffectCaster:GetDirectChooseId() local effectGroup = self.effectList[1] local chooseId = effectGroup.chooseId @@ -178,12 +178,12 @@ function EffectCaster:GetDirectChooseId() end --- ȡֱܵĿ꣬Ͳ߻涨һЧĿΪֱЧĿ,(missĿ) +-- 获取技能的直接目标，和策划规定第一个效果的目标为直接效果目标,(包含miss的目标) function EffectCaster:GetDirectTargets() return self.effectTargets[1] end --- ȡֱĿ꣬missĿ꣬Ϊ +-- 获取直接目标，不包含miss的目标，可能为空 function EffectCaster:GetDirectTargetsNoMiss() local list = {} for _, role in ipairs(self.effectTargets[1]) do @@ -194,7 +194,7 @@ function EffectCaster:GetDirectTargetsNoMiss() return list end --- ȡֱĿûбĿ꣬missĿ꣬Ϊ +-- 获取直接目标和没有被放逐的目标，不包含miss的目标，可能为空 function EffectCaster:GetDirectTargetsNoExile() local list = {} for _, role in ipairs(self.effectTargets[1]) do @@ -205,7 +205,7 @@ function EffectCaster:GetDirectTargetsNoExile() return list end --- ȡֱĿûбĿ꣬Ϊ +-- 获取直接目标和没有被放逐的目标，不包含不灭可能为空 function EffectCaster:GetDirectTargetsNoNODead() local list = {} for _, role in ipairs(self.effectTargets[1]) do @@ -216,7 +216,7 @@ function EffectCaster:GetDirectTargetsNoNODead() return list end --- ȡĿ +-- 获取技能目标最大人数 function EffectCaster:GetMaxTargetNum() local mainEffect = self.effectList[1] if not mainEffect then @@ -225,7 +225,7 @@ function EffectCaster:GetMaxTargetNum() return BattleUtil.GetMaxTargetNum(mainEffect.chooseId) end --- жǷ +-- 判断是否命中 function EffectCaster:CheckTargetIsHit(role) return self.targetIsHit[role] end diff --git a/luafight/Modules/Battle/Logic/Base/Passivity.lua b/luafight/Modules/Battle/Logic/Base/Passivity.lua index e04d67679..a3c90370b 100644 --- a/luafight/Modules/Battle/Logic/Base/Passivity.lua +++ b/luafight/Modules/Battle/Logic/Base/Passivity.lua @@ -2444,13 +2444,17 @@ local passivityList = { -- [129] = {}, - -- 死亡后持续战斗两回合期间受伤不致死，[a]回合后自动死亡。期间技能伤害降低[b]%无法触发追击效果且死后无法被复活。受到伤害[c]改变 - -- a[int]b[float]c[改变类型] + -- 死亡后持续战斗两回合期间受伤不致死，[a]回合后自动死亡。期间技能伤害降低[b]%无法触发追击效果且死后无法被复活。受到伤害[c]改变,[d]%概率不会直接死亡,回复[e]%生命,伤害转化为输出比例[f]% + -- a[int],b[float],c[改变类型],d[float],e[float],f[float] [130] = function(role, args) local i1 = args[1] local f1 = args[2] local ct = args[3] + local p1 = args[4] + local p2 = args[5] + local p3 = args[6] role.isHaveNoDead = true + local isTrigger=false -- 角色死亡时 local onRoleDead = function(atkRole) -- -- 暂时不能死 @@ -2480,9 +2484,12 @@ local passivityList = { -- end -- end -- role.Event:AddEvent(BattleEventName.RoleTurnEnd, onRoleTurnEnd) - - local buff = Buff.Create(role, BuffName.NoDead, i1, f1, ct, false) + if isTrigger then + return + end + local buff = Buff.Create(role, BuffName.NoDead, i1, f1, ct, false,p1,p2,p3) BattleLogic.BuffMgr:AddBuff(role, buff) + isTrigger=true end role.Event:AddEvent(BattleEventName.RoleDead, onRoleDead,nil,nil,role) end, @@ -3910,16 +3917,20 @@ local passivityList = { -- a[float] [187] = function(role, args,id,judge) local f1 = args[1] + local isMustCrit=false local function onSkillCast(skill) if skill.type == BattleSkillType.Normal then - role.data:AddValue(RoleDataName.Crit, f1) + -- role.data:AddValue(RoleDataName.Crit, f1) + isMustCrit=role.mustCrit + role.mustCrit=true end end role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role) local function onSkillCastEnd(skill) if skill.type == BattleSkillType.Normal then - role.data:SubValue(RoleDataName.Crit, f1) + --role.data:SubValue(RoleDataName.Crit, f1) + role.mustCrit=isMustCrit end end role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role) @@ -4150,7 +4161,7 @@ local passivityList = { table.insert(ctrls,ctr3) end local immune = function(buff) - return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)) + return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)),role end local curBuff=nil BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, function(curRound) @@ -5085,14 +5096,21 @@ local passivityList = { BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, _OnRoundChange,nil,nil,role) end, - -- 我方每有一个[a]武将，自身[d]改变[b]的[c]，可叠加（第一回合开始时生效） - -- a[元素],b[float],c[属性],d[改变类型] + -- 我方每有一个[a]武将，自身[b]%的[c]属性[d]改变，[e]%的[f]属性[g]改变 范围类型[h] 可叠加（第一回合开始时生效） + -- a[元素],b[float],c[属性],d[改变类型],e[float],f[int],g[int 改变类型],h[int 0/不填 自身 1：全体] [235] = function(role, args) local ele = args[1] local f1 = args[2] local pro = args[3] local ct = args[4] + local f2 = args[5] + local pro2 = args[6] + local ct2 = args[7] + local type = args[8] + if not args[8] then + type=0 + end local function _OnRoundChange(curRound) if curRound == 1 then local list = RoleManager.Query(function(r) @@ -5100,7 +5118,27 @@ local passivityList = { end) -- local num = #list - BattleUtil.AddProp(role, pro, f1*num, ct) + if type==0 then + --BattleUtil.AddProp(role, pro, f1*num, ct) + local buff = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro], f1*num, ct) + role:AddBuff(buff) + if f2 and pro2 and ct2 then + local buff2 = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro2], f2*num, ct2) + role:AddBuff(buff2) + end + else + local list2 = RoleManager.Query(function(r) + return r.camp == role.camp + end) + for i = 1, #list2 do + local buff = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro], f1*num, ct) + list2[i]:AddBuff(buff) + if f2 and pro2 and ct2 then + local buff2 = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro2], f2*num, ct2) + list2[i]:AddBuff(buff2) + end + end + end end end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, _OnRoundChange,nil,nil,role) @@ -5626,12 +5664,20 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role) end, - --技能击杀目标溢出伤害的[a]%将对生命百分比最高的攻击目标造成伤害 - -- a[float] + --技能击杀目标溢出伤害的[a]%将对生命百分比最高的攻击目标造成伤害,并降低其[b]点怒气,每回合最多减[c]点怒气 + -- a[float],b[int],c[int] [257]=function(role,args,id,judge) local f1 = args[1] - local dt = args[2] + local num = args[2] + local maxNum=args[3] + if not args[2] then + num=0 + end + if args[3]==nil then + maxNum=6 + end local point=nil + local curNum=0 -- 直接伤害后 local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill) if skill and not skill.isTriggerJudge and judge==1 then @@ -5643,16 +5689,26 @@ local passivityList = { list = BattleUtil.SortByHpFactor(list,0) -- if not list[1]:IsDead() then if list then - if not point then - point=list[1] - end - BattleUtil.FinalDamage(nil,role,point,dmg) + if not point then + point=list[1] + end + BattleUtil.FinalDamage(nil,role,point,dmg) + if curNum>=maxNum then + return + end + if num>0 then + BattleUtil.CalRage(role,point,num,CountTypeName.Sub) + curNum=curNum+num + end end - - -- end end end role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role) + + local onRoundChange=function() + curNum=0 + end + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role) end, --技能追加的普攻额外造成目标[a][b]%的伤害。，生命每下降[c]%,额外生命百分比加[d]%(c d 不填不增加) --a[int 属性id] b[float],c[float],d[float] @@ -5996,7 +6052,7 @@ local passivityList = { local sta3=args[3] local skiller=nil local immune = function(buff) - return buff.type == BuffName.DOT and (buff.damageType==sta2 or buff.damageType==sta3) + return buff.type == BuffName.DOT and (buff.damageType==sta2 or buff.damageType==sta3),role end local curBuff=nil @@ -6142,7 +6198,7 @@ local passivityList = { local sta3=args[3] local skiller=nil local immune = function(buff) - return buff.type == BuffName.Control + return buff.type == BuffName.Control,role end local curBuff=nil local immuneState=false @@ -6236,7 +6292,11 @@ local passivityList = { for i = 1, #list do if i<=num then if not list[i]:IsDead() then - local buff=Buff.Create(role, BuffName.Immune,round,1) + local ctrls={1,2,7} + local immune = function(buff) + return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)),role + end + local buff=Buff.Create(role, BuffName.Immune,round,4,immune) list[i]:AddBuff(buff) end end @@ -7138,7 +7198,7 @@ local passivityList = { table.insert(ctrls,ctr3) end local immune = function(buff) - return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)) + return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)),role end -- 释放技能后 local onSkillEnd = function(skill) @@ -9450,15 +9510,28 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.PassiveDamaging, passiveDmg,nil,nil,role) end, - -- 技能治疗的目标[a]属性[b]改变[c]%,持续[d]回合 - -- a[int],b[改变类型],c[float],d[int] + -- 技能治疗的目标[a]属性[b]改变[c]%,持续[d]回合 buff类型[e] + -- a[int],b[改变类型],c[float],d[int],e[int 0/不填：可叠加；1：不叠加 ] [384] = function(role, args,id,judge) local f1 = args[1] local ct = args[2] local v1 = args[3] local round = args[4] + local type = args[5] + if args[5]==nil then + type=0 + end + local addBuff=nil local onPassiveTreatingFactor = function(func, target) - target:AddBuff(Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[f1], v1,ct)) + + if type==1 and BattleLogic.BuffMgr:HasBuff(target,BuffName.PropertyChange,function(buff) return addBuff~=nil and buff==addBuff end) then + addBuff.roundDuration=round + addBuff.roundPass=0 + else + addBuff=Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[f1], v1,ct) + target:AddBuff(addBuff) + end + end local function onSkillCast(skill) @@ -9739,6 +9812,357 @@ local passivityList = { --role.Event:AddEvent(BattleEventName.SkillCast, OnSkillCast,nil,nil,role) role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd,nil,nil,role) end, + -- 受到[a]类型[b]状态敌人攻击时受到伤害[c]改变 状态层数*[d]%, 伤害类型为[e] + -- a[int],b[int],c[int 改变类型],d[float],e[int](e 不填/0不区别是否为直接伤害) + [392] = function(role, args) + local t1 = args[1] + local t2 = args[2] + local ct = args[3] + local f1 = args[4] + local type = args[5] + if not type then + type=0 + end + local onPassiveBeDamaging = function(func, caster, damage,skill) + if type==1 and not skill then + return + end + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==caster and buff.type==t1 and buff.damageType==t2 end) + local len=BattleUtil.LengthOfTable(list) + if len>0 then + + local dmgDeduction = floor(BattleUtil.ErrorCorrection(BattleUtil.CountValue(damage, f1*len, ct)-damage)) + if func then func(dmgDeduction) end + end + end + role.Event:AddEvent(BattleEventName.PassiveBeDamaging, onPassiveBeDamaging,nil,nil,role) + end, + --改变[a]目标身上[b]类型[c]状态buff层数*[d]%的暴击伤害 + --a[int],b[int],c[ind],d[float] + [393]=function(role,args,id,judge) + local ct=args[1] + local t1=args[2] + local t2 = args[3] + local v1 = args[4] + local addCritDamageFa=function(func,atkRole,defRole) + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==defRole and buff.type==t1 and buff.damageType==t2 end) + local len=BattleUtil.LengthOfTable(list) + if len>0 then + if func then + func(v1*len,ct) + end + end + end + role.Event:AddEvent(BattleEventName.PassiveAddCritDamageFactor,addCritDamageFa,nil,nil,role) + end, + --技能追加的普攻额外造成目标[a]属性*[b]类型[c]状态的层数*[d]的伤害 + --a[int 属性id] b[int],c[int],d[float] + [394]=function(role,args,id,judge) + local f1 = args[1] + local t1 = args[2] + local t2 = args[3] + local v1 = args[4] + -- 直接伤害后 + local onPassiveDamaging = function(func, defRole, damage,skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if skill and skill.type == BattleSkillType.Normal and skill.isAdd and skill.owner==role then + --如果是boss 并且额外伤害是根据最大生命则返回 + if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then + return + end + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==defRole and buff.type==t1 and buff.damageType==t2 end) + local len=BattleUtil.LengthOfTable(list) + if len==0 then + return + end + if (f1==12 or f1==13) then + local val = floor(BattleUtil.FP_Mul(len*v1, defRole:GetRoleData(BattlePropList[f1]))) + BattleUtil.FinalDamageCountShield(nil,role,defRole,val) + end + end + end + role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) + end, + --自身添加的免疫buff,免疫一次[a]类型buff,自身回复[b]点怒气，每回合最多触发[c]次 + --a[int buff类型],b[int],c[int] + [395]=function(role,args,id,judge) + local type=args[1] + local num=args[2] + local time=args[3] + local timeList={} + local onBuffImmune=function(buff,target,immCaster) + if immCaster~=role then + return + end + if buff.type~=type then + return + end + if timeList[target.position] and timeList[target.position]==time then + return + end + BattleUtil.CalRage(role,target,num,CountTypeName.Add) + if timeList[target.position] then + timeList[target.position]=timeList[target.position]+1 + else + timeList[target.position]=1 + end + end + BattleLogic.Event:AddEvent(BattleEventName.ImmuneDebuffSuccess,onBuffImmune,nil,nil,role) + + local onRoundChange=function() + timeList={} + end + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role) + end, + --直接伤害击杀目标自身增加[a]点怒气，并偷取目标[b]%的[c]属性在下次攻击种释放 + -- a[int],b[float],c[int] + [396] = function(role, args,id,judge) + local i1 = args[1] + local p1 = args[2] + local pro= args[3] + local isKill=false + local addAttack=0 + local OnRoleHit = function(defRole, damage, bCrit, finalDmg, damageType, skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + + if skill and defRole:IsDead() and not BattleUtil.CheckIsNoDead(defRole) then + isKill=true + addAttack=addAttack+floor(defRole:GetRoleData(BattlePropList[pro])*p1) + end + end + + local onSkillCast=function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + addAttack=0 + role.Event:AddEvent(BattleEventName.RoleHit, OnRoleHit,nil,nil,role) + end + role.Event:AddEvent(BattleEventName.SkillCast,onSkillCast,nil,nil,role) + + local onSkillCastEnd=function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if isKill then + BattleUtil.CalRage(role, role, i1, CountTypeName.Add) + role.addAttack=addAttack + isKill=false + else + addAttack=0 + role.addAttack=0 + end + + role.Event:RemoveEvent(BattleEventName.RoleHit, OnRoleHit,nil,nil,role) + end + role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,role) + end, + --[a]类型[b]效果命中后，[c]改变目标[d]属性[e]%,持续[f]回合，如果目标为[g]阵营，[h]改变目标[i]属性[j]% 持续[k]回合(不可叠加) + --a[int],b[int],c[int 改变类型],d[int],e[float],f[int],g[int],h[int 改变类型],i[int],j[float],k[int] + [397] = function(role, args) + local t1 = args[1] + local t2 = args[2] + local ct = args[3] + local f1 = args[4] + local v1 = args[5] + local r1 = args[6] + local ele = args[7] + local ct2 = args[8] + local f2 = args[9] + local v2 = args[10] + local r2 = args[11] + local buff1 = nil + local buff2 = nil + local OnBuffCaster = function(buff) + + if buff.type==t1 and buff.shieldType==t2 then + if buff.shieldValue==0 then + local isHave1=BattleLogic.BuffMgr:HasBuff(buff.target,BuffName.PropertyChange,function(buff) return buff1~=nil and buff==buff1 end) + if isHave1 then + buff1.roundDuration=r1 + buff1.roundPass=0 + else + buff1=Buff.Create(role, BuffName.PropertyChange, r1, BattlePropList[f1], v1, ct) + buff.target:AddBuff(buff1) + end + + + --未完待续 + if buff.target.element==ele then + local isHave2=BattleLogic.BuffMgr:HasBuff(buff.target,BuffName.PropertyChange,function(buff) return buff2~=nil and buff==buff2 end) + if isHave2 then + buff2.roundDuration=r1 + buff2.roundPass=0 + else + buff2=Buff.Create(role, BuffName.PropertyChange, r2, BattlePropList[f2], v2, ct2) + buff.target:AddBuff(buff2) + end + end + end + end + + end + role.Event:AddEvent(BattleEventName.BuffCaster, OnBuffCaster,nil,nil,role) + end, + --回合结束时,敌方处于[a]类型[b]状态的目标会扣除[c]属性[d]%的生命 + --a[int],b[int],c[int],d[float] + [398]=function(role,args,id,judge) + local t1=args[1] + local t2=args[2] + local pro=args[3] + local v1 =args[4] + local onRoundChange=function(round) + if round==0 then + return + end + local list = RoleManager.Query(function(v) return role.camp ~= v.camp end) + for _, r in pairs(list) do + if BattleLogic.BuffMgr:HasBuff(r, t1,nil) then + if pro==12 and not BattleUtil.CheckIsBoss(r) then + local damage= floor(r:GetRoleData(BattlePropList[pro])*v1) + BattleUtil.FinalDamageCountShield(false,role,r,damage) + end + end + end + end + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEnd, onRoundChange,nil,nil,role) + end, + -- 概率[a]给技能目标添加[b]类型[c]效果的buff,持续[d]回合 + -- a[float],b[int],c[int],d[int] + [399] = function(role, args,id,judge) + local pro = args[1] + local t1 = args[2] + local t2 = args[3] + local round=args[4] + -- 释放技能后 + local onRoleHit = function(defRole,damge,bcrit,finalDamage,damagetype,skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + + if skill and skill.type==BattleSkillType.Special then + BattleUtil.RandomAction(pro,function() + local buff = Buff.Create(role,t1,round) + defRole:AddBuff(buff) + end) + end + end + role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role) + end, + --处于[a]类型[b]状态的目标，怒气大于等于[c]点每次受到[d]阵营技能攻击，额外降低[e]点怒气，怒气小于[f]点，受到[g]阵营攻击暴击率改变[h][i]% + --a[int],b[int],c[int],d[int],e[int],f[int],g[int],h[int],i[float] + [400]=function(role, args,id,judge) + local t1=args[1] + local t2=args[2] + local n1=args[3] + local ele1=args[4] + local n2=args[5] + local n3=args[6] + local ele2=args[7] + local ct=args[8] + local v1=args[9] + + + local onRoleHit = function(atkRole, defRole, damage, bCrit, finalDmg, damageType, dotType, skill) + if not skill then + return + end + if atkRole.camp~=role.camp or defRole.camp==role.camp then + return + end + if atkRole.element~=ele1 then + return + end + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then + return + end + local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff) + -- if buff.Type==BuffName.SigilSign then + -- LogError("t1==="..t1) + return true + -- end + end) + if ishave then + if defRole.Rage>=n1 then + BattleUtil.CalRage(role,defRole,n2,CountTypeName.Sub) + end + end + + end + BattleLogic.Event:AddEvent(BattleEventName.RoleDamage, onRoleHit,nil,nil,role) + + local addCrit=function(critFunc,atkRole,defRole,skill) + if not skill then + return + end + if atkRole.camp~=role.camp or defRole.camp==role.camp then + return + end + if atkRole.element~=ele2 then + return + end + local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff) + -- if t1==BuffName.SigilSign then + return true + -- end + end) + if ishave then + if defRole.Rage0 then + for i = 1, add do + local newBuff = Buff.Create(buff.caster, BuffName.DOT, buff.duration, 1,1,buff.damagePro) + newBuff.skill=nil + newBuff.isRealDamage=true + buff.target:AddBuff(newBuff) + end + end + --end) + + end + + role.Event:AddEvent(BattleEventName.BuffCaster, OnBuffStart,nil,nil,role) + end } return passivityList diff --git a/luafight/Modules/Battle/Logic/BattleLogic.lua b/luafight/Modules/Battle/Logic/BattleLogic.lua index b1bfd8812..a7bf60d1d 100644 --- a/luafight/Modules/Battle/Logic/BattleLogic.lua +++ b/luafight/Modules/Battle/Logic/BattleLogic.lua @@ -278,7 +278,7 @@ function BattleLogic.TurnRound(debugTurn) -- 检测一次灵兽技能 SkillManager.CheckMonsterSkill(function() --轮数变化后延时0.2秒用于初始化监听回合数被动的初始化 - BattleLogic.WaitForTrigger(0.2,function() + BattleLogic.WaitForTrigger(0.5,function() -- 进入新轮 BattleLogic.CheckBattleLogic() end) @@ -288,7 +288,7 @@ function BattleLogic.TurnRound(debugTurn) -- 检测一次灵兽技能 SkillManager.CheckMonsterSkill(function() --轮数变化后延时0.2秒用于初始化监听回合数被动的初始化 - BattleLogic.WaitForTrigger(0.2,function() + BattleLogic.WaitForTrigger(0.5,function() -- 切换阵营 if not insertSkillRole then CurCamp = (CurCamp + 1) % 2 @@ -494,7 +494,6 @@ function BattleLogic.Update() or BattleLogic.Type == BATTLE_SERVER_TYPE.CarPersonFight or BattleLogic.Type == BATTLE_SERVER_TYPE.NewArenaFight then -- 好友切磋 if allHeroDamage>allEnemyDamage then - print("============="..allHeroDamage.." "..allEnemyDamage) BattleLogic.BattleEnd(1) else BattleLogic.BattleEnd(0) diff --git a/luafight/Modules/Battle/Logic/Buff/BanBlood.lua b/luafight/Modules/Battle/Logic/Buff/BanBlood.lua new file mode 100644 index 000000000..a3871a69c --- /dev/null +++ b/luafight/Modules/Battle/Logic/Buff/BanBlood.lua @@ -0,0 +1,33 @@ +BanBlood = Buff:New() + +--初始化Buff，通过传入一些自定义参数控制成长相关的数值 +function BanBlood:SetData(...) + + -- 刷新排序等级 + self.sort = 4 +end + + +--初始化后调用一次 +function BanBlood:OnStart() + self.target.isBanBlood = true + +end + +--间隔N帧触发，返回true时表示继续触发，返回false立刻触发OnEnd +function BanBlood:OnTrigger() + return true +end + +--效果结束时调用一次 +function BanBlood:OnEnd() + self.target.isBanBlood = false + +end + +--只有当cover字段为true时触发，返回true则被新效果覆盖 +function BanBlood:OnCover(newBuff) + return true +end + +return BanBlood \ No newline at end of file diff --git a/luafight/Modules/Battle/Logic/Buff/Blood.lua b/luafight/Modules/Battle/Logic/Buff/Blood.lua index abfc17338..be25c277d 100644 --- a/luafight/Modules/Battle/Logic/Buff/Blood.lua +++ b/luafight/Modules/Battle/Logic/Buff/Blood.lua @@ -5,11 +5,16 @@ function Blood:SetData(...) -- 刷新排序等级 self.bloodValue=... + self.sort = 4 end function Blood:AddValue(value) + local passiveChange=function(addValue) + value=value+addValue + end + BattleLogic.Event:DispatchEvent(BattleEventName.BloodValuePassiveChange,passiveChange,self.target,self.caster,value) self.bloodValue=self.bloodValue+value self.target.Event:DispatchEvent(BattleEventName.BloodValueChange,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp),1,value) end @@ -19,6 +24,10 @@ end --初始化后调用一次 function Blood:OnStart() self.target.bloodShield = self + local passiveChange=function(addValue) + self.bloodValue=self.bloodValue+addValue + end + BattleLogic.Event:DispatchEvent(BattleEventName.BloodValuePassiveChange,passiveChange,self.target,self.caster,self.bloodValue) self.target.Event:DispatchEvent(BattleEventName.BloodValueChange,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp),1,self.bloodValue) end function Blood:GetCurValue() @@ -37,7 +46,7 @@ function Blood:OnEnd() self.bloodValue=0 end --计算血甲 -function Blood:CountBloodValue(damage) +function Blood:CountBloodValue(damage,atkRole) local finalDamage=0 self.bloodValue=self.bloodValue-damage if self.bloodValue<=0 then @@ -47,8 +56,9 @@ function Blood:CountBloodValue(damage) local value=0 if self.bloodValue<=0 then value=0 + self.bloodValue=0 end - self.target.Event:DispatchEvent(BattleEventName.BloodValueChange,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp)) + self.target.Event:DispatchEvent(BattleEventName.BloodValueChange,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp),atkRole) return finalDamage end diff --git a/luafight/Modules/Battle/Logic/Buff/CommonSign.lua b/luafight/Modules/Battle/Logic/Buff/CommonSign.lua new file mode 100644 index 000000000..49553cdc9 --- /dev/null +++ b/luafight/Modules/Battle/Logic/Buff/CommonSign.lua @@ -0,0 +1,57 @@ +CommonSign = Buff:New() + +--初始化Buff，通过传入一些自定义参数控制成长相关的数值 +function CommonSign:SetData(...) + self.signType=... + -- 刷新排序等级 + self.sort = 4 +end + +local onRageChange=function(caster,target,func,type,value) + + -- local buff=Buff.Create(caster,BuffName.Control,1,7) + -- target:AddBuff(buff) + if type==CountTypeName.Sub and target.camp~=caster.camp then + BattleUtil.RandomControl(0.5,7,caster,target,1) + end + +end + +local onSkillCast=function(skill) + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then + return + end + skill.owner.Event:AddEvent(BattleEventName.RecordRageChange,onRageChange,nil,nil,skill.owner) +end + +local onSkillCastEnd=function(skill) + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then + return + end + skill.owner.Event:RemoveEvent(BattleEventName.RecordRageChange,onRageChange,nil,nil,skill.owner) +end + +--初始化后调用一次 +function CommonSign:OnStart() + self.target.Event:AddEvent(BattleEventName.SkillCast,onSkillCast,nil,nil,self.target) + self.target.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,self.target) +end + +--间隔N帧触发，返回true时表示继续触发，返回false立刻触发OnEnd +function CommonSign:OnTrigger() + return true +end + +--效果结束时调用一次 +function CommonSign:OnEnd() + self.target.Event:RemoveEvent(BattleEventName.SkillCast,onSkillCast,nil,nil,self.target) + self.target.Event:RemoveEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,self.target) + +end + +--只有当cover字段为true时触发，返回true则被新效果覆盖 +function CommonSign:OnCover(newBuff) + return true +end + +return CommonSign \ No newline at end of file diff --git a/luafight/Modules/Battle/Logic/Buff/DOT.lua b/luafight/Modules/Battle/Logic/Buff/DOT.lua index 97ce4d19e..5a3e4f337 100644 --- a/luafight/Modules/Battle/Logic/Buff/DOT.lua +++ b/luafight/Modules/Battle/Logic/Buff/DOT.lua @@ -16,7 +16,6 @@ function DOT:SetData(...) -- self.cover = false -- self.layer = nil --end - -- 刷新排序等级 self.sort = 2 -- if self.damageType == 3 then -- 流血buff在行动之后刷新 diff --git a/luafight/Modules/Battle/Logic/Buff/Immune.lua b/luafight/Modules/Battle/Logic/Buff/Immune.lua index dc3e282da..dd6e0e4de 100644 --- a/luafight/Modules/Battle/Logic/Buff/Immune.lua +++ b/luafight/Modules/Battle/Logic/Buff/Immune.lua @@ -1,23 +1,7 @@ -- 免疫效果 Immune = Buff:New() -local immune0 = function(buff) - return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT -end -local immune1 = function(buff) - return buff.type == BuffName.Control -end -local immune2 = function(buff) - return buff.type == BuffName.DOT -end -local immune3 = function(buff) - return buff.type == BuffName.Shield and buff.shieldType == ShieldTypeName.AllReduce -end ---免疫控制不免疫禁疗 -local immune5 = function(buff) - return buff.type == BuffName.Control and buff.ctrlType and buff.ctrlType~=4 -end @@ -30,10 +14,31 @@ function Immune:SetData(type,func) -- 刷新排序等级 self.sort = 4 end +local immune0 = nil +local immune1 = nil + +local immune2 = nil +local immune3 = nil +--免疫控制不免疫禁疗 +local immune5 = nil --初始化后调用一次 function Immune:OnStart() - + immune0=function(buff) + return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT,self.caster + end + immune1=function(buff) + return buff.type == BuffName.Control,self.caster + end + immune2 = function(buff) + return buff.type == BuffName.DOT,self.caster + end + immune3 = function(buff) + return buff.type == BuffName.Shield and buff.shieldType == ShieldTypeName.AllReduce,self.caster + end + immune5 =function(buff) + return buff.type == BuffName.Control and buff.ctrlType and buff.ctrlType~=4,self.caster + end if self.immuneType == 0 then --免疫负面状态（控制状态、减益状态和持续伤害状态） self.target.buffFilter:Add(immune0) elseif self.immuneType == 1 then --免疫控制状态 diff --git a/luafight/Modules/Battle/Logic/Buff/NoDead.lua b/luafight/Modules/Battle/Logic/Buff/NoDead.lua index c9392bbde..ab972a7e4 100644 --- a/luafight/Modules/Battle/Logic/Buff/NoDead.lua +++ b/luafight/Modules/Battle/Logic/Buff/NoDead.lua @@ -4,7 +4,10 @@ NoDead = Buff:New() function NoDead:SetData(...) self.damageFactor, self.factorCT, - self.isCanRelive = ... -- buff期间的增伤系数 + self.isCanRelive, + self.pro, + self.v1, + self.changePro = ... -- buff期间的增伤系数 self.cover = true --控制效果可被覆盖 -- 刷新排序等级 self.sort = 4 @@ -24,7 +27,7 @@ end -- 记录承受伤害 function NoDead:OnRoleBeHit(atkRole, damage, bCrit, finalDmg, damageType, skill,isDirect) if skill and (skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill ) and atkRole.camp~=self.target.camp then - self.recordDamage=self.recordDamage+math.floor(damage*0.1) + self.recordDamage=self.recordDamage+math.floor(damage*self.changePro) end end @@ -62,7 +65,19 @@ function NoDead:OnEnd() self.target.Event:RemoveEvent(BattleEventName.RoleBeHit,self.OnRoleBeHit,self) end --self.target.Event - self.target:SetDeadFilter(true) + local isRand=BattleUtil.RandomAction(self.pro,function() + RoleManager.RemoveDeadRole(self.target) + self.target.isDead=false + self.target.isRealDamage=false + local addHp= math.floor(self.target:GetRoleData(RoleDataName.MaxHp)*self.v1) + self.target.data:AddValue(RoleDataName.Hp,addHp) + self.target:SetIsCanAddSkill(true) + self.target:SetDeadFilter(true) + end) + if not isRand then + self.target:SetDeadFilter(true) + end + -- self.target:SetIsCanAddSkill(false) end diff --git a/luafight/Modules/Battle/Logic/Buff/SigilSign.lua b/luafight/Modules/Battle/Logic/Buff/SigilSign.lua new file mode 100644 index 000000000..c105777bd --- /dev/null +++ b/luafight/Modules/Battle/Logic/Buff/SigilSign.lua @@ -0,0 +1,33 @@ +SigilSign = Buff:New() + +--初始化Buff，通过传入一些自定义参数控制成长相关的数值 +function SigilSign:SetData(...) + + -- 刷新排序等级 + self.sort = 4 +end + + +--初始化后调用一次 +function SigilSign:OnStart() + + +end + +--间隔N帧触发，返回true时表示继续触发，返回false立刻触发OnEnd +function SigilSign:OnTrigger() + return true +end + +--效果结束时调用一次 +function SigilSign:OnEnd() + + +end + +--只有当cover字段为true时触发，返回true则被新效果覆盖 +function SigilSign:OnCover(newBuff) + return true +end + +return SigilSign \ No newline at end of file diff --git a/luafight/Modules/Battle/Logic/HardStageCondition.lua b/luafight/Modules/Battle/Logic/HardStageCondition.lua index 0d264df8d..6e7e805a8 100644 --- a/luafight/Modules/Battle/Logic/HardStageCondition.lua +++ b/luafight/Modules/Battle/Logic/HardStageCondition.lua @@ -21,7 +21,7 @@ local _ConditionConfig = { --上阵[a]个神将通过关卡 [3]=function(condition) local v1 = condition[1] - local list = RoleManager.Query(function(v) return v.camp == 0 end,true) + local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 end,true) if BattleUtil.LengthOfTable(list)<=v1 then return 1 end @@ -47,7 +47,7 @@ local _ConditionConfig = { [5]=function(condition) local v1 = condition[1] local v2 = condition[2] - local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end,true) + local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.element==v1 end,true) if BattleUtil.LengthOfTable(list)>=v2 then return 1 end @@ -56,7 +56,7 @@ local _ConditionConfig = { --存活[a]名 [6]=function(condition) local v1 = condition[1] - local list = RoleManager.Query(function(v) return v.camp == 0 and not v:IsDead() end) + local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and not v:IsDead() end) if BattleUtil.LengthOfTable(list)>=v1 then return 1 end @@ -65,7 +65,7 @@ local _ConditionConfig = { --不上阵[a]职能神将通过关卡 [7]=function(condition) local v1 = condition[1] - local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId==v1 end,true) + local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.professionId==v1 end,true) if BattleUtil.LengthOfTable(list)==0 then return 1 end @@ -74,7 +74,7 @@ local _ConditionConfig = { --不上阵[a]阵营神将通过关卡 [8]=function(condition) local v1 = condition[1] - local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end,true) + local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.element==v1 end,true) if BattleUtil.LengthOfTable(list)==0 then return 1 end @@ -83,7 +83,7 @@ local _ConditionConfig = { --佩戴xxxid被动通过关卡 [9]=function(condition) local v1 = condition[1] - local list = RoleManager.Query(function(v) return v.camp == 0 end,true) + local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 end,true) if not list or #list==0 then return 0 end @@ -107,7 +107,7 @@ local _ConditionConfig = { --全部上阵[a]职业神将通过关卡 [11]=function(condition) local v1 = condition[1] - local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId~=v1 end,true) + local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.professionId~=v1 end,true) if BattleUtil.LengthOfTable(list)==0 then return 1 end diff --git a/luafight/Modules/Battle/Logic/HardStageEventManager.lua b/luafight/Modules/Battle/Logic/HardStageEventManager.lua index 0a9818a85..aec20a13d 100644 --- a/luafight/Modules/Battle/Logic/HardStageEventManager.lua +++ b/luafight/Modules/Battle/Logic/HardStageEventManager.lua @@ -50,7 +50,7 @@ function this.ClearEvent() BattleLogic.Event:RemoveEvent(BattleEventName.RecordBuff,this.OnBuffAdd) BattleLogic.Event:RemoveEvent(BattleEventName.BattleRoleDead,this.OnRoleDead) BattleLogic.Event:RemoveEvent(BattleEventName.BuffStart,this.OnBuffStar) - BattleLogic.Event:AddEvent(BattleEventName.RecordTreat,this.OnRecordTreat) + BattleLogic.Event:RemoveEvent(BattleEventName.RecordTreat,this.OnRecordTreat) end --记录治疗 @@ -114,6 +114,9 @@ function this.OnBuffAdd(caster,target,buff) if caster and target and buff then if caster.camp==0 and buff.type==BuffName.Control then local type=buff.ctrlType + if type==4 then + return + end if ctrlNumList[type] then ctrlNumList[type]=ctrlNumList[type]+1 else diff --git a/luafight/Modules/Battle/Logic/Misc/BattleDefine.lua b/luafight/Modules/Battle/Logic/Misc/BattleDefine.lua index b7fd93da6..2b1e062eb 100644 --- a/luafight/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/luafight/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -189,6 +189,7 @@ BattleEventName = { CastRageBrfore = indexAdd(),--扣除怒气之前 PassiveAddCritDamageFactor = indexAdd(), --被动增加爆伤系数 PassiveChangeIgnoreImmuneValue = indexAdd(),--被动修改无视 + ImmuneDebuffSuccess = indexAdd(),--免疫debuff成功 } BattleMaxFrame = 1000000 @@ -269,6 +270,8 @@ BuffName = { Brand = 12, Blood = 13, BanBlood = 14, + SigilSign = 15, + CommonSign = 16, } DotType = { diff --git a/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua b/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua index 55048401c..970680500 100644 --- a/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -370,13 +370,23 @@ function BattleUtil.ChooseTarget(role, chooseId) elseif chooseLimit == 6 then --两纵排单位 local tempArr=BattleUtil.ChooseTowCol(arr) arr=tempArr + elseif chooseLimit == 7 then --佛阵营 + local tempArr = {} + for i = 1, #arr do + if arr[i].element == BattleRoleElementType.FO then + table.insert(tempArr, arr[i]) + end + end + arr = tempArr end -- 选择条件 if chooseWeight == 0 or role.ctrl_blind then --致盲时排序无效 BattleUtil.RandomList(arr) elseif chooseWeight == 1 then -- 生命值 - BattleUtil.SortByProp(arr, RoleDataName.Hp, sort) + if sort~=0 then + BattleUtil.SortByProp(arr, RoleDataName.Hp, sort) + end elseif chooseWeight == 2 then -- 血量百分比 BattleUtil.SortByHpFactor(arr, sort) --选血量百分比最低的 不选择有不灭的，如果伤害要选有不灭的 需处理 @@ -425,6 +435,14 @@ function BattleUtil.ChooseTarget(role, chooseId) return BattleUtil.GetHpPctLessThanPctHero(arr,0.40) elseif chooseWeight ==13 then --剩余血量百分比低于50%且生命绝对值最小 return BattleUtil.GetHpPctLessThanPctHero(arr,0.50) + elseif chooseWeight ==14 then --我方战位最靠前的单位 的对位及相邻 + local list=nil + list=RoleManager.Query(function (r) return r.camp == role.camp end) + if list and #list>0 then + arr=RoleManager.GetNeighbor(list[1], chooseType) + end + elseif chooseWeight ==15 then --敌方 + -- body end local finalArr = {} if num == 0 then @@ -666,7 +684,9 @@ end -- 怒气计算 function BattleUtil.CalRage(caster, target, value, countType,isBorrow) - + if target==nil then + return + end -- 角色身上有无敌盾，不扣除怒气 by:wangzhenxing 2020/08/10 14:56 if (countType==3 or countType==4) -- 降怒 and (target.isImmuneReduceRage -- 免疫降怒 或者 有无敌盾 @@ -688,7 +708,7 @@ function BattleUtil.CalRage(caster, target, value, countType,isBorrow) if (countType==3 or countType==4) and target.RoundMaxSubRage~=0 then target.AllSubRage=target.AllSubRage-deltaRage end - + caster.Event:DispatchEvent(BattleEventName.RecordRageChange, caster, target, deltaRage,countType,value,lastRage,isBorrow) BattleLogic.Event:DispatchEvent(BattleEventName.RecordRageChange, caster, target, deltaRage,countType,value,lastRage,isBorrow) -- 用于记录统计 BattleLogic.Event:DispatchEvent(BattleEventName.RecordRage, caster, target, deltaRage) @@ -953,7 +973,7 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i defence = defRole:GetRoleData(RoleDataName.MagicDefence) end -- 攻击力 - local attack = atkRole:GetRoleData(RoleDataName.Attack) + local attack = atkRole:GetRoleData(RoleDataName.Attack)+atkRole.addAttack -- 无视防御系数 ignoreDef = 1 - (ignoreDef or 0) -- 基础伤害 = 攻击力 - 防御力 @@ -1052,6 +1072,34 @@ function BattleUtil.CalTreat(castRole, targetRole, value, baseFactor,skill) targetRole.Event:DispatchEvent(BattleEventName.RoleBeHealed, castRole) BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamageFactor,addDamageFactor,skill) end + +--没有暴击得治疗 +function BattleUtil.CalTreatNoCrit(castRole, targetRole, value, baseFactor,skill) + -- 灵兽无效 + if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then + return + end + BattleLogic.Event:DispatchEvent(BattleEventName.DisposeRoleCtrl_noheal, castRole,targetRole) + if targetRole.ctrl_noheal or targetRole:IsDead() then --禁疗和死亡无法加血 + --禁疗并且没有死亡的单位显示血量+0 不走后面代码，防止触发后面的被动 by:王振兴 2021/1/27 + if targetRole.ctrl_noheal and not targetRole:IsDead() then + targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, 0, 0) + end + return + end + + -- 计算暴伤害系数 + local critDamageFactor = 1 + + -- 基础伤害增加系数 + local addDamageFactor = 1 + castRole:GetRoleData(RoleDataName.DamageBocusFactor) + targetRole.Event:DispatchEvent(BattleEventName.RoleBeHealed, castRole) + BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamageFactor,addDamageFactor,skill) +end + + + + function BattleUtil.FinalTreat(castRole, targetRole, value, baseFactor,skill) -- 灵兽无效 if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then diff --git a/luafight/Modules/Battle/Logic/Monster/Monster.lua b/luafight/Modules/Battle/Logic/Monster/Monster.lua index 35f96cc3d..e87c747e1 100644 --- a/luafight/Modules/Battle/Logic/Monster/Monster.lua +++ b/luafight/Modules/Battle/Logic/Monster/Monster.lua @@ -25,6 +25,7 @@ function Monster:Init(data) self.teamDamage=data.teamDamage self.roleData = data self.sex=data.sex + self.addAttack=0 self.data:Init(self, data.property) self.buffFilter:Clear() --buff屏蔽列表 self.Event:ClearEvent() diff --git a/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua b/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua index f5f25746f..8c7fdb7ca 100644 --- a/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua +++ b/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua @@ -169,6 +169,13 @@ local _ConditionConfig = { return false end, + [9] = function(skill, condition) --6:我方道系非治疗数量 + local conId = condition[1] + local comType = condition[2] + local comValue = condition[3] + local list=RoleManager.Query(function(role) return role.camp==skill.owner.camp and role.element==BattleRoleElementType.DAO and role.job~=1 end) + return BattleUtil.CompareValue(#list, comValue, comType) + end, } -- 条件检测 diff --git a/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua b/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua index b8e7928ee..957211e94 100644 --- a/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua +++ b/luafight/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua @@ -118,6 +118,22 @@ local _TriggerConfig = { local args = {...} local role = args[1] return role.camp == skill.owner.camp + end, + [13] = function(skill, ...)--13:敌方攻击最高单位行动后 + local args = {...} + local caster = args[1] + local cam=skill.owner.camp + if caster.camp==cam then + return false + end + local list = RoleManager.Query(function(v) return v.camp~=cam end) + if list and #list>0 then + BattleUtil.SortByProp(list,RoleDataName.Attack,0) + if caster==list[1] then + return true + end + end + return false end }, [BattleEventName.BattleStart] = { @@ -160,7 +176,13 @@ local _TriggerConfig = { local args = {...} local castSkill = args[1] return castSkill.owner.camp == skill.owner.camp and castSkill.owner.job==2 and (castSkill.type==BattleSkillType.DeadSkill or castSkill.type==BattleSkillType.Extra or castSkill.type==BattleSkillType.Special) - end + end, + [14] =function(skill,...) --14:我方金乌释放技能后 + local args = {...} + local castSkill = args[1] + return castSkill.owner.camp == skill.owner.camp and castSkill.owner.type==BattleUnitType.Monster and castSkill.owner.uid==20008 + end, + }, } diff --git a/luafight/Modules/Battle/Logic/Role/RoleLogic.lua b/luafight/Modules/Battle/Logic/Role/RoleLogic.lua index 18c62a9b1..580d2a09a 100644 --- a/luafight/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/luafight/Modules/Battle/Logic/Role/RoleLogic.lua @@ -89,6 +89,7 @@ function RoleLogic:Init(uid, data, position) self.isImmuneAllReduceShield = false --免疫敌方无敌盾(敌方无敌盾对自己无效) self.ignoreShara = false --忽略敌方分摊 self.type = BattleUnitType.Role + self.addAttack=0 --添加的攻击 self.isNormalAttackAddRage=true --普攻是否回复怒气 self.curMainTarget=nil --当前主目标 self.passiveList = {} @@ -120,24 +121,32 @@ function RoleLogic:Init(uid, data, position) end --如果时363类型得被动就存起来 if id==363 then - coverPass[args[1]]=args + if coverPass[args[1]] then + table.insert(coverPass[args[1]],args) + else + coverPass[args[1]]={} + table.insert(coverPass[args[1]],args) + end else --如果有363修改的被动就修改 if coverPass[passivityId] then - local coverArgs=coverPass[passivityId] - local len=floor((#coverArgs-1)/2) - for i = 1, len do - local id=0 - if #coverArgs>i+i then - id=coverArgs[i+i] - end - local value=0 - if #coverArgs>=i+i+1 then - value=coverArgs[i+i+1] - end - if id~=0 and value~=0 and #args>=id and args[id] then - args[id]=value - end + local list=coverPass[passivityId] + for i = 1, #list do + local coverArgs=list[i] + local len=floor((#coverArgs-1)/2) + for i = 1, len do + local id=0 + if #coverArgs>i+i then + id=coverArgs[i+i] + end + local value=0 + if #coverArgs>=i+i+1 then + value=coverArgs[i+i+1] + end + if id~=0 and #args>=id and args[id] then + args[id]=value + end + end end end end @@ -326,7 +335,7 @@ function RoleLogic:IsAssignHeroAndHeroStar(id,star) end -function RoleLogic:AddBuff(buff) +function RoleLogic:AddBuff(buff,_ignorePro) if self:IsRealDead() then BattleLogic.BuffMgr:PutBuff(buff) return @@ -351,6 +360,9 @@ function RoleLogic:AddBuff(buff) --概率忽略免疫 local ignoreProb=0 + if _ignorePro then + ignoreProb=_ignorePro + end local changeIgnore=function(v1,ct) ignoreProb=BattleUtil.CountValue(ignoreProb,v1,ct) end @@ -358,7 +370,8 @@ function RoleLogic:AddBuff(buff) local isIgnor=BattleUtil.RandomAction(ignoreProb,function()end) if not isIgnor then for i=1, self.buffFilter.size do - if self.buffFilter.buffer[i](buff,self) then + local isImm,immCaster=self.buffFilter.buffer[i](buff,self) + if isImm then BattleLogManager.Log( "Buff Filter", "camp", buff.caster.camp, @@ -366,6 +379,8 @@ function RoleLogic:AddBuff(buff) "id", buff.id, "type", buff.type) BattleLogic.BuffMgr:PutBuff(buff) + self.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Immune) + BattleLogic.Event:DispatchEvent(BattleEventName.ImmuneDebuffSuccess,buff,self,immCaster) BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddBuffFail,buff,self) return end @@ -633,7 +648,7 @@ function RoleLogic:SetDeadFilter(filter) self.deadFilter = filter end -- 要死了 -function RoleLogic:SetDead(damage) +function RoleLogic:SetDead(damage) self.isDead = true self.killDamage=damage RoleManager.AddDeadRole(self) @@ -686,6 +701,7 @@ function RoleLogic:SetRelive(hpf, caster) if self:IsCanRelive() then self.reliveHPF = hpf or 1 self.reliveCaster = caster + self.addAttack = 0 RoleManager.AddReliveRole(self) -- local maxHp = self.data:GetData(RoleDataName.MaxHp) -- local reHp = floor(self.reliveHPF * maxHp) diff --git a/luafight/Modules/Battle/Logic/Role/RoleManager.lua b/luafight/Modules/Battle/Logic/Role/RoleManager.lua index 22c19b619..0e6442b73 100644 --- a/luafight/Modules/Battle/Logic/Role/RoleManager.lua +++ b/luafight/Modules/Battle/Logic/Role/RoleManager.lua @@ -83,6 +83,13 @@ end function this.AddDeadRole(role) _DeadRoleList[role.position + role.camp * 6] = role end + +function this.RemoveDeadRole(role) + if _DeadRoleList[role.position + role.camp * 6] then + _DeadRoleList[role.position + role.camp * 6]=nil + end +end + -- 检测是有人将死 function this.CheckDead() local isDeadFrame = false diff --git a/luafight/Modules/Battle/Readme.txt b/luafight/Modules/Battle/Readme.txt index 114b9cbfb..5eb9216cc 100644 --- a/luafight/Modules/Battle/Readme.txt +++ b/luafight/Modules/Battle/Readme.txt @@ -1,131 +1,103 @@ -master_zh_test同步数据表2021_11_23_11_29_17 -v1.0.79 - 1、被动391修改 我方流血显示修改 -master_zh_test同步数据表2021_11_22_18_00_26 -v1.0.78 - 1、被动112 258 360修改提交 - 2. 伤害公式修改 - 3.战斗超时 pvp添加战斗类型 -v1.0.77 - 1、第三批神魂提交 -v1.0.76 - 1、修复前后端战斗数据格式不一致导致的结果不一致 -master_zh_test同步数据表2021_11_16_11_07_25 -v1.0.75 - 1，添加不处理增伤的伤害接口 -master_zh_test同步数据表2021_11_15_17_10_47 -v1.0.74 - 1，第二期神魂技能 -master_zh_test同步数据表2021_11_08_18_01_19 -v1.0.73 - 1，被动285修改 -master_zh_test同步数据表2021_11_08_17_48_59 -v1.0.72 - 1，第一期神魂技能 -v1.0.71 - 1，灵兽技能检测添加初始化 - 2.追加技能特效修改 +master_zh_online_special同步数据表2021_12_07_18_07_35 v1.0.70 - 1、添加神魂被动技能 -master_zh_test同步数据表2021_11_01_14_07_31 -master_zh_test同步数据表2021_10_26_10_10_26 -master_zh_test同步数据表2021_10_25_18_57_36 + 1、第四期神魂技能 +master_zh_online_special同步数据表2021_11_30_17_36_04 v1.0.69 - 1、战斗公式修改 -master_zh_test同步数据表2021_10_22_18_57_18 + 1、第一期变身卡技能 v1.0.68 - 1、添加主角技能 - 2. 被动199修改 -master_zh_test同步数据表2021_10_18_11_00_42 -master_zh_test同步数据表2021_10_16_19_07_28 -master_zh_test同步数据表2021_10_16_19_06_48 + 1、第三期神魂技能 + 2. 新法宝技能 +master_zh_online_special同步数据表2021_11_23_15_58_01 v1.0.67 + 1、修复前后端战斗数据格式不一致导致的结果不一致 +master_zh_online_special同步数据表2021_11_16_14_56_55 +v1.0.66 + 1 第二期神魂技能 +master_zh_online_special同步数据表2021_11_09_11_57_57 +master_zh_online_special同步数据表2021_11_09_11_57_46 +master_zh_online_special同步数据表2021_11_02_14_08_41 +v1.0.65 + 1 被动180修改 + 2. 灵兽检测逻辑初始化修改 +master_zh_online_special同步数据表2021_10_26_16_05_44 +v1.0.64 + 1 添加主角技能 + 2. 被动119修改 +master_zh_online_special同步数据表2021_10_19_16_13_17 +v1.0.63 1、被动344添加空判断 2. 战斗力公式修改 -master_zh_test同步数据表2021_10_12_15_58_23 -master_zh_test同步数据表2021_10_12_10_25_47 -master_zh_test同步数据表2021_10_11_18_25_43 -v1.0.66 - 1、被动312修改 -master_zh_test同步数据表2021_10_09_18_47_41 -master_zh_test同步数据表2021_10_09_18_46_50 -v1.0.65 - 1、被动116 258 281 312 344 250修改 +master_zh_online_special同步数据表2021_10_12_15_59_00 +master_zh_online_special同步数据表2021_10_12_15_58_52 +master_zh_online_special同步数据表2021_10_12_10_26_03 +master_zh_online_special同步数据表2021_10_11_19_54_13 +master_zh_online_special同步数据表2021_10_11_19_53_59 +v1.0.62 + 1、被动116 258 281 312 344 250，312，353 351 137修改 2. 精卫借的怒气不会回复怒气 3. 添加不处理增伤被动的方法 -master_zh_test同步数据表2021_09_28_17_45_03 -v1.0.64 - 1、353 351 137 被动修改 - 2. 添加获取没有出发不灭的目标 -master_zh_test同步数据表2021_09_27_18_41_38 -v1.0.63 - 1、353被动修改 -v1.0.62 - 1、添加御甲buff - 2.添加最后一期紫府神印，添加白金装备被动 觉醒被动修改 -master_zh_test同步数据表2021_09_26_20_35_14 -master_zh_test同步数据表2021_09_18_21_14_36 -master_zh_test同步数据表2021_09_18_18_42_35 v1.0.61 + 1.同步客户端逻辑 +master_zh_online_special同步数据表2021_09_28_18_03_42 +master_zh_online_special同步数据表2021_09_28_14_34_53 +master_zh_online_special同步数据表2021_09_18_21_22_03 +v1.0.60 1、技能是否能释放 添加是否有技能目标判断 2.被动196 200 188 修改 -master_zh_test同步数据表2021_09_17_16_21_53 -master_zh_test同步数据表2021_09_15_20_05_28 -master_zh_test同步数据表2021_09_15_14_23_26 -master_zh_test同步数据表2021_09_14_15_46_46 -master_zh_test同步数据表2021_09_14_11_51_05 -v1.0.60 - 1、被动56修改 -master_zh_test同步数据表2021_09_11_18_04_19 +master_zh_online_special同步数据表2021_09_16_20_56_10 +master_zh_online_special同步数据表2021_09_16_19_56_58 +master_zh_online_special同步数据表2021_09_15_16_43_43 +master_zh_online_special同步数据表2021_09_15_15_58_04 +master_zh_online_special同步数据表2021_09_15_15_55_26 +master_zh_online_special同步数据表2021_09_14_15_45_21 +master_zh_online_special同步数据表2021_09_14_13_07_13 + v1.0.59 - 1、被动261 修改 -master_zh_test同步数据表2021_09_10_18_24_51 + 1、被动56修改 被动261 修改 +master_zh_online_special同步数据表2021_09_14_11_32_16 +master_zh_online_special同步数据表2021_09_14_11_26_22 v1.0.58 1、修复方法缺失报错 v1.0.57 1、尝试修复孙悟空大招不会增加伤害的问题 2、添加用于debug的log -master_zh_test同步数据表2021_09_07_11_00_31 +master_zh_online_special同步数据表2021_09_07_10_58_24 v1.0.56 1.选生命百分比最少目标逻辑修改 去掉有不灭单位 - 2. 死亡不把怒气显示清空 - 3.被动99 307 选目标逻辑修改 + 2. 死亡不把怒气显示清空 + 3.被动99 307 选目标逻辑修改 +master_zh_online_special同步数据表2021_09_03_15_16_49 v1.0.55 - 1.被动263 269 274 332 112 145 修改 - 2. 添加战斗日志 + 1. 被动263 269 274 332 112 145 修改 + 2. 添加战斗日志 + +master_zh_online_special同步数据表2021_08_28_19_41_53 v1.0.54 1. 被动91 被动115 160修改 - 2. Dot类buff清除逻辑修改 -master_zh_test同步数据表2021_08_27_18_25_18 -master_zh_test同步数据表2021_08_21_16_34_06 -v1.0.54 - 1. 被动141 310 283 330 336修改 -master_zh_test同步数据表2021_08_02_19_27_29 + 2. Dot类buff清除逻辑修改 +master_zh_online_special同步数据表2021_08_24_14_58_11 v1.0.53 - 1. 随机种子修改 -master_zh_test同步数据表2021_07_31_17_55_16 -master_zh_test同步数据表2021_07_31_17_54_20 + 1. 被动141 310 283 330 336修改 +master_zh_online_special同步数据表2021_08_03_10_38_57 v1.0.52 - 1. 死亡技能不会被控制 - 2.追加技能是否触发特性修改 -master_zh_test同步数据表2021_07_26_11_10_56 + 1. 死亡技能不受控制影响 + 2.战斗随机种子修改 +master_zh_online_special同步数据表2021_07_28_08_34_36 v1.0.51 - 1. 被动292 修改 + 1. 被动292修改 +master_zh_online_special同步数据表2021_07_16_19_57_49 v1.0.50 1. 被动292 319修改 - -master_zh_test同步数据表2021_07_13_18_19_09 -master_zh_test同步数据表2021_07_10_20_33_05 v1.0.49 1. 同步客户端逻辑 +master_zh_online_special同步数据表2021_07_13_18_14_42 +master_zh_online_special同步数据表2021_07_06_17_33_58 v1.0.48 1. 新增紫府神印被动效果 v1.0.47 1. 新增英雄觉醒被动 及 困难副本被动 效果 - -master_zh_test同步数据表2021_06_30_07_33_23 -master_zh_test同步数据表2021_06_28_13_40_30 +master_zh_online_special同步数据表2021_06_30_07_33_07 v1.0.46 1、同步数据表 v1.0.45 diff --git a/serverlogic/src/main/resources/application.properties b/serverlogic/src/main/resources/application.properties index 984adbafa..86bdefab6 100644 --- a/serverlogic/src/main/resources/application.properties +++ b/serverlogic/src/main/resources/application.properties @@ -1,5 +1,5 @@ #server info -server.id = 10050 +server.id = 10161 server.openTime = 20190101000101 server.num = 1 server.debug = true @@ -38,7 +38,7 @@ spring.redis.expireTime = -1 #spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1 #spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1 #mongodb2 develop -spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10050 +spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10161 spring.data.mongodbcore.uri = mongodb://60.1.1.14:27017/jl_core #spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212 mongodb.options.maxWaitTime = 120000 @@ -67,7 +67,7 @@ netty.allTimeout=35 #core -services.core.ip=60.1.1.50 +services.core.ip=60.1.1.161 services.core.port=7900 services.core.area=1000 services.core.id=1 diff --git a/test/src/main/java/ExcelUtils.java b/test/src/main/java/ExcelUtils.java index ff901438b..b646821b9 100644 --- a/test/src/main/java/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -8,11 +8,14 @@ import java.util.*; public class ExcelUtils { private static boolean isWrite = true; - private static String excelPath ="E:\\work\\data_execl\\master_en\\base_data\\"; //excel 文件 + //private static String excelPath ="E:\\work\\data_execl\\master_en\\base_data\\"; //excel 文件 // private static String excelPath ="D:/excel/0.94/data_execl/Map_data/"; //excel 文件 private static String path = "conf/server/"; private static Set oldFileNames = new HashSet<>(); private static String javaFilePath = "tablemanager/src/main/java/config/"; + //private static String excelPath ="E:\\config\\master_zh_ios_tishen_new\\base_data\\"; //excel 文件 + private static String excelPath ="E:\\config\\master_zh_c\\base_data\\"; //excel 文件 + public static void main(String[] args) throws Exception { File oldfile = new File(path);