diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 65d021ef3..38298abb4 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -22,7 +22,7 @@ int int int mut,int#int,2 int 20 103 2 10304|1 20 21 103 1 103014#103016#103018#103020#103022#103024#103026#103028#103029#103030|1 15 22 103 1 103042#103044#103045#103046|1 10 -23 103 1 103078#103080#103082#103084#103086#103088#103090#103091#103092|1 20 +23 103 1 103178#103180#103181#103182|1 20 24 103 1 103102#103104#103106#103108#103110#103112#103114#103116#103118#103120#103121#103122#103124#103126#103128#103129#103130|1 10 25 103 7 0|1 10 26 103 7 0|3 15 diff --git a/conf/server/ActivityRewardConfig.txt b/conf/server/ActivityRewardConfig.txt index 019ef9b78..7c2fcece1 100644 --- a/conf/server/ActivityRewardConfig.txt +++ b/conf/server/ActivityRewardConfig.txt @@ -35,10 +35,10 @@ int int mut,int#int,2 mut,int#int,2 44 5 100#1 16#100|3#5003 45 5 100#2 16#100|3#5004 46 5 100#3 16#100|3#5005 -51 6 9#10 16#100 -52 6 9#20 16#200 -53 6 9#30 16#300 -54 6 9#40 16#400 -55 6 9#50 16#500 -56 6 9#60 16#600 -57 6 9#70 16#700 +51 6 9#10 19#10 +52 6 9#15 19#10 +53 6 9#20 19#10 +54 6 9#25 19#10 +55 6 9#30 19#10 +56 6 9#35 19#10 +57 6 9#40 19#10 diff --git a/conf/server/ChallengeMissionConfig.txt b/conf/server/ChallengeMissionConfig.txt index 1d872f17b..7d1642510 100644 --- a/conf/server/ChallengeMissionConfig.txt +++ b/conf/server/ChallengeMissionConfig.txt @@ -3,7 +3,7 @@ int int mut,int#int,1 1 1 2000 2 5 2001 3 3 2002 -4 5 2003#51 +4 6 2003#51 5 4 2004#51 6 3 2005#51 7 4 2006#51 diff --git a/conf/server/DialogueViewConfig.txt b/conf/server/DialogueViewConfig.txt index 6ca4fc894..9dce4e061 100644 --- a/conf/server/DialogueViewConfig.txt +++ b/conf/server/DialogueViewConfig.txt @@ -199,6 +199,18 @@ + + + + + + + + + + + + diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index edf9a4df4..83e0aff7e 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -308,6 +308,33 @@ int mut,int#int,1 103069 10306 103070 103134#103135 103071 103136#103137 +103072 103138#103139 +103073 103140#103141 +103074 103142#103143 +103075 103144#103145 +103076 103146#103147 +103077 103148#103149 +103078 103150#103151 +103079 103152#103153 +103080 103154#103155 +103081 103156#103157 +103082 103158#103159 +103083 103160#103161 +103084 103162#103163 +103085 103164#103165 +103086 103166#103167 +103087 103168#103169 +103088 103170#103171#103172 +103089 103173#103174 +103090 103175#103176 +103091 103177#103178 +103092 103179#103180 +103093 103181#103182 +103094 103183#103184 +103095 103185#103186 +103096 103187#103188 +103097 103189#103190 +103098 10309 104001 104001#104002 104002 104003#104004 104003 104005#104006 @@ -337,20 +364,30 @@ int mut,int#int,1 104027 104054#104055 104028 104056#104057 104029 104058#104059 -104030 104060#104061 +104030 null 104031 104062#104063 104032 104064#104065 104033 104066#104067 104034 104068#104069 104035 104070#104071 104036 104072#104073 -104037 104074#104075 +104037 null 104038 104076#104077 104039 104078#104079 104040 104080 104041 104081 104042 104082 104043 10404 +104044 104083#104084 +104045 104085#104086 +104046 104087#104088 +104047 104089#104090 +104048 104091#104092 +104049 104093#104094 +104050 104095#104096 +104051 104097#104098 +104052 104099#104100 +104053 104101#104102 105001 105001#105002 105002 105003#105004 105003 105005#105006 diff --git a/conf/server/FoodsConfig.txt b/conf/server/FoodsConfig.txt index c3c2ae335..5141a215d 100644 --- a/conf/server/FoodsConfig.txt +++ b/conf/server/FoodsConfig.txt @@ -34,5 +34,5 @@ int int int int mut,int#int,2 int 1001 0 2 2 6#100002 2 1002 10 2 2 2#2 2 1 0 1 1 1#1000 2 -2 5 1 1 2#150|3#150|4#150 2 +2 30 1 1 2#200|3#200|4#200|5#200 2 17 0 2 2 6#201028 2 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 86eb24ff9..90ffbeec9 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -54,6 +54,10 @@ int int int int int mut,int#int,2 103008 7 2 2 103066 null 103009 7 2 2 103067 null 103010 7 2 2 103068 null +103011 5 2 2 103094 null +103012 5 2 2 103096 null +103013 5 2 2 103072 null +103014 1 2 1 103098 null 0 0 0 0 0 null 104001 5 2 2 104001 null 104002 5 2 2 104011 null @@ -64,6 +68,10 @@ int int int int int mut,int#int,2 104007 7 2 2 104040 null 104008 7 2 2 104041 null 104009 7 2 2 104042 null +104010 10 2 2 0 null +104011 5 2 2 0 null +104012 5 2 2 0 null +104013 1 2 1 0 null 0 0 0 0 0 null 105001 5 2 2 105001 null 105002 10 2 1 105010 null diff --git a/conf/server/Map_101.txt b/conf/server/Map_101.txt index 40ef627b6..9841c49f5 100644 --- a/conf/server/Map_101.txt +++ b/conf/server/Map_101.txt @@ -8,7 +8,8 @@ int int mut,int#int,2 int 6 101016 10#3|12#6|3#14|14#16|9#18 1 7 101015 2#19 0 8 101014 10#12 0 -9 101001 11#8 0 -10 101012 13#18 0 -11 101011 10#18 0 -12 101010 4#12 0 +9 100005 13#12 0 +10 101001 11#8 0 +11 101012 13#18 0 +12 101011 10#18 0 +13 101010 4#12 0 diff --git a/conf/server/Map_103.txt b/conf/server/Map_103.txt index 62c74c03b..2169f48e9 100644 --- a/conf/server/Map_103.txt +++ b/conf/server/Map_103.txt @@ -1,6 +1,6 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 103006 1#1|2#1|3#1|4#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|3#2|9#2|12#2|13#2|14#2|15#2|1#3|2#3|14#3|15#3|1#4|2#4|13#4|14#4|15#4|1#5|15#5|1#6|4#6|5#6|15#6|1#7|4#7|5#7|6#7|4#8|5#8|6#8|5#9|6#9|10#9|5#10|6#10|10#10|11#10|9#11|10#11|11#11|13#11|14#11|9#12|10#12|11#12|12#12|13#12|14#12|8#13|9#13|10#13|11#13|12#13|13#13|14#13|15#13|7#14|8#14|9#14|10#14|11#14|12#14|13#14|14#14|15#14|5#15|6#15|7#15|8#15|9#15|10#15|11#15|12#15|13#15|14#15|15#15 1 +1 103006 1#1|2#1|3#1|4#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|3#2|9#2|12#2|13#2|14#2|15#2|1#3|2#3|14#3|15#3|1#4|2#4|13#4|14#4|15#4|1#5|15#5|1#6|4#6|5#6|15#6|1#7|4#7|5#7|6#7|4#8|5#8|6#8|5#9|6#9|10#9|5#10|6#10|10#10|11#10|9#11|10#11|11#11|13#11|14#11|9#12|11#12|12#12|13#12|14#12|8#13|9#13|13#13|14#13|15#13|7#14|8#14|9#14|10#14|11#14|12#14|13#14|14#14|15#14|5#15|6#15|7#15|8#15|9#15|10#15|11#15|12#15|13#15|14#15|15#15 1 2 103008 8#2 0 3 103007 4#4|7#5|9#7|2#8|5#12 1 4 103009 2#5 0 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 5ac2385b8..55c7d0fd8 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -1,27 +1,30 @@ Id MonsterId Type Profession Quality Level Hp Attack PhysicalDefence MagicDefence Speed Hit Dodge CritFactor CritDamageFactor DamageBocusFactor DamageReduceFactor CureFacter TreatFacter DifferDemonsReduceFactor AntiCritDamageFactor DifferDemonsBocusFactor PropertyName ElementDamageBonusFactor ElementDamageReduceFactor SkillList PassiveSkillList int int int int int int int int int int int float float float float float float float float float float float int float mut,float#float,1 mut,int#int,1 mut,int#int,1 10101 4 3 0 3 24 4500 224 60 224 240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20059 null -10102 4 3 0 2 24 4500 209 60 224 400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20058 null -10103 2 3 0 1 24 2500 97 60 101 7 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20003 null -10104 2 3 0 1 24 2500 97 60 101 240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null -10105 2 3 0 1 24 2500 97 60 101 400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null -10201 10040 1 3 2 24 8953 436 122 468 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null -10202 13 1 0 1 24 2984 318 122 338 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null -10203 13 1 0 1 24 2984 318 122 338 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20003 null -10204 14 1 0 2 24 4974 200 122 208 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null -10205 17 3 0 3 24 4974 338 122 338 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null -10206 17 3 0 2 24 4974 318 122 338 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20003 null -10207 23 3 0 1 24 4974 318 122 338 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null -10208 17 3 0 2 24 14922 727 122 338 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null -10209 24 2 0 4 24 8290 334 122 338 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null -10210 35 3 0 3 24 8290 531 122 338 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null -10301 10040 1 0 2 40 14922 727 203 780 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null -10302 42 1 0 1 40 8290 334 203 347 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20018 null -10303 8 3 0 2 40 8290 531 203 780 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20017 null -10304 5 1 0 3 40 8290 563 203 780 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null -10305 23 4 0 2 0 8290 531 203 563 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20021 null -10306 23 4 0 2 0 8290 531 203 563 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20020 null -10307 23 4 0 2 0 8290 531 203 563 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20022 null +10102 4 3 0 2 24 4500 209 60 209 400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20059 null +10103 2 3 0 1 24 2500 97 60 97 7 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null +10104 2 3 0 1 24 2500 97 60 97 240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null +10105 2 3 0 1 24 2500 97 60 97 400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null +10201 10040 1 3 2 24 8953 436 122 436 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null +10202 13 1 0 1 24 2984 318 122 318 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null +10203 13 1 0 1 24 2984 318 122 318 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null +10204 14 1 0 2 24 4974 200 122 200 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20003 null +10205 17 3 0 3 24 4974 338 122 338 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null +10206 17 3 0 2 24 4974 318 122 318 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null +10207 23 3 0 1 24 4974 318 122 318 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20003 null +10208 17 3 0 2 24 4974 318 122 318 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20002 null +10209 24 2 0 4 24 4974 216 122 216 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null +10210 35 3 0 3 24 8953 468 122 468 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20244#20247 null +10301 10040 1 0 2 40 14922 727 203 727 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null +10302 42 1 0 1 40 8290 334 203 334 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20016 null +10303 8 3 0 2 40 8290 531 203 531 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20018 null +10304 5 1 0 3 40 8290 563 203 563 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null +10305 23 4 0 2 0 8290 531 203 531 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20019 null +10306 23 4 0 2 0 8290 531 203 531 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20021 null +10307 23 4 0 2 0 8290 531 203 531 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20023 null +10308 5 1 0 3 0 8290 563 203 563 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null +10309 3 2 0 3 0 8290 563 203 563 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20029 null +10310 5 1 0 2 0 8290 531 203 531 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null 10401 8 3 0 2 56 11606 743 285 1092 52 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20030 null 10402 3 2 0 2 56 11606 743 285 789 1584 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20029 null 10403 8 3 0 3 56 11606 789 285 1092 2640 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20028 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index f64f45174..e630a847b 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -26,6 +26,9 @@ int mut,int#int,2 mut,int#int,1 10304 10304 40003#51 10305 10305#10306#10307 40003 10306 1035331#1035332#1035333 3011 +10307 10308 40003#40003#51 +10308 10309 40003#40003#51 +10309 10310 40003#51 10401 10401 40004 10402 10402 40004 10403 10403 40004#52 @@ -84,50 +87,50 @@ int mut,int#int,2 mut,int#int,1 25007 10201 101 25008 10201 101 201007 100002#100001#100003|100004#100001#100003 21 -201008 100002#100001#100003|100004#100001#100003|100005 23 -202007 100007#100006#100008|100009#100006#100008 21 +201008 100002#100001#100003|100004#100001#100003|100005 22 +202007 100007#100006#100008|100009#100006#100008 23 202008 100007#100006#100008|100011#100010#100012|100013 24 -203007 100015#100014#100016|100018#100014#100015#100016#100017 21 -203008 100018#100014#100015#100016#100017|100019 21 +203007 100015#100014#100016|100018#100014#100015#100016#100017 24 +203008 100018#100014#100015#100016#100017|100019 25 203009 100015#100014#100016|100018#100014#100015#100016#100017|100020 25 -204007 100022#100021#100023|100024 21 -204008 100022#100021#100023|100025 21 -204009 100022#100021#100023|100025|100026 27 -205007 100028#100027#100029|100030 21 -205008 100030#100031|100032#100030#100031 21 -205009 100032#100030#100031|100032#100030#100031|100033 21 -205010 100032#100030#100031|100033|100034 28 -206007 100032#100030#100031|100033 21 -206008 100039#100041|100040#100039#100041 21 -206009 100039#100041|100040#100039#100041|100042#100039#100041 29 -207007 100044#100043#100045|100046#100043#100045 21 -207008 100049#100048#100050|100051 21 -207009 100049#100048#100050|100046#100048#100050|100051 21 +204007 100022#100021#100023|100024 26 +204008 100022#100021#100023|100025 27 +204009 100022#100021#100023|100025|100026 28 +205007 100028#100027#100029|100030 27 +205008 100030#100031|100032#100030#100031 28 +205009 100032#100030#100031|100032#100030#100031|100033 29 +205010 100032#100030#100031|100033|100034 29 +206007 100032#100030#100031|100033 28 +206008 100039#100041|100040#100039#100041 29 +206009 100039#100041|100040#100039#100041|100042#100039#100041 30 +207007 100044#100043#100045|100046#100043#100045 29 +207008 100049#100048#100050|100051 29 +207009 100049#100048#100050|100046#100048#100050|100051 30 207010 100046#100047|100051|100052 31 -208007 100054#100053#100055|100057#100054#100055 21 -208008 100054#100053#100055|100057#100054#100055|100058 36 -209007 100059|100060 21 -209008 100060#100061|100062#100060#100061 21 -209009 100062#100060#100061|100063#100064 37 -210007 100065#100066#100067|100069#100066#100068 21 -210008 100069#100066#100067|100071#100070#100072 21 -210009 100071#100070#100072|100073#100074|100075#100073#100074 21 -210010 100073#100074|100075#100073#100074|100076 38 -211007 100078#100077#100079|100080 21 -211008 100081|100083 21 -211009 100082|100083|100084 34 -212007 100086#100085|100086#100087#100085 21 -212008 100086#100087#100088|100089 21 -212009 100086#100087#100088|100089|100090 40 -213007 100092#100091#100093|100094 21 -213008 100092#100091#100093|100094|100095 41 -214007 100096 21 -214008 100097 21 -214009 100098 21 -214010 100099 42 -215007 100101#100100#100102|100103#100100#100102 21 -215008 100105#100104#100106|100107#100104#100106 21 -215009 100103#100100#100102|100107#100104#100106|100108 43 +208007 100054#100053#100055|100057#100054#100055 30 +208008 100054#100053#100055|100057#100054#100055|100058 31 +209007 100059|100060 31 +209008 100060#100061|100062#100060#100061 31 +209009 100062#100060#100061|100063#100064 32 +210007 100065#100066#100067|100069#100066#100068 32 +210008 100069#100066#100067|100071#100070#100072 33 +210009 100071#100070#100072|100073#100074|100075#100073#100074 34 +210010 100073#100074|100075#100073#100074|100076 34 +211007 100078#100077#100079|100080 34 +211008 100081|100083 34 +211009 100082|100083|100084 35 +212007 100086#100085|100086#100087#100085 35 +212008 100086#100087#100088|100089 35 +212009 100086#100087#100088|100089|100090 36 +213007 100092#100091#100093|100094 36 +213008 100092#100091#100093|100094|100095 37 +214007 100096 36 +214008 100097 36 +214009 100098 37 +214010 100099 38 +215007 100101#100100#100102|100103#100100#100102 37 +215008 100105#100104#100106|100107#100104#100106 38 +215009 100103#100100#100102|100107#100104#100106|100108 39 1010001 1002#1003 100004#102005#102004 1010002 1005#1006 100004#102002#102005 1010003 1008#1009 100004#100003#102005#102004#102002#102001 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index c9f4f0822..482062d62 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -14,8 +14,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100012 0 1 10001 null 1 100011 100013 0 13 1 null 1 100012 100014 0 15 100004 null 4 null -100015 10201 2 1521#10|1522#10 700001 4 null -100016 0 0 null null 4 null +100015 0 19 4#101#14#10 null 4 null +100016 0 5 101#14#10 null 4 null 100017 0 0 null null 4 null 100018 0 0 null null 4 null 100019 0 15 100006 null 4 null @@ -412,10 +412,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102245 0 15 102017 40002#40002 4 null 102246 0 0 null null 1 102131 102247 0 0 null null 1 102131 -102248 0 34 1#102011 null 4 null +102248 0 8 1 null 6 102120 102249 0 8 2 null 1 102132 -102250 0 15 102011 null 4 null -102251 0 15 102011 null 4 null +102250 0 0 null null 6 102120 +102251 0 0 null null 6 102120 102252 0 0 null null 1 102134 102253 0 0 null null 1 102134 102254 0 20 10209#102007 null 4 null @@ -491,10 +491,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103069 0 0 null null 1 103036 103070 0 0 null null 1 103036 103071 0 1 10305 null 1 103037 -103072 0 1 10305 null 1 103038 -103073 0 0 null null 1 103038 -103074 0 0 null null 1 103038 -103075 0 0 null null 1 103039 +103072 0 1 10305 null 1 103037 +103073 0 30 103#12#13#103013 null 1 103038 +103074 0 30 103#12#13#103013 null 1 103038 +103075 0 22 4#103004#103#10#12 null 4 null 103076 0 0 null null 4 null 103077 0 0 null null 1 103040 103078 0 35 103004|103#11#5#103005 null 4 null @@ -557,6 +557,59 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103135 0 0 null null 1 103071 103136 10302 0 null null 1 103047 103137 0 0 null null 4 null +103138 0 0 null null 1 103073 +103139 0 0 null null 1 103075 +103140 0 0 null null 1 103074 +103141 0 0 null null 1 103075 +103142 0 0 null null 1 103075 +103143 0 0 null null 1 103075 +103144 0 1 10307 null 1 103076 +103145 0 0 null null 4 null +103146 0 0 null null 1 103077 +103147 0 0 null null 1 103088 +103148 0 0 null null 1 103078 +103149 0 0 null null 1 103088 +103150 0 0 null null 1 103079 +103151 0 0 null null 1 103088 +103152 0 0 null null 1 103080 +103153 0 0 null null 1 103088 +103154 0 0 null null 1 103081 +103155 0 0 null null 1 103088 +103156 0 0 null null 1 103082 +103157 0 0 null null 1 103088 +103158 0 0 null null 1 103083 +103159 0 0 null null 1 103088 +103160 0 0 null null 1 103084 +103161 0 0 null null 1 103088 +103162 0 0 null null 1 103085 +103163 0 0 null null 1 103088 +103164 0 0 null null 1 103086 +103165 0 0 null null 1 103088 +103166 0 0 null null 1 103087 +103167 0 0 null null 1 103088 +103168 0 0 null null 1 103088 +103169 0 0 null null 1 103088 +103170 0 6 1 40003 1 103093 +103171 0 6 1 51 1 103093 +103172 0 6 1 null 1 103089 +103173 0 0 null null 1 103090 +103174 0 0 null null 1 103090 +103175 0 1 10308 null 1 103091 +103176 0 0 null null 4 null +103177 0 0 null null 1 103092 +103178 0 19 4#103#6#5 null 4 null +103179 0 0 null null 1 103093 +103180 0 19 4#103#6#5 null 4 null +103181 0 19 4#103#6#5 null 4 null +103182 0 19 4#103#6#5 null 4 null +103183 0 0 null null 1 103095 +103184 0 0 null null 1 103095 +103185 0 5 103#3#12 null 4 null +103186 0 0 null null 4 null +103187 0 0 null null 1 103097 +103188 0 0 null null 1 103097 +103189 0 5 103#6#5 null 4 null +103190 0 0 null null 4 null 104001 0 0 null null 1 104002 104002 0 0 null null 1 104004 104003 0 0 null null 1 104003 @@ -613,19 +666,19 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104054 0 6 2 null 1 104028 104055 0 0 null null 4 null 104056 0 0 null null 1 104029 -104057 0 0 null null 1 104030 -104058 0 0 null null 1 104030 -104059 0 0 null null 1 104030 -104060 0 0 null null 1 104031 -104061 0 0 null null 1 104037 +104057 0 0 null null 4 null +104058 0 0 null null 1 104031 +104059 0 0 null null 4 null +104060 0 0 null null 0 null +104061 0 0 null null 0 null 104062 0 0 null null 1 104032 -104063 0 0 null null 1 104034 +104063 0 0 null null 4 null 104064 0 0 null null 1 104033 -104065 0 0 null null 1 104034 +104065 0 0 null null 4 null 104066 0 0 null null 1 104034 -104067 0 0 null null 1 104034 -104068 0 0 null null 1 104035 -104069 0 0 null null 1 104036 +104067 0 0 null null 4 null +104068 0 0 null null 4 null +104069 0 0 null null 4 null 104070 0 9 5 3001 4 null 104071 0 9 5 3001 4 null 104072 0 9 5 null 4 null @@ -639,6 +692,29 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104080 0 15 104007 40004#52 4 null 104081 0 15 104008 40004#52 4 null 104082 0 15 104009 40004#52 4 null +104083 0 0 null null 0 null +104084 0 0 null null 0 null +104085 0 0 null null 0 null +104086 0 0 null null 0 null +104087 0 0 null null 0 null +104088 0 0 null null 0 null +104089 0 0 null null 0 null +104090 0 0 null null 0 null +104091 0 0 null null 0 null +104092 0 0 null null 0 null +104093 0 0 null null 0 null +104094 0 0 null null 0 null +104095 0 0 null null 0 null +104096 0 0 null null 0 null +104097 0 0 null null 0 null +104098 0 0 null null 0 null +104099 0 0 null null 0 null +104100 0 0 null null 0 null +104101 0 0 null null 0 null +104102 0 0 null null 0 null +104103 0 0 null null 0 null +104104 0 0 null null 0 null +104105 0 0 null null 0 null 105001 0 0 null null 1 105002 105002 0 11 105001|105#16#19#105002|105#15#25#105002|105#16#23#105003|105#18#11#105004 null 6 105061 105003 0 0 null null 1 105003 diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index b7ef0d4d8..400a95f2d 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -4,50 +4,39 @@ int int mut,int#int,1 int int 22 2 1001#1002#1003#1004#1005#1006#1007#1008#1009#1010#1011#1012#1013#1014#1015#1016#1017#1018#1019#1020#1021#1022#1023#1024#1025#1026#1027#1028#1029#1030#1031#1032#1033#1034#1035#1036#1037#1038#1039#1040#1041#1042#1043#1044#1045#1046#1047#1048#1049#1050#1051#1052#1053#1054#1055#1056#1057#1058#1059#1060#1061#1062#1063#1064#1065#1066#1067#1068#1069#1070#1071#1072#1073#1074#1075#1076#1077#1078 1 0 23 2 1201#1202#1203#1204#1205#1206#1207#1208#1209#1210#1211#1212#1213#1214#1215#1216#1217#1218#1219#1220#1221#1222#1223#1224#1225#1226#1227#1228#1229 1 0 24 2 1601#1602#1603#1604#1605#1606#1607#1608#1609#1610#1611#1612#1613#1614#1615#1616#1617#1618#1619#1620 1 0 -25 2 1401#1402#1403#1404#1405#1406#1407#1408#1409#1410#1411#1412#1413#1414#1415#1416 1 0 +25 2 1401#1402#1403#1404#1405#1406#1407#1408#1409#1410#1411#1412#1413#1414#1415 1 0 26 2 2001#2002#2003#2004#2005#2006#2007#2008#2009#2010#2011#2012#2013#2014#2015#2016#2017#2018#2019#2020#2021#2022#2023#2024#2025#2026 1 0 27 2 2101#2102#2103#2104#2105#2106#2107#2108#2109#2110#2111#2112#2113#2114#2115#2116#2117#2118#2119#2120#2121#2122#2123#2124 1 0 28 2 2201#2202#2203#2204#2205#2206#2207#2208#2209#2210#2211#2212#2213#2214#2215#2216#2217#2218#2219#2220#2221#2222#2223#2224#2225#2226 1 0 29 2 2401#2402#2403#2404#2405#2406#2407#2408#2409#2410#2411#2412#2413#2414#2415#2416#2417#2418#2419#2420#2421 1 0 -30 2 3001#3002#3003#3004#3005#3006#3007#3008#3009#3010#3011#3012#3013#3014#3015#3016#3017#3018#3019#3020#3021#3022#3023#3024#3025#3026#3027#3028#3029#3030#3031#3032#3033#3034#3035#3036#3037#3038#3039#3040#3041#3042#3043#3044#3045#3046#3047#3048#3049#3050#3051#3052#3053#3054#3055#3056#3057#3058#3059#3060#3061#3062#3063#3088#3089#3090#3091#3092#3093#3094#3095#3096#3097#3098#3099#3100#3101#3102#3103#3104#3105#3106#3107#3108#3109#3110 1 0 -31 2 3201#3202#3203#3204#3205#3206#3207#3208#3209#3210#3211#3212#3213#3214#3215#3216 1 0 -32 2 3401#3402#3403#3404#3405#3406#3407#3408#3409#3410#3411#3412#3413#3414#3415#3416#3417#3418#3419#3420#3421#3422#3423#3424#3425#3426 1 0 -33 2 4001#4002#4003#4004#4005#4006#4007#4008#4009#4010#4011#4012#4013#4014#4015#4016#4017#4018#4019#4020#4021#4022#4023#4024#4025#4026#4027#4028#4029#4030#4031#4032#4033#4034#4035#4036#4037#4038#4039#4040#4041#4042#4043#4044#4045#4046#4047#4048#4049#4050#4051#4052#4053#4054#4055#4056#4057#4058#4059#4060#4061#4062#4063#40644067#4068#4069#4070#4071#4072#4073#4074#4075#4076#4077#4078#4079#4080#4081#4082#4083#4084#4085#4086#4087#4088#4089#4090#4091 1 0 -34 2 4201#4202#4203#4204#4205#4206#4207#4208#4209#4210#4211#4212#4213#4214#4215#4216#4217#4218#4219#4220#4221 1 0 -35 2 4401#4402#4403#4404#4405#4406#4407#4408#4409#4410#4411#4412#4413#4414#4415#4416#4417#4418#4419#4420#4421#4422#4423#4424#4425#4426#4427#4428#4429#4430#4431#4432#4433#4434#4435#4436#4437#4438#4439#4440#4441#4442#4443#4444#4445#4446#4447#4448#4449#4450#4451#4452#4453#4454#4455#4456 1 0 -36 2 3401#3402#3403#3404#3405#3406#3407#3408#3409#3410#3411#3412#3413#3414#3415#3400 1 0 -37 2 3416#3417#3418#3419#3420#3421#3422#3423#2424#3425#3426 1 0 -38 2 3064#3065#3066#3067#3068#3069#3070#3071#3072#3073#3074#3087#3075#3076#3077#3078#3079#3080#3081#3082#3083#3084#3085#3086 1 0 -40 2 4401#4402#4403#4404#4405#4406#4407#4408#4409#4410#4411#4412#4413#4414#4415#4416#4417#4418#4419#4420#4421#4422#4423#4424#4425#4426#4427#4428#4429#4430#4431#4432#4433#4434#4435#4457 1 0 -41 2 4436#4437#4438#4439#4440#4441#4442#4458 1 0 -42 2 4450#4451#4452#4453#4454#4455#4456 1 0 -43 2 4443#4444#4445#4446#4447#4448#4449#4459 1 0 -44 2 4041#4042#4043#4044#4045#4046#4047#4048#4049#4050#4051#4052#4066 1 0 -45 2 4053#4054#4055#4056#4057#4058#4059#4060#4061#4062#4063#4064#4065 1 0 -51 2 1001#1002#1003#1004#1005#1006#1007#1008#1009#1010#1011#1012#1013#1014#1015#1016#1017#1018#1019#1020#1021#1022#1023#1024#1025#1026#1027#1028#1029#1030#1031#1032#1033#1034#1035#1036#1037#1038#1039#1040#1041#1042#1043#1044#1045#1046#1047#1048#1049#1050#1051#1052#1053#1054#1055#1056#1057#1058#1059#1060#1061#1062#1063#1064#1065#1066#1067#1068#1069#1070#1071#1072#1073#1074#1075#1076#1077#1078 1 0 -52 2 1201#1202#1203#1204#1205#1206#1207#1208#1209#1210#1211#1212#1213#1214#1215#1216#1217#1218#1219#1220#1221#1222#1223#1224#1225#1226#1227#1228#1229 1 0 -53 2 1601#1602#1603#1604#1605#1606#1607#1608#1609#1610#1611#1612#1613#1614#1615#1616#1617#1618#1619#1620 1 0 -54 2 1401#1402#1403#1404#1405#1406#1407#1408#1409#1410#1411#1412#1413#1414#1415#1416 1 0 -61 2 2001#2002#2003#2004#2005#2006#2007#2008#2009#2010#2011#2012#2013#2014#2015#2016#2017#2018#2019#2020#2021#2022#2023#2024#2025 1 0 -62 2 2101#2102#2103#2104#2105#2106#2107#2108#2109#2110#2111#2112#2113#2114#2115#2116#2117#2118#2119#2120#2121#2122#2123 1 0 -63 2 2201#2202#2203#2204#2205#2206#2207#2208#2209#2210#2211#2212#2213#2214#2215#2216#2217#2218#2219#2220#2221#2222#2223#2224#2225 1 0 -64 2 2401#2402#2403#2404#2405#2406#2407#2408#2409#2410#2411#2412#2413#2414#2415#2416#2417#2418#2419#2420 1 0 -71 2 3001#3002#3003#3004#3005#3006#3007#3008#3009#3010#3011#3012#3013#3014#3015#3016#3017#3018#3019#3020#3021#3022#3023#3024#3025#3026#3027#3028#3029#3030#3031#3032#3033#3034#3035#3036#3037#3038#3039#3040#3041#3042#3043#3044#3045#3046#3047#3048#3049#3050#3051#3052#3053#3054#3055#3056#3057#3058#3059#3060#3061#3062#3063#3088#3089#3090#3091#3092#3093#3094#3095#3096#3097#3098#3099#3100#3101#3102#3103#3104#3105#3106#3107#3108#3109 1 0 -72 2 3201#3202#3203#3204#3205#3206#3207#3208#3209#3210#3211#3212#3213#3214#3215 1 0 -73 2 3401#3402#3403#3404#3405#3406#3407#3408#3409#3410#3411#3412#3413#3414#3415#3416#3417#3418#3419#3420#3421#3422#3423#3424#3425 1 0 -81 2 4001#4002#4003#4004#4005#4006#4007#4008#4009#4010#4011#4012#4013#4014#4015#4016#4017#4018#4019#4020#4021#4022#4023#4024#4025#4026#4027#4028#4029#4030#4031#4032#4033#4034#4035#4036#4037#4038#4039#4040#4041#4042#4043#4044#4045#4046#4047#4048#4049#4050#4051#4052#4053#4054#4055#4056#4057#4058#4059#4060#4061#4062#4063#40644067#4068#4069#4070#4071#4072#4073#4074#4075#4076#4077#4078#4079#4080#4081#4082#4083#4084#4085#4086#4087#4088#4089#4090 1 0 -82 2 4201#4202#4203#4204#4205#4206#4207#4208#4209#4210#4211#4212#4213#4214#4215#4216#4217#4218#4219#4220 1 0 -83 2 4401#4402#4403#4404#4405#4406#4407#4408#4409#4410#4411#4412#4413#4414#4415#4416#4417#4418#4419#4420#4421#4422#4423#4424#4425#4426#4427#4428#4429#4430#4431#4432#4433#4434#4435#4436#4437#4438#4439#4440#4441#4442#4443#4444#4445#4446#4447#4448#4449#4450#4451#4452#4453#4454#4455 1 0 -89 2 3401#3402#3403#3404#3405#3406#3407#3408#3409#3410#3411#3412#3413#3414#3415 1 0 -90 2 3416#3417#3418#3419#3420#3421#3422#3423#2424#3425 1 0 -93 2 3064#3065#3066#3067#3068#3069#3070#3071#3072#3073#3074 1 0 -94 2 3075#3076#3077#3078#3079#3080#3081#3082#3083#3084#3085 1 0 -95 2 4401#4402#4403#4404#4405#4406#4407#4408#4409#4410#4411#4412#4413#4414#4415#4416#4417#4418#4419#4420#4421#4422#4423#4424#4425#4426#4427#4428#4429#4430#4431#4432#4433#4434#4435 1 0 -96 2 4436#4437#4438#4439#4440#4441#4442 1 0 -97 2 4450#4451#4452#4453#4454#4455 1 0 -98 2 4443#4444#4445#4446#4447#4448#4449 1 0 -99 2 4041#4042#4043#4044#4045#4046#4047#4048#4049#4050#4051#4052 1 0 -100 2 4053#4054#4055#4056#4057#4058#4059#4060#4061#4062#4063#4064 1 0 +30 2 3001#3002#3003#3004#3005#3006#3007#3008#3009#3010#3011#3012#3013#3014#3015#3016#3017#3018#3019#3020#3021#3022#3023#3024#3025#3026#3027#3028#3029#3030#3031#3032#3033#3034#3035#3036#3037#3038#3039#3040#3041#3042#3043#3044#3045#3046#3047#3048#3049#3050#3051#3052#3053#3054#3055#3056#3057#3058#3059#3060#3061#3062#3063#3064#3065#3066#3067#3068#3069#3070#3071#3072#3073#3074#3075#3076#3077#3078#3079#3080#3081#3082#3083#3084#3085#3086#3087#3088 1 0 +31 2 3201#3202#3203#3204#3205#3206#3207#3208#3209#3210#3211#3212#3213#3214#3215#3216#3217#3218#3219#3220#3221#3222#3223#3224#3225#3226#3227 1 0 +32 2 3089#3090#3091#3092#3093#3094#3095#3096#3097#3098#3099#3100 1 0 +33 2 3101#3102#3103#3104#3105#3106#3107#3108#3109#3110#3111#3112 1 0 +34 2 4001#4002#4003#4004#4005#4006#4007#4008#4009#4010#4011#4012#4013#4014#4015#4016#4017#4018#4019#4020#4021#4022#4023#4024#4025#4026#4027#4028#4029#4030#4031#4032#4033#4034#4035#4036#4037#4038#4039#4040#4041#4042#4043#4044#4045#4046#4047#4048#4049#4050#4051#4052 1 0 +35 2 4496#4497#4498#4499#4500#4501#4502#4503#4504#4505#4506#4507#4508#4509 1 0 +36 2 4576#4577#4578#4579#4580#4581#4582#4583#4584#4585#4586#4587#4588#4589#4590#4591#4592#4593#4594#4595#4596#4597#4598#4599#4600#4601 1 0 +37 2 4078#4079#4080#4081#4082#4083#4084#4085#4086#4087#4088#4089#4090#4091#4092#4093#4094#4095#4096#4097 1 0 +38 2 4201#4202#4203#4204#4205#4206#4207#4208#4209#4210#4211#4212#4213#4214#4215#4216#4217#4218#4219#4220#4221 1 0 +39 2 4222#4223#4224#4225#4226#4227#4228#4229#4230#4231#4232#4233#4234#4235#4236#4237#4238#4239#4240#4241#4242#4243#4244#4245#4246#4247#4248#4249#4250#4251#4252#4253#4254#4255#4256 1 0 +52 2 1001#1002#1003#1004#1005#1006#1007#1008#1009#1010#1011#1012#1013#1014#1015#1016#1017#1018#1019#1020#1021#1022#1023#1024#1025#1026#1027#1028#1029#1030#1031#1032#1033#1034#1035#1036#1037#1038#1039#1040#1041#1042#1043#1044#1045#1046#1047#1048#1049#1050#1051#1052#1053#1054#1055#1056#1057#1058#1059#1060#1061#1062#1063#1064#1065#1066#1067#1068#1069#1070#1071#1072#1073#1074#1075#1076#1077#1078 1 0 +53 2 1201#1202#1203#1204#1205#1206#1207#1208#1209#1210#1211#1212#1213#1214#1215#1216#1217#1218#1219#1220#1221#1222#1223#1224#1225#1226#1227#1228#1229 1 0 +54 2 1601#1602#1603#1604#1605#1606#1607#1608#1609#1610#1611#1612#1613#1614#1615#1616#1617#1618#1619#1620 1 0 +55 2 1401#1402#1403#1404#1405#1406#1407#1408#1409#1410#1411#1412#1413#1414#1415 1 0 +56 2 2001#2002#2003#2004#2005#2006#2007#2008#2009#2010#2011#2012#2013#2014#2015#2016#2017#2018#2019#2020#2021#2022#2023#2024#2025 1 0 +57 2 2101#2102#2103#2104#2105#2106#2107#2108#2109#2110#2111#2112#2113#2114#2115#2116#2117#2118#2119#2120#2121#2122#2123 1 0 +58 2 2201#2202#2203#2204#2205#2206#2207#2208#2209#2210#2211#2212#2213#2214#2215#2216#2217#2218#2219#2220#2221#2222#2223#2224#2225 1 0 +59 2 2401#2402#2403#2404#2405#2406#2407#2408#2409#2410#2411#2412#2413#2414#2415#2416#2417#2418#2419#2420 1 0 +60 2 3001#3002#3003#3004#3005#3006#3007#3008#3009#3010#3011#3012#3013#3014#3015#3016#3017#3018#3019#3020#3021#3022#3023#3024#3025#3026#3027#3028#3029#3030#3031#3032#3033#3034#3035#3036#3037#3038#3039#3040#3041#3042#3043#3044#3045#3046#3047#3048#3049#3050#3051#3052#3053#3054#3055#3056#3057#3058#3059#3060#3061#3062#3063#3064#3065#3066#3067#3068#3069#3070#3071#3072#3073#3074#3075#3076#3077#3078#3079#3080#3081#3082#3083#3084#3085#3086#3087 1 0 +61 2 3201#3202#3203#3204#3205#3206#3207#3208#3209#3210#3211#3212#3213#3214#3215#3216#3217#3218#3219#3220#3221#3222#3223#3224#3225#3226 1 0 +62 2 3089#3090#3091#3092#3093#3094#3095#3096#3097#3098#3099 1 0 +63 2 3101#3102#3103#3104#3105#3106#3107#3108#3109#3110#3111 1 0 +64 2 4001#4002#4003#4004#4005#4006#4007#4008#4009#4010#4011#4012#4013#4014#4015#4016#4017#4018#4019#4020#4021#4022#4023#4024#4025#4026#4027#4028#4029#4030#4031#4032#4033#4034#4035#4036#4037#4038#4039#4040#4041#4042#4043#4044#4045#4046#4047#4048#4049#4050#4051 1 0 +65 2 4496#4497#4498#4499#4500#4501#4502#4503#4504#4505#4506#4507#4508 1 0 +66 2 4576#4577#4578#4579#4580#4581#4582#4583#4584#4585#4586#4587#4588#4589#4590#4591#4592#4593#4594#4595#4596#4597#4598#4599#4600 1 0 +67 2 4078#4079#4080#4081#4082#4083#4084#4085#4086#4087#4088#4089#4090#4091#4092#4093#4094#4095#4096 1 0 +68 2 4201#4202#4203#4204#4205#4206#4207#4208#4209#4210#4211#4212#4213#4214#4215#4216#4217#4218#4219#4220 1 0 +69 2 4222#4223#4224#4225#4226#4227#4228#4229#4230#4231#4232#4233#4234#4235#4236#4237#4238#4239#4240#4241#4242#4243#4244#4245#4246#4247#4248#4249#4250#4251#4252#4253#4254#4255 1 0 101 1 50001#50011 2 0 102 1 50002#50012 2 0 103 1 50003#50013 2 0 @@ -815,9 +804,9 @@ int int mut,int#int,1 int int 55017 1 50414 1 0 55018 1 50415 1 0 55019 1 50416 1 0 -56001 1 90 1 0 +56001 1 92 1 0 56002 1 91 1 0 -56003 1 92 1 0 +56003 1 90 1 0 100001 1 25050 1 0 700001 1 25050 1 0 700002 1 25050 1 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index 947b40d97..bd300f824 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -82,51 +82,50 @@ int int int float int int 1076 52162 100 1.0 1 1 1077 52163 100 1.0 1 1 1078 52164 100 1.0 1 1 -1201 52009 34 1.0 1 1 -1202 52010 34 1.0 1 1 -1203 52011 34 1.0 1 1 -1204 52012 34 1.0 1 1 -1205 52013 34 1.0 1 1 -1206 52029 34 1.0 1 1 -1207 52030 34 1.0 1 1 -1208 52031 34 1.0 1 1 -1209 52032 34 1.0 1 1 -1210 52033 34 1.0 1 1 -1211 52049 34 1.0 1 1 -1212 52050 34 1.0 1 1 -1213 52051 34 1.0 1 1 -1214 52052 34 1.0 1 1 -1215 52053 34 1.0 1 1 -1216 52069 34 1.0 1 1 -1217 52070 34 1.0 1 1 -1218 52071 34 1.0 1 1 -1219 52072 34 1.0 1 1 -1220 52073 34 1.0 1 1 -1221 52089 34 1.0 1 1 -1222 52090 34 1.0 1 1 -1223 52091 34 1.0 1 1 -1224 52092 34 1.0 1 1 -1225 52093 34 1.0 1 1 -1226 52111 34 1.0 1 1 -1227 52112 34 1.0 1 1 -1228 52113 34 1.0 1 1 -1229 52114 34 1.0 1 1 -1401 52018 66 1.0 1 1 -1402 52019 66 1.0 1 1 -1403 52020 66 1.0 1 1 -1404 52038 66 1.0 1 1 -1405 52039 66 1.0 1 1 -1406 52040 66 1.0 1 1 -1407 52058 66 1.0 1 1 -1408 52059 66 1.0 1 1 -1409 52060 66 1.0 1 1 -1410 52078 66 1.0 1 1 -1411 52079 66 1.0 1 1 -1412 52080 66 1.0 1 1 -1413 52098 66 1.0 1 1 -1414 52099 66 1.0 1 1 -1415 52100 66 1.0 1 1 -1416 52100 10 1.0 0 0 +1201 52009 100 1.0 1 1 +1202 52010 100 1.0 1 1 +1203 52011 100 1.0 1 1 +1204 52012 100 1.0 1 1 +1205 52013 100 1.0 1 1 +1206 52029 100 1.0 1 1 +1207 52030 100 1.0 1 1 +1208 52031 100 1.0 1 1 +1209 52032 100 1.0 1 1 +1210 52033 100 1.0 1 1 +1211 52049 100 1.0 1 1 +1212 52050 100 1.0 1 1 +1213 52051 100 1.0 1 1 +1214 52052 100 1.0 1 1 +1215 52053 100 1.0 1 1 +1216 52069 100 1.0 1 1 +1217 52070 100 1.0 1 1 +1218 52071 100 1.0 1 1 +1219 52072 100 1.0 1 1 +1220 52073 100 1.0 1 1 +1221 52089 100 1.0 1 1 +1222 52090 100 1.0 1 1 +1223 52091 100 1.0 1 1 +1224 52092 100 1.0 1 1 +1225 52093 100 1.0 1 1 +1226 52111 100 1.0 1 1 +1227 52112 100 1.0 1 1 +1228 52113 100 1.0 1 1 +1229 52114 100 1.0 1 1 +1401 52018 100 1.0 1 1 +1402 52019 100 1.0 1 1 +1403 52020 100 1.0 1 1 +1404 52038 100 1.0 1 1 +1405 52039 100 1.0 1 1 +1406 52040 100 1.0 1 1 +1407 52058 100 1.0 1 1 +1408 52059 100 1.0 1 1 +1409 52060 100 1.0 1 1 +1410 52078 100 1.0 1 1 +1411 52079 100 1.0 1 1 +1412 52080 100 1.0 1 1 +1413 52098 100 1.0 1 1 +1414 52099 100 1.0 1 1 +1415 52100 100 1.0 1 1 1601 52014 50 1.0 1 1 1602 52015 50 1.0 1 1 1603 52016 50 1.0 1 1 @@ -244,250 +243,217 @@ int int int float int int 2419 53069 40 1.0 1 1 2420 53070 40 1.0 1 1 2421 53070 200 1.0 0 0 -3001 54001 7 1.0 1 1 -3002 54002 7 1.0 1 1 -3003 54006 7 1.0 1 1 -3004 54007 7 1.0 1 1 -3005 54011 7 1.0 1 1 -3006 54012 7 1.0 1 1 -3007 54013 7 1.0 1 1 -3008 54014 7 1.0 1 1 -3009 54015 7 1.0 1 1 -3010 54016 7 1.0 1 1 -3011 54020 7 1.0 1 1 -3012 54021 7 1.0 1 1 -3013 54025 7 1.0 1 1 -3014 54026 7 1.0 1 1 -3015 54027 7 1.0 1 1 -3016 54028 7 1.0 1 1 -3017 54029 7 1.0 1 1 -3018 54030 7 1.0 1 1 -3019 54034 7 1.0 1 1 -3020 54035 7 1.0 1 1 -3021 54039 7 1.0 1 1 -3022 54040 7 1.0 1 1 -3023 54041 7 1.0 1 1 -3024 54042 7 1.0 1 1 -3025 54043 7 1.0 1 1 -3026 54044 7 1.0 1 1 -3027 54048 7 1.0 1 1 -3028 54049 7 1.0 1 1 -3029 54053 7 1.0 1 1 -3030 54054 7 1.0 1 1 -3031 54055 7 1.0 1 1 -3032 54056 7 1.0 1 1 -3033 54057 7 1.0 1 1 -3034 54058 7 1.0 1 1 -3035 54062 7 1.0 1 1 -3036 54063 7 1.0 1 1 -3037 54067 7 1.0 1 1 -3038 54068 7 1.0 1 1 -3039 54069 7 1.0 1 1 -3040 54070 7 1.0 1 1 -3041 54071 7 1.0 1 1 -3042 54075 7 1.0 1 1 -3043 54076 7 1.0 1 1 -3044 54080 7 1.0 1 1 -3045 54082 7 1.0 1 1 -3046 54083 7 1.0 1 1 -3047 54084 7 1.0 1 1 -3048 54085 7 1.0 1 1 -3049 54086 7 1.0 1 1 -3050 54087 7 1.0 1 1 -3051 54088 7 1.0 1 1 -3052 54091 7 1.0 1 1 -3053 54092 7 1.0 1 1 -3054 54093 7 1.0 1 1 -3055 54094 7 1.0 1 1 -3056 54095 7 1.0 1 1 -3057 54096 7 1.0 1 1 -3058 54097 7 1.0 1 1 -3059 54098 7 1.0 1 1 -3060 54099 7 1.0 1 1 -3061 54100 7 1.0 1 1 -3062 54102 7 1.0 1 1 -3063 54103 7 1.0 1 1 -3064 54104 54 1.0 1 1 -3065 54105 54 1.0 1 1 -3066 54106 54 1.0 1 1 -3067 54107 54 1.0 1 1 -3068 54108 54 1.0 1 1 -3069 54109 54 1.0 1 1 -3070 54110 54 1.0 1 1 -3071 54111 54 1.0 1 1 -3072 54112 54 1.0 1 1 -3073 54113 54 1.0 1 1 -3074 54114 54 1.0 1 1 -3087 54114 406 1.0 0 0 -3075 54115 54 1.0 1 1 -3076 54116 54 1.0 1 1 -3077 54117 54 1.0 1 1 -3078 54118 54 1.0 1 1 -3079 54119 54 1.0 1 1 -3080 54120 54 1.0 1 1 -3081 54121 54 1.0 1 1 -3082 54122 54 1.0 1 1 -3083 54123 54 1.0 1 1 -3084 54124 54 1.0 1 1 -3085 54125 54 1.0 1 1 -3086 54125 406 1.0 0 0 -3088 54104 7 7.0 1 1 -3089 54105 7 1.0 1 1 -3090 54106 7 1.0 1 1 -3091 54107 7 1.0 1 1 -3092 54108 7 1.0 1 1 -3093 54109 7 1.0 1 1 -3094 54110 7 1.0 1 1 -3095 54111 7 1.0 1 1 -3096 54112 7 1.0 1 1 -3097 54113 7 1.0 1 1 -3098 54114 7 1.0 1 1 -3099 54115 7 1.0 1 1 -3100 54116 7 1.0 1 1 -3101 54117 7 1.0 1 1 -3102 54118 7 1.0 1 1 -3103 54119 7 1.0 1 1 -3104 54120 7 1.0 1 1 -3105 54121 7 1.0 1 1 -3106 54122 7 1.0 1 1 -3107 54123 7 1.0 1 1 -3108 54124 7 1.0 1 1 -3109 54125 7 1.0 1 1 -3110 54125 405 1.0 0 0 -3201 54003 40 1.0 1 1 -3202 54004 40 1.0 1 1 -3203 54005 40 1.0 1 1 -3204 54017 40 1.0 1 1 -3205 54018 40 1.0 1 1 -3206 54019 40 1.0 1 1 -3207 54031 40 1.0 1 1 -3208 54032 40 1.0 1 1 -3209 54033 40 1.0 1 1 -3210 54045 40 1.0 1 1 -3211 54046 40 1.0 1 1 -3212 54047 40 1.0 1 1 -3213 54059 40 1.0 1 1 -3214 54060 40 1.0 1 1 -3215 54061 40 1.0 1 1 -3216 54061 400 1.0 0 0 -3401 54008 40 1.0 1 1 -3402 54009 40 1.0 1 1 -3403 54010 40 1.0 1 1 -3404 54022 40 1.0 1 1 -3405 54023 40 1.0 1 1 -3406 54024 40 1.0 1 1 -3407 54036 40 1.0 1 1 -3408 54037 40 1.0 1 1 -3409 54038 40 1.0 1 1 -3410 54050 40 1.0 1 1 -3411 54051 40 1.0 1 1 -3412 54052 40 1.0 1 1 -3413 54064 40 1.0 1 1 -3414 54065 40 1.0 1 1 -3415 54066 40 1.0 1 1 -3400 54066 400 1.0 0 0 -3416 54072 60 1.0 1 1 -3417 54073 60 1.0 1 1 -3418 54074 60 1.0 1 1 -3419 54077 60 1.0 1 1 -3420 54078 60 1.0 1 1 -3421 54079 60 1.0 1 1 -3422 54081 60 1.0 1 1 -3423 54089 60 1.0 1 1 -3424 54090 60 1.0 1 1 -3425 54101 60 1.0 1 1 -3426 54101 400 1.0 0 0 -4001 55001 4 1.0 1 1 -4002 55002 4 1.0 1 1 -4003 55003 4 1.0 1 1 -4004 55004 4 1.0 1 1 -4005 55005 4 1.0 1 1 -4006 55021 4 1.0 1 1 -4007 55022 4 1.0 1 1 -4008 55023 4 1.0 1 1 -4009 55024 4 1.0 1 1 -4010 55025 4 1.0 1 1 -4011 55041 4 1.0 1 1 -4012 55042 4 1.0 1 1 -4013 55043 4 1.0 1 1 -4014 55044 4 1.0 1 1 -4015 55045 4 1.0 1 1 -4016 55061 4 1.0 1 1 -4017 55062 4 1.0 1 1 -4018 55063 4 1.0 1 1 -4019 55064 4 1.0 1 1 -4020 55065 4 1.0 1 1 -4021 55081 4 1.0 1 1 -4022 55082 4 1.0 1 1 -4023 55083 4 1.0 1 1 -4024 55084 4 1.0 1 1 -4025 55085 4 1.0 1 1 -4026 55101 4 1.0 1 1 -4027 55107 4 1.0 1 1 -4028 55108 4 1.0 1 1 -4029 55114 4 1.0 1 1 -4030 55116 4 1.0 1 1 -4031 55117 4 1.0 1 1 -4032 55118 4 1.0 1 1 -4033 55119 4 1.0 1 1 -4034 55120 4 1.0 1 1 -4035 55131 4 1.0 1 1 -4036 55132 4 1.0 1 1 -4037 55133 4 1.0 1 1 -4038 55134 4 1.0 1 1 -4039 55135 4 1.0 1 1 -4040 55136 4 1.0 1 1 -4041 55146 23 1.0 1 1 -4042 55147 23 1.0 1 1 -4043 55148 23 1.0 1 1 -4044 55149 23 1.0 1 1 -4045 55150 23 1.0 1 1 -4046 55151 23 1.0 1 1 -4047 55152 23 1.0 1 1 -4048 55153 23 1.0 1 1 -4049 55154 23 1.0 1 1 -4050 55155 23 1.0 1 1 -4051 55156 23 1.0 1 1 -4052 55157 23 1.0 1 1 -4066 55157 724 1.0 0 0 -4053 55161 23 1.0 1 1 -4054 55162 23 1.0 1 1 -4055 55163 23 1.0 1 1 -4056 55164 23 1.0 1 1 -4057 55165 23 1.0 1 1 -4058 55166 23 1.0 1 1 -4059 55167 23 1.0 1 1 -4060 55168 23 1.0 1 1 -4061 55169 23 1.0 1 1 -4062 55170 23 1.0 1 1 -4063 55171 23 1.0 1 1 -4064 55172 23 1.0 1 1 -4065 55172 724 1.0 0 0 -4067 55146 4 1.0 1 1 -4068 55147 4 1.0 1 1 -4069 55148 4 1.0 1 1 -4070 55149 4 1.0 1 1 -4071 55150 4 1.0 1 1 -4072 55151 4 1.0 1 1 -4073 55152 4 1.0 1 1 -4074 55153 4 1.0 1 1 -4075 55154 4 1.0 1 1 -4076 55155 4 1.0 1 1 -4077 55156 4 1.0 1 1 -4078 55157 4 1.0 1 1 -4079 55161 4 1.0 1 1 -4080 55162 4 1.0 1 1 -4081 55163 4 1.0 1 1 -4082 55164 4 1.0 1 1 -4083 55165 4 1.0 1 1 -4084 55166 4 1.0 1 1 -4085 55167 4 1.0 1 1 -4086 55168 4 1.0 1 1 -4087 55169 4 1.0 1 1 -4088 55170 4 1.0 1 1 -4089 55171 4 1.0 1 1 -4090 55172 4 1.0 1 1 -4091 55172 744 1.0 0 0 +3001 54001 6 1.0 1 1 +3002 54002 6 1.0 1 1 +3003 54006 6 1.0 1 1 +3004 54007 6 1.0 1 1 +3005 54008 6 1.0 1 1 +3006 54009 6 1.0 1 1 +3007 54010 6 1.0 1 1 +3008 54015 6 1.0 1 1 +3009 54016 6 1.0 1 1 +3010 54020 6 1.0 1 1 +3011 54021 6 1.0 1 1 +3012 54022 6 1.0 1 1 +3013 54023 6 1.0 1 1 +3014 54024 6 1.0 1 1 +3015 54029 6 1.0 1 1 +3016 54030 6 1.0 1 1 +3017 54034 6 1.0 1 1 +3018 54035 6 1.0 1 1 +3019 54036 6 1.0 1 1 +3020 54037 6 1.0 1 1 +3021 54038 6 1.0 1 1 +3022 54043 6 1.0 1 1 +3023 54044 6 1.0 1 1 +3024 54048 6 1.0 1 1 +3025 54049 6 1.0 1 1 +3026 54050 6 1.0 1 1 +3027 54051 6 1.0 1 1 +3028 54052 6 1.0 1 1 +3029 54057 6 1.0 1 1 +3030 54058 6 1.0 1 1 +3031 54062 6 1.0 1 1 +3032 54063 6 1.0 1 1 +3033 54064 6 1.0 1 1 +3034 54065 6 1.0 1 1 +3035 54066 6 1.0 1 1 +3036 54071 6 1.0 1 1 +3037 54072 6 1.0 1 1 +3038 54074 6 1.0 1 1 +3039 54075 6 1.0 1 1 +3040 54076 6 1.0 1 1 +3041 54077 6 1.0 1 1 +3042 54078 6 1.0 1 1 +3043 54081 6 1.0 1 1 +3044 54082 6 1.0 1 1 +3045 54083 6 1.0 1 1 +3046 54084 6 1.0 1 1 +3047 54085 6 1.0 1 1 +3048 54086 6 1.0 1 1 +3049 54087 6 1.0 1 1 +3050 54088 6 1.0 1 1 +3051 54089 6 1.0 1 1 +3052 54090 6 1.0 1 1 +3053 54091 6 1.0 1 1 +3054 54092 6 1.0 1 1 +3055 54093 6 1.0 1 1 +3056 54094 6 1.0 1 1 +3057 54095 6 1.0 1 1 +3058 54096 6 1.0 1 1 +3059 54097 6 1.0 1 1 +3060 54098 6 1.0 1 1 +3061 54099 6 1.0 1 1 +3062 54100 6 1.0 1 1 +3063 54101 6 1.0 1 1 +3064 54102 6 1.0 1 1 +3065 54103 6 1.0 1 1 +3066 54104 6 1.0 1 1 +3067 54105 6 1.0 1 1 +3068 54106 6 1.0 1 1 +3069 54107 6 1.0 1 1 +3070 54108 6 1.0 1 1 +3071 54109 6 1.0 1 1 +3072 54110 6 1.0 1 1 +3073 54111 6 1.0 1 1 +3074 54112 6 1.0 1 1 +3075 54113 6 1.0 1 1 +3076 54114 6 1.0 1 1 +3077 54115 6 1.0 1 1 +3078 54116 6 1.0 1 1 +3079 54117 6 1.0 1 1 +3080 54118 6 1.0 1 1 +3081 54119 6 1.0 1 1 +3082 54120 6 1.0 1 1 +3083 54121 6 1.0 1 1 +3084 54122 6 1.0 1 1 +3085 54123 6 1.0 1 1 +3086 54124 6 1.0 1 1 +3087 54125 6 1.0 1 1 +3088 54114 478 1.0 0 0 +3089 54089 54 1.0 1 1 +3090 54090 54 1.0 1 1 +3091 54091 54 1.0 1 1 +3092 54092 54 1.0 1 1 +3093 54093 54 1.0 1 1 +3094 54094 54 1.0 1 1 +3095 54095 54 1.0 1 1 +3096 54096 54 1.0 1 1 +3097 54097 54 1.0 1 1 +3098 54098 54 1.0 1 1 +3099 54099 54 1.0 1 1 +3100 54114 406 1.0 0 0 +3101 54100 54 1.0 1 1 +3102 54101 54 1.0 1 1 +3103 54102 54 1.0 1 1 +3104 54103 54 1.0 1 1 +3105 54104 54 1.0 1 1 +3106 54105 54 1.0 1 1 +3107 54106 54 1.0 1 1 +3108 54107 54 1.0 1 1 +3109 54108 54 1.0 1 1 +3110 54109 54 1.0 1 1 +3111 54110 54 1.0 1 1 +3112 54114 406 1.0 0 0 +3201 54003 23 1.0 1 1 +3202 54004 23 1.0 1 1 +3203 54005 23 1.0 1 1 +3204 54017 23 1.0 1 1 +3205 54018 23 1.0 1 1 +3206 54019 23 1.0 1 1 +3207 54031 23 1.0 1 1 +3208 54032 23 1.0 1 1 +3209 54033 23 1.0 1 1 +3210 54045 23 1.0 1 1 +3211 54046 23 1.0 1 1 +3212 54047 23 1.0 1 1 +3213 54059 23 1.0 1 1 +3214 54060 23 1.0 1 1 +3215 54061 23 1.0 1 1 +3216 54012 23 1.0 1 1 +3217 54014 23 1.0 1 1 +3218 54025 23 1.0 1 1 +3219 54026 23 1.0 1 1 +3220 54039 23 1.0 1 1 +3221 54040 23 1.0 1 1 +3222 54053 23 1.0 1 1 +3223 54054 23 1.0 1 1 +3224 54067 23 1.0 1 1 +3225 54068 23 1.0 1 1 +3226 54080 23 1.0 1 1 +3227 54080 402 1.0 0 0 +4001 55001 5 1.0 1 1 +4002 55002 5 1.0 1 1 +4003 55003 5 1.0 1 1 +4004 55021 5 1.0 1 1 +4005 55022 5 1.0 1 1 +4006 55023 5 1.0 1 1 +4007 55041 5 1.0 1 1 +4008 55042 5 1.0 1 1 +4009 55043 5 1.0 1 1 +4010 55061 5 1.0 1 1 +4011 55062 5 1.0 1 1 +4012 55063 5 1.0 1 1 +4013 55081 5 1.0 1 1 +4014 55082 5 1.0 1 1 +4015 55083 5 1.0 1 1 +4016 55101 5 1.0 1 1 +4017 55105 5 1.0 1 1 +4018 55106 5 1.0 1 1 +4019 55107 5 1.0 1 1 +4020 55108 5 1.0 1 1 +4021 55111 5 1.0 1 1 +4022 55116 5 1.0 1 1 +4023 55117 5 1.0 1 1 +4024 55118 5 1.0 1 1 +4025 55119 5 1.0 1 1 +4026 55120 5 1.0 1 1 +4027 55121 5 1.0 1 1 +4028 55122 5 1.0 1 1 +4029 55124 5 1.0 1 1 +4030 55131 5 1.0 1 1 +4031 55132 5 1.0 1 1 +4032 55133 5 1.0 1 1 +4033 55134 5 1.0 1 1 +4034 55135 5 1.0 1 1 +4035 55136 5 1.0 1 1 +4036 55137 5 1.0 1 1 +4037 55138 5 1.0 1 1 +4038 55146 5 1.0 1 1 +4039 55147 5 1.0 1 1 +4040 55148 5 1.0 1 1 +4041 55149 5 1.0 1 1 +4042 55150 5 1.0 1 1 +4043 55151 5 1.0 1 1 +4044 55152 5 1.0 1 1 +4045 55161 5 1.0 1 1 +4046 55162 5 1.0 1 1 +4047 55163 5 1.0 1 1 +4048 55164 5 1.0 1 1 +4049 55165 5 1.0 1 1 +4050 55166 5 1.0 1 1 +4051 55167 5 1.0 1 1 +4052 55170 745 1.0 0 0 +4078 55014 14 1.0 1 1 +4079 55015 14 1.0 1 1 +4080 55016 14 1.0 1 1 +4081 55034 14 1.0 1 1 +4082 55035 14 1.0 1 1 +4083 55036 14 1.0 1 1 +4084 55054 14 1.0 1 1 +4085 55055 14 1.0 1 1 +4086 55056 14 1.0 1 1 +4087 55074 14 1.0 1 1 +4088 55075 14 1.0 1 1 +4089 55076 14 1.0 1 1 +4090 55094 14 1.0 1 1 +4091 55095 14 1.0 1 1 +4092 55096 14 1.0 1 1 +4093 55156 14 1.0 1 1 +4094 55157 14 1.0 1 1 +4095 55171 14 1.0 1 1 +4096 55172 14 1.0 1 1 +4097 55173 734 1.0 0 0 4201 55006 13 1.0 1 1 4202 55007 13 1.0 1 1 4203 55008 13 1.0 1 1 @@ -509,65 +475,82 @@ int int int float int int 4219 55088 13 1.0 1 1 4220 55089 13 1.0 1 1 4221 55089 740 1.0 1 1 -4401 55010 8 1.0 1 1 -4402 55011 8 1.0 1 1 -4403 55012 8 1.0 1 1 -4404 55013 8 1.0 1 1 -4405 55014 8 1.0 1 1 -4406 55015 8 1.0 1 1 -4407 55016 8 1.0 1 1 -4408 55030 8 1.0 1 1 -4409 55031 8 1.0 1 1 -4410 55032 8 1.0 1 1 -4411 55033 8 1.0 1 1 -4412 55034 8 1.0 1 1 -4413 55035 8 1.0 1 1 -4414 55036 8 1.0 1 1 -4415 55050 8 1.0 1 1 -4416 55051 8 1.0 1 1 -4417 55052 8 1.0 1 1 -4418 55053 8 1.0 1 1 -4419 55054 8 1.0 1 1 -4420 55055 8 1.0 1 1 -4421 55056 8 1.0 1 1 -4422 55070 8 1.0 1 1 -4423 55071 8 1.0 1 1 -4424 55072 8 1.0 1 1 -4425 55073 8 1.0 1 1 -4426 55074 8 1.0 1 1 -4427 55075 8 1.0 1 1 -4428 55076 8 1.0 1 1 -4429 55090 8 1.0 1 1 -4430 55091 8 1.0 1 1 -4431 55092 8 1.0 1 1 -4432 55093 8 1.0 1 1 -4433 55094 8 1.0 1 1 -4434 55095 8 1.0 1 1 -4435 55096 8 1.0 1 1 -4457 55096 720 1.0 0 0 -4436 55104 39 1.0 1 1 -4437 55105 39 1.0 1 1 -4438 55106 39 1.0 1 1 -4439 55111 39 1.0 1 1 -4440 55112 39 1.0 1 1 -4441 55113 39 1.0 1 1 -4442 55115 39 1.0 1 1 -4458 55115 727 1.0 0 0 -4443 55121 39 1.0 1 1 -4444 55122 39 1.0 1 1 -4445 55123 39 1.0 1 1 -4446 55124 39 1.0 1 1 -4447 55125 39 1.0 1 1 -4448 55126 39 1.0 1 1 -4449 55127 39 1.0 1 1 -4459 55127 727 1.0 0 0 -4450 55137 46 1.0 1 1 -4451 55138 46 1.0 1 1 -4452 55139 46 1.0 1 1 -4453 55140 46 1.0 1 1 -4454 55141 46 1.0 1 1 -4455 55142 46 1.0 1 1 -4456 55142 724 1.0 0 0 +4222 55010 8 1.0 1 1 +4223 55011 8 1.0 1 1 +4224 55012 8 1.0 1 1 +4225 55013 8 1.0 1 1 +4226 55017 8 1.0 1 1 +4227 55019 8 1.0 1 1 +4228 55030 8 1.0 1 1 +4229 55031 8 1.0 1 1 +4230 55032 8 1.0 1 1 +4231 55033 8 1.0 1 1 +4232 55039 8 1.0 1 1 +4233 55040 8 1.0 1 1 +4234 55050 8 1.0 1 1 +4235 55051 8 1.0 1 1 +4236 55052 8 1.0 1 1 +4237 55053 8 1.0 1 1 +4238 55059 8 1.0 1 1 +4239 55060 8 1.0 1 1 +4240 55070 8 1.0 1 1 +4241 55071 8 1.0 1 1 +4242 55072 8 1.0 1 1 +4243 55073 8 1.0 1 1 +4244 55078 8 1.0 1 1 +4245 55080 8 1.0 1 1 +4246 55090 8 1.0 1 1 +4247 55091 8 1.0 1 1 +4248 55092 8 1.0 1 1 +4249 55093 8 1.0 1 1 +4250 55098 8 1.0 1 1 +4251 55099 8 1.0 1 1 +4252 55110 8 1.0 1 1 +4253 55115 8 1.0 1 1 +4254 55123 8 1.0 1 1 +4255 55130 8 1.0 1 1 +4256 55096 728 1.0 0 0 +4496 55146 19 1.0 1 1 +4497 55147 19 1.0 1 1 +4498 55148 19 1.0 1 1 +4499 55149 19 1.0 1 1 +4500 55150 19 1.0 1 1 +4501 55151 19 1.0 1 1 +4502 55152 19 1.0 1 1 +4503 55161 19 1.0 1 1 +4504 55162 19 1.0 1 1 +4505 55163 19 1.0 1 1 +4506 55164 19 1.0 1 1 +4507 55165 19 1.0 1 1 +4508 55166 19 1.0 1 1 +4509 55167 19 1.0 1 1 +4510 55170 734 1.0 0 0 +4576 55004 11 1.0 1 1 +4577 55005 11 1.0 1 1 +4578 55024 11 1.0 1 1 +4579 55025 11 1.0 1 1 +4580 55044 11 1.0 1 1 +4581 55045 11 1.0 1 1 +4582 55064 11 1.0 1 1 +4583 55065 11 1.0 1 1 +4584 55084 11 1.0 1 1 +4585 55085 11 1.0 1 1 +4586 55112 11 1.0 1 1 +4587 55113 11 1.0 1 1 +4588 55114 11 1.0 1 1 +4589 55125 11 1.0 1 1 +4590 55126 11 1.0 1 1 +4591 55127 11 1.0 1 1 +4592 55139 11 1.0 1 1 +4593 55140 11 1.0 1 1 +4594 55141 11 1.0 1 1 +4595 55153 11 1.0 1 1 +4596 55154 11 1.0 1 1 +4597 55155 11 1.0 1 1 +4598 55168 11 1.0 1 1 +4599 55168 11 1.0 1 1 +4600 55168 11 1.0 1 1 +4601 55171 725 1.0 0 0 6000 14 100 1.0 8000 8000 6001 3 100 1.0 12 12 6060 16 100 1.0 50 50 diff --git a/conf/server/SkillLogicConfig.txt b/conf/server/SkillLogicConfig.txt index 0fcfbce8e..df0553c29 100644 --- a/conf/server/SkillLogicConfig.txt +++ b/conf/server/SkillLogicConfig.txt @@ -228,15 +228,15 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float 1002223 20221#0.7 15 1.86#2#0.25 3.0 1002224 20221#0.7 15 2.06#2#0.3 3.0 1002225 null null null 3.0 -1002311 20000#0.7 17 0.75#1#3#1 0 -1002312 20000#0.7 17 0.85#1#3#1 0 -1002313 20000#0.7 17 1#1#3#1 0 -1002314 20000#0.7 17 1.2#1#3#1 0 +1002311 20000#0.7 17 0.75#2#3#1 0 +1002312 20000#0.7 17 0.85#2#3#1 0 +1002313 20000#0.7 17 1#2#3#1 0 +1002314 20000#0.7 17 1.2#2#3#1 0 1002315 null null null 0 -1002321 20001#0.7 6 3#5#1.25#1 3.0 -1002322 20001#0.7 6 3#5#1.45#1 3.0 -1002323 20001#0.7|30001#0.7 6|4 3#5#1.75#1|10#0.25#0#1 3.0 -1002324 20001#0.7|30001#0.7 6|4 3#5#2.05#1|10#0.5#0#1 3.0 +1002321 20001#0.7 6 3#5#1.25#2 3.0 +1002322 20001#0.7 6 3#5#1.45#2 3.0 +1002323 20001#0.7|30001#0.7 6|4 3#5#1.75#2|10#0.25#0#1 3.0 +1002324 20001#0.7|30001#0.7 6|4 3#5#2.05#2|10#0.5#0#1 3.0 1002325 null null null 3.0 1002411 20002#0.7 1 0.54#1 0 1002412 20002#0.7 1 0.62#1 0 diff --git a/conf/server/TaskConfig.txt b/conf/server/TaskConfig.txt index a11d11685..811673b95 100644 --- a/conf/server/TaskConfig.txt +++ b/conf/server/TaskConfig.txt @@ -43,18 +43,18 @@ int int mut,int#int,1 mut,int#int,2 mut,int#int,1 11207 12 0#15 4#1003 5001 11212 12 0#5 4#1004 5001 11214 12 0#15 4#1005 5001 -11302 13 2#6 4#1006 18001 +11302 13 2#15 4#1006 18001 11305 13 3#12 4#1007 18001 -11306 13 4#15 4#1008 18001 -11307 13 5#15 4#1009 18001 -11309 13 2#6 4#1010 18001 +11306 13 4#8 4#1008 18001 +11307 13 5#5 4#1009 18001 +11309 13 2#15 4#1010 18001 11312 13 3#12 4#1011 18001 -11313 13 4#15 4#1012 18001 -11314 13 5#15 4#1013 18001 +11313 13 4#8 4#1012 18001 +11314 13 5#5 4#1013 18001 11401 15 102#1 4#1014 17001 -11406 15 215#1 4#1015 17001 -11409 15 102#1 4#1016 17001 -11413 15 215#1 4#1017 17001 +11406 15 115#1 4#1015 17001 +11409 15 110#1 4#1016 17001 +11413 15 115#1 4#1017 17001 11602 16 202#1 4#1000 17001 11603 16 203#1 4#1001 17001 11605 16 206#1 4#1002 17001 diff --git a/conf/server/VipLevelConfig.txt b/conf/server/VipLevelConfig.txt index 8822bb314..2d40f4b45 100644 --- a/conf/server/VipLevelConfig.txt +++ b/conf/server/VipLevelConfig.txt @@ -1,18 +1,18 @@ VipLevel Privileges VipBoxDailyReward VipBoxReward OpenRules int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int#int,1 0 1#10000|2#10000|3#10000|4#2|5#2|6#5|7#3|8#1|9#10|10#1|11#1|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#5 14#5000|3#500|4#50|19#3 10301#11401#11001 -1 1#11000|2#10000|3#10000|4#2|5#2|6#5|7#4|8#2|9#10|10#2|11#2|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#10 14#80000|3#3000|4#100|19#5 11302#10302#11602#11002 +1 1#11000|2#10000|3#10000|4#2|5#2|6#5|7#4|8#2|9#10|10#2|11#2|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#10 14#10000|3#1000|4#100|19#5 11302#10302#11602#11002 2 1#11000|2#10000|3#10000|4#2|5#3|6#5|7#5|8#3|9#10|10#3|11#3|12#3|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#11 12006#40|3#3000|4#200|19#8 10703#11903#10303#10103#11603 -3 1#11000|2#10000|3#10000|4#2|5#3|6#10|7#5|8#4|9#10|10#4|11#4|12#3|501#1|502#1|503#0|504#0|505#0|13#1|14#0|15#0 16#12 20#5|3#4000|4#300|19#10 10404#10204#11704#11204#11004 +3 1#11000|2#10000|3#10000|4#2|5#3|6#10|7#5|8#4|9#10|10#4|11#4|12#3|501#1|502#1|503#0|504#0|505#0|13#1|14#0|15#0 16#12 20#5|3#5000|4#300|19#10 10404#10204#11704#11204#11004 4 1#11000|2#10000|3#10000|4#2|5#4|6#10|7#5|8#5|9#10|10#5|11#5|12#4|501#1|502#0|503#1|504#0|505#0|13#1|14#0|15#0 16#13 12013#50|20#5|4#500|19#10 11305#10305#11605#10905#10805 -5 1#12000|2#10000|3#10000|4#2|5#5|6#10|7#5|8#6|9#10|10#6|11#6|12#5|501#1|502#0|503#0|504#1|505#0|13#1|14#0|15#0 16#20|12013#1 21#5|12007#40|4#1000|14#150000 11306#11406#10606#10106#11706 -6 1#12000|2#12000|3#12000|4#3|5#6|6#10|7#5|8#7|9#10|10#7|11#7|12#6|501#1|502#0|503#0|504#0|505#1|13#2|14#0|15#0 16#22|12013#1 10010#1|3#5000|4#1500|20#5 11307#10407#11207#10307#11007 +5 1#12000|2#10000|3#10000|4#2|5#5|6#10|7#5|8#6|9#10|10#6|11#6|12#5|501#1|502#0|503#0|504#1|505#0|13#1|14#0|15#0 16#20|12013#1 21#5|12007#40|4#800|14#100000 11306#11406#10606#10106#11706 +6 1#12000|2#12000|3#12000|4#3|5#6|6#10|7#5|8#7|9#10|10#7|11#7|12#6|501#1|502#0|503#0|504#0|505#1|13#2|14#0|15#0 16#22|12013#1 10010#1|3#5000|4#800|20#5 11307#10407#11207#10307#11007 7 1#12000|2#12000|3#12000|4#3|5#7|6#10|7#5|8#8|9#10|10#8|11#8|12#7|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#24|12013#1 6010#1|6011#1|6012#1|5#40 11908#11608#10808#11808#10608 8 1#12000|2#12000|3#12000|4#3|5#8|6#20|7#5|8#9|9#10|10#9|11#9|12#8|501#1|502#0|503#0|504#0|505#0|13#3|14#1|15#0 16#26|12013#1 10010#1|5#50|3#5000|20#10 11908#11608#10808#11808#10608 -9 1#12000|2#12000|3#12000|4#4|5#9|6#20|7#5|8#10|9#10|10#10|11#10|12#9|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#1 16#28|12013#2 16#150|5#70|4#1500|21#10 11908#11608#10808#11808#10608 -10 1#13000|2#15000|3#12000|4#4|5#10|6#30|7#6|8#11|9#10|10#11|11#11|12#10|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#30|12013#2|21#1 6033#1|6034#1|4#1500|6#5 11908#11608#10808#11808#10608 -11 1#13000|2#15000|3#12000|4#4|5#11|6#40|7#6|8#12|9#10|10#12|11#12|12#11|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#40|12013#2|21#1 10010#1|5#100|3#6000|21#15 11908#11608#10808#11808#10608 -12 1#13000|2#15000|3#12000|4#5|5#12|6#50|7#6|8#13|9#10|10#13|11#13|12#12|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#50|12013#2|21#2 6035#1|6036#1|6#8|21#20 11908#11608#10808#11808#10608 +9 1#12000|2#12000|3#12000|4#4|5#9|6#20|7#5|8#10|9#10|10#10|11#10|12#9|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#1 16#28|12013#2 55150#1|55166#1|4#1000|21#10 11908#11608#10808#11808#10608 +10 1#13000|2#15000|3#12000|4#4|5#10|6#30|7#6|8#11|9#10|10#11|11#11|12#10|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#30|12013#2|21#1 6033#1|6034#1|4#1000|6#10 11908#11608#10808#11808#10608 +11 1#13000|2#15000|3#12000|4#4|5#11|6#40|7#6|8#12|9#10|10#12|11#12|12#11|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#40|12013#2|21#1 10010#1|5#100|3#5000|21#15 11908#11608#10808#11808#10608 +12 1#13000|2#15000|3#12000|4#5|5#12|6#50|7#6|8#13|9#10|10#13|11#13|12#12|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#50|12013#2|21#2 6035#1|6036#1|6#10|21#20 11908#11608#10808#11808#10608 13 1#14000|2#15000|3#12000|4#5|5#13|6#60|7#7|8#14|9#10|10#14|11#14|12#13|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#113 6001#1|6002#14 11908#11608#10808#11808#10608 14 1#14000|2#15000|3#12000|4#6|5#14|6#70|7#7|8#15|9#10|10#15|11#15|12#14|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#114 6001#1|6002#15 11908#11608#10808#11808#10608 15 1#15000|2#15000|3#12000|4#6|5#15|6#80|7#8|8#16|9#10|10#16|11#16|12#15|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#115 6001#1|6002#16 null 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 42bd4b9e8..b7b652838 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 @@ -143,8 +143,7 @@ public class ProtocolsManager implements ProtocolsAbstract { } //处理多设备重登 if (dealRepeatLogin(session.getUid())==1){ - /* MessageUtil.sendErrorCode(session,0,"您的账号已经在其他设备上登陆,请确认账号安全!"); - return;*/ + return; } //刷新token refreshToken(session); @@ -164,15 +163,7 @@ public class ProtocolsManager implements ProtocolsAbstract { if (checkIndex(session,packetNetData) != 0){ return; } -// boolean isOpen = checkFunctionIsOpen(packetNetData.getMsgId(), session); -// if (!isOpen){ -// try { -// MessageUtil.sendErrorResponse(session,0,packetNetData.getMsgId()+1,"功能未开启"); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// return; -// } + //LOGGER.info("process the uid={},the msg={},the index={}",packetNetData.getUserId(), MessageTypeProto.MessageType.valueOf(packetNetData.getMsgId()),packetNetData.getIndex()); BaseHandler baseHandler = handlers.get(packetNetData.getMsgId()); if (baseHandler == null) { LOGGER.info("request unknow commond : " + packetNetData.getMsgId()); @@ -238,6 +229,8 @@ public class ProtocolsManager implements ProtocolsAbstract { byte[] message = iSession.getCacheMessage(index); if (message==null && packetNetData.getMsgId() != 11100){ //TODO error + LOGGER.info("the uid={},the msg={} is processing",iSession.getUid(), MessageTypeProto.MessageType.valueOf(packetNetData.getMsgId())); + return 1; }else { iSession.writeAndFlush(message); return 1;