From aa3c588b8752d94d64e816c8c42e9c4faf50b2fa Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 25 Apr 2019 10:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/AccomplishmentConfig.txt | 13 + conf/server/ActivityRewardConfig.txt | 30 +- conf/server/AdventureConfig.txt | 10 +- conf/server/ArtResourcesConfig.txt | 4 + conf/server/ChallengeConfig.txt | 24 +- conf/server/ChallengeMapConfig.txt | 2 + conf/server/ChallengeMissionConfig.txt | 4 +- conf/server/DifferDemonsComonpentsConfig.txt | 162 +++++----- conf/server/EquipConfig.txt | 234 +++++++-------- conf/server/EventPointConfig.txt | 166 +++++----- conf/server/FoodsConfig.txt | 1 + conf/server/GlobalSystemConfig.txt | 30 +- conf/server/GuideConfig.txt | 6 + conf/server/LevelDifficultyConfig.txt | 10 +- conf/server/LotteryRewardConfig.txt | 8 +- conf/server/MapPointConfig.txt | 57 ++-- conf/server/Map_108.txt | 2 +- conf/server/Map_109.txt | 94 +----- conf/server/Map_110.txt | 30 +- conf/server/MonsterConfig.txt | 284 ++++++++++-------- conf/server/MonsterGroup.txt | 51 ++-- conf/server/OptionAddCondition.txt | 10 +- conf/server/OptionConfig.txt | 198 ++++++------ conf/server/RewardGroup.txt | 13 + conf/server/RewardItemConfig.txt | 21 +- conf/server/SkillLogicConfig.txt | 40 +-- .../ljsd/jieling/handler/map/MapLogic.java | 3 +- 27 files changed, 786 insertions(+), 721 deletions(-) diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index ffd6232c5..1681d3d8e 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -52,3 +52,16 @@ int int int mut,int#int,2 int 50 108 7 0|2 5 51 108 7 0|4 10 52 108 7 0|6 15 +53 109 2 10909|1 20 +54 109 1 109017|1 15 +55 109 1 109044|1 10 +56 109 2 10910|1 15 +57 109 3 0|13 20 +58 109 7 0|1 5 +59 109 7 0|3 15 +60 110 2 11007|1 20 +61 110 2 11008|1 20 +62 110 1 110045|1 25 +63 110 3 0|13 15 +64 110 7 0|1 5 +65 110 7 0|3 15 diff --git a/conf/server/ActivityRewardConfig.txt b/conf/server/ActivityRewardConfig.txt index 2de20ee11..0f763ae59 100644 --- a/conf/server/ActivityRewardConfig.txt +++ b/conf/server/ActivityRewardConfig.txt @@ -1,24 +1,26 @@ Id ActivityId Values Reward int int mut,int#int,2 mut,int#int,2 -1 2 1 19#10|3#5000|14#500000 -2 2 2 10003#1|4#100|14#600000 +1 2 1 19#10|3#1000|14#500000|4#200 +2 2 2 10003#1|4#100|14#600000|3#400 3 2 3 3203#1|3211#1|3215#1|3217#1 -4 2 4 19#10|3#5000|14#500000 -5 2 5 15#888|14#30000 -6 2 6 19#10|3#5000|14#500000 +4 2 4 19#10|3#5000|14#500000|4#500 +5 2 5 16#888|14#30000|4#500|3#3000 +6 2 6 19#10|3#5000|14#500000|4#500 7 2 7 3303#1|3311#1|3315#1|3317#1 11 1 5 14#100000 -12 1 10 3#3000 -13 1 15 14#200000 -14 1 20 3#4000 -15 1 25 14#300000 +12 1 10 3#1000 +13 1 15 14#150000 +14 1 20 3#2000 +15 1 25 14#200000 16 1 30 4#500 -17 1 40 14#400000 -18 1 60 4#1000 -19 1 90 14#500000 -20 1 120 4#1500 +17 1 40 14#250000 +18 1 60 2#200|4#500 +19 1 90 14#300000 +20 1 120 19#10|4#600 +21 1 150 14#400000 +22 1 180 19#10|4#700 31 3 1051 14#300000 -32 3 2051 3#5000 +32 3 2051 3#1000 33 3 3051 10007#1 34 3 4051 14#500000 35 3 5051 4#1000 diff --git a/conf/server/AdventureConfig.txt b/conf/server/AdventureConfig.txt index 4ced275ca..14ef52ff5 100644 --- a/conf/server/AdventureConfig.txt +++ b/conf/server/AdventureConfig.txt @@ -1,7 +1,7 @@ Id OpenLevel MaxNum BaseRewardGroup RandomRewardGroup NumIncome LeaveBonus int int int mut,int#int,1 mut,int#int,1 mut,float#float,2 int -1 9 5 101 111#121#131#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -2 24 5 102 112#122#132#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -3 36 5 103 113#123#133#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -4 54 5 104 114#124#134#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -5 61 5 105 115#125#135#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +1 9 5 151 111#121#131#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +2 16 5 152 112#122#132#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +3 22 5 153 113#123#133#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +4 24 5 154 114#124#134#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +5 25 5 155 115#125#135#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 diff --git a/conf/server/ArtResourcesConfig.txt b/conf/server/ArtResourcesConfig.txt index b4cdf19b7..967fbed31 100644 --- a/conf/server/ArtResourcesConfig.txt +++ b/conf/server/ArtResourcesConfig.txt @@ -393,6 +393,10 @@ int 16030 16031 16032 +16033 +16034 +16035 +16036 18001 18002 18003 diff --git a/conf/server/ChallengeConfig.txt b/conf/server/ChallengeConfig.txt index dd92e2d26..8d250ec37 100644 --- a/conf/server/ChallengeConfig.txt +++ b/conf/server/ChallengeConfig.txt @@ -1,11 +1,13 @@ -Id OpenRule MapTime ReviveTime -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 -103 0#0 600 0#0#0#10 -104 0#0 600 0#0#0#10 -105 0#0 900 0#0#0#10 -106 0#0 900 0#0#0#10 -107 0#0 900 0#0#0#10 -108 0#0 900 0#0#0#10 +Id OpenRule Time MapTime ReviveTime +int mut,int#int,2 int int mut,int#int,1 +100 0#0 120 2147483647 0#0#0#10 +101 0#0 120 600 0#0#0#10 +102 0#0 180 600 0#0#0#10 +103 0#0 180 600 0#0#0#10 +104 0#0 240 600 0#0#0#10 +105 0#0 240 900 0#0#0#10 +106 0#0 240 900 0#0#0#10 +107 0#0 240 900 0#0#0#10 +108 0#0 240 1200 0#0#0#10 +109 0#0 240 1200 0#0#0#10 +110 0#0 240 1200 0#0#0#10 diff --git a/conf/server/ChallengeMapConfig.txt b/conf/server/ChallengeMapConfig.txt index 66c55441b..d923803a9 100644 --- a/conf/server/ChallengeMapConfig.txt +++ b/conf/server/ChallengeMapConfig.txt @@ -9,3 +9,5 @@ int int mut,int#int,1 int int mut,int#int,1 mut,int#int,1 106 7 20#30 0 0 2001 11#17 107 8 15#20 0 0 2001 5#2 108 9 20#15 0 0 2001 19#6 +109 10 10#20 0 0 2001 5#20 +110 11 15#20 0 0 2001 13#17 diff --git a/conf/server/ChallengeMissionConfig.txt b/conf/server/ChallengeMissionConfig.txt index eda1dfb1d..cef3072d1 100644 --- a/conf/server/ChallengeMissionConfig.txt +++ b/conf/server/ChallengeMissionConfig.txt @@ -9,8 +9,8 @@ int int mut,int#int,1 7 1 2006 8 1 2007 9 1 2008 -10 2 2009 -11 1 2010 +10 1 2009 +11 5 2010 12 2 2009 101 4 2002 102 3 2002 diff --git a/conf/server/DifferDemonsComonpentsConfig.txt b/conf/server/DifferDemonsComonpentsConfig.txt index 0826bb252..69be725ad 100644 --- a/conf/server/DifferDemonsComonpentsConfig.txt +++ b/conf/server/DifferDemonsComonpentsConfig.txt @@ -1,25 +1,25 @@ Id ComonpentsId Stage Cost BaseAttribute int int int mut,int#int,2 mut,int#int,2 -1 6001 1 6001#1|5#0 1#842|2#7 -2 6001 2 6001#1|5#40 1#2105|2#17 -3 6001 3 6001#2|5#65 1#3368|2#28 -4 6001 4 6001#2|5#100 1#5052|2#42 -5 6001 5 6001#3|5#135 1#7157|2#59 -6 6001 6 6001#3|5#180 1#9684|2#80 -7 6001 7 6001#4|5#235 1#12631|2#105 -8 6001 8 6001#5|5#290 1#16000|2#133 -9 6001 9 6001#6|5#355 1#19789|2#164 -10 6001 10 6001#8|5#420 1#24000|2#200 -11 6002 1 6002#1|5#0 1#842|3#35 -12 6002 2 6002#1|5#40 1#2105|3#85 -13 6002 3 6002#2|5#65 1#3368|3#140 -14 6002 4 6002#2|5#100 1#5052|3#210 -15 6002 5 6002#3|5#135 1#7157|3#295 -16 6002 6 6002#3|5#180 1#9684|3#400 -17 6002 7 6002#4|5#235 1#12631|3#525 -18 6002 8 6002#5|5#290 1#16000|3#665 -19 6002 9 6002#6|5#355 1#19789|3#820 -20 6002 10 6002#8|5#420 1#24000|3#1000 +1 6001 1 6001#1|5#0 1#842|2#7|6#842 +2 6001 2 6001#1|5#40 1#2105|2#17|6#2105 +3 6001 3 6001#2|5#65 1#3368|2#28|6#3368 +4 6001 4 6001#2|5#100 1#5052|2#42|6#5052 +5 6001 5 6001#3|5#135 1#7157|2#59|6#7157 +6 6001 6 6001#3|5#180 1#9684|2#80|6#9684 +7 6001 7 6001#4|5#235 1#12631|2#105|6#12631 +8 6001 8 6001#5|5#290 1#16000|2#133|6#16000 +9 6001 9 6001#6|5#355 1#19789|2#164|6#19789 +10 6001 10 6001#8|5#420 1#24000|2#200|6#24000 +11 6002 1 6002#1|5#0 1#842|3#35|6#842 +12 6002 2 6002#1|5#40 1#2105|3#85|6#2105 +13 6002 3 6002#2|5#65 1#3368|3#140|6#3368 +14 6002 4 6002#2|5#100 1#5052|3#210|6#5052 +15 6002 5 6002#3|5#135 1#7157|3#295|6#7157 +16 6002 6 6002#3|5#180 1#9684|3#400|6#9684 +17 6002 7 6002#4|5#235 1#12631|3#525|6#12631 +18 6002 8 6002#5|5#290 1#16000|3#665|6#16000 +19 6002 9 6002#6|5#355 1#19789|3#820|6#19789 +20 6002 10 6002#8|5#420 1#24000|3#1000|6#24000 21 6003 1 6003#1|5#0 2#7|3#70 22 6003 2 6003#1|5#40 2#17|3#175 23 6003 3 6003#2|5#65 2#28|3#280 @@ -30,26 +30,26 @@ int int int mut,int#int,2 mut,int#int,2 28 6003 8 6003#5|5#290 2#133|3#1330 29 6003 9 6003#6|5#355 2#164|3#1645 30 6003 10 6003#8|5#420 2#200|3#2000 -31 6004 1 6004#1|5#0 1#842|2#7 -32 6004 2 6004#1|5#40 1#2105|2#17 -33 6004 3 6004#2|5#65 1#3368|2#28 -34 6004 4 6004#2|5#100 1#5052|2#42 -35 6004 5 6004#3|5#135 1#7157|2#59 -36 6004 6 6004#3|5#180 1#9684|2#80 -37 6004 7 6004#4|5#235 1#12631|2#105 -38 6004 8 6004#5|5#290 1#16000|2#133 -39 6004 9 6004#6|5#355 1#19789|2#164 -40 6004 10 6004#8|5#420 1#24000|2#200 -41 6005 1 6005#1|5#0 1#842|4#70 -42 6005 2 6005#1|5#40 1#2105|4#175 -43 6005 3 6005#2|5#65 1#3368|4#280 -44 6005 4 6005#2|5#100 1#5052|4#420 -45 6005 5 6005#3|5#135 1#7157|4#595 -46 6005 6 6005#3|5#180 1#9684|4#805 -47 6005 7 6005#4|5#235 1#12631|4#1050 -48 6005 8 6005#5|5#290 1#16000|4#1330 -49 6005 9 6005#6|5#355 1#19789|4#1645 -50 6005 10 6005#8|5#420 1#24000|4#2000 +31 6004 1 6004#1|5#0 1#842|2#7|6#842 +32 6004 2 6004#1|5#40 1#2105|2#17|6#2105 +33 6004 3 6004#2|5#65 1#3368|2#28|6#3368 +34 6004 4 6004#2|5#100 1#5052|2#42|6#5052 +35 6004 5 6004#3|5#135 1#7157|2#59|6#7157 +36 6004 6 6004#3|5#180 1#9684|2#80|6#9684 +37 6004 7 6004#4|5#235 1#12631|2#105|6#12631 +38 6004 8 6004#5|5#290 1#16000|2#133|6#16000 +39 6004 9 6004#6|5#355 1#19789|2#164|6#19789 +40 6004 10 6004#8|5#420 1#24000|2#200|6#24000 +41 6005 1 6005#1|5#0 1#842|4#70|6#842 +42 6005 2 6005#1|5#40 1#2105|4#175|6#2105 +43 6005 3 6005#2|5#65 1#3368|4#280|6#3368 +44 6005 4 6005#2|5#100 1#5052|4#420|6#5052 +45 6005 5 6005#3|5#135 1#7157|4#595|6#7157 +46 6005 6 6005#3|5#180 1#9684|4#805|6#9684 +47 6005 7 6005#4|5#235 1#12631|4#1050|6#12631 +48 6005 8 6005#5|5#290 1#16000|4#1330|6#16000 +49 6005 9 6005#6|5#355 1#19789|4#1645|6#19789 +50 6005 10 6005#8|5#420 1#24000|4#2000|6#24000 51 6006 1 6006#1|5#0 2#7|4#70 52 6006 2 6006#1|5#40 2#17|4#175 53 6006 3 6006#2|5#65 2#28|4#280 @@ -60,26 +60,26 @@ int int int mut,int#int,2 mut,int#int,2 58 6006 8 6006#5|5#290 2#133|4#1330 59 6006 9 6006#6|5#355 2#164|4#1645 60 6006 10 6006#8|5#420 2#200|4#2000 -61 6007 1 6007#1|5#0 1#842|2#7 -62 6007 2 6007#1|5#40 1#2105|2#17 -63 6007 3 6007#2|5#65 1#3368|2#28 -64 6007 4 6007#2|5#100 1#5052|2#42 -65 6007 5 6007#3|5#135 1#7157|2#59 -66 6007 6 6007#3|5#180 1#9684|2#80 -67 6007 7 6007#4|5#235 1#12631|2#105 -68 6007 8 6007#5|5#290 1#16000|2#133 -69 6007 9 6007#6|5#355 1#19789|2#164 -70 6007 10 6007#8|5#420 1#24000|2#200 -71 6008 1 6008#1|5#0 1#842|53#1 -72 6008 2 6008#1|5#40 1#2105|53#2 -73 6008 3 6008#2|5#65 1#3368|53#4 -74 6008 4 6008#2|5#100 1#5052|53#6 -75 6008 5 6008#3|5#135 1#7157|53#9 -76 6008 6 6008#3|5#180 1#9684|53#12 -77 6008 7 6008#4|5#235 1#12631|53#16 -78 6008 8 6008#5|5#290 1#16000|53#20 -79 6008 9 6008#6|5#355 1#19789|53#25 -80 6008 10 6008#8|5#420 1#24000|53#30 +61 6007 1 6007#1|5#0 1#842|2#7|6#842 +62 6007 2 6007#1|5#40 1#2105|2#17|6#2105 +63 6007 3 6007#2|5#65 1#3368|2#28|6#3368 +64 6007 4 6007#2|5#100 1#5052|2#42|6#5052 +65 6007 5 6007#3|5#135 1#7157|2#59|6#7157 +66 6007 6 6007#3|5#180 1#9684|2#80|6#9684 +67 6007 7 6007#4|5#235 1#12631|2#105|6#12631 +68 6007 8 6007#5|5#290 1#16000|2#133|6#16000 +69 6007 9 6007#6|5#355 1#19789|2#164|6#19789 +70 6007 10 6007#8|5#420 1#24000|2#200|6#24000 +71 6008 1 6008#1|5#0 1#842|53#1|6#842 +72 6008 2 6008#1|5#40 1#2105|53#2|6#2105 +73 6008 3 6008#2|5#65 1#3368|53#4|6#3368 +74 6008 4 6008#2|5#100 1#5052|53#6|6#5052 +75 6008 5 6008#3|5#135 1#7157|53#9|6#7157 +76 6008 6 6008#3|5#180 1#9684|53#12|6#9684 +77 6008 7 6008#4|5#235 1#12631|53#16|6#12631 +78 6008 8 6008#5|5#290 1#16000|53#20|6#16000 +79 6008 9 6008#6|5#355 1#19789|53#25|6#19789 +80 6008 10 6008#8|5#420 1#24000|53#30|6#24000 81 6009 1 6009#1|5#0 2#7|53#1 82 6009 2 6009#1|5#40 2#17|53#2 83 6009 3 6009#2|5#65 2#28|53#4 @@ -90,26 +90,26 @@ int int int mut,int#int,2 mut,int#int,2 88 6009 8 6009#5|5#290 2#133|53#20 89 6009 9 6009#6|5#355 2#164|53#25 90 6009 10 6009#8|5#420 2#200|53#30 -91 6010 1 6010#1|5#0 1#842|2#7 -92 6010 2 6010#1|5#40 1#2105|2#17 -93 6010 3 6010#2|5#65 1#3368|2#28 -94 6010 4 6010#2|5#100 1#5052|2#42 -95 6010 5 6010#3|5#135 1#7157|2#59 -96 6010 6 6010#3|5#180 1#9684|2#80 -97 6010 7 6010#4|5#235 1#12631|2#105 -98 6010 8 6010#5|5#290 1#16000|2#133 -99 6010 9 6010#6|5#355 1#19789|2#164 -100 6010 10 6010#8|5#420 1#24000|2#200 -101 6011 1 6011#1|5#0 1#842|54#1 -102 6011 2 6011#1|5#40 1#2105|54#2 -103 6011 3 6011#2|5#65 1#3368|54#4 -104 6011 4 6011#2|5#100 1#5052|54#6 -105 6011 5 6011#3|5#135 1#7157|54#9 -106 6011 6 6011#3|5#180 1#9684|54#12 -107 6011 7 6011#4|5#235 1#12631|54#16 -108 6011 8 6011#5|5#290 1#16000|54#20 -109 6011 9 6011#6|5#355 1#19789|54#25 -110 6011 10 6011#8|5#420 1#24000|54#30 +91 6010 1 6010#1|5#0 1#842|2#7|6#842 +92 6010 2 6010#1|5#40 1#2105|2#17|6#2105 +93 6010 3 6010#2|5#65 1#3368|2#28|6#3368 +94 6010 4 6010#2|5#100 1#5052|2#42|6#5052 +95 6010 5 6010#3|5#135 1#7157|2#59|6#7157 +96 6010 6 6010#3|5#180 1#9684|2#80|6#9684 +97 6010 7 6010#4|5#235 1#12631|2#105|6#12631 +98 6010 8 6010#5|5#290 1#16000|2#133|6#16000 +99 6010 9 6010#6|5#355 1#19789|2#164|6#19789 +100 6010 10 6010#8|5#420 1#24000|2#200|6#24000 +101 6011 1 6011#1|5#0 1#842|54#1|6#842 +102 6011 2 6011#1|5#40 1#2105|54#2|6#2105 +103 6011 3 6011#2|5#65 1#3368|54#4|6#3368 +104 6011 4 6011#2|5#100 1#5052|54#6|6#5052 +105 6011 5 6011#3|5#135 1#7157|54#9|6#7157 +106 6011 6 6011#3|5#180 1#9684|54#12|6#9684 +107 6011 7 6011#4|5#235 1#12631|54#16|6#12631 +108 6011 8 6011#5|5#290 1#16000|54#20|6#16000 +109 6011 9 6011#6|5#355 1#19789|54#25|6#19789 +110 6011 10 6011#8|5#420 1#24000|54#30|6#24000 111 6012 1 6012#1|5#0 2#7|54#1 112 6012 2 6012#1|5#40 2#17|54#2 113 6012 3 6012#2|5#65 2#28|54#4 @@ -120,7 +120,7 @@ int int int mut,int#int,2 mut,int#int,2 118 6012 8 6012#5|5#290 2#133|54#20 119 6012 9 6012#6|5#355 2#164|54#25 120 6012 10 6012#8|5#420 2#200|54#30 -121 6013 1 6013#1|5#0 1#1347|2#11 +121 6013 1 6013#1|5#0 1#1347|2#11|6#1347 122 6013 2 6013#1|5#40 1#3368|2#28|101#2 123 6013 3 6013#2|5#65 1#5389|2#44 124 6013 4 6013#2|5#100 1#8084|2#67|101#6 diff --git a/conf/server/EquipConfig.txt b/conf/server/EquipConfig.txt index 96eb40f2d..cd0cc2d9a 100644 --- a/conf/server/EquipConfig.txt +++ b/conf/server/EquipConfig.txt @@ -1,119 +1,119 @@ Id Quality ProfessionLimit Position PropertyMin PropertyMax Pool SecondNumMin SecondNumMax SkillId IfClear int int int int mut,int#int,1 mut,int#int,1 int int int int int -3001 1 3 1 2#42 2#70 1 0 0 0 0 -3002 1 3 1 2#42 2#70 1 0 0 0 0 -3003 1 5 1 2#42 2#70 1 0 0 0 0 -3004 1 5 1 2#42 2#70 1 0 0 0 0 -3005 1 1 1 2#42 2#70 1 0 0 0 0 -3006 1 1 1 2#42 2#70 1 0 0 0 0 -3007 1 2 1 2#42 2#70 1 0 0 0 0 -3008 1 2 1 2#42 2#70 1 0 0 0 0 -3009 1 4 1 2#42 2#70 1 0 0 0 0 -3010 1 4 1 2#42 2#70 1 0 0 0 0 -3011 1 0 2 3#43 3#72 1 0 0 0 0 -3012 1 0 2 3#43 3#72 1 0 0 0 0 -3013 1 0 2 4#40 4#67 1 0 0 0 0 -3014 1 0 2 4#40 4#67 1 0 0 0 0 -3015 1 0 4 5#24 5#28 1 0 0 0 0 -3016 1 0 4 5#24 5#28 1 0 0 0 0 -3017 1 0 3 1#460 1#767 1 0 0 0 0 -3018 1 0 3 1#460 1#767 1 0 0 0 0 -3101 2 3 1 2#56 2#93 1 0 1 0 0 -3102 2 3 1 2#56 2#93 1 0 1 0 0 -3103 2 5 1 2#56 2#93 1 0 1 0 0 -3104 2 5 1 2#56 2#93 1 0 1 0 0 -3105 2 1 1 2#56 2#93 1 0 1 0 0 -3106 2 1 1 2#56 2#93 1 0 1 0 0 -3107 2 2 1 2#56 2#93 1 0 1 0 0 -3108 2 2 1 2#56 2#93 1 0 1 0 0 -3109 2 4 1 2#56 2#93 1 0 1 0 0 -3110 2 4 1 2#56 2#93 1 0 1 0 0 -3111 2 0 2 3#58 3#96 2 0 1 0 0 -3112 2 0 2 3#58 3#96 2 0 1 0 0 -3113 2 0 2 4#54 4#90 2 0 1 0 0 -3114 2 0 2 4#54 4#90 2 0 1 0 0 -3115 2 0 4 5#48 5#56 3 0 1 0 0 -3116 2 0 4 5#48 5#56 3 0 1 0 0 -3117 2 0 3 1#616 1#1027 4 0 1 0 0 -3118 2 0 3 1#616 1#1027 4 0 1 0 0 -3201 3 3 1 2#72 2#120 5 1 3 0 1 -3202 3 3 1 2#72 2#120 5 1 3 0 1 -3203 3 5 1 2#72 2#120 5 1 3 0 1 -3204 3 5 1 2#72 2#120 5 1 3 0 1 -3205 3 1 1 2#72 2#120 5 1 3 0 1 -3206 3 1 1 2#72 2#120 5 1 3 0 1 -3207 3 2 1 2#72 2#120 5 1 3 0 1 -3208 3 2 1 2#72 2#120 5 1 3 0 1 -3209 3 4 1 2#72 2#120 5 1 3 0 1 -3210 3 4 1 2#72 2#120 5 1 3 0 1 -3211 3 0 2 3#74 3#124 6 1 3 0 1 -3212 3 0 2 3#74 3#124 6 1 3 0 1 -3213 3 0 2 4#70 4#116 6 1 3 0 1 -3214 3 0 2 4#70 4#116 6 1 3 0 1 -3215 3 0 4 5#72 5#84 7 1 3 0 1 -3216 3 0 4 5#72 5#84 7 1 3 0 1 -3217 3 0 3 1#792 1#1320 8 1 3 0 1 -3218 3 0 3 1#792 1#1320 8 1 3 0 1 -3301 4 3 1 2#383 2#638 9 2 4 0 1 -3302 4 3 1 2#383 2#638 9 2 4 0 1 -3303 4 5 1 2#383 2#638 9 2 4 0 1 -3304 4 5 1 2#383 2#638 9 2 4 0 1 -3305 4 1 1 2#383 2#638 9 2 4 0 1 -3306 4 1 1 2#383 2#638 9 2 4 0 1 -3307 4 2 1 2#383 2#638 9 2 4 0 1 -3308 4 2 1 2#383 2#638 9 2 4 0 1 -3309 4 4 1 2#383 2#638 9 2 4 0 1 -3310 4 4 1 2#383 2#638 9 2 4 0 1 -3311 4 0 2 3#396 3#659 10 2 4 0 1 -3312 4 0 2 3#396 3#659 10 2 4 0 1 -3313 4 0 2 4#370 4#617 10 2 4 0 1 -3314 4 0 2 4#370 4#617 10 2 4 0 1 -3315 4 0 4 5#96 5#113 11 2 4 0 1 -3316 4 0 4 5#96 5#113 11 2 4 0 1 -3317 4 0 3 1#4212 1#7020 12 2 4 0 1 -3318 4 0 3 1#4212 1#7020 12 2 4 0 1 -3319 4 3 1 2#383 2#638 9 2 4 1000111 1 -3320 4 3 1 2#383 2#638 9 2 4 1000111 1 -3321 4 5 1 2#383 2#638 9 2 4 1000111 1 -3322 4 5 1 2#383 2#638 9 2 4 1000111 1 -3323 4 1 1 2#383 2#638 9 2 4 1000111 1 -3324 4 1 1 2#383 2#638 9 2 4 1000111 1 -3325 4 2 1 2#383 2#638 9 2 4 1000111 1 -3326 4 2 1 2#383 2#638 9 2 4 1000111 1 -3327 4 4 1 2#383 2#638 9 2 4 1000111 1 -3328 4 4 1 2#383 2#638 9 2 4 1000111 1 -3329 4 0 2 3#396 3#659 10 2 4 1000111 1 -3330 4 0 2 3#396 3#659 10 2 4 1000111 1 -3331 4 0 2 4#370 4#617 10 2 4 1000111 1 -3332 4 0 2 4#370 4#617 10 2 4 1000111 1 -3333 4 0 4 5#96 5#113 11 2 4 1000111 1 -3334 4 0 4 5#96 5#113 11 2 4 1000111 1 -3335 4 0 3 1#4212 1#7020 12 2 4 1000111 1 -3336 4 0 3 1#4212 1#7020 12 2 4 1000111 1 -4001 3 3 1 2#72 2#120 5 1 3 1000111 0 -4002 3 5 1 2#72 2#120 5 1 3 1000111 0 -4003 3 1 1 2#72 2#120 5 1 3 1000111 0 -4004 3 2 1 2#72 2#120 5 1 3 1000111 0 -4005 3 4 1 2#72 2#120 5 1 3 1000111 0 -4006 3 0 2 3#74 3#124 6 1 3 1000111 0 -4007 3 0 2 4#70 4#116 6 1 3 1000111 0 -4008 3 0 4 5#72 5#84 7 1 3 1000111 0 -4009 3 0 3 1#792 1#1320 8 1 3 1000111 0 -4101 4 3 1 2#383 2#638 9 2 4 1000111 0 -4102 4 3 1 2#383 2#638 9 2 4 1000111 0 -4103 4 5 1 2#383 2#638 9 2 4 1000111 0 -4104 4 5 1 2#383 2#638 9 2 4 1000111 0 -4105 4 1 1 2#383 2#638 9 2 4 1000111 0 -4106 4 1 1 2#383 2#638 9 2 4 1000111 0 -4107 4 2 1 2#383 2#638 9 2 4 1000111 0 -4108 4 2 1 2#383 2#638 9 2 4 1000111 0 -4109 4 4 1 2#383 2#638 9 2 4 1000111 0 -4110 4 4 1 2#383 2#638 9 2 4 1000111 0 -4111 4 0 2 3#396 3#659 10 2 4 1000111 0 -4112 4 0 2 3#396 3#659 10 2 4 1000111 0 -4113 4 0 2 4#370 4#617 10 2 4 1000111 0 -4114 4 0 2 4#370 4#617 10 2 4 1000111 0 -4115 4 0 4 5#96 5#113 11 2 4 1000111 0 -4116 4 0 4 5#96 5#113 11 2 4 1000111 0 -4117 4 0 3 1#4212 1#7020 12 2 4 1000111 0 -4118 4 0 3 1#4212 1#7020 12 2 4 1000111 0 +3001 2 3 1 2#42 2#70 1 0 0 0 0 +3002 2 3 1 2#42 2#70 1 0 0 0 0 +3003 2 5 1 2#42 2#70 1 0 0 0 0 +3004 2 5 1 2#42 2#70 1 0 0 0 0 +3005 2 1 1 2#42 2#70 1 0 0 0 0 +3006 2 1 1 2#42 2#70 1 0 0 0 0 +3007 2 2 1 2#42 2#70 1 0 0 0 0 +3008 2 2 1 2#42 2#70 1 0 0 0 0 +3009 2 4 1 2#42 2#70 1 0 0 0 0 +3010 2 4 1 2#42 2#70 1 0 0 0 0 +3011 2 0 2 3#43 3#72 1 0 0 0 0 +3012 2 0 2 3#43 3#72 1 0 0 0 0 +3013 2 0 2 4#40 4#67 1 0 0 0 0 +3014 2 0 2 4#40 4#67 1 0 0 0 0 +3015 2 0 4 5#24 5#28 1 0 0 0 0 +3016 2 0 4 5#24 5#28 1 0 0 0 0 +3017 2 0 3 1#460 1#767 1 0 0 0 0 +3018 2 0 3 1#460 1#767 1 0 0 0 0 +3101 3 3 1 2#56 2#93 1 0 1 0 0 +3102 3 3 1 2#56 2#93 1 0 1 0 0 +3103 3 5 1 2#56 2#93 1 0 1 0 0 +3104 3 5 1 2#56 2#93 1 0 1 0 0 +3105 3 1 1 2#56 2#93 1 0 1 0 0 +3106 3 1 1 2#56 2#93 1 0 1 0 0 +3107 3 2 1 2#56 2#93 1 0 1 0 0 +3108 3 2 1 2#56 2#93 1 0 1 0 0 +3109 3 4 1 2#56 2#93 1 0 1 0 0 +3110 3 4 1 2#56 2#93 1 0 1 0 0 +3111 3 0 2 3#58 3#96 2 0 1 0 0 +3112 3 0 2 3#58 3#96 2 0 1 0 0 +3113 3 0 2 4#54 4#90 2 0 1 0 0 +3114 3 0 2 4#54 4#90 2 0 1 0 0 +3115 3 0 4 5#48 5#56 3 0 1 0 0 +3116 3 0 4 5#48 5#56 3 0 1 0 0 +3117 3 0 3 1#616 1#1027 4 0 1 0 0 +3118 3 0 3 1#616 1#1027 4 0 1 0 0 +3201 4 3 1 2#72 2#120 5 1 3 0 1 +3202 4 3 1 2#72 2#120 5 1 3 0 1 +3203 4 5 1 2#72 2#120 5 1 3 0 1 +3204 4 5 1 2#72 2#120 5 1 3 0 1 +3205 4 1 1 2#72 2#120 5 1 3 0 1 +3206 4 1 1 2#72 2#120 5 1 3 0 1 +3207 4 2 1 2#72 2#120 5 1 3 0 1 +3208 4 2 1 2#72 2#120 5 1 3 0 1 +3209 4 4 1 2#72 2#120 5 1 3 0 1 +3210 4 4 1 2#72 2#120 5 1 3 0 1 +3211 4 0 2 3#74 3#124 6 1 3 0 1 +3212 4 0 2 3#74 3#124 6 1 3 0 1 +3213 4 0 2 4#70 4#116 6 1 3 0 1 +3214 4 0 2 4#70 4#116 6 1 3 0 1 +3215 4 0 4 5#72 5#84 7 1 3 0 1 +3216 4 0 4 5#72 5#84 7 1 3 0 1 +3217 4 0 3 1#792 1#1320 8 1 3 0 1 +3218 4 0 3 1#792 1#1320 8 1 3 0 1 +3301 5 3 1 2#383 2#638 9 2 4 0 1 +3302 5 3 1 2#383 2#638 9 2 4 0 1 +3303 5 5 1 2#383 2#638 9 2 4 0 1 +3304 5 5 1 2#383 2#638 9 2 4 0 1 +3305 5 1 1 2#383 2#638 9 2 4 0 1 +3306 5 1 1 2#383 2#638 9 2 4 0 1 +3307 5 2 1 2#383 2#638 9 2 4 0 1 +3308 5 2 1 2#383 2#638 9 2 4 0 1 +3309 5 4 1 2#383 2#638 9 2 4 0 1 +3310 5 4 1 2#383 2#638 9 2 4 0 1 +3311 5 0 2 3#396 3#659 10 2 4 0 1 +3312 5 0 2 3#396 3#659 10 2 4 0 1 +3313 5 0 2 4#370 4#617 10 2 4 0 1 +3314 5 0 2 4#370 4#617 10 2 4 0 1 +3315 5 0 4 5#96 5#113 11 2 4 0 1 +3316 5 0 4 5#96 5#113 11 2 4 0 1 +3317 5 0 3 1#4212 1#7020 12 2 4 0 1 +3318 5 0 3 1#4212 1#7020 12 2 4 0 1 +3319 5 3 1 2#383 2#638 9 2 4 1000111 1 +3320 5 3 1 2#383 2#638 9 2 4 1000111 1 +3321 5 5 1 2#383 2#638 9 2 4 1000111 1 +3322 5 5 1 2#383 2#638 9 2 4 1000111 1 +3323 5 1 1 2#383 2#638 9 2 4 1000111 1 +3324 5 1 1 2#383 2#638 9 2 4 1000111 1 +3325 5 2 1 2#383 2#638 9 2 4 1000111 1 +3326 5 2 1 2#383 2#638 9 2 4 1000111 1 +3327 5 4 1 2#383 2#638 9 2 4 1000111 1 +3328 5 4 1 2#383 2#638 9 2 4 1000111 1 +3329 5 0 2 3#396 3#659 10 2 4 1000111 1 +3330 5 0 2 3#396 3#659 10 2 4 1000111 1 +3331 5 0 2 4#370 4#617 10 2 4 1000111 1 +3332 5 0 2 4#370 4#617 10 2 4 1000111 1 +3333 5 0 4 5#96 5#113 11 2 4 1000111 1 +3334 5 0 4 5#96 5#113 11 2 4 1000111 1 +3335 5 0 3 1#4212 1#7020 12 2 4 1000111 1 +3336 5 0 3 1#4212 1#7020 12 2 4 1000111 1 +4001 4 3 1 2#72 2#120 5 1 3 1000111 0 +4002 4 5 1 2#72 2#120 5 1 3 1000111 0 +4003 4 1 1 2#72 2#120 5 1 3 1000111 0 +4004 4 2 1 2#72 2#120 5 1 3 1000111 0 +4005 4 4 1 2#72 2#120 5 1 3 1000111 0 +4006 4 0 2 3#74 3#124 6 1 3 1000111 0 +4007 4 0 2 4#70 4#116 6 1 3 1000111 0 +4008 4 0 4 5#72 5#84 7 1 3 1000111 0 +4009 4 0 3 1#792 1#1320 8 1 3 1000111 0 +4101 5 3 1 2#383 2#638 9 2 4 1000111 0 +4102 5 3 1 2#383 2#638 9 2 4 1000111 0 +4103 5 5 1 2#383 2#638 9 2 4 1000111 0 +4104 5 5 1 2#383 2#638 9 2 4 1000111 0 +4105 5 1 1 2#383 2#638 9 2 4 1000111 0 +4106 5 1 1 2#383 2#638 9 2 4 1000111 0 +4107 5 2 1 2#383 2#638 9 2 4 1000111 0 +4108 5 2 1 2#383 2#638 9 2 4 1000111 0 +4109 5 4 1 2#383 2#638 9 2 4 1000111 0 +4110 5 4 1 2#383 2#638 9 2 4 1000111 0 +4111 5 0 2 3#396 3#659 10 2 4 1000111 0 +4112 5 0 2 3#396 3#659 10 2 4 1000111 0 +4113 5 0 2 4#370 4#617 10 2 4 1000111 0 +4114 5 0 2 4#370 4#617 10 2 4 1000111 0 +4115 5 0 4 5#96 5#113 11 2 4 1000111 0 +4116 5 0 4 5#96 5#113 11 2 4 1000111 0 +4117 5 0 3 1#4212 1#7020 12 2 4 1000111 0 +4118 5 0 3 1#4212 1#7020 12 2 4 1000111 0 diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 6e78a6a00..87bc9e912 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -359,83 +359,91 @@ int mut,int#int,1 108054 108065 108055 108066 108056 108067 -109001 null -109002 null -109003 null -109004 null -109005 null -109006 null -109007 null -109008 1090003 -109009 109001#109002 -109010 109003#109004 -109011 109005 -109012 109006 -109013 109007 -109014 109008 -109015 109009#109010 -109016 109011 -109017 109012 -109018 109013 -109019 109014 -109020 109015 -109021 109016 -109022 109017 -109023 109018 -109024 109019 -109025 109020 -109026 109021 -109027 109022 -109028 109023 -109029 109024 -109030 109025 -109031 109026 -109032 109027 -109033 109028 -109034 109029 -109035 109030 -109036 109031 -109037 109032 -109038 109033 -109039 109034 -109040 109035 -109041 109036 -109042 109037 -109043 109038#109039 -109044 109040#109041 -109045 109042#109043 -109046 109044#109045 -109047 109046#109047 -109048 109048#109049 -109049 109050#109051 -109050 109052#109053 -109051 109054#109055 -109052 109056#109057 -109053 109058 -109054 109059 -109055 109060 -109056 109061 -109057 109062 -109058 109063 -109059 109064 -109060 109065 -109061 109066 -109062 109067 -109063 109068#109069 -109064 109070#109071 -109065 109072#109073 -109066 109074#109075 -109067 109076#109077 -109068 109078#109079 -110001 null -110002 null -110003 null -110004 null -110005 null -110006 null +109001 10901 +109002 10902 +109003 10903 +109004 10904 +109005 10905 +109006 10906 +109007 109001#109002 +109008 109003 +109009 109004 +109010 109005 +109011 109006 +109012 109007 +109013 109008 +109014 109009 +109015 109010#109011 +109016 109012#109013 +109017 109014#109015 +109018 109016 +109019 109017 +109020 109018#109019 +109021 109020#109021 +109022 109022#109023 +109023 109024 +109024 109025#109026 +109025 109027 +109026 109028#109029 +109027 109030 +109028 109031#109032 +109029 109033 +109030 109034#109035 +109031 109036 +109032 109037 +109033 109038#109039 +109034 109040#109041 +109035 109042#109043 +109036 109044 +109037 109045#109046#109047#109048 +109038 109049 +109039 109050 +109040 109051 +110001 11001 +110002 11002 +110003 11003 +110004 11004 +110005 11005 +110006 11006 110007 110001#110002 -110008 110003#110004 -110009 110005#110006 -110010 110007#110008 -110011 110009#110010 -110012 110011#110012 +110008 110003 +110009 110004#110005 +110010 110006 +110011 110007#110008 +110012 110009 +110013 110010#110011 +110014 110012 +110015 110013#110014 +110016 110015 +110017 110016#110017 +110018 110018 +110019 110019#110020 +110020 110021 +110021 110022#110023 +110022 110024 +110023 110025 +110024 110026 +110025 110027#110028#110029#110030 +110026 110031 +110027 110032#110033#110034#110035 +110028 110036#110037 +110029 110038 +110030 110039 +110031 110040 +110032 110041#110042 +110033 110043 +110034 110044 +110035 110045 +110036 110046#110047 +110037 110048 +110038 110049#110050 +110039 110051#110052 +110040 110053#110054 +110041 110055#110056 +110042 110057#110058 +110043 110059#110060 +110044 110061 +110045 110062#110063 +110046 110064 +110047 110065 +110048 110066 diff --git a/conf/server/FoodsConfig.txt b/conf/server/FoodsConfig.txt index 047e2885d..353b94ce4 100644 --- a/conf/server/FoodsConfig.txt +++ b/conf/server/FoodsConfig.txt @@ -46,3 +46,4 @@ int int int int mut,int#int,2 int 13 0 1 1 6#2000 2 14 0 1 1 2#800 2 15 0 2 2 6#108020 2 +16 0 1 1 6#-6000 2 diff --git a/conf/server/GlobalSystemConfig.txt b/conf/server/GlobalSystemConfig.txt index 2674d7ecf..3310b8e82 100644 --- a/conf/server/GlobalSystemConfig.txt +++ b/conf/server/GlobalSystemConfig.txt @@ -1,17 +1,17 @@ Id OpenRules int mut,int#int,1 -1 null -2 null -3 null -4 null -5 null -6 null -7 null -8 null -9 null -10 null -11 null -12 null -13 null -14 null -15 2#13 +1 2#1 +2 2#1 +3 2#30 +4 2#30 +5 2#20 +6 2#30 +7 2#9 +8 2#30 +9 2#30 +10 2#30 +11 2#30 +12 2#30 +13 2#30 +14 2#30 +15 2#12 diff --git a/conf/server/GuideConfig.txt b/conf/server/GuideConfig.txt index c45aee06a..ec42db016 100644 --- a/conf/server/GuideConfig.txt +++ b/conf/server/GuideConfig.txt @@ -5,6 +5,12 @@ int int 3 1 4 1 5 1 +6 1 +7 1 +8 1 +9 1 +10 1 +11 1 15 1 16 1 17 1 diff --git a/conf/server/LevelDifficultyConfig.txt b/conf/server/LevelDifficultyConfig.txt index 5e2076507..8de2c2643 100644 --- a/conf/server/LevelDifficultyConfig.txt +++ b/conf/server/LevelDifficultyConfig.txt @@ -10,27 +10,27 @@ int int int int mut,int#int,2 mut,int#int,2 int mut,int#int,1 mut,int#int,1 int 2031 2021 0 51023 2#7 2#1 8 6008#5008 4008#3008 300 0 3023 2041 2031 0 51024 2#7 2#1 8 6009#5009 4009#3009 300 0 3527 2051 2041 0 51025 2#7 2#1 8 6010#5010 4010#3010 300 0 4031 -3011 2051 0 51031 2#7 2#1 8 6011#5011 4011#3011 300 0 4535 +3011 2051 13 51031 2#7 2#1 8 6011#5011 4011#3011 300 0 4535 3021 3011 0 51032 2#7 2#1 8 6012#5012 4012#3012 300 0 5039 3031 3021 0 51033 2#7 2#1 8 6013#5013 4013#3013 300 0 5543 3041 3031 0 51034 2#7 2#1 8 6014#5014 4014#3014 300 0 6047 3051 3041 0 51035 2#7 2#1 8 6015#5015 4015#3015 300 0 6551 -4011 3051 0 51041 2#7 2#1 8 6016#5016 4016#3016 300 0 7055 +4011 3051 15 51041 2#7 2#1 8 6016#5016 4016#3016 300 0 7055 4021 4011 0 51042 2#7 2#1 8 6017#5017 4017#3017 300 0 8063 4031 4021 0 51043 2#7 2#1 8 6018#5018 4018#3018 300 0 9071 4041 4031 0 51044 2#7 2#1 8 6019#5019 4019#3019 300 0 10079 4051 4041 0 51045 2#7 2#1 8 6020#5020 4020#3020 300 0 10320 -5011 4051 0 51051 2#7 2#1 8 6021#5021 4021#3021 300 0 10320 +5011 4051 20 51051 2#7 2#1 8 6021#5021 4021#3021 300 0 10320 5021 5011 0 51052 2#7 2#1 8 6022#5022 4022#3022 300 0 10561 5031 5021 0 51053 2#7 2#1 8 6023#5023 4023#3023 300 0 10802 5041 5031 0 51054 2#7 2#1 8 6024#5024 4024#3024 300 0 11043 5051 5041 0 51055 2#7 2#1 8 6025#5025 4025#3025 300 0 11284 -6011 5051 0 51061 2#7 2#1 8 6026#5026 4026#3026 300 0 11669 +6011 5051 22 51061 2#7 2#1 8 6026#5026 4026#3026 300 0 11669 6021 6011 0 51062 2#7 2#1 8 6027#5027 4027#3027 300 0 12055 6031 6021 0 51063 2#7 2#1 8 6028#5028 4028#3028 300 0 12441 6041 6031 0 51064 2#7 2#1 8 6029#5029 4029#3029 300 0 12826 6051 6041 0 51065 2#7 2#1 8 6030#5030 4030#3030 300 0 13212 -7011 6051 0 51071 2#7 2#1 8 6031#5031 4031#3031 300 0 13237 +7011 6051 24 51071 2#7 2#1 8 6031#5031 4031#3031 300 0 13237 7021 7011 0 51072 2#7 2#1 8 6032#5032 4032#3032 300 0 13262 7031 7021 0 51073 2#7 2#1 8 6033#5033 4033#3033 300 0 13296 7041 7031 0 51074 2#7 2#1 8 6034#5034 4034#3034 300 0 13449 diff --git a/conf/server/LotteryRewardConfig.txt b/conf/server/LotteryRewardConfig.txt index 09f7f8c4d..75f23d823 100644 --- a/conf/server/LotteryRewardConfig.txt +++ b/conf/server/LotteryRewardConfig.txt @@ -9,11 +9,11 @@ int mut,int#int,1 int int int,int#int,1 8 10008#1 1 0 null 9 10009#1 1 0 null 10 10010#1 1 0 null -11 10011#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 0 null -15 10015#1 1 11 null +15 10015#1 1 0 null 16 10016#1 1 0 null 17 10017#1 1 0 null 18 10018#1 1 0 null @@ -160,11 +160,11 @@ int mut,int#int,1 int int int,int#int,1 401 10008#1 23 0 null 402 10009#1 23 0 null 403 10010#1 23 0 null -404 10011#1 23 0 null +404 10011#1 23 11 null 405 10012#1 23 8 null 406 10013#1 23 11 null 407 10014#1 23 0 null -408 10015#1 23 11 null +408 10015#1 23 0 null 409 10016#1 23 0 null 410 10017#1 23 0 null 411 10018#1 23 0 null diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index a8d05d76c..e9881caf7 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -181,43 +181,32 @@ int int int int int 109004 1 2 1 109004 109005 1 2 1 109005 109006 1 2 1 109006 -109007 1 3 1 109007 -109008 3 2 2 109009 -109009 4 2 2 109010 -109010 5 2 2 109011 -109011 1 3 1 109008 -109012 8 0 0 0 -109013 5 3 2 109013 -109014 5 3 2 109014 -109015 5 3 1 109015 -109016 5 3 2 109024 -109017 5 3 2 109043 -109018 5 3 2 109054 -109019 5 3 2 109055 -109020 5 3 2 109056 -109021 5 3 2 109057 -109022 5 3 2 109058 -109023 5 3 2 109059 -109024 5 3 2 109060 -109025 5 3 2 109061 -109026 5 3 2 109062 -109027 2 2 2 109063 -109028 2 2 2 109064 -109029 2 2 2 109065 -109030 2 2 2 109066 -109031 2 1 2 109067 -109032 2 1 2 109068 +109007 5 2 2 109007 +109008 5 2 2 109020 +109009 5 2 2 109033 +109010 5 2 2 109037 +109011 8 0 0 0 +109012 7 2 2 109038 +109013 7 2 2 109039 +109014 7 2 2 109040 0 0 0 0 0 110001 1 2 1 110001 110002 1 2 1 110002 110003 1 2 1 110003 110004 1 2 1 110004 110005 1 2 1 110005 -110006 1 3 1 110006 -110007 2 2 2 110007 -110008 2 2 2 110008 -110009 2 2 2 110009 -110010 2 1 2 110010 -110011 3 2 2 110011 -110012 4 2 2 110012 -110013 8 0 0 0 +110006 1 2 1 110006 +110007 5 2 2 110007 +110008 5 2 2 110009 +110009 5 2 2 110011 +110010 5 2 2 110013 +110011 5 2 2 110015 +110012 5 2 2 110017 +110013 5 2 2 110019 +110014 8 2 0 0 +110015 5 2 2 110021 +110016 5 2 2 110028 +110017 5 2 2 110036 +110018 7 2 2 110046 +110019 7 2 2 110047 +110020 7 2 2 110048 diff --git a/conf/server/Map_108.txt b/conf/server/Map_108.txt index f509586ca..5a80009ed 100644 --- a/conf/server/Map_108.txt +++ b/conf/server/Map_108.txt @@ -22,7 +22,7 @@ int int mut,int#int,2 int 20 108008 7#9 0 21 108009 12#12 0 22 108021 11#2 0 -23 108020 9#4 0 +23 108020 9#4 1 24 108023 1#6 0 25 108001 17#4|18#4|16#5|17#5 0 26 108022 13#13 0 diff --git a/conf/server/Map_109.txt b/conf/server/Map_109.txt index 5b7c1389b..1fd170d8f 100644 --- a/conf/server/Map_109.txt +++ b/conf/server/Map_109.txt @@ -1,82 +1,16 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 109027 19#10|19#11|20#12 0 -2 109029 11#1|12#1|13#1 0 -3 109031 24#11|25#11|24#12|24#13 0 -4 109002 27#3|28#4|27#5|28#5|28#6 0 -5 109007 2#3 0 -6 109030 11#38|12#38|11#39 0 -7 109028 30#27|30#28|30#29 0 -8 109009 30#20 0 -9 109028 26#38|26#39|26#40 0 -10 109028 11#22|10#23|11#23|11#24 0 -11 109003 26#35|26#36|27#36|26#37|27#38 0 -12 109001 3#21|3#22|4#22|3#23 0 -13 109005 24#15|24#16 0 -14 109026 29#20 0 -15 109001 8#32|7#33|8#33|9#33|7#34 0 -16 109024 3#37 0 -17 109022 17#7 0 -18 109001 9#16|8#17|9#17|10#17|9#18 0 -19 109020 23#38 0 -20 109003 3#32|2#33|3#33|4#33|3#34 0 -21 109002 2#7|3#7|2#8|3#8 0 -22 109003 8#20|8#21|8#22|8#23 0 -23 109001 15#38|16#39|16#40|17#40 0 -24 109028 6#23|7#23|6#24 0 -25 109001 13#26|12#27|13#27|14#27|14#28 0 -26 109027 20#32|21#32|22#32 0 -27 109004 14#1|14#2|14#3|15#3 0 -28 109030 4#3|5#3|4#4 0 -29 109029 17#22|18#22|19#22|17#23 0 -30 109007 8#30 0 -31 109005 13#35|13#36 0 -32 109019 8#8 0 -33 109030 28#8|28#9|28#10 0 -34 109001 16#30|15#31|15#32|16#32 0 -35 109017 22#7 0 -36 109003 17#24|18#25|19#25|18#26 0 -37 109015 14#31 0 -38 109028 4#34|5#34|4#35 0 -39 109013 23#19 0 -40 109011 27#28 0 -41 109030 5#7|6#7|6#8 0 -42 109030 2#9|3#9|4#10 0 -43 109028 13#6|12#7|13#7 0 -44 109001 1#13|1#14|2#14|3#14|1#15 0 -45 109008 5#16 0 -46 109029 15#33|16#33|15#34 0 -47 109029 1#20|2#20|1#21 0 -48 109029 28#27|28#28|28#29 0 -49 109027 29#2|30#2|30#3 0 -50 109027 10#10|11#10|11#11 0 -51 109004 24#29|23#30|24#30|25#30|24#31 0 -52 109006 22#3|23#3 0 -53 109025 22#30 0 -54 109002 27#15|27#16|28#16|27#17|27#18 0 -55 109023 29#3 0 -56 109002 6#10|5#11|6#11|7#11|6#12 0 -57 109030 22#25|23#25|24#25 0 -58 109021 6#31 0 -59 109004 18#6|19#6|20#6|20#7|20#8 0 -60 109027 17#38|18#38|17#39 0 -61 109002 6#38|7#38|7#39|8#39 0 -62 109027 15#17|13#18|14#18|15#19 0 -63 109002 19#20|18#21|19#21|20#22 0 -64 109001 26#20|26#21|27#21|26#22|26#23 0 -65 109029 6#14|7#14|7#15 0 -66 109028 11#28|13#28|12#29 0 -67 109030 24#17|24#18|25#18 0 -68 109003 27#10|26#11|27#11|28#12 0 -69 109004 12#15|13#15|13#16|13#17 0 -70 109018 10#20 0 -71 109016 28#39 0 -72 109002 21#33|21#34|22#34|21#35 0 -73 109014 10#7 0 -74 109004 6#3|7#3|6#4|6#5 0 -75 109012 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|5#2|7#2|9#2|10#2|11#2|12#2|13#2|15#2|16#2|17#2|18#2|19#2|20#2|21#2|22#2|23#2|24#2|25#2|26#2|27#2|28#2|1#3|1#4|2#4|3#4|7#4|8#4|9#4|10#4|11#4|12#4|13#4|14#4|15#4|16#4|17#4|18#4|19#4|20#4|25#4|26#4|27#4|29#4|1#5|2#5|3#5|4#5|5#5|7#5|19#5|20#5|21#5|22#5|23#5|24#5|25#5|26#5|29#5|1#6|2#6|4#6|7#6|10#6|11#6|12#6|14#6|16#6|17#6|22#6|23#6|24#6|29#6|1#7|9#7|14#7|16#7|18#7|21#7|23#7|24#7|27#7|29#7|4#8|5#8|9#8|10#8|11#8|12#8|14#8|16#8|18#8|19#8|21#8|23#8|24#8|25#8|27#8|29#8|5#9|7#9|8#9|9#9|12#9|14#9|16#9|18#9|21#9|23#9|24#9|25#9|29#9|1#10|2#10|7#10|8#10|12#10|14#10|16#10|18#10|20#10|21#10|23#10|24#10|25#10|26#10|29#10|2#11|3#11|10#11|12#11|14#11|16#11|18#11|21#11|23#11|29#11|3#12|4#12|5#12|9#12|10#12|12#12|16#12|18#12|19#12|21#12|23#12|26#12|29#12|3#13|4#13|5#13|6#13|7#13|10#13|12#13|13#13|14#13|16#13|18#13|21#13|23#13|25#13|26#13|27#13|29#13|8#14|10#14|14#14|15#14|16#14|18#14|20#14|21#14|23#14|29#14|2#15|5#15|6#15|8#15|10#15|11#15|14#15|15#15|16#15|18#15|21#15|25#15|28#15|2#16|4#16|6#16|8#16|11#16|12#16|16#16|18#16|19#16|21#16|25#16|26#16|30#16|2#17|3#17|4#17|6#17|12#17|16#17|18#17|21#17|22#17|23#17|28#17|29#17|30#17|2#18|3#18|4#18|6#18|7#18|8#18|10#18|12#18|15#18|16#18|20#18|21#18|22#18|30#18|2#19|3#19|4#19|6#19|7#19|10#19|12#19|16#19|17#19|18#19|20#19|21#19|22#19|25#19|26#19|27#19|28#19|29#19|30#19|6#20|7#20|9#20|12#20|17#20|18#20|20#20|21#20|22#20|23#20|24#20|25#20|5#21|6#21|7#21|9#21|10#21|12#21|14#21|15#21|16#21|17#21|21#21|22#21|23#21|24#21|28#21|29#21|30#21|2#22|5#22|10#22|12#22|14#22|15#22|16#22|23#22|24#22|25#22|27#22|28#22|2#23|4#23|5#23|12#23|14#23|16#23|18#23|19#23|22#23|23#23|25#23|27#23|2#24|7#24|8#24|9#24|10#24|12#24|14#24|19#24|22#24|23#24|25#24|27#24|29#24|2#25|8#25|9#25|10#25|12#25|14#25|25#25|27#25|29#25|2#26|3#26|4#26|5#26|12#26|17#26|20#26|21#26|22#26|23#26|25#26|27#26|29#26|3#27|4#27|5#27|6#27|7#27|8#27|9#27|10#27|11#27|15#27|16#27|17#27|21#27|22#27|23#27|24#27|25#27|27#27|29#27|20#28|21#28|22#28|23#28|25#28|29#28|1#29|3#29|4#29|5#29|6#29|7#29|8#29|9#29|10#29|11#29|14#29|15#29|16#29|17#29|18#29|19#29|20#29|21#29|23#29|25#29|26#29|27#29|29#29|1#30|2#30|10#30|11#30|14#30|27#30|29#30|1#31|2#31|4#31|5#31|7#31|10#31|16#31|17#31|18#31|19#31|20#31|21#31|23#31|25#31|27#31|29#31|1#32|2#32|7#32|10#32|11#32|12#32|13#32|14#32|23#32|25#32|27#32|29#32|5#33|6#33|11#33|12#33|13#33|14#33|17#33|18#33|19#33|20#33|22#33|23#33|24#33|25#33|27#33|29#33|8#34|9#34|14#34|17#34|18#34|19#34|24#34|25#34|27#34|29#34|3#35|9#35|10#35|11#35|16#35|17#35|18#35|19#35|20#35|23#35|24#35|25#35|27#35|3#36|4#36|5#36|6#36|9#36|10#36|11#36|12#36|24#36|25#36|28#36|29#36|2#37|4#37|6#37|7#37|8#37|9#37|10#37|14#37|15#37|16#37|17#37|18#37|19#37|20#37|21#37|22#37|23#37|24#37|29#37|2#38|9#38|10#38|24#38|25#38|29#38|5#39|6#39|9#39|10#39|12#39|13#39|14#39|15#39|18#39|19#39|20#39|21#39|22#39|23#39|24#39|25#39|4#40|5#40|12#40|13#40|14#40|15#40|28#40|29#40 1 -76 109027 9#30|8#31|9#31 0 -77 109010 4#21 0 -78 109029 2#39|3#39|3#40 0 -79 109031 1#35|1#36|2#36|1#37 0 -80 109002 30#34|29#35|30#35|30#36 0 +1 109008 6#5 0 +2 109007 8#8 0 +3 109009 3#12 0 +4 109004 6#14|7#14|7#15 0 +5 109003 5#7|4#8|5#8 0 +6 109006 9#6|10#6|10#7 0 +7 109014 1#20 0 +8 109005 1#7|1#8|1#9 0 +9 109011 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 +10 109012 1#3 0 +11 109013 10#3 0 +12 109010 3#17 0 +13 109002 7#19|7#20|8#20 0 +14 109001 1#16|1#17|1#18 0 diff --git a/conf/server/Map_110.txt b/conf/server/Map_110.txt index c7708689b..c648e9c77 100644 --- a/conf/server/Map_110.txt +++ b/conf/server/Map_110.txt @@ -1,20 +1,14 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 102006 1#6|2#6|1#7 0 -2 102002 7#5|6#6|7#6|7#7 0 -3 102008 8#1|10#1|9#2|8#3 0 -4 102027 7#9|6#10|7#10|8#10|7#11 0 -5 102001 1#11|1#12|2#12|1#13 0 -6 102007 11#12|12#13|11#14|12#14 0 -7 110011 8#15 0 -8 102027 9#3|9#4|9#5 0 -9 102002 13#9|13#10|13#11|14#11 0 -10 102007 3#13|3#14|3#15|4#15 0 -11 102001 4#6|3#7|4#7|3#8 0 -12 102006 4#8|6#8|5#9|5#10 0 -13 110013 5#1|2#2|3#2|5#2|7#2|8#2|11#2|2#3|3#3|5#3|10#3|11#3|12#3|14#3|15#3|5#4|6#4|7#4|8#4|12#4|2#5|3#5|4#5|8#5|10#5|12#5|14#5|8#6|10#6|12#6|14#6|5#7|6#7|8#7|12#7|14#7|2#8|8#8|12#8|2#9|4#9|8#9|9#9|10#9|11#9|12#9|14#9|15#9|2#10|4#10|12#10|2#11|4#11|6#11|8#11|9#11|10#11|12#11|4#12|6#12|14#12|15#12|2#13|4#13|6#13|8#13|9#13|10#13|11#13|13#13|14#13|15#13|2#14|4#14|6#14|10#14|2#15|6#15|7#15|12#15|14#15 1 -14 102005 10#7|11#7|10#8|11#8 0 -15 102004 1#3|1#4|2#4 0 -16 102027 13#1|12#2|13#2|14#2|13#3 0 -17 102009 3#1|4#1|4#2 0 -18 102008 13#4|14#4|13#5|13#6 0 +1 110009 1#20 0 +2 110020 13#2 0 +3 110001 2#17|3#17|2#18|3#18 0 +4 110002 12#4|13#4|12#5|13#5 0 +5 110003 10#12|11#12|10#13|11#13 0 +6 110014 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|3#2|4#2|6#2|8#2|10#2|12#2|14#2|1#3|2#3|10#3|1#4|6#4|7#4|9#4|10#4|1#5|2#5|3#5|4#5|5#5|6#5|1#6|1#7|2#7|3#7|1#8|5#8|6#8|8#8|1#9|2#9|3#9|4#9|5#9|8#9|9#9|10#9|12#9|1#10|5#10|12#10|13#10|14#10|14#11|15#11|5#12|6#12|6#13|6#14|7#14|7#15|8#15|8#17|9#17|10#17|11#17|11#18|12#18|12#19|13#19 1 +7 110004 4#6|5#6|4#7|5#7 0 +8 110005 2#10|1#11|2#11|2#12 0 +9 110016 8#10 0 +10 110006 6#18|7#18|6#19|7#19 0 +11 110018 2#8 0 +12 110019 7#2 0 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 309901fca..fcb1fe5bd 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -275,7 +275,7 @@ 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 -10001 45 4 0 4 32 300000 3360 1084 1084 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000001#1000002 null +10001 45 4 0 4 126 180000 3360 600 600 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000001#1000002 null 10002 1 2 0 1 0 10000 200 300 300 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1 null 10003 1 2 0 1 0 10000 200 300 300 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 2 null 10004 1 2 0 1 0 10000 200 300 300 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 3 null @@ -363,15 +363,15 @@ int int int int int int int int int int int float float float float int float mu 50079 1 2 0 1 32 813 1561 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null 50080 1 2 0 1 32 813 1561 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null 50081 1 2 0 1 32 813 1561 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null -50082 10040 1 0 1 32 2034 2716 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50083 10040 1 0 1 32 2034 2716 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50084 10040 1 0 1 32 2034 2716 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50085 10031 1 0 2 32 2238 3178 203 203 840 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 32 2238 3178 203 203 336 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 32 2238 3178 203 203 33 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 32 2441 3871 203 203 840 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 32 2441 3871 203 203 336 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 32 2441 3871 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50082 10040 1 0 1 32 1220 2716 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50083 10040 1 0 1 32 1220 2716 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50084 10040 1 0 1 32 1220 2716 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50085 10031 1 0 2 32 1342 3178 203 203 840 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 32 1342 3178 203 203 336 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 32 1342 3178 203 203 33 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 32 1465 3871 203 203 840 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 32 1465 3871 203 203 336 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 32 1465 3871 203 203 33 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 44 1119 2147 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50092 9 3 0 1 44 1119 2147 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50093 9 3 0 1 44 1119 2147 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null @@ -447,60 +447,60 @@ int int int int int int int int int int int float float float float int float mu 50163 11 3 0 2 64 2685 3585 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50164 11 3 0 2 64 2685 3585 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50165 11 3 0 2 64 2685 3585 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50166 43 3 0 1 72 2289 2474 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null -50167 43 3 0 1 72 2289 2474 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null -50168 43 3 0 1 72 2289 2474 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null -50169 10040 1 0 1 72 4578 6112 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null -50170 10040 1 0 1 72 4578 6112 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null -50171 10040 1 0 1 72 4578 6112 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null -50172 10039 1 0 3 72 5493 8710 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -50173 10039 1 0 3 72 5493 8710 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -50174 10039 1 0 3 72 5493 8710 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -50175 10030 1 0 3 72 5493 8710 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null -50176 10030 1 0 3 72 5493 8710 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null -50177 10030 1 0 3 72 5493 8710 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null -50178 9 3 0 1 88 2034 3904 508 508 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50179 9 3 0 1 88 2034 3904 508 508 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50180 9 3 0 1 88 2034 3904 508 508 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50181 2 3 0 1 88 3052 2172 508 508 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50182 2 3 0 1 88 3052 2172 508 508 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50183 2 3 0 1 88 3052 2172 508 508 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50184 4 3 0 2 88 5595 7946 508 508 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null -50185 4 3 0 2 88 5595 7946 508 508 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null -50186 4 3 0 2 88 5595 7946 508 508 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null -50187 11 3 0 2 88 3357 4481 508 508 1960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50188 11 3 0 2 88 3357 4481 508 508 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50189 11 3 0 2 88 3357 4481 508 508 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50190 21 3 0 3 89 6198 10046 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null -50191 21 3 0 3 89 6198 10046 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null -50192 21 3 0 3 89 6198 10046 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null -50193 10047 3 0 1 89 5165 7042 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null -50194 10047 3 0 1 89 5165 7042 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null -50195 10047 3 0 1 89 5165 7042 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null -50196 10048 3 0 1 89 5165 7042 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null -50197 10048 3 0 1 89 5165 7042 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null -50198 10048 3 0 1 89 5165 7042 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null -50199 10049 3 0 1 89 5165 7042 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null -50200 10049 3 0 1 89 5165 7042 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null -50201 10049 3 0 1 89 5165 7042 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null -50202 10050 3 0 1 89 5165 7042 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null -50203 10050 3 0 1 89 5165 7042 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null -50204 10050 3 0 1 89 5165 7042 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null -50205 6 2 0 2 89 3409 2475 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50206 6 2 0 2 89 3409 2475 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50207 6 2 0 2 89 3409 2475 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50208 41 4 0 3 89 6198 10046 516 516 1980 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104551#1104552 null -50209 41 4 0 3 89 6198 10046 516 516 792 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104551#1104552 null -50210 41 4 0 3 89 6198 10046 516 516 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104551#1104552 null -50211 9 3 0 1 90 2082 4104 520 520 2000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50212 9 3 0 1 90 2082 4104 520 520 800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50213 9 3 0 1 90 2082 4104 520 520 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50214 13 1 0 1 90 2082 4104 520 520 2000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50215 13 1 0 1 90 2082 4104 520 520 800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50216 13 1 0 1 90 2082 4104 520 520 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50217 14 1 0 1 90 3123 2266 520 520 2000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50218 14 1 0 1 90 3123 2266 520 520 800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50219 14 1 0 1 90 3123 2266 520 520 79 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50166 43 3 0 1 64 2034 2199 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null +50167 43 3 0 1 64 2034 2199 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null +50168 43 3 0 1 64 2034 2199 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null +50169 10040 1 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null +50170 10040 1 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null +50171 10040 1 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null +50172 10039 1 0 3 64 2930 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +50173 10039 1 0 3 64 2930 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +50174 10039 1 0 3 64 2930 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +50175 10030 1 0 3 64 2930 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null +50176 10030 1 0 3 64 2930 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null +50177 10030 1 0 3 64 2930 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null +50178 9 3 0 1 72 1831 3514 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50179 9 3 0 1 72 1831 3514 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50180 9 3 0 1 72 1831 3514 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50181 2 3 0 1 72 2746 1955 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50182 2 3 0 1 72 2746 1955 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50183 2 3 0 1 72 2746 1955 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null +50184 4 3 0 2 72 5036 7151 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null +50185 4 3 0 2 72 5036 7151 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null +50186 4 3 0 2 72 5036 7151 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20010 null +50187 11 3 0 2 72 3021 4033 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50188 11 3 0 2 72 3021 4033 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50189 11 3 0 2 72 3021 4033 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50190 21 3 0 3 64 1953 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null +50191 21 3 0 3 64 1953 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null +50192 21 3 0 3 64 1953 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null +50193 10047 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null +50194 10047 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null +50195 10047 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null +50196 10048 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null +50197 10048 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null +50198 10048 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null +50199 10049 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null +50200 10049 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null +50201 10049 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null +50202 10050 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null +50203 10050 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null +50204 10050 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null +50205 6 2 0 2 64 1790 1922 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50206 6 2 0 2 64 1790 1922 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50207 6 2 0 2 64 1790 1922 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50208 41 4 0 3 64 2930 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104551#1104552 null +50209 41 4 0 3 64 2930 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104551#1104552 null +50210 41 4 0 3 64 2930 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104551#1104552 null +50211 9 3 0 1 77 1862 3647 465 465 1750 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50212 9 3 0 1 77 1862 3647 465 465 700 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50213 9 3 0 1 77 1862 3647 465 465 69 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null +50214 13 1 0 1 77 1862 3647 465 465 1750 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50215 13 1 0 1 77 1862 3647 465 465 700 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50216 13 1 0 1 77 1862 3647 465 465 69 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50217 14 1 0 1 77 2794 2017 465 465 1750 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50218 14 1 0 1 77 2794 2017 465 465 700 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50219 14 1 0 1 77 2794 2017 465 465 69 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50220 13 1 0 1 91 2097 4170 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50221 13 1 0 1 91 2097 4170 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50222 13 1 0 1 91 2097 4170 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null @@ -711,63 +711,99 @@ int int int int int int int int int int int float float float float int float mu 50427 10023 1 0 3 120 9300 18226 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null 50428 10023 1 0 3 120 9300 18226 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null 50429 10023 1 0 3 120 9300 18226 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null -50430 8 2 0 1 122 6580 9251 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null -50431 8 2 0 1 122 6580 9251 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null -50432 8 2 0 1 122 6580 9251 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null -50433 16 4 0 1 122 5483 6428 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50434 16 4 0 1 122 5483 6428 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50435 16 4 0 1 122 5483 6428 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50436 15 4 0 1 122 6580 9251 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50437 15 4 0 1 122 6580 9251 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50438 15 4 0 1 122 6580 9251 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50439 3 2 0 1 124 6936 9651 1156 1156 2680 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50440 3 2 0 1 124 6936 9651 1156 1156 1072 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50441 3 2 0 1 124 6936 9651 1156 1156 107 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50442 16 4 0 1 124 5780 6716 1156 1156 2680 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50443 16 4 0 1 124 5780 6716 1156 1156 1072 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50444 16 4 0 1 124 5780 6716 1156 1156 107 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50445 15 4 0 1 124 6936 9651 1156 1156 2680 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50446 15 4 0 1 124 6936 9651 1156 1156 1072 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50447 15 4 0 1 124 6936 9651 1156 1156 107 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50448 24 2 0 1 124 6936 5248 1156 1156 2680 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50449 24 2 0 1 124 6936 5248 1156 1156 1072 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50450 24 2 0 1 124 6936 5248 1156 1156 107 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50451 15 4 0 1 126 6505 9619 1084 1084 2720 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50452 15 4 0 1 126 6505 9619 1084 1084 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50453 15 4 0 1 126 6505 9619 1084 1084 108 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50454 24 2 0 1 126 6505 5149 1084 1084 2720 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50455 24 2 0 1 126 6505 5149 1084 1084 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50456 24 2 0 1 126 6505 5149 1084 1084 108 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50457 36 2 0 2 126 7156 11110 1084 1084 2720 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50458 36 2 0 2 126 7156 11110 1084 1084 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50459 36 2 0 2 126 7156 11110 1084 1084 108 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50460 17 4 0 2 126 7156 11110 1084 1084 2720 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50461 17 4 0 2 126 7156 11110 1084 1084 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50462 17 4 0 2 126 7156 11110 1084 1084 108 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50463 8 2 0 1 128 6903 10043 1150 1150 2760 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50464 8 2 0 1 128 6903 10043 1150 1150 1104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50465 8 2 0 1 128 6903 10043 1150 1150 110 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50466 15 4 0 1 128 6903 10043 1150 1150 2760 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50467 15 4 0 1 128 6903 10043 1150 1150 1104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50468 15 4 0 1 128 6903 10043 1150 1150 110 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50469 24 2 0 1 128 6903 5397 1150 1150 2760 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50470 24 2 0 1 128 6903 5397 1150 1150 1104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50471 24 2 0 1 128 6903 5397 1150 1150 110 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50472 3 2 0 1 128 6903 10043 1150 1150 2760 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50473 3 2 0 1 128 6903 10043 1150 1150 1104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50474 3 2 0 1 128 6903 10043 1150 1150 110 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50475 8 2 0 1 130 7301 10466 1216 1216 2800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50476 8 2 0 1 130 7301 10466 1216 1216 1120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50477 8 2 0 1 130 7301 10466 1216 1216 112 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50478 16 4 0 1 130 6084 7253 1216 1216 2800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50479 16 4 0 1 130 6084 7253 1216 1216 1120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50480 16 4 0 1 130 6084 7253 1216 1216 112 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50481 15 4 0 1 130 7301 10466 1216 1216 2800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50482 15 4 0 1 130 7301 10466 1216 1216 1120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50483 15 4 0 1 130 7301 10466 1216 1216 112 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50484 17 4 0 2 130 8031 12072 1216 1216 2800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50485 17 4 0 2 130 8031 12072 1216 1216 1120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50486 17 4 0 2 130 8031 12072 1216 1216 112 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50487 35 4 0 3 130 14602 26531 1216 1216 2800 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50488 35 4 0 3 130 14602 26531 1216 1216 1120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50489 35 4 0 3 130 14602 26531 1216 1216 112 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50430 8 2 0 1 120 5229 7751 871 871 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +50431 8 2 0 1 120 5229 7751 871 871 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +50432 8 2 0 1 120 5229 7751 871 871 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +50433 16 4 0 1 120 4357 5348 871 871 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50434 16 4 0 1 120 4357 5348 871 871 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50435 16 4 0 1 120 4357 5348 871 871 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50436 15 4 0 1 120 5229 7751 871 871 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50437 15 4 0 1 120 5229 7751 871 871 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50438 15 4 0 1 120 5229 7751 871 871 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50439 3 2 0 1 121 5808 8394 968 968 2620 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50440 3 2 0 1 121 5808 8394 968 968 1048 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50441 3 2 0 1 121 5808 8394 968 968 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50442 16 4 0 1 121 4840 5811 968 968 2620 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50443 16 4 0 1 121 4840 5811 968 968 1048 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50444 16 4 0 1 121 4840 5811 968 968 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50445 15 4 0 1 121 5808 8394 968 968 2620 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50446 15 4 0 1 121 5808 8394 968 968 1048 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50447 15 4 0 1 121 5808 8394 968 968 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50448 24 2 0 1 121 5808 4519 968 968 2620 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50449 24 2 0 1 121 5808 4519 968 968 1048 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50450 24 2 0 1 121 5808 4519 968 968 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50451 15 4 0 1 122 6580 9251 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50452 15 4 0 1 122 6580 9251 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50453 15 4 0 1 122 6580 9251 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50454 24 2 0 1 122 6580 5016 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50455 24 2 0 1 122 6580 5016 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50456 24 2 0 1 122 6580 5016 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50457 36 2 0 2 122 7238 10663 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50458 36 2 0 2 122 7238 10663 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50459 36 2 0 2 122 7238 10663 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50460 17 4 0 2 122 7238 10663 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50461 17 4 0 2 122 7238 10663 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50462 17 4 0 2 122 7238 10663 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50463 8 2 0 1 122 6687 9371 1114 1114 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50464 8 2 0 1 122 6687 9371 1114 1114 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50465 8 2 0 1 122 6687 9371 1114 1114 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50466 15 4 0 1 122 6687 9371 1114 1114 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50467 15 4 0 1 122 6687 9371 1114 1114 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50468 15 4 0 1 122 6687 9371 1114 1114 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50469 24 2 0 1 122 6687 5086 1114 1114 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50470 24 2 0 1 122 6687 5086 1114 1114 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50471 24 2 0 1 122 6687 5086 1114 1114 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50472 3 2 0 1 122 6687 9371 1114 1114 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50473 3 2 0 1 122 6687 9371 1114 1114 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50474 3 2 0 1 122 6687 9371 1114 1114 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50475 8 2 0 1 123 6794 9491 1132 1132 2660 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50476 8 2 0 1 123 6794 9491 1132 1132 1064 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50477 8 2 0 1 123 6794 9491 1132 1132 106 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50478 16 4 0 1 123 5661 6600 1132 1132 2660 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50479 16 4 0 1 123 5661 6600 1132 1132 1064 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50480 16 4 0 1 123 5661 6600 1132 1132 106 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50481 15 4 0 1 123 6794 9491 1132 1132 2660 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50482 15 4 0 1 123 6794 9491 1132 1132 1064 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50483 15 4 0 1 123 6794 9491 1132 1132 106 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50484 17 4 0 2 123 7473 10937 1132 1132 2660 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50485 17 4 0 2 123 7473 10937 1132 1132 1064 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50486 17 4 0 2 123 7473 10937 1132 1132 106 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50487 35 4 0 3 123 13588 23945 1132 1132 2660 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50488 35 4 0 3 123 13588 23945 1132 1132 1064 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50489 35 4 0 3 123 13588 23945 1132 1132 106 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50490 23 1 0 2 100 3521 5725 586 586 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50491 23 1 0 2 100 3521 5725 586 586 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50492 23 1 0 2 100 3521 5725 586 586 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50493 10050 3 0 1 100 4694 8456 586 586 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50494 10050 3 0 1 100 4694 8456 586 586 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50495 10050 3 0 1 100 4694 8456 586 586 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50496 10048 3 0 1 100 4557 8674 569 569 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50497 10048 3 0 1 100 4557 8674 569 569 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50498 10048 3 0 1 100 4557 8674 569 569 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50499 10047 3 0 1 101 4523 8802 565 565 2220 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50500 10047 3 0 1 101 4523 8802 565 565 888 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50501 10047 3 0 1 101 4523 8802 565 565 88 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50502 10049 3 0 1 104 4593 8840 574 574 2280 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50503 10049 3 0 1 104 4593 8840 574 574 912 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50504 10049 3 0 1 104 4593 8840 574 574 91 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50505 8 2 0 1 96 3355 4776 559 559 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50506 8 2 0 1 96 3355 4776 559 559 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50507 8 2 0 1 96 3355 4776 559 559 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50508 11 3 0 2 72 3021 4033 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50509 11 3 0 2 72 3021 4033 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50510 11 3 0 2 72 3021 4033 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50511 24 2 0 1 115 4598 3750 766 766 2500 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50512 24 2 0 1 115 4598 3750 766 766 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50513 24 2 0 1 115 4598 3750 766 766 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50514 24 2 0 1 115 4598 3750 766 766 2500 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50515 24 2 0 1 115 4598 3750 766 766 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50516 24 2 0 1 115 4598 3750 766 766 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50517 22 2 0 3 100 5798 11755 603 603 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50518 22 2 0 3 100 5798 11755 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50519 22 2 0 3 100 5798 11755 603 603 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50520 24 2 0 1 115 4598 3750 766 766 2500 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50521 24 2 0 1 115 4598 3750 766 766 1000 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50522 24 2 0 1 115 4598 3750 766 766 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null +50523 36 2 0 2 110 5000 8154 757 757 2400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50524 36 2 0 2 110 5000 8154 757 757 960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50525 36 2 0 2 110 5000 8154 757 757 95 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index b3a0b7822..a6f58e0f3 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -13,7 +13,7 @@ int mut,int#int,2 mut,int#int,1 10107 5#4#6 3001 10108 2#4#6#1#3 3001 10109 8#1#3 3001 -10110 11 10110 +10110 11 10110#2305 10201 13#14#15 3006 10202 14#16#18 3006 10203 13#15#16#18 3006 @@ -27,12 +27,12 @@ int mut,int#int,2 mut,int#int,1 10211 28 3006#10211 10212 29 3006#10212 10213 28#29 3006#10213 -10214 50089 10110 +10214 50089 10110#2305 10301 50094#50096#50091#50093 3011 10302 50104#50100#50103 3011 10303 50116#50119 3011 10304 50140#50137 55001 -10305 50143 10110#10305 +10305 50143 10110#10305#2305 10401 50143#50137#50140 3018 10402 50176#50166#50168 3018 10403 50173#50169#50168 3018 @@ -41,7 +41,7 @@ int mut,int#int,2 mut,int#int,1 10406 44#37#39 3018 10407 50185 3018#10410 10408 50188 3018#10410 -10409 50191 10110#10409 +10409 50191 10110#10409#2305 10501 50219#50214#50216 3020 10502 50230 3020 10503 50236#50235#50237 3020 @@ -49,12 +49,12 @@ int mut,int#int,2 mut,int#int,1 10505 50251#50247#50249#50253#50255 3020 10506 50260#50259#50261 55003 10507 50266 10110#10411 -10508 50239 10110#10411 +10508 50239 10110#10411#2305 10601 50274#50276#50271#50213 3026#10412 10602 50381#50383#50385 3026#10412 10603 50305#50304#50306 3026#10412 10604 50314 10110#10411 -10605 50320 10110#10411 +10605 50320 10110#10411#2305 10701 50325#50327 3031 10702 50334#50335 3031 10703 50346#50358 3031 @@ -67,7 +67,7 @@ int mut,int#int,2 mut,int#int,1 10710 50362 10110#10411 10711 50368 10110#10411 10712 50371 10110#10411 -10713 50374 10110#10411 +10713 50374 10110#10411#2305 10801 50380#50379#50381 3036 10802 50386#50379#50381 3036 10803 50395#50379#50381 3036 @@ -84,19 +84,30 @@ int mut,int#int,2 mut,int#int,1 10814 50404 3036#10412 10815 50413 10110#10413 10816 50422 10110#10413 -10901 106#107#108 10901#20901 -10902 109#110#111 10902#20902 -10903 104#109#111 10903#20903 -10904 101#106#108 10904#20904 -10905 113#101#104 10905#20905 -10906 113 10906#20906 -10907 116 10907#20907 -11001 124#125#126 11001#21001 -11002 127#128#129 11002#21002 -11003 119#125#128 11003#21003 -11004 122#125#128 11004#21004 -11005 122 11005#21005 -11006 131 11006#21006 +10901 50431#50430#50432 100000 +10902 50446#50442#50444 100000 +10903 50461#50451#50453 100000 +10904 50431#50430#50432 100000 +10905 50446#50442#50444 100000 +10906 50461#50451#50453 100000 +10907 50485 10906#20906 +10908 50518 10906#20906 +10909 50488 10907#20907 +10910 50431#50430#50432 50407 +10911 50518 50408 +10912 50488 50409 +10913 50521 50410 +10914 50524 50411#20907 +11001 50491#50490#50492 3041 +11002 50491#50490#50492 3041 +11003 50491#50490#50492 3041 +11004 50491#50490#50492 3041 +11005 50491#50490#50492 3041 +11006 50494#50497#50500#50503 3041 +11007 50506 10906#20906 +11008 50509 10907#20907 +11009 50512 10906#20906 +11010 50515 10907#20907 101011 1#2#3 100002#100003#102005#102002 101021 4#5#6 100004#100002#102002#102003#102004#102005 101071 11#1#3 100006#102003#102004#102005#102006 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index 77b9b5281..d16146bad 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -28,8 +28,14 @@ int int mut,int#int,2 10802 2 1503#5 10803 2 1503#10 10804 2 1503#6 -0 0 null -0 0 null +10901 3 1#5#1000 +10902 2 14#5000 +10903 2 14#10000 +10904 2 14#30000 +10905 2 14#50000 +10906 2 14#100000 +11001 2 1501#1 +11002 2 1501#1|1502#1 0 0 null 0 0 null 0 0 null diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index d52d20080..41c2a42fa 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -23,7 +23,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100021 0 0 null null 1 100020 100022 0 0 null null 5 100021 100023 0 0 null null 5 100022 -100024 0 0 null null 4 null +100024 0 15 100003 null 4 null 100025 0 0 null null 0 null 100026 0 0 null null 4 null 100027 0 0 null null 1 null @@ -436,7 +436,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 108037 0 0 null null 1 108034 108038 0 0 null null 1 108032 108039 0 1 10813 null 1 108033 -108040 0 0 null null 4 108032 +108040 0 15 108011 null 4 108032 108041 0 0 null null 1 108035 108042 0 0 null null 1 108032 108043 0 0 null null 1 108036 @@ -464,94 +464,120 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 108065 0 15 108024 101006 4 null 108066 0 15 108025 101006 4 null 108067 0 15 108026 101006 4 null -109001 0 5 0 null 4 null +109001 0 0 null null 1 109008 109002 0 0 null null 4 null -109003 0 19 12#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 12 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 12 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 +109003 0 1 10902 null 1 109009 +109004 0 1 10904 null 1 109010 +109005 0 1 10906 null 1 109011 +109006 0 6 2 null 3 109012#109013|1#10901 +109007 0 6 2 100006 1 109014 +109008 0 8 16 null 1 109014 +109009 0 1 10907 null 1 109015 +109010 0 6 1 null 1 109017 +109011 0 6 1 null 1 109016 +109012 0 6 1 null 1 109015 +109013 0 6 1 null 1 109017 +109014 0 6 1 null 1 109016 +109015 0 6 1 null 1 109018 +109016 0 1 10909 null 1 109019 +109017 0 9 10 100006 4 null +109018 0 0 null null 1 109021 +109019 0 0 null null 4 null +109020 0 0 null null 1 109022 +109021 0 0 null null 4 null +109022 10902 2 14#5000 null 1 109023 +109023 0 0 null null 6 109021 +109024 0 1 10910 null 1 109024 +109025 10903 2 14#10000 null 1 109025 +109026 0 15 109008 null 4 null +109027 0 1 10911 null 1 109026 +109028 10904 2 14#30000 null 1 109027 +109029 0 15 109008 null 4 null +109030 0 1 10912 null 1 109028 +109031 10905 2 14#50000 null 1 109029 +109032 0 15 109008 null 4 null +109033 0 1 10913 null 1 109030 +109034 10906 2 14#100000 null 1 109031 +109035 0 15 109008 null 4 null +109036 0 1 10914 null 1 109032 +109037 0 15 109008 null 4 null +109038 0 0 null null 1 109034 109039 0 0 null null 4 null -109040 0 1 1090001 null 1 109045 +109040 0 1 10904 null 1 109035 109041 0 0 null null 4 null -109042 0 1 1090001 null 1 109046 +109042 0 1 10908 null 1 109036 109043 0 0 null null 4 null -109044 0 0 null null 1 109047 -109045 0 0 null null 4 null -109046 0 1 1090001 null 1 109048 -109047 0 0 null null 4 null -109048 0 1 1090001 null 1 109049 -109049 0 0 null null 4 null -109050 0 1 1090002 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 29 1503#1 10102 4 null -109069 0 0 null null 4 null -109070 1 29 1503#1 10102 4 null -109071 0 0 null null 4 null -109072 1 29 1503#1 10102 4 null -109073 0 0 null null 4 null -109074 1 29 1503#1 10102 4 null -109075 0 0 null null 4 null -109076 1 29 1503#1 10102 4 null -109077 0 0 null null 4 null -109078 1 29 1503#1 10102 4 null -109079 0 0 null null 4 null -110001 1 29 1503#1 10102 4 null +109044 0 15 109009 100006 4 null +109045 10801 2 1501#3 100006 1 109037 +109046 10802 2 1501#5 101006 1 109037 +109047 10803 2 1501#10 102006 1 109037 +109048 0 0 null null 4 null +109049 0 15 109012 101006 4 null +109050 0 15 109013 101006 4 null +109051 0 15 109014 101006 4 null +110001 0 1 11007 null 1 110008 110002 0 0 null null 4 null -110003 1 29 1503#1 10102 4 null -110004 0 0 null null 4 null -110005 1 29 1503#1 10102 4 null -110006 0 0 null null 4 null -110007 1 29 1503#1 10102 4 null +110003 0 9 11 55005 4 null +110004 0 1 11008 null 1 110010 +110005 0 0 null null 4 null +110006 0 9 11 55006 4 null +110007 0 1 11009 null 1 110012 110008 0 0 null null 4 null -110009 0 5 0 null 4 null -110010 0 0 null null 4 null +110009 0 17 11#110009|110#2#4#110010 null 4 null +110010 0 1 11009 null 1 110014 110011 0 0 null null 4 null -110012 0 0 null null 4 null +110012 0 17 11#110010|110#15#2#110011 null 4 null +110013 0 1 11009 null 1 110016 +110014 0 0 null null 4 null +110015 0 17 11#110011|110#15#20#110012 null 4 null +110016 0 1 11009 null 1 110018 +110017 0 0 null null 4 null +110018 0 17 11#110012|110#9#8#110013 null 4 null +110019 0 1 11010 null 1 110020 +110020 0 0 null null 4 null +110021 0 15 110013 null 4 null +110022 0 0 null null 1 110022 +110023 0 0 null null 4 null +110024 0 0 null null 1 110023 +110025 0 0 null null 1 110024 +110026 0 30 110#11#2#110007 null 6 110025 +110027 10801 2 1503#3 100006 1 110025 +110028 10802 2 1503#5 101006 1 110025 +110029 11001 0 null null 1 110026 +110030 0 0 null null 4 null +110031 0 11 11|110#9#2#110017 null 6 110027 +110032 10801 2 1503#3 100006 1 110027 +110033 10802 2 1503#5 101006 1 110027 +110034 10803 2 1503#10 102006 1 110027 +110035 0 0 null null 4 null +110036 0 0 null null 1 110029 +110037 0 0 null null 4 null +110038 0 0 null null 1 110030 +110039 0 0 null null 1 110031 +110040 0 11 11|110#5#2#110015 null 6 110032 +110041 11002 2 1501#1|1502#1 null 1 110033 +110042 0 0 null null 4 null +110043 0 6 2 null 1 110034 +110044 0 6 2 null 1 110035 +110045 0 9 11 null 4 null +110046 0 0 null null 1 110037 +110047 0 0 null null 4 null +110048 0 0 null null 1 110038 +110049 0 6 2 null 2 110039#110040|30#70 +110050 0 0 null null 6 110038 +110051 0 6 2 null 2 110039#110040|30#70 +110052 0 0 null null 6 110038 +110053 0 6 2 null 2 110041#110042|50#50 +110054 0 0 null null 6 110038 +110055 0 6 2 null 2 110041#110042|50#50 +110056 0 0 null null 6 110038 +110057 0 6 2 null 2 110043#110044|70#30 +110058 0 0 null null 6 110038 +110059 0 6 2 null 2 110043#110044|70#30 +110060 0 0 null null 6 110038 +110061 0 30 110#4#13#110008 null 6 110045 +110062 0 0 null null 1 110045 +110063 0 0 null null 4 null +110064 0 15 110018 null 4 null +110065 0 15 110019 null 4 null +110066 0 15 110020 null 4 null diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index d3806f2a3..adea2faba 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -33,6 +33,11 @@ int int mut,int#int,1 int int 137 2 50707#50607 1 0 138 2 50708#50608 1 0 140 2 601#602 1 0 +151 1 70011#70001 2 0 +152 1 70012#70002 2 0 +153 1 70013#70003 2 0 +154 1 70014#70004 2 0 +155 1 70015#70005 2 0 501 2 60047#60048#60049#60050#60051#60052 1 0 502 2 60036#60037#60039#60043 1 0 503 2 60025#60038#60040#60041 1 0 @@ -126,6 +131,7 @@ int int mut,int#int,1 int int 2025 1 6068#6069#6070#6007#6008 5 0 2303 2 51001#51002#51003#51004#51005#51006#51007#51008#51009#51010#51011#51012#51013#51014#51015#51016#51017#51018 1 0 2304 2 51001#51002#51003#51004#51005#51006#51007#51008#51009#51010#51011#51012#51013#51014#51015#51016#51017#51018 1 0 +2305 2 604#605 1 0 3001 1 22001#21001 5 0 3002 1 22002#21002 5 0 3003 1 22003#21003 5 0 @@ -647,6 +653,13 @@ int int mut,int#int,1 int int 55002 1 50402 1 0 55003 1 50403 1 0 55004 1 50404 1 0 +55005 1 50405 1 0 +55006 1 50406 1 0 +55007 1 50407 1 0 +55008 1 50408 1 0 +55009 1 50409 1 0 +55010 1 50410 1 0 +55011 1 50411 1 0 100001 1 100001 1 0 700001 1 2028 1 0 700002 1 1047 1 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index 059ef2989..13b90d427 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -76,7 +76,9 @@ int int int float int int 600 3001 1 1.0 0 0 601 12013 12 1.0 1 1 602 12013 9988 1.0 0 0 -603 12013 770 0 0 0 +603 12013 770 1.0 0 0 +604 19 20 1.0 1 1 +605 19 80 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 @@ -785,6 +787,13 @@ int int int float int int 50402 1501 100 1.0 1 1 50403 1503 100 1.0 1 1 50404 1501 100 1.0 5 5 +50405 1501 100 1.0 1 1 +50406 1502 100 1.0 1 1 +50407 14 100 1.0 10000 10000 +50408 14 100 1.0 20000 20000 +50409 14 100 1.0 60000 60000 +50410 14 100 1.0 100000 100000 +50411 14 100 1.0 200000 200000 50101 1007 10 1.0 1 1 50102 1007 15 1.0 1 1 50103 1007 20 1.0 1 1 @@ -1169,3 +1178,13 @@ int int int float int int 100000 14 100 1.0 0 0 100001 14 100 1.0 1000 1000 102003 4 100 1.0 40 40 +70001 14 100 1.0 100 100 +70002 14 100 1.0 100 100 +70003 14 100 1.0 150 150 +70004 14 100 1.0 150 150 +70005 14 100 1.0 250 250 +70011 3 100 1.0 15 15 +70012 3 100 1.0 15 15 +70013 3 100 1.0 20 20 +70014 3 100 1.0 20 20 +70015 3 100 1.0 25 25 diff --git a/conf/server/SkillLogicConfig.txt b/conf/server/SkillLogicConfig.txt index 23b1059fa..0ea8869f6 100644 --- a/conf/server/SkillLogicConfig.txt +++ b/conf/server/SkillLogicConfig.txt @@ -680,26 +680,26 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float 500208 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2 500209 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2 500210 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2 -500301 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500302 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500303 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500304 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500305 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500306 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500307 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500308 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500309 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500310 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3 -500401 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500402 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500403 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500404 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500405 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500406 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500407 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500408 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500409 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 -500410 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4 +500301 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500302 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500303 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500304 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500305 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500306 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500307 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500308 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500309 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500310 20012#0.7|10014#0.7 26|4#4 60000|9#0.2#6#1|10#0.2#6#1 3 +500401 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500402 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500403 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500404 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500405 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500406 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500407 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500408 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500409 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 +500410 20014#0.7|10015#0.7 26|4 80000|4#400#6#1 4 500501 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5 500502 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5 500503 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5 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 e83f28273..c866a8c0c 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 @@ -524,7 +524,6 @@ public class MapLogic { } updateMapMission(mapManager,EventType.updateEvent, optionId,0); - LOGGER.info("optionId={}" ,optionId); int totalWeight = updateMapMission(mapManager,EventType.updateEvent, pointId,0); if (totalWeight >= 100) { CrossInfo crossInfo = mapManager.getCrossInfoMap().get(mapManager.getCurMapId()); @@ -560,7 +559,7 @@ public class MapLogic { } // LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{} {} sOptionConfig.getReward()=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(), // cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon,eventUpdateResponse.getDrop(), sOptionConfig.getReward()); - LOGGER.info("updatEvent() uid=>{},nextEventId={},eventId={},mission=>{}", uid, nextEventId, cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMission()); +// LOGGER.info("updatEvent() uid=>{},nextEventId={},eventId={},mission=>{}", uid, nextEventId, cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMission()); MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true); }