diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 9cf433471..1c1684f46 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -175,19 +175,19 @@ int int int mut,int#int,2 int mut,int#int,1 173 215 2 215007|1 30 null 174 215 2 215008|1 30 null 175 215 2 215009|1 40 null -176 301 9 1|1 0 40001 -177 301 9 2|1 0 40001 -178 301 9 3|1 0 40001 -179 301 9 4|1 0 40001 -180 301 10 1|600 0 40001 -181 301 11 2|600 0 40001 -182 301 12 3|600 0 40001 -183 301 13 4|600 0 40001 -184 301 11 1|2 0 40001 -185 301 11 2|2 0 40001 -186 301 11 3|2 0 40001 -187 301 11 4|2 0 40001 -188 301 13 4|3 0 40001 +176 301 9 1|1 0 43001 +177 301 9 2|1 0 43002 +178 301 9 3|1 0 43003 +179 301 9 4|1 0 43004 +180 301 10 1|600 0 43005 +181 301 11 2|600 0 43006 +182 301 12 3|600 0 43007 +183 301 13 4|600 0 43008 +184 301 11 1|2 0 43009 +185 301 11 2|2 0 43010 +186 301 11 3|2 0 43011 +187 301 11 4|2 0 43012 +188 301 13 4|3 0 43013 189 302 11 1|1 0 40001 190 302 9 1|1 0 40001 191 302 10 1|900 0 40001 diff --git a/conf/server/ChallengeMapConfig.txt b/conf/server/ChallengeMapConfig.txt index 1166b5b18..f63f15912 100644 --- a/conf/server/ChallengeMapConfig.txt +++ b/conf/server/ChallengeMapConfig.txt @@ -32,7 +32,27 @@ int int mut,int#int,1 int int mut,int#int,1 mut,int#int,1 214 114 20#30 0 1 null 3#3 215 115 21#26 0 1 null 2#13 2001 101 10#12 0 0 null 5#5 -3011 201 10#12 0 0 null 7#12 -3012 202 10#12 0 0 null 7#12 -3013 203 10#12 0 0 null 7#12 -3014 204 10#12 0 0 null 7#12 +3011 2011 10#12 0 0 null 7#12 +3012 2012 10#12 0 0 null 7#12 +3013 2013 10#12 0 0 null 7#12 +3014 2014 10#12 0 0 null 7#12 +3021 2021 10#12 0 0 null 7#12 +3022 2022 10#12 0 0 null 7#12 +3023 2023 10#12 0 0 null 7#12 +3024 2024 10#12 0 0 null 7#12 +3031 2031 10#12 0 0 null 7#12 +3032 2032 10#12 0 0 null 7#12 +3033 2033 10#12 0 0 null 7#12 +3034 2034 10#12 0 0 null 7#12 +3041 2041 10#12 0 0 null 7#12 +3042 2042 10#12 0 0 null 7#12 +3043 2043 10#12 0 0 null 7#12 +3044 2044 10#12 0 0 null 7#12 +3051 2051 10#12 0 0 null 7#12 +3052 2052 10#12 0 0 null 7#12 +3053 2053 10#12 0 0 null 7#12 +3054 2054 10#12 0 0 null 7#12 +3061 2061 10#12 0 0 null 7#12 +3062 2062 10#12 0 0 null 7#12 +3063 2063 10#12 0 0 null 7#12 +3064 2064 10#12 0 0 null 7#12 diff --git a/conf/server/ChallengeMissionConfig.txt b/conf/server/ChallengeMissionConfig.txt index f6325f1a1..01b0c5ced 100644 --- a/conf/server/ChallengeMissionConfig.txt +++ b/conf/server/ChallengeMissionConfig.txt @@ -31,7 +31,27 @@ int int mut,int#int,1 113 2 null 114 4 null 115 3 null -201 2 null -202 2 null -203 2 null -204 2 null +2011 2 null +2012 2 null +2013 2 null +2014 2 null +2021 2 null +2022 2 null +2023 2 null +2024 2 null +2031 2 null +2032 2 null +2033 2 null +2034 2 null +2041 2 null +2042 2 null +2043 2 null +2044 2 null +2051 2 null +2052 2 null +2053 2 null +2054 2 null +2061 2 null +2062 2 null +2063 2 null +2064 2 null diff --git a/conf/server/DifferDemonsBoxSetting.txt b/conf/server/DifferDemonsBoxSetting.txt index b242561a2..158fb6f57 100644 --- a/conf/server/DifferDemonsBoxSetting.txt +++ b/conf/server/DifferDemonsBoxSetting.txt @@ -1,32 +1,48 @@ Id MainCost SecondaryCost LevelLimit ExtraItem SeasonTimes SeasonOpen SeasonEnd RandomPool LimitPrivigele int mut,int#int,2 int int mut,int#int,1 int string string int int -1 21#1 1 0 22#1 9 20190701 100000 20190708 100000 6 6 -2 21#10 10 0 22#11 9 20190708 100000 20190715 100000 6 6 -3 21#1 1 0 22#1 10 20190715 100000 20190722 100000 6 6 -4 21#10 10 0 22#11 10 20190722 100000 20190729 100000 6 6 -5 21#1 1 0 22#1 11 20190729 100000 20190805 100000 6 6 -6 21#10 10 0 22#11 11 20190805 100000 20190812 100000 6 6 -7 21#1 1 0 22#1 12 20190812 100000 20190819 100000 6 6 -8 21#10 10 0 22#11 12 20190819 100000 20190826 100000 6 6 -9 21#1 1 0 22#1 13 20190826 100000 20190902 100000 6 6 -10 21#10 10 0 22#11 13 20190902 100000 20190909 100000 6 6 -11 21#1 1 0 22#1 14 20190909 100000 20190916 100000 6 6 -12 21#10 10 0 22#11 14 20190916 100000 20190923 100000 6 6 -13 21#1 1 0 22#1 15 20190923 100000 20190930 100000 6 6 -14 21#10 10 0 22#11 15 20190930 100000 20191007 100000 6 6 -15 21#1 1 0 22#1 16 20191007 100000 20191014 100000 6 6 -16 21#10 10 0 22#11 16 20191014 100000 20191021 100000 6 6 -17 21#1 1 0 22#1 17 20191021 100000 20191028 100000 6 6 -18 21#10 10 0 22#11 17 20191028 100000 20191104 100000 6 6 -19 21#1 1 0 22#1 18 20191104 100000 20191111 100000 6 6 -20 21#10 10 0 22#11 18 20191111 100000 20191118 100000 6 6 -21 21#1 1 0 22#1 19 20191118 100000 20191125 100000 6 6 -22 21#10 10 0 22#11 19 20191125 100000 20191202 100000 6 6 -23 21#1 1 0 22#1 20 20191202 100000 20191209 100000 6 6 -24 21#10 10 0 22#11 20 20191209 100000 20191216 100000 6 6 -25 21#1 1 0 22#1 21 20191216 100000 20191223 100000 6 6 -26 21#10 10 0 22#11 21 20191223 100000 20191230 100000 6 6 -27 21#1 1 0 22#1 22 20191230 100000 20200106 100000 6 6 -28 21#10 10 0 22#11 22 20200106 100000 20200113 100000 6 6 -29 21#1 1 0 22#1 23 20200113 100000 20200120 100000 6 6 -30 21#10 10 0 22#11 23 20200120 100000 20200127 100000 6 6 +1 21#1 1 0 22#1 1 20190510 100000 20190517 100000 6 6 +2 21#10 10 0 22#11 1 20190510 100000 20190517 100000 6 6 +3 21#1 1 0 22#1 2 20190517 100000 20190524 100000 6 6 +4 21#10 10 0 22#11 2 20190517 100000 20190524 100000 6 6 +5 21#1 1 0 22#1 3 20190524 100000 20190531 100000 6 6 +6 21#10 10 0 22#11 3 20190524 100000 20190531 100000 6 6 +7 21#1 1 0 22#1 4 20190531 100000 20190601 100000 6 6 +8 21#10 10 0 22#11 4 20190531 100000 20190601 100000 6 6 +9 21#1 1 0 22#1 5 20190601 100000 20190608 100000 6 6 +10 21#10 10 0 22#11 5 20190601 100000 20190608 100000 6 6 +11 21#1 1 0 22#1 6 20190608 100000 20190615 100000 6 6 +12 21#10 10 0 22#11 6 20190608 100000 20190615 100000 6 6 +13 21#1 1 0 22#1 7 20190615 100000 20190622 100000 6 6 +14 21#10 10 0 22#11 7 20190615 100000 20190622 100000 6 6 +15 21#1 1 0 22#1 8 20190622 100000 20190701 100000 6 6 +16 21#10 10 0 22#11 8 20190622 100000 20190701 100000 6 6 +17 21#1 1 0 22#1 9 20190701 100000 20190708 100000 6 6 +18 21#10 10 0 22#11 9 20190708 100000 20190715 100000 6 6 +19 21#1 1 0 22#1 10 20190715 100000 20190722 100000 6 6 +20 21#10 10 0 22#11 10 20190722 100000 20190729 100000 6 6 +21 21#1 1 0 22#1 11 20190729 100000 20190805 100000 6 6 +22 21#10 10 0 22#11 11 20190805 100000 20190812 100000 6 6 +23 21#1 1 0 22#1 12 20190812 100000 20190819 100000 6 6 +24 21#10 10 0 22#11 12 20190819 100000 20190826 100000 6 6 +25 21#1 1 0 22#1 13 20190826 100000 20190902 100000 6 6 +26 21#10 10 0 22#11 13 20190902 100000 20190909 100000 6 6 +27 21#1 1 0 22#1 14 20190909 100000 20190916 100000 6 6 +28 21#10 10 0 22#11 14 20190916 100000 20190923 100000 6 6 +29 21#1 1 0 22#1 15 20190923 100000 20190930 100000 6 6 +30 21#10 10 0 22#11 15 20190930 100000 20191007 100000 6 6 +31 21#1 1 0 22#1 16 20191007 100000 20191014 100000 6 6 +32 21#10 10 0 22#11 16 20191014 100000 20191021 100000 6 6 +33 21#1 1 0 22#1 17 20191021 100000 20191028 100000 6 6 +34 21#10 10 0 22#11 17 20191028 100000 20191104 100000 6 6 +35 21#1 1 0 22#1 18 20191104 100000 20191111 100000 6 6 +36 21#10 10 0 22#11 18 20191111 100000 20191118 100000 6 6 +37 21#1 1 0 22#1 19 20191118 100000 20191125 100000 6 6 +38 21#10 10 0 22#11 19 20191125 100000 20191202 100000 6 6 +39 21#1 1 0 22#1 20 20191202 100000 20191209 100000 6 6 +40 21#10 10 0 22#11 20 20191209 100000 20191216 100000 6 6 +41 21#1 1 0 22#1 21 20191216 100000 20191223 100000 6 6 +42 21#10 10 0 22#11 21 20191223 100000 20191230 100000 6 6 +43 21#1 1 0 22#1 22 20191230 100000 20200106 100000 6 6 +44 21#10 10 0 22#11 22 20200106 100000 20200113 100000 6 6 +45 21#1 1 0 22#1 23 20200113 100000 20200120 100000 6 6 +46 21#10 10 0 22#11 23 20200120 100000 20200127 100000 6 6 diff --git a/conf/server/GlobalSystemConfig.txt b/conf/server/GlobalSystemConfig.txt index 4fbd5dc18..ab6991711 100644 --- a/conf/server/GlobalSystemConfig.txt +++ b/conf/server/GlobalSystemConfig.txt @@ -27,7 +27,7 @@ int mut,int#int,1 int string string string string int 25 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 26 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 27 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 -28 2#10 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 +28 2#99 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 29 2#9 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 101 3#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 102 3#35 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 diff --git a/conf/server/LevelDifficultyConfig.txt b/conf/server/LevelDifficultyConfig.txt index dfbf257cb..fb19f101b 100644 --- a/conf/server/LevelDifficultyConfig.txt +++ b/conf/server/LevelDifficultyConfig.txt @@ -125,103 +125,103 @@ int int int int mut,int#int,2 mut,int#int,2 int mut,int#int,1 mut,int#int,1 int 10032 10022 0 52058 2#7 2#1 8 6048#401123 4048#3048 180 0 64029 10042 10032 0 52059 2#7 2#1 8 6049#401124 4049#3049 180 0 66078 10052 10042 0 52060 2#7 2#1 8 6050#401125 4050#3050 180 0 67911 -11012 10052 0 51171 2#7 2#1 8 6046#401126 4046#3046 180 0 60378 -11022 11012 0 51172 2#7 2#1 8 6047#401127 4047#3047 180 0 62203 -11032 11022 0 51173 2#7 2#1 8 6048#401128 4048#3048 180 0 64029 -11042 11032 0 51174 2#7 2#1 8 6049#401129 4049#3049 180 0 66078 -11052 11042 0 51175 2#7 2#1 8 6050#401130 4050#3050 180 0 67911 -12012 11052 0 51171 2#7 2#1 8 6046#401131 4046#3046 180 0 60378 -12022 12012 0 51172 2#7 2#1 8 6047#401132 4047#3047 180 0 62203 -12032 12022 0 51173 2#7 2#1 8 6048#401133 4048#3048 180 0 64029 -12042 12032 0 51174 2#7 2#1 8 6049#401134 4049#3049 180 0 66078 -12052 12042 0 51175 2#7 2#1 8 6050#401135 4050#3050 180 0 67911 -13012 12052 0 51171 2#7 2#1 8 6046#401136 4046#3046 180 0 60378 -13022 13012 0 51172 2#7 2#1 8 6047#401137 4047#3047 180 0 62203 -13032 13022 0 51173 2#7 2#1 8 6048#401138 4048#3048 180 0 64029 -13042 13032 0 51174 2#7 2#1 8 6049#401139 4049#3049 180 0 66078 -13052 13042 0 51175 2#7 2#1 8 6050#401140 4050#3050 180 0 67911 -14012 13052 0 51171 2#7 2#1 8 6046#401141 4046#3046 180 0 60378 -14022 14012 0 51172 2#7 2#1 8 6047#401142 4047#3047 180 0 62203 -14032 14022 0 51173 2#7 2#1 8 6048#401143 4048#3048 180 0 64029 -14042 14032 0 51174 2#7 2#1 8 6049#401144 4049#3049 180 0 66078 -14052 14042 0 51175 2#7 2#1 8 6050#401145 4050#3050 180 0 67911 -15012 14052 0 51171 2#7 2#1 8 6046#401146 4046#3046 180 0 60378 -15022 15012 0 51172 2#7 2#1 8 6047#401147 4047#3047 180 0 62203 -15032 15022 0 51173 2#7 2#1 8 6048#401148 4048#3048 180 0 64029 -15042 15032 0 51174 2#7 2#1 8 6049#401149 4049#3049 180 0 66078 -15052 15042 0 51175 2#7 2#1 8 6050#401150 4050#3050 180 0 67911 -1013 10052 0 51176 2#7 2#1 8 6001#401151 4001#3001 180 0 67911 -1023 1013 0 51177 2#7 2#1 8 6002#401152 4002#3002 180 0 69743 -1033 1023 0 51178 2#7 2#1 8 6003#401153 4003#3003 180 0 71576 -1043 1033 0 51179 2#7 2#1 8 6004#401154 4004#3004 180 0 73408 -1053 1043 0 51180 2#7 2#1 8 6005#401155 4005#3005 180 0 75241 -2013 1053 0 51181 2#7 2#1 8 6006#401156 4006#3006 180 0 77456 -2023 2013 0 51182 2#7 2#1 8 6007#401157 4007#3007 180 0 78605 -2033 2023 0 51183 2#7 2#1 8 6008#401158 4008#3008 180 0 79754 -2043 2033 0 51184 2#7 2#1 8 6009#401159 4009#3009 180 0 81281 -2053 2043 0 51185 2#7 2#1 8 6010#401160 4010#3010 180 0 82443 -3013 2053 0 51186 2#7 2#1 8 6011#401161 4011#3011 180 0 83670 -3023 3013 0 51187 2#7 2#1 8 6012#401162 4012#3012 180 0 84930 -3033 3023 0 51188 2#7 2#1 8 6013#401163 4013#3013 180 0 86190 -3043 3033 0 51189 2#7 2#1 8 6014#401164 4014#3014 180 0 87450 -3053 3043 0 51190 2#7 2#1 8 6015#401165 4015#3015 180 0 88709 -4013 3053 0 51191 2#7 2#1 8 6016#401166 4016#3016 180 0 90389 -4023 4013 0 51192 2#7 2#1 8 6017#401167 4017#3017 180 0 92660 -4033 4023 0 51193 2#7 2#1 8 6018#401168 4018#3018 180 0 94147 -4043 4033 0 51194 2#7 2#1 8 6019#401169 4019#3019 180 0 95419 -4053 4043 0 51195 2#7 2#1 8 6020#401170 4020#3020 180 0 96691 -5013 4053 0 51196 2#7 2#1 8 6021#401171 4021#3021 180 0 98019 -5023 5013 0 51197 2#7 2#1 8 6022#401172 4022#3022 180 0 99403 -5033 5023 0 51198 2#7 2#1 8 6023#401173 4023#3023 180 0 98802 -5043 5033 0 51199 2#7 2#1 8 6024#401174 4024#3024 180 0 109455 -5053 5043 0 51200 2#7 2#1 8 6025#401175 4025#3025 180 0 123410 -6013 5053 0 51201 2#7 2#1 8 6026#401176 4026#3026 180 0 133818 -6023 6013 0 51202 2#7 2#1 8 6027#401177 4027#3027 180 0 144227 -6033 6023 0 51203 2#7 2#1 8 6028#401178 4028#3028 180 0 154636 -6043 6033 0 51204 2#7 2#1 8 6029#401179 4029#3029 180 0 165045 -6053 6043 0 51205 2#7 2#1 8 6030#401180 4030#3030 180 0 175448 -7013 6053 0 51206 2#7 2#1 8 6031#401181 4031#3031 180 0 185847 -7023 7013 0 51207 2#7 2#1 8 6032#401182 4032#3032 180 0 196749 -7033 7023 0 51208 2#7 2#1 8 6033#401183 4033#3033 180 0 207165 -7043 7033 0 51209 2#7 2#1 8 6034#401184 4034#3034 180 0 217581 -7053 7043 0 51210 2#7 2#1 8 6035#401185 4035#3035 180 0 227996 -8013 7053 0 51211 2#7 2#1 8 6036#401186 4036#3036 180 0 238412 -8023 8013 0 51212 2#7 2#1 8 6037#401187 4037#3037 180 0 248828 -8033 8023 0 51213 2#7 2#1 8 6038#401188 4038#3038 180 0 259243 -8043 8033 0 51214 2#7 2#1 8 6039#401189 4039#3039 180 0 269348 -8053 8043 0 51215 2#7 2#1 8 6040#401190 4040#3040 180 0 280174 -9013 8053 0 51216 2#7 2#1 8 6041#401191 4041#3041 180 0 290284 -9023 9013 0 51217 2#7 2#1 8 6042#401192 4042#3042 180 0 300381 -9033 9023 0 51218 2#7 2#1 8 6043#401193 4043#3043 180 0 306304 -9043 9033 0 51219 2#7 2#1 8 6044#401194 4044#3044 180 0 308054 -9053 9043 0 51220 2#7 2#1 8 6045#401195 4045#3045 180 0 309804 -10013 9053 0 51221 2#7 2#1 8 6046#401196 4046#3046 180 0 311554 -10023 10013 0 51222 2#7 2#1 8 6047#401197 4047#3047 180 0 313304 -10033 10023 0 51223 2#7 2#1 8 6048#401198 4048#3048 180 0 316025 -10043 10033 0 51224 2#7 2#1 8 6049#401199 4049#3049 180 0 317796 -10053 10043 0 51225 2#7 2#1 8 6050#401200 4050#3050 180 0 319402 -11013 10053 0 51221 2#7 2#1 8 6046#401201 4046#3046 180 0 311554 -11023 11013 0 51222 2#7 2#1 8 6047#401202 4047#3047 180 0 313304 -11033 11023 0 51223 2#7 2#1 8 6048#401203 4048#3048 180 0 316025 -11043 11033 0 51224 2#7 2#1 8 6049#401204 4049#3049 180 0 317796 -11053 11043 0 51225 2#7 2#1 8 6050#401205 4050#3050 180 0 319402 -12013 11053 0 51221 2#7 2#1 8 6046#401206 4046#3046 180 0 311554 -12023 12013 0 51222 2#7 2#1 8 6047#401207 4047#3047 180 0 313304 -12033 12023 0 51223 2#7 2#1 8 6048#401208 4048#3048 180 0 316025 -12043 12033 0 51224 2#7 2#1 8 6049#401209 4049#3049 180 0 317796 -12053 12043 0 51225 2#7 2#1 8 6050#401210 4050#3050 180 0 319402 -13013 12053 0 51221 2#7 2#1 8 6046#401211 4046#3046 180 0 311554 -13023 13013 0 51222 2#7 2#1 8 6047#401212 4047#3047 180 0 313304 -13033 13023 0 51223 2#7 2#1 8 6048#401213 4048#3048 180 0 316025 -13043 13033 0 51224 2#7 2#1 8 6049#401214 4049#3049 180 0 317796 -13053 13043 0 51225 2#7 2#1 8 6050#401215 4050#3050 180 0 319402 -14013 13053 0 51221 2#7 2#1 8 6046#401216 4046#3046 180 0 311554 -14023 14013 0 51222 2#7 2#1 8 6047#401217 4047#3047 180 0 313304 -14033 14023 0 51223 2#7 2#1 8 6048#401218 4048#3048 180 0 316025 -14043 14033 0 51224 2#7 2#1 8 6049#401219 4049#3049 180 0 317796 -14053 14043 0 51225 2#7 2#1 8 6050#401220 4050#3050 180 0 319402 -15013 14053 0 51221 2#7 2#1 8 6046#401221 4046#3046 180 0 311554 -15023 15013 0 51222 2#7 2#1 8 6047#401222 4047#3047 180 0 313304 -15033 15023 0 51223 2#7 2#1 8 6048#401223 4048#3048 180 0 316025 -15043 15033 0 51224 2#7 2#1 8 6049#401224 4049#3049 180 0 317796 -15053 15043 0 51225 2#7 2#1 8 6050#401225 4050#3050 180 0 319402 +11012 10052 0 52061 2#7 2#1 8 6046#401126 4046#3046 180 0 60378 +11022 11012 0 52062 2#7 2#1 8 6047#401127 4047#3047 180 0 62203 +11032 11022 0 52063 2#7 2#1 8 6048#401128 4048#3048 180 0 64029 +11042 11032 0 52064 2#7 2#1 8 6049#401129 4049#3049 180 0 66078 +11052 11042 0 52065 2#7 2#1 8 6050#401130 4050#3050 180 0 67911 +12012 11052 0 52066 2#7 2#1 8 6046#401131 4046#3046 180 0 60378 +12022 12012 0 52067 2#7 2#1 8 6047#401132 4047#3047 180 0 62203 +12032 12022 0 52068 2#7 2#1 8 6048#401133 4048#3048 180 0 64029 +12042 12032 0 52069 2#7 2#1 8 6049#401134 4049#3049 180 0 66078 +12052 12042 0 52070 2#7 2#1 8 6050#401135 4050#3050 180 0 67911 +13012 12052 0 52071 2#7 2#1 8 6046#401136 4046#3046 180 0 60378 +13022 13012 0 52072 2#7 2#1 8 6047#401137 4047#3047 180 0 62203 +13032 13022 0 52073 2#7 2#1 8 6048#401138 4048#3048 180 0 64029 +13042 13032 0 52074 2#7 2#1 8 6049#401139 4049#3049 180 0 66078 +13052 13042 0 52075 2#7 2#1 8 6050#401140 4050#3050 180 0 67911 +14012 13052 0 52076 2#7 2#1 8 6046#401141 4046#3046 180 0 60378 +14022 14012 0 52077 2#7 2#1 8 6047#401142 4047#3047 180 0 62203 +14032 14022 0 52078 2#7 2#1 8 6048#401143 4048#3048 180 0 64029 +14042 14032 0 52079 2#7 2#1 8 6049#401144 4049#3049 180 0 66078 +14052 14042 0 52080 2#7 2#1 8 6050#401145 4050#3050 180 0 67911 +15012 14052 0 52081 2#7 2#1 8 6046#401146 4046#3046 180 0 60378 +15022 15012 0 52082 2#7 2#1 8 6047#401147 4047#3047 180 0 62203 +15032 15022 0 52083 2#7 2#1 8 6048#401148 4048#3048 180 0 64029 +15042 15032 0 52084 2#7 2#1 8 6049#401149 4049#3049 180 0 66078 +15052 15042 0 52085 2#7 2#1 8 6050#401150 4050#3050 180 0 67911 +1013 10052 0 52011 2#7 2#1 8 6001#401151 4001#3001 180 0 67911 +1023 1013 0 52012 2#7 2#1 8 6002#401152 4002#3002 180 0 69743 +1033 1023 0 52013 2#7 2#1 8 6003#401153 4003#3003 180 0 71576 +1043 1033 0 52014 2#7 2#1 8 6004#401154 4004#3004 180 0 73408 +1053 1043 0 52015 2#7 2#1 8 6005#401155 4005#3005 180 0 75241 +2013 1053 0 52016 2#7 2#1 8 6006#401156 4006#3006 180 0 77456 +2023 2013 0 52017 2#7 2#1 8 6007#401157 4007#3007 180 0 78605 +2033 2023 0 52018 2#7 2#1 8 6008#401158 4008#3008 180 0 79754 +2043 2033 0 52019 2#7 2#1 8 6009#401159 4009#3009 180 0 81281 +2053 2043 0 52020 2#7 2#1 8 6010#401160 4010#3010 180 0 82443 +3013 2053 0 52021 2#7 2#1 8 6011#401161 4011#3011 180 0 83670 +3023 3013 0 52022 2#7 2#1 8 6012#401162 4012#3012 180 0 84930 +3033 3023 0 52023 2#7 2#1 8 6013#401163 4013#3013 180 0 86190 +3043 3033 0 52024 2#7 2#1 8 6014#401164 4014#3014 180 0 87450 +3053 3043 0 52025 2#7 2#1 8 6015#401165 4015#3015 180 0 88709 +4013 3053 0 52026 2#7 2#1 8 6016#401166 4016#3016 180 0 90389 +4023 4013 0 52027 2#7 2#1 8 6017#401167 4017#3017 180 0 92660 +4033 4023 0 52028 2#7 2#1 8 6018#401168 4018#3018 180 0 94147 +4043 4033 0 52029 2#7 2#1 8 6019#401169 4019#3019 180 0 95419 +4053 4043 0 52030 2#7 2#1 8 6020#401170 4020#3020 180 0 96691 +5013 4053 0 52031 2#7 2#1 8 6021#401171 4021#3021 180 0 98019 +5023 5013 0 52032 2#7 2#1 8 6022#401172 4022#3022 180 0 99403 +5033 5023 0 52033 2#7 2#1 8 6023#401173 4023#3023 180 0 98802 +5043 5033 0 52034 2#7 2#1 8 6024#401174 4024#3024 180 0 109455 +5053 5043 0 52035 2#7 2#1 8 6025#401175 4025#3025 180 0 123410 +6013 5053 0 52036 2#7 2#1 8 6026#401176 4026#3026 180 0 133818 +6023 6013 0 52037 2#7 2#1 8 6027#401177 4027#3027 180 0 144227 +6033 6023 0 52038 2#7 2#1 8 6028#401178 4028#3028 180 0 154636 +6043 6033 0 52039 2#7 2#1 8 6029#401179 4029#3029 180 0 165045 +6053 6043 0 52040 2#7 2#1 8 6030#401180 4030#3030 180 0 175448 +7013 6053 0 52041 2#7 2#1 8 6031#401181 4031#3031 180 0 185847 +7023 7013 0 52042 2#7 2#1 8 6032#401182 4032#3032 180 0 196749 +7033 7023 0 52043 2#7 2#1 8 6033#401183 4033#3033 180 0 207165 +7043 7033 0 52044 2#7 2#1 8 6034#401184 4034#3034 180 0 217581 +7053 7043 0 52045 2#7 2#1 8 6035#401185 4035#3035 180 0 227996 +8013 7053 0 52046 2#7 2#1 8 6036#401186 4036#3036 180 0 238412 +8023 8013 0 52047 2#7 2#1 8 6037#401187 4037#3037 180 0 248828 +8033 8023 0 52048 2#7 2#1 8 6038#401188 4038#3038 180 0 259243 +8043 8033 0 52049 2#7 2#1 8 6039#401189 4039#3039 180 0 269348 +8053 8043 0 52050 2#7 2#1 8 6040#401190 4040#3040 180 0 280174 +9013 8053 0 52051 2#7 2#1 8 6041#401191 4041#3041 180 0 290284 +9023 9013 0 52052 2#7 2#1 8 6042#401192 4042#3042 180 0 300381 +9033 9023 0 52053 2#7 2#1 8 6043#401193 4043#3043 180 0 306304 +9043 9033 0 52054 2#7 2#1 8 6044#401194 4044#3044 180 0 308054 +9053 9043 0 52055 2#7 2#1 8 6045#401195 4045#3045 180 0 309804 +10013 9053 0 52056 2#7 2#1 8 6046#401196 4046#3046 180 0 311554 +10023 10013 0 52057 2#7 2#1 8 6047#401197 4047#3047 180 0 313304 +10033 10023 0 52058 2#7 2#1 8 6048#401198 4048#3048 180 0 316025 +10043 10033 0 52059 2#7 2#1 8 6049#401199 4049#3049 180 0 317796 +10053 10043 0 52060 2#7 2#1 8 6050#401200 4050#3050 180 0 319402 +11013 10053 0 52061 2#7 2#1 8 6046#401201 4046#3046 180 0 311554 +11023 11013 0 52062 2#7 2#1 8 6047#401202 4047#3047 180 0 313304 +11033 11023 0 52063 2#7 2#1 8 6048#401203 4048#3048 180 0 316025 +11043 11033 0 52064 2#7 2#1 8 6049#401204 4049#3049 180 0 317796 +11053 11043 0 52065 2#7 2#1 8 6050#401205 4050#3050 180 0 319402 +12013 11053 0 52066 2#7 2#1 8 6046#401206 4046#3046 180 0 311554 +12023 12013 0 52067 2#7 2#1 8 6047#401207 4047#3047 180 0 313304 +12033 12023 0 52068 2#7 2#1 8 6048#401208 4048#3048 180 0 316025 +12043 12033 0 52069 2#7 2#1 8 6049#401209 4049#3049 180 0 317796 +12053 12043 0 52070 2#7 2#1 8 6050#401210 4050#3050 180 0 319402 +13013 12053 0 52071 2#7 2#1 8 6046#401211 4046#3046 180 0 311554 +13023 13013 0 52072 2#7 2#1 8 6047#401212 4047#3047 180 0 313304 +13033 13023 0 52073 2#7 2#1 8 6048#401213 4048#3048 180 0 316025 +13043 13033 0 52074 2#7 2#1 8 6049#401214 4049#3049 180 0 317796 +13053 13043 0 52075 2#7 2#1 8 6050#401215 4050#3050 180 0 319402 +14013 13053 0 52076 2#7 2#1 8 6046#401216 4046#3046 180 0 311554 +14023 14013 0 52077 2#7 2#1 8 6047#401217 4047#3047 180 0 313304 +14033 14023 0 52078 2#7 2#1 8 6048#401218 4048#3048 180 0 316025 +14043 14033 0 52079 2#7 2#1 8 6049#401219 4049#3049 180 0 317796 +14053 14043 0 52080 2#7 2#1 8 6050#401220 4050#3050 180 0 319402 +15013 14053 0 52081 2#7 2#1 8 6046#401221 4046#3046 180 0 311554 +15023 15013 0 52082 2#7 2#1 8 6047#401222 4047#3047 180 0 313304 +15033 15023 0 52083 2#7 2#1 8 6048#401223 4048#3048 180 0 316025 +15043 15033 0 52084 2#7 2#1 8 6049#401224 4049#3049 180 0 317796 +15053 15043 0 52085 2#7 2#1 8 6050#401225 4050#3050 180 0 319402 diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 501cbd4ce..26ea3cf36 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -403,6 +403,31 @@ int mut,int#int,2 mut,int#int,1 52058 1253121#1253122|1253231#1253232#1253233 null 52059 1254131#1254132#1254133 null 52060 1255121#1255122|1255221#1255222|1255331#1255332#1255333 null +52061 1261121#1261122 null +52062 1262131#1262132#1262133 null +52063 1263121#1263122|1263231#1263232#1263233 null +52064 1264131#1264132#1264133 null +52065 1265121#1265122|1265221#1265222|1265331#1265332#1265333 null +52066 1271121#1271122 null +52067 1272131#1272132#1272133 null +52068 1273121#1273122|1273231#1273232#1273233 null +52069 1274131#1274132#1274133 null +52070 1275121#1275122|1275221#1275222|1275331#1275332#1275333 null +52071 1281121#1281122 null +52072 1282131#1282132#1282133 null +52073 1283121#1283122|1283231#1283232#1283233 null +52074 1284131#1284132#1284133 null +52075 1285121#1285122|1285221#1285222|1285331#1285332#1285333 null +52076 1291121#1291122 null +52077 1292131#1292132#1292133 null +52078 1293121#1293122|1293231#1293232#1293233 null +52079 1294131#1294132#1294133 null +52080 1295121#1295122|1295221#1295222|1295331#1295332#1295333 null +52081 1301121#1301122 null +52082 1302131#1302132#1302133 null +52083 1303121#1303122|1303231#1303232#1303233 null +52084 1304131#1304132#1304133 null +52085 1305121#1305122|1305221#1305222|1305331#1305332#1305333 null 601011 6010101 220101 601021 6010201 220102 601031 6010301 220103 diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index 6f94be68c..74e296223 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -958,6 +958,19 @@ int int mut,int#int,1 int int 40013 1 40013#41013#42013 1 0 40014 1 40014#41014#42014 1 0 40015 1 40015#41015#42015 1 0 +43001 1 61001 1 0 +43002 1 61002 1 0 +43003 1 61003 1 0 +43004 1 61004 1 0 +43005 1 61005 1 0 +43006 1 61006 1 0 +43007 1 61007 1 0 +43008 1 61008 1 0 +43009 1 61009 1 0 +43010 1 61010 1 0 +43011 1 61011 1 0 +43012 1 61012 1 0 +43013 1 61013 1 0 55001 1 50401 1 0 55002 1 50402 1 0 55003 1 50403 1 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index bc597d2c7..78e2742fd 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -1843,6 +1843,19 @@ int int int float int int 60073 13044 26 1 1 1 60074 13045 26 1 1 1 60075 13046 26 1 1 1 +61001 14 100 1.0 500000 500000 +61002 14 100 1.0 600000 600000 +61003 14 100 1.0 700000 700000 +61004 14 100 1.0 800000 800000 +61005 16 100 1.0 200 200 +61006 16 100 1.0 300 300 +61007 16 100 1.0 400 400 +61008 16 100 1.0 500 500 +61009 12013 100 1.0 10 10 +61010 12013 100 1.0 10 10 +61011 12013 100 1.0 10 10 +61012 12013 100 1.0 20 20 +61013 55081 100 1.0 1 1 110001 1001 100 1.0 15 15 110002 1001 100 1.0 60 60 110003 1001 100 1.0 100 100 diff --git a/conf/server/SkillLogicConfig.txt b/conf/server/SkillLogicConfig.txt index 3861ae2ad..554f451d9 100644 --- a/conf/server/SkillLogicConfig.txt +++ b/conf/server/SkillLogicConfig.txt @@ -68,10 +68,10 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float 1000623 20000#0.7|20300#0.7 2|4 1.1#2|1#0.15#8#4 2.0 1000624 20000#0.7|20300#0.7 2|4 1.3#2|1#0.15#12#4 2.0 1000625 null null null 2.0 -1000711 20001#0.7 6#4 3#3#0.78#1|2#0.15#8#4 0 -1000712 20001#0.7 6#4 3#3#0.88#1|2#0.15#8#4 0 -1000713 20001#0.7 6#4 3#3#1.08#1|2#0.2#10#4 0 -1000714 20001#0.7 6#4 3#3#1.08#1|2#0.3#12#4 0 +1000711 20001#0.7 6#4#4 3#3#0.78#1|2#0.15#8#4|3#0.15#8#4 0 +1000712 20001#0.7 6#4#4 3#3#0.88#1|2#0.15#8#4|3#0.15#8#4 0 +1000713 20001#0.7 6#4#4 3#3#1.08#1|2#0.2#10#4|3#0.15#8#4 0 +1000714 20001#0.7 6#4#4 3#3#1.08#1|2#0.3#12#4|3#0.15#8#4 0 1000715 null null null 0 1000721 20001#0.7 1 1#1 2.0 1000722 20001#0.7|10721#0.7 1|8 1.1#1|0#1#1 2.0 diff --git a/conf/server/TaskConfig.txt b/conf/server/TaskConfig.txt index fbb81455a..0e2a7ba12 100644 --- a/conf/server/TaskConfig.txt +++ b/conf/server/TaskConfig.txt @@ -15,7 +15,7 @@ int int mut,int#int,2 mut,int#int,2 mut,int#int,1 10204 2 5|5 14#10000 1001 10404 4 0|1 14#10000 3001 11004 10 0|70000 14#10000 2001 -11204 12 0|5 14#10000 5001 +11204 12 0|10 14#10000 5001 11704 8 0|1250 14#10000 8001 10305 3 80|5 14#10000 22001 10805 16 1|201 14#10000 18001