Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
jiahuiwen
commit
e754405dfe
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -17,6 +17,8 @@ local BuffRegister = {
|
|||
[BuffName.Brand] = "Brand",
|
||||
[BuffName.Blood] = "Blood",
|
||||
[BuffName.BanBlood] = "BanBlood",
|
||||
[BuffName.SigilSign] = "SigilSign",
|
||||
[BuffName.CommonSign] = "CommonSign",
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.Rage<n3 then
|
||||
if critFunc then
|
||||
critFunc(v1,ct)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit,addCrit,nil,nil,role)
|
||||
end,
|
||||
--有[a]%概率使目标多附加[b]层效果，[c]%概率使目标多附加[d]层效果；效果为[e]类型[f]效果
|
||||
--a[float],b[int],c[float],d[int],e[int],f[int]
|
||||
[401]=function(role, args,id,judge)
|
||||
local p1=args[1]
|
||||
local v1=args[2]
|
||||
local p2=args[3]
|
||||
local v2=args[4]
|
||||
local t1=args[5]
|
||||
local t2=args[6]
|
||||
local OnBuffStart = function(buff)
|
||||
-- BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function ()
|
||||
|
||||
-- buff=buff1
|
||||
if buff.skill==nil or buff.skill.type~=BattleSkillType.Special then
|
||||
return
|
||||
end
|
||||
if buff.type~=BuffName.DOT or buff.damageType~=t2 then
|
||||
return
|
||||
end
|
||||
local add=0
|
||||
local rand=Random.Range01()
|
||||
if rand<=p2 then
|
||||
add=v2
|
||||
end
|
||||
if rand<=p1 and add==0 then
|
||||
add=v1
|
||||
end
|
||||
local buffTarget={}
|
||||
buffTarget=buff.target
|
||||
if add>0 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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -16,7 +16,6 @@ function DOT:SetData(...)
|
|||
-- self.cover = false
|
||||
-- self.layer = nil
|
||||
--end
|
||||
|
||||
-- 刷新排序等级
|
||||
self.sort = 2
|
||||
-- if self.damageType == 3 then -- 流血buff在行动之后刷新
|
||||
|
|
|
|||
|
|
@ -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 --免疫控制状态
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
}
|
||||
|
||||
-- 条件检测
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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<String> 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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue