From 0a42dfd4d1301c56746eab50a99c19c0eb4bb9db Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 25 Jan 2019 16:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E7=9B=B8=E5=85=B3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/GameSetting.txt | 61 +-- conf/server/HeroConfig.txt | 112 ++-- conf/server/HeroLevelConfig.txt | 498 +++++++++--------- conf/server/HeroRankupConfig.txt | 20 +- conf/server/LotteryRewardConfig.txt | 142 +++-- conf/server/LotterySetting.txt | 4 +- .../java/com/ljsd/jieling/config/SCHero.java | 6 +- .../com/ljsd/jieling/config/SGameSetting.java | 20 +- .../jieling/config/SLotteryRewardConfig.java | 6 +- .../ljsd/jieling/config/SLotterySetting.java | 6 +- .../combat/AdventureRewardHandler.java | 28 + .../combat/AdventureStationHandler.java | 29 + .../combat/GetAdventureStateInfoHandler.java | 22 + .../java/com/ljsd/jieling/logic/dao/Hero.java | 29 +- .../ljsd/jieling/logic/fight/CombatLogic.java | 16 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 30 +- .../network/server/ProtocolsManager.java | 3 +- .../com/ljsd/jieling/util/CBean2Proto.java | 5 +- .../com/ljsd/jieling/util/MessageUtil.java | 1 + 19 files changed, 556 insertions(+), 482 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureRewardHandler.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureStationHandler.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/combat/GetAdventureStateInfoHandler.java diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index 9bed62331..1ee3ac6f2 100644 --- a/conf/server/GameSetting.txt +++ b/conf/server/GameSetting.txt @@ -1,58 +1,3 @@ -Id BornItem SpeedFormula -int mut,int#int,2 mut,int#int,1 -1 2#1000#2|3#1#4 0#0#10#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 -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 -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 -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 -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 -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 -0 null null +Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula +int mut,int#int,2 mut,int#int,1 int int mut,int#int,1 +1 2#1000#2|3#1#4 0#0#10#1 100 2 0#0#10#1 diff --git a/conf/server/HeroConfig.txt b/conf/server/HeroConfig.txt index 6d0826e43..4647ccbf0 100644 --- a/conf/server/HeroConfig.txt +++ b/conf/server/HeroConfig.txt @@ -1,58 +1,54 @@ -Id PiecesId PiecesCount Star Profession PropertyName MaxRank Hp Attack PhysicalDefence MagicDefence Speed RankupConsumeMaterial OpenSkillRules -int int int int int int int float float float float float mut,int#int,2 mut,int#int,2 -10001 11001 50 5 1 1 10 2390 167 275 96 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10002 11002 50 5 5 2 10 2278 165 265 93 158 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10003 11003 50 5 2 3 10 2277 155 259 91 172 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10004 11004 50 5 3 4 10 2263 183 97 278 132 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10005 11005 50 5 4 5 10 2163 170 92 263 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10006 11006 50 5 3 6 10 2159 174 93 265 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10007 11007 50 5 1 2 10 2161 168 91 261 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10008 11008 50 5 5 2 10 2016 208 77 220 132 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10009 11009 50 5 2 2 10 1922 196 74 212 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10010 11010 50 5 3 2 10 1919 202 71 203 132 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10011 11011 50 5 4 2 10 1921 198 71 203 150 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10012 11012 50 5 3 2 10 1768 253 201 70 150 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10013 11013 50 5 1 3 10 1682 244 199 70 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10014 11014 50 5 5 3 10 1676 245 200 70 185 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10015 11015 50 5 2 3 10 1680 245 198 69 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10016 11016 50 5 3 3 10 1507 293 160 56 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10017 11017 50 5 4 3 10 1437 278 157 55 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10018 11018 50 5 3 3 10 1440 285 154 54 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10019 11019 50 5 1 4 10 1440 284 159 56 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10020 11020 50 5 5 4 10 2280 164 256 90 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10021 11021 40 4 2 4 10 1941 133 218 76 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10022 11022 40 4 3 4 10 1630 175 62 178 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10023 11023 40 4 4 4 10 1428 208 161 56 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10024 11024 40 4 3 4 10 1225 237 135 47 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10025 11025 40 4 1 4 10 1831 148 78 223 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10026 11026 40 4 5 4 10 1943 132 223 78 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10027 11027 40 4 2 4 10 1629 169 61 173 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10028 11028 40 4 3 4 10 1431 203 166 58 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10029 11029 40 4 4 4 10 1223 241 136 48 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10030 11030 40 4 3 4 10 1835 140 76 218 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10031 11031 40 4 1 4 10 1940 133 221 77 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10032 11032 40 4 5 4 10 1636 172 61 175 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10033 11033 40 4 2 4 10 1433 209 169 59 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10034 11034 40 4 3 4 10 1222 237 137 48 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10035 11035 40 4 4 4 10 1832 147 76 217 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10036 11036 40 4 3 4 10 1933 137 217 76 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10037 11037 40 4 1 4 10 1630 170 63 180 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10038 11038 40 4 5 4 10 1428 204 169 59 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10039 11039 40 4 2 4 10 1292 235 136 48 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10040 11040 40 4 3 4 10 1945 142 78 224 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10041 11041 40 4 4 4 10 1935 134 225 79 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10042 11042 40 4 3 4 10 1634 172 63 179 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10043 11043 40 4 1 4 10 1943 134 220 77 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10044 11044 40 4 5 4 10 1629 169 61 173 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10045 11045 40 4 2 4 10 1423 200 167 58 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10046 11046 30 3 3 4 10 1222 240 135 47 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10047 11047 30 3 4 4 10 1838 140 79 225 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10048 11048 30 3 3 4 10 1940 138 220 77 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10049 11049 30 3 1 4 10 1627 165 62 176 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10050 11050 30 3 5 4 10 1433 204 169 59 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10051 11051 30 3 2 4 10 1222 233 131 46 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10052 11052 30 3 3 4 10 1834 142 79 225 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10053 11053 30 3 4 4 10 1937 141 224 78 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10054 11054 30 3 3 4 10 1633 167 61 174 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10055 11055 30 3 1 4 10 1516 202 166 58 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 -10056 11056 30 3 5 4 10 1299 235 129 45 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +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 1 10 2390 167 275 96 176 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10002 11002 50 5 5 2 10 2278 165 265 93 158 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10003 11003 50 5 2 3 10 2277 155 259 91 172 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10004 11004 50 5 3 4 10 2263 183 97 278 132 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10005 11005 50 5 4 5 10 2163 170 92 263 176 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10006 11006 50 5 3 6 10 2159 174 93 265 176 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10007 11007 50 5 1 2 10 2161 168 91 261 176 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10008 11008 50 5 5 2 10 2016 208 77 220 132 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10009 11009 50 5 2 2 10 1922 196 74 212 163 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10010 11010 50 5 3 2 10 1919 202 71 203 132 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10011 11011 50 5 4 2 10 1921 198 71 203 150 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10012 11012 50 5 3 2 10 1768 253 201 70 150 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10013 11013 50 5 1 3 10 1682 244 199 70 163 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10014 11014 50 5 5 3 10 1676 245 200 70 185 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10015 11015 50 5 2 3 10 1680 245 198 69 176 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10016 11016 50 5 3 3 10 1507 293 160 56 154 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10017 11017 50 5 4 3 10 1437 278 157 55 154 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10018 11018 50 5 3 3 10 1440 285 154 54 154 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10019 11019 50 5 1 4 10 1440 284 159 56 154 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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10020 11020 50 5 5 4 10 2280 164 256 90 154 10 6#1#3#1|6#2#41#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#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10021 11021 40 5 2 4 10 1941 133 218 76 176 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#22#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10022 11022 40 5 3 4 10 1630 175 62 178 163 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#23#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10023 11023 40 5 4 4 10 1428 208 161 56 194 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#24#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10024 11024 40 4 3 4 10 1225 237 135 47 154 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#25#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10025 11025 40 4 1 4 10 1831 148 78 223 176 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10026 11026 40 4 5 4 10 1943 132 223 78 176 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#27#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10027 11027 40 4 2 4 10 1629 169 61 173 163 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#28#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10028 11028 40 4 3 4 10 1431 203 166 58 194 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10029 11029 40 4 4 4 10 1223 241 136 48 154 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10030 11030 40 4 3 4 10 1835 140 76 218 176 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#31#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10031 11031 40 4 1 4 10 1940 133 221 77 176 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#32#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10032 11032 40 4 5 4 10 1636 172 61 175 163 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#33#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10033 11033 40 4 2 4 10 1433 209 169 59 194 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#34#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10034 11034 40 4 3 4 10 1222 237 137 48 154 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#35#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10035 11035 40 4 4 4 10 1832 147 76 217 176 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10036 11036 40 4 3 4 10 1933 137 217 76 176 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#37#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10037 11037 40 4 1 4 10 1630 170 63 180 163 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10038 11038 40 4 5 4 10 1428 204 169 59 194 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#39#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10039 11039 40 4 2 4 10 1292 235 136 48 154 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10040 11040 40 4 3 4 10 1945 142 78 224 176 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#41#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10041 11041 40 4 4 4 10 1935 134 225 79 176 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#42#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10042 11042 40 4 3 4 10 1634 172 63 179 163 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#43#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10043 11043 40 4 1 4 10 1943 134 220 77 176 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#44#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10044 11044 40 4 5 4 10 1629 169 61 173 163 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10045 11045 40 4 2 4 10 1423 200 167 58 194 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10046 11046 30 4 3 4 10 1222 240 135 47 154 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10047 11047 30 3 4 4 10 1838 140 79 225 176 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10048 11048 30 3 3 4 10 1940 138 220 77 176 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10049 11049 30 3 1 4 10 1627 165 62 176 163 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10050 11050 30 3 5 4 10 1433 204 169 59 194 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10051 11051 30 3 2 4 10 1222 233 131 46 154 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10052 11052 30 3 3 4 10 1834 142 79 225 176 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 diff --git a/conf/server/HeroLevelConfig.txt b/conf/server/HeroLevelConfig.txt index 9110b0183..cf18ed5fa 100644 --- a/conf/server/HeroLevelConfig.txt +++ b/conf/server/HeroLevelConfig.txt @@ -1,252 +1,252 @@ Id Level CharacterLevelPara Consume int int float mut,int#int,2 -1 1 1 2#500|1100#60 -2 2 1 2#600|1100#70 -3 3 1 2#700|1100#80 -4 4 1 2#800|1100#90 -5 5 1 2#900|1100#100 -6 6 1 2#1000|1100#110 -7 7 1 2#1100|1100#120 -8 8 1 2#1200|1100#130 -9 9 1 2#1300|1100#140 -10 10 1 2#1400|1100#150 -11 11 1 2#1500|1100#160 -12 12 1 2#1600|1100#170 -13 13 1 2#1700|1100#180 -14 14 1 2#1800|1100#190 -15 15 1 2#1900|1100#200 -16 16 1 2#2000|1100#210 -17 17 1 2#2100|1100#220 -18 18 1 2#2200|1100#230 -19 19 1 2#2300|1100#240 -20 20 1 2#2400|1100#250 -21 21 1 2#2500|1100#260 -22 22 1 2#2600|1100#270 -23 23 1 2#2700|1100#280 -24 24 1 2#2800|1100#290 -25 25 1 2#2900|1100#300 -26 26 1 2#3000|1100#310 -27 27 2 2#3100|1100#320 -28 28 2 2#3200|1100#330 -29 29 2 2#3300|1100#340 -30 30 2 2#3500|1100#350 -31 31 2 2#3700|1100#360 -32 32 2 2#3900|1100#370 -33 33 2 2#4100|1100#380 -34 34 2 2#4300|1100#390 -35 35 2 2#4500|1100#400 -36 36 2 2#4700|1100#410 -37 37 2 2#4900|1100#420 -38 38 2 2#5100|1100#430 -39 39 2 2#5300|1100#440 -40 40 2 2#5500|1100#450 -41 41 2 2#5700|1100#460 -42 42 2 2#5900|1100#470 -43 43 2 2#6100|1100#480 -44 44 2 2#6300|1100#490 -45 45 2 2#6500|1100#500 -46 46 2 2#6700|1100#510 -47 47 2 2#6900|1100#520 -48 48 2 2#7100|1100#530 -49 49 2 2#7300|1100#540 -50 50 2 2#7500|1100#550 -51 51 2 2#7700|1100#560 -52 52 3 2#7900|1100#570 -53 53 3 2#8100|1100#580 -54 54 3 2#8300|1100#590 -55 55 3 2#8500|1100#600 -56 56 3 2#8700|1100#610 -57 57 3 2#8900|1100#620 -58 58 3 2#9100|1100#630 -59 59 3 2#9300|1100#640 -60 60 3 2#10000|1100#650 -61 61 3 2#10700|1100#660 -62 62 3 2#11400|1100#670 -63 63 3 2#12100|1100#680 -64 64 3 2#12800|1100#690 -65 65 3 2#13500|1100#700 -66 66 3 2#14200|1100#710 -67 67 3 2#14900|1100#720 -68 68 3 2#15600|1100#730 -69 69 3 2#16300|1100#740 -70 70 3 2#17000|1100#750 -71 71 3 2#17700|1100#760 -72 72 3 2#18400|1100#770 -73 73 3 2#19100|1100#780 -74 74 3 2#19800|1100#790 -75 75 3 2#20500|1100#800 -76 76 3 2#21200|1100#810 -77 77 3 2#21900|1100#820 -78 78 4 2#22600|1100#830 -79 79 4 2#23300|1100#840 -80 80 4 2#24000|1100#850 -81 81 4 2#24700|1100#860 -82 82 4 2#25400|1100#870 -83 83 4 2#26100|1100#880 -84 84 4 2#26800|1100#890 -85 85 4 2#27500|1100#900 -86 86 4 2#28200|1100#910 -87 87 4 2#28900|1100#920 -88 88 4 2#29600|1100#930 -89 89 4 2#30300|1100#940 -90 90 4 2#31000|1100#950 -91 91 4 2#31700|1100#960 -92 92 4 2#32400|1100#970 -93 93 4 2#33100|1100#980 -94 94 4 2#33800|1100#990 -95 95 4 2#34500|1100#1000 -96 96 4 2#35200|1100#1010 -97 97 4 2#35900|1100#1020 -98 98 4 2#36600|1100#1030 -99 99 4 2#37300|1100#1040 -100 100 5 2#38000|1100#1140 -101 101 5 2#39000|1100#1240 -102 102 5 2#40000|1100#1340 -103 103 5 2#41000|1100#1440 -104 104 5 2#42000|1100#1540 -105 105 6 2#43000|1100#1640 -106 106 6 2#44000|1100#1740 -107 107 6 2#45000|1100#1840 -108 108 6 2#46000|1100#1940 -109 109 6 2#47000|1100#2040 -110 110 7 2#48000|1100#2140 -111 111 7 2#49000|1100#2240 -112 112 7 2#50000|1100#2340 -113 113 7 2#51000|1100#2440 -114 114 7 2#52000|1100#2540 -115 115 8 2#53000|1100#2640 -116 116 8 2#54000|1100#2740 -117 117 8 2#55000|1100#2840 -118 118 8 2#56000|1100#2940 -119 119 8 2#57000|1100#3040 -120 120 9 2#58000|1100#3140 -121 121 9 2#59000|1100#3240 -122 122 9 2#60000|1100#3340 -123 123 9 2#61000|1100#3440 -124 124 9 2#62000|1100#3540 -125 125 10 2#63000|1100#3640 -126 126 10 2#64000|1100#3740 -127 127 10 2#65000|1100#3840 -128 128 10 2#66000|1100#3940 -129 129 10 2#67000|1100#4040 -130 130 11 2#68000|1100#4140 -131 131 11 2#69000|1100#4240 -132 132 11 2#70000|1100#4340 -133 133 11 2#71000|1100#4440 -134 134 11 2#72000|1100#4540 -135 135 12 2#73000|1100#4640 -136 136 12 2#74000|1100#4740 -137 137 12 2#75000|1100#4840 -138 138 12 2#76000|1100#4940 -139 139 12 2#77000|1100#5040 -140 140 13 2#80000|1100#5340 -141 141 13 2#83000|1100#5640 -142 142 13 2#86000|1100#5940 -143 143 13 2#89000|1100#6240 -144 144 13 2#92000|1100#6540 -145 145 13 2#95000|1100#6840 -146 146 13 2#98000|1100#7140 -147 147 14 2#101000|1100#7440 -148 148 14 2#104000|1100#7740 -149 149 14 2#107000|1100#8040 -150 150 14 2#110000|1100#8340 -151 151 14 2#113000|1100#8640 -152 152 14 2#116000|1100#8940 -153 153 15 2#119000|1100#9240 -154 154 15 2#122000|1100#9540 -155 155 15 2#125000|1100#9840 -156 156 15 2#128000|1100#10140 -157 157 15 2#131000|1100#10440 -158 158 15 2#134000|1100#10740 -159 159 16 2#137000|1100#11040 -160 160 16 2#140000|1100#11340 -161 161 16 2#145000|1100#11640 -162 162 16 2#150000|1100#11940 -163 163 16 2#155000|1100#12240 -164 164 16 2#160000|1100#12540 -165 165 17 2#165000|1100#12840 -166 166 17 2#170000|1100#13140 -167 167 17 2#175000|1100#13440 -168 168 17 2#180000|1100#13740 -169 169 17 2#185000|1100#14040 -170 170 17 2#190000|1100#14340 -171 171 18 2#195000|1100#14640 -172 172 18 2#200000|1100#14940 -173 173 18 2#205000|1100#15240 -174 174 18 2#210000|1100#15540 -175 175 18 2#215000|1100#15840 -176 176 18 2#220000|1100#16140 -177 177 19 2#225000|1100#16440 -178 178 19 2#230000|1100#16740 -179 179 19 2#235000|1100#17040 -180 180 19 2#240000|1100#17340 -181 181 19 2#245000|1100#17640 -182 182 19 2#250000|1100#17940 -183 183 20 2#255000|1100#18240 -184 184 20 2#260000|1100#18540 -185 185 20 2#265000|1100#18840 -186 186 20 2#270000|1100#19140 -187 187 20 2#275000|1100#19440 -188 188 20 2#280000|1100#19740 -189 189 21 2#285000|1100#20040 -190 190 21 2#290000|1100#20340 -191 191 21 2#295000|1100#20640 -192 192 21 2#300000|1100#20940 -193 193 21 2#305000|1100#21240 -194 194 21 2#310000|1100#21540 -195 195 22 2#315000|1100#21840 -196 196 22 2#320000|1100#22140 -197 197 22 2#325000|1100#22440 -198 198 22 2#330000|1100#22740 -199 199 22 2#335000|1100#22980 -200 200 22 2#340000|1100#23580 -201 201 22 2#345000|1100#24180 -202 202 23 2#350000|1100#24780 -203 203 23 2#355000|1100#25380 -204 204 23 2#360000|1100#25980 -205 205 23 2#365000|1100#26580 -206 206 23 2#370000|1100#27180 -207 207 23 2#375000|1100#27780 -208 208 24 2#380000|1100#28380 -209 209 24 2#385000|1100#28980 -210 210 24 2#390000|1100#29580 -211 211 24 2#395000|1100#30180 -212 212 24 2#400000|1100#30780 -213 213 24 2#405000|1100#31380 -214 214 25 2#410000|1100#31980 -215 215 25 2#415000|1100#32580 -216 216 25 2#420000|1100#33180 -217 217 25 2#425000|1100#33780 -218 218 25 2#430000|1100#34380 -219 219 25 2#435000|1100#34980 -220 220 26 2#440000|1100#35580 -221 221 26 2#445000|1100#36180 -222 222 26 2#450000|1100#36780 -223 223 26 2#455000|1100#37380 -224 224 26 2#460000|1100#37980 -225 225 26 2#465000|1100#38580 -226 226 27 2#470000|1100#39180 -227 227 27 2#475000|1100#39780 -228 228 27 2#480000|1100#40380 -229 229 27 2#485000|1100#40980 -230 230 27 2#490000|1100#41580 -231 231 27 2#495000|1100#42180 -232 232 28 2#500000|1100#42780 -233 233 28 2#505000|1100#43380 -234 234 28 2#510000|1100#43980 -235 235 28 2#515000|1100#44580 -236 236 28 2#520000|1100#45180 -237 237 28 2#525000|1100#45780 -238 238 29 2#530000|1100#46380 -239 239 29 2#535000|1100#46980 -240 240 29 2#540000|1100#47580 -241 241 29 2#545000|1100#48180 -242 242 29 2#550000|1100#48780 -243 243 29 2#555000|1100#49380 -244 244 30 2#560000|1100#49980 -245 245 30 2#565000|1100#50580 -246 246 30 2#570000|1100#51180 -247 247 30 2#575000|1100#51780 -248 248 30 2#580000|1100#52380 -249 249 30 2#585000|1100#52980 +1 1 1 14#500|4#60 +2 2 1 14#600|4#70 +3 3 1 14#700|4#80 +4 4 1 14#800|4#90 +5 5 1 14#900|4#100 +6 6 1 14#1000|4#110 +7 7 1 14#1100|4#120 +8 8 1 14#1200|4#130 +9 9 1 14#1300|4#140 +10 10 1 14#1400|4#150 +11 11 1 14#1500|4#160 +12 12 1 14#1600|4#170 +13 13 1 14#1700|4#180 +14 14 1 14#1800|4#190 +15 15 1 14#1900|4#200 +16 16 1 14#2000|4#210 +17 17 1 14#2100|4#220 +18 18 1 14#2200|4#230 +19 19 1 14#2300|4#240 +20 20 1 14#2400|4#250 +21 21 1 14#2500|4#260 +22 22 1 14#2600|4#270 +23 23 1 14#2700|4#280 +24 24 1 14#2800|4#290 +25 25 1 14#2900|4#300 +26 26 1 14#3000|4#310 +27 27 2 14#3100|4#320 +28 28 2 14#3200|4#330 +29 29 2 14#3300|4#340 +30 30 2 14#3500|4#350 +31 31 2 14#3700|4#360 +32 32 2 14#3900|4#370 +33 33 2 14#4100|4#380 +34 34 2 14#4300|4#390 +35 35 2 14#4500|4#400 +36 36 2 14#4700|4#410 +37 37 2 14#4900|4#420 +38 38 2 14#5100|4#430 +39 39 2 14#5300|4#440 +40 40 2 14#5500|4#450 +41 41 2 14#5700|4#460 +42 42 2 14#5900|4#470 +43 43 2 14#6100|4#480 +44 44 2 14#6300|4#490 +45 45 2 14#6500|4#500 +46 46 2 14#6700|4#510 +47 47 2 14#6900|4#520 +48 48 2 14#7100|4#530 +49 49 2 14#7300|4#540 +50 50 2 14#7500|4#550 +51 51 2 14#7700|4#560 +52 52 3 14#7900|4#570 +53 53 3 14#8100|4#580 +54 54 3 14#8300|4#590 +55 55 3 14#8500|4#600 +56 56 3 14#8700|4#610 +57 57 3 14#8900|4#620 +58 58 3 14#9100|4#630 +59 59 3 14#9300|4#640 +60 60 3 14#10000|4#650 +61 61 3 14#10700|4#660 +62 62 3 14#11400|4#670 +63 63 3 14#12100|4#680 +64 64 3 14#12800|4#690 +65 65 3 14#13500|4#700 +66 66 3 14#14200|4#710 +67 67 3 14#14900|4#720 +68 68 3 14#15600|4#730 +69 69 3 14#16300|4#740 +70 70 3 14#17000|4#750 +71 71 3 14#17700|4#760 +72 72 3 14#18400|4#770 +73 73 3 14#19100|4#780 +74 74 3 14#19800|4#790 +75 75 3 14#20500|4#800 +76 76 3 14#21200|4#810 +77 77 3 14#21900|4#820 +78 78 4 14#22600|4#830 +79 79 4 14#23300|4#840 +80 80 4 14#24000|4#850 +81 81 4 14#24700|4#860 +82 82 4 14#25400|4#870 +83 83 4 14#26100|4#880 +84 84 4 14#26800|4#890 +85 85 4 14#27500|4#900 +86 86 4 14#28200|4#910 +87 87 4 14#28900|4#920 +88 88 4 14#29600|4#930 +89 89 4 14#30300|4#940 +90 90 4 14#31000|4#950 +91 91 4 14#31700|4#960 +92 92 4 14#32400|4#970 +93 93 4 14#33100|4#980 +94 94 4 14#33800|4#990 +95 95 4 14#34500|4#1000 +96 96 4 14#35200|4#1010 +97 97 4 14#35900|4#1020 +98 98 4 14#36600|4#1030 +99 99 4 14#37300|4#1040 +100 100 5 14#38000|4#1140 +101 101 5 14#39000|4#1240 +102 102 5 14#40000|4#1340 +103 103 5 14#41000|4#1440 +104 104 5 14#42000|4#1540 +105 105 6 14#43000|4#1640 +106 106 6 14#44000|4#1740 +107 107 6 14#45000|4#1840 +108 108 6 14#46000|4#1940 +109 109 6 14#47000|4#2040 +110 110 7 14#48000|4#2140 +111 111 7 14#49000|4#2240 +112 112 7 14#50000|4#2340 +113 113 7 14#51000|4#2440 +114 114 7 14#52000|4#2540 +115 115 8 14#53000|4#2640 +116 116 8 14#54000|4#2740 +117 117 8 14#55000|4#2840 +118 118 8 14#56000|4#2940 +119 119 8 14#57000|4#3040 +120 120 9 14#58000|4#3140 +121 121 9 14#59000|4#3240 +122 122 9 14#60000|4#3340 +123 123 9 14#61000|4#3440 +124 124 9 14#62000|4#3540 +125 125 10 14#63000|4#3640 +126 126 10 14#64000|4#3740 +127 127 10 14#65000|4#3840 +128 128 10 14#66000|4#3940 +129 129 10 14#67000|4#4040 +130 130 11 14#68000|4#4140 +131 131 11 14#69000|4#4240 +132 132 11 14#70000|4#4340 +133 133 11 14#71000|4#4440 +134 134 11 14#72000|4#4540 +135 135 12 14#73000|4#4640 +136 136 12 14#74000|4#4740 +137 137 12 14#75000|4#4840 +138 138 12 14#76000|4#4940 +139 139 12 14#77000|4#5040 +140 140 13 14#80000|4#5340 +141 141 13 14#83000|4#5640 +142 142 13 14#86000|4#5940 +143 143 13 14#89000|4#6240 +144 144 13 14#92000|4#6540 +145 145 13 14#95000|4#6840 +146 146 13 14#98000|4#7140 +147 147 14 14#101000|4#7440 +148 148 14 14#104000|4#7740 +149 149 14 14#107000|4#8040 +150 150 14 14#110000|4#8340 +151 151 14 14#113000|4#8640 +152 152 14 14#116000|4#8940 +153 153 15 14#119000|4#9240 +154 154 15 14#122000|4#9540 +155 155 15 14#125000|4#9840 +156 156 15 14#128000|4#10140 +157 157 15 14#131000|4#10440 +158 158 15 14#134000|4#10740 +159 159 16 14#137000|4#11040 +160 160 16 14#140000|4#11340 +161 161 16 14#145000|4#11640 +162 162 16 14#150000|4#11940 +163 163 16 14#155000|4#12240 +164 164 16 14#160000|4#12540 +165 165 17 14#165000|4#12840 +166 166 17 14#170000|4#13140 +167 167 17 14#175000|4#13440 +168 168 17 14#180000|4#13740 +169 169 17 14#185000|4#14040 +170 170 17 14#190000|4#14340 +171 171 18 14#195000|4#14640 +172 172 18 14#200000|4#14940 +173 173 18 14#205000|4#15240 +174 174 18 14#210000|4#15540 +175 175 18 14#215000|4#15840 +176 176 18 14#220000|4#16140 +177 177 19 14#225000|4#16440 +178 178 19 14#230000|4#16740 +179 179 19 14#235000|4#17040 +180 180 19 14#240000|4#17340 +181 181 19 14#245000|4#17640 +182 182 19 14#250000|4#17940 +183 183 20 14#255000|4#18240 +184 184 20 14#260000|4#18540 +185 185 20 14#265000|4#18840 +186 186 20 14#270000|4#19140 +187 187 20 14#275000|4#19440 +188 188 20 14#280000|4#19740 +189 189 21 14#285000|4#20040 +190 190 21 14#290000|4#20340 +191 191 21 14#295000|4#20640 +192 192 21 14#300000|4#20940 +193 193 21 14#305000|4#21240 +194 194 21 14#310000|4#21540 +195 195 22 14#315000|4#21840 +196 196 22 14#320000|4#22140 +197 197 22 14#325000|4#22440 +198 198 22 14#330000|4#22740 +199 199 22 14#335000|4#22980 +200 200 22 14#340000|4#23580 +201 201 22 14#345000|4#24180 +202 202 23 14#350000|4#24780 +203 203 23 14#355000|4#25380 +204 204 23 14#360000|4#25980 +205 205 23 14#365000|4#26580 +206 206 23 14#370000|4#27180 +207 207 23 14#375000|4#27780 +208 208 24 14#380000|4#28380 +209 209 24 14#385000|4#28980 +210 210 24 14#390000|4#29580 +211 211 24 14#395000|4#30180 +212 212 24 14#400000|4#30780 +213 213 24 14#405000|4#31380 +214 214 25 14#410000|4#31980 +215 215 25 14#415000|4#32580 +216 216 25 14#420000|4#33180 +217 217 25 14#425000|4#33780 +218 218 25 14#430000|4#34380 +219 219 25 14#435000|4#34980 +220 220 26 14#440000|4#35580 +221 221 26 14#445000|4#36180 +222 222 26 14#450000|4#36780 +223 223 26 14#455000|4#37380 +224 224 26 14#460000|4#37980 +225 225 26 14#465000|4#38580 +226 226 27 14#470000|4#39180 +227 227 27 14#475000|4#39780 +228 228 27 14#480000|4#40380 +229 229 27 14#485000|4#40980 +230 230 27 14#490000|4#41580 +231 231 27 14#495000|4#42180 +232 232 28 14#500000|4#42780 +233 233 28 14#505000|4#43380 +234 234 28 14#510000|4#43980 +235 235 28 14#515000|4#44580 +236 236 28 14#520000|4#45180 +237 237 28 14#525000|4#45780 +238 238 29 14#530000|4#46380 +239 239 29 14#535000|4#46980 +240 240 29 14#540000|4#47580 +241 241 29 14#545000|4#48180 +242 242 29 14#550000|4#48780 +243 243 29 14#555000|4#49380 +244 244 30 14#560000|4#49980 +245 245 30 14#565000|4#50580 +246 246 30 14#570000|4#51180 +247 247 30 14#575000|4#51780 +248 248 30 14#580000|4#52380 +249 249 30 14#585000|4#52980 250 250 31 null diff --git a/conf/server/HeroRankupConfig.txt b/conf/server/HeroRankupConfig.txt index 9088f80f2..e6d5cea14 100644 --- a/conf/server/HeroRankupConfig.txt +++ b/conf/server/HeroRankupConfig.txt @@ -1,12 +1,12 @@ Id Type RankupPara LimitLevel OpenLevel LimitStar OpenStar ConsumeMaterial int int float int int int int mut,int#int,2 -1 1 2000 30 40 3 3 2#10000|1101#20 -2 1 5000 40 50 3 3 2#20000|1101#40 -3 1 9000 50 60 3 3 2#30000|1101#100 -4 1 14000 60 80 4 4 2#30000|1101#300 -5 1 20000 80 100 5 5 2#70000|1101#1000 -6 1 60000 100 140 5 6 2#120000|1101#0 -7 2 2000 140 160 6 7 2#0|1101#2000 -8 2 4000 160 180 7 8 2#0|1101#3000 -9 2 7000 180 200 8 9 2#0|1101#4000 -10 2 10000 200 250 9 10 2#0|1101#10000 +1 1 2000 30 40 3 3 14#10000|4#20 +2 1 5000 40 50 3 3 14#20000|4#40 +3 1 9000 50 60 3 3 14#30000|4#100 +4 1 14000 60 80 4 4 14#30000|4#300 +5 1 20000 80 100 5 5 14#70000|4#1000 +6 1 60000 100 140 5 6 14#120000|4#0 +7 2 2000 140 160 6 7 14#0|4#2000 +8 2 4000 160 180 7 8 14#0|4#3000 +9 2 7000 180 200 8 9 14#0|4#4000 +10 2 10000 200 250 9 10 14#0|4#10000 diff --git a/conf/server/LotteryRewardConfig.txt b/conf/server/LotteryRewardConfig.txt index 53d8fa0f3..ab230d4b5 100644 --- a/conf/server/LotteryRewardConfig.txt +++ b/conf/server/LotteryRewardConfig.txt @@ -1,73 +1,69 @@ -Id Reward ItemName Pool Weight -int mut,int#int,1 string int int -2 10002#1 角色2 1 11 -3 10003#1 角色3 1 11 -4 10004#1 角色4 1 8 -5 10005#1 角色5 1 11 -6 10006#1 角色6 1 11 -7 10007#1 角色7 1 11 -8 10008#1 角色8 1 8 -9 10009#1 角色9 1 11 -10 10010#1 角色10 1 5 -11 10011#1 角色11 1 11 -12 10012#1 角色12 1 8 -13 10013#1 角色13 1 11 -14 10014#1 角色14 1 5 -15 10015#1 角色15 1 11 -16 10016#1 角色16 1 8 -17 10017#1 角色17 1 11 -18 10018#1 角色18 1 5 -19 10019#1 角色19 1 5 -20 10020#1 角色20 1 11 -21 10021#1 角色21 1 95 -22 10022#1 角色22 1 95 -23 10023#1 角色23 1 95 -24 10024#1 角色24 1 95 -25 10025#1 角色25 1 95 -26 10026#1 角色26 1 95 -27 10027#1 角色27 1 95 -28 10028#1 角色28 1 95 -29 10029#1 角色29 1 95 -30 10030#1 角色30 1 95 -31 10031#1 角色31 1 95 -32 10032#1 角色32 1 95 -33 10033#1 角色33 1 95 -34 10034#1 角色34 1 95 -35 10035#1 角色35 1 95 -36 10036#1 角色36 1 95 -37 10037#1 角色37 1 95 -38 10038#1 角色38 1 95 -39 10039#1 角色39 1 47 -40 10040#1 角色40 1 47 -41 10041#1 角色41 1 95 -42 10042#1 角色42 1 95 -43 10043#1 角色43 1 600 -44 10044#1 角色44 1 600 -45 10045#1 角色45 1 600 -46 10046#1 角色46 1 600 -47 10047#1 角色47 1 600 -48 10048#1 角色48 1 600 -49 10049#1 角色49 1 600 -50 10050#1 角色50 1 600 -51 10051#1 角色51 1 600 -52 10052#1 角色52 1 600 -53 10053#1 角色53 1 600 -54 10054#1 角色54 1 600 -55 10055#1 角色55 1 300 -56 10056#1 角色56 1 300 -57 10035#1 角色35 11 100 -58 10036#1 角色36 11 100 -59 10037#1 角色37 11 100 -60 10038#1 角色38 11 100 -61 10031#1 角色31 12 100 -62 10032#1 角色32 12 100 -63 10033#1 角色33 12 100 -64 10034#1 角色34 12 100 -65 10026#1 角色26 13 100 -66 10027#1 角色27 13 100 -67 10028#1 角色28 13 100 -68 10029#1 角色29 13 100 -69 10021#1 角色21 14 100 -70 10022#1 角色22 14 100 -71 10023#1 角色23 14 100 -72 10024#1 角色24 14 100 +Id Reward ItemName Pool Weight OpenRules +int mut,int#int,1 string int int int,int#int,1 +2 10002#1 角色2 1 11 null +3 10003#1 角色3 1 11 null +4 10004#1 角色4 1 8 null +5 10005#1 角色5 1 11 null +6 10006#1 角色6 1 11 null +7 10007#1 角色7 1 11 null +8 10008#1 角色8 1 8 null +9 10009#1 角色9 1 11 null +10 10010#1 角色10 1 5 null +11 10011#1 角色11 1 11 null +12 10012#1 角色12 1 8 null +13 10013#1 角色13 1 11 null +14 10014#1 角色14 1 5 null +15 10015#1 角色15 1 11 null +16 10016#1 角色16 1 8 null +17 10017#1 角色17 1 11 null +18 10018#1 角色18 1 5 null +19 10019#1 角色19 1 5 null +20 10020#1 角色20 1 11 null +21 10021#1 角色21 1 95 null +22 10022#1 角色22 1 95 null +23 10023#1 角色23 1 95 null +24 10024#1 角色24 1 95 null +25 10025#1 角色25 1 95 null +26 10026#1 角色26 1 95 null +27 10027#1 角色27 1 95 null +28 10028#1 角色28 1 95 null +29 10029#1 角色29 1 95 null +30 10030#1 角色30 1 95 null +31 10031#1 角色31 1 95 null +32 10032#1 角色32 1 95 null +33 10033#1 角色33 1 95 null +34 10034#1 角色34 1 95 null +35 10035#1 角色35 1 95 null +36 10036#1 角色36 1 95 null +37 10037#1 角色37 1 95 null +38 10038#1 角色38 1 95 null +39 10039#1 角色39 1 47 null +40 10040#1 角色40 1 47 null +41 10041#1 角色41 1 95 null +42 10042#1 角色42 1 95 null +43 10043#1 角色43 1 600 null +44 10044#1 角色44 1 600 null +45 10045#1 角色45 1 600 null +46 10046#1 角色46 1 600 null +47 10047#1 角色47 1 600 null +48 10048#1 角色48 1 600 null +49 10049#1 角色49 1 600 null +50 10050#1 角色50 1 600 null +51 10051#1 角色51 1 600 null +52 10052#1 角色52 1 600 null +57 10035#1 角色35 11 100 null +58 10036#1 角色36 11 100 null +59 10037#1 角色37 11 100 null +60 10038#1 角色38 11 100 null +61 10031#1 角色31 12 100 null +62 10032#1 角色32 12 100 null +63 10033#1 角色33 12 100 null +64 10034#1 角色34 12 100 null +65 10026#1 角色26 13 100 null +66 10027#1 角色27 13 100 null +67 10028#1 角色28 13 100 null +68 10029#1 角色29 13 100 null +69 10021#1 角色21 14 100 null +70 10022#1 角色22 14 100 null +71 10023#1 角色23 14 100 null +72 10024#1 角色24 14 100 null diff --git a/conf/server/LotterySetting.txt b/conf/server/LotterySetting.txt index 7bf13e63d..60cbe0c8b 100644 --- a/conf/server/LotterySetting.txt +++ b/conf/server/LotterySetting.txt @@ -1,6 +1,6 @@ Id OrderBoxOpenTime OrderBoxContinue OrderBoxInterval OrderBoxPool DiamondBoxInterval Cost GetHerosInterval DiamondBoxContain TenTimesMustGetItem PerCount -int int int int mut,int#int,1 int mut,int#int,1 int mut,int#int,2 mut,int#int,1 int +int int int int mut,int#int,1 int mut,int#int,1 int mut,int#int,2 mut,int#int,2 int 1 56 48 120 11#12#13#14 0 3#10 0 null null 10 2 56 48 120 11#12#13#14 0 3#1 0 null null 1 11 0 0 0 null 0 220 150 1#100 3#1 10 -12 0 0 0 null 2160.0 2200 0 1#100 null 1 +12 0 0 0 null 2160 2200 0 1#100 null 1 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java index 8288bdf2d..5624bf2e4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java @@ -37,7 +37,7 @@ public class SCHero implements BaseConfig{ private float speed; //速度 - private int[][] skillId; + private int actionPower; private int[][] rankupConsumeMaterial; @@ -169,8 +169,8 @@ public class SCHero implements BaseConfig{ return propertyName; } - public int[][] getSkillId() { - return skillId; + public int getActionPower() { + return actionPower; } public int[][] getRankupConsumeMaterial() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java index d2baee9f1..ca9f197b6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java @@ -14,6 +14,12 @@ public class SGameSetting implements BaseConfig { private int[] speedFormula; + private int initialEnergy; + + private int energyRecoverSpeed; + + private int[] actionPowerRormula; + private static SGameSetting gameSetting; @@ -42,7 +48,19 @@ public class SGameSetting implements BaseConfig { return speedFormula; } - public float calSpeed(float speed,int level){ + public int getInitialEnergy() { + return initialEnergy; + } + + public int getEnergyRecoverSpeed() { + return energyRecoverSpeed; + } + + public int[] getActionPowerRormula() { + return actionPowerRormula; + } + + public float calSpeed(float speed, int level){ float result = speed; int length = speedFormula.length; for(int i=0;i< speedFormula.length;i++){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SLotteryRewardConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SLotteryRewardConfig.java index 215710e26..8b01c70b8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SLotteryRewardConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SLotteryRewardConfig.java @@ -21,6 +21,8 @@ public class SLotteryRewardConfig implements BaseConfig { private int weight; + private int[] openRules; + private static Map> sLotteryRewardConfigsByPoolId; private static Map sLotteryRewardWeightByPoolId; @@ -78,5 +80,7 @@ public class SLotteryRewardConfig implements BaseConfig { return weight; } - + public int[] getOpenRules() { + return openRules; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java index 7d11dc42a..4413df164 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java @@ -26,7 +26,7 @@ public class SLotterySetting implements BaseConfig { private int[][] diamondBoxContain; - private int[] tenTimesMustGetItem; + private int[][] tenTimesMustGetItem; private int perCount; @@ -81,11 +81,11 @@ public class SLotterySetting implements BaseConfig { return diamondBoxContain; } - public int[] getTenTimesMustGetItem() { + public int[][] getTenTimesMustGetItem() { return tenTimesMustGetItem; } - public int getPerCount() { + public int getPerCount() { return perCount; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureRewardHandler.java new file mode 100644 index 000000000..c4d60186d --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureRewardHandler.java @@ -0,0 +1,28 @@ +package com.ljsd.jieling.handler.combat; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.fight.CombatLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.FightInfoProto; +import com.ljsd.jieling.protocols.MessageTypeProto; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +public class AdventureRewardHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.ADVENTURE_REWARD_REQUEST; + } + + @Override + public void process(ISession iSession, PacketNetData netData) throws Exception { + byte[] bytes = netData.parseClientProtoNetData(); + FightInfoProto.TakeAventureRewardRequest takeAventureRewardRequest = FightInfoProto.TakeAventureRewardRequest.parseFrom(bytes); + int position = takeAventureRewardRequest.getPosition(); + CombatLogic.getInstance().clearStation(iSession,position); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureStationHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureStationHandler.java new file mode 100644 index 000000000..5412e846f --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/AdventureStationHandler.java @@ -0,0 +1,29 @@ +package com.ljsd.jieling.handler.combat; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.fight.CombatLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.FightInfoProto; +import com.ljsd.jieling.protocols.MessageTypeProto; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class AdventureStationHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.ADVENTURE_STATION_REQUEST; + } + + @Override + public void process(ISession iSession, PacketNetData netData) throws Exception { + byte[] bytes = netData.parseClientProtoNetData(); + FightInfoProto.AventureStationRequest aventureStationRequest = FightInfoProto.AventureStationRequest.parseFrom(bytes); + int position = aventureStationRequest.getPosition(); + List heroIdListList = aventureStationRequest.getHeroIdListList(); + int hourDuration = aventureStationRequest.getHourDuration(); + CombatLogic.getInstance().adventureStation(iSession,position,heroIdListList,hourDuration); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/GetAdventureStateInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/GetAdventureStateInfoHandler.java new file mode 100644 index 000000000..d7c6288de --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/combat/GetAdventureStateInfoHandler.java @@ -0,0 +1,22 @@ +package com.ljsd.jieling.handler.combat; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.fight.CombatLogic; +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 GetAdventureStateInfoHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.GET_ADVENTURE_INFO_REQUEST; + } + + @Override + public void process(ISession iSession, PacketNetData netData) throws Exception { + CombatLogic.getInstance().getAdventureStateInfo(iSession); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 58134d95b..d137da698 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; import com.ljsd.jieling.config.SCHero; +import com.ljsd.jieling.config.SGameSetting; import com.ljsd.jieling.config.SHeroLevlConfig; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.util.KeyGenUtils; @@ -24,6 +25,14 @@ public class Hero extends MongoBase { private List equipList; + private int breakId; + + private int energy; + + private int createTime ; + + private int lastUpdateEnergyTime; + public Hero(){} public Hero(String uid,int heroTid){ @@ -31,18 +40,22 @@ public class Hero extends MongoBase { SCHero scHero = SCHero.getsCHero().get(heroTid); this.templateId = scHero.getId(); this.level = 1; - this.star = 1; + this.star = scHero.getStar(); this.skillList = new ArrayList<>(); this.equipList = new ArrayList<>(); List skillIds = scHero.getSkillListByStar().get(star); if(skillIds!=null && skillIds.isEmpty()){ this.skillList.addAll(skillIds); } - + createTime = (int)(System.currentTimeMillis()/1000); + lastUpdateEnergyTime = createTime; + breakId = 0; + energy = SGameSetting.getGameSetting().getInitialEnergy(); } public void upStar(int upStar) throws Exception { SCHero scHero = SCHero.getsCHero().get(templateId); + this.star += upStar; List skillIds = scHero.getSkillListByStar().get(star); if(skillIds!=null && skillIds.isEmpty()){ if(this.skillList!=null){ @@ -52,7 +65,6 @@ public class Hero extends MongoBase { } this.skillList.addAll(skillIds); } - this.star += upStar; updateString("star",star); updateString("skillList",skillList); } @@ -108,9 +120,16 @@ public class Hero extends MongoBase { this.equipList = equipList; } - - public List getEquipList() { return equipList; } + + public int getBreakId() { + return breakId; + } + + public void setBreakId(int breakId) throws Exception { + updateString("breakId",breakId); + this.breakId = breakId; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 31eb6f78b..7ab486587 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -3,14 +3,15 @@ package com.ljsd.jieling.logic.fight; import com.ljsd.jieling.config.SAdventureConfig; import com.ljsd.jieling.config.SAdventureSetting; -import com.ljsd.jieling.config.SCHero; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.FightInfoProto; +import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.ItemUtil; +import com.ljsd.jieling.util.MessageUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,9 +41,8 @@ public class CombatLogic { for(AdventureStateInfo adventureStateInfo : adventureStateInfoMap.values()){ result.add(CBean2Proto.getAdventureStateInfo(adventureStateInfo)); } - FightInfoProto.GetAdventureStateInfoResponse response = FightInfoProto.GetAdventureStateInfoResponse.newBuilder().addAllAdventureStateInfoList(result).build(); - + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ADVENTURE_INFO_RESPONSE_VALUE,response,true); } @@ -61,7 +61,6 @@ public class CombatLogic { return; } - AdventureManager adventureManager = user.getAdventureManager(); //检验 Map adventureStateInfoMap = adventureManager.getAdventureStateInfoMap(); @@ -80,14 +79,10 @@ public class CombatLogic { } } - - - - - adventureManager.station(new AdventureStateInfo(position,heroIds,(int)(System.currentTimeMillis()),hourDuration)); //发送成功 + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,null,true); } @@ -152,12 +147,13 @@ public class CombatLogic { CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropInfoMap); - //清除占领 adventureManager.clearStation(position); + FightInfoProto.TakeAventureRewardResponse response = FightInfoProto.TakeAventureRewardResponse.newBuilder().setDrop(drop).build(); //发送成功 + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_REWARD_RESPONSE_VALUE,response,true); } public float calRatio(float value,float[][] base){ 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 18aa5e0d8..d14ce1072 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 @@ -153,11 +153,15 @@ public class HeroLogic { } public String extraReward(SLotterySetting sLotterySetting){ + StringBuilder sb = new StringBuilder(); if(sLotterySetting.getTenTimesMustGetItem()!=null &&sLotterySetting.getTenTimesMustGetItem().length>0){ - int[] tenTimesMustGetItem = sLotterySetting.getTenTimesMustGetItem(); - return tenTimesMustGetItem[0] + "#" + tenTimesMustGetItem[1]; + int[][] tenTimesMustGetItem = sLotterySetting.getTenTimesMustGetItem(); + for(int i=0;i heroIds ,List pokemonoIds) throws Exception { @@ -209,9 +213,17 @@ public class HeroLogic { SCHeroRankUpConfig scHeroRankUpConfig = scHeroRankUpConfigByType.get(oldLevel); boolean isBreak =false; int[][] consume; - if(scHeroRankUpConfig!=null){ + int breakId = hero.getBreakId(); + if(scHeroRankUpConfig!=null ){ + if(hero.getStar() < scHeroRankUpConfig.getLimitStar()){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level"); + return; + } + } + if(scHeroRankUpConfig!=null && breakId!=scHeroRankUpConfig.getId()){ isBreak =true; consume = scHeroRankUpConfig.getConsumeMaterial(); + breakId = scHeroRankUpConfig.getId(); }else{ SHeroLevlConfig sHeroLevlConfig = SHeroLevlConfig.getsCHero().get(oldLevel); consume = sHeroLevlConfig.getConsume(); @@ -224,6 +236,13 @@ public class HeroLogic { } if(!isBreak){ hero.setLevel( oldLevel + 1); + }else{ + hero.setBreakId(breakId); + int upStar = scHeroRankUpConfig.getOpenStar() - hero.getStar(); + if(upStar>0){ + hero.upStar(upStar); + } + } //发送成功消息 @@ -309,7 +328,8 @@ public class HeroLogic { } //删除hero recyleHeroBySystem(user,removeHeroIds); - targetHero.setStar( oldStar + 1 ); + targetHero.upStar( 1 ); + targetHero.setBreakId(scHeroRankUpConfig.getId()); MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,null,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java index 356ea92d8..606bce3c3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java @@ -223,8 +223,7 @@ public class ProtocolsManager implements ProtocolsAbstract { baseHandler.execute(session, packetNetData); } catch (Exception e) { //TODO - LOGGER.error("error : " + e); - e.printStackTrace(); + LOGGER.error("error : " ,e); } } } 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 0a666b414..8b73f2d58 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -62,11 +62,12 @@ public class CBean2Proto { } public static CommonProto.AdventureStateInfo getAdventureStateInfo(AdventureStateInfo adventureStateInfo){ + int startTime = adventureStateInfo.getStartTime(); + int now = (int)(System.currentTimeMillis()/1000); return CommonProto.AdventureStateInfo.newBuilder() .addAllHeroIdList(adventureStateInfo.getHeroIds()) - .setStartTime(adventureStateInfo.getStartTime()) - .setHourDuration(adventureStateInfo.getHourDuration()) .setPositionId(adventureStateInfo.getPosition()) + .setRemainTime((now - startTime )) .build(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index 44f29512c..4452e5bb6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -88,6 +88,7 @@ public class MessageUtil { if(errorCode!=1 && !StringUtil.isEmpty(errMsg)){ generatedMessage = CommonProto.ErrorResponse.newBuilder().setErrCode(errorCode).setErrMsg(errMsg).build(); } + LOGGER.error("send error msg,the uid={},the msgId={},the errMsg={}",session.getId(),msgId,errMsg); byte[] byteBuf = wrappedBuffer(session.getUid(), session.getToken(), session.getIndex(), errorCode,msgId, generatedMessage); session.writeAndFlush(byteBuf);