diff --git a/conf/server/ArtResourcesConfig.txt b/conf/server/ArtResourcesConfig.txt index d3da88b24..c5b8253e3 100644 --- a/conf/server/ArtResourcesConfig.txt +++ b/conf/server/ArtResourcesConfig.txt @@ -474,6 +474,7 @@ int 19044 19045 19046 +19047 20001 20002 20003 diff --git a/conf/server/ChallengeConfig.txt b/conf/server/ChallengeConfig.txt index ba1e1651c..0bf7a35bc 100644 --- a/conf/server/ChallengeConfig.txt +++ b/conf/server/ChallengeConfig.txt @@ -3,4 +3,3 @@ int mut,int#int,2 int mut,int#int,1 100 0#0 2147483647 0#0#0#10 101 0#0 600 0#0#0#10 102 0#0 600 0#0#0#10 -0 null 0 0#0#0#10 diff --git a/conf/server/ChallengeSetting.txt b/conf/server/ChallengeSetting.txt index d2ce0c5b8..c435e98b4 100644 --- a/conf/server/ChallengeSetting.txt +++ b/conf/server/ChallengeSetting.txt @@ -1,3 +1,3 @@ -Limit -int -5 +Limit Cost +int mut,int#int,1 +5 0#0#0#100 diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index aa530753a..1b4c023ed 100644 --- a/conf/server/GameSetting.txt +++ b/conf/server/GameSetting.txt @@ -1,3 +1,3 @@ -Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition -int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 -1 10026#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 +Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh +int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int +1 10026#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 10 diff --git a/conf/server/HeroConfig.txt b/conf/server/HeroConfig.txt index f63e2e025..1bf302bd8 100644 --- a/conf/server/HeroConfig.txt +++ b/conf/server/HeroConfig.txt @@ -1,54 +1,54 @@ Id PiecesId PiecesCount Star Profession PropertyName MaxRank Hp Attack PhysicalDefence MagicDefence Speed ActionPower RankupConsumeMaterial OpenSkillRules int int int int int int int float float float float float int mut,int#int,2 mut,int#int,2 -10001 11001 50 5 1 2 10 2508.0 181.0 286.0 238.0 176.0 15 6#1#3#1|6#2#34#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000111|5#1000121|6#1000111|6#1000121|7#1000112|7#1000122|8#1000113|8#1000122|9#1000113|9#1000123|10#1000114|10#1000124 -10002 11002 50 5 5 3 10 2281.0 158.0 259.0 216.0 154.0 15 6#1#3#1|6#2#22#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000211|5#1000221|6#1000211|6#1000221|7#1000212|7#1000222|8#1000213|8#1000222|9#1000213|9#1000223|10#1000214|10#1000224 -10003 11003 50 5 2 4 10 2280.0 162.0 262.0 218.0 181.0 15 6#1#3#1|6#2#27#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000311|5#1000321|6#1000311|6#1000321|7#1000312|7#1000322|8#1000313|8#1000322|9#1000313|9#1000323|10#1000314|10#1000324 -10004 11004 50 5 3 3 10 2373.0 184.0 236.0 283.0 136.0 15 6#1#3#1|6#2#28#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000411|5#1000421|6#1000411|6#1000421|7#1000412|7#1000422|8#1000413|8#1000422|9#1000413|9#1000423|10#1000414|10#1000424 -10005 11005 50 5 4 4 10 2155.0 166.0 215.0 258.0 184.0 15 6#1#3#1|6#2#29#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000511|5#1000521|6#1000511|6#1000521|7#1000512|7#1000522|8#1000513|8#1000522|9#1000513|9#1000523|10#1000514|10#1000524 -10006 11006 50 5 3 1 10 2161.0 171.0 214.0 257.0 175.0 15 6#1#3#1|6#2#23#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000611|5#1000621|6#1000611|6#1000621|7#1000612|7#1000622|8#1000613|8#1000622|9#1000613|9#1000623|10#1000614|10#1000624 -10007 11007 50 5 1 2 10 2165.0 165.0 259.0 216.0 172.0 15 6#1#3#1|6#2#35#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000711|5#1000721|6#1000711|6#1000721|7#1000712|7#1000722|8#1000713|8#1000722|9#1000713|9#1000723|10#1000714|10#1000724 -10008 11008 50 5 5 5 10 2206.0 217.0 193.0 232.0 130.0 15 6#1#3#1|6#2#24#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000811|5#1000821|6#1000811|6#1000821|7#1000812|7#1000822|8#1000813|8#1000822|9#1000813|9#1000823|10#1000814|10#1000824 -10009 11009 50 5 2 6 10 1921.0 198.0 208.0 173.0 168.0 15 6#1#3#1|6#2#32#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000911|5#1000921|6#1000911|6#1000921|7#1000912|7#1000922|8#1000913|8#1000922|9#1000913|9#1000923|10#1000914|10#1000924 -10010 11010 50 5 3 2 10 1922.0 199.0 172.0 206.0 138.0 15 6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001011|5#1001021|6#1001011|6#1001021|7#1001012|7#1001022|8#1001013|8#1001022|9#1001013|9#1001023|10#1001014|10#1001024 -10011 11011 50 5 4 4 10 1922.0 199.0 178.0 213.0 153.0 15 6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001111|5#1001121|6#1001111|6#1001121|7#1001112|7#1001122|8#1001113|8#1001122|9#1001113|9#1001123|10#1001114|10#1001124 -10012 11012 50 5 3 1 10 1849.0 265.0 217.0 181.0 146.0 15 6#1#3#1|6#2#36#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001211|5#1001221|6#1001211|6#1001221|7#1001212|7#1001222|8#1001213|8#1001222|9#1001213|9#1001223|10#1001214|10#1001224 -10013 11013 50 5 1 4 10 1678.0 242.0 194.0 162.0 163.0 15 6#1#3#1|6#2#31#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001311|5#1001321|6#1001311|6#1001321|7#1001312|7#1001322|8#1001313|8#1001322|9#1001313|9#1001323|10#1001314|10#1001324 -10014 11014 50 5 5 6 10 1676.0 244.0 196.0 163.0 191.0 15 6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001411|5#1001421|6#1001411|6#1001421|7#1001412|7#1001422|8#1001413|8#1001422|9#1001413|9#1001423|10#1001414|10#1001424 -10015 11015 50 5 2 5 10 1675.0 235.0 159.0 191.0 174.0 15 6#1#3#1|6#2#25#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001511|5#1001521|6#1001511|6#1001521|7#1001512|7#1001522|8#1001513|8#1001522|9#1001513|9#1001523|10#1001514|10#1001524 -10016 11016 50 5 3 1 10 1587.0 313.0 141.0 169.0 156.0 15 6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001611|5#1001621|6#1001611|6#1001621|7#1001612|7#1001622|8#1001613|8#1001622|9#1001613|9#1001623|10#1001614|10#1001624 -10017 11017 50 5 4 6 10 1443.0 278.0 127.0 152.0 159.0 15 6#1#3#1|6#2#42#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001711|5#1001721|6#1001711|6#1001721|7#1001712|7#1001722|8#1001713|8#1001722|9#1001713|9#1001723|10#1001714|10#1001724 -10018 11018 50 5 3 5 10 1443.0 280.0 134.0 161.0 154.0 15 6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001811|5#1001821|6#1001811|6#1001821|7#1001812|7#1001822|8#1001813|8#1001822|9#1001813|9#1001823|10#1001814|10#1001824 -10019 11019 50 5 1 3 10 1436.0 284.0 152.0 127.0 149.0 15 6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001911|5#1001921|6#1001911|6#1001921|7#1001912|7#1001922|8#1001913|8#1001922|9#1001913|9#1001923|10#1001914|10#1001924 -10020 11020 50 5 5 1 10 2279.0 164.0 264.0 220.0 152.0 15 6#1#3#1|6#2#39#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002011|5#1002021|6#1002011|6#1002021|7#1002012|7#1002022|8#1002013|8#1002022|9#1002013|9#1002023|10#1002014|10#1002024 -10021 11021 40 5 2 2 10 1920.0 205.0 170.0 204.0 178.0 15 6#1#3#1|6#2#41#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002111|5#1002121|6#1002111|6#1002121|7#1002112|7#1002122|8#1002113|8#1002122|9#1002113|9#1002123|10#1002114|10#1002124 -10022 11022 40 5 3 3 10 1676.0 244.0 167.0 200.0 173.0 15 6#1#3#1|6#2#43#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002211|5#1002221|6#1002211|6#1002221|7#1002212|7#1002222|8#1002213|8#1002222|9#1002213|9#1002223|10#1002214|10#1002224 -10023 11023 40 5 4 5 10 1439.0 280.0 131.0 157.0 168.0 15 6#1#3#1|6#2#44#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002311|5#1002321|6#1002311|6#1002321|7#1002312|7#1002322|8#1002313|8#1002322|9#1002313|9#1002323|10#1002314|10#1002324 -10024 11024 40 4 3 3 10 1933.0 138.0 216.0 180.0 182.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002411|4#1002421|5#1002411|5#1002421|6#1002411|6#1002421|7#1002412|7#1002422|8#1002413|8#1002422|9#1002413|9#1002423 -10025 11025 40 4 1 1 10 1630.0 174.0 146.0 175.0 166.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002511|4#1002521|5#1002511|5#1002521|6#1002511|6#1002521|7#1002512|7#1002522|8#1002513|8#1002522|9#1002513|9#1002523 -10026 11026 40 4 5 3 10 2051.0 138.0 216.0 180.0 181.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002611|4#1002621|5#1002611|5#1002621|6#1002611|6#1002621|7#1002612|7#1002622|8#1002613|8#1002622|9#1002613|9#1002623 -10027 11027 40 4 2 5 10 1944.0 141.0 221.0 184.0 175.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#24#1|6#3#17#3 4#1002711|4#1002721|5#1002711|5#1002721|6#1002711|6#1002721 -10028 11028 40 4 3 4 10 1292.0 241.0 110.0 132.0 157.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#25#1|6#3#17#3 4#1002811|4#1002821|5#1002811|5#1002821|6#1002811|6#1002821 -10029 11029 40 4 4 4 10 1228.0 240.0 108.0 129.0 153.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002911|4#1002921|5#1002911|5#1002921|6#1002911|6#1002921|7#1002912|7#1002922|8#1002913|8#1002922|9#1002913|9#1002923 -10030 11030 40 4 3 5 10 1833.0 146.0 186.0 223.0 174.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#22#1|6#3#17#3 4#1003011|4#1003021|5#1003011|5#1003021|6#1003011|6#1003021 -10031 11031 40 4 1 3 10 1942.0 133.0 218.0 182.0 184.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#27#1|6#3#17#3 4#1003111|4#1003121|5#1003111|5#1003121|6#1003111|6#1003121 -10032 11032 40 4 5 2 10 1426.0 205.0 161.0 134.0 202.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 4#1003211|4#1003221|5#1003211|5#1003221|6#1003211|6#1003221 -10033 11033 40 4 2 4 10 1219.0 234.0 130.0 108.0 156.0 15 5#1#2#3|5#2#15#4|5#3#16#4 4#1003311|4#1003321|5#1003311|5#1003321|6#1003311|6#1003321 -10034 11034 40 4 3 4 10 1293.0 240.0 107.0 128.0 161.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1003411|4#1003421|5#1003411|5#1003421|6#1003411|6#1003421|7#1003412|7#1003422|8#1003413|8#1003422|9#1003413|14#1003423 -10035 11035 40 4 4 1 10 1732.0 166.0 172.0 143.0 160.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#32#1|6#3#17#3 4#1003511|4#1003521|5#1003511|5#1003521|6#1003511|6#1003521 -10036 11036 40 4 3 1 10 1724.0 170.0 149.0 179.0 158.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1003611|4#1003621|5#1003611|5#1003621|6#1003611|6#1003621|7#1003612|7#1003622|8#1003613|8#1003622|9#1003613|16#1003623 -10037 11037 40 4 1 2 10 1427.0 206.0 161.0 134.0 197.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#34#1|6#3#17#3 4#1003711|4#1003721|5#1003711|5#1003721|6#1003711|6#1003721 -10038 11038 40 4 5 4 10 1224.0 242.0 114.0 137.0 155.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1003811|4#1003821|5#1003811|5#1003821|6#1003811|6#1003821 -10039 11039 40 4 2 2 10 1428.0 206.0 165.0 138.0 191.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#35#1|6#3#17#3 4#1003911|4#1003921|5#1003911|5#1003921|6#1003911|6#1003921 -10040 11040 40 4 3 3 10 1938.0 141.0 222.0 185.0 182.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1004011|4#1004021|5#1004011|5#1004021|6#1004011|6#1004021 -10041 11041 40 4 4 3 10 1937.0 135.0 221.0 184.0 174.0 15 5#1#2#3|5#2#15#4|5#3#16#4 4#1004111|4#1004121 -10042 11042 40 4 3 3 10 1942.0 135.0 218.0 182.0 181.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#28#1|6#3#17#3 4#1004211|4#1004221|5#1004211|5#1004221|6#1004211|6#1004221 -10043 11043 40 4 1 4 10 1222.0 234.0 136.0 113.0 155.0 15 5#1#2#3|5#2#15#4|5#3#16#4 4#1004311|4#1004321 -10044 11044 40 4 5 2 10 1425.0 201.0 138.0 165.0 192.0 15 5#1#2#3|5#2#15#4|5#3#16#4 4#1004411|4#1004421 -10045 11045 40 4 2 5 10 1831.0 143.0 188.0 225.0 181.0 15 5#1#2#3|5#2#15#4|5#3#16#4 4#1004511|4#1004521 -10046 11046 30 4 3 2 10 1507.0 203.0 134.0 161.0 171.0 15 5#1#2#3|5#2#15#4|5#3#16#4 4#1004611|4#1004621 -10047 11047 30 3 4 1 10 1942.0 140.0 226.0 188.0 175.0 15 null 3#1004711|3#1004721 -10048 11048 30 3 3 3 10 1637.0 167.0 173.0 144.0 172.0 15 null 3#1004811|3#1004821 -10049 11049 30 3 1 2 10 1423.0 199.0 161.0 134.0 196.0 15 null 3#1004911|3#1004921 -10050 11050 30 3 5 4 10 1226.0 242.0 111.0 133.0 159.0 15 null 3#1005011|3#1005021 -10051 11051 30 3 2 5 10 1943.0 140.0 188.0 225.0 182.0 15 null 3#1005111|3#1005121 -10052 11052 30 3 3 6 10 2049.0 136.0 187.0 224.0 177.0 15 null 3#1005211|3#1005221 +10001 11001 50 5 1 2 10 2508.0 181.0 286.0 238.0 176.0 30 6#1#3#1|6#2#34#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000111|5#1000121|6#1000111|6#1000121|7#1000112|7#1000122|8#1000113|8#1000122|9#1000113|9#1000123|10#1000114|10#1000124 +10002 11002 50 5 5 3 10 2281.0 158.0 259.0 216.0 154.0 30 6#1#3#1|6#2#22#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000211|5#1000221|6#1000211|6#1000221|7#1000212|7#1000222|8#1000213|8#1000222|9#1000213|9#1000223|10#1000214|10#1000224 +10003 11003 50 5 2 4 10 2280.0 162.0 262.0 218.0 181.0 30 6#1#3#1|6#2#27#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000311|5#1000321|6#1000311|6#1000321|7#1000312|7#1000322|8#1000313|8#1000322|9#1000313|9#1000323|10#1000314|10#1000324 +10004 11004 50 5 3 3 10 2373.0 184.0 236.0 283.0 136.0 30 6#1#3#1|6#2#28#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000411|5#1000421|6#1000411|6#1000421|7#1000412|7#1000422|8#1000413|8#1000422|9#1000413|9#1000423|10#1000414|10#1000424 +10005 11005 50 5 4 4 10 2155.0 166.0 215.0 258.0 184.0 30 6#1#3#1|6#2#29#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000511|5#1000521|6#1000511|6#1000521|7#1000512|7#1000522|8#1000513|8#1000522|9#1000513|9#1000523|10#1000514|10#1000524 +10006 11006 50 5 3 1 10 2161.0 171.0 214.0 257.0 175.0 30 6#1#3#1|6#2#23#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000611|5#1000621|6#1000611|6#1000621|7#1000612|7#1000622|8#1000613|8#1000622|9#1000613|9#1000623|10#1000614|10#1000624 +10007 11007 50 5 1 2 10 2165.0 165.0 259.0 216.0 172.0 30 6#1#3#1|6#2#35#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000711|5#1000721|6#1000711|6#1000721|7#1000712|7#1000722|8#1000713|8#1000722|9#1000713|9#1000723|10#1000714|10#1000724 +10008 11008 50 5 5 5 10 2206.0 217.0 193.0 232.0 130.0 30 6#1#3#1|6#2#24#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000811|5#1000821|6#1000811|6#1000821|7#1000812|7#1000822|8#1000813|8#1000822|9#1000813|9#1000823|10#1000814|10#1000824 +10009 11009 50 5 2 6 10 1921.0 198.0 208.0 173.0 168.0 30 6#1#3#1|6#2#32#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000911|5#1000921|6#1000911|6#1000921|7#1000912|7#1000922|8#1000913|8#1000922|9#1000913|9#1000923|10#1000914|10#1000924 +10010 11010 50 5 3 2 10 1922.0 199.0 172.0 206.0 138.0 30 6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001011|5#1001021|6#1001011|6#1001021|7#1001012|7#1001022|8#1001013|8#1001022|9#1001013|9#1001023|10#1001014|10#1001024 +10011 11011 50 5 4 4 10 1922.0 199.0 178.0 213.0 153.0 30 6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001111|5#1001121|6#1001111|6#1001121|7#1001112|7#1001122|8#1001113|8#1001122|9#1001113|9#1001123|10#1001114|10#1001124 +10012 11012 50 5 3 1 10 1849.0 265.0 217.0 181.0 146.0 30 6#1#3#1|6#2#36#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001211|5#1001221|6#1001211|6#1001221|7#1001212|7#1001222|8#1001213|8#1001222|9#1001213|9#1001223|10#1001214|10#1001224 +10013 11013 50 5 1 4 10 1678.0 242.0 194.0 162.0 163.0 30 6#1#3#1|6#2#31#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001311|5#1001321|6#1001311|6#1001321|7#1001312|7#1001322|8#1001313|8#1001322|9#1001313|9#1001323|10#1001314|10#1001324 +10014 11014 50 5 5 6 10 1676.0 244.0 196.0 163.0 191.0 30 6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001411|5#1001421|6#1001411|6#1001421|7#1001412|7#1001422|8#1001413|8#1001422|9#1001413|9#1001423|10#1001414|10#1001424 +10015 11015 50 5 2 5 10 1675.0 235.0 159.0 191.0 174.0 30 6#1#3#1|6#2#25#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001511|5#1001521|6#1001511|6#1001521|7#1001512|7#1001522|8#1001513|8#1001522|9#1001513|9#1001523|10#1001514|10#1001524 +10016 11016 50 5 3 1 10 1587.0 313.0 141.0 169.0 156.0 30 6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001611|5#1001621|6#1001611|6#1001621|7#1001612|7#1001622|8#1001613|8#1001622|9#1001613|9#1001623|10#1001614|10#1001624 +10017 11017 50 5 4 6 10 1443.0 278.0 127.0 152.0 159.0 30 6#1#3#1|6#2#42#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001711|5#1001721|6#1001711|6#1001721|7#1001712|7#1001722|8#1001713|8#1001722|9#1001713|9#1001723|10#1001714|10#1001724 +10018 11018 50 5 3 5 10 1443.0 280.0 134.0 161.0 154.0 30 6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001811|5#1001821|6#1001811|6#1001821|7#1001812|7#1001822|8#1001813|8#1001822|9#1001813|9#1001823|10#1001814|10#1001824 +10019 11019 50 5 1 3 10 1436.0 284.0 152.0 127.0 149.0 30 6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001911|5#1001921|6#1001911|6#1001921|7#1001912|7#1001922|8#1001913|8#1001922|9#1001913|9#1001923|10#1001914|10#1001924 +10020 11020 50 5 5 1 10 2279.0 164.0 264.0 220.0 152.0 30 6#1#3#1|6#2#39#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002011|5#1002021|6#1002011|6#1002021|7#1002012|7#1002022|8#1002013|8#1002022|9#1002013|9#1002023|10#1002014|10#1002024 +10021 11021 40 5 2 2 10 1920.0 205.0 170.0 204.0 178.0 30 6#1#3#1|6#2#41#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002111|5#1002121|6#1002111|6#1002121|7#1002112|7#1002122|8#1002113|8#1002122|9#1002113|9#1002123|10#1002114|10#1002124 +10022 11022 40 5 3 3 10 1676.0 244.0 167.0 200.0 173.0 30 6#1#3#1|6#2#43#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002211|5#1002221|6#1002211|6#1002221|7#1002212|7#1002222|8#1002213|8#1002222|9#1002213|9#1002223|10#1002214|10#1002224 +10023 11023 40 5 4 5 10 1439.0 280.0 131.0 157.0 168.0 30 6#1#3#1|6#2#44#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002311|5#1002321|6#1002311|6#1002321|7#1002312|7#1002322|8#1002313|8#1002322|9#1002313|9#1002323|10#1002314|10#1002324 +10024 11024 40 4 3 3 10 1933.0 138.0 216.0 180.0 182.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002411|4#1002421|5#1002411|5#1002421|6#1002411|6#1002421|7#1002412|7#1002422|8#1002413|8#1002422|9#1002413|9#1002423 +10025 11025 40 4 1 1 10 1630.0 174.0 146.0 175.0 166.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002511|4#1002521|5#1002511|5#1002521|6#1002511|6#1002521|7#1002512|7#1002522|8#1002513|8#1002522|9#1002513|9#1002523 +10026 11026 40 4 5 3 10 2051.0 138.0 216.0 180.0 181.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002611|4#1002621|5#1002611|5#1002621|6#1002611|6#1002621|7#1002612|7#1002622|8#1002613|8#1002622|9#1002613|9#1002623 +10027 11027 40 4 2 5 10 1944.0 141.0 221.0 184.0 175.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#24#1|6#3#17#3 4#1002711|4#1002721|5#1002711|5#1002721|6#1002711|6#1002721 +10028 11028 40 4 3 4 10 1292.0 241.0 110.0 132.0 157.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#25#1|6#3#17#3 4#1002811|4#1002821|5#1002811|5#1002821|6#1002811|6#1002821 +10029 11029 40 4 4 4 10 1228.0 240.0 108.0 129.0 153.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002911|4#1002921|5#1002911|5#1002921|6#1002911|6#1002921|7#1002912|7#1002922|8#1002913|8#1002922|9#1002913|9#1002923 +10030 11030 40 4 3 5 10 1833.0 146.0 186.0 223.0 174.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#22#1|6#3#17#3 4#1003011|4#1003021|5#1003011|5#1003021|6#1003011|6#1003021 +10031 11031 40 4 1 3 10 1942.0 133.0 218.0 182.0 184.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#27#1|6#3#17#3 4#1003111|4#1003121|5#1003111|5#1003121|6#1003111|6#1003121 +10032 11032 40 4 5 2 10 1426.0 205.0 161.0 134.0 202.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 4#1003211|4#1003221|5#1003211|5#1003221|6#1003211|6#1003221 +10033 11033 40 4 2 4 10 1219.0 234.0 130.0 108.0 156.0 30 5#1#2#3|5#2#15#4|5#3#16#4 4#1003311|4#1003321|5#1003311|5#1003321|6#1003311|6#1003321 +10034 11034 40 4 3 4 10 1293.0 240.0 107.0 128.0 161.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1003411|4#1003421|5#1003411|5#1003421|6#1003411|6#1003421|7#1003412|7#1003422|8#1003413|8#1003422|9#1003413|14#1003423 +10035 11035 40 4 4 1 10 1732.0 166.0 172.0 143.0 160.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#32#1|6#3#17#3 4#1003511|4#1003521|5#1003511|5#1003521|6#1003511|6#1003521 +10036 11036 40 4 3 1 10 1724.0 170.0 149.0 179.0 158.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1003611|4#1003621|5#1003611|5#1003621|6#1003611|6#1003621|7#1003612|7#1003622|8#1003613|8#1003622|9#1003613|16#1003623 +10037 11037 40 4 1 2 10 1427.0 206.0 161.0 134.0 197.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#34#1|6#3#17#3 4#1003711|4#1003721|5#1003711|5#1003721|6#1003711|6#1003721 +10038 11038 40 4 5 4 10 1224.0 242.0 114.0 137.0 155.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1003811|4#1003821|5#1003811|5#1003821|6#1003811|6#1003821 +10039 11039 40 4 2 2 10 1428.0 206.0 165.0 138.0 191.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#35#1|6#3#17#3 4#1003911|4#1003921|5#1003911|5#1003921|6#1003911|6#1003921 +10040 11040 40 4 3 3 10 1938.0 141.0 222.0 185.0 182.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1004011|4#1004021|5#1004011|5#1004021|6#1004011|6#1004021 +10041 11041 40 4 4 3 10 1937.0 135.0 221.0 184.0 174.0 30 5#1#2#3|5#2#15#4|5#3#16#4 4#1004111|4#1004121 +10042 11042 40 4 3 3 10 1942.0 135.0 218.0 182.0 181.0 30 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#28#1|6#3#17#3 4#1004211|4#1004221|5#1004211|5#1004221|6#1004211|6#1004221 +10043 11043 40 4 1 4 10 1222.0 234.0 136.0 113.0 155.0 30 5#1#2#3|5#2#15#4|5#3#16#4 4#1004311|4#1004321 +10044 11044 40 4 5 2 10 1425.0 201.0 138.0 165.0 192.0 30 5#1#2#3|5#2#15#4|5#3#16#4 4#1004411|4#1004421 +10045 11045 40 4 2 5 10 1831.0 143.0 188.0 225.0 181.0 30 5#1#2#3|5#2#15#4|5#3#16#4 4#1004511|4#1004521 +10046 11046 30 4 3 2 10 1507.0 203.0 134.0 161.0 171.0 30 5#1#2#3|5#2#15#4|5#3#16#4 4#1004611|4#1004621 +10047 11047 30 3 4 1 10 1942.0 140.0 226.0 188.0 175.0 30 null 3#1004711|3#1004721 +10048 11048 30 3 3 3 10 1637.0 167.0 173.0 144.0 172.0 30 null 3#1004811|3#1004821 +10049 11049 30 3 1 2 10 1423.0 199.0 161.0 134.0 196.0 30 null 3#1004911|3#1004921 +10050 11050 30 3 5 4 10 1226.0 242.0 111.0 133.0 159.0 30 null 3#1005011|3#1005021 +10051 11051 30 3 2 5 10 1943.0 140.0 188.0 225.0 182.0 30 null 3#1005111|3#1005121 +10052 11052 30 3 3 6 10 2049.0 136.0 187.0 224.0 177.0 30 null 3#1005211|3#1005221 diff --git a/conf/server/LotteryRewardConfig.txt b/conf/server/LotteryRewardConfig.txt index ef6096d79..1101700b0 100644 --- a/conf/server/LotteryRewardConfig.txt +++ b/conf/server/LotteryRewardConfig.txt @@ -99,26 +99,26 @@ int mut,int#int,1 int int int,int#int,1 102 12010#8 14 50 null 103 12010#12 14 50 null 104 12010#10 14 50 null -110 10024#1 1 0 null -111 10025#1 1 95 null -112 10026#1 1 0 null -113 10027#1 1 0 null -114 10028#1 1 0 null -115 10029#1 1 0 null -116 10030#1 1 0 null -117 10031#1 1 0 null -118 10032#1 1 0 null -119 10033#1 1 0 null -120 10034#1 1 95 null -121 10035#1 1 0 null -122 10036#1 1 0 null -123 10037#1 1 95 null -124 10038#1 1 0 null -125 10039#1 1 0 null -126 10040#1 1 0 null -127 10041#1 1 0 null -128 10042#1 1 0 null -129 10043#1 1 0 null -130 10044#1 1 0 null -131 10045#1 1 0 null -132 10046#1 1 0 null +110 10024#1 20 0 null +111 10025#1 20 95 null +112 10026#1 20 0 null +113 10027#1 20 0 null +114 10028#1 20 0 null +115 10029#1 20 0 null +116 10030#1 20 0 null +117 10031#1 20 0 null +118 10032#1 20 0 null +119 10033#1 20 0 null +120 10034#1 20 95 null +121 10035#1 20 0 null +122 10036#1 20 0 null +123 10037#1 20 95 null +124 10038#1 20 0 null +125 10039#1 20 0 null +126 10040#1 20 0 null +127 10041#1 20 0 null +128 10042#1 20 0 null +129 10043#1 20 0 null +130 10044#1 20 0 null +131 10045#1 20 0 null +132 10046#1 20 0 null diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 37627a6c1..92fc552af 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -278,51 +278,52 @@ int int int int int int int int int int int float float float float int float mu 1138 17 4 0 2 124 84034 2664 1156 1156 107 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 1139 17 4 0 2 124 84034 2664 1156 1156 1072 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 1140 35 4 0 3 126 158534 3360 1084 1084 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50001 2 3 0 1 0 180 177 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50002 2 3 0 1 0 180 177 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50003 2 3 0 1 0 180 177 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50004 1 2 0 1 0 120 264 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50005 1 2 0 1 0 120 264 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50006 1 2 0 1 0 120 264 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50007 2 3 0 1 0 300 177 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50008 2 3 0 1 0 300 177 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50009 2 3 0 1 0 300 177 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50010 42 1 0 1 0 300 177 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50011 42 1 0 1 0 300 177 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50012 42 1 0 1 0 300 177 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50013 1 2 0 1 0 180 336 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50014 1 2 0 1 0 180 336 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50015 1 2 0 1 0 180 336 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50016 2 3 0 1 0 300 206 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50017 2 3 0 1 0 300 206 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50018 2 3 0 1 0 300 206 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null -50019 3 2 0 2 0 198 379 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50020 3 2 0 2 0 198 379 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50021 3 2 0 2 0 198 379 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50022 1 2 0 1 0 180 336 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50023 1 2 0 1 0 180 336 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50024 1 2 0 1 0 180 336 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50025 2 3 0 1 0 300 206 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101531 null -50026 2 3 0 1 0 300 206 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101531 null -50027 2 3 0 1 0 300 206 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101531 null -50028 3 2 0 2 0 198 379 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50029 3 2 0 2 0 198 379 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50030 3 2 0 2 0 198 379 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50031 4 3 0 2 0 198 379 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101541#1101542 null -50032 4 3 0 2 0 198 379 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101541#1101542 null -50033 4 3 0 2 0 198 379 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101541#1101542 null -50034 1 2 0 1 0 180 336 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101511 null -50035 1 2 0 1 0 180 336 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101511 null -50036 1 2 0 1 0 180 336 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101511 null -50037 42 1 0 1 0 300 235 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50038 42 1 0 1 0 300 235 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50039 42 1 0 1 0 300 235 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50040 3 2 0 2 0 198 465 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101521#1101522 null -50041 3 2 0 2 0 198 465 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101521#1101522 null -50042 3 2 0 2 0 198 465 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101521#1101522 null -50043 5 1 0 3 0 216 552 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20013 null -50044 5 1 0 3 0 216 552 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20013 null -50045 5 1 0 3 0 216 552 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20013 null +10001 45 4 0 4 32 1119 177 203 203 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000001#1000002 null +50001 2 3 0 1 0 180 158 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50002 2 3 0 1 0 180 158 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50003 2 3 0 1 0 180 158 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50004 1 2 0 1 0 120 216 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50005 1 2 0 1 0 120 216 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50006 1 2 0 1 0 120 216 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50007 2 3 0 1 0 300 158 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50008 2 3 0 1 0 300 158 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50009 2 3 0 1 0 300 158 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50010 42 1 0 1 0 300 158 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50011 42 1 0 1 0 300 158 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50012 42 1 0 1 0 300 158 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50013 1 2 0 1 0 180 264 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50014 1 2 0 1 0 180 264 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50015 1 2 0 1 0 180 264 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50016 2 3 0 1 0 300 177 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50017 2 3 0 1 0 300 177 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50018 2 3 0 1 0 300 177 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20004 null +50019 3 2 0 2 0 198 292 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50020 3 2 0 2 0 198 292 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50021 3 2 0 2 0 198 292 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50022 1 2 0 1 0 180 264 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50023 1 2 0 1 0 180 264 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50024 1 2 0 1 0 180 264 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50025 2 3 0 1 0 300 177 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101531 null +50026 2 3 0 1 0 300 177 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101531 null +50027 2 3 0 1 0 300 177 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101531 null +50028 3 2 0 2 0 198 292 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50029 3 2 0 2 0 198 292 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50030 3 2 0 2 0 198 292 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50031 4 3 0 2 0 198 292 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101541#1101542 null +50032 4 3 0 2 0 198 292 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101541#1101542 null +50033 4 3 0 2 0 198 292 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101541#1101542 null +50034 1 2 0 1 0 180 264 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101511 null +50035 1 2 0 1 0 180 264 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101511 null +50036 1 2 0 1 0 180 264 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101511 null +50037 42 1 0 1 0 300 196 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50038 42 1 0 1 0 300 196 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50039 42 1 0 1 0 300 196 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50040 3 2 0 2 0 198 350 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101521#1101522 null +50041 3 2 0 2 0 198 350 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101521#1101522 null +50042 3 2 0 2 0 198 350 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101521#1101522 null +50043 5 1 0 3 0 216 408 60 60 200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20013 null +50044 5 1 0 3 0 216 408 60 60 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20013 null +50045 5 1 0 3 0 216 408 60 60 7 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20013 null 50046 1 2 0 1 8 152 332 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50047 1 2 0 1 8 152 332 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50048 1 2 0 1 8 152 332 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null @@ -335,39 +336,39 @@ int int int int int int int int int int int float float float float int float mu 50055 6 2 0 1 8 254 194 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null 50056 6 2 0 1 8 254 194 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null 50057 6 2 0 1 8 254 194 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50058 1 2 0 1 8 152 390 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102311 null -50059 1 2 0 1 8 152 390 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102311 null -50060 1 2 0 1 8 152 390 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102311 null -50061 7 1 0 1 8 152 390 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102321#1102322 null -50062 7 1 0 1 8 152 390 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102321#1102322 null -50063 7 1 0 1 8 152 390 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102321#1102322 null -50064 8 2 0 2 8 167 448 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102331#1102332 null -50065 8 2 0 2 8 167 448 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102331#1102332 null -50066 8 2 0 2 8 167 448 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102331#1102332 null -50067 1 2 0 1 8 152 390 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50068 1 2 0 1 8 152 390 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50069 1 2 0 1 8 152 390 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50070 6 2 0 1 8 254 217 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50071 6 2 0 1 8 254 217 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50072 6 2 0 1 8 254 217 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50073 3 2 0 2 8 167 448 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50074 3 2 0 2 8 167 448 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50075 3 2 0 2 8 167 448 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50076 8 2 0 2 8 167 448 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null -50077 8 2 0 2 8 167 448 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null -50078 8 2 0 2 8 167 448 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null -50079 1 2 0 1 8 152 390 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null -50080 1 2 0 1 8 152 390 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null -50081 1 2 0 1 8 152 390 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null -50082 10040 1 0 1 8 254 217 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50083 10040 1 0 1 8 254 217 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50084 10040 1 0 1 8 254 217 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50085 10031 1 0 2 8 279 240 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null -50086 10031 1 0 2 8 279 240 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null -50087 10031 1 0 2 8 279 240 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null -50088 10035 1 0 3 8 183 534 50 50 360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50089 10035 1 0 3 8 183 534 50 50 144 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50090 10035 1 0 3 8 183 534 50 50 14 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50058 1 2 0 1 12 228 556 76 76 440 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102311 null +50059 1 2 0 1 12 228 556 76 76 176 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102311 null +50060 1 2 0 1 12 228 556 76 76 17 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102311 null +50061 7 1 0 1 12 228 556 76 76 440 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102321#1102322 null +50062 7 1 0 1 12 228 556 76 76 176 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102321#1102322 null +50063 7 1 0 1 12 228 556 76 76 17 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102321#1102322 null +50064 8 2 0 2 12 251 637 76 76 440 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102331#1102332 null +50065 8 2 0 2 12 251 637 76 76 176 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102331#1102332 null +50066 8 2 0 2 12 251 637 76 76 17 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102331#1102332 null +50067 1 2 0 1 12 228 556 76 76 440 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50068 1 2 0 1 12 228 556 76 76 176 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50069 1 2 0 1 12 228 556 76 76 17 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50070 6 2 0 1 12 381 314 76 76 440 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null +50071 6 2 0 1 12 381 314 76 76 176 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null +50072 6 2 0 1 12 381 314 76 76 17 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null +50073 3 2 0 2 12 251 637 76 76 440 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50074 3 2 0 2 12 251 637 76 76 176 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50075 3 2 0 2 12 251 637 76 76 17 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50076 8 2 0 2 12 251 637 76 76 440 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +50077 8 2 0 2 12 251 637 76 76 176 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +50078 8 2 0 2 12 251 637 76 76 17 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +50079 1 2 0 1 16 305 780 101 101 520 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null +50080 1 2 0 1 16 305 780 101 101 208 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null +50081 1 2 0 1 16 305 780 101 101 20 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null +50082 10040 1 0 1 16 508 434 101 101 520 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50083 10040 1 0 1 16 508 434 101 101 208 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50084 10040 1 0 1 16 508 434 101 101 20 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50085 10031 1 0 2 16 559 480 101 101 520 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null +50086 10031 1 0 2 16 559 480 101 101 208 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null +50087 10031 1 0 2 16 559 480 101 101 20 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null +50088 10035 1 0 3 16 366 1069 101 101 520 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50089 10035 1 0 3 16 366 1069 101 101 208 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50090 10035 1 0 3 16 366 1069 101 101 20 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null 50091 9 3 0 1 24 457 1171 152 152 680 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50092 9 3 0 1 24 457 1171 152 152 272 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50093 9 3 0 1 24 457 1171 152 152 27 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null @@ -401,18 +402,18 @@ int int int int int int int int int int int float float float float int float mu 50121 10031 1 0 2 32 1119 961 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null 50122 10031 1 0 2 32 1119 961 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null 50123 10031 1 0 2 32 1119 961 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50124 9 3 0 1 36 686 1757 228 228 920 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50125 9 3 0 1 36 686 1757 228 228 368 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50126 9 3 0 1 36 686 1757 228 228 36 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50127 10040 1 0 1 36 1144 977 228 228 920 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50128 10040 1 0 1 36 1144 977 228 228 368 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50129 10040 1 0 1 36 1144 977 228 228 36 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50130 10031 1 0 2 36 1259 1081 228 228 920 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50131 10031 1 0 2 36 1259 1081 228 228 368 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50132 10031 1 0 2 36 1259 1081 228 228 36 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50133 10035 1 0 3 36 824 2406 228 228 920 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50134 10035 1 0 3 36 824 2406 228 228 368 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50135 10035 1 0 3 36 824 2406 228 228 36 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50124 9 3 0 1 40 686 1757 228 228 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50125 9 3 0 1 40 686 1757 228 228 400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50126 9 3 0 1 40 686 1757 228 228 39 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50127 10040 1 0 1 40 1144 977 228 228 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50128 10040 1 0 1 40 1144 977 228 228 400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50129 10040 1 0 1 40 1144 977 228 228 39 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50130 10031 1 0 2 40 1259 1081 228 228 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50131 10031 1 0 2 40 1259 1081 228 228 400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50132 10031 1 0 2 40 1259 1081 228 228 39 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50133 10035 1 0 3 40 824 2406 228 228 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50134 10035 1 0 3 40 824 2406 228 228 400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50135 10035 1 0 3 40 824 2406 228 228 39 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null 50136 10051 2 0 2 40 839 2240 254 254 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null 50137 10051 2 0 2 40 839 2240 254 254 400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null 50138 10051 2 0 2 40 839 2240 254 254 39 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null @@ -497,93 +498,93 @@ int int int int int int int int int int int float float float float int float mu 50217 14 1 0 1 88 2563 2203 512 512 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50218 14 1 0 1 88 2563 2203 512 512 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50219 14 1 0 1 88 2563 2203 512 512 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50220 13 1 0 1 88 1549 4037 516 516 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50221 13 1 0 1 88 1549 4037 516 516 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50222 13 1 0 1 88 1549 4037 516 516 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50223 14 1 0 1 88 2582 2234 516 516 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50224 14 1 0 1 88 2582 2234 516 516 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50225 14 1 0 1 88 2582 2234 516 516 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50226 43 3 0 1 88 2066 2835 516 516 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50227 43 3 0 1 88 2066 2835 516 516 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50228 43 3 0 1 88 2066 2835 516 516 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50229 10025 1 0 3 88 1859 5539 516 516 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null -50230 10025 1 0 3 88 1859 5539 516 516 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null -50231 10025 1 0 3 88 1859 5539 516 516 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null -50232 42 1 0 1 88 2602 2266 520 520 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50233 42 1 0 1 88 2602 2266 520 520 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50234 42 1 0 1 88 2602 2266 520 520 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50235 23 1 0 2 88 1717 4716 520 520 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50236 23 1 0 2 88 1717 4716 520 520 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50237 23 1 0 2 88 1717 4716 520 520 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50238 10002 1 0 3 88 3123 2878 520 520 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50239 10002 1 0 3 88 3123 2878 520 520 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50240 10002 1 0 3 88 3123 2878 520 520 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50241 10026 1 0 3 88 3123 2878 520 520 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null -50242 10026 1 0 3 88 3123 2878 520 520 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null -50243 10026 1 0 3 88 3123 2878 520 520 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null -50244 42 1 0 1 88 2622 2297 524 524 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50245 42 1 0 1 88 2622 2297 524 524 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50246 42 1 0 1 88 2622 2297 524 524 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50247 13 1 0 1 88 1573 4170 524 524 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50248 13 1 0 1 88 1573 4170 524 524 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50249 13 1 0 1 88 1573 4170 524 524 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50250 14 1 0 1 88 2622 2297 524 524 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50251 14 1 0 1 88 2622 2297 524 524 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50252 14 1 0 1 88 2622 2297 524 524 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50253 43 3 0 1 88 2097 2921 524 524 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50254 43 3 0 1 88 2097 2921 524 524 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50255 43 3 0 1 88 2097 2921 524 524 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50256 42 1 0 1 88 2641 2328 528 528 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50257 42 1 0 1 88 2641 2328 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50258 42 1 0 1 88 2641 2328 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50259 23 1 0 2 88 1743 4873 528 528 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50260 23 1 0 2 88 1743 4873 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50261 23 1 0 2 88 1743 4873 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50262 10033 1 0 2 88 1743 4873 528 528 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50263 10033 1 0 2 88 1743 4873 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50264 10033 1 0 2 88 1743 4873 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50265 5 1 0 3 88 1902 5827 528 528 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50266 5 1 0 3 88 1902 5827 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50267 5 1 0 3 88 1902 5827 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50268 1 2 0 1 88 1596 4303 532 532 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50269 1 2 0 1 88 1596 4303 532 532 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50270 1 2 0 1 88 1596 4303 532 532 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50271 9 3 0 1 88 1596 4303 532 532 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50272 9 3 0 1 88 1596 4303 532 532 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50273 9 3 0 1 88 1596 4303 532 532 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50274 10 3 0 1 88 2129 3008 532 532 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50275 10 3 0 1 88 2129 3008 532 532 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50276 10 3 0 1 88 2129 3008 532 532 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50277 2 3 0 1 88 2681 2391 536 536 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50278 2 3 0 1 88 2681 2391 536 536 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50279 2 3 0 1 88 2681 2391 536 536 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50280 10034 1 0 1 88 1608 4370 536 536 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -50281 10034 1 0 1 88 1608 4370 536 536 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -50282 10034 1 0 1 88 1608 4370 536 536 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -50283 10037 1 0 1 88 1608 4370 536 536 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -50284 10037 1 0 1 88 1608 4370 536 536 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -50285 10037 1 0 1 88 1608 4370 536 536 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -50286 9 3 0 1 88 1620 4436 540 540 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50287 9 3 0 1 88 1620 4436 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50288 9 3 0 1 88 1620 4436 540 540 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50289 1 2 0 1 88 1620 4436 540 540 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50290 1 2 0 1 88 1620 4436 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50291 1 2 0 1 88 1620 4436 540 540 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50292 6 2 0 1 88 2701 2422 540 540 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50293 6 2 0 1 88 2701 2422 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50294 6 2 0 1 88 2701 2422 540 540 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50295 3 2 0 1 88 1620 4436 540 540 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50296 3 2 0 1 88 1620 4436 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50297 3 2 0 1 88 1620 4436 540 540 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50298 2 3 0 1 88 2720 2454 544 544 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50299 2 3 0 1 88 2720 2454 544 544 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50300 2 3 0 1 88 2720 2454 544 544 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50301 16 4 0 1 88 2176 3137 544 544 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50302 16 4 0 1 88 2176 3137 544 544 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50303 16 4 0 1 88 2176 3137 544 544 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50304 38 4 0 2 88 1795 5186 544 544 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50305 38 4 0 2 88 1795 5186 544 544 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50306 38 4 0 2 88 1795 5186 544 544 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50220 13 1 0 1 89 1549 4037 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50221 13 1 0 1 89 1549 4037 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50222 13 1 0 1 89 1549 4037 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50223 14 1 0 1 89 2582 2234 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50224 14 1 0 1 89 2582 2234 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50225 14 1 0 1 89 2582 2234 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50226 43 3 0 1 89 2066 2835 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50227 43 3 0 1 89 2066 2835 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50228 43 3 0 1 89 2066 2835 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50229 10025 1 0 3 89 1859 5539 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null +50230 10025 1 0 3 89 1859 5539 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null +50231 10025 1 0 3 89 1859 5539 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null +50232 42 1 0 1 90 2602 2266 520 520 2000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50233 42 1 0 1 90 2602 2266 520 520 800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50234 42 1 0 1 90 2602 2266 520 520 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50235 23 1 0 2 90 1717 4716 520 520 2000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50236 23 1 0 2 90 1717 4716 520 520 800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50237 23 1 0 2 90 1717 4716 520 520 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50238 10002 1 0 3 90 3123 2878 520 520 2000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50239 10002 1 0 3 90 3123 2878 520 520 800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50240 10002 1 0 3 90 3123 2878 520 520 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50241 10026 1 0 3 90 3123 2878 520 520 2000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null +50242 10026 1 0 3 90 3123 2878 520 520 800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null +50243 10026 1 0 3 90 3123 2878 520 520 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null +50244 42 1 0 1 91 2622 2297 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50245 42 1 0 1 91 2622 2297 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50246 42 1 0 1 91 2622 2297 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50247 13 1 0 1 91 1573 4170 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50248 13 1 0 1 91 1573 4170 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50249 13 1 0 1 91 1573 4170 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50250 14 1 0 1 91 2622 2297 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50251 14 1 0 1 91 2622 2297 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50252 14 1 0 1 91 2622 2297 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50253 43 3 0 1 91 2097 2921 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50254 43 3 0 1 91 2097 2921 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50255 43 3 0 1 91 2097 2921 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50256 42 1 0 1 92 2641 2328 528 528 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50257 42 1 0 1 92 2641 2328 528 528 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50258 42 1 0 1 92 2641 2328 528 528 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50259 23 1 0 2 92 1743 4873 528 528 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50260 23 1 0 2 92 1743 4873 528 528 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50261 23 1 0 2 92 1743 4873 528 528 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50262 10033 1 0 2 92 1743 4873 528 528 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50263 10033 1 0 2 92 1743 4873 528 528 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50264 10033 1 0 2 92 1743 4873 528 528 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50265 5 1 0 3 92 1902 5827 528 528 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50266 5 1 0 3 92 1902 5827 528 528 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50267 5 1 0 3 92 1902 5827 528 528 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50268 1 2 0 1 92 1596 4303 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50269 1 2 0 1 92 1596 4303 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50270 1 2 0 1 92 1596 4303 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50271 9 3 0 1 92 1596 4303 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50272 9 3 0 1 92 1596 4303 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50273 9 3 0 1 92 1596 4303 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50274 10 3 0 1 92 2129 3008 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50275 10 3 0 1 92 2129 3008 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50276 10 3 0 1 92 2129 3008 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50277 2 3 0 1 93 2681 2391 536 536 2060 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50278 2 3 0 1 93 2681 2391 536 536 824 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50279 2 3 0 1 93 2681 2391 536 536 82 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50280 10034 1 0 1 93 1608 4370 536 536 2060 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +50281 10034 1 0 1 93 1608 4370 536 536 824 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +50282 10034 1 0 1 93 1608 4370 536 536 82 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +50283 10037 1 0 1 93 1608 4370 536 536 2060 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +50284 10037 1 0 1 93 1608 4370 536 536 824 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +50285 10037 1 0 1 93 1608 4370 536 536 82 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +50286 9 3 0 1 94 1620 4436 540 540 2080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50287 9 3 0 1 94 1620 4436 540 540 832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50288 9 3 0 1 94 1620 4436 540 540 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50289 1 2 0 1 94 1620 4436 540 540 2080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50290 1 2 0 1 94 1620 4436 540 540 832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50291 1 2 0 1 94 1620 4436 540 540 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50292 6 2 0 1 94 2701 2422 540 540 2080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null +50293 6 2 0 1 94 2701 2422 540 540 832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null +50294 6 2 0 1 94 2701 2422 540 540 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null +50295 3 2 0 1 94 1620 4436 540 540 2080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50296 3 2 0 1 94 1620 4436 540 540 832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50297 3 2 0 1 94 1620 4436 540 540 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50298 2 3 0 1 95 2720 2454 544 544 2100 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50299 2 3 0 1 95 2720 2454 544 544 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50300 2 3 0 1 95 2720 2454 544 544 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50301 16 4 0 1 95 2176 3137 544 544 2100 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50302 16 4 0 1 95 2176 3137 544 544 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50303 16 4 0 1 95 2176 3137 544 544 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50304 38 4 0 2 95 1795 5186 544 544 2100 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50305 38 4 0 2 95 1795 5186 544 544 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50306 38 4 0 2 95 1795 5186 544 544 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50307 16 4 0 1 96 2192 3180 548 548 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50308 16 4 0 1 96 2192 3180 548 548 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50309 16 4 0 1 96 2192 3180 548 548 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null @@ -608,39 +609,39 @@ int int int int int int int int int int int float float float float int float mu 50328 8 2 0 1 96 1677 4776 559 559 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50329 8 2 0 1 96 1677 4776 559 559 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50330 8 2 0 1 96 1677 4776 559 559 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50331 8 2 0 1 96 1711 4983 570 570 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50332 8 2 0 1 96 1711 4983 570 570 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50333 8 2 0 1 96 1711 4983 570 570 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50334 6 2 0 1 96 2852 2677 570 570 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50335 6 2 0 1 96 2852 2677 570 570 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50336 6 2 0 1 96 2852 2677 570 570 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50337 16 4 0 1 96 2281 3446 570 570 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50338 16 4 0 1 96 2281 3446 570 570 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50339 16 4 0 1 96 2281 3446 570 570 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50340 3 2 0 2 96 1882 5751 570 570 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50341 3 2 0 2 96 1882 5751 570 570 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50342 3 2 0 2 96 1882 5751 570 570 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50343 8 2 0 1 96 1744 5189 581 581 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50344 8 2 0 1 96 1744 5189 581 581 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50345 8 2 0 1 96 1744 5189 581 581 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50346 6 2 0 1 96 2908 2773 581 581 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50347 6 2 0 1 96 2908 2773 581 581 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50348 6 2 0 1 96 2908 2773 581 581 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50349 16 4 0 1 96 2326 3579 581 581 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50350 16 4 0 1 96 2326 3579 581 581 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50351 16 4 0 1 96 2326 3579 581 581 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50352 15 4 0 2 96 1919 5994 581 581 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50353 15 4 0 2 96 1919 5994 581 581 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50354 15 4 0 2 96 1919 5994 581 581 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50355 8 2 0 1 96 1778 5396 592 592 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50356 8 2 0 1 96 1778 5396 592 592 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50357 8 2 0 1 96 1778 5396 592 592 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50358 2 3 0 1 96 2964 2869 592 592 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50359 2 3 0 1 96 2964 2869 592 592 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50360 2 3 0 1 96 2964 2869 592 592 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50361 4 3 0 2 96 1956 6238 592 592 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null -50362 4 3 0 2 96 1956 6238 592 592 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null -50363 4 3 0 2 96 1956 6238 592 592 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null +50331 8 2 0 1 97 1711 4983 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50332 8 2 0 1 97 1711 4983 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50333 8 2 0 1 97 1711 4983 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50334 6 2 0 1 97 2852 2677 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50335 6 2 0 1 97 2852 2677 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50336 6 2 0 1 97 2852 2677 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50337 16 4 0 1 97 2281 3446 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50338 16 4 0 1 97 2281 3446 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50339 16 4 0 1 97 2281 3446 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50340 3 2 0 2 97 1882 5751 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50341 3 2 0 2 97 1882 5751 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50342 3 2 0 2 97 1882 5751 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50343 8 2 0 1 98 1744 5189 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50344 8 2 0 1 98 1744 5189 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50345 8 2 0 1 98 1744 5189 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50346 6 2 0 1 98 2908 2773 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50347 6 2 0 1 98 2908 2773 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50348 6 2 0 1 98 2908 2773 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50349 16 4 0 1 98 2326 3579 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50350 16 4 0 1 98 2326 3579 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50351 16 4 0 1 98 2326 3579 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50352 15 4 0 2 98 1919 5994 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50353 15 4 0 2 98 1919 5994 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50354 15 4 0 2 98 1919 5994 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50355 8 2 0 1 99 1778 5396 592 592 2180 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50356 8 2 0 1 99 1778 5396 592 592 872 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50357 8 2 0 1 99 1778 5396 592 592 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50358 2 3 0 1 99 2964 2869 592 592 2180 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50359 2 3 0 1 99 2964 2869 592 592 872 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50360 2 3 0 1 99 2964 2869 592 592 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50361 4 3 0 2 99 1956 6238 592 592 2180 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null +50362 4 3 0 2 99 1956 6238 592 592 872 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null +50363 4 3 0 2 99 1956 6238 592 592 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null 50364 1 2 0 1 100 1811 5602 603 603 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50365 1 2 0 1 100 1811 5602 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50366 1 2 0 1 100 1811 5602 603 603 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null @@ -674,24 +675,24 @@ int int int int int int int int int int int float float float float int float mu 50394 10004 1 0 3 100 2734 5377 569 569 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null 50395 10004 1 0 3 100 2734 5377 569 569 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null 50396 10004 1 0 3 100 2734 5377 569 569 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null -50397 23 1 0 1 100 1696 5925 565 565 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50398 23 1 0 1 100 1696 5925 565 565 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50399 23 1 0 1 100 1696 5925 565 565 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50400 10047 3 0 1 100 1696 5925 565 565 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50401 10047 3 0 1 100 1696 5925 565 565 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50402 10047 3 0 1 100 1696 5925 565 565 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50403 10012 1 0 3 100 2035 8322 565 565 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null -50404 10012 1 0 3 100 2035 8322 565 565 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null -50405 10012 1 0 3 100 2035 8322 565 565 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null -50406 23 1 0 1 100 1722 5955 574 574 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50407 23 1 0 1 100 1722 5955 574 574 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50408 23 1 0 1 100 1722 5955 574 574 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50409 10049 3 0 1 100 1722 5955 574 574 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50410 10049 3 0 1 100 1722 5955 574 574 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50411 10049 3 0 1 100 1722 5955 574 574 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50412 10007 1 0 3 100 2755 5475 574 574 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null -50413 10007 1 0 3 100 2755 5475 574 574 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null -50414 10007 1 0 3 100 2755 5475 574 574 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null +50397 23 1 0 1 101 1696 5925 565 565 2220 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50398 23 1 0 1 101 1696 5925 565 565 888 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50399 23 1 0 1 101 1696 5925 565 565 88 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50400 10047 3 0 1 101 1696 5925 565 565 2220 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50401 10047 3 0 1 101 1696 5925 565 565 888 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50402 10047 3 0 1 101 1696 5925 565 565 88 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50403 10012 1 0 3 101 2035 8322 565 565 2220 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null +50404 10012 1 0 3 101 2035 8322 565 565 888 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null +50405 10012 1 0 3 101 2035 8322 565 565 88 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null +50406 23 1 0 1 104 1722 5955 574 574 2280 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50407 23 1 0 1 104 1722 5955 574 574 912 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50408 23 1 0 1 104 1722 5955 574 574 91 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50409 10049 3 0 1 104 1722 5955 574 574 2280 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50410 10049 3 0 1 104 1722 5955 574 574 912 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50411 10049 3 0 1 104 1722 5955 574 574 91 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50412 10007 1 0 3 104 2755 5475 574 574 2280 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null +50413 10007 1 0 3 104 2755 5475 574 574 912 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null +50414 10007 1 0 3 104 2755 5475 574 574 91 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null 50415 10051 2 0 1 108 1748 5986 582 582 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null 50416 10051 2 0 1 108 1748 5986 582 582 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null 50417 10051 2 0 1 108 1748 5986 582 582 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null @@ -728,30 +729,30 @@ int int int int int int int int int int int float float float float int float mu 50448 24 2 0 1 108 3596 3592 719 719 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50449 24 2 0 1 108 3596 3592 719 719 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50450 24 2 0 1 108 3596 3592 719 719 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50451 15 4 0 1 108 2273 7047 757 757 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50452 15 4 0 1 108 2273 7047 757 757 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50453 15 4 0 1 108 2273 7047 757 757 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50454 24 2 0 1 108 3788 3728 757 757 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50455 24 2 0 1 108 3788 3728 757 757 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50456 24 2 0 1 108 3788 3728 757 757 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50457 36 2 0 2 108 2500 8154 757 757 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50458 36 2 0 2 108 2500 8154 757 757 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50459 36 2 0 2 108 2500 8154 757 757 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50460 17 4 0 2 108 4167 4170 757 757 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50461 17 4 0 2 108 4167 4170 757 757 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50462 17 4 0 2 108 4167 4170 757 757 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50463 8 2 0 1 108 2299 7078 766 766 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50464 8 2 0 1 108 2299 7078 766 766 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50465 8 2 0 1 108 2299 7078 766 766 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50466 15 4 0 1 108 2299 7078 766 766 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50467 15 4 0 1 108 2299 7078 766 766 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50468 15 4 0 1 108 2299 7078 766 766 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50469 24 2 0 1 108 3831 3750 766 766 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50470 24 2 0 1 108 3831 3750 766 766 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50471 24 2 0 1 108 3831 3750 766 766 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50472 3 2 0 1 108 2299 7078 766 766 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50473 3 2 0 1 108 2299 7078 766 766 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50474 3 2 0 1 108 2299 7078 766 766 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50451 15 4 0 1 110 2273 7047 757 757 2400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50452 15 4 0 1 110 2273 7047 757 757 960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50453 15 4 0 1 110 2273 7047 757 757 95 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50454 24 2 0 1 110 3788 3728 757 757 2400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50455 24 2 0 1 110 3788 3728 757 757 960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50456 24 2 0 1 110 3788 3728 757 757 95 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50457 36 2 0 2 110 2500 8154 757 757 2400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50458 36 2 0 2 110 2500 8154 757 757 960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50459 36 2 0 2 110 2500 8154 757 757 95 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50460 17 4 0 2 110 4167 4170 757 757 2400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50461 17 4 0 2 110 4167 4170 757 757 960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50462 17 4 0 2 110 4167 4170 757 757 95 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50463 8 2 0 1 115 2299 7078 766 766 2500 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50464 8 2 0 1 115 2299 7078 766 766 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50465 8 2 0 1 115 2299 7078 766 766 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50466 15 4 0 1 115 2299 7078 766 766 2500 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50467 15 4 0 1 115 2299 7078 766 766 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50468 15 4 0 1 115 2299 7078 766 766 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50469 24 2 0 1 115 3831 3750 766 766 2500 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50470 24 2 0 1 115 3831 3750 766 766 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50471 24 2 0 1 115 3831 3750 766 766 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50472 3 2 0 1 115 2299 7078 766 766 2500 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50473 3 2 0 1 115 2299 7078 766 766 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50474 3 2 0 1 115 2299 7078 766 766 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 50475 8 2 0 1 120 2325 7108 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 50476 8 2 0 1 120 2325 7108 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 50477 8 2 0 1 120 2325 7108 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 63c143c89..f766761a7 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -1,6 +1,7 @@ Id Contents Rewardgroup int mut,int#int,2 mut,int#int,1 10001 50001#50002 10001 +100001 10001 null 10101 1#2#3 10101#20101 10102 4#5#6 10102#20102 10103 7#8#9 10103#20103 diff --git a/conf/server/MonsterViewConfig.txt b/conf/server/MonsterViewConfig.txt index 673eeae03..fd9068246 100644 --- a/conf/server/MonsterViewConfig.txt +++ b/conf/server/MonsterViewConfig.txt @@ -44,3 +44,4 @@ int 42 43 44 +45 diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index c26f53b64..0a8c3aa49 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -29,58 +29,58 @@ int int mut,int#int,1 int int 511 2 20002#20004#20019#20022 1 0 512 2 20023#20024#20025#20026#20027#20028#20029#20030#20031#20032#20033#20034#20035#20036#20037#20038#20039#20040#20041#20042#20043#20044#20045#20046 1 0 513 2 20001#20002#20003#20004#20005#20006#20007#20008#20009#20010#20011#20012#20013#20014#20015#20016#20017#20018#20019#20020#20021#20022 1 0 -701 1 20001 1 0 -702 1 20002 1 0 -703 1 20003 1 0 -704 1 20004 1 0 -705 1 20005 1 0 -706 1 20006 1 0 -707 1 20007 1 0 -708 1 20008 1 0 -709 1 20009 1 0 -710 1 20010 1 0 -711 1 20011 1 0 -712 1 20012 1 0 -713 1 20013 1 0 -714 1 20014 1 0 -715 1 20015 1 0 -716 1 20016 1 0 -717 1 20017 1 0 -718 1 20018 1 0 -719 1 20019 1 0 -720 1 20020 1 0 -721 1 20021 1 0 -722 1 20022 1 0 -723 1 20023 1 0 -724 1 20024 1 0 -725 1 20025 1 0 -726 1 20026 1 0 -727 1 20027 1 0 -728 1 20028 1 0 -729 1 20029 1 0 -730 1 20030 1 0 -731 1 20031 1 0 -732 1 20032 1 0 -733 1 20033 1 0 -734 1 20034 1 0 -735 1 20035 1 0 -736 1 20036 1 0 -737 1 20037 1 0 -738 1 20038 1 0 -739 1 20039 1 0 -740 1 20040 1 0 -741 1 20041 1 0 -742 1 20042 1 0 -743 1 20043 1 0 -744 1 20044 1 0 -745 1 20045 1 0 -746 1 20046 1 0 -747 1 20047 1 0 -748 1 20048 1 0 -749 1 20049 1 0 -750 1 20050 1 0 -751 1 20051 1 0 -752 1 20052 1 0 +701 1 60001 1 0 +702 1 60002 1 0 +703 1 60003 1 0 +704 1 60004 1 0 +705 1 60005 1 0 +706 1 60006 1 0 +707 1 60007 1 0 +708 1 60008 1 0 +709 1 60009 1 0 +710 1 60010 1 0 +711 1 60011 1 0 +712 1 60012 1 0 +713 1 60013 1 0 +714 1 60014 1 0 +715 1 60015 1 0 +716 1 60016 1 0 +717 1 60017 1 0 +718 1 60018 1 0 +719 1 60019 1 0 +720 1 60020 1 0 +721 1 60021 1 0 +722 1 60022 1 0 +723 1 60023 1 0 +724 1 60024 1 0 +725 1 60025 1 0 +726 1 60026 1 0 +727 1 60027 1 0 +728 1 60028 1 0 +729 1 60029 1 0 +730 1 60030 1 0 +731 1 60031 1 0 +732 1 60032 1 0 +733 1 60033 1 0 +734 1 60034 1 0 +735 1 60035 1 0 +736 1 60036 1 0 +737 1 60037 1 0 +738 1 60038 1 0 +739 1 60039 1 0 +740 1 60040 1 0 +741 1 60041 1 0 +742 1 60042 1 0 +743 1 60043 1 0 +744 1 60044 1 0 +745 1 60045 1 0 +746 1 60046 1 0 +747 1 60047 1 0 +748 1 60048 1 0 +749 1 60049 1 0 +750 1 60050 1 0 +751 1 60051 1 0 +752 1 60052 1 0 1001 1 10001 1 0 1002 1 10002 1 0 1003 1 10003 1 0 @@ -201,7 +201,7 @@ int int mut,int#int,1 int int 2025 1 6068#6069#6070#6007#6008 5 0 3001 1 22001#21001 5 0 3002 1 22002#21002 5 0 -3003 1 22003#21003 5 0 +3003 1 22003#21003#20900 5 0 3004 1 22004#21004 5 0 3005 1 22005#21005 5 0 3006 1 22006#21006 5 0 @@ -249,56 +249,56 @@ int int mut,int#int,1 int int 3048 1 22048#21048 5 0 3049 1 22049#21049 5 0 3050 1 22050#21050 5 0 -4001 2 20000#20001 5 0 -4002 2 20000#20002 5 0 -4003 2 20000#20003 5 0 -4004 2 20000#20004 5 0 -4005 2 20000#20005 5 0 -4006 2 20000#20006 5 0 -4007 2 20000#20007 5 0 -4008 2 20000#20008 5 0 -4009 2 20000#20009 5 0 -4010 2 20000#20010 5 0 -4011 2 20000#20011 5 0 -4012 2 20000#20012 5 0 -4013 2 20000#20013 5 0 -4014 2 20000#20014 5 0 -4015 2 20000#20015 5 0 -4016 2 20000#20016 5 0 -4017 2 20000#20017 5 0 -4018 2 20000#20018 5 0 -4019 2 20000#20019 5 0 -4020 2 20000#20020 5 0 -4021 2 20000#20021 5 0 -4022 2 20000#20022 5 0 -4023 2 20000#20023 5 0 -4024 2 20000#20024 5 0 -4025 2 20000#20025 5 0 -4026 2 20000#20026 5 0 -4027 2 20000#20027 5 0 -4028 2 20000#20028 5 0 -4029 2 20000#20029 5 0 -4030 2 20000#20030 5 0 -4031 2 20000#20031 5 0 -4032 2 20000#20032 5 0 -4033 2 20000#20033 5 0 -4034 2 20000#20034 5 0 -4035 2 20000#20035 5 0 -4036 2 20000#20036 5 0 -4037 2 20000#20037 5 0 -4038 2 20000#20038 5 0 -4039 2 20000#20039 5 0 -4040 2 20000#20040 5 0 -4041 2 20000#20041 5 0 -4042 2 20000#20042 5 0 -4043 2 20000#20043 5 0 -4044 2 20000#20044 5 0 -4045 2 20000#20045 5 0 -4046 2 20000#20046 5 0 -4047 2 20000#20047 5 0 -4048 2 20000#20048 5 0 -4049 2 20000#20049 5 0 -4050 2 20000#20050 5 0 +4001 2 20000#20001 1 0 +4002 2 20000#20002 1 0 +4003 2 20000#20003 1 0 +4004 2 20000#20004 1 0 +4005 2 20000#20005 1 0 +4006 2 20000#20006 1 0 +4007 2 20000#20007 1 0 +4008 2 20000#20008 1 0 +4009 2 20000#20009 1 0 +4010 2 20000#20010 1 0 +4011 2 20000#20011 1 0 +4012 2 20000#20012 1 0 +4013 2 20000#20013 1 0 +4014 2 20000#20014 1 0 +4015 2 20000#20015 1 0 +4016 2 20000#20016 1 0 +4017 2 20000#20017 1 0 +4018 2 20000#20018 1 0 +4019 2 20000#20019 1 0 +4020 2 20000#20020 1 0 +4021 2 20000#20021 1 0 +4022 2 20000#20022 1 0 +4023 2 20000#20023 1 0 +4024 2 20000#20024 1 0 +4025 2 20000#20025 1 0 +4026 2 20000#20026 1 0 +4027 2 20000#20027 1 0 +4028 2 20000#20028 1 0 +4029 2 20000#20029 1 0 +4030 2 20000#20030 1 0 +4031 2 20000#20031 1 0 +4032 2 20000#20032 1 0 +4033 2 20000#20033 1 0 +4034 2 20000#20034 1 0 +4035 2 20000#20035 1 0 +4036 2 20000#20036 1 0 +4037 2 20000#20037 1 0 +4038 2 20000#20038 1 0 +4039 2 20000#20039 1 0 +4040 2 20000#20040 1 0 +4041 2 20000#20041 1 0 +4042 2 20000#20042 1 0 +4043 2 20000#20043 1 0 +4044 2 20000#20044 1 0 +4045 2 20000#20045 1 0 +4046 2 20000#20046 1 0 +4047 2 20000#20047 1 0 +4048 2 20000#20048 1 0 +4049 2 20000#20049 1 0 +4050 2 20000#20050 1 0 10001 1 1000 1 0 10101 1 1000#2000 2 0 10102 1 1001#2001 2 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index ab983e0cd..1f5e3eae8 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -73,7 +73,7 @@ int int int float int int 416 3316 100 1.0 1 1 417 3317 100 1.0 1 1 418 3318 100 1.0 1 1 -600 3001 10200 1.0 0 0 +600 3001 1 1.0 0 0 1000 3 100 1.0 18 22 1001 3 100 1.0 14 17 1002 3 100 1.0 14 17 @@ -380,57 +380,58 @@ int int int float int int 10322 1002 100 1.0 0 0 10323 1002 100 1.0 0 0 11001 1002 900 1.0 0 0 -20000 10024 40 1.0 1 1 -20001 10024 60 1.0 1 1 -20002 10025 60 1.0 1 1 -20003 10026 60 1.0 1 1 -20004 10027 60 1.0 1 1 -20005 10028 60 1.0 1 1 -20006 10029 60 1.0 1 1 -20007 10030 60 1.0 1 1 -20008 10031 60 1.0 1 1 -20009 10032 60 1.0 1 1 -20010 10033 60 1.0 1 1 -20011 10034 60 1.0 1 1 -20012 10035 60 1.0 1 1 -20013 10036 60 1.0 1 1 -20014 10037 60 1.0 1 1 -20015 10038 60 1.0 1 1 -20016 10039 60 1.0 1 1 -20017 10040 60 1.0 1 1 -20018 10041 60 1.0 1 1 -20019 10042 60 1.0 1 1 -20020 10043 60 1.0 1 1 -20021 10044 60 1.0 1 1 -20022 10045 60 1.0 1 1 -20023 10046 60 1.0 1 1 -20024 10002 60 1.0 1 1 -20025 10003 60 1.0 1 1 -20026 10005 60 1.0 1 1 -20027 10006 60 1.0 1 1 -20028 10007 60 1.0 1 1 -20029 10009 60 1.0 1 1 -20030 10010 60 1.0 1 1 -20031 10011 60 1.0 1 1 -20032 10013 60 1.0 1 1 -20033 10019 60 1.0 1 1 -20034 10020 60 1.0 1 1 -20035 10021 60 1.0 1 1 -20036 10022 60 1.0 1 1 -20037 10002 60 1.0 1 1 -20038 10003 60 1.0 1 1 -20039 10005 60 1.0 1 1 -20040 10006 60 1.0 1 1 -20041 10007 60 1.0 1 1 -20042 10009 60 1.0 1 1 -20043 10010 60 1.0 1 1 -20044 10011 60 1.0 1 1 -20045 10013 60 1.0 1 1 -20046 10019 60 1.0 1 1 -20047 10020 60 1.0 1 1 -20048 10021 60 1.0 1 1 -20049 10022 60 1.0 1 1 -20050 10002 60 1.0 1 1 +20000 11024 40 1.0 0 0 +20001 11024 60 1.0 1 1 +20002 11025 60 1.0 1 1 +20003 11026 60 1.0 1 1 +20004 11027 60 1.0 1 1 +20005 11028 60 1.0 1 1 +20006 11029 60 1.0 1 1 +20007 11030 60 1.0 1 1 +20008 11031 60 1.0 1 1 +20009 11032 60 1.0 1 1 +20010 11033 60 1.0 1 1 +20011 11034 60 1.0 1 1 +20012 11035 60 1.0 1 1 +20013 11036 60 1.0 1 1 +20014 11037 60 1.0 1 1 +20015 11038 60 1.0 1 1 +20016 11039 60 1.0 1 1 +20017 11040 60 1.0 1 1 +20018 11041 60 1.0 1 1 +20019 11042 60 1.0 1 1 +20020 11043 60 1.0 1 1 +20021 11044 60 1.0 1 1 +20022 11045 60 1.0 1 1 +20023 11046 60 1.0 1 1 +20024 11002 60 1.0 1 1 +20025 11003 60 1.0 1 1 +20026 11005 60 1.0 1 1 +20027 11006 60 1.0 1 1 +20028 11007 60 1.0 1 1 +20029 11009 60 1.0 1 1 +20030 11010 60 1.0 1 1 +20031 11011 60 1.0 1 1 +20032 11013 60 1.0 1 1 +20033 11019 60 1.0 1 1 +20034 11020 60 1.0 1 1 +20035 11021 60 1.0 1 1 +20036 11022 60 1.0 1 1 +20037 11002 60 1.0 1 1 +20038 11003 60 1.0 1 1 +20039 11005 60 1.0 1 1 +20040 11006 60 1.0 1 1 +20041 11007 60 1.0 1 1 +20042 11009 60 1.0 1 1 +20043 11010 60 1.0 1 1 +20044 11011 60 1.0 1 1 +20045 11013 60 1.0 1 1 +20046 11019 60 1.0 1 1 +20047 11020 60 1.0 1 1 +20048 11021 60 1.0 1 1 +20049 11022 60 1.0 1 1 +20050 11002 60 1.0 1 1 +20900 10024 60 1.0 1 1 21001 14 100 1.0 130 130 21002 14 100 1.0 150 150 21003 14 100 1.0 170 170 @@ -768,58 +769,58 @@ int int int float int int 52004 12013 100 1.0 2 2 52005 12013 100 1.0 2 4 52006 12013 100 1.0 5 5 -20001 10001 100 1.0 1 1 -20002 10002 100 1.0 1 1 -20003 10003 100 1.0 1 1 -20004 10004 100 1.0 1 1 -20005 10005 100 1.0 1 1 -20006 10006 100 1.0 1 1 -20007 10007 100 1.0 1 1 -20008 10008 100 1.0 1 1 -20009 10009 100 1.0 1 1 -20010 10010 100 1.0 1 1 -20011 10011 100 1.0 1 1 -20012 10012 100 1.0 1 1 -20013 10013 100 1.0 1 1 -20014 10014 100 1.0 1 1 -20015 10015 100 1.0 1 1 -20016 10016 100 1.0 1 1 -20017 10017 100 1.0 1 1 -20018 10018 100 1.0 1 1 -20019 10019 100 1.0 1 1 -20020 10020 100 1.0 1 1 -20021 10021 100 1.0 1 1 -20022 10022 100 1.0 1 1 -20023 10023 100 1.0 1 1 -20024 10024 100 1.0 1 1 -20025 10025 100 1.0 1 1 -20026 10026 100 1.0 1 1 -20027 10027 100 1.0 1 1 -20028 10028 100 1.0 1 1 -20029 10029 100 1.0 1 1 -20030 10030 100 1.0 1 1 -20031 10031 100 1.0 1 1 -20032 10032 100 1.0 1 1 -20033 10033 100 1.0 1 1 -20034 10034 100 1.0 1 1 -20035 10035 100 1.0 1 1 -20036 10036 100 1.0 1 1 -20037 10037 100 1.0 1 1 -20038 10038 100 1.0 1 1 -20039 10039 100 1.0 1 1 -20040 10040 100 1.0 1 1 -20041 10041 100 1.0 1 1 -20042 10042 100 1.0 1 1 -20043 10043 100 1.0 1 1 -20044 10044 100 1.0 1 1 -20045 10045 100 1.0 1 1 -20046 10046 100 1.0 1 1 -20047 10047 100 1.0 1 1 -20048 10048 100 1.0 1 1 -20049 10049 100 1.0 1 1 -20050 10050 100 1.0 1 1 -20051 10051 100 1.0 1 1 -20052 10052 100 1.0 1 1 +60001 10001 100 1.0 1 1 +60002 10002 100 1.0 1 1 +60003 10003 100 1.0 1 1 +60004 10004 100 1.0 1 1 +60005 10005 100 1.0 1 1 +60006 10006 100 1.0 1 1 +60007 10007 100 1.0 1 1 +60008 10008 100 1.0 1 1 +60009 10009 100 1.0 1 1 +60010 10010 100 1.0 1 1 +60011 10011 100 1.0 1 1 +60012 10012 100 1.0 1 1 +60013 10013 100 1.0 1 1 +60014 10014 100 1.0 1 1 +60015 10015 100 1.0 1 1 +60016 10016 100 1.0 1 1 +60017 10017 100 1.0 1 1 +60018 10018 100 1.0 1 1 +60019 10019 100 1.0 1 1 +60020 10020 100 1.0 1 1 +60021 10021 100 1.0 1 1 +60022 10022 100 1.0 1 1 +60023 10023 100 1.0 1 1 +60024 10024 100 1.0 1 1 +60025 10025 100 1.0 1 1 +60026 10026 100 1.0 1 1 +60027 10027 100 1.0 1 1 +60028 10028 100 1.0 1 1 +60029 10029 100 1.0 1 1 +60030 10030 100 1.0 1 1 +60031 10031 100 1.0 1 1 +60032 10032 100 1.0 1 1 +60033 10033 100 1.0 1 1 +60034 10034 100 1.0 1 1 +60035 10035 100 1.0 1 1 +60036 10036 100 1.0 1 1 +60037 10037 100 1.0 1 1 +60038 10038 100 1.0 1 1 +60039 10039 100 1.0 1 1 +60040 10040 100 1.0 1 1 +60041 10041 100 1.0 1 1 +60042 10042 100 1.0 1 1 +60043 10043 100 1.0 1 1 +60044 10044 100 1.0 1 1 +60045 10045 100 1.0 1 1 +60046 10046 100 1.0 1 1 +60047 10047 100 1.0 1 1 +60048 10048 100 1.0 1 1 +60049 10049 100 1.0 1 1 +60050 10050 100 1.0 1 1 +60051 10051 100 1.0 1 1 +60052 10052 100 1.0 1 1 100001 14 100 1.0 1000 1000 100002 14 100 1.0 2000 2000 100003 14 100 1.0 4000 4000 diff --git a/conf/server/SkillLogicConfig.txt b/conf/server/SkillLogicConfig.txt index b2081dbbf..d7f8ffd82 100644 --- a/conf/server/SkillLogicConfig.txt +++ b/conf/server/SkillLogicConfig.txt @@ -1,5 +1,7 @@ Id Target Effect EffectValue CD int mut,float#float,2 mut,int#int,2 mut,float#float,2 float +1000001 40001#0.7 1#13 0.75#1|3#0.1#1#5 0.0 +1000002 20000#0.7 2#3 0.5#2|1#1#2 0.0 1000111 40001#0.7|30011#0.7 1|3#4#4 1.08#1|1#3#10|2#0.3#3#1|3#0.3#3#1 0.0 1000112 40001#0.7|30011#0.7 1|3#4#4 1.08#1|1#3#10|2#0.3#3#1|3#0.3#3#1 0.0 1000113 40001#0.7|30011#0.7 1|3#4#4 1.08#1|1#3#10|2#0.3#3#1|3#0.3#3#1 0.0 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java index b21b74228..5ae65b13f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java @@ -30,6 +30,8 @@ public class SGameSetting implements BaseConfig { private int[] bornPosition; + private int adventureRefresh; + private static SGameSetting gameSetting; @@ -100,4 +102,8 @@ public class SGameSetting implements BaseConfig { public int getWorldTalking() { return worldTalking; } + + public int getAdventureRefresh() { + return adventureRefresh; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/CrossInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/CrossInfo.java new file mode 100644 index 000000000..47b7fb079 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/CrossInfo.java @@ -0,0 +1,37 @@ +package com.ljsd.jieling.handler.map; + +import java.util.Set; + +public class CrossInfo { + + private Set stars; + + private int leastTime; + + private long sendRewardTime; + + + public Set getStars() { + return stars; + } + + public void setStars(Set stars) { + this.stars = stars; + } + + public int getLeastTime() { + return leastTime; + } + + public void setLeastTime(int leastTime) { + this.leastTime = leastTime; + } + + public long getSendRewardTime() { + return sendRewardTime; + } + + public void setSendRewardTime(long sendRewardTime) { + this.sendRewardTime = sendRewardTime; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 4503bbd19..e80a3855b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -72,6 +72,12 @@ public class MapLogic { MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), ""); return; } + if (mapManager.getCurMapId() > 0) { + int leftTime = getLeftTime(user); + if (leftTime == 0) { + resetMapInfo(user, true); + } + } // 初始序章地图 if (user.getPlayerInfoManager().getMapId() == 0) { String error = initTeamInfo(teamId, uid, user, mapManager); @@ -105,19 +111,20 @@ public class MapLogic { MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "该地图不存在"); return; } -// if (scMapConfig == null || scMapConfig.getOpenRule() == null || scMapConfig.getOpenRule().length == 0) { -// LOGGER.info("enterMap() uid=>{} mapId=>{}, scMapConfig.getOpenRule()=>{}", uid, mapId, scMapConfig == null ? "" : scMapConfig.getOpenRule()); -// MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), ""); -// return; -// } -// int missionId = scMapConfig.getOpenRule()[0]; -// if (!user.getMissionManager().getTakeRewardMissions().contains(missionId)) { -// Mission mission = user.getMissionManager().getDoingMissions().get(missionId); -// if (mission == null || mission.getMissionStep() < scMapConfig.getOpenRule()[1]) { -// LOGGER.info("enterMap() uid=>{} map not open == missionId =>{} step=>{}", uid, missionId, mission == null ? 0 : mission.getMissionStep()); -// MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "需要完成任务:" + (scMapConfig == null ? "" : scMapConfig.getOpenRule()[0] + "#" + scMapConfig.getOpenRule()[1])); + // TODO 可进入地图条件判断 +// int[][] openRule = sChallengeConfig.getOpenRule(); +// if (openRule != null && openRule.length > 0) { +// if (user.getPlayerInfoManager().getLevel() < openRule[0][1]) { +// MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "需要等级:" + openRule[0][1]); // return; // } +// LevelDifficulty levelDifficulty = user.getLevelDifficultyManager().getLevelDifficultyInfosMap().get(openRule[0][0]); +// if (levelDifficulty == null && levelDifficulty.getState() != 4) { +// if (user.getPlayerInfoManager().getLevel() < openRule[0][1]) { +// MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "需要通关:" + openRule[0][0]); +// return; +// } +// } // } if (user.getPlayerInfoManager().getMapId() < mapId) { user.getPlayerInfoManager().setMapId(mapId); @@ -168,12 +175,16 @@ public class MapLogic { mapEnterResponse.setTemporaryItems(CBean2Proto.getDrop(mapManager.getTemporaryItems())); } MapMission mapMissionProgres = mapManager.getMapMissionProgres(); - Map allMissionProgress = mapMissionProgres.getAllMissionProgress(); - List exploreDetailList = new ArrayList<>(allMissionProgress.size()); - for(Map.Entry item : allMissionProgress.entrySet()){ - exploreDetailList.add(CommonProto.ExploreDetail.newBuilder().setId(item.getKey()).setProgress(item.getValue()).build()); + if (mapMissionProgres != null) { + Map allMissionProgress = mapMissionProgres.getAllMissionProgress(); + List exploreDetailList = new ArrayList<>(allMissionProgress.size()); + for(Map.Entry item : allMissionProgress.entrySet()){ + exploreDetailList.add(CommonProto.ExploreDetail.newBuilder().setId(item.getKey()).setProgress(item.getValue()).build()); + } + mapEnterResponse.addAllExploreDetail(exploreDetailList); + }else{ + LOGGER.error("the curmap={}",mapManager.getCurMapId()); } - mapEnterResponse.addAllExploreDetail(exploreDetailList); MessageUtil.sendMessage(iSession, 1, messageType.getNumber(), mapEnterResponse.build(), true); } @@ -263,6 +274,7 @@ public class MapLogic { Mission mission = new Mission(); mission.setMissionId(challengeMapConfig.getMissionId()); mission.setMissionStep(0); + mission.setTime(0); mapManager.setMission(mission); mapManager.setMapInfo(newMap); mapManager.setTypeEight(spicelMap); @@ -307,6 +319,13 @@ public class MapLogic { MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); return; } + if (mapManager.getCanMoveTime() > 0) { + long leftTime = mapManager.getCanMoveTime() - TimeUtils.now(); + if (leftTime > 0) { + MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "英雄 " + (leftTime / 1000) + " 秒后复活"); + return; + } + } if (mapManager.getStartExporeTime() == 0) { LOGGER.info("mapManager.getStartExporeTime() == 0"); MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "未开始探索"); @@ -338,6 +357,7 @@ public class MapLogic { .setEventId(cell.getEventId()) .setLeftTime(getLeftTime(user)) .build(); + LOGGER.info("enterMap() uid=>{} mapId =>{} ", uid, mapManager.getCurMapId()); MessageUtil.sendMessage(session, 1, messageType.getNumber(), mapUpdateResponse, true); } @@ -362,6 +382,13 @@ public class MapLogic { MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "未开始探索"); return; } + if (mapManager.getCanMoveTime() > 0) { + long leftTime = mapManager.getCanMoveTime() - TimeUtils.now(); + if (leftTime > 0) { + MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "英雄 " + (leftTime / 1000) + " 秒后复活"); + return; + } + } Cell cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); if (cell == null) { LOGGER.info("cell == null xy is wrong =>{} triggerXY=>{}", mapManager.getCurXY(), mapManager.getTriggerXY()); @@ -661,6 +688,7 @@ public class MapLogic { .setItemId(mission.getMissionId()) .setMissionStep(mission.getMissionStep()) .setState("") + .setTime(mission.getTime()) .build(); return openMission; } @@ -694,6 +722,8 @@ public class MapLogic { mapManager.setCurMapId(0); mapManager.setStartExporeTime(0); mapManager.setTriggerXY(0); + mapManager.setDieCount(0); + mapManager.setCanMoveTime(0); mapManager.setFoodBufferMap(new HashMap<>()); TemporaryItems temporaryItems = mapManager.getTemporaryItems(); mapManager.setMission(null); @@ -717,6 +747,13 @@ public class MapLogic { MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); return; } + if (mapManager.getCanMoveTime() > 0) { + long leftTime = mapManager.getCanMoveTime() - TimeUtils.now(); + if (leftTime > 0) { + MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "英雄 " + (leftTime / 1000) + " 秒后复活"); + return; + } + } Cell cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); if (cell == null) { cell = mapManager.getMapInfo().get(mapManager.getCurXY()); @@ -782,6 +819,14 @@ public class MapLogic { MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "此战斗已结算过!"); return; } + MapManager mapManager = user.getMapManager(); + if (user.getMapManager().getCanMoveTime() > 0) { + long leftTime = user.getMapManager().getCanMoveTime() - TimeUtils.now(); + if (leftTime > 0) { + MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "英雄 " + (leftTime / 1000) + " 秒后复活"); + return; + } + } int seed = Integer.parseInt((String)valueMap.get(RedisKey.FIGHT_SEED)); int monsterGroupId = Integer.parseInt((String)valueMap.get(RedisKey.FIGHT_GROUPID)); CommonProto.FightTeamInfo.Builder builder = CommonProto.FightTeamInfo.newBuilder(); @@ -813,8 +858,29 @@ public class MapLogic { MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "战斗异常!"); return; }else if(resultCode == 0){ - // 失败处理 -// resetMapInfo(user,true); + // 失败需要等待n秒后复活所有英雄 + int dieCount = user.getMapManager().getDieCount(); + dieCount++; + user.getMapManager().setDieCount(dieCount); + SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId()); + int[] reviveTime = sChallengeConfig.getReviveTime(); + long time = (long) (MathUtils.calABX(dieCount, reviveTime) * 1000); + user.getMapManager().setCanMoveTime(TimeUtils.now() + time); + int leftTime = getLeftTime(user); + if (leftTime <= (int) (time / 1000)) { + resetMapInfo(user, false); + } else { + List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId()); + for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) { + Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); + if (hero == null) { + continue; + } + Map heroAttributeMap = HeroLogic.getInstance().calHeroFinalAttribute(user, hero); + hero.setCurHp(heroAttributeMap.get(HeroAttributeEnum.Hp.getPropertyId())); + hero.setSpeed(heroAttributeMap.get(HeroAttributeEnum.Speed.getPropertyId())); + } + } CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse .newBuilder() @@ -826,7 +892,7 @@ public class MapLogic { return; } - int teamId = user.getMapManager().getTeamId(); + int teamId = mapManager.getTeamId(); List team = user.getTeamPosManager().getTeamPosForHero().get(teamId); for (TeamPosHeroInfo teamPosHeroInfo : team){ Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); @@ -848,22 +914,22 @@ public class MapLogic { fightEndResponse.setMission(eventUpdateResponse.getMission()); } if (destoryId != 0) { - BehaviorUtil.destoryPoint(user, user.getMapManager().getCurMapId(), destoryId); + BehaviorUtil.destoryPoint(user, mapManager.getCurMapId(), destoryId); } if (destoryXY != 0) { BehaviorUtil.destoryApointXY(user, destoryXY); } if (nextEventId != 0) { - int triggerXY = user.getMapManager().getTriggerXY(); - Cell cell = user.getMapManager().getMapInfo().get(triggerXY); + int triggerXY = mapManager.getTriggerXY(); + Cell cell = mapManager.getMapInfo().get(triggerXY); if (cell != null) { cell.setEventId(nextEventId); - user.getMapManager().addOrUpdateCell(triggerXY, cell); - updateMapMission(user.getMapManager(),EventType.updateEvent,cell.getEventId(),0); + mapManager.addOrUpdateCell(triggerXY, cell); + updateMapMission(mapManager,EventType.updateEvent,cell.getEventId(),0); } } LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId); - updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId); + updateMapMission(mapManager,EventType.fightEvent,0,monsterGroupId); // LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} drop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getDrop()); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); } @@ -1006,6 +1072,7 @@ public class MapLogic { } if(needUpdate){ mapMission.setAllMissionProgress(allMissionProgress); + mapManager.setMapMissionProgres(mapMission); } } @@ -1024,10 +1091,22 @@ public class MapLogic { } } + public int getUseTime(User user) throws Exception { + long startExporeTime = user.getMapManager().getStartExporeTime(); + if (startExporeTime == 0) { + return -1; + } + int useTime = (int) ((TimeUtils.now() - startExporeTime) / 1000); + return useTime; + } + public CheckMissionReturn checkMission(Mission mission, User user) throws Exception { + if (mission.getTime() > 0) { + return null; + } + CheckMissionReturn checkMissionReturn = new CheckMissionReturn(); SMissionEventsConfig sMissionEventsConfig = SMissionEventsConfig.sMissionEventsConfigMap.get(mission.getMissionId()); mission.setMissionStep(mission.getMissionStep() + 1); - CheckMissionReturn checkMissionReturn = new CheckMissionReturn(); if (mission.getMissionStep() >= sMissionEventsConfig.getMissionNum()) { if (mission.getMissionInfo() != null) { checkMissionReturn.newEventId = mission.getMissionInfo(); @@ -1035,9 +1114,9 @@ public class MapLogic { int[] reward = {sMissionEventsConfig.getReward()}; CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, 1, 0); checkMissionReturn.drop = drop; - } else { - user.getMapManager().setMission(mission); + mission.setTime(getUseTime(user)); } + user.getMapManager().setMission(mission); checkMissionReturn.mission = mission; return checkMissionReturn; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMission.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMission.java index d7ce50b8c..ffc1288b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMission.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMission.java @@ -1,13 +1,9 @@ package com.ljsd.jieling.handler.map; -import com.ljsd.common.mogodb.MongoBase; -import com.ljsd.jieling.logic.dao.root.User; -import java.util.HashSet; import java.util.Map; -import java.util.Set; -public class MapMission extends MongoBase { +public class MapMission { private int mapId; @@ -26,7 +22,6 @@ public class MapMission extends MongoBase { public MapMission(){} public MapMission(int mapId, Map missionProgress) { - this.setRootCollection(User._COLLECTION_NAME); this.mapId = mapId; this.allMissionProgress = missionProgress; } @@ -37,13 +32,11 @@ public class MapMission extends MongoBase { } public void setAllMissionProgress(Map allMissionProgress) { - updateString("allMissionProgress",allMissionProgress); this.allMissionProgress = allMissionProgress; } public void setTotalWeight(int totalWeight) { - updateString("totalWeight",totalWeight); this.totalWeight = totalWeight; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 5be2cb412..934c353c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -125,16 +125,17 @@ public class CombatLogic { AdventureManager adventureManager = user.getAdventureManager(); Map adventureStateInfoMap = adventureManager.getAdventureStateInfoMap(); int now = (int)(System.currentTimeMillis()/1000); + int adventureRefresh = SGameSetting.getGameSetting().getAdventureRefresh(); for(AdventureStateInfo adventureStateInfoTmp:adventureStateInfoMap.values()){ int positionTmp = adventureStateInfoTmp.getPosition(); if(position!=0 && positionTmp!=position){ continue; } int startTime = adventureStateInfoTmp.getStartTime(); - int times = (now - startTime)%60; + int times = (now - startTime)%adventureRefresh; int size = adventureStateInfoTmp.getHeroIds().size(); if(times>0){ - adventureStateInfoTmp.setStartTime(startTime+times*60); + adventureStateInfoTmp.setStartTime(startTime+times*adventureRefresh); SAdventureConfig sAdventureConfig = SAdventureConfig.getSAdventureConfigByPosition(positionTmp); int leaveBonus = sAdventureConfig.getLeaveBonus(); if(!isOnLine){