From a4815854e0cb4bef01706c79554a53b2e56a56f7 Mon Sep 17 00:00:00 2001 From: gaojie Date: Wed, 24 Apr 2019 13:45:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/AccomplishmentConfig.txt | 8 + conf/server/ActivityRewardConfig.txt | 33 +- conf/server/AdventureConfig.txt | 10 +- conf/server/ChallengeMapConfig.txt | 1 + conf/server/ChallengeMissionConfig.txt | 6 +- conf/server/ChallengeSetting.txt | 2 +- conf/server/EventPointConfig.txt | 127 ++++---- conf/server/ExploreFunctionConfig.txt | 2 +- conf/server/FoodsConfig.txt | 4 + conf/server/ItemConfig.txt | 298 ++++++++--------- conf/server/LevelDifficultyConfig.txt | 300 +++++++++--------- conf/server/LotteryRewardConfig.txt | 4 +- conf/server/MapPointConfig.txt | 37 ++- conf/server/MonsterGroup.txt | 27 +- conf/server/OptionAddCondition.txt | 8 +- conf/server/OptionConfig.txt | 175 +++++----- conf/server/RewardGroup.txt | 92 ++++-- conf/server/RewardItemConfig.txt | 163 +++++++--- conf/server/WorkShopRebuildConfig.txt | 8 +- .../ljsd/jieling/logic/item/ItemLogic.java | 2 +- test/src/main/java/ExcelUtils.java | 2 +- 21 files changed, 699 insertions(+), 610 deletions(-) diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index d1c1a3d45..ffd6232c5 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -44,3 +44,11 @@ int int int mut,int#int,2 int 42 107 3 0|10 20 43 107 7 0|1 5 44 107 7 0|2 15 +45 108 2 10811|1 20 +46 108 1 108023|1 5 +47 108 1 108040#108015|1 10 +48 108 1 108055|1 15 +49 108 2 10815|1 20 +50 108 7 0|2 5 +51 108 7 0|4 10 +52 108 7 0|6 15 diff --git a/conf/server/ActivityRewardConfig.txt b/conf/server/ActivityRewardConfig.txt index 32856ff17..2de20ee11 100644 --- a/conf/server/ActivityRewardConfig.txt +++ b/conf/server/ActivityRewardConfig.txt @@ -1,25 +1,28 @@ Id ActivityId Values Reward int int mut,int#int,2 mut,int#int,2 -1 2 1 19#10|4#100|14#122222 -2 2 2 10003#1|4#100|14#122223 -3 2 3 4#100|14#122224 -4 2 4 4#100|14#122225 -5 2 5 4#100|14#122226 -6 2 6 4#100|14#122227 -7 2 7 4#100|14#122228 +1 2 1 19#10|3#5000|14#500000 +2 2 2 10003#1|4#100|14#600000 +3 2 3 3203#1|3211#1|3215#1|3217#1 +4 2 4 19#10|3#5000|14#500000 +5 2 5 15#888|14#30000 +6 2 6 19#10|3#5000|14#500000 +7 2 7 3303#1|3311#1|3315#1|3317#1 11 1 5 14#100000 12 1 10 3#3000 13 1 15 14#200000 14 1 20 3#4000 15 1 25 14#300000 -16 1 30 3#5000 +16 1 30 4#500 17 1 40 14#400000 -18 1 60 3#500 +18 1 60 4#1000 19 1 90 14#500000 -20 1 120 3#1000 -31 3 1051 4#100 -32 3 2051 4#100 +20 1 120 4#1500 +31 3 1051 14#300000 +32 3 2051 3#5000 33 3 3051 10007#1 -34 3 4051 4#101 -35 3 5051 4#102 -36 3 6051 4#103 +34 3 4051 14#500000 +35 3 5051 4#1000 +36 3 6051 10011#1 +37 3 7051 14#500000 +38 3 8051 4#1000 +39 3 9051 10001#1 diff --git a/conf/server/AdventureConfig.txt b/conf/server/AdventureConfig.txt index 95a7a0190..4ced275ca 100644 --- a/conf/server/AdventureConfig.txt +++ b/conf/server/AdventureConfig.txt @@ -1,7 +1,7 @@ Id OpenLevel MaxNum BaseRewardGroup RandomRewardGroup NumIncome LeaveBonus int int int mut,int#int,1 mut,int#int,1 mut,float#float,2 int -1 9 5 101 111#121 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -2 24 5 102 112#122 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -3 36 5 103 113#123 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -4 54 5 104 114#124 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 -5 61 5 105 115#125 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +1 9 5 101 111#121#131#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +2 24 5 102 112#122#132#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +3 36 5 103 113#123#133#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +4 54 5 104 114#124#134#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 +5 61 5 105 115#125#135#140 1#0.2|2#0.4|3#0.6|4#0.8|5#1 8 diff --git a/conf/server/ChallengeMapConfig.txt b/conf/server/ChallengeMapConfig.txt index d868ea4db..66c55441b 100644 --- a/conf/server/ChallengeMapConfig.txt +++ b/conf/server/ChallengeMapConfig.txt @@ -8,3 +8,4 @@ int int mut,int#int,1 int int mut,int#int,1 mut,int#int,1 105 6 15#20 0 0 2001 13#17 106 7 20#30 0 0 2001 11#17 107 8 15#20 0 0 2001 5#2 +108 9 20#15 0 0 2001 19#6 diff --git a/conf/server/ChallengeMissionConfig.txt b/conf/server/ChallengeMissionConfig.txt index 11be8d321..eda1dfb1d 100644 --- a/conf/server/ChallengeMissionConfig.txt +++ b/conf/server/ChallengeMissionConfig.txt @@ -8,9 +8,9 @@ int int mut,int#int,1 6 2 2005 7 1 2006 8 1 2007 -9 2 2006 -10 2 2007 -11 1 2008 +9 1 2008 +10 2 2009 +11 1 2010 12 2 2009 101 4 2002 102 3 2002 diff --git a/conf/server/ChallengeSetting.txt b/conf/server/ChallengeSetting.txt index 52699aaeb..ac91ca1e6 100644 --- a/conf/server/ChallengeSetting.txt +++ b/conf/server/ChallengeSetting.txt @@ -1,3 +1,3 @@ Id Limit Item Cost int int int mut,int#int,1 -1 10 14 0#0#0#100 +1 99999 14 0#0#0#100 diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 73cdaa67a..6e78a6a00 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -22,7 +22,7 @@ int mut,int#int,1 100020 100022 100021 100023 100022 100024 -100023 100025 +100023 null 100024 100026 100025 100027 100026 100028 @@ -303,75 +303,62 @@ int mut,int#int,1 107035 107042 107036 107043 107037 107044 -108001 null -108002 null -108003 null -108004 null -108005 null -108006 null -108007 null -108008 null -108009 1080009 -108010 108001#108002 -108011 108003#108004 -108012 108005#108006 -108013 108007#108008 -108014 108009#108010 -108015 108011#108012 -108016 108013#108014 -108017 108015#108016 -108018 108017#108018 -108019 108019#108020 -108020 108021#108022 -108021 108023#108024 -108022 108025#108026 -108023 108027#108028 -108024 108029#108030 -108025 108031#108032 -108026 108033#108034 -108027 108035#108036 -108028 108037#108038 -108029 108039#108040 -108030 108041#108042 -108031 108043#108044 -108032 108045#108046 -108033 108047#108048 -108034 108049#108050 -108035 108051#108052 -108036 108053#108054 -108037 108055#108056 -108038 108057#108058 -108039 108059#108060 -108040 108061#108062 -108041 108063#108064 -108042 108065#108066 -108043 108067#108068 -108044 108069#108070 -108045 108071#108072 -108046 108073#108074 -108047 108075 -108048 108076 -108049 108077 -108050 108078 -108051 108079 -108052 108080 -108053 108081 -108054 108082 -108055 108083 -108056 108084 -108057 108085 -108058 108086 -108059 108087 -108060 108088 -108061 108089 -108062 108090 -108063 108091 -108064 108092 -108065 108093 -108066 108094 -108067 108095#108096 -108068 108097#108098 -108069 108099#108100 +108001 10801 +108002 10802 +108003 10803 +108004 10804 +108005 10805 +108006 10806 +108007 108001#108002 +108008 108003 +108009 108004 +108010 108005 +108011 108006#108007 +108012 108008 +108013 108009 +108014 108010 +108015 108011 +108016 108012 +108017 108013#108014 +108018 108015#108016 +108019 108017#108018 +108020 108019 +108021 108020 +108022 108021 +108023 108022 +108024 108023 +108025 108024#108025 +108026 108026#108027#108028#108029 +108027 108030#108031 +108028 108032 +108029 108033#108034 +108030 108035#108036 +108031 108037#108038 +108032 108039 +108033 108040 +108034 108041#108042 +108035 108043#108044 +108036 108045 +108037 108046#108047 +108038 108048#108049 +108039 108050#108051 +108040 108052#108053 +108041 108054 +108042 108055 +108043 108056#108057 +108044 108058 +108045 10807 +108046 10808 +108047 108059#108060 +108048 108061 +108049 10809 +108050 10810 +108051 108062 +108052 108063 +108053 108064 +108054 108065 +108055 108066 +108056 108067 109001 null 109002 null 109003 null diff --git a/conf/server/ExploreFunctionConfig.txt b/conf/server/ExploreFunctionConfig.txt index 891364b60..4e3e19294 100644 --- a/conf/server/ExploreFunctionConfig.txt +++ b/conf/server/ExploreFunctionConfig.txt @@ -5,4 +5,4 @@ int float 3 1.0 4 0.0 5 0.0 -6 2.0 +6 3.0 diff --git a/conf/server/FoodsConfig.txt b/conf/server/FoodsConfig.txt index 8b31e4cf1..047e2885d 100644 --- a/conf/server/FoodsConfig.txt +++ b/conf/server/FoodsConfig.txt @@ -42,3 +42,7 @@ int int int int mut,int#int,2 int 9 30 1 1 2#450 2 10 30 1 1 3#200 2 11 30 1 1 4#200 2 +12 0 1 1 6#-4000 2 +13 0 1 1 6#2000 2 +14 0 1 1 2#800 2 +15 0 2 2 6#108020 2 diff --git a/conf/server/ItemConfig.txt b/conf/server/ItemConfig.txt index 9e4f618bd..53ed77dac 100644 --- a/conf/server/ItemConfig.txt +++ b/conf/server/ItemConfig.txt @@ -45,155 +45,155 @@ int bool int int int bool int string int int int int mut,int#int,1 int 1509 true 0 4 3 false 1 15012 0 0 0 0 null 1 1510 true 0 4 4 false 1 15013 0 0 0 0 null 1 1511 true 0 4 5 false 1 15014 0 0 0 0 null 1 -3001 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3002 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3003 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3004 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3005 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3006 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3007 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3008 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3009 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3010 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3011 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3012 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3013 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3014 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3015 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3016 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3017 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3018 true 3 1 1 false 1 100001 0 0 0 0 null 1 -3101 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3102 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3103 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3104 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3105 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3106 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3107 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3108 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3109 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3110 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3111 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3112 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3113 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3114 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3115 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3116 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3117 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3118 true 3 1 2 false 1 100001 0 0 0 0 null 1 -3201 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3202 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3203 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3204 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3205 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3206 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3207 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3208 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3209 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3210 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3211 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3212 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3213 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3214 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3215 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3216 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3217 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3218 true 3 1 3 false 1 100001 0 0 0 0 null 1 -3301 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3302 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3303 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3304 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3305 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3306 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3307 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3308 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3309 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3310 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3311 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3312 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3313 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3314 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3315 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3316 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3317 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3318 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3319 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3320 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3321 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3322 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3323 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3324 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3325 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3326 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3327 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3328 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3329 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3330 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3331 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3332 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3333 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3334 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3335 true 3 1 4 false 1 100001 0 0 0 0 null 1 -3336 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4001 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4002 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4003 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4004 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4005 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4006 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4007 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4008 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4009 true 3 1 3 false 1 100001 0 0 0 0 null 1 -4101 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4102 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4103 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4104 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4105 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4106 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4107 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4108 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4109 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4110 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4111 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4112 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4113 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4114 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4115 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4116 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4117 true 3 1 4 false 1 100001 0 0 0 0 null 1 -4118 true 3 1 4 false 1 100001 0 0 0 0 null 1 -6001 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6002 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6003 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6004 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6005 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6006 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6007 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6008 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6009 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6010 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6011 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6012 true 4 4 4 false 1 100001 0 0 0 0 null 1 -6013 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6014 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6015 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6016 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6017 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6018 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6019 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6020 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6021 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6022 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6023 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6024 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6025 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6026 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6027 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6028 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6029 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6030 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6031 true 4 4 5 false 1 100001 0 0 0 0 null 1 -6032 true 4 4 5 false 1 100001 0 0 0 0 null 1 +3001 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3002 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3003 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3004 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3005 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3006 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3007 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3008 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3009 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3010 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3011 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3012 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3013 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3014 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3015 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3016 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3017 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3018 true 3 1 2 false 1 15011 0 0 0 0 null 1 +3101 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3102 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3103 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3104 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3105 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3106 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3107 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3108 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3109 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3110 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3111 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3112 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3113 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3114 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3115 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3116 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3117 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3118 true 3 1 3 false 1 15011 0 0 0 0 null 1 +3201 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3202 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3203 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3204 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3205 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3206 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3207 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3208 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3209 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3210 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3211 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3212 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3213 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3214 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3215 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3216 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3217 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3218 true 3 1 4 false 1 15013 0 0 0 0 null 1 +3301 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3302 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3303 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3304 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3305 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3306 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3307 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3308 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3309 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3310 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3311 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3312 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3313 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3314 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3315 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3316 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3317 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3318 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3319 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3320 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3321 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3322 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3323 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3324 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3325 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3326 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3327 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3328 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3329 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3330 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3331 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3332 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3333 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3334 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3335 true 3 1 5 false 1 15014 0 0 0 0 null 1 +3336 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4001 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4002 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4003 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4004 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4005 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4006 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4007 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4008 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4009 true 3 1 4 false 1 15013 0 0 0 0 null 1 +4101 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4102 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4103 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4104 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4105 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4106 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4107 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4108 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4109 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4110 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4111 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4112 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4113 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4114 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4115 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4116 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4117 true 3 1 5 false 1 15014 0 0 0 0 null 1 +4118 true 3 1 5 false 1 15014 0 0 0 0 null 1 +6001 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6002 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6003 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6004 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6005 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6006 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6007 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6008 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6009 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6010 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6011 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6012 true 4 4 6 false 0 100001 0 0 0 0 null 1 +6013 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6014 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6015 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6016 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6017 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6018 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6019 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6020 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6021 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6022 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6023 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6024 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6025 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6026 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6027 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6028 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6029 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6030 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6031 true 4 4 7 false 0 100001 0 0 0 0 null 1 +6032 true 4 4 7 false 0 100001 0 0 0 0 null 1 7001 true 7 4 4 false 1 100001 0 0 0 0 null 0 7002 true 7 4 4 false 1 100001 0 0 0 0 null 0 7003 true 7 4 4 false 1 100001 0 0 0 0 null 0 diff --git a/conf/server/LevelDifficultyConfig.txt b/conf/server/LevelDifficultyConfig.txt index 08b2c7e07..5e2076507 100644 --- a/conf/server/LevelDifficultyConfig.txt +++ b/conf/server/LevelDifficultyConfig.txt @@ -1,152 +1,152 @@ Id Precondition LevelLimit MonsterGroup Cost PreLevelCost Exp FirstReward RandomReward RankTime MaxCountPerDay RecommendFightAbility int int int int mut,int#int,2 mut,int#int,2 int mut,int#int,1 mut,int#int,1 int int int -1011 0 0 51011 2#7 2#1 8 6001#5001 4001#3001 300 0 1007 -1021 1011 0 51012 2#7 2#1 8 6002#5002 4002#3002 300 0 1050 -1031 1021 0 51013 2#7 2#1 8 6003#5003 4003#3003 300 0 1093 -1041 1031 0 51014 2#7 2#1 8 6004#5004 4004#3004 300 0 1136 -1051 1041 0 51015 2#7 2#1 8 6005#5005 4005#3005 300 0 1179 -2011 1051 0 51021 2#7 2#1 8 6006#5006 4006#3006 300 0 1224 -2021 2011 0 51022 2#7 2#1 8 6007#5007 4007#3007 300 0 1583 -2031 2021 0 51023 2#7 2#1 8 6008#5008 4008#3008 300 0 1942 -2041 2031 0 51024 2#7 2#1 8 6009#5009 4009#3009 300 0 2301 -2051 2041 0 51025 2#7 2#1 8 6010#5010 4010#3010 300 0 2660 -3011 2051 0 51031 2#7 2#1 8 6011#5011 4011#3011 300 0 3023 -3021 3011 0 51032 2#7 2#1 8 6012#5012 4012#3012 300 0 3527 -3031 3021 0 51033 2#7 2#1 8 6013#5013 4013#3013 300 0 4031 -3041 3031 0 51034 2#7 2#1 8 6014#5014 4014#3014 300 0 4535 -3051 3041 0 51035 2#7 2#1 8 6015#5015 4015#3015 300 0 5039 -4011 3051 0 51041 2#7 2#1 8 6016#5016 4016#3016 300 0 6047 -4021 4011 0 51042 2#7 2#1 8 6017#5017 4017#3017 300 0 7055 -4031 4021 0 51043 2#7 2#1 8 6018#5018 4018#3018 300 0 8063 -4041 4031 0 51044 2#7 2#1 8 6019#5019 4019#3019 300 0 9071 -4051 4041 0 51045 2#7 2#1 8 6020#5020 4020#3020 300 0 10079 -5011 4051 0 51051 2#7 2#1 8 6021#5021 4021#3021 300 0 10199 -5021 5011 0 51052 2#7 2#1 8 6022#5022 4022#3022 300 0 10320 -5031 5021 0 51053 2#7 2#1 8 6023#5023 4023#3023 300 0 10440 -5041 5031 0 51054 2#7 2#1 8 6024#5024 4024#3024 300 0 10561 -5051 5041 0 51055 2#7 2#1 8 6025#5025 4025#3025 300 0 10681 -6011 5051 0 51061 2#7 2#1 8 6026#5026 4026#3026 300 0 10802 -6021 6011 0 51062 2#7 2#1 8 6027#5027 4027#3027 300 0 10922 -6031 6021 0 51063 2#7 2#1 8 6028#5028 4028#3028 300 0 11043 -6041 6031 0 51064 2#7 2#1 8 6029#5029 4029#3029 300 0 11163 -6051 6041 0 51065 2#7 2#1 8 6030#5030 4030#3030 300 0 11284 -7011 6051 0 51071 2#7 2#1 8 6031#5031 4031#3031 300 0 11669 -7021 7011 0 51072 2#7 2#1 8 6032#5032 4032#3032 300 0 12055 -7031 7021 0 51073 2#7 2#1 8 6033#5033 4033#3033 300 0 12441 -7041 7031 0 51074 2#7 2#1 8 6034#5034 4034#3034 300 0 12826 -7051 7041 0 51075 2#7 2#1 8 6035#5035 4035#3035 300 0 13212 -8011 7051 0 51081 2#7 2#1 8 6036#5036 4036#3036 300 0 13246 -8021 8011 0 51082 2#7 2#1 8 6037#5037 4037#3037 300 0 13279 -8031 8021 0 51083 2#7 2#1 8 6038#5038 4038#3038 300 0 13357 -8041 8031 0 51084 2#7 2#1 8 6039#5039 4039#3039 300 0 13480 -8051 8041 0 51085 2#7 2#1 8 6040#5040 4040#3040 300 0 13603 -9011 8051 0 51091 2#7 2#1 8 6041#5041 4041#3041 300 0 14989 -9021 9011 0 51092 2#7 2#1 8 6042#5042 4042#3042 300 0 16375 -9031 9021 0 51093 2#7 2#1 8 6043#5043 4043#3043 300 0 17129 -9041 9031 0 51094 2#7 2#1 8 6044#5044 4044#3044 300 0 17252 -9051 9041 0 51095 2#7 2#1 8 6045#5045 4045#3045 300 0 17375 -10011 9051 0 51094 2#7 2#1 8 6046#5046 4046#3046 300 0 20746 -10021 10011 0 51095 2#7 2#1 8 6047#5047 4047#3047 300 0 24118 -10031 10021 0 51094 2#7 2#1 8 6048#5048 4048#3048 300 0 24670 -10041 10031 0 51095 2#7 2#1 8 6049#5049 4049#3049 300 0 25222 -10051 10041 0 51094 2#7 2#1 8 6050#5050 4050#3050 300 0 24513 -1012 5011 0 51095 2#7 2#1 8 8101 8001#7001 300 0 25222 -1022 1012 0 51094 2#7 2#1 8 8102 8002#7002 300 0 24513 -1032 1022 0 51095 2#7 2#1 8 8103 8003#7003 300 0 25222 -1042 1032 0 51094 2#7 2#1 8 8104 8004#7004 300 0 24513 -1052 1042 0 51095 2#7 2#1 8 8105 8005#7005 300 0 25222 -2012 1052 0 51094 2#7 2#1 8 8106 8006#7006 300 0 24513 -2022 2012 0 51095 2#7 2#1 8 8107 8007#7007 300 0 25222 -2032 2022 0 51094 2#7 2#1 8 8108 8008#7008 300 0 24513 -2042 2032 0 51095 2#7 2#1 8 8109 8009#7009 300 0 25222 -2052 2042 0 51094 2#7 2#1 8 8110 8010#7010 300 0 24513 -3012 2052 0 51095 2#7 2#1 8 8111 8011#7011 300 0 25222 -3022 3012 0 51094 2#7 2#1 8 8112 8012#7012 300 0 24513 -3032 3022 0 51095 2#7 2#1 8 8113 8013#7013 300 0 25222 -3042 3032 0 51094 2#7 2#1 8 8114 8014#7014 300 0 24513 -3052 3042 0 51095 2#7 2#1 8 8115 8015#7015 300 0 25222 -4012 3052 0 51094 2#7 2#1 8 8116 8016#7016 300 0 24513 -4022 4012 0 51095 2#7 2#1 8 8117 8017#7017 300 0 25222 -4032 4022 0 51094 2#7 2#1 8 8118 8018#7018 300 0 24513 -4042 4032 0 51095 2#7 2#1 8 8119 8019#7019 300 0 25222 -4052 4042 0 51094 2#7 2#1 8 8120 8020#7020 300 0 24513 -5012 4052 0 51095 2#7 2#1 8 8121 8021#7021 300 0 25222 -5022 5012 0 51094 2#7 2#1 8 8122 8022#7022 300 0 24513 -5032 5022 0 51095 2#7 2#1 8 8123 8023#7023 300 0 25222 -5042 5032 0 51094 2#7 2#1 8 8124 8024#7024 300 0 24513 -5052 5042 0 51095 2#7 2#1 8 8125 8025#7025 300 0 25222 -6012 5052 0 51094 2#7 2#1 8 8126 8026#7026 300 0 24513 -6022 6012 0 51095 2#7 2#1 8 8127 8027#7027 300 0 25222 -6032 6022 0 51094 2#7 2#1 8 8128 8028#7028 300 0 24513 -6042 6032 0 51095 2#7 2#1 8 8129 8029#7029 300 0 25222 -6052 6042 0 51094 2#7 2#1 8 8130 8030#7030 300 0 24513 -7012 6052 0 51095 2#7 2#1 8 8131 8031#7031 300 0 25222 -7022 7012 0 51094 2#7 2#1 8 8132 8032#7032 300 0 24513 -7032 7022 0 51095 2#7 2#1 8 8133 8033#7033 300 0 25222 -7042 7032 0 51094 2#7 2#1 8 8134 8034#7034 300 0 24513 -7052 7042 0 51095 2#7 2#1 8 8135 8035#7035 300 0 25222 -8012 7052 0 51094 2#7 2#1 8 8136 8036#7036 300 0 24513 -8022 8012 0 51095 2#7 2#1 8 8137 8037#7037 300 0 25222 -8032 8022 0 51094 2#7 2#1 8 8138 8038#7038 300 0 24513 -8042 8032 0 51095 2#7 2#1 8 8139 8039#7039 300 0 25222 -8052 8042 0 51094 2#7 2#1 8 8140 8040#7040 300 0 24513 -9012 8052 0 51095 2#7 2#1 8 8141 8041#7041 300 0 25222 -9022 9012 0 51094 2#7 2#1 8 8142 8042#7042 300 0 24513 -9032 9022 0 51095 2#7 2#1 8 8143 8043#7043 300 0 25222 -9042 9032 0 51094 2#7 2#1 8 8144 8044#7044 300 0 24513 -9052 9042 0 51095 2#7 2#1 8 8145 8045#7045 300 0 25222 -10012 9052 0 51094 2#7 2#1 8 8146 8046#7046 300 0 24513 -10022 10012 0 51095 2#7 2#1 8 8147 8047#7047 300 0 25222 -10032 10022 0 51094 2#7 2#1 8 8148 8048#7048 300 0 24513 -10042 10032 0 51095 2#7 2#1 8 8149 8049#7049 300 0 25222 -10052 10042 0 51094 2#7 2#1 8 8150 8050#7050 300 0 24513 -1013 2052 0 51095 2#7 2#1 8 null 8601#8501 300 0 25222 -1023 1013 0 51094 2#7 2#1 8 null 8602#8502 300 0 24513 -1033 1023 0 51095 2#7 2#1 8 null 8603#8503 300 0 25222 -1043 1033 0 51094 2#7 2#1 8 null 8604#8504 300 0 24513 -1053 1043 0 51095 2#7 2#1 8 null 8605#8505 300 0 25222 -2013 1053 0 51094 2#7 2#1 8 null 8606#8506 300 0 24513 -2023 2013 0 51095 2#7 2#1 8 null 8607#8507 300 0 25222 -2033 2023 0 51094 2#7 2#1 8 null 8608#8508 300 0 24513 -2043 2033 0 51095 2#7 2#1 8 null 8609#8509 300 0 25222 -2053 2043 0 51094 2#7 2#1 8 null 8610#8510 300 0 24513 -3013 2053 0 51095 2#7 2#1 8 null 8611#8511 300 0 25222 -3023 3013 0 51094 2#7 2#1 8 null 8612#8512 300 0 24513 -3033 3023 0 51095 2#7 2#1 8 null 8613#8513 300 0 25222 -3043 3033 0 51094 2#7 2#1 8 null 8614#8514 300 0 24513 -3053 3043 0 51095 2#7 2#1 8 null 8615#8515 300 0 25222 -4013 3053 0 51094 2#7 2#1 8 null 8616#8516 300 0 24513 -4023 4013 0 51095 2#7 2#1 8 null 8617#8517 300 0 25222 -4033 4023 0 51094 2#7 2#1 8 null 8618#8518 300 0 24513 -4043 4033 0 51095 2#7 2#1 8 null 8619#8519 300 0 25222 -4053 4043 0 51094 2#7 2#1 8 null 8620#8520 300 0 24513 -5013 4053 0 51095 2#7 2#1 8 null 8621#8521 300 0 25222 -5023 5013 0 51094 2#7 2#1 8 null 8622#8522 300 0 24513 -5033 5023 0 51095 2#7 2#1 8 null 8623#8523 300 0 25222 -5043 5033 0 51094 2#7 2#1 8 null 8624#8524 300 0 24513 -5053 5043 0 51095 2#7 2#1 8 null 8625#8525 300 0 25222 -6013 5053 0 51094 2#7 2#1 8 null 8626#8526 300 0 24513 -6023 6013 0 51095 2#7 2#1 8 null 8627#8527 300 0 25222 -6033 6023 0 51094 2#7 2#1 8 null 8628#8528 300 0 24513 -6043 6033 0 51095 2#7 2#1 8 null 8629#8529 300 0 25222 -6053 6043 0 51094 2#7 2#1 8 null 8630#8530 300 0 24513 -7013 6053 0 51095 2#7 2#1 8 null 8631#8531 300 0 25222 -7023 7013 0 51094 2#7 2#1 8 null 8632#8532 300 0 24513 -7033 7023 0 51095 2#7 2#1 8 null 8633#8533 300 0 25222 -7043 7033 0 51094 2#7 2#1 8 null 8634#8534 300 0 24513 -7053 7043 0 51095 2#7 2#1 8 null 8635#8535 300 0 25222 -8013 7053 0 51094 2#7 2#1 8 null 8636#8536 300 0 24513 -8023 8013 0 51095 2#7 2#1 8 null 8637#8537 300 0 25222 -8033 8023 0 51094 2#7 2#1 8 null 8638#8538 300 0 24513 -8043 8033 0 51095 2#7 2#1 8 null 8639#8539 300 0 25222 -8053 8043 0 51094 2#7 2#1 8 null 8640#8540 300 0 24513 -9013 8053 0 51095 2#7 2#1 8 null 8641#8541 300 0 25222 -9023 9013 0 51094 2#7 2#1 8 null 8642#8542 300 0 24513 -9033 9023 0 51095 2#7 2#1 8 null 8643#8543 300 0 25222 -9043 9033 0 51094 2#7 2#1 8 null 8644#8544 300 0 24513 -9053 9043 0 51095 2#7 2#1 8 null 8645#8545 300 0 25222 -10013 9053 0 51094 2#7 2#1 8 null 8646#8546 300 0 24513 -10023 10013 0 51095 2#7 2#1 8 null 8647#8547 300 0 25222 -10033 10023 0 51094 2#7 2#1 8 null 8648#8548 300 0 24513 -10043 10033 0 51095 2#7 2#1 8 null 8649#8549 300 0 25222 -10053 10043 0 51094 2#7 2#1 8 null 8650#8550 300 0 24513 +1011 0 0 51011 2#7 2#1 8 6001#5001 4001#3001 300 0 500 +1021 1011 0 51012 2#7 2#1 8 6002#5002 4002#3002 300 0 600 +1031 1021 0 51013 2#7 2#1 8 6003#5003 4003#3003 300 0 700 +1041 1031 0 51014 2#7 2#1 8 6004#5004 4004#3004 300 0 800 +1051 1041 0 51015 2#7 2#1 8 6005#5005 4005#3005 300 0 900 +2011 1051 0 51021 2#7 2#1 8 6006#5006 4006#3006 300 0 2015 +2021 2011 0 51022 2#7 2#1 8 6007#5007 4007#3007 300 0 2519 +2031 2021 0 51023 2#7 2#1 8 6008#5008 4008#3008 300 0 3023 +2041 2031 0 51024 2#7 2#1 8 6009#5009 4009#3009 300 0 3527 +2051 2041 0 51025 2#7 2#1 8 6010#5010 4010#3010 300 0 4031 +3011 2051 0 51031 2#7 2#1 8 6011#5011 4011#3011 300 0 4535 +3021 3011 0 51032 2#7 2#1 8 6012#5012 4012#3012 300 0 5039 +3031 3021 0 51033 2#7 2#1 8 6013#5013 4013#3013 300 0 5543 +3041 3031 0 51034 2#7 2#1 8 6014#5014 4014#3014 300 0 6047 +3051 3041 0 51035 2#7 2#1 8 6015#5015 4015#3015 300 0 6551 +4011 3051 0 51041 2#7 2#1 8 6016#5016 4016#3016 300 0 7055 +4021 4011 0 51042 2#7 2#1 8 6017#5017 4017#3017 300 0 8063 +4031 4021 0 51043 2#7 2#1 8 6018#5018 4018#3018 300 0 9071 +4041 4031 0 51044 2#7 2#1 8 6019#5019 4019#3019 300 0 10079 +4051 4041 0 51045 2#7 2#1 8 6020#5020 4020#3020 300 0 10320 +5011 4051 0 51051 2#7 2#1 8 6021#5021 4021#3021 300 0 10320 +5021 5011 0 51052 2#7 2#1 8 6022#5022 4022#3022 300 0 10561 +5031 5021 0 51053 2#7 2#1 8 6023#5023 4023#3023 300 0 10802 +5041 5031 0 51054 2#7 2#1 8 6024#5024 4024#3024 300 0 11043 +5051 5041 0 51055 2#7 2#1 8 6025#5025 4025#3025 300 0 11284 +6011 5051 0 51061 2#7 2#1 8 6026#5026 4026#3026 300 0 11669 +6021 6011 0 51062 2#7 2#1 8 6027#5027 4027#3027 300 0 12055 +6031 6021 0 51063 2#7 2#1 8 6028#5028 4028#3028 300 0 12441 +6041 6031 0 51064 2#7 2#1 8 6029#5029 4029#3029 300 0 12826 +6051 6041 0 51065 2#7 2#1 8 6030#5030 4030#3030 300 0 13212 +7011 6051 0 51071 2#7 2#1 8 6031#5031 4031#3031 300 0 13237 +7021 7011 0 51072 2#7 2#1 8 6032#5032 4032#3032 300 0 13262 +7031 7021 0 51073 2#7 2#1 8 6033#5033 4033#3033 300 0 13296 +7041 7031 0 51074 2#7 2#1 8 6034#5034 4034#3034 300 0 13449 +7051 7041 0 51075 2#7 2#1 8 6035#5035 4035#3035 300 0 13603 +8011 7051 0 51081 2#7 2#1 8 6036#5036 4036#3036 300 0 14642 +8021 8011 0 51082 2#7 2#1 8 6037#5037 4037#3037 300 0 15682 +8031 8021 0 51083 2#7 2#1 8 6038#5038 4038#3038 300 0 17068 +8041 8031 0 51084 2#7 2#1 8 6039#5039 4039#3039 300 0 17221 +8051 8041 0 51085 2#7 2#1 8 6040#5040 4040#3040 300 0 17375 +9011 8051 0 51091 2#7 2#1 8 6041#5041 4041#3041 300 0 19398 +9021 9011 0 51092 2#7 2#1 8 6042#5042 4042#3042 300 0 21421 +9031 9021 0 51093 2#7 2#1 8 6043#5043 4043#3043 300 0 24118 +9041 9031 0 51094 2#7 2#1 8 6044#5044 4044#3044 300 0 24449 +9051 9041 0 51095 2#7 2#1 8 6045#5045 4045#3045 300 0 24781 +10011 9051 0 51094 2#7 2#1 8 6046#5046 4046#3046 300 0 25222 +10021 10011 0 51095 2#7 2#1 8 6047#5047 4047#3047 300 0 25009 +10031 10021 0 51094 2#7 2#1 8 6048#5048 4048#3048 300 0 24797 +10041 10031 0 51095 2#7 2#1 8 6049#5049 4049#3049 300 0 24513 +10051 10041 0 51094 2#7 2#1 8 6050#5050 4050#3050 300 0 24873 +1012 10051 0 51095 2#7 2#1 8 8101 8001#7001 300 0 25233 +1022 1012 0 51094 2#7 2#1 8 8102 8002#7002 300 0 25472 +1032 1022 0 51095 2#7 2#1 8 8103 8003#7003 300 0 25712 +1042 1032 0 51094 2#7 2#1 8 8104 8004#7004 300 0 26312 +1052 1042 0 51095 2#7 2#1 8 8105 8005#7005 300 0 26912 +2012 1052 0 51094 2#7 2#1 8 8106 8006#7006 300 0 27511 +2022 2012 0 51095 2#7 2#1 8 8107 8007#7007 300 0 28111 +2032 2022 0 51094 2#7 2#1 8 8108 8008#7008 300 0 29311 +2042 2032 0 51095 2#7 2#1 8 8109 8009#7009 300 0 30629 +2052 2042 0 51094 2#7 2#1 8 8110 8010#7010 300 0 33715 +3012 2052 0 51095 2#7 2#1 8 8111 8011#7011 300 0 35909 +3022 3012 0 51094 2#7 2#1 8 8112 8012#7012 300 0 38102 +3032 3022 0 51095 2#7 2#1 8 8113 8013#7013 300 0 40295 +3042 3032 0 51094 2#7 2#1 8 8114 8014#7014 300 0 42489 +3052 3042 0 51095 2#7 2#1 8 8115 8015#7015 300 0 44682 +4012 3052 0 51094 2#7 2#1 8 8116 8016#7016 300 0 46856 +4022 4012 0 51095 2#7 2#1 8 8117 8017#7017 300 0 49030 +4032 4022 0 51094 2#7 2#1 8 8118 8018#7018 300 0 51205 +4042 4032 0 51095 2#7 2#1 8 8119 8019#7019 300 0 53379 +4052 4042 0 51094 2#7 2#1 8 8120 8020#7020 300 0 55553 +5012 4052 0 51095 2#7 2#1 8 8121 8021#7021 300 0 57705 +5022 5012 0 51094 2#7 2#1 8 8122 8022#7022 300 0 59858 +5032 5022 0 51095 2#7 2#1 8 8123 8023#7023 300 0 60733 +5042 5032 0 51094 2#7 2#1 8 8124 8024#7024 300 0 62992 +5052 5042 0 51095 2#7 2#1 8 8125 8025#7025 300 0 36956 +6012 5052 0 51094 2#7 2#1 8 8126 8026#7026 300 0 37774 +6022 6012 0 51095 2#7 2#1 8 8127 8027#7027 300 0 38592 +6032 6022 0 51094 2#7 2#1 8 8128 8028#7028 300 0 39409 +6042 6032 0 51095 2#7 2#1 8 8129 8029#7029 300 0 40250 +6052 6042 0 51094 2#7 2#1 8 8130 8030#7030 300 0 41070 +7012 6052 0 51095 2#7 2#1 8 8131 8031#7031 300 0 41889 +7022 7012 0 51094 2#7 2#1 8 8132 8032#7032 300 0 42764 +7032 7022 0 51095 2#7 2#1 8 8133 8033#7033 300 0 43587 +7042 7032 0 51094 2#7 2#1 8 8134 8034#7034 300 0 44409 +7052 7042 0 51095 2#7 2#1 8 8135 8035#7035 300 0 45232 +8012 7052 0 51094 2#7 2#1 8 8136 8036#7036 300 0 46055 +8022 8012 0 51095 2#7 2#1 8 8137 8037#7037 300 0 46877 +8032 8022 0 51094 2#7 2#1 8 8138 8038#7038 300 0 47700 +8042 8032 0 51095 2#7 2#1 8 8139 8039#7039 300 0 48522 +8052 8042 0 51094 2#7 2#1 8 8140 8040#7040 300 0 49467 +9012 8052 0 51095 2#7 2#1 8 8141 8041#7041 300 0 51284 +9022 9012 0 51094 2#7 2#1 8 8142 8042#7042 300 0 53102 +9032 9022 0 51095 2#7 2#1 8 8143 8043#7043 300 0 54919 +9042 9032 0 51094 2#7 2#1 8 8144 8044#7044 300 0 56727 +9052 9042 0 51095 2#7 2#1 8 8145 8045#7045 300 0 58553 +10012 9052 0 51094 2#7 2#1 8 8146 8046#7046 300 0 60378 +10022 10012 0 51095 2#7 2#1 8 8147 8047#7047 300 0 62203 +10032 10022 0 51094 2#7 2#1 8 8148 8048#7048 300 0 64029 +10042 10032 0 51095 2#7 2#1 8 8149 8049#7049 300 0 66078 +10052 10042 0 51094 2#7 2#1 8 8150 8050#7050 300 0 67911 +1013 10052 0 51095 2#7 2#1 8 null 8601#8501 300 0 67911 +1023 1013 0 51094 2#7 2#1 8 null 8602#8502 300 0 69743 +1033 1023 0 51095 2#7 2#1 8 null 8603#8503 300 0 71576 +1043 1033 0 51094 2#7 2#1 8 null 8604#8504 300 0 73408 +1053 1043 0 51095 2#7 2#1 8 null 8605#8505 300 0 75241 +2013 1053 0 51094 2#7 2#1 8 null 8606#8506 300 0 77456 +2023 2013 0 51095 2#7 2#1 8 null 8607#8507 300 0 78605 +2033 2023 0 51094 2#7 2#1 8 null 8608#8508 300 0 79754 +2043 2033 0 51095 2#7 2#1 8 null 8609#8509 300 0 81281 +2053 2043 0 51094 2#7 2#1 8 null 8610#8510 300 0 82443 +3013 2053 0 51095 2#7 2#1 8 null 8611#8511 300 0 83670 +3023 3013 0 51094 2#7 2#1 8 null 8612#8512 300 0 84930 +3033 3023 0 51095 2#7 2#1 8 null 8613#8513 300 0 86190 +3043 3033 0 51094 2#7 2#1 8 null 8614#8514 300 0 87450 +3053 3043 0 51095 2#7 2#1 8 null 8615#8515 300 0 88709 +4013 3053 0 51094 2#7 2#1 8 null 8616#8516 300 0 90389 +4023 4013 0 51095 2#7 2#1 8 null 8617#8517 300 0 92660 +4033 4023 0 51094 2#7 2#1 8 null 8618#8518 300 0 94147 +4043 4033 0 51095 2#7 2#1 8 null 8619#8519 300 0 95419 +4053 4043 0 51094 2#7 2#1 8 null 8620#8520 300 0 96691 +5013 4053 0 51095 2#7 2#1 8 null 8621#8521 300 0 98019 +5023 5013 0 51094 2#7 2#1 8 null 8622#8522 300 0 99403 +5033 5023 0 51095 2#7 2#1 8 null 8623#8523 300 0 98802 +5043 5033 0 51094 2#7 2#1 8 null 8624#8524 300 0 109455 +5053 5043 0 51095 2#7 2#1 8 null 8625#8525 300 0 123410 +6013 5053 0 51094 2#7 2#1 8 null 8626#8526 300 0 133818 +6023 6013 0 51095 2#7 2#1 8 null 8627#8527 300 0 144227 +6033 6023 0 51094 2#7 2#1 8 null 8628#8528 300 0 154636 +6043 6033 0 51095 2#7 2#1 8 null 8629#8529 300 0 165045 +6053 6043 0 51094 2#7 2#1 8 null 8630#8530 300 0 175448 +7013 6053 0 51095 2#7 2#1 8 null 8631#8531 300 0 185847 +7023 7013 0 51094 2#7 2#1 8 null 8632#8532 300 0 196749 +7033 7023 0 51095 2#7 2#1 8 null 8633#8533 300 0 207165 +7043 7033 0 51094 2#7 2#1 8 null 8634#8534 300 0 217581 +7053 7043 0 51095 2#7 2#1 8 null 8635#8535 300 0 227996 +8013 7053 0 51094 2#7 2#1 8 null 8636#8536 300 0 238412 +8023 8013 0 51095 2#7 2#1 8 null 8637#8537 300 0 248828 +8033 8023 0 51094 2#7 2#1 8 null 8638#8538 300 0 259243 +8043 8033 0 51095 2#7 2#1 8 null 8639#8539 300 0 269348 +8053 8043 0 51094 2#7 2#1 8 null 8640#8540 300 0 280174 +9013 8053 0 51095 2#7 2#1 8 null 8641#8541 300 0 290284 +9023 9013 0 51094 2#7 2#1 8 null 8642#8542 300 0 300381 +9033 9023 0 51095 2#7 2#1 8 null 8643#8543 300 0 306304 +9043 9033 0 51094 2#7 2#1 8 null 8644#8544 300 0 308054 +9053 9043 0 51095 2#7 2#1 8 null 8645#8545 300 0 309804 +10013 9053 0 51094 2#7 2#1 8 null 8646#8546 300 0 311554 +10023 10013 0 51095 2#7 2#1 8 null 8647#8547 300 0 313304 +10033 10023 0 51094 2#7 2#1 8 null 8648#8548 300 0 316025 +10043 10033 0 51095 2#7 2#1 8 null 8649#8549 300 0 317796 +10053 10043 0 51094 2#7 2#1 8 null 8650#8550 300 0 319402 diff --git a/conf/server/LotteryRewardConfig.txt b/conf/server/LotteryRewardConfig.txt index 9276eb930..09f7f8c4d 100644 --- a/conf/server/LotteryRewardConfig.txt +++ b/conf/server/LotteryRewardConfig.txt @@ -9,7 +9,7 @@ int mut,int#int,1 int int int,int#int,1 8 10008#1 1 0 null 9 10009#1 1 0 null 10 10010#1 1 0 null -11 10011#1 1 11 null +11 10011#1 1 0 null 12 10012#1 1 8 null 13 10013#1 1 11 null 14 10014#1 1 0 null @@ -160,7 +160,7 @@ int mut,int#int,1 int int int,int#int,1 401 10008#1 23 0 null 402 10009#1 23 0 null 403 10010#1 23 0 null -404 10011#1 23 11 null +404 10011#1 23 0 null 405 10012#1 23 8 null 406 10013#1 23 11 null 407 10014#1 23 0 null diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 1e81b92ff..a8d05d76c 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -2,7 +2,7 @@ Id Style Refresh TriggerRules InitialEventId int int int int int 100001 4 2 2 100001 100002 5 2 2 100002 -100003 5 3 1 100019 +100003 5 3 2 100019 100004 5 2 1 100010 100005 5 3 2 100014 100006 5 3 2 100015 @@ -154,21 +154,26 @@ int int int int int 108004 1 2 1 108004 108005 1 2 1 108005 108006 1 2 1 108006 -108007 1 2 1 108007 -108008 1 3 1 108008 -108009 1 3 1 108009 -108010 3 2 2 108010 -108011 4 2 2 108011 -108012 5 2 2 108012 -108013 8 0 0 0 -108014 5 3 2 108013 -108015 5 3 2 108019 -108016 5 3 2 108025 -108017 5 3 2 108031 -108018 5 3 2 108037 -108019 2 1 2 108067 -108020 2 1 2 108068 -108021 2 1 2 108069 +108007 5 2 2 108007 +108008 5 2 2 108017 +108009 10 2 1 108025 +108010 5 2 2 108029 +108011 10 2 1 108030 +108012 10 2 1 108037 +108013 5 2 2 108043 +108014 1 2 1 108045 +108015 1 2 1 108046 +108016 5 2 2 108047 +108017 1 2 1 108049 +108018 1 2 1 108050 +108019 8 2 0 0 +108020 8 2 0 0 +108021 7 2 2 108051 +108022 7 2 2 108052 +108023 7 2 2 108053 +108024 7 2 2 108054 +108025 7 2 2 108055 +108026 7 2 2 108056 0 0 0 0 0 109001 1 2 1 109001 109002 1 2 1 109002 diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 888e81c76..9a72df402 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -1,6 +1,6 @@ Id Contents Rewardgroup int mut,int#int,2 mut,int#int,1 -10001 50001#50002 10001 +10001 50001#50002 3001 100001 10001 null 100002 10002#10003#10004 null 100003 10005#10006#10007 null @@ -68,15 +68,22 @@ int mut,int#int,2 mut,int#int,1 10711 50368 10707#20707 10712 50371 10708#20708 10713 50374 10709#20709 -10801 82#83#84 10801#20801 -10802 88#89#90 10802#20802 -10803 94#95#96 10803#20803 -10804 86#89#95 10804#20804 -10805 97#99 10805#20805 -10806 92#85#87 10806#20806 -10807 97#98#99 10807#20807 -10808 92 10808#20808 -10809 91#93#85#87 10809#20809 +10801 50380#50379#50381 100000 +10802 50386#50379#50381 100000 +10803 50395#50379#50381 100000 +10804 50401#50379#50381 100000 +10805 50410#50379#50381 100000 +10806 50386#50395#50401#50410 100000 +10807 50386#50395#50401#50410 100000 +10808 50386#50395#50401#50410 100000 +10809 50416#50419 100000 +10810 50416#50419 100000 +10811 50425#50428 100000 +10812 50386 100000 +10813 50395 100000 +10814 50404 100000 +10815 50413 100000 +10816 50422 100000 10901 106#107#108 10901#20901 10902 109#110#111 10902#20902 10903 104#109#111 10903#20903 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index 9bd9806fa..77b9b5281 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -24,10 +24,10 @@ int int mut,int#int,2 10503 2 1503#5 10701 2 14#2000 10702 2 14#10000 -0 0 null -0 0 null -0 0 null -0 0 null +10801 2 1503#3 +10802 2 1503#5 +10803 2 1503#10 +10804 2 1503#6 0 0 null 0 0 null 0 0 null diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 685edf47c..d52d20080 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -21,10 +21,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100019 10001 29 2#100006|100#5#18#100005 3001 4 null 100020 0 6 1 55001 4 null 100021 0 0 null null 1 100020 -100022 0 0 null null 1 100021 -100023 0 0 null null 1 100022 -100024 0 0 null null 5 100023 -100025 0 0 null null 5 100024 +100022 0 0 null null 5 100021 +100023 0 0 null null 5 100022 +100024 0 0 null null 4 null +100025 0 0 null null 0 null 100026 0 0 null null 4 null 100027 0 0 null null 1 null 100028 0 0 null null 1 null @@ -275,9 +275,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 105033 10502 29 1501#1 null 4 null 105034 0 18 6#10508#105013 null 4 null 105035 0 0 null null 4 null -105036 0 15 105014 100006 4 null -105037 0 15 105015 100006 4 null -105038 0 15 105016 700001 4 null +105036 0 15 105014 700003 4 null +105037 0 15 105015 700004 4 null +105038 0 15 105016 700003 4 null 106001 0 1 10604 null 1 106002 106002 0 0 null null 4 null 106003 0 17 7#106001|106#7#2#106009 null 4 null @@ -349,10 +349,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 106069 0 1 10603 null 1 106036 106070 0 0 null null 4 null 106071 0 8 11 null 1 106035 -106072 0 15 106025 null 4 null -106073 0 15 106026 null 4 null -106074 0 15 106027 null 4 null -106075 0 15 106028 null 4 null +106072 0 15 106025 700003 4 null +106073 0 15 106026 700004 4 null +106074 0 15 106027 700003 4 null +106075 0 15 106028 700004 4 null 107001 0 18 8#10709#107007 null 4 null 107002 0 0 null null 4 null 107003 0 0 null null 1 107009 @@ -397,106 +397,73 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 107042 0 15 107011 100006 4 null 107043 0 15 107012 100006 4 null 107044 0 15 107013 100006 4 null -108001 0 5 0 null 4 null +108001 0 0 null null 1 108008 108002 0 0 null null 4 null -108003 0 5 null null 4 null -108004 0 0 null 10102 4 null -108005 0 0 null null 4 null -108006 0 0 null null 4 null -108007 0 0 null null 1 108014 -108008 0 0 null null 4 null -108009 0 1 1080001 null 1 108015 -108010 0 0 null null 4 null -108011 0 1 1080001 null 1 108016 -108012 0 0 null null 4 null -108013 0 1 1080001 null 1 108017 +108003 0 8 12 null 1 108009 +108004 0 0 null null 1 108010 +108005 0 1 10801 null 1 108011 +108006 0 6 4 null 1 108012 +108007 0 6 4 null 1 108013 +108008 0 8 13 null 1 108014 +108009 0 8 14 null 1 108014 +108010 0 1 10801 null 1 108015 +108011 0 1 10811 null 1 108016 +108012 0 9 9 100006 4 null +108013 0 0 null null 1 108018 108014 0 0 null null 4 null -108015 0 1 1080001 null 1 108018 +108015 0 0 null null 1 108019 108016 0 0 null null 4 null -108017 0 15 108014 10102 4 null +108017 0 1 10812 null 1 108020 108018 0 0 null null 4 null -108019 0 0 null null 1 108020 -108020 0 0 null null 4 null -108021 0 1 108002 null 1 108021 -108022 0 0 null null 4 null -108023 0 1 108002 null 1 108022 -108024 0 0 null null 4 null -108025 0 1 108002 null 1 108023 -108026 0 0 null null 4 null -108027 0 1 108002 null 1 108024 -108028 0 0 null null 4 null -108029 0 15 108015 10102 4 null -108030 0 0 null null 4 null -108031 0 0 null null 1 108026 -108032 0 0 null null 4 null -108033 0 1 1080003 null 1 108027 +108019 0 0 null null 1 108021 +108020 0 0 null null 1 108022 +108021 0 8 15 null 1 108023 +108022 0 15 108020 null 1 108024 +108023 0 15 108008 null 4 null +108024 0 0 null null 1 108026 +108025 0 0 null null 4 null +108026 10801 2 1503#3 100006 1 108026 +108027 10802 2 1503#5 101006 1 108026 +108028 10803 2 1503#10 102006 1 108026 +108029 0 0 null null 1 108027 +108030 10804 2 1503#6 null 1 108028 +108031 0 0 null null 6 108026 +108032 0 31 10#13 null 6 108026 +108033 0 31 12#11 null 4 null 108034 0 0 null null 4 null -108035 0 1 1080003 null 1 108028 +108035 0 0 null null 1 108031 108036 0 0 null null 4 null -108037 0 1 1080003 null 1 108029 -108038 0 0 null null 4 null -108039 0 1 1080003 null 1 108030 -108040 0 0 null null 4 null -108041 0 15 108016 10102 4 null -108042 0 0 null null 4 null -108043 0 0 null null 1 108032 -108044 0 0 null null 4 null -108045 0 1 1080004 null 1 108033 -108046 0 0 null null 4 null -108047 0 1 1080004 null 1 108034 -108048 0 0 null null 4 null -108049 0 1 1080004 null 1 108035 -108050 0 0 null null 4 null -108051 0 1 1080004 null 1 108036 -108052 0 0 null null 4 null -108053 0 15 108017 10102 4 null -108054 0 0 null null 4 null -108055 0 0 null null 1 108038 -108056 0 0 null null 4 null -108057 0 1 1080005 null 1 108039 -108058 0 0 null null 4 null -108059 0 1 1080006 null 1 108040 +108037 0 0 null null 1 108034 +108038 0 0 null null 1 108032 +108039 0 1 10813 null 1 108033 +108040 0 0 null null 4 108032 +108041 0 0 null null 1 108035 +108042 0 0 null null 1 108032 +108043 0 0 null null 1 108036 +108044 0 0 null null 1 108032 +108045 0 15 108011 null 4 null +108046 0 0 null null 1 108038 +108047 0 0 null null 4 null +108048 0 0 null null 1 108039 +108049 0 0 null null 4 null +108050 0 0 null null 1 108040 +108051 0 0 null null 4 null +108052 0 0 null null 1 108041 +108053 0 0 null null 4 null +108054 0 1 10814 null 1 108042 +108055 0 15 108012 null 4 null +108056 0 1 10815 null 1 108044 +108057 0 0 null null 4 null +108058 0 15 108013 101006 4 null +108059 0 1 10816 null 1 108048 108060 0 0 null null 4 null -108061 0 1 1080005 null 1 108041 -108062 0 0 null null 4 null -108063 0 1 1080006 null 1 108042 -108064 0 0 null null 4 null -108065 0 1 1080005 null 1 108043 -108066 0 0 null null 4 null -108067 0 1 1080006 null 1 108044 -108068 0 0 null null 4 null -108069 0 1 1080005 null 1 108045 -108070 0 0 null null 4 null -108071 0 1 1080006 null 1 108046 -108072 0 0 null null 4 null -108073 0 1 1080007 null 1 108047 -108074 0 0 null null 4 null -108075 0 0 null null 5 108048 -108076 0 0 null null 1 108049 -108077 0 0 null null 1 108050 -108078 0 0 null null 1 108051 -108079 0 0 null null 1 108052 -108080 0 0 null null 1 108053 -108081 0 0 null null 1 108054 -108082 0 1 1080008 null 1 108055 -108083 0 0 null null 5 108056 -108084 0 0 null null 5 108057 -108085 0 0 null null 1 108058 -108086 0 0 null null 1 108059 -108087 0 0 null null 1 108060 -108088 0 0 null null 1 108061 -108089 0 0 null null 5 108062 -108090 0 0 null null 5 108063 -108091 0 0 null null 1 108064 -108092 0 0 null null 1 108065 -108093 0 22 9#108018#109#5#17 null 4 null -108094 0 0 null null 4 null -108095 1 29 1503#1 10102 4 null -108096 0 0 null null 4 null -108097 1 29 1503#1 10102 4 null -108098 0 0 null null 4 null -108099 1 29 1503#1 10102 4 null -108100 0 0 null null 4 null +108061 0 15 108016 101006 4 null +108062 0 15 108021 101006 4 null +108063 0 15 108022 101006 4 null +108064 0 15 108023 101006 4 null +108065 0 15 108024 101006 4 null +108066 0 15 108025 101006 4 null +108067 0 15 108026 101006 4 null 109001 0 5 0 null 4 null 109002 0 0 null null 4 null 109003 0 19 12#0 null 4 null diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index 3e65cefa5..4343f06f1 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -5,29 +5,47 @@ int int mut,int#int,1 int int 103 1 50003#50013 2 0 104 1 50004#50014 2 0 105 1 50005#50015 2 0 -111 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0 -112 2 101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118#51001#51002#51003#51004#51005#51006#51007#51008#51009#51010#51011#51012#51013#51014#51015#51016#51017#51018 1 0 -113 2 51019#51020#51021#51022#51023#51024#51025#51026#51027#51028#51029#51030#51031#51032#51033#51034#51035#51036#51037#51038#51039#51040#51041#51042#51043#51044#51045#51046#51047#51048#51049#51050#51051#51052#51053#51054#51055#51056#51057#51058#51059#51060#51061#51062#51063#51064#51065#51066#51067#51068#51069#51070#51071#51072 1 0 -114 2 51073#51074#51075#51076#51077#51078#51079#51080#51081#51082#51083#51084#51085#51086#51087#51088#51089#51090#51091#51092#51093#51094#51095#51096#51097#51098#51099#51100#51101#51102#51103#51104#51105#51106#51107#51108#51109#51110#51111#51112#51113#51114#51115#51116#51117#51118#51119#51120#51121#51122#51123#51124#51125#51126#51127#51128#51129#51130#51131#51132#51133#51134#51135#51136#51137#51138#51139#51140#51141#51142#51143#51144 1 0 -115 2 51145#51146#51147#51148#51149#51150#51151#51152#51153#51154#51155#51156#51157#51158#51159#51160#51161#51162#51163#51164#51165#51166#51167#51168#51169#51170#51171#51172#51173#51174#51175#51176#51177#51178#51179#51180#51181#51182#51183#51184#51185#51186#51187#51188#51189#51190#51191#51192#51193#51194#51195#51196#51197#51198#51199#51200#51201#51202#51203#51204#51205#51206#51207#51208#51209#51210#51211#51212#51213#51214#51215#51216 1 0 -121 2 50201#50101 1 0 -122 2 50202#50102 1 0 -123 2 50203#50103 1 0 -124 2 50204#50104 1 0 -125 2 50205#50105 1 0 -501 2 20047#20048#20049#20050#20051#20052 1 0 -502 2 20036#20037#20039#20043 1 0 -503 2 20025#20038#20040#20041 1 0 -504 2 20029#20031#20032#20033 1 0 -505 2 20024#20030#20042#20045 1 0 -506 2 20026#20027#20028#20046 1 0 -507 2 20034#20035#20044 1 0 -508 2 20001#20007#20010#20021 1 0 -509 2 20006#20012#20016#20020 1 0 -510 2 20003#20005#20011#20013 1 0 -511 2 20002#20004#20019#20022 1 0 -512 2 20023#20024#20025#20026#20027#20028#20029#20030#20031#20032#20033#20034#20035#20036#20037#20038#20039#20040#20041#20042#20043#20044#20045#20046 1 0 -513 2 20001#20002#20003#20004#20005#20006#20007#20008#20009#20010#20011#20012#20013#20014#20015#20016#20017#20018#20019#20020#20021#20022 1 0 +106 1 50006#50016 2 0 +107 1 50007#50017 2 0 +108 1 50008#50018 2 0 +111 2 50101#50201 1 0 +112 2 50102#50202 1 0 +113 2 50103#50203 1 0 +114 2 50104#50204 1 0 +115 2 50105#50205 1 0 +116 2 50106#50206 1 0 +117 2 50107#50207 1 0 +118 2 50108#50208 1 0 +121 2 50501#50301 1 0 +122 2 50502#50302 1 0 +123 2 50503#50303 1 0 +124 2 50504#50304 1 0 +125 2 50505#50305 1 0 +126 2 50506#50306 1 0 +127 2 50507#50307 1 0 +128 2 50508#50308 1 0 +131 2 50701#50601 1 0 +132 2 50702#50602 1 0 +133 2 50703#50603 1 0 +134 2 50704#50604 1 0 +135 2 50705#50605 1 0 +136 2 50706#50606 1 0 +137 2 50707#50607 1 0 +138 2 50708#50608 1 0 +140 2 601#602 1 0 +501 2 60047#60048#60049#60050#60051#60052 1 0 +502 2 60036#60037#60039#60043 1 0 +503 2 60025#60038#60040#60041 1 0 +504 2 60029#60031#60032#60033 1 0 +505 2 60024#60030#60042#60045 1 0 +506 2 60026#60027#60028#60046 1 0 +507 2 60034#60035#60044 1 0 +508 2 60001#60007#60010#60021 1 0 +509 2 60006#60012#60016#60020 1 0 +510 2 60003#60005#60011#60013 1 0 +511 2 60002#60004#60019#60022 1 0 +512 2 60023#60024#60025#60026#60027#60028#60029#60030#60031#60032#60033#60034#60035#60036#60037#60038#60039#60040#60041#60042#60043#60044#60045#60046 1 0 +513 2 60001#60002#60003#60004#60005#60006#60007#60008#60009#60010#60011#60012#60013#60014#60015#60016#60017#60018#60019#60020#60021#60022 1 0 701 1 60001 1 0 702 1 60002 1 0 703 1 60003 1 0 @@ -83,14 +101,14 @@ int int mut,int#int,1 int int 2000 1 6060#6000 5 0 2001 1 6061#6062#6071 5 0 2002 1 6065#6066#6067 5 0 -2003 1 6003#6005#6007#6008#6038 5 0 -2004 1 6004#6006#6007#6008#6039 5 0 -2005 1 6009#6014#6016#6017#6040 5 0 -2006 1 6010#6015#6016#6017#6041 5 0 -2007 1 6011#6014#6016#6017#6042 5 0 -2008 1 6012#6015#6016#6017#6043 5 0 -2009 1 6013#6014#6016#6017#6044 5 0 -2010 1 6018#6023#6025#6026#6045 5 0 +2003 1 6068#6069#6071 5 0 +2004 1 6081#6091#6101 5 0 +2005 1 6082#6092#6102 5 0 +2006 1 6083#6093#6103 5 0 +2007 1 6084#6094#6104 5 0 +2008 1 6085#6095#6105 5 0 +2009 1 6086#6096#6106 5 0 +2010 1 6087#6097#6107 5 0 2011 1 6019#6024#6025#6026#6046 5 0 2012 1 6020#6023#6025#6026#6047 5 0 2013 1 6021#6024#6025#6026#6048 5 0 @@ -615,6 +633,13 @@ int int mut,int#int,1 int int 10213 2 51019#51020#51021#51022#51023#51024#51025#51026#51027#51028 1 0 10409 2 51065#51066#51067#51068#51069#51070#51071#51072 1 0 10410 2 101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0 +15001 1 110001 1 0 +15002 1 110002 1 0 +15003 1 110003 1 0 +15011 1 110011 1 0 +15012 1 110012 1 0 +15013 1 110013 1 0 +15014 1 110014 1 0 55001 1 50401 1 0 55002 1 50402 1 0 55003 1 50403 1 0 @@ -622,4 +647,9 @@ int int mut,int#int,1 int int 100001 1 100001 1 0 700001 1 2028 1 0 700002 1 1047 1 0 +700003 1 31001 1 0 +700004 1 32005 1 0 100006 1 31002 1 0 +101006 1 32002 1 0 +102006 1 102003 1 0 +100000 2 50403#100000 1 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index 4bd7d0342..f8b9f9857 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -74,6 +74,8 @@ int int int float int int 417 3317 100 1.0 1 1 418 3318 100 1.0 1 1 600 3001 1 1.0 0 0 +601 12013 12 1.0 1 1 +602 12013 9988 1.0 0 0 1000 3 100 1.0 18 22 1001 3 100 1.0 14 17 1002 3 100 1.0 14 17 @@ -278,16 +280,37 @@ int int int float int int 6059 3 100 1.0 3000 3000 6060 19 100 1.0 1 1 6061 14 100 1.0 50000 50000 -6062 3 100 1.0 1000 1000 +6062 3 100 1.0 300 300 6063 14 100 1.0 80000 80000 6064 3 100 1.0 800 800 -6065 14 100 1.0 100000 100000 -6066 3 100 1.0 2000 2000 -6067 4 100 1.0 300 300 -6068 14 100 1.0 150000 150000 -6069 3 100 1.0 3000 3000 -6070 4 100 1.0 600 600 -6071 4 100 1.0 200 200 +6065 14 100 1.0 60000 60000 +6066 3 100 1.0 400 400 +6067 4 100 1.0 150 150 +6068 14 100 1.0 70000 70000 +6069 3 100 1.0 500 500 +6070 4 100 1.0 150 150 +6071 4 100 1.0 150 150 +6081 14 100 1.0 80000 80000 +6082 14 100 1.0 90000 90000 +6083 14 100 1.0 100000 100000 +6084 14 100 1.0 110000 110000 +6085 14 100 1.0 120000 120000 +6086 14 100 1.0 130000 130000 +6087 14 100 1.0 140000 140000 +6091 3 100 1.0 600 600 +6092 3 100 1.0 700 700 +6093 3 100 1.0 800 800 +6094 3 100 1.0 900 900 +6095 3 100 1.0 1000 1000 +6096 3 100 1.0 1100 1100 +6097 3 100 1.0 1200 1200 +6101 4 100 1.0 150 150 +6102 4 100 1.0 150 150 +6103 4 100 1.0 150 150 +6104 4 100 1.0 150 150 +6105 4 100 1.0 150 150 +6106 4 100 1.0 150 150 +6107 4 100 1.0 150 150 20000 11024 40 1.0 0 0 20001 11024 60 1.0 1 1 20002 11025 60 1.0 1 1 @@ -644,21 +667,21 @@ int int int float int int 31001 14 100 1.0 10000 10000 31002 14 100 1.0 20000 20000 31003 14 100 1.0 30000 30000 -31004 14 100 1.0 140000 140000 +31004 14 100 1.0 40000 40000 31005 14 100 1.0 50000 50000 31006 14 100 1.0 60000 60000 31007 14 100 1.0 70000 70000 -31008 14 100 1.0 280000 280000 +31008 14 100 1.0 80000 80000 31009 14 100 1.0 90000 90000 31010 14 100 1.0 100000 100000 31011 14 100 1.0 110000 110000 31012 14 100 1.0 120000 120000 -31013 14 100 1.0 430000 430000 +31013 14 100 1.0 130000 130000 31014 14 100 1.0 140000 140000 31015 14 100 1.0 150000 150000 31016 14 100 1.0 160000 160000 31017 14 100 1.0 170000 170000 -31018 14 100 1.0 580000 580000 +31018 14 100 1.0 180000 180000 31019 14 100 1.0 190000 190000 31020 14 100 1.0 200000 200000 31021 14 100 1.0 200000 200000 @@ -695,12 +718,12 @@ int int int float int int 32002 3 100 1.0 200 200 32003 3 100 1.0 300 300 32004 3 100 1.0 400 400 -32005 3 100 1.0 3500 3500 +32005 3 100 1.0 500 3500 32006 3 100 1.0 550 550 32007 3 100 1.0 600 600 32008 3 100 1.0 650 650 32009 3 100 1.0 700 700 -32010 3 100 1.0 4750 4750 +32010 3 100 1.0 750 750 32011 3 100 1.0 800 800 32012 3 100 1.0 850 850 32013 3 100 1.0 900 900 @@ -741,30 +764,74 @@ int int int float int int 32048 3 100 1.0 1200 1200 32049 3 100 1.0 1200 1200 32050 3 100 1.0 1200 1200 -50001 14 100 1.0 10 10 -50002 14 100 1.0 15 15 -50003 14 100 1.0 20 20 -50004 14 100 1.0 30 30 -50005 14 100 1.0 40 40 +50001 14 100 1.0 50 50 +50002 14 100 1.0 50 50 +50003 14 100 1.0 70 70 +50004 14 100 1.0 70 70 +50005 14 100 1.0 90 90 +50006 14 100 1.0 90 90 +50007 14 100 1.0 120 120 +50008 14 100 1.0 120 120 50011 3 100 1.0 3 3 -50012 3 100 1.0 4 4 +50012 3 100 1.0 3 3 50013 3 100 1.0 4 4 -50014 3 100 1.0 5 5 -50015 3 100 1.0 6 6 +50014 3 100 1.0 4 4 +50015 3 100 1.0 5 5 +50016 3 100 1.0 5 5 +50017 3 100 1.0 6 6 +50018 3 100 1.0 6 6 50401 1503 100 1.0 1 1 50402 1501 100 1.0 1 1 50403 1503 100 1.0 1 1 50404 1501 100 1.0 5 5 -50101 4 3 1.0 1 1 -50102 4 4 1.0 1 1 -50103 4 4 1.0 1 1 -50104 4 5 1.0 1 1 -50105 4 5 1.0 1 1 -50201 4 97 1.0 1 1 -50202 4 96 1.0 1 1 -50203 4 96 1.0 1 1 -50204 4 95 1.0 1 1 -50205 4 95 1.0 1 1 +50101 1007 10 1.0 1 1 +50102 1007 15 1.0 1 1 +50103 1007 20 1.0 1 1 +50104 1007 25 1.0 1 1 +50105 1007 30 1.0 1 1 +50106 1007 35 1.0 1 1 +50107 1007 40 1.0 1 1 +50108 1007 45 1.0 1 1 +50201 4 90 1.0 0 0 +50202 4 85 1.0 0 0 +50203 4 80 1.0 0 0 +50204 4 75 1.0 0 0 +50205 4 70 1.0 0 0 +50206 4 65 1.0 0 0 +50207 4 60 1.0 0 0 +50208 4 55 1.0 0 0 +50301 1008 0 1.0 1 1 +50302 1008 0 1.0 1 1 +50303 1008 0 1.0 1 1 +50304 1008 10 1.0 1 1 +50305 1008 15 1.0 1 1 +50306 1008 20 1.0 1 1 +50307 1008 25 1.0 1 1 +50308 1008 30 1.0 1 1 +50501 4 100 1.0 0 0 +50502 4 100 1.0 0 0 +50503 4 100 1.0 0 0 +50504 4 90 1.0 0 0 +50505 4 85 1.0 0 0 +50506 4 80 1.0 0 0 +50507 4 75 1.0 0 0 +50508 4 70 1.0 0 0 +50601 1009 0 1.0 1 1 +50602 1009 0 1.0 1 1 +50603 1009 0 1.0 1 1 +50604 1009 0 1.0 1 1 +50605 1009 0 1.0 1 1 +50606 1009 0 1.0 1 1 +50607 1009 0 1.0 1 1 +50608 1009 1 1.0 1 1 +50701 4 100 1.0 0 0 +50702 4 100 1.0 0 0 +50703 4 100 1.0 0 0 +50704 4 100 1.0 0 0 +50705 4 100 1.0 0 0 +50706 4 100 1.0 0 0 +50707 4 100 1.0 0 0 +50708 4 99 1.0 0 0 51001 3101 33 1.0 1 1 51002 3102 33 1.0 1 1 51003 3103 33 1.0 1 1 @@ -1041,26 +1108,26 @@ int int int float int int 60001 10001 100 1.0 1 1 60002 10002 100 1.0 1 1 60003 10003 100 1.0 1 1 -60004 10004 100 1.0 1 1 -60005 10005 100 1.0 1 1 +60004 10004 0 1.0 1 1 +60005 10005 0 1.0 1 1 60006 10006 100 1.0 1 1 60007 10007 100 1.0 1 1 -60008 10008 100 1.0 1 1 -60009 10009 100 1.0 1 1 -60010 10010 100 1.0 1 1 +60008 10008 0 1.0 1 1 +60009 10009 0 1.0 1 1 +60010 10010 0 1.0 1 1 60011 10011 100 1.0 1 1 60012 10012 100 1.0 1 1 60013 10013 100 1.0 1 1 -60014 10014 100 1.0 1 1 +60014 10014 0 1.0 1 1 60015 10015 100 1.0 1 1 -60016 10016 100 1.0 1 1 -60017 10017 100 1.0 1 1 -60018 10018 100 1.0 1 1 +60016 10016 0 1.0 1 1 +60017 10017 0 1.0 1 1 +60018 10018 0 1.0 1 1 60019 10019 100 1.0 1 1 -60020 10020 100 1.0 1 1 +60020 10020 0 1.0 1 1 60021 10021 100 1.0 1 1 60022 10022 100 1.0 1 1 -60023 10023 100 1.0 1 1 +60023 10023 0 1.0 1 1 60024 10024 100 1.0 1 1 60025 10025 100 1.0 1 1 60026 10026 100 1.0 1 1 @@ -1090,4 +1157,14 @@ int int int float int int 60050 10050 100 1.0 1 1 60051 10051 100 1.0 1 1 60052 10052 100 1.0 1 1 +110001 1001 100 1.0 50 50 +110002 1001 100 1.0 350 350 +110003 1001 100 1.0 3500 3500 +110011 1001 100 1.0 60 60 +110012 1001 100 1.0 240 240 +110013 1001 100 1.0 420 420 +110014 1001 100 1.0 4200 4200 103001 13025 100 1.0 1 1 +100000 14 100 1.0 0 0 +100001 14 100 1.0 1000 1000 +102003 4 100 1.0 40 40 diff --git a/conf/server/WorkShopRebuildConfig.txt b/conf/server/WorkShopRebuildConfig.txt index a2cfe3782..0f424c712 100644 --- a/conf/server/WorkShopRebuildConfig.txt +++ b/conf/server/WorkShopRebuildConfig.txt @@ -1,7 +1,7 @@ Id Quality SecondaryCost Exp int int mut,int#int,2 int -1 1 1007#100 1 -2 2 1007#101 2 -3 3 1007#102 3 -4 4 1007#103 4 +1 1 1001#5000 10 +2 2 1001#25000 22 +3 3 1001#5000|14#20000 44 +4 4 1001#25000|14#70000 88 0 0 null 0 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 918ce7b30..2cec030cc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -48,7 +48,7 @@ public class ItemLogic { cost = new StringBuilder(item.getItemId() + "#" + item.getItemNum()); SItem sItem = SItem.getsItemMap().get(item.getItemId()); if (sItem.getIfResolve() ==0){ - MessageUtil.sendErrorResponse(iSession,0,msgId,""); + MessageUtil.sendErrorResponse(iSession,0,msgId,"物品中有不可分解道具"); return; } reward = new StringBuilder(sItem.getResolveReward()); diff --git a/test/src/main/java/ExcelUtils.java b/test/src/main/java/ExcelUtils.java index cb137b3fc..fa0fd8831 100644 --- a/test/src/main/java/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -8,7 +8,7 @@ import java.util.*; public class ExcelUtils { private static boolean isWrite = true; - private static String excelPath ="C:/ljsd/demo/tmp/"; //excel 文件 + private static String excelPath ="C:/ljsd/demo/tmp/base_data/"; //excel 文件 private static String path = "conf/server/"; private static Set oldFileNames = new HashSet<>(); private static String javaFilePath = "serverlogic/src/main/java/com/ljsd/jieling/config/";