From de2b8cf853630e6948c2b9cf6b67918b2ef42f86 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 29 Jun 2019 16:29:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=82=BC=E5=89=AF=E6=9C=AC=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/ChallengeMissionConfig.txt | 26 +- conf/server/DifferDemonsComonpentsConfig.txt | 240 +++++++++--------- conf/server/LevelDifficultyConfig.txt | 2 +- conf/server/MonsterConfig.txt | 76 +++--- conf/server/OptionConfig.txt | 2 +- conf/server/VipLevelConfig.txt | 12 +- conf/server/WorkShopSetting.txt | 200 +++++++-------- .../ljsd/jieling/core/VipPrivilegeType.java | 2 + .../ljsd/jieling/handler/map/MapLogic.java | 95 ++++--- .../ljsd/jieling/handler/map/MapManager.java | 52 ++-- .../map/behavior/FourtyThreeBehavior.java | 9 +- .../map/behavior/FourtyTwoBehavior.java | 3 + .../ljsd/jieling/logic/store/StoreLogic.java | 26 ++ .../com/ljsd/jieling/util/CBean2Proto.java | 15 -- .../java/com/ljsd/jieling/util/CellUtil.java | 2 +- .../java/com/ljsd/jieling/util/MathUtils.java | 20 ++ 16 files changed, 434 insertions(+), 348 deletions(-) diff --git a/conf/server/ChallengeMissionConfig.txt b/conf/server/ChallengeMissionConfig.txt index f13d30145..6c086b22d 100644 --- a/conf/server/ChallengeMissionConfig.txt +++ b/conf/server/ChallengeMissionConfig.txt @@ -2,19 +2,19 @@ Id MissionNum Reward int int mut,int#int,1 1 1 2000 2 5 2001 -3 3 2002 -4 6 2003#51 -5 5 2004#51 -6 6 2005#51 -7 6 2006#51 -8 7 2007#51 -9 10 2008#51 -10 9 2009#51 -11 6 2010#51 -12 6 2011#61 -13 7 2012#61 -14 5 2013#61 -15 6 2014#61 +3 3 2003 +4 6 2005#51 +5 5 2007#51 +6 6 2009#51 +7 6 20011#51 +8 7 20013#51 +9 10 2015#51 +10 9 2015#51 +11 6 2015#51 +12 6 2015#61 +13 7 2015#61 +14 5 2015#61 +15 6 2015#61 16 5 2015#71 101 2 null 102 2 null diff --git a/conf/server/DifferDemonsComonpentsConfig.txt b/conf/server/DifferDemonsComonpentsConfig.txt index 4a8646ac6..edcaa6a42 100644 --- a/conf/server/DifferDemonsComonpentsConfig.txt +++ b/conf/server/DifferDemonsComonpentsConfig.txt @@ -120,86 +120,86 @@ int int int mut,int#int,2 mut,int#int,2 mut,int#int,2 118 6012 8 6012#5|5#290 1#17733|60#1330 1#2#214 119 6012 9 6012#6|5#355 1#21933|60#1640 null 120 6012 10 6012#8|5#420 1#26600|60#2000 1#2#214 -121 6013 1 6013#1|5#0 1#596|2#7|102#4 null -122 6013 2 6013#1|5#40 1#1491|2#18|102#9 1#4#375 -123 6013 3 6013#2|5#65 1#2386|2#28|102#14 null -124 6013 4 6013#2|5#100 1#3579|2#42|102#21 2#4#375 -125 6013 5 6013#3|5#135 1#5070|2#59|102#30 null -126 6013 6 6013#3|5#180 1#6859|2#81|102#40 3#4#375 -127 6013 7 6013#4|5#235 1#8947|2#105|102#53 null -128 6013 8 6013#5|5#290 1#11333|2#133|102#67 4#4#375 -129 6013 9 6013#6|5#355 1#14017|2#164|102#82 null -130 6013 10 6013#8|5#420 1#17000|2#200|102#100 5#4#375 -131 6014 1 6014#1|5#0 1#596|2#7|101#4 null -132 6014 2 6014#1|5#40 1#1491|2#18|101#9 1#4#375 -133 6014 3 6014#2|5#65 1#2386|2#28|101#14 null -134 6014 4 6014#2|5#100 1#3579|2#42|101#21 2#4#375 -135 6014 5 6014#3|5#135 1#5070|2#59|101#30 null -136 6014 6 6014#3|5#180 1#6859|2#81|101#40 3#4#375 -137 6014 7 6014#4|5#235 1#8947|2#105|101#53 null -138 6014 8 6014#5|5#290 1#11333|2#133|101#67 4#4#375 -139 6014 9 6014#6|5#355 1#14017|2#164|101#82 null -140 6014 10 6014#8|5#420 1#17000|2#200|101#100 5#4#375 -141 6015 1 6015#1|5#0 1#596|2#7|103#4 null -142 6015 2 6015#1|5#40 1#1491|2#18|103#9 1#4#375 -143 6015 3 6015#2|5#65 1#2386|2#28|103#14 null -144 6015 4 6015#2|5#100 1#3579|2#42|103#21 2#4#375 -145 6015 5 6015#3|5#135 1#5070|2#59|103#30 null -146 6015 6 6015#3|5#180 1#6859|2#81|103#40 3#4#375 -147 6015 7 6015#4|5#235 1#8947|2#105|103#53 null -148 6015 8 6015#5|5#290 1#11333|2#133|103#67 4#4#375 -149 6015 9 6015#6|5#355 1#14017|2#164|103#82 null -150 6015 10 6015#8|5#420 1#17000|2#200|103#100 5#4#375 -151 6016 1 6016#1|5#0 1#596|2#7|104#4 null -152 6016 2 6016#1|5#40 1#1491|2#18|104#9 1#4#375 -153 6016 3 6016#2|5#65 1#2386|2#28|104#14 null -154 6016 4 6016#2|5#100 1#3579|2#42|104#21 2#4#375 -155 6016 5 6016#3|5#135 1#5070|2#59|104#30 null -156 6016 6 6016#3|5#180 1#6859|2#81|104#40 3#4#375 -157 6016 7 6016#4|5#235 1#8947|2#105|104#53 null -158 6016 8 6016#5|5#290 1#11333|2#133|104#67 4#4#375 -159 6016 9 6016#6|5#355 1#14017|2#164|104#82 null -160 6016 10 6016#8|5#420 1#17000|2#200|104#100 5#4#375 -161 6017 1 6017#1|5#0 1#596|2#7|108#4 null -162 6017 2 6017#1|5#40 1#1491|2#18|108#9 1#3#375 -163 6017 3 6017#2|5#65 1#2386|2#28|108#14 null -164 6017 4 6017#2|5#100 1#3579|2#42|108#21 2#3#375 -165 6017 5 6017#3|5#135 1#5070|2#59|108#30 null -166 6017 6 6017#3|5#180 1#6859|2#81|108#40 3#3#375 -167 6017 7 6017#4|5#235 1#8947|2#105|108#53 null -168 6017 8 6017#5|5#290 1#11333|2#133|108#67 4#3#375 -169 6017 9 6017#6|5#355 1#14017|2#164|108#82 null -170 6017 10 6017#8|5#420 1#17000|2#200|108#100 5#3#375 -171 6018 1 6018#1|5#0 1#596|2#7|107#4 null -172 6018 2 6018#1|5#40 1#1491|2#18|107#9 1#3#375 -173 6018 3 6018#2|5#65 1#2386|2#28|107#14 null -174 6018 4 6018#2|5#100 1#3579|2#42|107#21 2#3#375 -175 6018 5 6018#3|5#135 1#5070|2#59|107#30 null -176 6018 6 6018#3|5#180 1#6859|2#81|107#40 3#3#375 -177 6018 7 6018#4|5#235 1#8947|2#105|107#53 null -178 6018 8 6018#5|5#290 1#11333|2#133|107#67 4#3#375 -179 6018 9 6018#6|5#355 1#14017|2#164|107#82 null -180 6018 10 6018#8|5#420 1#17000|2#200|107#100 5#3#375 -181 6019 1 6019#1|5#0 1#596|2#7|109#4 null -182 6019 2 6019#1|5#40 1#1491|2#18|109#9 1#3#375 -183 6019 3 6019#2|5#65 1#2386|2#28|109#14 null -184 6019 4 6019#2|5#100 1#3579|2#42|109#21 2#3#375 -185 6019 5 6019#3|5#135 1#5070|2#59|109#30 null -186 6019 6 6019#3|5#180 1#6859|2#81|109#40 3#3#375 -187 6019 7 6019#4|5#235 1#8947|2#105|109#53 null -188 6019 8 6019#5|5#290 1#11333|2#133|109#67 4#3#375 -189 6019 9 6019#6|5#355 1#14017|2#164|109#82 null -190 6019 10 6019#8|5#420 1#17000|2#200|109#100 5#3#375 -191 6020 1 6020#1|5#0 1#596|2#7|110#4 null -192 6020 2 6020#1|5#40 1#1491|2#18|110#9 1#3#375 -193 6020 3 6020#2|5#65 1#2386|2#28|110#14 null -194 6020 4 6020#2|5#100 1#3579|2#42|110#21 2#3#375 -195 6020 5 6020#3|5#135 1#5070|2#59|110#30 null -196 6020 6 6020#3|5#180 1#6859|2#81|110#40 3#3#375 -197 6020 7 6020#4|5#235 1#8947|2#105|110#53 null -198 6020 8 6020#5|5#290 1#11333|2#133|110#67 4#3#375 -199 6020 9 6020#6|5#355 1#14017|2#164|110#82 null -200 6020 10 6020#8|5#420 1#17000|2#200|110#100 5#3#375 +121 6013 1 6013#1|5#0 1#596|2#7|102#400 null +122 6013 2 6013#1|5#40 1#1491|2#18|102#900 1#4#375 +123 6013 3 6013#2|5#65 1#2386|2#28|102#1400 null +124 6013 4 6013#2|5#100 1#3579|2#42|102#2100 2#4#375 +125 6013 5 6013#3|5#135 1#5070|2#59|102#3000 null +126 6013 6 6013#3|5#180 1#6859|2#81|102#4000 3#4#375 +127 6013 7 6013#4|5#235 1#8947|2#105|102#5300 null +128 6013 8 6013#5|5#290 1#11333|2#133|102#6700 4#4#375 +129 6013 9 6013#6|5#355 1#14017|2#164|102#8200 null +130 6013 10 6013#8|5#420 1#17000|2#200|102#10000 5#4#375 +131 6014 1 6014#1|5#0 1#596|2#7|101#400 null +132 6014 2 6014#1|5#40 1#1491|2#18|101#900 1#4#375 +133 6014 3 6014#2|5#65 1#2386|2#28|101#1400 null +134 6014 4 6014#2|5#100 1#3579|2#42|101#2100 2#4#375 +135 6014 5 6014#3|5#135 1#5070|2#59|101#3000 null +136 6014 6 6014#3|5#180 1#6859|2#81|101#4000 3#4#375 +137 6014 7 6014#4|5#235 1#8947|2#105|101#5300 null +138 6014 8 6014#5|5#290 1#11333|2#133|101#6700 4#4#375 +139 6014 9 6014#6|5#355 1#14017|2#164|101#8200 null +140 6014 10 6014#8|5#420 1#17000|2#200|101#10000 5#4#375 +141 6015 1 6015#1|5#0 1#596|2#7|103#400 null +142 6015 2 6015#1|5#40 1#1491|2#18|103#900 1#4#375 +143 6015 3 6015#2|5#65 1#2386|2#28|103#1400 null +144 6015 4 6015#2|5#100 1#3579|2#42|103#2100 2#4#375 +145 6015 5 6015#3|5#135 1#5070|2#59|103#3000 null +146 6015 6 6015#3|5#180 1#6859|2#81|103#4000 3#4#375 +147 6015 7 6015#4|5#235 1#8947|2#105|103#5300 null +148 6015 8 6015#5|5#290 1#11333|2#133|103#6700 4#4#375 +149 6015 9 6015#6|5#355 1#14017|2#164|103#8200 null +150 6015 10 6015#8|5#420 1#17000|2#200|103#10000 5#4#375 +151 6016 1 6016#1|5#0 1#596|2#7|104#400 null +152 6016 2 6016#1|5#40 1#1491|2#18|104#900 1#4#375 +153 6016 3 6016#2|5#65 1#2386|2#28|104#1400 null +154 6016 4 6016#2|5#100 1#3579|2#42|104#2100 2#4#375 +155 6016 5 6016#3|5#135 1#5070|2#59|104#3000 null +156 6016 6 6016#3|5#180 1#6859|2#81|104#4000 3#4#375 +157 6016 7 6016#4|5#235 1#8947|2#105|104#5300 null +158 6016 8 6016#5|5#290 1#11333|2#133|104#6700 4#4#375 +159 6016 9 6016#6|5#355 1#14017|2#164|104#8200 null +160 6016 10 6016#8|5#420 1#17000|2#200|104#10000 5#4#375 +161 6017 1 6017#1|5#0 1#596|2#7|108#400 null +162 6017 2 6017#1|5#40 1#1491|2#18|108#900 1#3#375 +163 6017 3 6017#2|5#65 1#2386|2#28|108#1400 null +164 6017 4 6017#2|5#100 1#3579|2#42|108#2100 2#3#375 +165 6017 5 6017#3|5#135 1#5070|2#59|108#3000 null +166 6017 6 6017#3|5#180 1#6859|2#81|108#4000 3#3#375 +167 6017 7 6017#4|5#235 1#8947|2#105|108#5300 null +168 6017 8 6017#5|5#290 1#11333|2#133|108#6700 4#3#375 +169 6017 9 6017#6|5#355 1#14017|2#164|108#8200 null +170 6017 10 6017#8|5#420 1#17000|2#200|108#10000 5#3#375 +171 6018 1 6018#1|5#0 1#596|2#7|107#400 null +172 6018 2 6018#1|5#40 1#1491|2#18|107#900 1#3#375 +173 6018 3 6018#2|5#65 1#2386|2#28|107#1400 null +174 6018 4 6018#2|5#100 1#3579|2#42|107#2100 2#3#375 +175 6018 5 6018#3|5#135 1#5070|2#59|107#3000 null +176 6018 6 6018#3|5#180 1#6859|2#81|107#4000 3#3#375 +177 6018 7 6018#4|5#235 1#8947|2#105|107#5300 null +178 6018 8 6018#5|5#290 1#11333|2#133|107#6700 4#3#375 +179 6018 9 6018#6|5#355 1#14017|2#164|107#8200 null +180 6018 10 6018#8|5#420 1#17000|2#200|107#10000 5#3#375 +181 6019 1 6019#1|5#0 1#596|2#7|109#400 null +182 6019 2 6019#1|5#40 1#1491|2#18|109#900 1#3#375 +183 6019 3 6019#2|5#65 1#2386|2#28|109#1400 null +184 6019 4 6019#2|5#100 1#3579|2#42|109#2100 2#3#375 +185 6019 5 6019#3|5#135 1#5070|2#59|109#3000 null +186 6019 6 6019#3|5#180 1#6859|2#81|109#4000 3#3#375 +187 6019 7 6019#4|5#235 1#8947|2#105|109#5300 null +188 6019 8 6019#5|5#290 1#11333|2#133|109#6700 4#3#375 +189 6019 9 6019#6|5#355 1#14017|2#164|109#8200 null +190 6019 10 6019#8|5#420 1#17000|2#200|109#10000 5#3#375 +191 6020 1 6020#1|5#0 1#596|2#7|110#400 null +192 6020 2 6020#1|5#40 1#1491|2#18|110#900 1#3#375 +193 6020 3 6020#2|5#65 1#2386|2#28|110#1400 null +194 6020 4 6020#2|5#100 1#3579|2#42|110#2100 2#3#375 +195 6020 5 6020#3|5#135 1#5070|2#59|110#3000 null +196 6020 6 6020#3|5#180 1#6859|2#81|110#4000 3#3#375 +197 6020 7 6020#4|5#235 1#8947|2#105|110#5300 null +198 6020 8 6020#5|5#290 1#11333|2#133|110#6700 4#3#375 +199 6020 9 6020#6|5#355 1#14017|2#164|110#8200 null +200 6020 10 6020#8|5#420 1#17000|2#200|110#10000 5#3#375 201 6021 1 6021#1|5#0 1#596|2#7|58#52 null 202 6021 2 6021#1|5#40 1#1491|2#18|58#131 1#1#125 203 6021 3 6021#2|5#65 1#2386|2#28|58#206 null @@ -280,46 +280,46 @@ int int int mut,int#int,2 mut,int#int,2 mut,int#int,2 278 6028 8 6028#5|5#290 52#666|55#666|66#133 4#2#125 279 6028 9 6028#6|5#355 52#822|55#822|66#164 null 280 6028 10 6028#8|5#420 52#1000|55#1000|66#200 5#2#125 -281 6029 1 6029#1|5#0 1#596|2#7|105#4 null -282 6029 2 6029#1|5#40 1#1491|2#18|105#9 1#5#250 -283 6029 3 6029#2|5#65 1#2386|2#28|105#14 null -284 6029 4 6029#2|5#100 1#3579|2#42|105#21 2#5#250 -285 6029 5 6029#3|5#135 1#5070|2#59|105#30 null -286 6029 6 6029#3|5#180 1#6859|2#81|105#40 3#5#250 -287 6029 7 6029#4|5#235 1#8947|2#105|105#53 null -288 6029 8 6029#5|5#290 1#11333|2#133|105#67 4#5#250 -289 6029 9 6029#6|5#355 1#14017|2#164|105#82 null -290 6029 10 6029#8|5#420 1#17000|2#200|105#100 5#5#250 -291 6030 1 6030#1|5#0 1#596|2#7|106#4 null -292 6030 2 6030#1|5#40 1#1491|2#18|106#9 1#5#250 -293 6030 3 6030#2|5#65 1#2386|2#28|106#14 null -294 6030 4 6030#2|5#100 1#3579|2#42|106#21 2#5#250 -295 6030 5 6030#3|5#135 1#5070|2#59|106#30 null -296 6030 6 6030#3|5#180 1#6859|2#81|106#40 3#5#250 -297 6030 7 6030#4|5#235 1#8947|2#105|106#53 null -298 6030 8 6030#5|5#290 1#11333|2#133|106#67 4#5#250 -299 6030 9 6030#6|5#355 1#14017|2#164|106#82 null -300 6030 10 6030#8|5#420 1#17000|2#200|106#100 5#5#250 -301 6031 1 6031#1|5#0 1#596|2#7|111#4 null -302 6031 2 6031#1|5#40 1#1491|2#18|111#9 1#5#250 -303 6031 3 6031#2|5#65 1#2386|2#28|111#14 null -304 6031 4 6031#2|5#100 1#3579|2#42|111#21 2#5#250 -305 6031 5 6031#3|5#135 1#5070|2#59|111#30 null -306 6031 6 6031#3|5#180 1#6859|2#81|111#40 3#5#250 -307 6031 7 6031#4|5#235 1#8947|2#105|111#53 null -308 6031 8 6031#5|5#290 1#11333|2#133|111#67 4#5#250 -309 6031 9 6031#6|5#355 1#14017|2#164|111#82 null -310 6031 10 6031#8|5#420 1#17000|2#200|111#100 5#5#250 -311 6032 1 6032#1|5#0 1#596|2#7|112#4 null -312 6032 2 6032#1|5#40 1#1491|2#18|112#9 1#5#250 -313 6032 3 6032#2|5#65 1#2386|2#28|112#14 null -314 6032 4 6032#2|5#100 1#3579|2#42|112#21 2#5#250 -315 6032 5 6032#3|5#135 1#5070|2#59|112#30 null -316 6032 6 6032#3|5#180 1#6859|2#81|112#40 3#5#250 -317 6032 7 6032#4|5#235 1#8947|2#105|112#53 null -318 6032 8 6032#5|5#290 1#11333|2#133|112#67 4#5#250 -319 6032 9 6032#6|5#355 1#14017|2#164|112#82 null -320 6032 10 6032#8|5#420 1#17000|2#200|112#100 5#5#250 +281 6029 1 6029#1|5#0 1#596|2#7|105#400 null +282 6029 2 6029#1|5#40 1#1491|2#18|105#900 1#5#250 +283 6029 3 6029#2|5#65 1#2386|2#28|105#1400 null +284 6029 4 6029#2|5#100 1#3579|2#42|105#2100 2#5#250 +285 6029 5 6029#3|5#135 1#5070|2#59|105#3000 null +286 6029 6 6029#3|5#180 1#6859|2#81|105#4000 3#5#250 +287 6029 7 6029#4|5#235 1#8947|2#105|105#5300 null +288 6029 8 6029#5|5#290 1#11333|2#133|105#6700 4#5#250 +289 6029 9 6029#6|5#355 1#14017|2#164|105#8200 null +290 6029 10 6029#8|5#420 1#17000|2#200|105#10000 5#5#250 +291 6030 1 6030#1|5#0 1#596|2#7|106#400 null +292 6030 2 6030#1|5#40 1#1491|2#18|106#900 1#5#250 +293 6030 3 6030#2|5#65 1#2386|2#28|106#1400 null +294 6030 4 6030#2|5#100 1#3579|2#42|106#2100 2#5#250 +295 6030 5 6030#3|5#135 1#5070|2#59|106#3000 null +296 6030 6 6030#3|5#180 1#6859|2#81|106#4000 3#5#250 +297 6030 7 6030#4|5#235 1#8947|2#105|106#5300 null +298 6030 8 6030#5|5#290 1#11333|2#133|106#6700 4#5#250 +299 6030 9 6030#6|5#355 1#14017|2#164|106#8200 null +300 6030 10 6030#8|5#420 1#17000|2#200|106#10000 5#5#250 +301 6031 1 6031#1|5#0 1#596|2#7|111#400 null +302 6031 2 6031#1|5#40 1#1491|2#18|111#900 1#5#250 +303 6031 3 6031#2|5#65 1#2386|2#28|111#1400 null +304 6031 4 6031#2|5#100 1#3579|2#42|111#2100 2#5#250 +305 6031 5 6031#3|5#135 1#5070|2#59|111#3000 null +306 6031 6 6031#3|5#180 1#6859|2#81|111#4000 3#5#250 +307 6031 7 6031#4|5#235 1#8947|2#105|111#5300 null +308 6031 8 6031#5|5#290 1#11333|2#133|111#6700 4#5#250 +309 6031 9 6031#6|5#355 1#14017|2#164|111#8200 null +310 6031 10 6031#8|5#420 1#17000|2#200|111#10000 5#5#250 +311 6032 1 6032#1|5#0 1#596|2#7|112#400 null +312 6032 2 6032#1|5#40 1#1491|2#18|112#900 1#5#250 +313 6032 3 6032#2|5#65 1#2386|2#28|112#1400 null +314 6032 4 6032#2|5#100 1#3579|2#42|112#2100 2#5#250 +315 6032 5 6032#3|5#135 1#5070|2#59|112#3000 null +316 6032 6 6032#3|5#180 1#6859|2#81|112#4000 3#5#250 +317 6032 7 6032#4|5#235 1#8947|2#105|112#5300 null +318 6032 8 6032#5|5#290 1#11333|2#133|112#6700 4#5#250 +319 6032 9 6032#6|5#355 1#14017|2#164|112#8200 null +320 6032 10 6032#8|5#420 1#17000|2#200|112#10000 5#5#250 321 6033 1 6029#1|5#0 1#807|2#13|66#10 null 322 6033 2 6029#1|5#40 1#2056|2#35|66#13 1#51#250 323 6033 3 6029#2|5#65 1#3231|2#55|66#20 null diff --git a/conf/server/LevelDifficultyConfig.txt b/conf/server/LevelDifficultyConfig.txt index 572f9589b..972cce147 100644 --- a/conf/server/LevelDifficultyConfig.txt +++ b/conf/server/LevelDifficultyConfig.txt @@ -80,7 +80,7 @@ int int int int mut,int#int,2 mut,int#int,2 int mut,int#int,1 mut,int#int,1 int 1032 1022 0 52013 2#7 2#1 8 6003#401078 4003#3003 180 0 25712 1042 1032 0 52014 2#7 2#1 8 6004#401079 4004#3004 180 0 26312 1052 1042 0 52015 2#7 2#1 8 6005#401080 4005#3005 180 0 26912 -2012 1052 0 52016 2#7 2#1 8 6006#401081 4006#3006 180 0 27511 +2012 1052 41 52016 2#7 2#1 8 6006#401081 4006#3006 180 0 27511 2022 2012 0 52017 2#7 2#1 8 6007#401082 4007#3007 180 0 28111 2032 2022 0 52018 2#7 2#1 8 6008#401083 4008#3008 180 0 29311 2042 2032 0 52019 2#7 2#1 8 6009#401084 4009#3009 180 0 30629 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 4829bbda2..69f26ae94 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -1116,38 +1116,38 @@ int int int int int int int int int int int float float float float float float 100074 13 1 0 2 136 13055 3759 1476 1476 116 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20216#20219 null 100075 14 1 0 3 136 19583 2262 1476 1476 3504 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20221#20224 null 100076 10008 1 1 3 136 97918 5256 1476 1476 3504 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000814#1000824 null -100077 2 3 0 1 137 15399 2895 1972 1972 5880 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20151 null -100078 2 3 0 1 137 15399 2895 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20152 null -100079 2 3 0 1 137 15399 2625 1972 1972 117 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20153 null -100080 4 3 0 3 137 76997 5057 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20155#20158 null -100081 21 3 0 2 137 25665 5057 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20179#20182 null -100082 17 4 0 3 137 15399 3841 1972 1972 5880 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20208#20211 null -100083 35 3 0 3 137 76997 5057 1972 1972 117 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20246#20249 null -100084 36 2 0 3 137 46198 3841 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20251#20254 null -100085 42 1 0 1 139 12297 3482 2469 2469 5960 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20256#20259 null -100086 42 1 0 1 139 12297 3482 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null -100087 42 1 0 1 139 12297 3482 2469 2469 119 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null -100088 42 1 0 1 139 12297 3482 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null -100089 38 4 0 3 139 36892 5196 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20263#20266 null -100090 10022 1 2 3 139 20495 6911 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1002214#1002224 null -100091 42 1 0 1 140 12976 3795 2961 2961 6000 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20256#20259 null -100092 42 1 0 1 140 12976 3795 2961 2961 3600 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null -100093 42 1 0 1 140 12976 3795 2961 2961 120 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null -100094 10034 1 0 3 140 64882 6557 2961 2961 3600 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1003414#1003424 null -100095 41 4 0 3 140 64882 6557 2961 2961 3600 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null -100096 35 3 0 3 142 21856 7233 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20245#20248 null -100097 38 4 0 3 142 13113 5786 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20263#20266 null -100098 36 2 0 3 142 13113 5786 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20251#20254 null -100099 10048 4 0 4 142 21856 7233 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20275#20278 null -100100 44 3 0 1 144 9025 6482 3830 3830 6160 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20280 null -100101 44 3 0 1 144 9025 6482 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20281 null -100102 44 3 0 1 144 9025 6482 3830 3830 123 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20282 null -100103 10026 1 3 2 144 22564 9386 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1002614#1002624 null -100104 43 3 0 1 144 11282 5969 3830 3830 6160 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20283 null -100105 43 3 0 1 144 11282 5969 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20284 null -100106 43 3 0 1 144 11282 5456 3830 3830 123 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20285 null -100107 10030 1 5 2 144 22564 8019 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1003014#1003024 null -100108 10001 1 3 3 144 67692 8019 3830 3830 123 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000114#1000124 null +100077 2 3 0 1 137 20704 2453 1972 1972 5880 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20151 null +100078 2 3 0 1 137 20704 2453 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20152 null +100079 2 3 0 1 137 20704 2182 1972 1972 117 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20153 null +100080 4 3 0 3 137 103523 4615 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20155#20158 null +100081 21 3 0 2 137 34507 4615 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20179#20182 null +100082 17 4 0 3 137 20704 3399 1972 1972 5880 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20208#20211 null +100083 35 3 0 3 137 103523 4615 1972 1972 117 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20246#20249 null +100084 36 2 0 3 137 62114 3399 1972 1972 3528 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20251#20254 null +100085 42 1 0 1 139 22907 2598 2469 2469 5960 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20256#20259 null +100086 42 1 0 1 139 22907 2598 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null +100087 42 1 0 1 139 22907 2598 2469 2469 119 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null +100088 42 1 0 1 139 22907 2598 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null +100089 38 4 0 3 139 68723 4312 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20263#20266 null +100090 10022 1 2 3 139 38179 6027 2469 2469 3576 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1002214#1002224 null +100091 42 1 0 1 140 28892 2468 2961 2961 6000 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20256#20259 null +100092 42 1 0 1 140 28892 2468 2961 2961 3600 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null +100093 42 1 0 1 140 28892 2468 2961 2961 120 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null +100094 10034 1 0 3 140 144461 5231 2961 2961 3600 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1003414#1003424 null +100095 41 4 0 3 140 144461 5231 2961 2961 3600 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null +100096 35 3 0 3 142 57224 5465 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20245#20248 null +100097 38 4 0 3 142 34334 4018 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20263#20266 null +100098 36 2 0 3 142 34334 4018 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20251#20254 null +100099 10048 4 0 4 142 57224 5465 3451 3451 3648 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20275#20278 null +100100 44 3 0 1 144 26709 4271 3830 3830 6160 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20280 null +100101 44 3 0 1 144 26709 4271 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20281 null +100102 44 3 0 1 144 26709 4271 3830 3830 123 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20282 null +100103 10026 1 3 2 144 66774 7176 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1002614#1002624 null +100104 43 3 0 1 144 33387 3758 3830 3830 6160 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20283 null +100105 43 3 0 1 144 33387 3758 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20284 null +100106 43 3 0 1 144 33387 3246 3830 3830 123 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20285 null +100107 10030 1 5 2 144 66774 5809 3830 3830 3696 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1003014#1003024 null +100108 10001 1 3 3 144 200324 5809 3830 3830 123 0.05 0.15 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000114#1000124 null 6010101 10024 1 3 2 30 50734 29671 325 216 1600 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1002414 null 6010201 10025 1 1 2 146 3693030 453872 4474 2982 3744 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1002514 null 6010301 10029 1 4 2 198 12232232 992072 10100 6734 8320 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1002914 null @@ -1181,22 +1181,22 @@ int int int int int int int int int int int float float float float float float 6050301 10034 1 4 3 216 20853956 1314756 34530 23020 9040 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1003414#1003424 null 6050302 10035 1 1 3 216 20853956 1314756 34530 23020 5424 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1003514#1003524 null 6050303 10016 1 4 3 216 20853956 1314756 34530 23020 180 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1001614#1001624 null -6060101 10001 1 3 3 138 1010908 339948 5220 3480 5920 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1000114#1000124 null -6060102 10002 1 3 3 138 1010908 339948 5220 3480 3552 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1000214#1000224 null +6060101 10001 1 3 3 138 1417645 338474 3451 2302 5920 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1000114#1000124 null +6060102 10002 1 3 3 138 1417645 338474 3451 2302 3552 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1000214#1000224 null 6060201 10003 1 3 3 187 9202665 808487 7776 5184 7880 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1000314#1000324 null 6060202 10004 1 5 3 187 9202665 808487 7776 5184 4728 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1000414#1000424 null 6060301 10005 1 5 3 216 20853956 1314756 34530 23020 9040 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1000514#1000524 null 6060302 10006 1 5 3 216 20853956 1314756 34530 23020 5424 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000614#1000624 null 6060303 10007 1 5 3 216 20853956 1314756 34530 23020 180 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1000714#1000724 null -6070101 10008 1 1 3 140 1217334 371181 6898 4599 6000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1000814#1000824 null -6070102 10009 1 1 3 140 1217334 371181 6898 4599 3600 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1000914#1000924 null +6070101 10008 1 1 3 140 1997208 368528 3715 2477 6000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1000814#1000824 null +6070102 10009 1 1 3 140 1997208 368528 3715 2477 3600 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1000914#1000924 null 6070201 10010 1 1 3 190 10543539 906877 8660 5773 8000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1001014#1001024 null 6070202 10011 1 1 3 190 10543539 906877 8660 5773 4800 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1001114#1001124 null 6070301 10012 1 2 3 220 26033088 1408867 42724 28483 9200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1001214#1001224 null 6070302 10013 1 2 3 220 26033088 1408867 42724 28483 5520 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1001314#1001324 null 6070303 10014 1 2 3 220 26033088 1408867 42724 28483 183 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1001414#1001424 null -6080101 10015 1 2 3 144 1491405 414632 9406 6270 6160 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1001514#1001524 null -6080102 10017 1 4 3 144 1491405 414632 9406 6270 3696 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1001714#1001724 null +6080101 10015 1 2 3 144 2870773 410210 4100 2734 6160 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1001514#1001524 null +6080102 10017 1 4 3 144 2870773 410210 4100 2734 3696 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1001714#1001724 null 6080201 10018 1 4 3 192 11083577 931548 8836 5891 8080 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1001814#1001824 null 6080202 10019 1 4 3 192 11083577 931548 8836 5891 4848 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1001914#1001924 null 6080301 10020 1 3 3 224 26868766 1498049 43386 28925 9360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1002014#1002024 null diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index ed5b0109b..d51ccd028 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -3160,6 +3160,6 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 2001010 0 43 null null 1 2001008 2001011 0 42 null null 4 null 2001012 0 0 null null 1 2001010 -2001013 0 0 null null 1 2001012 +2001013 0 0 null null 1 2001011 2001014 0 0 null null 1 2001012 2001015 0 42 null null 4 null diff --git a/conf/server/VipLevelConfig.txt b/conf/server/VipLevelConfig.txt index 03a37c4e1..f5f5d28b9 100644 --- a/conf/server/VipLevelConfig.txt +++ b/conf/server/VipLevelConfig.txt @@ -1,8 +1,8 @@ VipLevel Privileges VipBoxDailyReward VipBoxReward OpenRules int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int#int,1 -0 1#10000|2#10000|3#10000|4#2|5#2|6#5|7#3|8#1|9#10|10#1|11#1|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1|17#2 16#50 14#5000|3#500|4#50|16#100 10301#11401#11001 -1 1#11000|2#10000|3#10000|4#2|5#2|6#5|7#3|8#2|9#10|10#2|11#2|12#2|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1|17#2 16#100 14#50000|3#4000|4#100|16#100 11302#10302#11602#11002 -2 1#11000|2#10000|3#10000|4#2|5#3|6#5|7#3|8#3|9#10|10#3|11#3|12#3|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1|17#2 16#150 12006#40|3#6000|4#200|16#100 10703#11903#10303#10103#11603 +0 1#10000|2#10000|3#10000|4#2|5#2|6#10|7#3|8#1|9#10|10#1|11#1|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1|17#2 16#50 14#5000|3#500|4#50|16#100 10301#11401#11001 +1 1#11000|2#10000|3#10000|4#2|5#2|6#10|7#3|8#2|9#10|10#2|11#2|12#2|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1|17#2 16#100 14#50000|3#4000|4#100|16#100 11302#10302#11602#11002 +2 1#11000|2#10000|3#10000|4#2|5#3|6#10|7#3|8#3|9#10|10#3|11#3|12#3|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1|17#2 16#150 12006#40|3#6000|4#200|16#100 10703#11903#10303#10103#11603 3 1#11000|2#10000|3#10000|4#2|5#3|6#10|7#3|8#4|9#10|10#4|11#4|12#3|501#1|502#1|503#0|504#0|505#0|13#1|14#0|15#0|16#3|1001#-1|17#2 16#200 20#5|3#8000|4#300|19#10 10404#10204#11704#11204#11004 4 1#11000|2#10000|3#10000|4#2|5#4|6#10|7#4|8#5|9#10|10#5|11#5|12#4|501#1|502#1|503#1|504#0|505#0|13#1|14#0|15#0|16#3|1001#-1|17#2 16#200 10007#1|20#5|4#500|14#100000 11305#10305#11605#10905#10805 5 1#12000|2#10000|3#10000|4#2|5#5|6#10|7#4|8#6|9#10|10#6|11#6|12#5|501#1|502#1|503#1|504#1|505#0|13#1|14#0|15#0|16#3|1001#-1|17#2 16#200|12013#1 52134#1|52120#1|52086#1|52106#1 11306#11406#10606#10106#11706 @@ -13,6 +13,6 @@ int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int#int,1 10 1#13000|2#15000|3#12000|4#4|5#10|6#30|7#5|8#11|9#10|10#11|11#11|12#10|501#1|502#1|503#1|504#1|505#1|13#3|14#1|15#1|16#3|1001#-1|17#2 16#200|12013#2|21#1 6033#1|6034#1|5#50|6#5 11908#11608#10808#11808#10608 11 1#13000|2#15000|3#12000|4#4|5#11|6#40|7#5|8#12|9#10|10#12|11#12|12#11|501#1|502#1|503#1|504#1|505#1|13#3|14#1|15#1|16#3|1001#-1|17#2 16#200|12013#2|21#1 10005#1|14#500000|3#10000|21#20 11908#11608#10808#11808#10608 12 1#13000|2#15000|3#12000|4#5|5#12|6#50|7#6|8#13|9#10|10#13|11#13|12#12|501#1|502#1|503#1|504#1|505#1|13#3|14#1|15#1|16#3|1001#-1|17#2 16#50|12013#2|21#2 6035#1|6036#1|6#10|5#100 11908#11608#10808#11808#10608 -13 1#14000|2#15000|3#12000|4#5|5#13|6#60|7#6|8#14|9#10|10#14|11#14|12#13|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1|17#2 2#113 6001#1|6002#14 11908#11608#10808#11808#10608 -14 1#14000|2#15000|3#12000|4#6|5#14|6#70|7#6|8#15|9#10|10#15|11#15|12#14|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1|17#2 2#114 6001#1|6002#15 11908#11608#10808#11808#10608 -15 1#15000|2#15000|3#12000|4#6|5#15|6#80|7#7|8#16|9#10|10#16|11#16|12#15|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1|17#2 2#115 6001#1|6002#16 null +13 1#14000|2#15000|3#12000|4#5|5#13|6#60|7#6|8#14|9#10|10#14|11#14|12#13|501#1|502#1|503#1|504#1|505#1|13#3|14#1|15#1|16#3|1001#-1|17#2 2#113 6001#1|6002#14 11908#11608#10808#11808#10608 +14 1#14000|2#15000|3#12000|4#6|5#14|6#70|7#6|8#15|9#10|10#15|11#15|12#14|501#1|502#1|503#1|504#1|505#1|13#3|14#1|15#1|16#3|1001#-1|17#2 2#114 6001#1|6002#15 11908#11608#10808#11808#10608 +15 1#15000|2#15000|3#12000|4#6|5#15|6#80|7#7|8#16|9#10|10#16|11#16|12#15|501#1|502#1|503#1|504#1|505#1|13#3|14#1|15#1|16#3|1001#-1|17#2 2#115 6001#1|6002#16 null diff --git a/conf/server/WorkShopSetting.txt b/conf/server/WorkShopSetting.txt index 53bb33dcf..6b15ccaa6 100644 --- a/conf/server/WorkShopSetting.txt +++ b/conf/server/WorkShopSetting.txt @@ -1,103 +1,103 @@ Id Exp Promote TechnologyLevel UnravelItem FoodExp AddNum PoolRate AddSuccessRate int mut,int#int,2 mut,int#int,1 int mut,int#int,1 int float mut,int#int,2 float 0 1001#0 null 0 63001 0 0.01 1#9#20#70 0.05 -1 1001#50 1#1 2 63015 600 0.02 1#9#20#70 0.05 -2 1001#100 2#1 4 63029 900 0.03 1#9#20#70 0.05 -3 1001#150 3#1 6 63043 1200 0.04 1#9#20#70 0.05 -4 1001#200 4#1 8 63057 1500 0.05 1#9#20#70 0.05 -5 1001#250 5#1 10 63071 1500 0.06 1#9#20#70 0.05 -6 1001#300 1#3 12 63076 2100 0.07 1#9#20#70 0.05 -7 1001#350 2#3 14 63082 2400 0.08 1#9#20#70 0.05 -8 1001#400 3#3 16 63093 2700 0.09 1#9#20#70 0.05 -9 1001#450 4#3 18 63104 3000 0.1 1#9#20#70 0.05 -10 1001#500 5#3 20 63115 3300 0.11 1#9#20#70 0.05 -11 1001#550 1#6 22 64001 3600 0.12 1#9#20#70 0.05 -12 1001#600 2#6 24 64015 3900 0.13 1#9#20#70 0.05 -13 1001#650 3#6 26 64029 4200 0.14 1#9#20#70 0.05 -14 1001#700 4#6 28 64043 4500 0.15 1#9#20#70 0.05 -15 1001#750 5#6 30 64057 4800 0.16 1#9#20#70 0.05 -16 1001#800 1#10 30 64071 5100 0.17 1#9#20#70 0.05 -17 1001#850 2#10 30 64076 5400 0.18 1#9#20#70 0.05 -18 1001#900 3#10 30 64082 5700 0.19 1#9#20#70 0.05 -19 1001#950 4#10 30 64093 6000 0.2 1#9#20#70 0.05 -20 1001#1000 5#10 30 64104 6300 0.21 1#9#20#70 0.05 -21 1001#1050 1#15 30 64115 6600 0.22 1#9#20#70 0.05 -22 1001#1100 2#15 30 65001 6900 0.23 1#9#20#70 0.05 -23 1001#1150 3#15 30 65021 7200 0.24 1#9#20#70 0.05 -24 1001#1200 4#15 30 65041 7500 0.25 1#9#20#70 0.05 -25 1001#1250 5#15 30 65061 7800 0.26 1#9#20#70 0.05 -26 1001#1300 1#21 30 65081 8100 0.27 1#9#20#70 0.05 -27 1001#1350 2#21 30 65101 8400 0.28 1#9#20#70 0.05 -28 1001#1400 3#21 30 65116 8700 0.29 1#9#20#70 0.05 -29 1001#1450 4#21 30 65131 9000 0.3 1#9#20#70 0.05 -30 1001#1500 5#21 30 65146 9300 0.31 1#9#20#70 0.05 -31 1001#1550 1#28 30 65161 9600 0.32 1#9#20#70 0.05 -32 1001#1600 2#28 30 null 9900 0.33 1#9#20#70 0.05 -33 1001#1650 3#28 30 null 10200 0.34 1#9#20#70 0.05 -34 1001#1700 4#28 30 null 10500 0.35 1#9#20#70 0.05 -35 1001#1750 5#28 30 null 10800 0.36 1#9#20#70 0.05 -36 1001#1800 1#36 30 null 11100 0.37 1#9#20#70 0.05 -37 1001#1850 2#36 30 null 11400 0.38 1#9#20#70 0.05 -38 1001#1900 3#36 30 null 11700 0.39 1#9#20#70 0.05 -39 1001#1950 4#36 30 null 12000 0.4 1#9#20#70 0.05 -40 1001#2000 5#36 30 null 12300 0.41 1#9#20#70 0.05 -41 1001#2050 1#45 30 null 12600 0.42 1#9#20#70 0.05 -42 1001#2100 2#45 30 null 12900 0.43 1#9#20#70 0.05 -43 1001#2150 3#45 30 null 13200 0.44 1#9#20#70 0.05 -44 1001#2200 4#45 30 null 13500 0.45 1#9#20#70 0.05 -45 1001#2250 5#45 30 null 13800 0.46 1#9#20#70 0.05 -46 1001#2300 1#55 30 null 14100 0.47 1#9#20#70 0.05 -47 1001#2350 2#55 30 null 14400 0.48 1#9#20#70 0.05 -48 1001#2400 3#55 30 null 14700 0.49 1#9#20#70 0.05 -49 1001#2450 4#55 30 null 15000 0.5 1#9#20#70 0.05 -50 1001#2500 5#55 30 null 15300 0.51 1#9#20#70 0.05 -51 1001#2550 1#65 30 null 15600 0.52 1#9#20#70 0.05 -52 1001#2600 2#65 30 null 15900 0.53 1#9#20#70 0.05 -53 1001#2650 3#65 30 null 16200 0.54 1#9#20#70 0.05 -54 1001#2700 4#65 30 null 16500 0.55 1#9#20#70 0.05 -55 1001#2750 5#65 30 null 16800 0.56 1#9#20#70 0.05 -56 1001#2800 1#76 30 null 17100 0.57 1#9#20#70 0.05 -57 1001#2850 2#76 30 null 17400 0.58 1#9#20#70 0.05 -58 1001#2900 3#76 30 null 17700 0.59 1#9#20#70 0.05 -59 1001#2950 4#76 30 null 18000 0.6 1#9#20#70 0.05 -60 1001#3000 5#76 30 null 18300 0.61 1#9#20#70 0.05 -61 1001#3000 1#88 30 null 18600 0.62 1#9#20#70 0.05 -62 1001#3000 2#88 30 null 18900 0.63 1#9#20#70 0.05 -63 1001#3000 3#88 30 null 19200 0.64 1#9#20#70 0.05 -64 1001#3000 4#88 30 null 19500 0.65 1#9#20#70 0.05 -65 1001#3000 5#88 30 null 19800 0.66 1#9#20#70 0.05 -66 1001#3000 1#101 30 null 20100 0.67 1#9#20#70 0.05 -67 1001#3000 2#101 30 null 20400 0.68 1#9#20#70 0.05 -68 1001#3000 3#101 30 null 20700 0.69 1#9#20#70 0.05 -69 1001#3000 4#101 30 null 21000 0.7 1#9#20#70 0.05 -70 1001#3000 5#101 30 null 21300 0.71 1#9#20#70 0.05 -71 1001#3000 1#115 30 null 21600 0.72 1#9#20#70 0.05 -72 1001#3000 2#115 30 null 21900 0.73 1#9#20#70 0.05 -73 1001#3000 3#115 30 null 22200 0.74 1#9#20#70 0.05 -74 1001#3000 4#115 30 null 22500 0.75 1#9#20#70 0.05 -75 1001#3000 5#115 30 null 22800 0.76 1#9#20#70 0.05 -76 1001#3000 1#130 30 null 23100 0.77 1#9#20#70 0.05 -77 1001#3000 2#130 30 null 23400 0.78 1#9#20#70 0.05 -78 1001#3000 3#130 30 null 23700 0.79 1#9#20#70 0.05 -79 1001#3000 4#130 30 null 24000 0.8 1#9#20#70 0.05 -80 1001#3000 5#130 30 null 24300 0.81 1#9#20#70 0.05 -81 1001#3000 1#146 30 null 24600 0.82 1#9#20#70 0.05 -82 1001#3000 2#146 30 null 24900 0.83 1#9#20#70 0.05 -83 1001#3000 3#146 30 null 25200 0.84 1#9#20#70 0.05 -84 1001#3000 4#146 30 null 25500 0.85 1#9#20#70 0.05 -85 1001#3000 5#146 30 null 25800 0.86 1#9#20#70 0.05 -86 1001#3000 1#163 30 null 26100 0.87 1#9#20#70 0.05 -87 1001#3000 2#163 30 null 26400 0.88 1#9#20#70 0.05 -88 1001#3000 3#163 30 null 26700 0.89 1#9#20#70 0.05 -89 1001#3000 4#163 30 null 27000 0.9 1#9#20#70 0.05 -90 1001#3000 5#163 30 null 27300 0.91 1#9#20#70 0.05 -91 1001#3000 1#181 30 null 27600 0.92 1#9#20#70 0.05 -92 1001#3000 2#181 30 null 27900 0.93 1#9#20#70 0.05 -93 1001#3000 3#181 30 null 28200 0.94 1#9#20#70 0.05 -94 1001#3000 4#181 30 null 28500 0.95 1#9#20#70 0.05 -95 1001#3000 5#181 30 null 28800 0.96 1#9#20#70 0.05 -96 1001#3000 1#200 30 null 29100 0.97 1#9#20#70 0.05 -97 1001#3000 2#200 30 null 29400 0.98 1#9#20#70 0.05 -98 1001#3000 3#200 30 null 29700 0.99 1#9#20#70 0.05 -99 1001#3000 4#200 30 null 30000 1.0 1#9#20#70 0.05 -100 1001#3000 5#200 30 null 30300 1.01 1#9#20#70 0.05 +1 1001#100 1#1 5 63015 600 0.02 1#9#20#70 0.05 +2 1001#200 2#1 10 63029 900 0.03 1#9#20#70 0.05 +3 1001#300 3#1 10 63043 1200 0.04 1#9#20#70 0.05 +4 1001#400 4#1 10 63057 1500 0.05 1#9#20#70 0.05 +5 1001#500 5#1 10 63071 1500 0.06 1#9#20#70 0.05 +6 1001#600 1#3 10 63076 2100 0.07 1#9#20#70 0.05 +7 1001#700 2#3 10 63082 2400 0.08 1#9#20#70 0.05 +8 1001#800 3#3 10 63093 2700 0.09 1#9#20#70 0.05 +9 1001#900 4#3 10 63104 3000 0.1 1#9#20#70 0.05 +10 1001#1000 5#3 10 63115 3300 0.11 1#9#20#70 0.05 +11 1001#1100 1#6 10 64001 3600 0.12 1#9#20#70 0.05 +12 1001#1200 2#6 10 64015 3900 0.13 1#9#20#70 0.05 +13 1001#1300 3#6 10 64029 4200 0.14 1#9#20#70 0.05 +14 1001#1400 4#6 10 64043 4500 0.15 1#9#20#70 0.05 +15 1001#1500 5#6 10 64057 4800 0.16 1#9#20#70 0.05 +16 1001#1600 1#10 10 64071 5100 0.17 1#9#20#70 0.05 +17 1001#1700 2#10 10 64076 5400 0.18 1#9#20#70 0.05 +18 1001#1800 3#10 10 64082 5700 0.19 1#9#20#70 0.05 +19 1001#1900 4#10 10 64093 6000 0.2 1#9#20#70 0.05 +20 1001#2000 5#10 20 64104 6300 0.21 1#9#20#70 0.05 +21 1001#2100 1#15 20 64115 6600 0.22 1#9#20#70 0.05 +22 1001#2200 2#15 20 65001 6900 0.23 1#9#20#70 0.05 +23 1001#2300 3#15 20 65021 7200 0.24 1#9#20#70 0.05 +24 1001#2400 4#15 20 65041 7500 0.25 1#9#20#70 0.05 +25 1001#2500 5#15 20 65061 7800 0.26 1#9#20#70 0.05 +26 1001#2600 1#21 20 65081 8100 0.27 1#9#20#70 0.05 +27 1001#2700 2#21 20 65101 8400 0.28 1#9#20#70 0.05 +28 1001#2800 3#21 20 65116 8700 0.29 1#9#20#70 0.05 +29 1001#2900 4#21 20 65131 9000 0.3 1#9#20#70 0.05 +30 1001#3000 5#21 30 65146 9300 0.31 1#9#20#70 0.05 +31 1001#3100 1#28 30 65161 9600 0.32 1#9#20#70 0.05 +32 1001#3200 2#28 30 null 9900 0.33 1#9#20#70 0.05 +33 1001#3300 3#28 30 null 10200 0.34 1#9#20#70 0.05 +34 1001#3400 4#28 30 null 10500 0.35 1#9#20#70 0.05 +35 1001#3500 5#28 30 null 10800 0.36 1#9#20#70 0.05 +36 1001#3600 1#36 30 null 11100 0.37 1#9#20#70 0.05 +37 1001#3700 2#36 30 null 11400 0.38 1#9#20#70 0.05 +38 1001#3800 3#36 30 null 11700 0.39 1#9#20#70 0.05 +39 1001#3900 4#36 30 null 12000 0.4 1#9#20#70 0.05 +40 1001#4000 5#36 30 null 12300 0.41 1#9#20#70 0.05 +41 1001#4100 1#45 30 null 12600 0.42 1#9#20#70 0.05 +42 1001#4200 2#45 30 null 12900 0.43 1#9#20#70 0.05 +43 1001#4300 3#45 30 null 13200 0.44 1#9#20#70 0.05 +44 1001#4400 4#45 30 null 13500 0.45 1#9#20#70 0.05 +45 1001#4500 5#45 30 null 13800 0.46 1#9#20#70 0.05 +46 1001#4600 1#55 30 null 14100 0.47 1#9#20#70 0.05 +47 1001#4700 2#55 30 null 14400 0.48 1#9#20#70 0.05 +48 1001#4800 3#55 30 null 14700 0.49 1#9#20#70 0.05 +49 1001#4900 4#55 30 null 15000 0.5 1#9#20#70 0.05 +50 1001#5000 5#55 30 null 15300 0.51 1#9#20#70 0.05 +51 1001#5000 1#65 30 null 15600 0.52 1#9#20#70 0.05 +52 1001#5000 2#65 30 null 15900 0.53 1#9#20#70 0.05 +53 1001#5000 3#65 30 null 16200 0.54 1#9#20#70 0.05 +54 1001#5000 4#65 30 null 16500 0.55 1#9#20#70 0.05 +55 1001#5000 5#65 30 null 16800 0.56 1#9#20#70 0.05 +56 1001#5000 1#76 30 null 17100 0.57 1#9#20#70 0.05 +57 1001#5000 2#76 30 null 17400 0.58 1#9#20#70 0.05 +58 1001#5000 3#76 30 null 17700 0.59 1#9#20#70 0.05 +59 1001#5000 4#76 30 null 18000 0.6 1#9#20#70 0.05 +60 1001#5000 5#76 30 null 18300 0.61 1#9#20#70 0.05 +61 1001#5000 1#88 30 null 18600 0.62 1#9#20#70 0.05 +62 1001#5000 2#88 30 null 18900 0.63 1#9#20#70 0.05 +63 1001#5000 3#88 30 null 19200 0.64 1#9#20#70 0.05 +64 1001#5000 4#88 30 null 19500 0.65 1#9#20#70 0.05 +65 1001#5000 5#88 30 null 19800 0.66 1#9#20#70 0.05 +66 1001#5000 1#101 30 null 20100 0.67 1#9#20#70 0.05 +67 1001#5000 2#101 30 null 20400 0.68 1#9#20#70 0.05 +68 1001#5000 3#101 30 null 20700 0.69 1#9#20#70 0.05 +69 1001#5000 4#101 30 null 21000 0.7 1#9#20#70 0.05 +70 1001#5000 5#101 30 null 21300 0.71 1#9#20#70 0.05 +71 1001#5000 1#115 30 null 21600 0.72 1#9#20#70 0.05 +72 1001#5000 2#115 30 null 21900 0.73 1#9#20#70 0.05 +73 1001#5000 3#115 30 null 22200 0.74 1#9#20#70 0.05 +74 1001#5000 4#115 30 null 22500 0.75 1#9#20#70 0.05 +75 1001#5000 5#115 30 null 22800 0.76 1#9#20#70 0.05 +76 1001#5000 1#130 30 null 23100 0.77 1#9#20#70 0.05 +77 1001#5000 2#130 30 null 23400 0.78 1#9#20#70 0.05 +78 1001#5000 3#130 30 null 23700 0.79 1#9#20#70 0.05 +79 1001#5000 4#130 30 null 24000 0.8 1#9#20#70 0.05 +80 1001#5000 5#130 30 null 24300 0.81 1#9#20#70 0.05 +81 1001#5000 1#146 30 null 24600 0.82 1#9#20#70 0.05 +82 1001#5000 2#146 30 null 24900 0.83 1#9#20#70 0.05 +83 1001#5000 3#146 30 null 25200 0.84 1#9#20#70 0.05 +84 1001#5000 4#146 30 null 25500 0.85 1#9#20#70 0.05 +85 1001#5000 5#146 30 null 25800 0.86 1#9#20#70 0.05 +86 1001#5000 1#163 30 null 26100 0.87 1#9#20#70 0.05 +87 1001#5000 2#163 30 null 26400 0.88 1#9#20#70 0.05 +88 1001#5000 3#163 30 null 26700 0.89 1#9#20#70 0.05 +89 1001#5000 4#163 30 null 27000 0.9 1#9#20#70 0.05 +90 1001#5000 5#163 30 null 27300 0.91 1#9#20#70 0.05 +91 1001#5000 1#181 30 null 27600 0.92 1#9#20#70 0.05 +92 1001#5000 2#181 30 null 27900 0.93 1#9#20#70 0.05 +93 1001#5000 3#181 30 null 28200 0.94 1#9#20#70 0.05 +94 1001#5000 4#181 30 null 28500 0.95 1#9#20#70 0.05 +95 1001#5000 5#181 30 null 28800 0.96 1#9#20#70 0.05 +96 1001#5000 1#200 30 null 29100 0.97 1#9#20#70 0.05 +97 1001#5000 2#200 30 null 29400 0.98 1#9#20#70 0.05 +98 1001#5000 3#200 30 null 29700 0.99 1#9#20#70 0.05 +99 1001#5000 4#200 30 null 30000 1.0 1#9#20#70 0.05 +100 1001#5000 5#200 30 null 30300 1.01 1#9#20#70 0.05 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java b/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java index 177c22561..85a24d28a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java @@ -23,6 +23,8 @@ public interface VipPrivilegeType { int POKEMON_NUM = 13; //异妖上阵栏位 int FREE_HERO_RANDOM = 14;//免费抽取妖灵师 int FREE_SECRET_RANDOM = 15; //解锁免费抽取秘盒 + int TOWER_RESRT_NUM= 17; //每日试炼重置次数 + //功能项解锁 int UNLOCK_TWO_FIGHT = 501;//解锁2倍速战斗 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 7788589a3..1aec5ead8 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 @@ -795,6 +795,10 @@ public class MapLogic { public void outMap(ISession session, int mapId, MessageTypeProto.MessageType messageType) throws Exception { int uid = session.getUid(); User user = UserManager.getUser(uid); + SChallengeConfig challengeConfig = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId()); + if(user.getMapManager().getTower()>1&&challengeConfig.getType()==2){ + user.getMapManager().setMapIntoFlag(1); + } boolean result = onlyLevelMap(user, true); if (!result) { MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), ""); @@ -987,10 +991,12 @@ public class MapLogic { if (sChallengeConfig.getType() == 2) { STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower()); int[][] randomMonsterType = sTrialConfig.getRandomMonsterType(); - if (randomMonsterType[0][1] == cell.getPointId()) { - mapManager.setEssenceValue(mapManager.getEssenceValue() + sTrialConfig.getNormalEnergy()); - } else { - mapManager.setEssenceValue(mapManager.getEssenceValue() + sTrialConfig.getEliteEnergy()); + if(cell.getCellId()!=mapManager.getBossXY()){ + if (randomMonsterType[0][1] == cell.getPointId()) { + mapManager.setEssenceValue(mapManager.getEssenceValue() + sTrialConfig.getNormalEnergy()); + } else { + mapManager.setEssenceValue(mapManager.getEssenceValue() + sTrialConfig.getEliteEnergy()); + } } } @@ -1514,15 +1520,13 @@ public class MapLogic { }else{ builder.setStarNum(sChallengeStarBox.getStarNum()); } - - List towerShopInfos = CBean2Proto.getTowerShopInfo(mapManager.getTowerShopInfos()); MapInfoProto.TowerCopyInfo towerCopyInfo = MapInfoProto.TowerCopyInfo.newBuilder() .setTower(mapManager.getHighestTower() == 0 ? 1 : mapManager.getHighestTower()) .setFightCount(mapManager.getFightCount()) .setResetCount(mapManager.getResetCount()) .setHighestTower(mapManager.getHighestTower()) - .addAllTowerShopInfos(towerShopInfos) .setEssenceValue(mapManager.getEssenceValue()) + .setMapIntoReset(mapManager.getMapIntoFlag()) .build(); builder.setTowerCopyInfo(towerCopyInfo); MessageUtil.sendMessage(iSession, 1, msgId, builder.build(), true); @@ -1998,9 +2002,9 @@ public class MapLogic { SChallengeMapConfig challengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(sTrialConfig.getMapId()); int xy = CellUtil.xy2Pos(challengeMapConfig.getPosition()[0], challengeMapConfig.getPosition()[1]); mapManager.setCurXY(xy); -// mapManager.setTower(1); mapManager.setMapInfo(newMap); mapManager.setEssenceValue(0); + mapManager.setStartExporeTime(System.currentTimeMillis()); if(mapManager.getTowerUnusedBuffer()==null){ mapManager.setTowerUnusedBuffer(new HashMap<>()); } @@ -2027,41 +2031,44 @@ public class MapLogic { int type = 1; - int[][] bossType = config.getRandomBossType(); - int amount = 0; - for(int i = 0 ; i xySet = CellUtil.getSurroundPos(mapSize[0],mapSize[1],mapManager.getCurXY()); LOGGER.info(xySet.toString()); Map mapInfo = mapManager.getMapInfo(); Iterator it = xySet.iterator(); Map pointConfig = MapPointConfig.scMapEventMap; - for(int i = 0 ; i cellEntry:mapInfo.entrySet()){ if(cellEntry.getKey().equals(n)) { - if (pointConfig.get(cellEntry.getValue().getPointId()).getStyle() == 8) { + if (pointConfig.get(cellEntry.getValue().getPointId()).getStyle() != 0) { it.remove(); -// break; + break; } } } @@ -2079,18 +2086,21 @@ public class MapLogic { } i++; } - mapManager.setBossType(2); + mapManager.setBossType(3); +// xyResult mapManager.setBossXY(xyResult); + int randomPoint = MathUtils.randomFromWeight(pointId[2]); + LOGGER.info("随机事件id:"+randomPoint); //buff处理 if(type==3){ if(currTower>0){ - mapManager.addTowerUnusedBuffer(currTower,pointId[type-1][0][0]); + mapManager.addTowerUnusedBuffer(currTower, randomPoint); } } MapInfoProto.MapTowerCallChiefResponse.Builder response = MapInfoProto.MapTowerCallChiefResponse.newBuilder(); - Cell cell = BehaviorUtil.addBehaviorInfo(user,pointId[type-1][0][0],mapManager,mapManager.getCurMapId(),CellUtil.pos2XY(xyResult)[0],CellUtil.pos2XY(xyResult)[1]); + Cell cell = BehaviorUtil.addBehaviorInfo(user,randomPoint,mapManager,mapManager.getCurMapId(),CellUtil.pos2XY(xyResult)[0],CellUtil.pos2XY(xyResult)[1]); CommonProto.Cell protoCell =CBean2Proto.getCell(cell); - response.setType(2); + response.setType(3); mapManager.setEssenceValue(-1); response.setMonsterInfo(protoCell); @@ -2173,15 +2183,28 @@ public class MapLogic { int uid = iSession.getUid(); User user = UserManager.getUser(uid); MapManager mapManager = user.getMapManager(); + if(mapManager.getMapIntoFlag()==0){ + MessageUtil.sendErrorResponse(iSession,0,messageType.getNumber(),"重置错误"); + return; + } // TODO 检测重置次数 + PlayerManager playerInfoManager = user.getPlayerInfoManager(); + if( !playerInfoManager.check(VipPrivilegeType.TOWER_RESRT_NUM, 1)){ + + return; + } + playerInfoManager.updateVipPrivilage(VipPrivilegeType.TOWER_RESRT_NUM,1); + + if(mapManager.getTower()>5){ + mapManager.setTower(mapManager.getTower()-mapManager.getTower()%5); + }else{ + mapManager.setTower(1); + } - mapManager.setTower(1); mapManager.setFightCount(0); mapManager.setEssenceValue(0); - Map towerShopInfos = mapManager.getTowerShopInfos(); - if (towerShopInfos != null) { - mapManager.setTowerShopInfos(null); - } + mapManager.setTowerUnusedBuffer(null); + mapManager.setMapIntoFlag(0); resetMapInfo(user, true); MapInfoProto.MapTowerResetResponse mapTowerResetResponse = MapInfoProto.MapTowerResetResponse .newBuilder() 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 2094e7608..bb6693f33 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 @@ -84,14 +84,18 @@ public class MapManager extends MongoBase { private int essenceValue; // 爬塔副本历史最高层 private int highestTower; - // 爬塔副本商店 - private Map towerShopInfos; //爬塔副本暂存Buff private Map towerUnusedBuffer; //副本boss坐标 private int bossXY; //副本boss类型 private int bossType; + //每层最快时间 + private int[] everyTowerTime; + //当前层使用时间 + private int currTowerTime; + + private int mapIntoFlag; public MapManager() { this.setRootCollection(User._COLLECTION_NAME); @@ -492,20 +496,6 @@ public class MapManager extends MongoBase { updateString("highestTower" , highestTower); this.highestTower = highestTower; } - - public Map getTowerShopInfos() { - return towerShopInfos; - } - - public void setTowerShopInfos(Map towerShopInfos) { - updateString("towerShopInfos" , towerShopInfos); - this.towerShopInfos = towerShopInfos; - } - - public void addOrUpdatetowerShopInfos(int key, int value) { - updateString("towerShopInfos." + key, value); - this.towerShopInfos.put(key, value); - } public Map getTowerUnusedBuffer(){ return this.towerUnusedBuffer;} public void setTowerUnusedBuffer(Map towerUnusedBuffer){ @@ -539,4 +529,34 @@ public class MapManager extends MongoBase { updateString("bossType",bossType); this.bossType = bossType; } + + public int[] getEveryTowerTime() { + return everyTowerTime; + } + public void setEveryTowerTime(int[] everyTowerTime){ + this.everyTowerTime = everyTowerTime; + } + public void setEachTime(int index,int eachTime){ + if(everyTowerTime.length>0){ + this.everyTowerTime[index] = eachTime; + } + } + + public int getCurrTowerTime() { + return currTowerTime; + } + + public void setCurrTowerTime(int currTowerTime) { + updateString("currTowerTime",currTowerTime); + this.currTowerTime = currTowerTime; + } + + public int getMapIntoFlag() { + return mapIntoFlag; + } + + public void setMapIntoFlag(int mapIntoFlag) { + updateString("mapIntoFlag",mapIntoFlag); + this.mapIntoFlag = mapIntoFlag; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyThreeBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyThreeBehavior.java index e61e690ff..d5ee1c947 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyThreeBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyThreeBehavior.java @@ -3,8 +3,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.handler.map.MapManager; +import com.ljsd.jieling.logic.dao.StoreManager; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.protocols.MapInfoProto; +import com.ljsd.jieling.util.MessageUtil; import org.springframework.stereotype.Component; @Component @@ -16,6 +19,7 @@ public class FourtyThreeBehavior extends BaseBehavior{ @Override public boolean process(int optionId, User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { + LOGGER.info("43协议"); MapManager mapManager = user.getMapManager(); if(mapManager.getTriggerXY()!=mapManager.getBossXY()){ return false; @@ -23,10 +27,13 @@ public class FourtyThreeBehavior extends BaseBehavior{ }; if (mapManager.getBossType()==3){ Cell cell = mapManager.getMapInfo().get(mapManager.getBossXY()); + LOGGER.info("暂存buff层数:"+mapManager.getTower()+",buff:"+cell.getEventId()); mapManager.addTowerUnusedBuffer(mapManager.getTower(),cell.getEventId()); return true; + }else if(mapManager.getBossType()==4){ + StoreLogic.initOrUpdateOneStore(user,8); } - return false; + return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java index 45bea726f..ab46e215b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; @@ -18,6 +19,8 @@ public class FourtyTwoBehavior extends BaseBehavior{ MapManager mapManager = user.getMapManager(); mapManager.setTower(user.getMapManager().getTower()+1); mapManager.setEssenceValue(0); + mapManager.setCurrTowerTime(Integer.parseInt(String.valueOf(System.currentTimeMillis()-mapManager.getStartExporeTime()/1000))); + MapLogic.getInstance().initTrialMap(mapManager, user); return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index b5a28fece..a41da3047 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -100,6 +100,32 @@ public class StoreLogic { storeManager.newStoreInfo(sStoreTypeConfig.getId(),startTime,endTime,itemNumMap); } + public static void initOrUpdateOneStore(User user,int storeType) throws Exception { + StoreManager storeManager = user.getStoreManager(); + SStoreTypeConfig sStoreTypeConfig = SStoreTypeConfig.getsStoreTypeConfigMap().get(storeType); + if(sStoreTypeConfig == null){ + return; + } + StoreInfo storeInfo = storeManager.getStoreInfoMap().get(storeType); + if(storeInfo==null){ + long now = TimeUtils.now(); + long startTime = now; + long endTime = 0; + if(sStoreTypeConfig.getStoreOpenRule() == 2 ){ + endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000 + now; + } + Map itemNumMap = new ConcurrentHashMap<>(); + int rewardId = getRewardId(storeType,1,user); + itemNumMap.put(rewardId, 0); + storeManager.newStoreInfo(sStoreTypeConfig.getId(),startTime,endTime,itemNumMap); + }else{ + Map itemNumMap = storeInfo.getItemNumMap(); + int rewardId = getRewardId(storeType,itemNumMap.size(),user); + itemNumMap.put(rewardId, 0); + storeInfo.setItemNumMap(itemNumMap); + } + } + //初始化商店 private static void initStoreInfo(User user,StoreManager storeManager) throws Exception { Map sstoreTypeConfigMap = SStoreTypeConfig.getsStoreTypeConfigMap(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 387cf359f..85ff70dad 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -304,21 +304,6 @@ public class CBean2Proto { return result; } - - public static List getTowerShopInfo(Map towerShopInfos) { - List towerShopInfosProto = new ArrayList<>(); - if (towerShopInfos != null) { - for (Map.Entry entry : towerShopInfos.entrySet()) { - MapInfoProto.TowerShopInfo towerShopInfo = MapInfoProto.TowerShopInfo - .newBuilder() - .setGoodsId(entry.getKey()) - .setBuyCount(entry.getValue()) - .build(); - towerShopInfosProto.add(towerShopInfo); - } - } - return towerShopInfosProto; - } public static CommonProto.Cell getCell(Cell cell){ CommonProto.Cell.Builder protoCell = CommonProto.Cell.newBuilder(); protoCell.setPointId(cell.getPointId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CellUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CellUtil.java index 5cec6adb8..9efd2b46b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CellUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CellUtil.java @@ -86,7 +86,7 @@ public class CellUtil { if(x1<1 || x1 > width){ continue; } - for(;y1 height){ continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MathUtils.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MathUtils.java index c532e8aea..0dcb0316d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MathUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MathUtils.java @@ -149,4 +149,24 @@ public class MathUtils { } return result; } + public static int randomFromWeight(int[][] array){ + int amount = 0; + int result = 0; + for(int i = 0 ; i