diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index 4e99277ad..c46a50849 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 int mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 -1 4#100|14#100|10001#1 0#0#0.3164#0 100 2 0#0#1#0 70#100 999 9999 1 05#09 +1 3#100|14#10000|10026#1|19#1 0#0#0.3164#0 100 2 0#0#1#0 70#100 999 9999 1 05#09 diff --git a/conf/server/LotteryRewardConfig.txt b/conf/server/LotteryRewardConfig.txt index 66def5c80..a371d0953 100644 --- a/conf/server/LotteryRewardConfig.txt +++ b/conf/server/LotteryRewardConfig.txt @@ -2,48 +2,48 @@ Id Reward Pool Weight OpenRules int mut,int#int,1 int int int,int#int,1 2 10002#1 1 11 null 3 10003#1 1 11 null -4 10004#1 1 8 null -5 10005#1 1 11 null +4 10004#1 1 0 null +5 10005#1 1 0 null 6 10006#1 1 11 null 7 10007#1 1 11 null -8 10008#1 1 8 null -9 10009#1 1 11 null -10 10010#1 1 5 null +8 10008#1 1 0 null +9 10009#1 1 0 null +10 10010#1 1 0 null 11 10011#1 1 11 null 12 10012#1 1 8 null 13 10013#1 1 11 null 14 10014#1 1 5 null 15 10015#1 1 11 null -16 10016#1 1 8 null -17 10017#1 1 11 null +16 10016#1 1 0 null +17 10017#1 1 0 null 18 10018#1 1 5 null 19 10019#1 1 5 null -20 10020#1 1 11 null +20 10020#1 1 0 null 21 10021#1 1 95 null 22 10022#1 1 95 null -23 10023#1 1 95 null +23 10023#1 1 0 null 24 10024#1 1 95 null 25 10025#1 1 95 null 26 10026#1 1 95 null -27 10027#1 1 95 null -28 10028#1 1 95 null -29 10029#1 1 95 null -30 10030#1 1 95 null -31 10031#1 1 95 null -32 10032#1 1 95 null +27 10027#1 1 0 null +28 10028#1 1 0 null +29 10029#1 1 0 null +30 10030#1 1 0 null +31 10031#1 1 0 null +32 10032#1 1 0 null 33 10033#1 1 95 null 34 10034#1 1 95 null -35 10035#1 1 95 null -36 10036#1 1 95 null +35 10035#1 1 0 null +36 10036#1 1 0 null 37 10037#1 1 95 null -38 10038#1 1 95 null -39 10039#1 1 47 null -40 10040#1 1 47 null -41 10041#1 1 95 null -42 10042#1 1 95 null -43 10043#1 1 600 null -44 10044#1 1 600 null -45 10045#1 1 600 null +38 10038#1 1 0 null +39 10039#1 1 0 null +40 10040#1 1 0 null +41 10041#1 1 0 null +42 10042#1 1 0 null +43 10043#1 1 0 null +44 10044#1 1 0 null +45 10045#1 1 0 null 46 10046#1 1 600 null 47 10047#1 1 600 null 48 10048#1 1 600 null @@ -52,24 +52,24 @@ int mut,int#int,1 int int int,int#int,1 51 10051#1 1 600 null 52 10052#1 1 600 null 57 10001#1 11 20 null -58 10007#1 11 60 null -59 10010#1 11 60 null -60 10021#1 11 60 null -61 10036#1 11 150 null -62 10037#1 11 150 null -63 10039#1 11 150 null +58 10007#1 11 0 null +59 10010#1 11 0 null +60 10021#1 11 0 null +61 10036#1 11 0 null +62 10037#1 11 0 null +63 10039#1 11 0 null 64 10043#1 11 150 null 65 12008#10 11 50 null 66 12008#8 11 50 null 67 12008#12 11 50 null -68 12008#10 11 50 null +68 12008#10 11 0 null 69 10006#1 12 60 null 70 10012#1 12 20 null 71 10016#1 12 60 null 72 10020#1 12 60 null 73 10025#1 12 150 null -74 10038#1 12 150 null -75 10040#1 12 150 null +74 10038#1 12 0 null +75 10040#1 12 0 null 76 10041#1 12 150 null 77 12009#10 12 50 null 78 12009#8 12 50 null @@ -78,22 +78,22 @@ int mut,int#int,1 int int int,int#int,1 81 10002#1 13 60 null 82 10004#1 13 20 null 83 10019#1 13 60 null -84 10022#1 13 60 null -85 10024#1 13 150 null -86 10030#1 13 150 null -87 10042#1 13 150 null +84 10022#1 13 0 null +85 10024#1 13 0 null +86 10030#1 13 0 null +87 10042#1 13 0 null 88 10045#1 13 150 null 89 12011#10 13 50 null 90 12011#8 13 50 null 91 12011#12 13 50 null 92 12011#10 13 50 null -93 10003#1 14 20 null -94 10005#1 14 60 null +93 10003#1 14 0 null +94 10005#1 14 0 null 95 10011#1 14 60 null -96 10013#1 14 60 null -97 10029#1 14 150 null -98 10031#1 14 150 null -99 10032#1 14 150 null +96 10013#1 14 0 null +97 10029#1 14 0 null +98 10031#1 14 0 null +99 10032#1 14 0 null 100 10033#1 14 150 null 101 12010#10 14 50 null 102 12010#8 14 50 null diff --git a/conf/server/MapConfig.txt b/conf/server/MapConfig.txt index 62a903815..da830c6c9 100644 --- a/conf/server/MapConfig.txt +++ b/conf/server/MapConfig.txt @@ -3,13 +3,13 @@ int string mut,int#int,1 int int string 100 序章 10#10 1 0 101 战乱荒林 15#20 1 10 102 三途津 15#20 2 10 -103 风见原野 40#20 2 20 -104 青龙门 20#15 2 20 -105 中心枢纽 10#20 2 20 -106 观澜港 15#20 2 20 -107 毁灭之城 30#40 2 20 -108 白叶渡 20#30 2 20 -109 荆棘流域 30#30 2 20 +103 青龙门 20#15 2 20 +104 风见原野 40#20 2 20 +105 观澜港 15#20 2 20 +106 白叶渡 20#30 2 20 +107 荆棘流域 30#30 2 20 +108 中心枢纽 10#20 2 20 +109 毁灭之城 30#40 2 20 110 寒水溶洞 15#20 2 20 111 地图11 15#20 2 20 112 地图12 15#20 2 20 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index c09d2f796..18220b5da 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -161,58 +161,132 @@ int int int int int int 105034 5 3 2 0 105082 105035 5 3 2 0 105083 0 0 0 0 0 0 -106001 1 2 1 0 0 -106002 1 2 1 0 0 -106003 1 2 1 0 0 -106004 2 2 2 0 0 -106005 2 2 2 0 0 -106006 2 2 2 0 0 -106007 2 2 2 0 0 -106008 2 2 2 0 0 -106009 2 2 2 0 0 -106010 2 2 2 0 0 -106011 2 1 2 0 0 -106012 3 2 2 0 0 -106013 4 2 2 0 0 -106014 5 3 1 0 0 -106015 5 3 2 0 0 -106016 5 3 1 0 0 -106017 5 3 2 0 0 -106018 5 3 1 0 0 -106019 5 3 2 0 0 -106020 8 0 0 0 0 -106021 5 3 2 0 0 -106022 5 3 2 0 0 -106023 5 3 2 0 0 -106024 5 3 2 0 0 -106025 5 3 2 0 0 -106026 9 3 1 0 0 +106001 1 2 1 0 106001 +106002 1 2 1 0 106002 +106003 1 2 1 0 106003 +106004 2 2 2 0 106004 +106005 2 2 2 0 106005 +106006 2 2 2 0 106006 +106007 2 2 2 0 106007 +106008 2 2 2 0 106008 +106009 2 2 2 0 106009 +106010 2 2 2 0 106010 +106011 2 1 2 0 106011 +106012 3 2 2 0 106012 +106013 4 2 2 0 106013 +106014 9 2 2 0 106014 +106015 5 2 2 0 106015 +106016 9 2 2 0 106016 +106017 5 2 2 0 106017 +106018 8 0 0 0 0 +106019 5 3 2 0 106018 +106020 5 3 2 0 106019 +106021 5 3 2 0 106084 +106022 5 3 2 0 106055 +106023 5 3 2 0 106083 +106024 9 3 1 0 106070 +106025 1 2 1 0 106078 +106026 1 2 1 0 106079 +106027 1 2 1 0 106080 +106028 1 2 1 0 106081 +106029 1 2 1 0 106082 0 0 0 0 0 0 -107001 1 2 1 0 0 -107002 1 2 1 0 0 -107003 1 2 1 0 0 -107004 1 3 1 0 0 -107005 2 2 2 0 0 -107006 2 2 2 0 0 -107007 2 2 2 0 0 -107008 2 2 2 0 0 -107009 2 2 2 0 0 -107010 2 2 2 0 0 -107011 2 2 2 0 0 -107012 2 1 2 0 0 -107013 3 2 2 0 0 -107014 4 2 2 0 0 -107015 9 2 2 0 0 -107016 5 2 2 0 0 -107017 9 2 2 0 0 -107018 5 2 2 0 0 -107019 8 0 0 0 0 -107020 5 3 2 0 0 -107021 5 3 2 0 0 -107022 5 3 2 0 0 -107023 5 3 2 0 0 -107024 5 3 2 0 0 -107025 5 3 2 0 0 -107026 5 3 2 0 0 -107027 5 3 2 0 0 -107028 5 3 2 0 0 +107001 1 2 1 0 107001 +107002 1 2 1 0 107002 +107003 1 2 1 0 107003 +107004 1 3 1 0 107004 +107005 2 2 2 0 107005 +107006 2 2 2 0 107006 +107007 2 2 2 0 107007 +107008 2 2 2 0 107008 +107009 2 2 2 0 107009 +107010 2 2 2 0 107010 +107011 2 2 2 0 107011 +107012 2 1 2 0 107012 +107013 3 2 2 0 107013 +107014 4 2 2 0 107014 +107015 5 3 1 0 107015 +107016 5 3 2 0 107016 +107017 5 3 1 0 107018 +107018 5 3 2 0 107019 +107019 5 3 1 0 107021 +107020 5 3 2 0 107022 +107021 8 0 0 0 0 +107022 5 3 2 0 107024 +107023 5 3 2 0 107035 +107024 5 3 2 0 107055 +107025 5 3 2 0 107056 +107026 5 3 2 0 107057 +107027 5 3 2 0 107058 +107028 5 3 2 0 107059 +107029 5 3 2 0 107060 +107030 5 3 2 0 107061 +0 0 0 0 0 0 +108001 1 2 1 0 108001 +108002 1 2 1 0 108002 +108003 1 2 1 0 108003 +108004 1 2 1 0 108004 +108005 1 2 1 0 108005 +108006 1 2 1 0 108006 +108007 1 2 1 0 108007 +108008 1 3 1 0 108008 +108009 1 3 1 0 108009 +108010 3 2 2 0 108010 +108011 4 2 2 0 108011 +108012 5 2 2 0 108012 +108013 8 0 0 0 0 +108014 5 3 2 0 108013 +108015 5 3 2 0 108019 +108016 5 3 2 0 108025 +108017 5 3 2 0 108031 +108018 5 3 2 0 108037 +108019 2 1 2 0 108067 +108020 2 1 2 0 108068 +108021 2 1 2 0 108069 +0 0 0 0 0 0 +109001 1 2 1 0 109001 +109002 1 2 1 0 109002 +109003 1 2 1 0 109003 +109004 1 2 1 0 109004 +109005 1 2 1 0 109005 +109006 1 2 1 0 109006 +109007 1 3 1 0 109007 +109008 3 2 2 0 109009 +109009 4 2 2 0 109010 +109010 5 2 2 0 109011 +109011 1 3 1 0 109008 +109012 8 0 0 0 0 +109013 5 3 2 0 109013 +109014 5 3 2 0 109014 +109015 5 3 1 0 109015 +109016 5 3 2 0 109024 +109017 5 3 2 0 109043 +109018 5 3 2 0 109054 +109019 5 3 2 0 109055 +109020 5 3 2 0 109056 +109021 5 3 2 0 109057 +109022 5 3 2 0 109058 +109023 5 3 2 0 109059 +109024 5 3 2 0 109060 +109025 5 3 2 0 109061 +109026 5 3 2 0 109062 +109027 2 2 2 0 109063 +109028 2 2 2 0 109064 +109029 2 2 2 0 109065 +109030 2 2 2 0 109066 +109031 2 1 2 0 109067 +109032 2 1 2 0 109068 +0 0 0 0 0 0 +110001 1 2 1 0 110001 +110002 1 2 1 0 110002 +110003 1 2 1 0 110003 +110004 1 2 1 0 110004 +110005 1 2 1 0 110005 +110006 1 3 1 0 110006 +110007 2 2 2 0 110007 +110008 2 2 2 0 110008 +110009 2 2 2 0 110009 +110010 2 1 2 0 110010 +110011 3 2 2 0 110011 +110012 4 2 2 0 110012 +110013 8 0 0 0 0 diff --git a/conf/server/Map_101.txt b/conf/server/Map_101.txt index 49d540fd2..06399e68f 100644 --- a/conf/server/Map_101.txt +++ b/conf/server/Map_101.txt @@ -6,32 +6,31 @@ int int mut,int#int,2 int 4 101027 4#7|4#8|5#8|4#9 0 5 101005 15#20 0 6 101026 2#6|2#7|3#7|2#8|2#9 0 -7 101003 7#13 0 -8 101004 8#2|9#2|10#2 0 -9 101025 12#10|11#11|12#11|11#12 0 -10 101020 6#7|7#7|6#8 0 -11 101001 13#16|12#17|14#17|12#18|14#18 0 -12 101002 5#12|5#13|5#14|5#15|4#16 0 -13 101019 3#2|2#3|3#3 0 -14 101010 2#20 0 -15 101019 13#6|14#7|13#8|9#14|10#14|9#15 0 -16 101018 9#7 0 -17 101017 1#1 0 -18 101002 4#2|5#2|4#3|5#3|4#4 0 -19 101016 6#1 0 -20 101026 14#10|13#11|13#12|14#12 0 -21 101001 7#16|6#17|7#18|7#19 0 -22 101015 13#14|14#15|15#15 0 -23 101014 10#3|10#4|9#5|11#5 0 -24 101014 11#15|12#15|11#16|11#17 0 -25 101026 7#2|7#3|7#4|8#4|8#5 0 -26 101001 13#2|14#2|13#3|14#3|14#4 0 -27 101024 3#5 0 -28 101001 10#16|10#17|9#18|9#19 0 -29 101023 12#3 0 -30 101002 3#17|2#18|2#19|3#19|4#19 0 -31 101026 10#7|10#8|10#9|11#9 0 -32 101022 5#18|6#18|6#19 0 -33 101021 1#14|1#15|2#15|1#16|2#16|1#17|2#17|1#18 0 -34 101020 2#11|3#11|3#12 0 -35 101002 8#10|7#11|8#11|9#12 0 +7 101004 8#2|9#2|10#2 0 +8 101025 12#10|11#11|12#11|11#12 0 +9 101020 6#7|7#7|6#8 0 +10 101001 13#16|12#17|14#17|12#18|14#18 0 +11 101002 5#12|5#13|5#14|5#15|4#16 0 +12 101019 3#2|2#3|3#3 0 +13 101010 2#20 0 +14 101019 13#6|14#7|13#8|9#14|10#14|9#15 0 +15 101018 9#7 0 +16 101017 1#1 0 +17 101002 4#2|5#2|4#3|5#3|4#4 0 +18 101016 6#1 0 +19 101026 14#10|13#11|13#12|14#12 0 +20 101001 7#16|6#17|7#18|7#19 0 +21 101015 13#14|14#15|15#15 0 +22 101014 10#3|10#4|9#5|11#5 0 +23 101014 11#15|12#15|11#16|11#17 0 +24 101026 7#2|7#3|7#4|8#4|8#5 0 +25 101001 13#2|14#2|13#3|14#3|14#4 0 +26 101024 3#5 0 +27 101001 10#16|10#17|9#18|9#19 0 +28 101023 12#3 0 +29 101002 3#17|2#18|2#19|3#19|4#19 0 +30 101026 10#7|10#8|10#9|11#9 0 +31 101022 5#18|6#18|6#19 0 +32 101021 1#14|1#15|2#15|1#16|2#16|1#17|2#17|1#18 0 +33 101020 2#11|3#11|3#12 0 +34 101002 8#10|7#11|8#11|9#12 0 diff --git a/conf/server/Map_103.txt b/conf/server/Map_103.txt index e1ee09e6a..fd89abd1f 100644 --- a/conf/server/Map_103.txt +++ b/conf/server/Map_103.txt @@ -1,33 +1,41 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 103001 1#6 0 -2 103001 13#10|12#11|13#11|14#11|13#12|13#13 0 -3 103022 8#15 0 -4 103021 12#1 0 -5 103024 2#5|2#6|3#6|2#7|2#8 0 -6 103002 7#4|8#4|6#5|7#5|8#5|7#6 0 -7 103023 3#15 0 -8 103003 8#6 0 -9 103025 1#1|2#1|3#1|2#2|3#2 0 -10 103004 8#2|9#2|10#2|8#3|10#3 0 -11 103016 1#3|2#3|3#3|3#4|3#5|4#5|4#6|5#6|5#7|5#8|4#9|5#9|6#9|4#11|5#11|6#11|1#12|3#12|4#12|5#12|6#12|7#12|8#12|4#13|5#13|6#13|8#13|9#13|11#13|5#14|11#14|12#14|13#14|14#14|5#15|14#15|15#15 1 -12 103017 12#13 0 -13 103018 5#10 0 -14 103001 15#1 0 -15 103024 12#7|10#8|11#8|12#8|11#9 0 -16 103008 6#7|7#7|6#8|7#8 0 -17 103002 2#13|1#14|2#14|3#14|4#14|2#15 0 -18 103025 8#14|9#14|10#14|9#15|10#15|11#15 0 -19 103024 11#2|11#3|11#4|12#4|10#5|11#5 0 -20 103010 10#9|9#10|10#10|9#11 0 -21 103013 13#6 0 -22 103024 6#1|4#2|5#2|6#2|7#2 0 -23 103001 15#6|14#7|15#7|15#8|15#9 0 -24 103015 6#15 0 -25 103014 1#2 0 -26 103005 5#3|4#4|5#4|5#5 0 -27 103006 14#12|15#12|15#13 0 -28 103008 3#7|4#7|3#8|4#8 0 -29 103009 13#2|14#2|13#3|14#3 0 -30 103002 1#9|1#10|2#10|2#11|3#11 0 -31 103024 7#9|8#9|9#9|7#10|8#10|8#11 0 +1 103004 10#9|9#10|10#10|9#11 0 +2 103020 18#3 0 +3 103001 2#5|1#6|2#6|3#6|2#7|2#8 0 +4 103001 13#10|12#11|13#11|14#11|13#12|13#13 0 +5 103021 12#1 1 +6 103022 8#15 0 +7 103001 17#11|16#12|17#12|17#13|16#14|17#14 0 +8 103002 7#4|8#4|6#5|7#5|8#5|7#6 0 +9 103023 3#15 0 +10 103003 8#6 0 +11 103004 19#1|18#2|19#2 0 +12 103004 8#2|9#2|10#2|8#3|10#3 0 +13 103017 12#13 0 +14 103016 1#3|2#3|3#3|3#4|3#5|4#5|4#6|5#6|5#7|5#8|4#9|5#9|6#9|4#11|5#11|6#11|1#12|3#12|4#12|5#12|6#12|7#12|8#12|4#13|5#13|6#13|8#13|9#13|11#13|5#14|11#14|12#14|13#14|14#14|5#15|14#15|15#15|16#15|17#15|18#15 0 +15 103004 17#7|18#7|17#8|17#9 0 +16 103019 16#10 0 +17 103018 5#10 0 +18 103001 15#1|16#1|17#1|16#2|16#3 0 +19 103002 8#14|9#14|10#14|9#15|10#15|11#15 0 +20 103008 6#7|7#7|6#8|7#8 0 +21 103001 12#7|10#8|11#8|12#8|11#9 0 +22 103001 11#2|11#3|11#4|12#4|10#5|11#5 0 +23 103001 20#9|19#10|20#10|19#11|20#11 0 +24 103001 6#1|4#2|5#2|6#2|7#2 0 +25 103004 19#13|19#14|20#14|19#15 0 +26 103002 2#13|1#14|2#14|3#14|4#14|2#15 0 +27 103001 7#9|8#9|9#9|7#10|8#10|8#11 0 +28 103011 20#2 0 +29 103004 5#3|4#4|5#4|5#5 0 +30 103013 13#6 0 +31 103004 13#2|14#2|13#3|14#3 0 +32 103001 15#6|16#6|14#7|15#7|15#8|15#9 0 +33 103015 6#15 0 +34 103002 1#1|2#1|3#1|2#2|3#2 0 +35 103014 1#2 0 +36 103008 3#7|4#7|3#8|4#8 0 +37 103002 1#9|1#10|2#10|2#11|3#11 0 +38 103001 19#3|19#4|20#4|18#5|19#5|19#6 0 +39 103004 14#12|15#12|15#13|16#13 0 diff --git a/conf/server/Map_104.txt b/conf/server/Map_104.txt index 05b5a9ddd..2ea47c26f 100644 --- a/conf/server/Map_104.txt +++ b/conf/server/Map_104.txt @@ -2,56 +2,100 @@ id Event Groups isMustAppear int int mut,int#int,2 int 1 104009 18#12|16#13|18#13|17#14 0 2 104036 12#19 0 -3 104015 5#6 0 -4 104007 10#16|10#17|10#19 0 -5 104001 1#9|1#10|2#10|1#11|1#12 0 -6 104133 12#18 0 -7 104006 9#1|9#2|8#3 0 -8 104002 10#11|8#12|9#12|9#13|10#13|11#13 0 -9 104031 17#1|17#2|16#3|17#3|18#3 0 -10 104008 20#8|20#9|20#10 0 -11 104016 5#5 0 -12 104012 4#13|3#14|3#15|3#16|4#17 0 -13 104031 8#16|8#17|9#17|8#18|9#19 0 -14 104001 20#11 0 -15 104002 20#14 0 -16 104019 17#18 0 -17 104006 12#2|11#3|12#3 0 -18 104031 12#4|11#5|12#5|13#5|11#6|13#6 0 -19 104031 2#2|3#2|2#3|3#3|2#4 0 -20 104007 15#18|14#19|13#20|15#20 0 -21 104012 14#9|13#10|14#10|12#11|13#11 0 -22 104002 15#6|16#7|17#7|15#8|17#8 0 -23 104032 14#15|13#16|14#17|15#17|16#17 0 -24 104005 2#5|1#6|2#7 0 -25 104024 2#20 0 -26 104006 11#8|10#9|9#10 0 -27 104022 7#19 0 -28 104006 7#16|6#17|6#18|7#18 0 -29 104008 18#4|18#5|17#6 0 -30 104001 7#5|7#6|7#7|6#8|7#8 0 -31 104031 18#15|18#16|17#17|18#17|18#18 0 -32 104005 6#2|4#3|5#3 0 -33 104001 6#1|7#1|5#2|7#2 0 -34 104015 5#4 0 -35 104013 1#3 0 -36 104015 6#5 0 -37 104036 13#18 0 -38 104036 12#17 0 -39 104034 1#16|1#17|1#18|2#18 0 -40 104032 3#8|4#8|3#9|4#10|3#11 0 -41 104001 3#18|4#18|5#18|5#19|5#20 0 -42 104003 15#11 0 -43 104005 1#15|2#15|2#16 0 -44 104018 12#7 0 -45 104007 19#18|20#18|19#19 0 -46 104032 11#2|9#3|10#3|10#4|9#5 0 -47 104034 8#7|9#8|10#8|8#9 0 -48 104036 11#18 0 -49 104015 4#5 0 -50 104025 20#4 0 -51 104003 6#12 0 -52 104005 5#9|6#9|5#11 0 -53 104023 9#15 0 -54 104007 15#2|14#3|15#4 0 -55 104021 4#14 0 +3 104007 10#16|10#17|10#19 0 +4 104032 27#16|27#17|27#18|28#18|27#19 0 +5 104006 9#1|9#2|8#3 0 +6 104002 27#5|26#6|26#7|27#7|26#8 0 +7 104031 17#1|17#2|16#3|17#3|18#3 0 +8 104037 24#2 0 +9 104012 36#7|37#7|37#8|38#8|39#8 0 +10 104010 31#1|29#2|30#2 0 +11 104033 33#4|32#5|34#5|31#6|33#6 0 +12 104002 20#14|21#14|21#15|22#16|21#17 0 +13 104019 17#18 0 +14 104006 12#2|11#3|12#3 0 +15 104031 2#2|3#2|2#3|3#3|2#4 0 +16 104033 24#8|23#9|25#9|24#10|25#10 0 +17 104037 23#3 0 +18 104007 15#18|14#19|13#20|15#20 0 +19 104010 30#18|29#19|30#20 0 +20 104026 39#5 0 +21 104003 34#17 0 +22 104022 7#19 0 +23 104008 22#18|23#19|22#20 0 +24 104012 25#13|24#14|25#15|24#16 0 +25 104006 7#16|6#17|6#18|7#18 0 +26 104029 33#1 0 +27 104134 24#3 0 +28 104031 18#15|18#16|17#17|18#17|18#18 0 +29 104003 28#3 0 +30 104001 6#1|7#1|5#2|7#2 0 +31 104011 35#2|34#3|35#3|35#4 0 +32 104013 1#3 0 +33 104015 6#5 0 +34 104009 29#7|31#7|29#8|30#8 0 +35 104036 12#17 0 +36 104001 28#8|27#9|28#9|28#10|27#11 0 +37 104032 3#8|4#8|3#9|4#10|3#11 0 +38 104001 36#3|37#3|36#4|35#5|36#5 0 +39 104005 1#15|2#15|2#16 0 +40 104018 12#7 0 +41 104034 8#7|9#8|10#8|8#9 0 +42 104008 22#1|21#2|23#2 0 +43 104015 4#5 0 +44 104011 34#18|35#18|34#19 0 +45 104031 25#16|26#16|24#17|25#18|24#19 0 +46 104002 34#8|34#9|33#10|34#10|35#10 0 +47 104025 20#4 0 +48 104003 6#12 0 +49 104007 15#2|14#3|15#4 0 +50 104021 4#14 0 +51 104011 39#2|40#2|39#3 0 +52 104015 5#6 0 +53 104009 23#7|23#8|24#9 0 +54 104028 26#10 0 +55 104001 1#9|1#10|2#10|1#11|1#12 0 +56 104133 12#18 0 +57 104002 10#11|8#12|9#12|9#13|10#13|11#13 0 +58 104010 35#12|36#12|36#13|37#14 0 +59 104037 25#3 0 +60 104008 20#8|20#9|20#10 0 +61 104016 5#5 0 +62 104012 4#13|3#14|3#15|3#16|4#17 0 +63 104031 8#16|8#17|9#17|8#18|9#19 0 +64 104001 21#9|21#10|22#10|20#11|23#11 0 +65 104031 12#4|11#5|12#5|13#5|11#6|13#6 0 +66 104031 30#1|31#2|31#3|30#4|31#4 0 +67 104009 27#13|27#14|28#15 0 +68 104012 14#9|13#10|14#10|12#11|13#11 0 +69 104002 15#6|16#7|17#7|15#8|17#8 0 +70 104031 38#2|38#3|40#3|39#4|40#4 0 +71 104032 14#15|13#16|14#17|15#17|16#17 0 +72 104005 2#5|1#6|2#7 0 +73 104024 2#20 0 +74 104006 11#8|10#9|9#10 0 +75 104020 32#15 0 +76 104001 36#16|37#16|37#18|37#19|38#19 0 +77 104031 22#2|21#3|22#3|22#4|23#4 0 +78 104037 24#4 0 +79 104031 28#16|29#16|30#16|30#17|31#18 0 +80 104008 18#4|18#5|17#6 0 +81 104010 25#1|25#2|26#3|26#4 0 +82 104001 7#5|7#6|7#7|6#8|7#8 0 +83 104005 6#2|4#3|5#3 0 +84 104030 40#13 0 +85 104001 40#8|38#9|39#9|40#9|39#11 0 +86 104032 38#14|39#14|40#14|40#15|40#16 0 +87 104015 5#4 0 +88 104036 13#18 0 +89 104034 1#16|1#17|1#18|2#18 0 +90 104011 39#15|39#17|38#18|40#18 0 +91 104001 3#18|4#18|5#18|5#19|5#20 0 +92 104003 15#11 0 +93 104007 19#18|20#18|19#19 0 +94 104032 11#2|9#3|10#3|10#4|9#5 0 +95 104036 11#18 0 +96 104001 31#9|31#10|31#11|32#12|33#12 0 +97 104027 31#17 0 +98 104005 5#9|6#9|5#11 0 +99 104023 9#15 0 diff --git a/conf/server/Map_108.txt b/conf/server/Map_108.txt index 446737829..e69de29bb 100644 --- a/conf/server/Map_108.txt +++ b/conf/server/Map_108.txt @@ -1,33 +0,0 @@ -id Event Groups isMustAppear -int int mut,int#int,2 int -1 108013 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|1#2|2#2|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|2#3|3#3|4#3|5#3|6#3|7#3|8#3|9#3|2#4|3#4|4#4|5#4|6#4|7#4|8#4|4#5|5#5|7#5|8#5|9#5|2#6|2#7|3#7|4#7|6#7|7#7|8#7|9#7|6#8|9#8|2#9|4#9|6#9|8#9|9#9|4#10|6#10|8#10|2#11|3#11|6#11|8#11|10#11|2#12|5#12|8#12|2#13|4#13|5#13|2#14|5#14|8#14|9#14|6#15|8#15|9#15|2#16|3#16|4#16|6#16|8#16|2#17|4#17|6#17|8#17|10#17|2#18|4#18|6#18|8#18|6#19|8#19|9#19|2#20|6#20 1 -2 108014 1#20 0 -3 108016 10#3 0 -4 108015 1#3 0 -5 108018 6#5 0 -6 108017 8#8 0 -7 108009 8#13 0 -8 108019 10#5|5#6|10#9|1#10|5#10|7#10|7#17|5#18 0 -9 108009 3#6 0 -10 108004 7#12 0 -11 108009 1#14 0 -12 108002 2#8|1#9 0 -13 108001 9#12|9#13|10#13 0 -14 108002 7#19|7#20|8#20 0 -15 108003 4#8|5#8 0 -16 108004 4#15|5#15|5#16 0 -17 108005 1#11|1#12 0 -18 108006 10#16 0 -19 108007 3#12|3#13 0 -20 108009 3#17 0 -21 108021 3#5|6#13|9#16 0 -22 108020 1#5|3#9|2#15|2#19|10#20 0 -23 108001 1#16|1#17|1#18 0 -24 108001 6#14|7#14|7#15 0 -25 108002 9#18|10#19 0 -26 108005 1#6|1#7 0 -27 108006 7#6|8#6 0 -28 108003 10#6|10#7 0 -29 108004 9#10 0 -30 108009 2#10 0 -31 108007 2#5|3#20 0 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 7726c3f29..1e2f7ae2f 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -1,134 +1,134 @@ Id MonsterId Type Profession Quality Level Hp Attack PhysicalDefence MagicDefence Speed Hit Dodge CritFactor CritDamageFactor DamageBonusFactor DamageReduceFactor SkillList PassiveSkillList int int int int int int int int int int int float float float float mut,int#int,1 mut,int#int,1 mut,int#int,1 mut,int#int,2 -1 1 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -2 1 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -3 1 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -4 2 3 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -5 2 3 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -6 2 3 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -7 3 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -8 3 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -9 3 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -10 4 3 0 2 0 1448 522 305 305 120 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null -11 4 3 0 2 0 1448 522 305 305 40 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null -12 4 3 0 2 0 1448 522 305 305 3 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null -13 5 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -14 5 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -15 5 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -16 6 2 0 1 0 1931 520 305 305 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -17 6 2 0 1 0 1931 520 305 305 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -18 6 2 0 1 0 1931 520 305 305 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -19 7 1 0 1 0 6519 1560 915 915 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -20 7 1 0 1 0 6519 1560 915 915 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -21 7 1 0 1 0 6519 1560 915 915 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -22 8 2 0 2 0 8692 1567 915 915 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -23 8 2 0 2 0 8692 1567 915 915 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -24 8 2 0 2 0 8692 1567 915 915 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -25 9 3 0 1 5 9657 2601 1526 1526 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -26 9 3 0 1 5 9657 2601 1526 1526 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -27 9 3 0 1 5 9657 2601 1526 1526 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -28 10 3 0 1 5 9657 2601 1526 1526 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -29 10 3 0 1 5 9657 2601 1526 1526 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -30 10 3 0 1 5 9657 2601 1526 1526 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -31 11 3 0 2 5 28973 5225 3052 3052 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -32 11 3 0 2 5 28973 5225 3052 3052 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -33 11 3 0 2 5 28973 5225 3052 3052 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -34 9 3 0 1 5 15452 4161 2441 2441 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -35 9 3 0 1 5 15452 4161 2441 2441 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -36 9 3 0 1 5 15452 4161 2441 2441 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -37 13 3 0 1 88 19315 5202 3052 3052 1176 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -38 13 3 0 1 88 19315 5202 3052 3052 392 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -39 13 3 0 1 88 19315 5202 3052 3052 39 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -40 7 1 0 1 88 22275 5411 3170 3170 1176 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -41 7 1 0 1 88 22275 5411 3170 3170 392 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -42 7 1 0 1 88 22275 5411 3170 3170 39 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -43 11 3 0 2 96 31905 5949 3456 3456 1272 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -44 11 3 0 2 96 31905 5949 3456 3456 424 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -45 11 3 0 2 96 31905 5949 3456 3456 42 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -46 15 1 0 1 96 23928 5917 3456 3456 1272 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -47 15 1 0 1 96 23928 5917 3456 3456 424 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -48 15 1 0 1 96 23928 5917 3456 3456 42 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -49 16 1 0 2 100 32359 6045 3495 3495 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -50 16 1 0 2 100 32359 6045 3495 3495 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -51 16 1 0 2 100 32359 6045 3495 3495 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -52 17 4 0 1 100 24269 6009 3495 3495 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -53 17 4 0 1 100 24269 6009 3495 3495 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -54 17 4 0 1 100 24269 6009 3495 3495 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -55 18 4 0 1 100 22254 6215 3623 3623 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -56 18 4 0 1 100 22254 6215 3623 3623 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -57 18 4 0 1 100 22254 6215 3623 3623 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -58 19 4 0 2 100 31970 5950 3431 3431 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -59 19 4 0 2 100 31970 5950 3431 3431 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -60 19 4 0 2 100 31970 5950 3431 3431 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -61 20 2 0 1 100 23977 5911 3431 3431 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -62 20 2 0 1 100 23977 5911 3431 3431 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -63 20 2 0 1 100 23977 5911 3431 3431 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -64 21 3 0 1 100 23977 5911 3431 3431 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -65 21 3 0 1 100 23977 5911 3431 3431 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -66 21 3 0 1 100 23977 5911 3431 3431 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -67 22 4 0 1 108 38829 7754 4520 4520 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -68 22 4 0 1 108 38829 7754 4520 4520 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -69 22 4 0 1 108 38829 7754 4520 4520 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -70 23 3 0 1 100 20892 5802 3366 3366 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -71 23 3 0 1 100 20892 5802 3366 3366 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -72 23 3 0 1 100 20892 5802 3366 3366 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -73 24 2 0 2 108 50478 7887 4520 4520 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -74 24 2 0 2 108 50478 7887 4520 4520 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -75 24 2 0 2 108 50478 7887 4520 4520 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -76 25 4 0 2 108 39598 6929 4008 4008 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -77 25 4 0 2 108 39598 6929 4008 4008 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -78 25 4 0 2 108 39598 6929 4008 4008 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -79 26 2 0 1 100 20892 5802 3366 3366 1320 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -80 26 2 0 1 100 20892 5802 3366 3366 440 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -81 26 2 0 1 100 20892 5802 3366 3366 43 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -82 27 2 0 1 108 21734 6021 3496 3496 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -83 27 2 0 1 108 21734 6021 3496 3496 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -84 27 2 0 1 108 21734 6021 3496 3496 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -85 28 4 0 1 108 29698 6887 4008 4008 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -86 28 4 0 1 108 29698 6887 4008 4008 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -87 28 4 0 1 108 29698 6887 4008 4008 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -88 29 3 0 1 108 21734 6021 3496 3496 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -89 29 3 0 1 108 21734 6021 3496 3496 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -90 29 3 0 1 108 21734 6021 3496 3496 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -91 30 4 0 2 108 47227 7908 4585 4585 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -92 30 4 0 2 108 47227 7908 4585 4585 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -93 30 4 0 2 108 47227 7908 4585 4585 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -94 31 2 0 1 108 21734 6021 3496 3496 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -95 31 2 0 1 108 21734 6021 3496 3496 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -96 31 2 0 1 108 21734 6021 3496 3496 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -97 32 1 0 1 108 29698 6887 4008 4008 1416 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -98 32 1 0 1 108 29698 6887 4008 4008 472 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -99 32 1 0 1 108 29698 6887 4008 4008 47 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -100 33 2 0 1 120 45686 9611 5615 5615 1560 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -101 33 2 0 1 120 45686 9611 5615 5615 520 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -102 33 2 0 1 120 45686 9611 5615 5615 51 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -103 34 4 0 1 120 45686 9611 5615 5615 1560 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -104 34 4 0 1 120 45686 9611 5615 5615 520 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -105 34 4 0 1 120 45686 9611 5615 5615 51 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -106 35 2 0 1 120 31905 7972 4650 4650 1560 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -107 35 2 0 1 120 31905 7972 4650 4650 520 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -108 35 2 0 1 120 31905 7972 4650 4650 51 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -109 36 2 0 1 120 31905 7972 4650 4650 1560 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -110 36 2 0 1 120 31905 7972 4650 4650 520 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -111 36 2 0 1 120 31905 7972 4650 4650 51 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -112 37 3 0 2 122 75685 11610 6758 6758 1584 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -113 37 3 0 2 122 75685 11610 6758 6758 528 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -114 37 3 0 2 122 75685 11610 6758 6758 52 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -115 38 2 0 2 124 83849 12031 6936 6936 1608 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -116 38 2 0 2 124 83849 12031 6936 6936 536 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -117 38 2 0 2 124 83849 12031 6936 6936 53 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -118 39 2 0 1 124 56469 11497 6721 6721 1608 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -119 39 2 0 1 124 56469 11497 6721 6721 536 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -120 39 2 0 1 124 56469 11497 6721 6721 53 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -121 40 4 0 2 126 75101 11538 6704 6704 1632 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -122 40 4 0 2 126 75101 11538 6704 6704 544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -123 40 4 0 2 126 75101 11538 6704 6704 54 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -124 41 2 0 1 124 51599 11855 6936 6936 1608 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -125 41 2 0 1 124 51599 11855 6936 6936 536 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -126 41 2 0 1 124 51599 11855 6936 6936 53 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -127 42 3 0 1 124 51599 11855 6936 6936 1608 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -128 42 3 0 1 124 51599 11855 6936 6936 536 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -129 42 3 0 1 124 51599 11855 6936 6936 53 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -130 43 0 0 2 128 83434 12001 6903 6903 1656 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -131 43 0 0 2 128 83434 12001 6903 6903 552 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -132 43 0 0 2 128 83434 12001 6903 6903 55 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +1 1 2 0 1 0 193 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +2 1 2 0 1 0 193 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +3 1 2 0 1 0 193 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +4 2 3 0 1 0 193 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +5 2 3 0 1 0 193 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +6 2 3 0 1 0 193 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +7 3 2 0 1 0 193 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +8 3 2 0 1 0 193 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +9 3 2 0 1 0 193 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +10 4 3 0 2 0 1448 522 305 305 240 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null +11 4 3 0 2 0 1448 522 305 305 80 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null +12 4 3 0 2 0 1448 522 305 305 7 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null +13 5 2 0 1 0 193 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +14 5 2 0 1 0 193 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +15 5 2 0 1 0 193 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +16 6 2 0 1 0 1931 520 305 305 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +17 6 2 0 1 0 1931 520 305 305 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +18 6 2 0 1 0 1931 520 305 305 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +19 7 1 0 1 0 6519 1560 915 915 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +20 7 1 0 1 0 6519 1560 915 915 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +21 7 1 0 1 0 6519 1560 915 915 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +22 8 2 0 2 0 8692 1567 915 915 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +23 8 2 0 2 0 8692 1567 915 915 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +24 8 2 0 2 0 8692 1567 915 915 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +25 9 3 0 1 5 9657 2601 1526 1526 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +26 9 3 0 1 5 9657 2601 1526 1526 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +27 9 3 0 1 5 9657 2601 1526 1526 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +28 10 3 0 1 5 9657 2601 1526 1526 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +29 10 3 0 1 5 9657 2601 1526 1526 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +30 10 3 0 1 5 9657 2601 1526 1526 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +31 11 3 0 2 5 28973 5225 3052 3052 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +32 11 3 0 2 5 28973 5225 3052 3052 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +33 11 3 0 2 5 28973 5225 3052 3052 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +34 9 3 0 1 5 15452 4161 2441 2441 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +35 9 3 0 1 5 15452 4161 2441 2441 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +36 9 3 0 1 5 15452 4161 2441 2441 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +37 13 3 0 1 88 19315 5202 3052 3052 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +38 13 3 0 1 88 19315 5202 3052 3052 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +39 13 3 0 1 88 19315 5202 3052 3052 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +40 7 1 0 1 88 22275 5411 3170 3170 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +41 7 1 0 1 88 22275 5411 3170 3170 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +42 7 1 0 1 88 22275 5411 3170 3170 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +43 11 3 0 2 96 31905 5949 3456 3456 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +44 11 3 0 2 96 31905 5949 3456 3456 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +45 11 3 0 2 96 31905 5949 3456 3456 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +46 15 1 0 1 96 23928 5917 3456 3456 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +47 15 1 0 1 96 23928 5917 3456 3456 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +48 15 1 0 1 96 23928 5917 3456 3456 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +49 16 1 0 2 100 32359 6045 3495 3495 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +50 16 1 0 2 100 32359 6045 3495 3495 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +51 16 1 0 2 100 32359 6045 3495 3495 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +52 17 4 0 1 100 24269 6009 3495 3495 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +53 17 4 0 1 100 24269 6009 3495 3495 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +54 17 4 0 1 100 24269 6009 3495 3495 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +55 18 4 0 1 100 22254 6215 3623 3623 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +56 18 4 0 1 100 22254 6215 3623 3623 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +57 18 4 0 1 100 22254 6215 3623 3623 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +58 19 4 0 2 100 31970 5950 3431 3431 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +59 19 4 0 2 100 31970 5950 3431 3431 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +60 19 4 0 2 100 31970 5950 3431 3431 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +61 20 2 0 1 100 23977 5911 3431 3431 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +62 20 2 0 1 100 23977 5911 3431 3431 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +63 20 2 0 1 100 23977 5911 3431 3431 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +64 21 3 0 1 100 23977 5911 3431 3431 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +65 21 3 0 1 100 23977 5911 3431 3431 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +66 21 3 0 1 100 23977 5911 3431 3431 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +67 22 4 0 1 108 38829 7754 4520 4520 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +68 22 4 0 1 108 38829 7754 4520 4520 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +69 22 4 0 1 108 38829 7754 4520 4520 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +70 23 3 0 1 100 20892 5802 3366 3366 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +71 23 3 0 1 100 20892 5802 3366 3366 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +72 23 3 0 1 100 20892 5802 3366 3366 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +73 24 2 0 2 108 50478 7887 4520 4520 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +74 24 2 0 2 108 50478 7887 4520 4520 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +75 24 2 0 2 108 50478 7887 4520 4520 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +76 25 4 0 2 108 39598 6929 4008 4008 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +77 25 4 0 2 108 39598 6929 4008 4008 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +78 25 4 0 2 108 39598 6929 4008 4008 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +79 26 2 0 1 100 20892 5802 3366 3366 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +80 26 2 0 1 100 20892 5802 3366 3366 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +81 26 2 0 1 100 20892 5802 3366 3366 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +82 27 2 0 1 108 21734 6021 3496 3496 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +83 27 2 0 1 108 21734 6021 3496 3496 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +84 27 2 0 1 108 21734 6021 3496 3496 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +85 28 4 0 1 108 29698 6887 4008 4008 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +86 28 4 0 1 108 29698 6887 4008 4008 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +87 28 4 0 1 108 29698 6887 4008 4008 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +88 29 3 0 1 108 21734 6021 3496 3496 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +89 29 3 0 1 108 21734 6021 3496 3496 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +90 29 3 0 1 108 21734 6021 3496 3496 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +91 30 4 0 2 108 47227 7908 4585 4585 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +92 30 4 0 2 108 47227 7908 4585 4585 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +93 30 4 0 2 108 47227 7908 4585 4585 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +94 31 2 0 1 108 21734 6021 3496 3496 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +95 31 2 0 1 108 21734 6021 3496 3496 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +96 31 2 0 1 108 21734 6021 3496 3496 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +97 32 1 0 1 108 29698 6887 4008 4008 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +98 32 1 0 1 108 29698 6887 4008 4008 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +99 32 1 0 1 108 29698 6887 4008 4008 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +100 33 2 0 1 120 45686 9611 5615 5615 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +101 33 2 0 1 120 45686 9611 5615 5615 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +102 33 2 0 1 120 45686 9611 5615 5615 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +103 34 4 0 1 120 45686 9611 5615 5615 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +104 34 4 0 1 120 45686 9611 5615 5615 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +105 34 4 0 1 120 45686 9611 5615 5615 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +106 35 2 0 1 120 31905 7972 4650 4650 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +107 35 2 0 1 120 31905 7972 4650 4650 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +108 35 2 0 1 120 31905 7972 4650 4650 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +109 36 2 0 1 120 31905 7972 4650 4650 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +110 36 2 0 1 120 31905 7972 4650 4650 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +111 36 2 0 1 120 31905 7972 4650 4650 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +112 37 3 0 2 122 75685 11610 6758 6758 3168 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +113 37 3 0 2 122 75685 11610 6758 6758 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +114 37 3 0 2 122 75685 11610 6758 6758 105 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +115 38 2 0 2 124 83849 12031 6936 6936 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +116 38 2 0 2 124 83849 12031 6936 6936 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +117 38 2 0 2 124 83849 12031 6936 6936 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +118 39 2 0 1 124 56469 11497 6721 6721 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +119 39 2 0 1 124 56469 11497 6721 6721 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +120 39 2 0 1 124 56469 11497 6721 6721 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +121 40 4 0 2 126 75101 11538 6704 6704 3264 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +122 40 4 0 2 126 75101 11538 6704 6704 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +123 40 4 0 2 126 75101 11538 6704 6704 108 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +124 41 2 0 1 124 51599 11855 6936 6936 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +125 41 2 0 1 124 51599 11855 6936 6936 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +126 41 2 0 1 124 51599 11855 6936 6936 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +127 42 3 0 1 124 51599 11855 6936 6936 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +128 42 3 0 1 124 51599 11855 6936 6936 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +129 42 3 0 1 124 51599 11855 6936 6936 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +130 43 0 0 2 128 83434 12001 6903 6903 3312 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +131 43 0 0 2 128 83434 12001 6903 6903 1104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +132 43 0 0 2 128 83434 12001 6903 6903 110 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 50c781ad6..d21ce8025 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -1,5 +1,6 @@ Id Contents Rewardgroup int mut,int#int,2 mut,int#int,1 +10001 1#2#3 10001 10101 1#2#3 10101#20101 10102 4#5#6 10102#20102 10103 7#8#9 10103#20103 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index b835e4efe..5907ef2a0 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -2,10 +2,10 @@ Id AddConditionID BehaviorType BehaviorTypeValues Reward JumpType JumpTypeValues int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100001 0 19 1#100#20#29 null 4 null 100002 0 0 null null 4 null -100003 0 11 1|100#8#4#100001 null 5 100003 +100003 0 0 null null 5 100003 100004 0 0 null null 4 null 100005 0 0 null null 1 100004 -100006 0 0 null null 6 100005 +100006 0 0 null null 5 100005 100007 0 0 null null 5 100006 100008 0 0 null null 5 100007 100009 0 0 null null 1 100008 @@ -14,13 +14,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100012 0 0 null null 1 100011 100013 0 0 null null 1 100012 100014 0 0 null null 1 100013 -100015 0 1 10101 null 1 100014 +100015 0 1 10001 null 1 100014 100016 0 0 null null 5 100015 100017 0 0 null null 5 100016 100018 0 0 null null 5 100017 -100019 0 0 null null 5 100018 +100019 0 11 1|100#8#4#100001 null 5 100018 100020 0 15 100002 null 4 null -101001 1 2 1503#1 10102 4 null +101001 1 2 1503#1 1001#1101#1201#1301 4 null 101002 0 0 null null 4 null 101003 0 5 0 null 4 null 101004 0 0 null null 4 null @@ -68,12 +68,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101046 0 0 null null 4 null 101047 0 1 10101 null 1 101038 101048 0 0 null null 4 null -101049 2 0 null null 1 101039 +101049 2 6 2 null 1 101039 101050 0 0 null null 4 null 101051 2 1 10103 null 1 101040 101052 0 1 10102 null 1 101040 101053 0 0 null null 4 null -101054 0 0 null 10102 1 101041 +101054 0 6 2 10102 1 101041 101055 0 0 null null 4 null 101056 0 1 10101 null 1 101042 101057 0 0 null null 4 null @@ -87,14 +87,14 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101065 0 0 null null 5 101047 101066 0 0 null null 5 101048 101067 0 0 null null 1 101049 -101068 0 17 1#101011|101#13#18#101012|101#12#13#101009 null 4 null +101068 0 17 2#101009|101#13#18#101012|101#12#13#101011 null 4 null 101069 0 0 null null 1 101051 101070 0 0 null null 4 null 101071 0 1 10101 null 1 101052 101072 0 0 null null 4 null 101073 0 1 10102 null 1 101053 101074 0 0 null null 4 null -101075 3 0 null null 1 101054 +101075 3 6 2 null 1 101054 101076 0 0 null null 1 101054 101077 0 0 null null 4 null 101078 0 0 null null 1 101055 @@ -102,15 +102,15 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101080 0 0 null null 4 null 101081 0 1 10103 null 1 101057 101082 0 0 null null 4 null -101083 0 0 null 10102 1 101058 -101084 0 0 null 10102 1 101058 +101083 0 6 3 10102 1 101058 +101084 0 6 2 10102 1 101058 101085 0 0 null null 4 null 101086 0 1 10103 null 1 101059 101087 0 0 null null 4 null 101088 0 0 null null 1 101060 101089 0 0 null null 1 101061 101090 0 0 null null 4 null -101091 3 0 null null 1 101062 +101091 3 6 2 null 1 101062 101092 0 0 null null 4 null 101093 0 1 10104 null 1 101063 101094 0 0 null null 4 null @@ -147,7 +147,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101125 0 1 10108 null 1 101089 101126 0 1 10109 null 1 101090 101127 0 0 null null 1 101091 -101128 3 0 null null 1 101091 +101128 3 6 2 null 1 101091 101129 0 1 10105 null 5 101092 101130 0 0 null null 5 101093 101131 0 1 10110 null 5 101094 @@ -177,7 +177,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101155 0 0 null null 4 null 101156 0 1 10102 null 1 101117 101157 0 0 null null 4 null -101158 0 0 null 10102 1 101118 +101158 0 6 2 10102 1 101118 101159 0 0 null null 4 null 101160 0 1 10105 null 1 101119 101161 0 0 null null 4 null @@ -195,17 +195,17 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101173 0 1 10103 null 1 101126 101174 0 0 null null 4 null 101175 0 0 null null 4 null -101176 1 2 1503#1 10102 4 null +101176 1 2 1503#1 1001#1101#1201#1301 4 null 101177 0 0 null null 4 null -101178 1 2 1503#1 10102 4 null +101178 1 2 1503#1 1001#1101#1201#1301 4 null 101179 0 0 null null 4 null -101180 1 2 1503#1 10103 4 null +101180 1 2 1503#1 1001#1101#1201#1301 4 null 101181 0 0 null null 4 null -101182 1 2 1503#1 10102 4 null +101182 1 2 1503#1 1001#1101#1201#1301 4 null 101183 0 0 null null 4 null 101184 0 0 null null 4 null 101185 0 0 null null 4 null -101186 1 2 1503#1 10102 4 null +101186 1 2 1503#1 1001#1101#1201#1301 4 null 101187 0 0 null null 4 null 101188 0 0 null null 1 101136 101189 0 0 null null 1 101137 @@ -214,7 +214,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101192 0 0 null null 1 101140 101193 0 0 null null 1 101141 101194 0 0 null null 1 101142 -101195 0 15 101012 null 4 null +101195 0 9 2 null 4 null 101196 0 0 null null 5 101144 101197 0 0 null null 5 101146 101198 0 0 null null 1 101147 @@ -225,19 +225,19 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101203 0 0 null null 4 null 101204 0 19 2#102#2#5 null 4 null 101205 0 0 null null 4 null -102001 1 2 1503#1 10102 4 null +102001 1 2 1503#1 1002#1102#1202#1302 4 null 102002 0 0 null null 4 null -102003 1 2 1503#1 10102 4 null +102003 1 2 1503#1 1002#1102#1202#1302 4 null 102004 0 0 null null 4 null -102005 1 2 1503#1 10102 4 null +102005 1 2 1503#1 1002#1102#1202#1302 4 null 102006 0 0 null null 4 null -102007 1 2 1503#1 10102 4 null +102007 1 2 1503#1 1002#1102#1202#1302 4 null 102008 0 0 null null 4 null -102009 1 2 1503#1 10102 4 null +102009 1 2 1503#1 1002#1102#1202#1302 4 null 102010 0 0 null null 4 null -102011 1 2 1503#1 10102 4 null +102011 1 2 1503#1 1002#1102#1202#1302 4 null 102012 0 0 null null 4 null -102013 1 2 1503#1 10102 4 null +102013 1 2 1503#1 1002#1102#1202#1302 4 null 102014 0 0 null null 4 null 102015 0 1 10204 null 1 102012 102016 0 0 null null 4 null @@ -383,19 +383,19 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102156 0 15 102025 null 4 null 102157 0 0 null null 4 null 102158 0 0 null null 4 null -103001 1 2 1503#1 10102 4 null +103001 1 2 1503#1 1003#1103#1203#1303 4 null 103002 0 0 null null 4 null -103003 1 2 1503#1 10102 4 null +103003 1 2 1503#1 1003#1103#1203#1303 4 null 103004 0 0 null null 4 null -103005 1 2 1503#1 10102 4 null +103005 1 2 1503#1 1003#1103#1203#1303 4 null 103006 0 0 null null 4 null -103007 1 2 1503#1 10102 4 null +103007 1 2 1503#1 1003#1103#1203#1303 4 null 103008 0 0 null null 4 null -103009 1 2 1503#1 10102 4 null +103009 1 2 1503#1 1003#1103#1203#1303 4 null 103010 0 0 null null 4 null -103011 1 2 1503#1 10102 4 null +103011 1 2 1503#1 1003#1103#1203#1303 4 null 103012 0 0 null null 4 null -103013 1 2 1503#1 10102 4 null +103013 1 2 1503#1 1003#1103#1203#1303 4 null 103014 0 0 null null 4 null 103015 0 5 0 null 4 null 103016 0 0 null null 4 null @@ -470,21 +470,21 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103085 0 0 null 10101 4 null 103086 0 0 null 10101 4 null 103087 0 0 null 10101 4 null -104001 1 2 1503#1 10102 4 null +104001 1 2 1503#1 1004#1104#1204#1304 4 null 104002 0 0 null null 4 null -104003 1 2 1503#1 10102 4 null +104003 1 2 1503#1 1004#1104#1204#1304 4 null 104004 0 0 null null 4 null -104005 1 2 1503#1 10102 4 null +104005 1 2 1503#1 1004#1104#1204#1304 4 null 104006 0 0 null null 4 null -104007 1 2 1503#1 10102 4 null +104007 1 2 1503#1 1004#1104#1204#1304 4 null 104008 0 0 null null 4 null -104009 1 2 1503#1 10102 4 null +104009 1 2 1503#1 1004#1104#1204#1304 4 null 104010 0 0 null null 4 null -104011 1 2 1503#1 10102 4 null +104011 1 2 1503#1 1004#1104#1204#1304 4 null 104012 0 0 null null 4 null -104013 1 2 1503#1 10102 4 null +104013 1 2 1503#1 1004#1104#1204#1304 4 null 104014 0 0 null null 4 null -104015 1 2 1503#1 10102 4 null +104015 1 2 1503#1 1004#1104#1204#1304 4 null 104016 0 0 null null 4 null 104017 0 5 0 null 4 null 104018 0 0 null null 4 null @@ -638,21 +638,21 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104166 0 0 null null 4 null 104167 0 0 null null 4 null 104168 0 0 null null 4 null -105001 1 2 1503#1 10102 4 null +105001 1 2 1503#1 1005#1105#1205#1305 4 null 105002 0 0 null null 4 null -105003 1 2 1503#1 10102 4 null +105003 1 2 1503#1 1005#1105#1205#1305 4 null 105004 0 0 null null 4 null -105005 1 2 1503#1 10102 4 null +105005 1 2 1503#1 1005#1105#1205#1305 4 null 105006 0 0 null null 4 null -105007 1 2 1503#1 10102 4 null +105007 1 2 1503#1 1005#1105#1205#1305 4 null 105008 0 0 null null 4 null -105009 1 2 1503#1 10102 4 null +105009 1 2 1503#1 1005#1105#1205#1305 4 null 105010 0 0 null null 4 null -105011 1 2 1503#1 10102 4 null +105011 1 2 1503#1 1005#1105#1205#1305 4 null 105012 0 0 null null 4 null -105013 1 2 1503#1 10102 4 null +105013 1 2 1503#1 1005#1105#1205#1305 4 null 105014 0 0 null null 4 null -105015 1 2 1503#1 10102 4 null +105015 1 2 1503#1 1005#1105#1205#1305 4 null 105016 0 0 null null 4 null 105017 0 5 0 null 4 null 105018 0 0 null null 4 null @@ -761,3 +761,386 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 105121 0 0 null null 4 null 105122 0 0 null null 4 null 105123 0 0 null null 4 null +106001 1 2 1503#1 10102 4 null +106002 0 0 null null 4 null +106003 1 2 1503#1 10102 4 null +106004 0 0 null null 4 null +106005 1 2 1503#1 10102 4 null +106006 0 0 null null 4 null +106007 1 2 1503#1 10102 4 null +106008 0 0 null null 4 null +106009 1 2 1503#1 10102 4 null +106010 0 0 null null 4 null +106011 1 2 1503#1 10102 4 null +106012 0 0 null null 4 null +106013 1 2 1503#1 10102 4 null +106014 0 0 null null 4 null +106015 1 2 1503#1 10102 4 null +106016 0 0 null null 4 null +106017 0 5 0 null 4 null +106018 0 0 null null 4 null +106019 0 19 8#107#26#29 null 4 null +106020 0 0 null null 4 null +106021 0 1 10101 null 4 null +106022 0 0 null null 4 null +106023 0 1 10101 null 4 null +106024 0 0 null null 4 null +106025 0 0 null null 4 null +106026 0 0 null null 1 106020 +106027 0 0 null null 4 null +106028 0 0 null null 1 106021 +106029 0 0 null null 4 null +106030 0 1 10101 null 1 106022 +106031 0 0 null null 4 null +106032 0 0 null null 1 106023 +106033 0 0 null null 4 null +106034 0 0 null null 1 106024 +106035 0 0 null null 1 106024 +106036 0 0 null null 4 null +106037 0 1 10101 null 1 106025 +106038 0 0 null null 4 null +106039 0 1 10101 null 1 106026 +106040 0 0 null null 4 null +106041 0 1 10101 null 1 106027 +106042 0 0 null null 4 null +106043 0 1 10101 null 1 106028 +106044 0 0 null null 4 null +106045 0 0 null null 1 106029 +106046 0 0 null null 4 null +106047 0 0 null null 1 106030 +106048 0 0 null null 4 null +106049 0 0 null null 5 106031 +106050 0 0 null null 1 106032 +106051 0 0 null null 5 106033 +106052 0 0 null null 5 106034 +106053 0 0 null null 5 106035 +106054 0 0 null null 5 106036 +106055 0 9 7 null 11 106021#106037 +106056 0 0 null null 1 106038 +106057 0 0 null null 4 null +106058 0 0 null null 1 106039 +106059 0 0 null null 4 null +106060 0 1 10101 null 1 106040 +106061 0 0 null null 4 null +106062 3 0 null null 1 106041 +106063 0 0 null null 4 null +106064 0 1 10101 null 1 106042 +106065 0 0 null null 4 null +106066 0 1 10101 null 1 106043 +106067 0 0 null null 4 null +106068 0 1 10101 null 1 106044 +106069 0 0 null null 4 null +106070 0 1 10101 null 1 106045 +106071 0 0 null null 4 null +106072 0 1 10101 null 1 106046 +106073 0 0 null null 4 null +106074 0 0 null null 5 106047 +106075 0 0 null null 4 null +106076 0 0 null null 1 106048 +106077 0 0 null null 1 106049 +106078 0 0 null null 1 106050 +106079 0 0 null null 1 106051 +106080 0 1 10101 null 1 106052 +106081 0 0 null null 1 106053 +106082 0 0 null null 1 106054 +106083 0 0 null null 4 null +106084 0 9 7 null 11 106023#106056 +106085 0 0 null null 1 106057 +106086 0 0 null null 4 null +106087 0 0 null null 1 106058 +106088 0 0 null null 4 null +106089 0 0 null null 1 106059 +106090 0 0 null null 4 null +106091 0 0 null null 1 106060 +106092 0 0 null null 4 null +106093 0 0 null null 1 106061 +106094 0 0 null null 1 106063 +106095 0 0 null null 4 null +106096 0 0 null 10102 1 106062 +106097 0 0 null null 1 106063 +106098 0 0 null null 4 null +106099 0 1 10101 null 1 106063 +106100 0 0 null null 4 null +106101 0 0 null null 1 106064 +106102 0 0 null null 4 null +106103 0 0 null 10102 1 106065 +106104 0 0 null null 4 null +106105 0 0 null null 1 106066 +106106 0 0 null null 4 null +106107 0 1 10101 null 5 106067 +106108 0 0 null null 5 106068 +106109 0 0 null null 5 106069 +106110 0 9 8 null 4 null +106111 0 0 null null 5 106071 +106112 0 0 null null 1 106072 +106113 0 0 null null 1 106073 +106114 0 0 null null 1 106074 +106115 0 0 null null 5 106075 +106116 0 1 10101 null 5 106076 +106117 0 0 null null 1 106077 +106118 0 15 106026 null 4 null +106119 0 0 null null 4 null +106120 0 0 null null 4 null +107001 1 2 1503#1 10102 4 null +107002 0 0 null null 4 null +107003 1 2 1503#1 10102 4 null +107004 0 0 null null 4 null +107005 1 2 1503#1 10102 4 null +107006 0 0 null null 4 null +107007 1 2 1503#1 10102 4 null +107008 0 0 null null 4 null +107009 1 2 1503#1 10102 4 null +107010 0 0 null null 4 null +107011 1 2 1503#1 10102 4 null +107012 0 0 null null 4 null +107013 1 2 1503#1 10102 4 null +107014 0 0 null null 4 null +107015 1 2 1503#1 10102 4 null +107016 0 0 null null 4 null +107017 0 5 0 null 4 null +107018 0 0 null null 4 null +107019 0 19 8#108#5#19 null 4 null +107020 0 0 null null 4 null +107021 0 0 null null 4 null +107022 0 1 10101 null 1 107017 +107023 0 0 null null 4 null +107024 0 0 null null 4 null +107025 0 0 null null 4 null +107026 0 1 10101 null 1 107020 +107027 0 0 null null 4 null +107028 0 0 null null 4 null +107029 0 0 null null 4 null +107030 0 1 10101 null 1 107023 +107031 0 0 null null 4 null +107032 0 0 null null 4 null +107033 0 1 10101 null 5 107025 +107034 0 0 null null 4 null +107035 0 0 null null 1 107026 +107036 0 0 null null 1 107027 +107037 0 0 null null 1 107028 +107038 0 0 null null 1 107029 +107039 0 0 null null 1 107030 +107040 0 0 null null 1 107031 +107041 0 0 null 10102 1 107032 +107042 0 0 null null 1 107033 +107043 0 0 null null 1 107034 +107044 0 15 107022 null 4 null +107045 0 0 null null 5 107036 +107046 0 0 null null 4 null +107047 0 0 null null 1 107037 +107048 0 0 null null 1 107038 +107049 0 0 null null 5 107039 +107050 0 0 null null 5 107040 +107051 0 0 null null 5 107041 +107052 0 0 null null 5 107042 +107053 0 0 null null 5 107043 +107054 0 0 null null 5 107044 +107055 0 0 null null 1 107045 +107056 0 0 null null 5 107046 +107057 0 0 null null 5 107047 +107058 0 0 null 10102 1 107048 +107059 0 0 null null 1 107049 +107060 0 0 null null 5 107050 +107061 0 0 null null 5 107051 +107062 0 0 null null 1 107052 +107063 0 0 null null 1 107053 +107064 0 11 8|107#15#2#107014 null 1 107054 +107065 0 15 107023 null 4 null +107066 0 0 null null 4 null +107067 0 0 null null 4 null +107068 0 0 null null 4 null +107069 0 0 null null 4 null +107070 0 0 null null 4 null +107071 0 0 null null 4 null +107072 0 0 null null 4 null +108001 0 5 0 null 4 null +108002 0 0 null null 4 null +108003 0 5 null null 4 null +108004 0 0 null 10102 4 null +108005 0 0 null null 4 null +108006 0 0 null null 4 null +108007 0 0 null null 1 108014 +108008 0 0 null null 4 null +108009 0 1 10101 null 1 108015 +108010 0 0 null null 4 null +108011 0 1 10101 null 1 108016 +108012 0 0 null null 4 null +108013 0 1 10101 null 1 108017 +108014 0 0 null null 4 null +108015 0 1 10101 null 1 108018 +108016 0 0 null null 4 null +108017 0 15 108014 10102 4 null +108018 0 0 null null 4 null +108019 0 0 null null 1 108020 +108020 0 0 null null 4 null +108021 0 1 10101 null 1 108021 +108022 0 0 null null 4 null +108023 0 1 10101 null 1 108022 +108024 0 0 null null 4 null +108025 0 1 10101 null 1 108023 +108026 0 0 null null 4 null +108027 0 1 10101 null 1 108024 +108028 0 0 null null 4 null +108029 0 15 108015 10102 4 null +108030 0 0 null null 4 null +108031 0 0 null null 1 108026 +108032 0 0 null null 4 null +108033 0 1 10101 null 1 108027 +108034 0 0 null null 4 null +108035 0 1 10101 null 1 108028 +108036 0 0 null null 4 null +108037 0 1 10101 null 1 108029 +108038 0 0 null null 4 null +108039 0 1 10101 null 1 108030 +108040 0 0 null null 4 null +108041 0 15 108016 10102 4 null +108042 0 0 null null 4 null +108043 0 0 null null 1 108032 +108044 0 0 null null 4 null +108045 0 1 10101 null 1 108033 +108046 0 0 null null 4 null +108047 0 1 10101 null 1 108034 +108048 0 0 null null 4 null +108049 0 1 10101 null 1 108035 +108050 0 0 null null 4 null +108051 0 1 10101 null 1 108036 +108052 0 0 null null 4 null +108053 0 15 108017 10102 4 null +108054 0 0 null null 4 null +108055 0 0 null null 1 108038 +108056 0 0 null null 4 null +108057 0 1 10101 null 1 108039 +108058 0 0 null null 4 null +108059 0 1 10101 null 1 108040 +108060 0 0 null null 4 null +108061 0 1 10101 null 1 108041 +108062 0 0 null null 4 null +108063 0 1 10101 null 1 108042 +108064 0 0 null null 4 null +108065 0 1 10101 null 1 108043 +108066 0 0 null null 4 null +108067 0 1 10101 null 1 108044 +108068 0 0 null null 4 null +108069 0 1 10101 null 1 108045 +108070 0 0 null null 4 null +108071 0 1 10101 null 1 108046 +108072 0 0 null null 4 null +108073 0 1 10101 null 1 108047 +108074 0 0 null null 4 null +108075 0 0 null null 5 108048 +108076 0 0 null null 1 108049 +108077 0 0 null null 1 108050 +108078 0 0 null null 1 108051 +108079 0 0 null null 1 108052 +108080 0 0 null null 1 108053 +108081 0 0 null null 1 108054 +108082 0 1 10101 null 1 108055 +108083 0 0 null null 5 108056 +108084 0 0 null null 5 108057 +108085 0 0 null null 1 108058 +108086 0 0 null null 1 108059 +108087 0 0 null null 1 108060 +108088 0 0 null null 1 108061 +108089 0 0 null null 5 108062 +108090 0 0 null null 5 108063 +108091 0 0 null null 1 108064 +108092 0 0 null null 1 108065 +108093 0 22 9#108018#109#5#17 null 4 null +108094 0 0 null null 4 null +108095 1 2 1503#1 10102 4 null +108096 0 0 null null 4 null +108097 1 2 1503#1 10102 4 null +108098 0 0 null null 4 null +108099 1 2 1503#1 10102 4 null +108100 0 0 null null 4 null +109001 0 5 0 null 4 null +109002 0 0 null null 4 null +109003 0 19 10#0 null 4 null +109004 0 0 null 10102 4 null +109005 0 0 null null 1 109012 +109006 0 0 null null 4 null +109007 0 0 null null 4 null +109008 0 0 null null 4 null +109009 1 16 1503#1 null 5 109016 +109010 0 23 10 null 4 null +109011 0 0 null null 1 109017 +109012 0 0 null null 5 109018 +109013 0 0 null null 5 109019 +109014 0 0 null null 1 109020 +109015 0 0 null null 1 109021 +109016 0 0 null null 5 109022 +109017 0 0 null null 5 109023 +109018 0 9 10 null 4 null +109019 0 0 null null 1 109025 +109020 0 0 null null 1 109026 +109021 0 0 null null 1 109027 +109022 0 0 null null 5 109028 +109023 0 0 null null 5 109029 +109024 0 0 null null 1 109030 +109025 0 0 null null 1 109031 +109026 0 0 null null 1 109032 +109027 0 0 null null 1 109033 +109028 0 0 null null 1 109034 +109029 0 0 null null 1 109035 +109030 0 0 null null 1 109036 +109031 0 0 null null 1 109037 +109032 0 0 null null 1 109038 +109033 0 0 null null 1 109039 +109034 0 0 null null 1 109040 +109035 0 0 null null 1 109041 +109036 0 0 null null 1 109042 +109037 0 0 null null 4 null +109038 0 0 null null 1 109044 +109039 0 0 null null 4 null +109040 0 1 10101 null 1 109045 +109041 0 0 null null 4 null +109042 0 1 10101 null 1 109046 +109043 0 0 null null 4 null +109044 0 1 10101 null 1 109047 +109045 0 0 null null 4 null +109046 0 1 10101 null 1 109048 +109047 0 0 null null 4 null +109048 0 1 10101 null 1 109049 +109049 0 0 null null 4 null +109050 0 1 10101 null 1 109050 +109051 0 0 null null 4 null +109052 0 0 null 10102 1 109051 +109053 0 0 null null 4 null +109054 3 0 null null 1 109052 +109055 0 0 null null 4 null +109056 0 0 null 10102 1 109053 +109057 0 0 null null 4 null +109058 0 15 109017 null 4 null +109059 0 0 null null 4 null +109060 0 0 null null 4 null +109061 0 0 null null 4 null +109062 0 0 null null 4 null +109063 0 0 null null 4 null +109064 0 0 null null 4 null +109065 0 0 null null 4 null +109066 0 0 null null 4 null +109067 0 0 null null 4 null +109068 1 2 1503#1 10102 4 null +109069 0 0 null null 4 null +109070 1 2 1503#1 10102 4 null +109071 0 0 null null 4 null +109072 1 2 1503#1 10102 4 null +109073 0 0 null null 4 null +109074 1 2 1503#1 10102 4 null +109075 0 0 null null 4 null +109076 1 2 1503#1 10102 4 null +109077 0 0 null null 4 null +109078 1 2 1503#1 10102 4 null +109079 0 0 null null 4 null +110001 1 2 1503#1 10102 4 null +110002 0 0 null null 4 null +110003 1 2 1503#1 10102 4 null +110004 0 0 null null 4 null +110005 1 2 1503#1 10102 4 null +110006 0 0 null null 4 null +110007 1 2 1503#1 10102 4 null +110008 0 0 null null 4 null +110009 0 5 0 null 4 null +110010 0 0 null null 4 null +110011 0 0 null null 4 null +110012 0 0 null null 4 null diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index 70b299edd..a79fef35a 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -92,6 +92,7 @@ int int mut,int#int,1 int int 1321 2 100 1 0 1322 2 100 1 0 1323 2 100 1 0 +10001 1 1000#2000#101 3 0 10101 1 1000#2000 2 0 10102 1 1001#2001 2 0 10103 1 1002#2002 2 0 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 eec6de80b..89fdd51c7 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 @@ -204,7 +204,15 @@ public class MapLogic { } - public void updateMap(ISession session, int curXY, List cells, MessageTypeProto.MessageType messageType) throws Exception { + public void updateMap(ISession session, int curXY, int triggerXY, List cells, MessageTypeProto.MessageType messageType) throws Exception { + if (triggerXY != curXY) { + boolean isConnect = CellUtil.checkIsNextCell(curXY, triggerXY); + if (!isConnect) { + LOGGER.info("updateMap() curXY=>{},triggerXY=>{} is not connect", curXY, triggerXY); + MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); + return; + } + } if (cells.isEmpty()) { LOGGER.info("cells.isEmpty()"); MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); @@ -220,10 +228,14 @@ public class MapLogic { } Cell cell = mapManager.getMapInfo().get(curXY); if (cell == null) { - LOGGER.info("xy is wrong =>{}", curXY); - MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); - return; + cell = mapManager.getMapInfo().get(triggerXY); + if (cell == null) { + LOGGER.info("xy is wrong =>{} triggerXY=>{}", curXY, triggerXY); + MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); + return; + } } + mapManager.setTriggerXY(triggerXY); mapManager.addWalkCells(new HashSet<>(cells)); mapManager.setCurXY(curXY); MapInfoProto.MapUpdateResponse mapUpdateResponse = MapInfoProto.MapUpdateResponse.newBuilder() @@ -250,9 +262,12 @@ public class MapLogic { } Cell cell = mapManager.getMapInfo().get(mapManager.getCurXY()); if (cell == null) { - LOGGER.info("cell == null xy is wrong =>{}", mapManager.getCurXY()); - MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); - return; + cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); + if (cell == null) { + LOGGER.info("cell == null xy is wrong =>{} triggerXY=>{}", mapManager.getCurXY(), mapManager.getTriggerXY()); + MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); + return; + } } int bigEventId = cell.getEventId(); if (eventId != bigEventId) { @@ -284,9 +299,9 @@ public class MapLogic { MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); return; } - int schedule = cell.getPointId(); - if (schedule == -1) { - LOGGER.info("event is finished,bigEventId=>{} smallEventId=>{}", bigEventId, -1); + MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(cell.getPointId()); + if (mapPointConfig == null) { + LOGGER.info("event is finished,bigEventId=>{} smallEventId=>{}", bigEventId, cell.getPointId()); MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); return; } @@ -354,7 +369,12 @@ public class MapLogic { break; } } - cell = mapManager.getMapInfo().get(mapManager.getCurXY()); + if (mapPointConfig.getTriggerRules() == 1) { + cell = mapManager.getMapInfo().get(mapManager.getCurXY()); + } else { + cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); + } + // 检测该事件点是否已被销毁 if (cell != null) { cell.setEventId(nextPoint); @@ -388,8 +408,8 @@ public class MapLogic { if (dropBuilder != null) { eventUpdateResponse.setDrop(dropBuilder); } - LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextPoint=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(), - cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextPoint); +// LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextPoint=>{}, eventBehaviorCommon=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(), +// cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextPoint, eventBehaviorCommon); MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true); } @@ -478,13 +498,17 @@ public class MapLogic { MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); return; } + resetMapInfo(mapManager); + MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true); + } + + public void resetMapInfo(MapManager mapManager) throws Exception { mapManager.setMapInfo(new HashMap<>()); mapManager.setHeroes(new HashSet<>()); mapManager.setTypeEight(new HashMap<>()); mapManager.setWalkCells(new HashSet<>()); mapManager.setCurXY(0); mapManager.setCurMapId(0); - MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true); } //在地图吃东西 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 9d1a1808b..676b23790 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -16,6 +16,8 @@ public class MapManager extends MongoBase { private int curXY; + private int triggerXY; + private int maxMapId; private Set heroes; @@ -135,4 +137,12 @@ public class MapManager extends MongoBase { this.totalStep = totalStep; } + public int getTriggerXY() { + return triggerXY; + } + + public void setTriggerXY(int triggerXY) { + updateString( "triggerXY", triggerXY); + this.triggerXY = triggerXY; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapUpdateRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapUpdateRequestHandler.java index e530b8c51..3756c7bb9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapUpdateRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapUpdateRequestHandler.java @@ -19,6 +19,6 @@ public class MapUpdateRequestHandler extends BaseHandler{ public void process(ISession iSession, PacketNetData netData) throws Exception { byte[] message = netData.parseClientProtoNetData(); MapInfoProto.MapUpdateRequest mapEnterRequest = MapInfoProto.MapUpdateRequest.parseFrom(message); - MapLogic.getInstance().updateMap(iSession, mapEnterRequest.getCurXY(), mapEnterRequest.getCellsList(), MessageTypeProto.MessageType.MAP_UDPATE_RESPONSE); + MapLogic.getInstance().updateMap(iSession, mapEnterRequest.getCurXY(), mapEnterRequest.getTriggerXY(), mapEnterRequest.getCellsList(), MessageTypeProto.MessageType.MAP_UDPATE_RESPONSE); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java index 163fc5fc2..8db2dca3f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java @@ -6,6 +6,7 @@ import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.handler.map.Cell; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.map.MapManager; +import com.ljsd.jieling.handler.mission.CheckMissionReturn; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionLogic; import com.ljsd.jieling.logic.dao.Hero; @@ -28,11 +29,11 @@ public class BehaviorUtil { * @param user * @throws Exception */ - public static void distoryPoint(User user, int[][] behaviorTypeValues) throws Exception { + public static void distoryPoint(User user, int needDistoryPointId) throws Exception { Map mapInfo = user.getMapManager().getMapInfo(); Set needDelete = new HashSet<>(); for (Map.Entry entry : mapInfo.entrySet()) { - if (entry.getValue().getPointId() == behaviorTypeValues[0][0]) { + if (entry.getValue().getPointId() == needDistoryPointId) { needDelete.add(entry.getKey()); } } @@ -40,7 +41,6 @@ public class BehaviorUtil { mapInfo.remove(xy); } user.getMapManager().setMapInfo(mapInfo); - LOGGER.info("distoryPoint=========>{}", user.getMapManager().getCurXY()); } /** @@ -86,15 +86,17 @@ public class BehaviorUtil { /** * 更新任务 */ - public static boolean updateMission(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception{ + public static boolean updateMission(User user, int missionId, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception{ Map doingMissions = user.getMissionManager().getDoingMissions(); - Mission mission = doingMissions.get(behaviorTypeValues[0][0]); + Mission mission = doingMissions.get(missionId); if (mission == null) { return false; } - MissionLogic.getInstance().checkMission(mission, user); - CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission); - eventUpdateResponse.addMission(missionProto); + CheckMissionReturn checkMissionReturn = MissionLogic.getInstance().checkMission(mission, user); + for (Mission missions : checkMissionReturn.missions) { + CommonProto.Mission missionProto = MapLogic.getInstance().getMission(missions); + eventUpdateResponse.addMission(missionProto); + } return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointAndBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointAndBehavior.java index b75e73b21..b726810b0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointAndBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointAndBehavior.java @@ -14,7 +14,7 @@ public class DestroyPointAndBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - BehaviorUtil.distoryPoint(user, behaviorTypeValues); + BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][1]); // TODO 监视地图 return true; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java index f325d5b3d..a3749a282 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java @@ -17,7 +17,7 @@ public class DestroyPointBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - BehaviorUtil.distoryPoint(user, behaviorTypeValues); + BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][0]); return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightAndDestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightAndDestroyPointBehavior.java index 8d2dc2f74..9118feb41 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightAndDestroyPointBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightAndDestroyPointBehavior.java @@ -15,7 +15,7 @@ public class FightAndDestroyPointBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { BehaviorUtil.getFightInfo(user, behaviorTypeValues, eventUpdateResponse); - BehaviorUtil.distoryPoint(user, behaviorTypeValues); - return false; + BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][1]); + return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java index 7687098d1..a7f141fc7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java @@ -1,23 +1,10 @@ package com.ljsd.jieling.handler.map.behavior; -import com.ljsd.jieling.core.GlobalsDef; -import com.ljsd.jieling.db.redis.RedisKey; -import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.handler.map.MapManager; -import com.ljsd.jieling.logic.dao.Hero; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.hero.HeroLogic; -import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; -import com.ljsd.jieling.util.CBean2Proto; -import com.ljsd.jieling.util.MonsterUtil; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - @Component public class FightBehavior extends BaseBehavior { @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java index c9028d911..08a23db34 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java @@ -14,6 +14,6 @@ public class FinishMissionBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - return BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse); + return BehaviorUtil.updateMission(user, behaviorTypeValues[0][0], eventUpdateResponse); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java index 0908f84fb..e0ec5ee11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java @@ -19,7 +19,9 @@ public class JumpBehavior extends BaseBehavior { user.getMapManager().setCurMapId(behaviorTypeValues[0][0]); MapLogic.getInstance().initMap(user.getMapManager(), user); return true; + } else { + MapLogic.getInstance().resetMapInfo(user.getMapManager()); } - return false; + return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java index 5a75ef190..a2b4ad49c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java @@ -17,18 +17,21 @@ public class MonitorMissionAndDestroyPointBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse); + // 1#101011|101#13#18#101012|101#12#13#101009 + BehaviorUtil.updateMission(user, behaviorTypeValues[0][0], eventUpdateResponse); // 销毁事件点 - BehaviorUtil.distoryPoint(user, behaviorTypeValues); + BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][1]); // 开新事件 - if (user.getMapManager().getCurMapId() == behaviorTypeValues[0][1]) { - int x = behaviorTypeValues[1][0]; - int y = behaviorTypeValues[1][1]; - int xy = CellUtil.xy2Pos(x, y); - MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(behaviorTypeValues[1][2]); - Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId()); - user.getMapManager().addOrUpdateCell(xy, cellValue); + if (user.getMapManager().getCurMapId() == behaviorTypeValues[1][0]) { + for (int i = 1; i < behaviorTypeValues.length; i++) { + int x = behaviorTypeValues[i][1]; + int y = behaviorTypeValues[i][2]; + int xy = CellUtil.xy2Pos(x, y); + MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(behaviorTypeValues[i][3]); + Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId()); + user.getMapManager().addOrUpdateCell(xy, cellValue); + } } - return false; + return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java index 230e88949..ad5398681 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java @@ -15,7 +15,7 @@ public class MonitorMissionAndMoveBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse); + BehaviorUtil.updateMission(user, behaviorTypeValues[0][0], eventUpdateResponse); // 0的时候回城 if (behaviorTypeValues[0][1] == 0) { return false; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java index 8b5c2cd7a..d7c3db571 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java @@ -1,14 +1,11 @@ package com.ljsd.jieling.handler.map.behavior; -import com.ljsd.jieling.handler.map.Cell; import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; -import java.util.Map; - @Component public class UseItemAndDestroyBehavior extends BaseBehavior { @Override @@ -22,7 +19,7 @@ public class UseItemAndDestroyBehavior extends BaseBehavior { if (!isEnough) { return isEnough; } - BehaviorUtil.distoryPoint(user, behaviorTypeValues); + BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][2]); return true; } } diff --git a/test/src/main/java/ExcelUtils.java b/test/src/main/java/ExcelUtils.java index 7e5782d99..a047a63c5 100644 --- a/test/src/main/java/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -7,7 +7,7 @@ import java.util.*; public class ExcelUtils { private static boolean isWrite = true; - private static String excelPath ="C:/ljsd/demo/tmp/Map_data/"; //excel 文件 + private static String excelPath ="C:/ljsd/demo/tmp/"; //excel 文件 private static String path = "conf/server/"; private static Set oldFileNames = new HashSet<>(); private static String javaFilePath = "serverlogic/src/main/java/com/ljsd/jieling/config/"; @@ -249,8 +249,9 @@ public class ExcelUtils { Object[][] aa = new Object[rowNum][]; for (int i = 0; i < rowNum; i++) { Row row = sheet.getRow(i); - Object[] bb = new Object[rowNum]; - for (int j = 0; j < rowNum; j++) { + int physicalNumberOfCells = row.getPhysicalNumberOfCells(); + Object[] bb = new Object[physicalNumberOfCells]; + for (int j = 0; j < physicalNumberOfCells; j++) { //文件名 Object cellData = getCellFormatValue(row.getCell(j),null); if (!"".equals(cellData)) {