From 1ff8ad21313f696f0f9dc6227dc07066d8500b8f Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 22 Feb 2019 13:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=A6=96&=E7=99=BE=E5=91=B3=E5=B1=85?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/DifferDemonsComonpentsConfig.txt | 320 ++++++++++++++++++ conf/server/DifferDemonsConfig.txt | 18 +- conf/server/DifferDemonsStageConfig.txt | 100 ++++++ conf/server/HeroConfig.txt | 104 +++--- conf/server/HeroRankupConfig.txt | 44 +-- conf/server/MysteryFoodPoolConfig.txt | 2 + conf/server/MysteryFoodSetting.txt | 2 + conf/server/WorkShopEquipmentConfig.txt | 202 +++++------ conf/server/WorkShopFoundationConfig.txt | 12 +- conf/server/WorkShopSetting.txt | 206 +++++------ .../jieling/config/SDifferDemonsConfig.java | 2 +- .../config/SMysteryFoodPoolConfig.java | 49 +++ .../jieling/config/SMysteryFoodSetting.java | 37 ++ .../config/SWorkShopEquipmentConfig.java | 6 +- .../config/SWorkShopFoundationConfig.java | 10 + .../com/ljsd/jieling/core/GlobalsDef.java | 4 + .../ljsd/jieling/globals/GlobalItemType.java | 1 + .../jieling/handler/GetAllPokemonHandler.java | 20 ++ .../handler/PokemonAdvancedHandler.java | 24 ++ .../PokemonComonpentLevelupHandler.java | 25 ++ .../com/ljsd/jieling/logic/dao/Pokemon.java | 2 +- .../jieling/logic/dao/PokemonManager.java | 4 + .../ljsd/jieling/logic/hero/HeroLogic.java | 45 ++- .../jieling/logic/item/WorkShopLogic.java | 7 +- .../com/ljsd/jieling/util/CBean2Proto.java | 13 +- 25 files changed, 956 insertions(+), 303 deletions(-) create mode 100644 conf/server/MysteryFoodPoolConfig.txt create mode 100644 conf/server/MysteryFoodSetting.txt create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodPoolConfig.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodSetting.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllPokemonHandler.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonAdvancedHandler.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonComonpentLevelupHandler.java diff --git a/conf/server/DifferDemonsComonpentsConfig.txt b/conf/server/DifferDemonsComonpentsConfig.txt index 8f9255deb..7c2def5ec 100644 --- a/conf/server/DifferDemonsComonpentsConfig.txt +++ b/conf/server/DifferDemonsComonpentsConfig.txt @@ -1,2 +1,322 @@ Id ComonpentsId Stage Cost BaseAttribute int int int mut,int#int,2 mut,int#int,2 +1 1 1 6001#1|5#0 1#842|2#7 +2 1 2 6001#1|5#40 1#2105|2#17 +3 1 3 6001#2|5#65 1#3368|2#28 +4 1 4 6001#2|5#100 1#5052|2#42 +5 1 5 6001#3|5#135 1#7157|2#59 +6 1 6 6001#3|5#180 1#9684|2#80 +7 1 7 6001#4|5#235 1#12631|2#105 +8 1 8 6001#5|5#290 1#16000|2#133 +9 1 9 6001#6|5#355 1#19789|2#164 +10 1 10 6001#8|5#420 1#24000|2#200 +11 2 1 6002#1|5#0 1#842|3#35 +12 2 2 6002#1|5#40 1#2105|3#85 +13 2 3 6002#2|5#65 1#3368|3#140 +14 2 4 6002#2|5#100 1#5052|3#210 +15 2 5 6002#3|5#135 1#7157|3#295 +16 2 6 6002#3|5#180 1#9684|3#400 +17 2 7 6002#4|5#235 1#12631|3#525 +18 2 8 6002#5|5#290 1#16000|3#665 +19 2 9 6002#6|5#355 1#19789|3#820 +20 2 10 6002#8|5#420 1#24000|3#1000 +21 3 1 6003#1|5#0 2#7|3#70 +22 3 2 6003#1|5#40 2#17|3#175 +23 3 3 6003#2|5#65 2#28|3#280 +24 3 4 6003#2|5#100 2#42|3#420 +25 3 5 6003#3|5#135 2#59|3#595 +26 3 6 6003#3|5#180 2#80|3#805 +27 3 7 6003#4|5#235 2#105|3#1050 +28 3 8 6003#5|5#290 2#133|3#1330 +29 3 9 6003#6|5#355 2#164|3#1645 +30 3 10 6003#8|5#420 2#200|3#2000 +31 4 1 6004#1|5#0 1#842|2#7 +32 4 2 6004#1|5#40 1#2105|2#17 +33 4 3 6004#2|5#65 1#3368|2#28 +34 4 4 6004#2|5#100 1#5052|2#42 +35 4 5 6004#3|5#135 1#7157|2#59 +36 4 6 6004#3|5#180 1#9684|2#80 +37 4 7 6004#4|5#235 1#12631|2#105 +38 4 8 6004#5|5#290 1#16000|2#133 +39 4 9 6004#6|5#355 1#19789|2#164 +40 4 10 6004#8|5#420 1#24000|2#200 +41 5 1 6005#1|5#0 1#842|4#70 +42 5 2 6005#1|5#40 1#2105|4#175 +43 5 3 6005#2|5#65 1#3368|4#280 +44 5 4 6005#2|5#100 1#5052|4#420 +45 5 5 6005#3|5#135 1#7157|4#595 +46 5 6 6005#3|5#180 1#9684|4#805 +47 5 7 6005#4|5#235 1#12631|4#1050 +48 5 8 6005#5|5#290 1#16000|4#1330 +49 5 9 6005#6|5#355 1#19789|4#1645 +50 5 10 6005#8|5#420 1#24000|4#2000 +51 6 1 6006#1|5#0 2#7|4#70 +52 6 2 6006#1|5#40 2#17|4#175 +53 6 3 6006#2|5#65 2#28|4#280 +54 6 4 6006#2|5#100 2#42|4#420 +55 6 5 6006#3|5#135 2#59|4#595 +56 6 6 6006#3|5#180 2#80|4#805 +57 6 7 6006#4|5#235 2#105|4#1050 +58 6 8 6006#5|5#290 2#133|4#1330 +59 6 9 6006#6|5#355 2#164|4#1645 +60 6 10 6006#8|5#420 2#200|4#2000 +61 7 1 6007#1|5#0 1#842|2#7 +62 7 2 6007#1|5#40 1#2105|2#17 +63 7 3 6007#2|5#65 1#3368|2#28 +64 7 4 6007#2|5#100 1#5052|2#42 +65 7 5 6007#3|5#135 1#7157|2#59 +66 7 6 6007#3|5#180 1#9684|2#80 +67 7 7 6007#4|5#235 1#12631|2#105 +68 7 8 6007#5|5#290 1#16000|2#133 +69 7 9 6007#6|5#355 1#19789|2#164 +70 7 10 6007#8|5#420 1#24000|2#200 +71 8 1 6008#1|5#0 1#842|53#1 +72 8 2 6008#1|5#40 1#2105|53#2 +73 8 3 6008#2|5#65 1#3368|53#4 +74 8 4 6008#2|5#100 1#5052|53#6 +75 8 5 6008#3|5#135 1#7157|53#9 +76 8 6 6008#3|5#180 1#9684|53#12 +77 8 7 6008#4|5#235 1#12631|53#16 +78 8 8 6008#5|5#290 1#16000|53#20 +79 8 9 6008#6|5#355 1#19789|53#25 +80 8 10 6008#8|5#420 1#24000|53#30 +81 9 1 6009#1|5#0 2#7|53#1 +82 9 2 6009#1|5#40 2#17|53#2 +83 9 3 6009#2|5#65 2#28|53#4 +84 9 4 6009#2|5#100 2#42|53#6 +85 9 5 6009#3|5#135 2#59|53#9 +86 9 6 6009#3|5#180 2#80|53#12 +87 9 7 6009#4|5#235 2#105|53#16 +88 9 8 6009#5|5#290 2#133|53#20 +89 9 9 6009#6|5#355 2#164|53#25 +90 9 10 6009#8|5#420 2#200|53#30 +91 10 1 6010#1|5#0 1#842|2#7 +92 10 2 6010#1|5#40 1#2105|2#17 +93 10 3 6010#2|5#65 1#3368|2#28 +94 10 4 6010#2|5#100 1#5052|2#42 +95 10 5 6010#3|5#135 1#7157|2#59 +96 10 6 6010#3|5#180 1#9684|2#80 +97 10 7 6010#4|5#235 1#12631|2#105 +98 10 8 6010#5|5#290 1#16000|2#133 +99 10 9 6010#6|5#355 1#19789|2#164 +100 10 10 6010#8|5#420 1#24000|2#200 +101 11 1 6011#1|5#0 1#842|54#1 +102 11 2 6011#1|5#40 1#2105|54#2 +103 11 3 6011#2|5#65 1#3368|54#4 +104 11 4 6011#2|5#100 1#5052|54#6 +105 11 5 6011#3|5#135 1#7157|54#9 +106 11 6 6011#3|5#180 1#9684|54#12 +107 11 7 6011#4|5#235 1#12631|54#16 +108 11 8 6011#5|5#290 1#16000|54#20 +109 11 9 6011#6|5#355 1#19789|54#25 +110 11 10 6011#8|5#420 1#24000|54#30 +111 12 1 6012#1|5#0 2#7|54#1 +112 12 2 6012#1|5#40 2#17|54#2 +113 12 3 6012#2|5#65 2#28|54#4 +114 12 4 6012#2|5#100 2#42|54#6 +115 12 5 6012#3|5#135 2#59|54#9 +116 12 6 6012#3|5#180 2#80|54#12 +117 12 7 6012#4|5#235 2#105|54#16 +118 12 8 6012#5|5#290 2#133|54#20 +119 12 9 6012#6|5#355 2#164|54#25 +120 12 10 6012#8|5#420 2#200|54#30 +121 13 1 6013#1|5#0 1#1347|2#11 +122 13 2 6013#1|5#40 1#3368|2#28|101#2 +123 13 3 6013#2|5#65 1#5389|2#44 +124 13 4 6013#2|5#100 1#8084|2#67|101#6 +125 13 5 6013#3|5#135 1#11452|2#95 +126 13 6 6013#3|5#180 1#15494|2#129|101#12 +127 13 7 6013#4|5#235 1#20210|2#168 +128 13 8 6013#5|5#290 1#25600|2#213|101#20 +129 13 9 6013#6|5#355 1#31663|2#263 +130 13 10 6013#8|5#420 1#38400|2#320|101#30 +131 14 1 6014#1|5#0 1#1347|2#11 +132 14 2 6014#1|5#40 1#3368|2#28|103#2 +133 14 3 6014#2|5#65 1#5389|2#44 +134 14 4 6014#2|5#100 1#8084|2#67|103#6 +135 14 5 6014#3|5#135 1#11452|2#95 +136 14 6 6014#3|5#180 1#15494|2#129|103#12 +137 14 7 6014#4|5#235 1#20210|2#168 +138 14 8 6014#5|5#290 1#25600|2#213|103#20 +139 14 9 6014#6|5#355 1#31663|2#263 +140 14 10 6014#8|5#420 1#38400|2#320|103#30 +141 15 1 6015#1|5#0 1#1347|2#11 +142 15 2 6015#1|5#40 1#3368|2#28|104#2 +143 15 3 6015#2|5#65 1#5389|2#44 +144 15 4 6015#2|5#100 1#8084|2#67|104#6 +145 15 5 6015#3|5#135 1#11452|2#95 +146 15 6 6015#3|5#180 1#15494|2#129|104#12 +147 15 7 6015#4|5#235 1#20210|2#168 +148 15 8 6015#5|5#290 1#25600|2#213|104#20 +149 15 9 6015#6|5#355 1#31663|2#263 +150 15 10 6015#8|5#420 1#38400|2#320|104#30 +151 16 1 6016#1|5#0 1#1347|2#11 +152 16 2 6016#1|5#40 1#3368|2#28|102#2 +153 16 3 6016#2|5#65 1#5389|2#44 +154 16 4 6016#2|5#100 1#8084|2#67|102#6 +155 16 5 6016#3|5#135 1#11452|2#95 +156 16 6 6016#3|5#180 1#15494|2#129|102#12 +157 16 7 6016#4|5#235 1#20210|2#168 +158 16 8 6016#5|5#290 1#25600|2#213|102#20 +159 16 9 6016#6|5#355 1#31663|2#263 +160 16 10 6016#8|5#420 1#38400|2#320|102#30 +161 17 1 6017#1|5#0 1#1347|2#11 +162 17 2 6017#1|5#40 1#3368|2#28|107#2 +163 17 3 6017#2|5#65 1#5389|2#44 +164 17 4 6017#2|5#100 1#8084|2#67|107#6 +165 17 5 6017#3|5#135 1#11452|2#95 +166 17 6 6017#3|5#180 1#15494|2#129|107#12 +167 17 7 6017#4|5#235 1#20210|2#168 +168 17 8 6017#5|5#290 1#25600|2#213|107#20 +169 17 9 6017#6|5#355 1#31663|2#263 +170 17 10 6017#8|5#420 1#38400|2#320|107#30 +171 18 1 6018#1|5#0 1#1347|2#11 +172 18 2 6018#1|5#40 1#3368|2#28|109#2 +173 18 3 6018#2|5#65 1#5389|2#44 +174 18 4 6018#2|5#100 1#8084|2#67|109#6 +175 18 5 6018#3|5#135 1#11452|2#95 +176 18 6 6018#3|5#180 1#15494|2#129|109#12 +177 18 7 6018#4|5#235 1#20210|2#168 +178 18 8 6018#5|5#290 1#25600|2#213|109#20 +179 18 9 6018#6|5#355 1#31663|2#263 +180 18 10 6018#8|5#420 1#38400|2#320|109#30 +181 19 1 6019#1|5#0 1#1347|2#11 +182 19 2 6019#1|5#40 1#3368|2#28|110#2 +183 19 3 6019#2|5#65 1#5389|2#44 +184 19 4 6019#2|5#100 1#8084|2#67|110#6 +185 19 5 6019#3|5#135 1#11452|2#95 +186 19 6 6019#3|5#180 1#15494|2#129|110#12 +187 19 7 6019#4|5#235 1#20210|2#168 +188 19 8 6019#5|5#290 1#25600|2#213|110#20 +189 19 9 6019#6|5#355 1#31663|2#263 +190 19 10 6019#8|5#420 1#38400|2#320|110#30 +191 20 1 6020#1|5#0 1#1347|2#11 +192 20 2 6020#1|5#40 1#3368|2#28|108#2 +193 20 3 6020#2|5#65 1#5389|2#44 +194 20 4 6020#2|5#100 1#8084|2#67|108#6 +195 20 5 6020#3|5#135 1#11452|2#95 +196 20 6 6020#3|5#180 1#15494|2#129|108#12 +197 20 7 6020#4|5#235 1#20210|2#168 +198 20 8 6020#5|5#290 1#25600|2#213|108#20 +199 20 9 6020#6|5#355 1#31663|2#263 +200 20 10 6020#8|5#420 1#38400|2#320|108#30 +201 21 1 6021#1|5#0 1#1347|2#11 +202 21 2 6021#1|5#40 1#3368|2#28|105#2 +203 21 3 6021#2|5#65 1#5389|2#44 +204 21 4 6021#2|5#100 1#8084|2#67|105#6 +205 21 5 6021#3|5#135 1#11452|2#95 +206 21 6 6021#3|5#180 1#15494|2#129|105#12 +207 21 7 6021#4|5#235 1#20210|2#168 +208 21 8 6021#5|5#290 1#25600|2#213|105#20 +209 21 9 6021#6|5#355 1#31663|2#263 +210 21 10 6021#8|5#420 1#38400|2#320|105#30 +211 22 1 6022#1|5#0 1#1347|2#11 +212 22 2 6022#1|5#40 1#3368|2#28|111#3 +213 22 3 6022#2|5#65 1#5389|2#44 +214 22 4 6022#2|5#100 1#8084|2#67|111#6 +215 22 5 6022#3|5#135 1#11452|2#95 +216 22 6 6022#3|5#180 1#15494|2#129|111#9 +217 22 7 6022#4|5#235 1#20210|2#168 +218 22 8 6022#5|5#290 1#25600|2#213|111#12 +219 22 9 6022#6|5#355 1#31663|2#263 +220 22 10 6022#8|5#420 1#38400|2#320|111#15 +221 23 1 6023#1|5#0 1#1347|2#11 +222 23 2 6023#1|5#40 1#3368|2#28|106#2 +223 23 3 6023#2|5#65 1#5389|2#44 +224 23 4 6023#2|5#100 1#8084|2#67|106#6 +225 23 5 6023#3|5#135 1#11452|2#95 +226 23 6 6023#3|5#180 1#15494|2#129|106#12 +227 23 7 6023#4|5#235 1#20210|2#168 +228 23 8 6023#5|5#290 1#25600|2#213|106#20 +229 23 9 6023#6|5#355 1#31663|2#263 +230 23 10 6023#8|5#420 1#38400|2#320|106#30 +231 24 1 6024#1|5#0 1#1347|2#11 +232 24 2 6024#1|5#40 1#3368|2#28|112#3 +233 24 3 6024#2|5#65 1#5389|2#44 +234 24 4 6024#2|5#100 1#8084|2#67|112#6 +235 24 5 6024#3|5#135 1#11452|2#95 +236 24 6 6024#3|5#180 1#15494|2#129|112#9 +237 24 7 6024#4|5#235 1#20210|2#168 +238 24 8 6024#5|5#290 1#25600|2#213|112#12 +239 24 9 6024#6|5#355 1#31663|2#263 +240 24 10 6024#8|5#420 1#38400|2#320|112#15 +241 25 1 6025#1|5#0 1#1347|2#11 +242 25 2 6025#1|5#40 1#3368|2#28|5#34 +243 25 3 6025#2|5#65 1#5389|2#44 +244 25 4 6025#2|5#100 1#8084|2#67|5#83 +245 25 5 6025#3|5#135 1#11452|2#95 +246 25 6 6025#3|5#180 1#15494|2#129|5#160 +247 25 7 6025#4|5#235 1#20210|2#168 +248 25 8 6025#5|5#290 1#25600|2#213|5#265 +249 25 9 6025#6|5#355 1#31663|2#263 +250 25 10 6025#8|5#420 1#38400|2#320|5#397 +251 26 1 6026#1|5#0 1#1347|2#11 +252 26 2 6026#1|5#40 1#3368|2#28|57#3 +253 26 3 6026#2|5#65 1#5389|2#44 +254 26 4 6026#2|5#100 1#8084|2#67|57#6 +255 26 5 6026#3|5#135 1#11452|2#95 +256 26 6 6026#3|5#180 1#15494|2#129|57#9 +257 26 7 6026#4|5#235 1#20210|2#168 +258 26 8 6026#5|5#290 1#25600|2#213|57#12 +259 26 9 6026#6|5#355 1#31663|2#263 +260 26 10 6026#8|5#420 1#38400|2#320|57#15 +261 27 1 6027#1|5#0 1#1347|2#11 +262 27 2 6027#1|5#40 1#3368|2#28|5#34 +263 27 3 6027#2|5#65 1#5389|2#44 +264 27 4 6027#2|5#100 1#8084|2#67|5#83 +265 27 5 6027#3|5#135 1#11452|2#95 +266 27 6 6027#3|5#180 1#15494|2#129|5#160 +267 27 7 6027#4|5#235 1#20210|2#168 +268 27 8 6027#5|5#290 1#25600|2#213|5#265 +269 27 9 6027#6|5#355 1#31663|2#263 +270 27 10 6027#8|5#420 1#38400|2#320|5#397 +271 28 1 6028#1|5#0 1#1347|2#11 +272 28 2 6028#1|5#40 1#3368|2#28|57#3 +273 28 3 6028#2|5#65 1#5389|2#44 +274 28 4 6028#2|5#100 1#8084|2#67|57#6 +275 28 5 6028#3|5#135 1#11452|2#95 +276 28 6 6028#3|5#180 1#15494|2#129|57#9 +277 28 7 6028#4|5#235 1#20210|2#168 +278 28 8 6028#5|5#290 1#25600|2#213|57#12 +279 28 9 6028#6|5#355 1#31663|2#263 +280 28 10 6028#8|5#420 1#38400|2#320|57#15 +281 29 1 6029#1|5#0 1#1347|2#11 +282 29 2 6029#1|5#40 1#3368|2#28|55#2 +283 29 3 6029#2|5#65 1#5389|2#44 +284 29 4 6029#2|5#100 1#8084|2#67|55#4 +285 29 5 6029#3|5#135 1#11452|2#95 +286 29 6 6029#3|5#180 1#15494|2#129|55#6 +287 29 7 6029#4|5#235 1#20210|2#168 +288 29 8 6029#5|5#290 1#25600|2#213|55#8 +289 29 9 6029#6|5#355 1#31663|2#263 +290 29 10 6029#8|5#420 1#38400|2#320|55#10 +291 30 1 6030#1|5#0 1#1347|2#11 +292 30 2 6030#1|5#40 1#3368|2#28|56#4 +293 30 3 6030#2|5#65 1#5389|2#44 +294 30 4 6030#2|5#100 1#8084|2#67|56#6 +295 30 5 6030#3|5#135 1#11452|2#95 +296 30 6 6030#3|5#180 1#15494|2#129|56#8 +297 30 7 6030#4|5#235 1#20210|2#168 +298 30 8 6030#5|5#290 1#25600|2#213|56#14 +299 30 9 6030#6|5#355 1#31663|2#263 +300 30 10 6030#8|5#420 1#38400|2#320|56#20 +301 31 1 6031#1|5#0 1#1347|2#11 +302 31 2 6031#1|5#40 1#3368|2#28|58#2 +303 31 3 6031#2|5#65 1#5389|2#44 +304 31 4 6031#2|5#100 1#8084|2#67|58#4 +305 31 5 6031#3|5#135 1#11452|2#95 +306 31 6 6031#3|5#180 1#15494|2#129|58#6 +307 31 7 6031#4|5#235 1#20210|2#168 +308 31 8 6031#5|5#290 1#25600|2#213|58#8 +309 31 9 6031#6|5#355 1#31663|2#263 +310 31 10 6031#8|5#420 1#38400|2#320|58#10 +311 32 1 6032#1|5#0 1#1347|2#11 +312 32 2 6032#1|5#40 1#3368|2#28|56#4 +313 32 3 6032#2|5#65 1#5389|2#44 +314 32 4 6032#2|5#100 1#8084|2#67|56#6 +315 32 5 6032#3|5#135 1#11452|2#95 +316 32 6 6032#3|5#180 1#15494|2#129|56#8 +317 32 7 6032#4|5#235 1#20210|2#168 +318 32 8 6032#5|5#290 1#25600|2#213|56#14 +319 32 9 6032#6|5#355 1#31663|2#263 +320 32 10 6032#8|5#420 1#38400|2#320|56#20 diff --git a/conf/server/DifferDemonsConfig.txt b/conf/server/DifferDemonsConfig.txt index ba902608d..ccfc140ea 100644 --- a/conf/server/DifferDemonsConfig.txt +++ b/conf/server/DifferDemonsConfig.txt @@ -1,14 +1,14 @@ Id OpenRules ComonpentList int mut,int#int,2 mut,int#int,1 -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null +1 null 1#2#3 +2 null 4#5#6 +3 null 7#8#9 +4 null 10#11#12 +5 null 13#14#15#16 +6 null 17#18#19#20 +7 null 21#22#23#24 +8 null 25#26#27#28 +9 null 29#30#31#32 0 null null 0 null null 0 null null diff --git a/conf/server/DifferDemonsStageConfig.txt b/conf/server/DifferDemonsStageConfig.txt index 756adf48d..307e5f95b 100644 --- a/conf/server/DifferDemonsStageConfig.txt +++ b/conf/server/DifferDemonsStageConfig.txt @@ -1,2 +1,102 @@ Id DifferDemonsId SkillId Cost int int int mut,int#int,2 +1 101 0 5#240|6#1 +2 102 0 5#360|6#1 +3 103 0 5#480|6#2 +4 104 0 5#600|6#2 +5 105 0 5#720|6#3 +6 106 0 5#840|6#3 +7 107 0 5#960|6#4 +8 108 0 5#1080|6#5 +9 109 0 5#1200|6#8 +10 110 0 5#1320|6#11 +11 201 0 5#240|6#1 +12 202 0 5#360|6#1 +13 203 0 5#480|6#2 +14 204 0 5#600|6#2 +15 205 0 5#720|6#3 +16 206 0 5#840|6#3 +17 207 0 5#960|6#4 +18 208 0 5#1080|6#5 +19 209 0 5#1200|6#8 +20 210 0 5#1320|6#11 +21 301 0 5#240|6#1 +22 302 0 5#360|6#1 +23 303 0 5#480|6#2 +24 304 0 5#600|6#2 +25 305 0 5#720|6#3 +26 306 0 5#840|6#3 +27 307 0 5#960|6#4 +28 308 0 5#1080|6#5 +29 309 0 5#1200|6#8 +30 310 0 5#1320|6#11 +31 401 0 5#240|6#1 +32 402 0 5#360|6#1 +33 403 0 5#480|6#2 +34 404 0 5#600|6#2 +35 405 0 5#720|6#3 +36 406 0 5#840|6#3 +37 407 0 5#960|6#4 +38 408 0 5#1080|6#5 +39 409 0 5#1200|6#8 +40 410 0 5#1320|6#11 +41 501 0 5#400|6#2 +42 502 0 5#600|6#2 +43 503 0 5#800|6#3 +44 504 0 5#1000|6#3 +45 505 0 5#1200|6#4 +46 506 0 5#1400|6#4 +47 507 0 5#1600|6#6 +48 508 0 5#1800|6#8 +49 509 0 5#2000|6#12 +50 510 0 5#2200|6#15 +51 601 0 5#400|6#2 +52 602 0 5#600|6#2 +53 603 0 5#800|6#3 +54 604 0 5#1000|6#3 +55 605 0 5#1200|6#4 +56 606 0 5#1400|6#4 +57 607 0 5#1600|6#6 +58 608 0 5#1800|6#8 +59 609 0 5#2000|6#12 +60 610 0 5#2200|6#15 +61 701 0 5#400|6#2 +62 702 0 5#600|6#2 +63 703 0 5#800|6#3 +64 704 0 5#1000|6#3 +65 705 0 5#1200|6#4 +66 706 0 5#1400|6#4 +67 707 0 5#1600|6#6 +68 708 0 5#1800|6#8 +69 709 0 5#2000|6#12 +70 710 0 5#2200|6#15 +71 801 0 5#400|6#2 +72 802 0 5#600|6#2 +73 803 0 5#800|6#3 +74 804 0 5#1000|6#3 +75 805 0 5#1200|6#4 +76 806 0 5#1400|6#4 +77 807 0 5#1600|6#6 +78 808 0 5#1800|6#8 +79 809 0 5#2000|6#12 +80 810 0 5#2200|6#15 +81 901 0 5#400|6#2 +82 902 0 5#600|6#2 +83 903 0 5#800|6#3 +84 904 0 5#1000|6#3 +85 905 0 5#1200|6#4 +86 906 0 5#1400|6#4 +87 907 0 5#1600|6#6 +88 908 0 5#1800|6#8 +89 909 0 5#2000|6#12 +90 910 0 5#2200|6#15 +91 1001 0 5#400|6#2 +92 1002 0 5#600|6#2 +93 1003 0 5#800|6#3 +94 1004 0 5#1000|6#3 +95 1005 0 5#1200|6#4 +96 1006 0 5#1400|6#4 +97 1007 0 5#1600|6#6 +98 1008 0 5#1800|6#8 +99 1009 0 5#2000|6#12 +100 1010 0 5#2200|6#15 diff --git a/conf/server/HeroConfig.txt b/conf/server/HeroConfig.txt index fc494c1c3..49ce4420c 100644 --- a/conf/server/HeroConfig.txt +++ b/conf/server/HeroConfig.txt @@ -1,54 +1,54 @@ Id PiecesId PiecesCount Star Profession PropertyName MaxRank Hp Attack PhysicalDefence MagicDefence Speed ActionPower RankupConsumeMaterial OpenSkillRules int int int int int int int float float float float float int mut,int#int,2 mut,int#int,2 -10001 11001 50 5 1 2 10 2393.0 165.0 278.0 232.0 176.0 10 6#1#3#1|6#2#34#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000111|5#1000121|6#1000111|6#1000121|7#1000112|7#1000122|8#1000113|8#1000122|9#1000113|9#1000123|10#1000114|10#1000124 -10002 11002 50 5 5 3 10 2285.0 156.0 262.0 218.0 154.0 10 6#1#3#1|6#2#22#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000211|5#1000221|6#1000211|6#1000221|7#1000212|7#1000222|8#1000213|8#1000222|9#1000213|9#1000223|10#1000214|10#1000224 -10003 11003 50 5 2 4 10 2278.0 155.0 263.0 219.0 181.0 10 6#1#3#1|6#2#27#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000311|5#1000321|6#1000311|6#1000321|7#1000312|7#1000322|8#1000313|8#1000322|9#1000313|9#1000323|10#1000314|10#1000324 -10004 11004 50 5 3 3 10 2272.0 175.0 223.0 268.0 136.0 10 6#1#3#1|6#2#28#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000411|5#1000421|6#1000411|6#1000421|7#1000412|7#1000422|8#1000413|8#1000422|9#1000413|9#1000423|10#1000414|10#1000424 -10005 11005 50 5 4 4 10 2160.0 174.0 217.0 260.0 184.0 10 6#1#3#1|6#2#29#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000511|5#1000521|6#1000511|6#1000521|7#1000512|7#1000522|8#1000513|8#1000522|9#1000513|9#1000523|10#1000514|10#1000524 -10006 11006 50 5 3 1 10 2165.0 169.0 213.0 255.0 175.0 10 6#1#3#1|6#2#23#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000611|5#1000621|6#1000611|6#1000621|7#1000612|7#1000622|8#1000613|8#1000622|9#1000613|9#1000623|10#1000614|10#1000624 -10007 11007 50 5 1 2 10 2160.0 170.0 262.0 218.0 172.0 10 6#1#3#1|6#2#35#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000711|5#1000721|6#1000711|6#1000721|7#1000712|7#1000722|8#1000713|8#1000722|9#1000713|9#1000723|10#1000714|10#1000724 -10008 11008 50 5 5 5 10 2116.0 214.0 183.0 219.0 130.0 10 6#1#3#1|6#2#24#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000811|5#1000821|6#1000811|6#1000821|7#1000812|7#1000822|8#1000813|8#1000822|9#1000813|9#1000823|10#1000814|10#1000824 -10009 11009 50 5 2 6 10 1916.0 205.0 210.0 175.0 168.0 10 6#1#3#1|6#2#32#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000911|5#1000921|6#1000911|6#1000921|7#1000912|7#1000922|8#1000913|8#1000922|9#1000913|9#1000923|10#1000914|10#1000924 -10010 11010 50 5 3 2 10 1924.0 197.0 178.0 213.0 138.0 10 6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001011|5#1001021|6#1001011|6#1001021|7#1001012|7#1001022|8#1001013|8#1001022|9#1001013|9#1001023|10#1001014|10#1001024 -10011 11011 50 5 4 4 10 1918.0 198.0 173.0 208.0 153.0 10 6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001111|5#1001121|6#1001111|6#1001121|7#1001112|7#1001122|8#1001113|8#1001122|9#1001113|9#1001123|10#1001114|10#1001124 -10012 11012 50 5 3 1 10 1766.0 256.0 202.0 168.0 146.0 10 6#1#3#1|6#2#36#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001211|5#1001221|6#1001211|6#1001221|7#1001212|7#1001222|8#1001213|8#1001222|9#1001213|9#1001223|10#1001214|10#1001224 -10013 11013 50 5 1 4 10 1685.0 242.0 199.0 166.0 163.0 10 6#1#3#1|6#2#31#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001311|5#1001321|6#1001311|6#1001321|7#1001312|7#1001322|8#1001313|8#1001322|9#1001313|9#1001323|10#1001314|10#1001324 -10014 11014 50 5 5 6 10 1681.0 238.0 198.0 165.0 191.0 10 6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001411|5#1001421|6#1001411|6#1001421|7#1001412|7#1001422|8#1001413|8#1001422|9#1001413|9#1001423|10#1001414|10#1001424 -10015 11015 50 5 2 5 10 1677.0 236.0 165.0 198.0 174.0 10 6#1#3#1|6#2#25#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001511|5#1001521|6#1001511|6#1001521|7#1001512|7#1001522|8#1001513|8#1001522|9#1001513|9#1001523|10#1001514|10#1001524 -10016 11016 50 5 3 1 10 1513.0 296.0 136.0 163.0 156.0 10 6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001611|5#1001621|6#1001611|6#1001621|7#1001612|7#1001622|8#1001613|8#1001622|9#1001613|9#1001623|10#1001614|10#1001624 -10017 11017 50 5 4 6 10 1435.0 281.0 134.0 161.0 159.0 10 6#1#3#1|6#2#42#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001711|5#1001721|6#1001711|6#1001721|7#1001712|7#1001722|8#1001713|8#1001722|9#1001713|9#1001723|10#1001714|10#1001724 -10018 11018 50 5 3 5 10 1445.0 285.0 133.0 159.0 154.0 10 6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001811|5#1001821|6#1001811|6#1001821|7#1001812|7#1001822|8#1001813|8#1001822|9#1001813|9#1001823|10#1001814|10#1001824 -10019 11019 50 5 1 3 10 1439.0 284.0 157.0 131.0 149.0 10 6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001911|5#1001921|6#1001911|6#1001921|7#1001912|7#1001922|8#1001913|8#1001922|9#1001913|9#1001923|10#1001914|10#1001924 -10020 11020 50 5 5 1 10 2285.0 160.0 263.0 219.0 152.0 10 6#1#3#1|6#2#39#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002011|5#1002021|6#1002011|6#1002021|7#1002012|7#1002022|8#1002013|8#1002022|9#1002013|9#1002023|10#1002014|10#1002024 -10021 11021 40 5 2 2 10 1924.0 201.0 173.0 208.0 178.0 10 6#1#3#1|6#2#41#4|5#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002111|5#1002121|6#1002111|6#1002121|7#1002112|7#1002122|8#1002113|8#1002122|9#1002113|9#1002123|10#1002114|10#1002124 -10022 11022 40 5 3 3 10 1678.0 237.0 162.0 194.0 173.0 10 6#1#3#1|6#2#43#4|5#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002211|5#1002221|6#1002211|6#1002221|7#1002212|7#1002222|8#1002213|8#1002222|9#1002213|9#1002223|10#1002214|10#1002224 -10023 11023 40 5 4 5 10 1438.0 278.0 128.0 153.0 168.0 10 6#1#3#1|6#2#44#4|5#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002311|5#1002321|6#1002311|6#1002321|7#1002312|7#1002322|8#1002313|8#1002322|9#1002313|9#1002323|10#1002314|10#1002324 -10024 11024 40 4 3 3 10 1933.0 133.0 225.0 188.0 182.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002411|4#1002421|5#1002411|5#1002421|6#1002411|6#1002421|7#1002412|7#1002422|8#1002413|8#1002422|9#1002413|9#1002423 -10025 11025 40 4 1 1 10 1633.0 169.0 143.0 172.0 166.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002511|4#1002521|5#1002511|5#1002521|6#1002511|6#1002521|7#1002512|7#1002522|8#1002513|8#1002522|9#1002513|9#1002523 -10026 11026 40 4 5 5 10 2051.0 133.0 219.0 183.0 181.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002611|4#1002621|5#1002611|5#1002621|6#1002611|6#1002621|7#1002612|7#1002622|8#1002613|8#1002622|9#1002613|9#1002623 -10027 11027 40 4 2 5 10 1946.0 147.0 223.0 186.0 175.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#24#1|6#3#17#3 4#1002711|4#1002721|5#1002711|5#1002721|6#1002711|6#1002721 -10028 11028 40 4 3 5 10 1296.0 238.0 114.0 137.0 157.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#25#1|6#3#17#3 4#1002811|4#1002821|5#1002811|5#1002821|6#1002811|6#1002821 -10029 11029 40 4 4 4 10 1221.0 234.0 110.0 132.0 153.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002911|4#1002921|5#1002911|5#1002921|6#1002911|6#1002921|7#1002912|7#1002922|8#1002913|8#1002922|9#1002913|9#1002923 -10030 11030 40 4 3 3 10 1839.0 144.0 187.0 224.0 174.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#22#1|6#3#17#3 4#1003011|4#1003021|5#1003011|5#1003021|6#1003011|6#1003021 -10031 11031 40 4 1 4 10 1936.0 133.0 221.0 184.0 184.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#27#1|6#3#17#3 4#1003111|4#1003121|5#1003111|5#1003121|6#1003111|6#1003121 -10032 11032 40 4 5 4 10 1432.0 206.0 162.0 135.0 202.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 4#1003211|4#1003221|5#1003211|5#1003221|6#1003211|6#1003221 -10033 11033 40 4 2 4 10 1221.0 242.0 128.0 107.0 156.0 10 5#1#2#3|5#2#15#4|5#3#16#4 4#1003311|4#1003321|5#1003311|5#1003321|6#1003311|6#1003321 -10034 11034 40 4 3 6 10 1296.0 233.0 113.0 136.0 161.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1003411|4#1003421|5#1003411|5#1003421|6#1003411|6#1003421|7#1003412|7#1003422|8#1003413|8#1003422|9#1003413|14#1003423 -10035 11035 40 4 4 6 10 1732.0 167.0 175.0 146.0 160.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#32#1|6#3#17#3 4#1003511|4#1003521|5#1003511|5#1003521|6#1003511|6#1003521 -10036 11036 40 4 3 2 10 1730.0 172.0 146.0 175.0 158.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1003611|4#1003621|5#1003611|5#1003621|6#1003611|6#1003621|7#1003612|7#1003622|8#1003613|8#1003622|9#1003613|16#1003623 -10037 11037 40 4 1 2 10 1430.0 202.0 162.0 135.0 197.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#34#1|6#3#17#3 4#1003711|4#1003721|5#1003711|5#1003721|6#1003711|6#1003721 -10038 11038 40 4 5 1 10 1229.0 239.0 112.0 134.0 155.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1003811|4#1003821|5#1003811|5#1003821|6#1003811|6#1003821 -10039 11039 40 4 2 2 10 1433.0 199.0 163.0 136.0 191.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#35#1|6#3#17#3 4#1003911|4#1003921|5#1003911|5#1003921|6#1003911|6#1003921 -10040 11040 40 4 3 1 10 1940.0 137.0 223.0 186.0 182.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1004011|4#1004021|5#1004011|5#1004021|6#1004011|6#1004021 -10041 11041 40 4 4 1 10 1933.0 141.0 220.0 183.0 174.0 10 null 4#1004111|4#1004121|5#1004111|5#1004121|6#1004111|6#1004121 -10042 11042 40 4 3 3 10 1941.0 132.0 218.0 182.0 181.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#28#1|6#3#17#3 4#1004211|4#1004221|5#1004211|5#1004221|6#1004211|6#1004221 -10043 11043 40 4 1 2 10 1228.0 237.0 137.0 114.0 155.0 10 null 4#1004311|4#1004321|5#1004311|5#1004321|6#1004311|6#1004321 -10044 11044 40 4 5 6 10 1428.0 209.0 142.0 170.0 192.0 10 null 4#1004411|4#1004421|5#1004411|5#1004421|6#1004411|6#1004421 -10045 11045 40 4 2 3 10 1841.0 148.0 181.0 217.0 181.0 10 null 4#1004511|4#1004521|5#1004511|5#1004521|6#1004511|6#1004521 -10046 11046 30 4 3 5 10 1508.0 199.0 135.0 162.0 171.0 10 null 4#1004611|4#1004621|5#1004611|5#1004621|6#1004611|6#1004621 -10047 11047 30 3 4 1 10 1939.0 138.0 223.0 186.0 175.0 10 null 3#1004711|3#1004721 -10048 11048 30 3 3 3 10 1636.0 172.0 179.0 149.0 172.0 10 null 3#1004811|3#1004821 -10049 11049 30 3 1 2 10 1428.0 204.0 168.0 140.0 196.0 10 null 3#1004911|3#1004921 -10050 11050 30 3 5 4 10 1227.0 235.0 109.0 131.0 159.0 10 null 3#1005011|3#1005021 -10051 11051 30 3 2 5 10 1945.0 149.0 182.0 218.0 182.0 10 null 3#1005111|3#1005121 -10052 11052 30 3 3 6 10 2055.0 137.0 180.0 216.0 177.0 10 null 3#1005211|3#1005221 +10001 11001 50 5 1 2 10 2508.0 181.0 286.0 238.0 176.0 10 6#1#3#1|6#2#34#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000111|5#1000121|6#1000111|6#1000121|7#1000112|7#1000122|8#1000113|8#1000122|9#1000113|9#1000123|10#1000114|10#1000124 +10002 11002 50 5 5 3 10 2281.0 158.0 259.0 216.0 154.0 10 6#1#3#1|6#2#22#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000211|5#1000221|6#1000211|6#1000221|7#1000212|7#1000222|8#1000213|8#1000222|9#1000213|9#1000223|10#1000214|10#1000224 +10003 11003 50 5 2 4 10 2280.0 162.0 262.0 218.0 181.0 10 6#1#3#1|6#2#27#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000311|5#1000321|6#1000311|6#1000321|7#1000312|7#1000322|8#1000313|8#1000322|9#1000313|9#1000323|10#1000314|10#1000324 +10004 11004 50 5 3 3 10 2373.0 184.0 236.0 283.0 136.0 10 6#1#3#1|6#2#28#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000411|5#1000421|6#1000411|6#1000421|7#1000412|7#1000422|8#1000413|8#1000422|9#1000413|9#1000423|10#1000414|10#1000424 +10005 11005 50 5 4 4 10 2155.0 166.0 215.0 258.0 184.0 10 6#1#3#1|6#2#29#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000511|5#1000521|6#1000511|6#1000521|7#1000512|7#1000522|8#1000513|8#1000522|9#1000513|9#1000523|10#1000514|10#1000524 +10006 11006 50 5 3 1 10 2161.0 171.0 214.0 257.0 175.0 10 6#1#3#1|6#2#23#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000611|5#1000621|6#1000611|6#1000621|7#1000612|7#1000622|8#1000613|8#1000622|9#1000613|9#1000623|10#1000614|10#1000624 +10007 11007 50 5 1 2 10 2165.0 165.0 259.0 216.0 172.0 10 6#1#3#1|6#2#35#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000711|5#1000721|6#1000711|6#1000721|7#1000712|7#1000722|8#1000713|8#1000722|9#1000713|9#1000723|10#1000714|10#1000724 +10008 11008 50 5 5 5 10 2206.0 217.0 193.0 232.0 130.0 10 6#1#3#1|6#2#24#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000811|5#1000821|6#1000811|6#1000821|7#1000812|7#1000822|8#1000813|8#1000822|9#1000813|9#1000823|10#1000814|10#1000824 +10009 11009 50 5 2 6 10 1921.0 198.0 208.0 173.0 168.0 10 6#1#3#1|6#2#32#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1000911|5#1000921|6#1000911|6#1000921|7#1000912|7#1000922|8#1000913|8#1000922|9#1000913|9#1000923|10#1000914|10#1000924 +10010 11010 50 5 3 2 10 1922.0 199.0 172.0 206.0 138.0 10 6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001011|5#1001021|6#1001011|6#1001021|7#1001012|7#1001022|8#1001013|8#1001022|9#1001013|9#1001023|10#1001014|10#1001024 +10011 11011 50 5 4 4 10 1922.0 199.0 178.0 213.0 153.0 10 6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001111|5#1001121|6#1001111|6#1001121|7#1001112|7#1001122|8#1001113|8#1001122|9#1001113|9#1001123|10#1001114|10#1001124 +10012 11012 50 5 3 1 10 1849.0 265.0 217.0 181.0 146.0 10 6#1#3#1|6#2#36#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001211|5#1001221|6#1001211|6#1001221|7#1001212|7#1001222|8#1001213|8#1001222|9#1001213|9#1001223|10#1001214|10#1001224 +10013 11013 50 5 1 4 10 1678.0 242.0 194.0 162.0 163.0 10 6#1#3#1|6#2#31#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001311|5#1001321|6#1001311|6#1001321|7#1001312|7#1001322|8#1001313|8#1001322|9#1001313|9#1001323|10#1001314|10#1001324 +10014 11014 50 5 5 6 10 1676.0 244.0 196.0 163.0 191.0 10 6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001411|5#1001421|6#1001411|6#1001421|7#1001412|7#1001422|8#1001413|8#1001422|9#1001413|9#1001423|10#1001414|10#1001424 +10015 11015 50 5 2 5 10 1675.0 235.0 159.0 191.0 174.0 10 6#1#3#1|6#2#25#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001511|5#1001521|6#1001511|6#1001521|7#1001512|7#1001522|8#1001513|8#1001522|9#1001513|9#1001523|10#1001514|10#1001524 +10016 11016 50 5 3 1 10 1587.0 313.0 141.0 169.0 156.0 10 6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001611|5#1001621|6#1001611|6#1001621|7#1001612|7#1001622|8#1001613|8#1001622|9#1001613|9#1001623|10#1001614|10#1001624 +10017 11017 50 5 4 6 10 1443.0 278.0 127.0 152.0 159.0 10 6#1#3#1|6#2#42#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001711|5#1001721|6#1001711|6#1001721|7#1001712|7#1001722|8#1001713|8#1001722|9#1001713|9#1001723|10#1001714|10#1001724 +10018 11018 50 5 3 5 10 1443.0 280.0 134.0 161.0 154.0 10 6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001811|5#1001821|6#1001811|6#1001821|7#1001812|7#1001822|8#1001813|8#1001822|9#1001813|9#1001823|10#1001814|10#1001824 +10019 11019 50 5 1 3 10 1436.0 284.0 152.0 127.0 149.0 10 6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001911|5#1001921|6#1001911|6#1001921|7#1001912|7#1001922|8#1001913|8#1001922|9#1001913|9#1001923|10#1001914|10#1001924 +10020 11020 50 5 5 1 10 2279.0 164.0 264.0 220.0 152.0 10 6#1#3#1|6#2#39#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002011|5#1002021|6#1002011|6#1002021|7#1002012|7#1002022|8#1002013|8#1002022|9#1002013|9#1002023|10#1002014|10#1002024 +10021 11021 40 5 2 2 10 1920.0 205.0 170.0 204.0 178.0 10 6#1#3#1|6#2#41#4|5#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002111|5#1002121|6#1002111|6#1002121|7#1002112|7#1002122|8#1002113|8#1002122|9#1002113|9#1002123|10#1002114|10#1002124 +10022 11022 40 5 3 3 10 1676.0 244.0 167.0 200.0 173.0 10 6#1#3#1|6#2#43#4|5#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002211|5#1002221|6#1002211|6#1002221|7#1002212|7#1002222|8#1002213|8#1002222|9#1002213|9#1002223|10#1002214|10#1002224 +10023 11023 40 5 4 5 10 1439.0 280.0 131.0 157.0 168.0 10 6#1#3#1|6#2#44#4|5#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002311|5#1002321|6#1002311|6#1002321|7#1002312|7#1002322|8#1002313|8#1002322|9#1002313|9#1002323|10#1002314|10#1002324 +10024 11024 40 4 3 3 10 1933.0 138.0 216.0 180.0 182.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002411|4#1002421|5#1002411|5#1002421|6#1002411|6#1002421|7#1002412|7#1002422|8#1002413|8#1002422|9#1002413|9#1002423 +10025 11025 40 4 1 1 10 1630.0 174.0 146.0 175.0 166.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002511|4#1002521|5#1002511|5#1002521|6#1002511|6#1002521|7#1002512|7#1002522|8#1002513|8#1002522|9#1002513|9#1002523 +10026 11026 40 4 5 5 10 2051.0 138.0 216.0 180.0 181.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002611|4#1002621|5#1002611|5#1002621|6#1002611|6#1002621|7#1002612|7#1002622|8#1002613|8#1002622|9#1002613|9#1002623 +10027 11027 40 4 2 5 10 1944.0 141.0 221.0 184.0 175.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#24#1|6#3#17#3 4#1002711|4#1002721|5#1002711|5#1002721|6#1002711|6#1002721 +10028 11028 40 4 3 5 10 1292.0 241.0 110.0 132.0 157.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#25#1|6#3#17#3 4#1002811|4#1002821|5#1002811|5#1002821|6#1002811|6#1002821 +10029 11029 40 4 4 4 10 1228.0 240.0 108.0 129.0 153.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1002911|4#1002921|5#1002911|5#1002921|6#1002911|6#1002921|7#1002912|7#1002922|8#1002913|8#1002922|9#1002913|9#1002923 +10030 11030 40 4 3 3 10 1833.0 146.0 186.0 223.0 174.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#22#1|6#3#17#3 4#1003011|4#1003021|5#1003011|5#1003021|6#1003011|6#1003021 +10031 11031 40 4 1 4 10 1942.0 133.0 218.0 182.0 184.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#27#1|6#3#17#3 4#1003111|4#1003121|5#1003111|5#1003121|6#1003111|6#1003121 +10032 11032 40 4 5 4 10 1426.0 205.0 161.0 134.0 202.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 4#1003211|4#1003221|5#1003211|5#1003221|6#1003211|6#1003221 +10033 11033 40 4 2 4 10 1219.0 234.0 130.0 108.0 156.0 10 5#1#2#3|5#2#15#4|5#3#16#4 4#1003311|4#1003321|5#1003311|5#1003321|6#1003311|6#1003321 +10034 11034 40 4 3 6 10 1293.0 240.0 107.0 128.0 161.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1003411|4#1003421|5#1003411|5#1003421|6#1003411|6#1003421|7#1003412|7#1003422|8#1003413|8#1003422|9#1003413|14#1003423 +10035 11035 40 4 4 6 10 1732.0 166.0 172.0 143.0 160.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#32#1|6#3#17#3 4#1003511|4#1003521|5#1003511|5#1003521|6#1003511|6#1003521 +10036 11036 40 4 3 2 10 1724.0 170.0 149.0 179.0 158.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2 4#1003611|4#1003621|5#1003611|5#1003621|6#1003611|6#1003621|7#1003612|7#1003622|8#1003613|8#1003622|9#1003613|16#1003623 +10037 11037 40 4 1 2 10 1427.0 206.0 161.0 134.0 197.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#34#1|6#3#17#3 4#1003711|4#1003721|5#1003711|5#1003721|6#1003711|6#1003721 +10038 11038 40 4 5 1 10 1224.0 242.0 114.0 137.0 155.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1003811|4#1003821|5#1003811|5#1003821|6#1003811|6#1003821 +10039 11039 40 4 2 2 10 1428.0 206.0 165.0 138.0 191.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#35#1|6#3#17#3 4#1003911|4#1003921|5#1003911|5#1003921|6#1003911|6#1003921 +10040 11040 40 4 3 1 10 1938.0 141.0 222.0 185.0 182.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 4#1004011|4#1004021|5#1004011|5#1004021|6#1004011|6#1004021 +10041 11041 40 4 4 1 10 1937.0 135.0 221.0 184.0 174.0 10 null 4#1004111|4#1004121 +10042 11042 40 4 3 3 10 1942.0 135.0 218.0 182.0 181.0 10 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#28#1|6#3#17#3 4#1004211|4#1004221|5#1004211|5#1004221|6#1004211|6#1004221 +10043 11043 40 4 1 2 10 1222.0 234.0 136.0 113.0 155.0 10 null 4#1004311|4#1004321 +10044 11044 40 4 5 6 10 1425.0 201.0 138.0 165.0 192.0 10 null 4#1004411|4#1004421 +10045 11045 40 4 2 3 10 1831.0 143.0 188.0 225.0 181.0 10 null 4#1004511|4#1004521 +10046 11046 30 4 3 5 10 1507.0 203.0 134.0 161.0 171.0 10 null 4#1004611|4#1004621 +10047 11047 30 3 4 1 10 1942.0 140.0 226.0 188.0 175.0 10 null 3#1004711|3#1004721 +10048 11048 30 3 3 3 10 1637.0 167.0 173.0 144.0 172.0 10 null 3#1004811|3#1004821 +10049 11049 30 3 1 2 10 1423.0 199.0 161.0 134.0 196.0 10 null 3#1004911|3#1004921 +10050 11050 30 3 5 4 10 1226.0 242.0 111.0 133.0 159.0 10 null 3#1005011|3#1005021 +10051 11051 30 3 2 5 10 1943.0 140.0 188.0 225.0 182.0 10 null 3#1005111|3#1005121 +10052 11052 30 3 3 6 10 2049.0 136.0 187.0 224.0 177.0 10 null 3#1005211|3#1005221 diff --git a/conf/server/HeroRankupConfig.txt b/conf/server/HeroRankupConfig.txt index aef896965..d0f0b51ca 100644 --- a/conf/server/HeroRankupConfig.txt +++ b/conf/server/HeroRankupConfig.txt @@ -1,24 +1,24 @@ Id Type RankupPara LimitLevel OpenLevel LimitStar OpenStar ConsumeMaterial Star Show int int float int int int int mut,int#int,2 int int -101 1 2000 30 40 5 5 14#10000|4#20 5 1 -102 1 5000 40 50 5 5 14#20000|4#40 5 1 -103 1 9000 50 60 5 5 14#30000|4#100 5 1 -104 1 14000 60 80 5 5 14#30000|4#300 5 1 -105 1 20000 80 100 5 5 14#70000|4#1000 5 1 -106 1 60000 100 140 5 6 14#120000|4#0 5 2 -107 2 2000 140 160 6 7 14#0|4#2000 5 2 -108 2 4000 160 180 7 8 14#0|4#3000 5 2 -109 2 7000 180 200 8 9 14#0|4#4000 5 2 -110 2 10000 200 250 9 10 14#0|4#10000 5 2 -201 1 2000 30 40 4 4 14#10000|4#20 4 1 -202 1 5000 40 50 4 4 14#20000|4#40 4 1 -203 1 9000 50 60 4 4 14#30000|4#100 4 1 -204 1 14000 60 80 4 4 14#30000|4#300 4 1 -205 1 20000 80 100 4 5 14#70000|4#1000 4 2 -206 1 60000 100 140 5 6 14#120000|4#0 4 2 -207 2 2000 140 160 6 7 14#0|4#2000 4 2 -208 2 4000 160 180 7 8 14#0|4#3000 4 2 -209 2 7000 180 200 8 9 14#0|4#4000 4 2 -301 1 2000 30 40 3 3 14#10000|4#20 3 1 -302 1 5000 40 50 3 3 14#20000|4#40 3 1 -303 1 9000 50 60 3 3 14#30000|4#100 3 1 +101 1 2000.0 30 40 5 5 14#10000|4#20 5 1 +102 1 5000.0 40 50 5 5 14#20000|4#40 5 1 +103 1 9000.0 50 60 5 5 14#30000|4#100 5 1 +104 1 14000.0 60 80 5 5 14#30000|4#300 5 1 +105 1 20000.0 80 100 5 5 14#70000|4#1000 5 1 +106 1 60000.0 100 140 5 6 14#120000|4#0 5 2 +107 2 2000.0 140 160 6 7 14#0|4#2000 5 2 +108 2 4000.0 160 180 7 8 14#0|4#3000 5 2 +109 2 7000.0 180 200 8 9 14#0|4#4000 5 2 +110 2 10000.0 200 250 9 10 14#0|4#10000 5 2 +201 1 2000.0 30 40 4 4 14#10000|4#20 4 1 +202 1 5000.0 40 50 4 4 14#20000|4#40 4 1 +203 1 9000.0 50 60 4 4 14#30000|4#100 4 1 +204 1 14000.0 60 80 4 4 14#30000|4#300 4 1 +205 1 20000.0 80 100 4 5 14#70000|4#1000 4 2 +206 1 60000.0 100 140 5 6 14#120000|4#0 4 2 +207 2 2000.0 140 160 6 7 14#0|4#2000 4 2 +208 2 4000.0 160 180 7 8 14#0|4#3000 4 2 +209 2 7000.0 180 200 8 9 14#0|4#4000 4 2 +301 1 2000.0 30 40 3 3 14#10000|4#20 3 1 +302 1 5000.0 40 50 3 3 14#20000|4#40 3 1 +303 1 9000.0 50 60 3 3 14#30000|4#100 3 1 diff --git a/conf/server/MysteryFoodPoolConfig.txt b/conf/server/MysteryFoodPoolConfig.txt new file mode 100644 index 000000000..d8df888d3 --- /dev/null +++ b/conf/server/MysteryFoodPoolConfig.txt @@ -0,0 +1,2 @@ +Id ItemId Weight Exp Pool +int int int int int diff --git a/conf/server/MysteryFoodSetting.txt b/conf/server/MysteryFoodSetting.txt new file mode 100644 index 000000000..917472451 --- /dev/null +++ b/conf/server/MysteryFoodSetting.txt @@ -0,0 +1,2 @@ +Id AddRate FailExp +int mut,float#float,1 int diff --git a/conf/server/WorkShopEquipmentConfig.txt b/conf/server/WorkShopEquipmentConfig.txt index 4b022d15b..578823836 100644 --- a/conf/server/WorkShopEquipmentConfig.txt +++ b/conf/server/WorkShopEquipmentConfig.txt @@ -1,101 +1,101 @@ -Id OpenRules Mineral RunesNum SpecialRunes Exp -int mut,int#int,1 mut,int#int,1 int mut,int#int,1 int -3001 null 1007#1 1 null 0 -3002 null 1007#1 2 null 0 -3003 null 1007#1 1 null 0 -3004 null 1007#1 2 null 0 -3005 null 1007#1 1 null 0 -3006 null 1007#1 2 null 0 -3007 null 1007#1 1 null 0 -3008 null 1007#1 2 null 0 -3009 null 1007#1 1 null 0 -3010 null 1007#1 2 null 0 -3011 null 1007#1 1 null 0 -3012 null 1007#1 2 null 0 -3013 null 1007#1 1 null 0 -3014 null 1007#1 2 null 0 -3015 null 1007#1 1 null 0 -3016 null 1007#1 2 null 0 -3017 null 1007#1 1 null 0 -3018 null 1007#1 2 null 0 -3101 null 1007#1 1 null 0 -3102 null 1007#1 2 null 0 -3103 null 1007#1 1 null 0 -3104 null 1007#1 2 null 0 -3105 null 1007#1 1 null 0 -3106 null 1007#1 2 null 0 -3107 null 1007#1 1 null 0 -3108 null 1007#1 2 null 0 -3109 null 1007#1 1 null 0 -3110 null 1007#1 2 null 0 -3111 null 1007#1 1 null 0 -3112 null 1007#1 2 null 0 -3113 null 1007#1 1 null 0 -3114 null 1007#1 2 null 0 -3115 null 1007#1 1 null 0 -3116 null 1007#1 2 null 0 -3117 null 1007#1 1 null 0 -3118 null 1007#1 2 null 0 -3201 null 1008#1 1 null 0 -3202 null 1008#1 2 null 0 -3203 null 1008#1 1 null 0 -3204 null 1008#1 2 null 0 -3205 null 1008#1 1 null 0 -3206 null 1008#1 2 null 0 -3207 null 1008#1 1 null 0 -3208 null 1008#1 2 null 0 -3209 null 1008#1 1 null 0 -3210 null 1008#1 2 null 0 -3211 null 1008#1 1 null 0 -3212 null 1008#1 2 null 0 -3213 null 1008#1 1 null 0 -3214 null 1008#1 2 null 0 -3215 null 1008#1 1 null 0 -3216 null 1008#1 2 null 0 -3217 null 1008#1 1 null 0 -3218 null 1008#1 2 null 0 -3301 null 1009#1 1 null 0 -3302 null 1009#1 2 null 0 -3303 null 1009#1 1 null 0 -3304 null 1009#1 2 null 0 -3305 null 1009#1 1 null 0 -3306 null 1009#1 2 null 0 -3307 null 1009#1 1 null 0 -3308 null 1009#1 2 null 0 -3309 null 1009#1 1 null 0 -3310 null 1009#1 2 null 0 -3311 null 1009#1 1 null 0 -3312 null 1009#1 2 null 0 -3313 null 1009#1 1 null 0 -3314 null 1009#1 2 null 0 -3315 null 1009#1 1 null 0 -3316 null 1009#1 2 null 0 -3317 null 1009#1 1 null 0 -3318 null 1009#1 2 null 0 -4001 2#7001 1008#1 2 null 0 -4002 2#7002 1008#1 2 null 0 -4003 2#7003 1008#1 2 null 0 -4004 2#7004 1008#1 2 null 0 -4005 2#7005 1008#1 2 null 0 -4006 2#7006 1008#1 2 null 0 -4007 2#7007 1008#1 2 null 0 -4008 2#7008 1008#1 2 null 0 -4009 2#7009 1008#1 2 null 0 -4101 2#7101 1009#1 2 null 0 -4102 2#7102 1009#1 2 null 0 -4103 2#7103 1009#1 2 null 0 -4104 2#7104 1009#1 2 null 0 -4105 2#7105 1009#1 2 null 0 -4106 2#7106 1009#1 2 null 0 -4107 2#7107 1009#1 2 null 0 -4108 2#7108 1009#1 2 null 0 -4109 2#7109 1009#1 2 null 0 -4110 2#7110 1009#1 2 null 0 -4111 2#7111 1009#1 2 null 0 -4112 2#7112 1009#1 2 null 0 -4113 2#7113 1009#1 2 null 0 -4114 2#7114 1009#1 2 null 0 -4115 2#7115 1009#1 2 null 0 -4116 2#7116 1009#1 2 null 0 -4117 2#7117 1009#1 2 null 0 -4118 2#7118 1009#1 2 null 0 +Id Type OpenRules Mineral RunesNum SpecialRunes Exp +int int mut,int#int,1 mut,int#int,1 int mut,int#int,1 int +3001 1 null 1007#1 1 null 0 +3002 1 null 1007#1 2 null 0 +3003 1 null 1007#1 1 null 0 +3004 1 null 1007#1 2 null 0 +3005 1 null 1007#1 1 null 0 +3006 1 null 1007#1 2 null 0 +3007 1 null 1007#1 1 null 0 +3008 1 null 1007#1 2 null 0 +3009 1 null 1007#1 1 null 0 +3010 1 null 1007#1 2 null 0 +3011 1 null 1007#1 1 null 0 +3012 1 null 1007#1 2 null 0 +3013 1 null 1007#1 1 null 0 +3014 1 null 1007#1 2 null 0 +3015 1 null 1007#1 1 null 0 +3016 1 null 1007#1 2 null 0 +3017 1 null 1007#1 1 null 0 +3018 1 null 1007#1 2 null 0 +3101 1 null 1007#1 1 null 0 +3102 1 null 1007#1 2 null 0 +3103 1 null 1007#1 1 null 0 +3104 1 null 1007#1 2 null 0 +3105 1 null 1007#1 1 null 0 +3106 1 null 1007#1 2 null 0 +3107 1 null 1007#1 1 null 0 +3108 1 null 1007#1 2 null 0 +3109 1 null 1007#1 1 null 0 +3110 1 null 1007#1 2 null 0 +3111 1 null 1007#1 1 null 0 +3112 1 null 1007#1 2 null 0 +3113 1 null 1007#1 1 null 0 +3114 1 null 1007#1 2 null 0 +3115 1 null 1007#1 1 null 0 +3116 1 null 1007#1 2 null 0 +3117 1 null 1007#1 1 null 0 +3118 1 null 1007#1 2 null 0 +3201 1 null 1008#1 1 null 0 +3202 1 null 1008#1 2 null 0 +3203 1 null 1008#1 1 null 0 +3204 1 null 1008#1 2 null 0 +3205 1 null 1008#1 1 null 0 +3206 1 null 1008#1 2 null 0 +3207 1 null 1008#1 1 null 0 +3208 1 null 1008#1 2 null 0 +3209 1 null 1008#1 1 null 0 +3210 1 null 1008#1 2 null 0 +3211 1 null 1008#1 1 null 0 +3212 1 null 1008#1 2 null 0 +3213 1 null 1008#1 1 null 0 +3214 1 null 1008#1 2 null 0 +3215 1 null 1008#1 1 null 0 +3216 1 null 1008#1 2 null 0 +3217 1 null 1008#1 1 null 0 +3218 1 null 1008#1 2 null 0 +3301 1 null 1009#1 1 null 0 +3302 1 null 1009#1 2 null 0 +3303 1 null 1009#1 1 null 0 +3304 1 null 1009#1 2 null 0 +3305 1 null 1009#1 1 null 0 +3306 1 null 1009#1 2 null 0 +3307 1 null 1009#1 1 null 0 +3308 1 null 1009#1 2 null 0 +3309 1 null 1009#1 1 null 0 +3310 1 null 1009#1 2 null 0 +3311 1 null 1009#1 1 null 0 +3312 1 null 1009#1 2 null 0 +3313 1 null 1009#1 1 null 0 +3314 1 null 1009#1 2 null 0 +3315 1 null 1009#1 1 null 0 +3316 1 null 1009#1 2 null 0 +3317 1 null 1009#1 1 null 0 +3318 1 null 1009#1 2 null 0 +4001 1 2#7001 1008#1 2 null 0 +4002 1 2#7002 1008#1 2 null 0 +4003 1 2#7003 1008#1 2 null 0 +4004 1 2#7004 1008#1 2 null 0 +4005 1 2#7005 1008#1 2 null 0 +4006 1 2#7006 1008#1 2 null 0 +4007 1 2#7007 1008#1 2 null 0 +4008 1 2#7008 1008#1 2 null 0 +4009 1 2#7009 1008#1 2 null 0 +4101 1 2#7101 1009#1 2 null 0 +4102 1 2#7102 1009#1 2 null 0 +4103 1 2#7103 1009#1 2 null 0 +4104 1 2#7104 1009#1 2 null 0 +4105 1 2#7105 1009#1 2 null 0 +4106 1 2#7106 1009#1 2 null 0 +4107 1 2#7107 1009#1 2 null 0 +4108 1 2#7108 1009#1 2 null 0 +4109 1 2#7109 1009#1 2 null 0 +4110 1 2#7110 1009#1 2 null 0 +4111 1 2#7111 1009#1 2 null 0 +4112 1 2#7112 1009#1 2 null 0 +4113 1 2#7113 1009#1 2 null 0 +4114 1 2#7114 1009#1 2 null 0 +4115 1 2#7115 1009#1 2 null 0 +4116 1 2#7116 1009#1 2 null 0 +4117 1 2#7117 1009#1 2 null 0 +4118 1 2#7118 1009#1 2 null 0 diff --git a/conf/server/WorkShopFoundationConfig.txt b/conf/server/WorkShopFoundationConfig.txt index 43de92636..8ad3831fa 100644 --- a/conf/server/WorkShopFoundationConfig.txt +++ b/conf/server/WorkShopFoundationConfig.txt @@ -1,6 +1,6 @@ -Id OpenRules Cost Exp -int mut,int#int,1 mut,int#int,2 int -1007 null null 0 -1008 null null 0 -1009 null null 0 -0 null null 0 +Id Type OpenRules Cost Exp Num +int int mut,int#int,1 mut,int#int,2 int int +1007 0 null null 0 0 +1008 0 null null 0 0 +1009 0 null null 0 0 +0 0 null null 0 0 diff --git a/conf/server/WorkShopSetting.txt b/conf/server/WorkShopSetting.txt index a583fa6ca..a52afea70 100644 --- a/conf/server/WorkShopSetting.txt +++ b/conf/server/WorkShopSetting.txt @@ -1,103 +1,103 @@ -Id Exp Promote -int int mut,int#int,1 -0 0 null -1 1000 1#1 -2 1500 2#1 -3 2000 3#1 -4 2500 4#1 -5 2500 5#1 -6 3500 1#3 -7 4000 2#3 -8 4500 3#3 -9 5000 4#3 -10 5500 5#3 -11 6000 1#6 -12 6500 2#6 -13 7000 3#6 -14 7500 4#6 -15 8000 5#6 -16 8500 1#10 -17 9000 2#10 -18 9500 3#10 -19 10000 4#10 -20 10500 5#10 -21 11000 1#15 -22 11500 2#15 -23 12000 3#15 -24 12500 4#15 -25 13000 5#15 -26 13500 1#21 -27 14000 2#21 -28 14500 3#21 -29 15000 4#21 -30 15500 5#21 -31 16000 1#28 -32 16500 2#28 -33 17000 3#28 -34 17500 4#28 -35 18000 5#28 -36 18500 1#36 -37 19000 2#36 -38 19500 3#36 -39 20000 4#36 -40 20500 5#36 -41 21000 1#45 -42 21500 2#45 -43 22000 3#45 -44 22500 4#45 -45 23000 5#45 -46 23500 1#55 -47 24000 2#55 -48 24500 3#55 -49 25000 4#55 -50 25500 5#55 -51 26000 1#65 -52 26500 2#65 -53 27000 3#65 -54 27500 4#65 -55 28000 5#65 -56 28500 1#76 -57 29000 2#76 -58 29500 3#76 -59 30000 4#76 -60 30500 5#76 -61 31000 1#88 -62 31500 2#88 -63 32000 3#88 -64 32500 4#88 -65 33000 5#88 -66 33500 1#101 -67 34000 2#101 -68 34500 3#101 -69 35000 4#101 -70 35500 5#101 -71 36000 1#115 -72 36500 2#115 -73 37000 3#115 -74 37500 4#115 -75 38000 5#115 -76 38500 1#130 -77 39000 2#130 -78 39500 3#130 -79 40000 4#130 -80 40500 5#130 -81 41000 1#146 -82 41500 2#146 -83 42000 3#146 -84 42500 4#146 -85 43000 5#146 -86 43500 1#163 -87 44000 2#163 -88 44500 3#163 -89 45000 4#163 -90 45500 5#163 -91 46000 1#181 -92 46500 2#181 -93 47000 3#181 -94 47500 4#181 -95 48000 5#181 -96 48500 1#200 -97 49000 2#200 -98 49500 3#200 -99 50000 4#200 -100 50500 5#200 +Id Exp Promote FoodExp AddNum PoolRate AddSuccessRate +int int mut,int#int,1 int float mut,float#float,1 float +0 0 null 0 int null 0.0 +1 1000 1#1 0 int null 0.0 +2 1500 2#1 0 int null 0.0 +3 2000 3#1 0 int null 0.0 +4 2500 4#1 0 int null 0.0 +5 2500 5#1 0 int null 0.0 +6 3500 1#3 0 int null 0.0 +7 4000 2#3 0 int null 0.0 +8 4500 3#3 0 int null 0.0 +9 5000 4#3 0 int null 0.0 +10 5500 5#3 0 int null 0.0 +11 6000 1#6 0 int null 0.0 +12 6500 2#6 0 int null 0.0 +13 7000 3#6 0 int null 0.0 +14 7500 4#6 0 int null 0.0 +15 8000 5#6 0 int null 0.0 +16 8500 1#10 0 int null 0.0 +17 9000 2#10 0 int null 0.0 +18 9500 3#10 0 int null 0.0 +19 10000 4#10 0 int null 0.0 +20 10500 5#10 0 int null 0.0 +21 11000 1#15 0 int null 0.0 +22 11500 2#15 0 int null 0.0 +23 12000 3#15 0 int null 0.0 +24 12500 4#15 0 int null 0.0 +25 13000 5#15 0 int null 0.0 +26 13500 1#21 0 int null 0.0 +27 14000 2#21 0 int null 0.0 +28 14500 3#21 0 int null 0.0 +29 15000 4#21 0 int null 0.0 +30 15500 5#21 0 int null 0.0 +31 16000 1#28 0 int null 0.0 +32 16500 2#28 0 int null 0.0 +33 17000 3#28 0 int null 0.0 +34 17500 4#28 0 int null 0.0 +35 18000 5#28 0 int null 0.0 +36 18500 1#36 0 int null 0.0 +37 19000 2#36 0 int null 0.0 +38 19500 3#36 0 int null 0.0 +39 20000 4#36 0 int null 0.0 +40 20500 5#36 0 int null 0.0 +41 21000 1#45 0 int null 0.0 +42 21500 2#45 0 int null 0.0 +43 22000 3#45 0 int null 0.0 +44 22500 4#45 0 int null 0.0 +45 23000 5#45 0 int null 0.0 +46 23500 1#55 0 int null 0.0 +47 24000 2#55 0 int null 0.0 +48 24500 3#55 0 int null 0.0 +49 25000 4#55 0 int null 0.0 +50 25500 5#55 0 int null 0.0 +51 26000 1#65 0 int null 0.0 +52 26500 2#65 0 int null 0.0 +53 27000 3#65 0 int null 0.0 +54 27500 4#65 0 int null 0.0 +55 28000 5#65 0 int null 0.0 +56 28500 1#76 0 int null 0.0 +57 29000 2#76 0 int null 0.0 +58 29500 3#76 0 int null 0.0 +59 30000 4#76 0 int null 0.0 +60 30500 5#76 0 int null 0.0 +61 31000 1#88 0 int null 0.0 +62 31500 2#88 0 int null 0.0 +63 32000 3#88 0 int null 0.0 +64 32500 4#88 0 int null 0.0 +65 33000 5#88 0 int null 0.0 +66 33500 1#101 0 int null 0.0 +67 34000 2#101 0 int null 0.0 +68 34500 3#101 0 int null 0.0 +69 35000 4#101 0 int null 0.0 +70 35500 5#101 0 int null 0.0 +71 36000 1#115 0 int null 0.0 +72 36500 2#115 0 int null 0.0 +73 37000 3#115 0 int null 0.0 +74 37500 4#115 0 int null 0.0 +75 38000 5#115 0 int null 0.0 +76 38500 1#130 0 int null 0.0 +77 39000 2#130 0 int null 0.0 +78 39500 3#130 0 int null 0.0 +79 40000 4#130 0 int null 0.0 +80 40500 5#130 0 int null 0.0 +81 41000 1#146 0 int null 0.0 +82 41500 2#146 0 int null 0.0 +83 42000 3#146 0 int null 0.0 +84 42500 4#146 0 int null 0.0 +85 43000 5#146 0 int null 0.0 +86 43500 1#163 0 int null 0.0 +87 44000 2#163 0 int null 0.0 +88 44500 3#163 0 int null 0.0 +89 45000 4#163 0 int null 0.0 +90 45500 5#163 0 int null 0.0 +91 46000 1#181 0 int null 0.0 +92 46500 2#181 0 int null 0.0 +93 47000 3#181 0 int null 0.0 +94 47500 4#181 0 int null 0.0 +95 48000 5#181 0 int null 0.0 +96 48500 1#200 0 int null 0.0 +97 49000 2#200 0 int null 0.0 +98 49500 3#200 0 int null 0.0 +99 50000 4#200 0 int null 0.0 +100 50500 5#200 0 int null 0.0 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SDifferDemonsConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SDifferDemonsConfig.java index 0a639da10..84df52983 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SDifferDemonsConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SDifferDemonsConfig.java @@ -15,7 +15,7 @@ public class SDifferDemonsConfig implements BaseConfig { private int[] comonpentList; - private static Map sDifferDemonsConfigMap; + public static Map sDifferDemonsConfigMap; @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodPoolConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodPoolConfig.java new file mode 100644 index 000000000..3378ced4a --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodPoolConfig.java @@ -0,0 +1,49 @@ +package com.ljsd.jieling.config; + +import com.ljsd.jieling.logic.STableManager; +import com.ljsd.jieling.logic.Table; + +import java.util.Map; + +@Table(name ="MysteryFoodPoolConfig") +public class SMysteryFoodPoolConfig implements BaseConfig { + + private int id; + + private int itemId; + + private int weight; + + private int exp; + + private int pool; + + + @Override + public void init() throws Exception { + + } + + + public int getId() { + return id; + } + + public int getItemId() { + return itemId; + } + + public int getWeight() { + return weight; + } + + public int getExp() { + return exp; + } + + public int getPool() { + return pool; + } + + +} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodSetting.java new file mode 100644 index 000000000..1475294c9 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SMysteryFoodSetting.java @@ -0,0 +1,37 @@ +package com.ljsd.jieling.config; + +import com.ljsd.jieling.logic.STableManager; +import com.ljsd.jieling.logic.Table; + +import java.util.Map; + +@Table(name ="MysteryFoodSetting") +public class SMysteryFoodSetting implements BaseConfig { + + private int id; + + private float[] addRate; + + private int failExp; + + + @Override + public void init() throws Exception { + + } + + + public int getId() { + return id; + } + + public float[] getAddRate() { + return addRate; + } + + public int getFailExp() { + return failExp; + } + + +} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopEquipmentConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopEquipmentConfig.java index 875a63521..8db5475b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopEquipmentConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopEquipmentConfig.java @@ -10,6 +10,8 @@ public class SWorkShopEquipmentConfig implements BaseConfig { private int id; + private int type; + private int[] openRules; private int[] mineral; @@ -56,5 +58,7 @@ public class SWorkShopEquipmentConfig implements BaseConfig { return exp; } - + public int getType() { + return type; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopFoundationConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopFoundationConfig.java index c64f58b26..04c09e995 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopFoundationConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SWorkShopFoundationConfig.java @@ -10,12 +10,16 @@ public class SWorkShopFoundationConfig implements BaseConfig { private int id; + private int type; + private int[] openRules; private int[][] cost; private int exp; + private int num; + private static Map shopFoundationConfigMap; @@ -44,5 +48,11 @@ public class SWorkShopFoundationConfig implements BaseConfig { return exp; } + public int getType() { + return type; + } + public int getNum() { + return num; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index 0f3cea282..a9fafa466 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -21,4 +21,8 @@ public interface GlobalsDef { int ABSOLUTE_TYPE =1; // 绝对值 int PERCENT_TYPE =2; // 百分比 + //作坊类型 + int WORK_SHOP_TYPE = 1; // 1工坊 + int COOK_SHOP_TYPE = 2; //2百味居 + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index 09be8d31c..f6004d1b7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -12,6 +12,7 @@ public interface GlobalItemType { int CARD = 1; // 卡牌 int CARD_FRAGMENT = 2; // 卡牌碎片 int EQUIP = 3; //装备 + // int POKENMON_COMONPENT = 4; //异妖组件 int RANDOM_ITME = 5; // 随机道具 int RUNNE = 6; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllPokemonHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllPokemonHandler.java new file mode 100644 index 000000000..9968feac6 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllPokemonHandler.java @@ -0,0 +1,20 @@ +package com.ljsd.jieling.handler; + +import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.MessageTypeProto; +import org.springframework.stereotype.Component; + +@Component +public class GetAllPokemonHandler extends BaseHandler{ + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.GET_ALL_POKEMON_REQUEST; + }; + + @Override + public void process(ISession iSession, PacketNetData netData) throws Exception { + HeroLogic.getInstance().getAllPokemon(iSession); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonAdvancedHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonAdvancedHandler.java new file mode 100644 index 000000000..00d2d8c62 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonAdvancedHandler.java @@ -0,0 +1,24 @@ +package com.ljsd.jieling.handler; + +import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.HeroInfoProto; +import com.ljsd.jieling.protocols.MessageTypeProto; +import org.springframework.stereotype.Component; + +@Component +public class PokemonAdvancedHandler extends BaseHandler{ + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.POKEMON_ADVANCED_REQUEST; + } + + @Override + public void process(ISession iSession, PacketNetData netData) throws Exception { + byte[] bytes = netData.parseClientProtoNetData(); + HeroInfoProto.PokemonAdvancedRequest pokemonAdvancedRequest = HeroInfoProto.PokemonAdvancedRequest.parseFrom(bytes); + int pokemonId = pokemonAdvancedRequest.getPokemonId(); + HeroLogic.getInstance().pokemonAdvanced(iSession,pokemonId); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonComonpentLevelupHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonComonpentLevelupHandler.java new file mode 100644 index 000000000..7d3cfbcda --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/PokemonComonpentLevelupHandler.java @@ -0,0 +1,25 @@ +package com.ljsd.jieling.handler; + +import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.HeroInfoProto; +import com.ljsd.jieling.protocols.MessageTypeProto; +import org.springframework.stereotype.Component; + +@Component +public class PokemonComonpentLevelupHandler extends BaseHandler{ + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_REQUEST; + } + + @Override + public void process(ISession iSession, PacketNetData netData) throws Exception { + byte[] bytes = netData.parseClientProtoNetData(); + HeroInfoProto.PokenmonUpLevelRequest pokenmonUpLevelRequest = HeroInfoProto.PokenmonUpLevelRequest.parseFrom(bytes); + int comonpentId = pokenmonUpLevelRequest.getComonpentId(); + int pokemonId = pokenmonUpLevelRequest.getPokemonId(); + HeroLogic.getInstance().pokenmonUpLevel(iSession,pokemonId,comonpentId); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java index cff6fe8a5..6f0c822cb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Pokemon.java @@ -20,7 +20,7 @@ public class Pokemon extends MongoBase { this.comonpentsLevelMap = new HashMap<>(); } - public void upComonpentLevel(int comonpentId) throws Exception { + public void upOrActiveComonpent(int comonpentId) throws Exception { int level =1; Integer integer = this.comonpentsLevelMap.get(comonpentId); if( integer != null){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java index 347d0abae..65601a822 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java @@ -2,11 +2,15 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import java.util.HashMap; import java.util.Map; public class PokemonManager extends MongoBase { private Map pokemonMap; + public PokemonManager() { + this.pokemonMap = new HashMap<>(); + } public void addPokemon(Pokemon pokemon) throws Exception { updateString("pokemonMap." + pokemon.getId(),pokemon); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index fe9dd1587..852eadf16 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -714,6 +714,29 @@ public class HeroLogic { .build(); MessageUtil.sendMessage(iSession,1,msgId,heroComposeResponse,true); } + public void getAllPokemon(ISession iSession) throws Exception { + int uid = iSession.getUid(); + User user = UserManager.getUser(uid); + PokemonManager pokemonManager = user.getPokemonManager(); + Map pokemonMap = pokemonManager.getPokemonMap(); + + //TODO 测试 + if(pokemonMap.isEmpty()){ + for(SDifferDemonsConfig sDifferDemonsConfig : SDifferDemonsConfig.sDifferDemonsConfigMap.values() ){ + pokemonManager.addPokemon(new Pokemon(sDifferDemonsConfig.getId())); + } + } + List pokemonInfoList = new ArrayList<>(); + + for(Pokemon pokemon : pokemonMap.values()){ + pokemonInfoList.add(CBean2Proto.getPokemon(pokemon)); + } + + + HeroInfoProto.GetAllPokemonResponse build = HeroInfoProto.GetAllPokemonResponse.newBuilder().addAllPokemonInfo(pokemonInfoList).build(); + MessageUtil.sendMessage(iSession,1,MessageTypeProto.MessageType.GET_ALL_POKEMON_RESPONSE_VALUE,build,true); + } + //异妖相关 组件放置升级 public void pokenmonUpLevel(ISession session,int pokemonId,int comonpentId) throws Exception { int uid = session.getUid(); @@ -721,15 +744,29 @@ public class HeroLogic { PokemonManager pokemonManager = user.getPokemonManager(); Pokemon pokemon = pokemonManager.getPokemonMap().get(pokemonId); if(pokemon == null){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_RESPONSE_VALUE,""); return; } Integer oldLevel = pokemon.getComonpentsLevelMap().get(comonpentId); - if (checkPokemonComonpent(pokemonId, comonpentId,oldLevel, user)){ + if( null == oldLevel){ + //消耗组件 + boolean enough = ItemUtil.itemCost(user, new int[][]{{comonpentId, 1}}); + if(!enough){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_RESPONSE_VALUE,""); + return; + } + pokemon.upOrActiveComonpent(comonpentId); + MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_RESPONSE_VALUE,null,true); return; } - pokemon.upComonpentLevel(comonpentId); + if (checkPokemonComonpent(pokemonId, comonpentId,oldLevel, user)){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_RESPONSE_VALUE,""); + return; + } + pokemon.upOrActiveComonpent(comonpentId); //发送成功消息 + MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_RESPONSE_VALUE,null,true); } @@ -740,6 +777,7 @@ public class HeroLogic { PokemonManager pokemonManager = user.getPokemonManager(); Pokemon pokemon = pokemonManager.getPokemonMap().get(pokemonId); if(pokemon == null){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,""); return; } SDifferDemonsConfig sDifferDemonsConfig = SDifferDemonsConfig.getsDifferDemonsConfigByPokenID(pokemonId); @@ -761,13 +799,14 @@ public class HeroLogic { } } if(!isEnough){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,"not match"); return; } pokemon.setAllStage(pokemon.getAllStage()+1); //发送成功消息 - + MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,null,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java index 8e34da69e..7515df1dd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java @@ -54,16 +54,17 @@ public class WorkShopLogic { return; } Map finalMaterial = new HashMap<>(); - finalMaterial.put(materialId,nums); + finalMaterial.put(materialId,nums*sWorkShopFoundationConfig.getNum()); ItemUtil.addItem(user,finalMaterial,null); - //熟练度提升 + //熟练度提升 TODO + int type = sWorkShopFoundationConfig.getType(); int addExp = sWorkShopFoundationConfig.getExp(); user.getPlayerInfoManager().addWorkShopExp(addExp); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,null,true); } - //装备打造 + //装备打造 TODO public void createEquipByUser(ISession session, int equipTid, List runneIdsList) throws Exception { int uid=session.getUid(); User user = UserManager.getUser(uid); 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 8713e04d0..db50c1196 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -103,5 +103,16 @@ public class CBean2Proto { } - + public static CommonProto.PokemonInfo getPokemon(Pokemon pokemon) { + Map comonpentsLevelMap = pokemon.getComonpentsLevelMap(); + List pokemoncomonpentList = new ArrayList<>(); + for(Integer comonpentId : comonpentsLevelMap.keySet()){ + pokemoncomonpentList.add(CommonProto.Pokemoncomonpent.newBuilder().setId(comonpentId).setLevel(comonpentsLevelMap.get(comonpentId)).build()); + } + return CommonProto.PokemonInfo.newBuilder() + .setId(pokemon.getId()) + .setStage(pokemon.getAllStage()) + .addAllPokemoncomonpent(pokemoncomonpentList) + .build(); + } }