diff --git a/conf/server/AccomplishmentBox.txt b/conf/server/AccomplishmentBox.txt index 7b4204afa..00aac501d 100644 --- a/conf/server/AccomplishmentBox.txt +++ b/conf/server/AccomplishmentBox.txt @@ -1,3 +1,6 @@ id Total Box int int mut,int#int,2 101 100 40#2001|60#2002|100#2020 +102 100 40#2001|60#2002|100#2020 +103 100 40#2001|60#2002|100#2020 +104 100 40#2001|60#2002|100#2020 diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 1afd405f5..1325d436f 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -1,45 +1,86 @@ id MapId Logic Values Score int int int mut,int#int,1 int -1 101 1 101009#1 11 -2 101 1 101016#1 20 -3 101 3 0#1 5 -4 101 3 0#2 5 -5 101 3 0#3 5 -6 101 3 0#4 5 -7 101 3 0#5 5 -8 101 3 0#6 5 -9 101 3 0#7 5 -10 101 3 0#8 5 -11 101 3 0#9 5 -12 101 3 0#10 5 -13 101 3 0#11 5 -14 101 5 0#1 1 -15 101 5 0#2 1 -16 101 5 0#3 1 -17 101 5 0#4 1 -18 101 5 0#5 1 -19 101 6 0#50 3 -20 101 6 0#75 3 -21 101 6 0#100 3 -22 102 1 102015#1 6 -23 102 1 102017#1 6 -24 102 1 102018#1 6 -25 102 1 102019#1 2 -26 102 1 102020#1 2 -27 102 1 102021#1 2 -28 102 1 102022#1 6 -29 102 1 102023#1 6 -30 102 1 102024#1 6 -31 102 1 102025#1 6 -32 102 1 102026#1 6 -33 102 1 102028#1 6 -34 102 2 0#1 6 -35 102 1 102032#1 4 -36 102 1 102033#1 4 -37 102 7 0#1 8 -38 102 5 0#5 3 -39 102 5 0#10 3 -40 102 5 0#15 3 -41 102 3 0#20 3 -42 102 3 0#30 3 -43 102 3 0#50 3 +1 101 1 101064#1 4 +2 101 1 101026#1 8 +3 101 1 101142#1 4 +4 101 1 101046#1 8 +5 101 1 101061#1 8 +6 101 1 101100#1 8 +7 101 1 101126#1 8 +8 101 1 101222#1 6 +9 101 1 101224#1 6 +10 101 7 0#1 10 +11 101 5 0#1 4 +12 101 5 0#3 4 +13 101 5 0#5 4 +14 101 3 0#10 3 +15 101 3 0#20 3 +16 101 3 0#30 3 +17 101 6 0#50 3 +18 101 6 0#75 3 +19 101 6 0#100 3 +20 102 1 102016#1 6 +21 102 1 102028#1 6 +22 102 1 102137#1 7 +23 102 1 102036#1 2 +24 102 1 102039#1 2 +25 102 1 102042#1 2 +26 102 1 102061#1 7 +27 102 1 102172#1 7 +28 102 1 102077#1 7 +29 102 1 102105#1 7 +30 102 1 102026#1 7 +31 102 2 0#1 6 +32 102 1 102165#1 4 +33 102 1 102167#1 4 +34 102 7 0#1 8 +35 102 5 0#5 3 +36 102 5 0#10 3 +37 102 5 0#15 3 +38 102 3 0#20 3 +39 102 3 0#30 3 +40 102 3 0#50 3 +41 103 1 103017#1 3 +42 103 1 103018#1 3 +43 103 1 103020#1 6 +44 103 1 103021#1 6 +45 103 1 103022#1 6 +46 103 1 103023#1 6 +47 103 1 103030#1 6 +48 103 1 101017#1 6 +49 103 1 101023#1 6 +50 103 1 101024#1 6 +51 103 1 103028#1 4 +52 103 1 103029#1 4 +53 103 7 0#1 10 +54 103 5 0#5 3 +55 103 5 0#10 3 +56 103 5 0#20 3 +57 103 3 0#20 3 +58 103 3 0#30 3 +59 103 3 0#50 3 +60 103 8 0#1 10 +61 104 1 104021#1 6 +62 104 1 104023#1 6 +63 104 1 104024#1 6 +64 104 1 104026#1 6 +65 104 1 104022#1 4 +66 104 1 104025#1 4 +67 104 1 104027#1 4 +68 104 1 104028#1 4 +69 104 1 104029#1 4 +70 104 1 104004#1 4 +71 104 1 104030#1 4 +72 104 1 104019#1 4 +73 104 1 104020#1 4 +74 104 1 0#1 4 +75 104 1 0#1 4 +76 104 1 0#1 4 +77 104 7 0#2 4 +78 104 7 0#4 6 +79 104 7 0#1 4 +80 104 7 0#2 6 +81 104 5 0#10 3 +82 104 5 0#20 3 +83 104 3 0#20 3 +0 0 3 0#40 3 diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 2a2807d9a..eba4b04f5 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -1,23 +1,23 @@ Id Option int mut,int#int,1 -100001 100001#100002 +100001 100001 100002 100003 100003 100005 100004 100006 100005 100007 -100006 null +100006 100008 100007 100009 -100008 null +100008 100010 100009 null 100010 100012 -100011 null -100012 null -100013 100015 +100011 100013 +100012 100014 +100013 null 100014 null 100015 null 100016 null -100017 100019 -100018 100020 +100017 null +100018 null 100019 100021 100020 100022 100021 100023 @@ -44,7 +44,7 @@ int mut,int#int,1 101010 101012 101011 101013 101012 101014#101015 -101013 101016#101017#101018 +101013 101016#101018 101014 101019 101015 101020 101016 101021 @@ -58,9 +58,9 @@ int mut,int#int,1 101024 101031 101025 101032 101026 101033 -101027 101034 -101028 101035 -101029 101036 +101027 null +101028 null +101029 null 101030 101037 101031 101038#101039 101032 null @@ -84,7 +84,7 @@ int mut,int#int,1 101050 101069#101070 101051 101071#101072 101052 null -101053 101075#101076#101077 +101053 101075#101077 101054 null 101055 101079#101080 101056 101081#101082 @@ -121,7 +121,7 @@ int mut,int#int,1 101087 101124 101088 null 101089 101126 -101090 101127#101128 +101090 101128 101091 101129 101092 101130 101093 101131 @@ -230,7 +230,7 @@ int mut,int#int,1 101195 101276#101277 101196 101278 101197 null -101198 null +101198 101280 101199 null 101200 null 101202 101287#101288 @@ -253,12 +253,25 @@ int mut,int#int,1 101219 101308 101220 101309#101310 101221 101311 -101222 101312#101313 +101222 101312#101313#101319 101223 101314 -101224 1001#1101#1201#1301 -102001 10101 -102002 10102 -102003 10104 +101224 101315 +101225 101316 +101226 101317 +101227 null +101228 101319#101320 +101229 101321 +101230 101322 +101231 101323#101324 +101232 101325 +101233 101326 +101234 101327#101328 +101235 101329 +101236 101330 +101237 101331 +102001 10201 +102002 10202 +102003 10204 102004 102001#102002 102005 102003#102004 102006 102005#102006 @@ -268,7 +281,7 @@ int mut,int#int,1 102010 102013#102014 102011 102015#102016 102012 102017#102018#102019 -102013 102020#102021 +102013 102020#102028#102021 102014 102022#102023 102015 102024#102025 102016 102026 @@ -332,13 +345,13 @@ int mut,int#int,1 102074 102108#102109 102075 102110#102111 102076 102112#102113 -102077 102114#102115 +102077 102115 102078 102116 102079 102117 102080 102118 102081 102119 -102082 null -102083 null +102082 102114 +102083 102121 102084 102124#102125 102085 102126#102127 102086 102128#102129 @@ -363,7 +376,7 @@ int mut,int#int,1 102105 102156 102106 102157 102107 102158 -102108 10103 +102108 10203 102109 102159#102160 102110 102161#102162 102111 102163 @@ -409,7 +422,7 @@ int mut,int#int,1 102151 102218 102152 102219 102153 102220 -102154 null +102154 102221 102155 null 102156 102233#102234 102157 102235#102236 @@ -428,6 +441,8 @@ int mut,int#int,1 102170 102256 102171 102257 102172 102258 +102173 102259 +102174 102260 103001 10301 103002 10303 103003 10305 diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index aae1afaa1..62071ae76 100644 --- a/conf/server/GameSetting.txt +++ b/conf/server/GameSetting.txt @@ -1,3 +1,3 @@ Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 -1 10008#1|10013#1|10023#1|1503#8 0#0#0.3164#0 100 60#1 0#0#1#0 70#100 999 9999 1 05#09 +1 10008#1|10013#1|10023#1|1503#8 0#0#0.3164#0 100 60#1 0#0#1#0 70#100 999 9999 1 06#09 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 60655ea4b..7e911e6e7 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -3,7 +3,7 @@ int int int int int int int 100001 4 3 2 0 100001 0 100002 5 3 2 0 100002 0 100003 5 3 1 0 100019 0 -100004 9 3 3 0 100030 0 +100004 5 3 1 0 100010 0 0 0 0 0 0 0 0 101001 1 2 1 0 101001 0 101002 1 2 1 0 101002 0 @@ -28,7 +28,7 @@ int int int int int int int 101011 5 3 2 0 101064 0 101012 5 3 2 0 101065 0 101013 8 2 0 0 0 0 -101016 5 3 2 0 101149 0 +101016 5 3 2 0 101228 0 101017 5 3 2 0 101165 0 101018 5 3 2 0 101114 0 101023 5 3 2 0 101154 0 @@ -40,6 +40,10 @@ int int int int int int int 101033 5 2 2 0 101220 0 101034 5 2 2 0 101222 0 101035 7 3 2 0 101224 0 +101036 5 3 1 0 101225 0 +101037 5 3 1 0 101226 0 +101038 5 3 2 0 101231 0 +101039 5 3 2 0 101234 0 0 0 0 0 0 0 0 102001 1 2 1 0 102001 0 102002 1 2 1 0 102002 0 @@ -72,8 +76,8 @@ int int int int int int int 102029 5 0 0 0 102111 0 102030 5 3 1 0 102117 0 102031 5 0 0 0 102123 0 -102032 5 2 2 0 0 0 -102033 5 2 2 0 0 0 +102032 5 2 2 0 102164 0 +102033 5 2 2 0 102166 0 0 0 0 0 0 0 0 103001 1 2 1 0 103001 0 103024 1 2 1 0 103070 0 diff --git a/conf/server/Map_100.txt b/conf/server/Map_100.txt index b81d3fe60..bb606f394 100644 --- a/conf/server/Map_100.txt +++ b/conf/server/Map_100.txt @@ -1,3 +1,4 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 100002 5#4 0 +1 100004 7#7 0 +2 100002 4#4 0 diff --git a/conf/server/Map_101.txt b/conf/server/Map_101.txt index f21b36b55..608a87c12 100644 --- a/conf/server/Map_101.txt +++ b/conf/server/Map_101.txt @@ -1,20 +1,24 @@ id Event Groups isMustAppear int int mut,int#int,2 int 1 101009 15#9 0 -2 101019 9#9|10#9|9#10 0 -3 101008 6#12 0 -4 101016 6#1 0 -5 101001 14#12|14#13|14#14 0 +2 101008 5#12 0 +3 101016 6#1 0 +4 101001 9#9|9#10|10#10 0 +5 101026 5#16|5#17|5#18 0 6 101005 15#20 0 -7 101026 2#6|2#7|3#7|2#8|2#9 0 -8 101013 1#1|2#1|3#1|4#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|12#2|13#2|14#2|15#2|1#3|2#3|13#3|14#3|15#3|11#4|12#4|13#4|14#4|15#4|14#5|15#5|5#6|6#6|14#6|15#6|4#7|5#7|6#7|7#7|13#7|14#7|15#7|3#8|4#8|5#8|6#8|7#8|14#8|15#8|4#9|5#9|6#9|7#9|6#10|7#10|1#14|8#14|9#14|10#14|11#14|12#14|13#14|1#15|13#15|1#16|13#16|1#17|2#17|3#17|10#17|11#17|12#17|13#17|1#18|2#18|11#18|12#18|13#18|1#19|10#19|11#19|12#19|13#19|1#20|13#20 1 -9 101014 3#3|4#3|4#4 0 -10 101011 13#6 0 -11 101001 8#4|8#5|9#5 0 -12 101002 3#12|3#13|3#14|3#15 0 -13 101032 12#8 0 -14 101033 7#11 0 -15 101034 8#17 0 -16 101001 10#16|9#18|9#19 0 -17 101022 5#18|6#18|6#19 0 -18 101010 2#20 0 +7 101026 1#5|1#6|1#7|1#8 0 +8 101013 1#1|2#1|3#1|4#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|12#2|13#2|14#2|15#2|1#3|2#3|13#3|14#3|15#3|11#4|12#4|13#4|14#4|15#4|14#5|15#5|5#6|6#6|14#6|15#6|4#7|5#7|6#7|7#7|13#7|14#7|3#8|4#8|5#8|6#8|7#8|14#8|15#8|4#9|5#9|6#9|7#9|6#10|7#10|1#14|8#14|9#14|10#14|11#14|12#14|13#14|1#15|13#15|1#16|13#16|1#17|2#17|3#17|10#17|11#17|12#17|13#17|1#18|2#18|11#18|12#18|1#19|10#19|11#19|12#19|13#19|1#20|13#20 1 +9 101036 15#16 0 +10 101037 14#12 0 +11 101038 2#10 0 +12 101039 7#15 0 +13 101001 8#3|8#4|9#4 0 +14 101001 12#3|12#5|13#5 0 +15 101026 10#15|11#15|12#15 0 +16 101026 3#12|3#13|3#14|3#15 0 +17 101033 3#5 0 +18 101001 5#5|6#5 0 +19 101034 3#18 0 +20 101001 9#17|9#18|9#19 0 +21 101026 7#19|6#20|7#20 0 +22 101010 2#20 0 diff --git a/conf/server/Map_102.txt b/conf/server/Map_102.txt index d74538df5..dd9af62c9 100644 --- a/conf/server/Map_102.txt +++ b/conf/server/Map_102.txt @@ -1,38 +1,33 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 102012 1#5 0 -2 102033 10#12 0 -3 102013 14#20 0 -4 102032 11#4 0 -5 102010 5#18|6#18|4#19|5#19|4#20 0 -6 102004 10#1|11#1|10#2|11#2|10#3 0 -7 102004 9#15|10#15|9#16|10#16|9#17 0 -8 102002 11#18|12#18|11#19|12#19|13#19|11#20 0 -9 102001 10#18|9#19|10#19|8#20|9#20 0 -10 102001 2#6|1#7|2#7|1#8|1#9|2#9 0 -11 102004 13#17|14#17|15#17|13#18|14#18 0 -12 102026 14#14 0 -13 102009 1#14|2#14|2#15|3#15|2#16 0 -14 102022 15#3 0 -15 102023 8#3 0 -16 102001 7#8|8#8|6#9|7#9|7#10|6#11 0 -17 102024 9#10 0 -18 102002 14#10|14#11|15#11|14#12|14#13 0 -19 102001 13#12|13#13|13#14|13#15 0 -20 102025 7#19 0 -21 102004 2#1|2#2|1#3|2#3|2#4 0 -22 102002 11#7|12#7|11#8|12#8|10#9|11#9 0 -23 102001 4#2|5#2|6#2|7#2|5#3|5#4 0 -24 102020 11#14 0 -25 102021 15#10 0 -26 102004 5#6|3#7|4#7|5#7|4#8 0 -27 102001 13#2|12#3|13#3|13#4|14#4|14#5 0 -28 102002 7#16|6#17|7#17|7#18|8#18 0 -29 102019 12#20 0 -30 102001 4#11|3#12|4#12|2#13|3#13|4#13 0 -31 102004 14#1|14#2|15#2|14#3|15#4 0 -32 102014 8#1|8#2|9#2|9#3|9#4|10#4|10#5|10#7|9#8|10#8|14#8|15#8|8#9|9#9|12#9|13#9|14#9|8#10|11#10|12#10|7#11|8#11|9#11|10#11|11#11|7#12|5#13|6#13|7#13|5#15|4#16|5#16|3#17|4#17|2#18|3#18|2#19|1#20|2#20 1 -33 102015 5#14 0 -34 102004 7#5|8#5|9#5|8#6|8#7 0 -35 102017 2#11 0 -36 102018 8#12 0 +1 102011 8#12 0 +2 102012 1#5 0 +3 102013 11#20 0 +4 102032 9#5 0 +5 102001 13#10|12#11|13#11 0 +6 102002 12#14|13#15|14#16 0 +7 102002 12#18|13#18 0 +8 102001 3#13|3#14|10#18|9#19 0 +9 102001 4#6|4#7|5#7 0 +10 102032 11#13 0 +11 102026 14#14 0 +12 102022 15#3 0 +13 102023 8#3 0 +14 102001 7#6|8#6|7#7|7#8 0 +15 102024 9#10 0 +16 102002 15#9|15#10|15#11 0 +17 102001 5#11|6#12 0 +18 102025 15#18 0 +19 102002 11#7|12#7|11#8|12#8|11#9 0 +20 102001 4#2|4#3|5#3 0 +21 102020 10#15 0 +22 102021 12#16 0 +23 102001 13#5|14#5|14#6 0 +24 102019 8#16 0 +25 102002 7#18|7#19|7#20 0 +26 102001 1#16|1#17|1#18|1#19 0 +27 102002 8#14|9#14 0 +28 102014 2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|5#2|6#2|7#2|8#2|9#2|10#2|11#2|12#2|13#2|14#2|15#2|6#3|7#3|9#3|10#3|11#3|12#3|13#3|9#4|10#4|11#4|12#4|10#5|11#5|10#7|9#8|10#8|14#8|15#8|8#9|9#9|12#9|13#9|14#9|8#10|11#10|12#10|7#11|8#11|9#11|10#11|11#11|7#12|5#13|6#13|7#13|5#15|6#15|4#16|5#16|6#16|3#17|4#17|5#17|6#17|2#18|3#18|4#18|5#18|6#18|2#19|3#19|4#19|5#19|6#19|1#20|2#20|3#20|4#20|5#20|6#20 1 +29 102015 5#14 0 +30 102017 2#11 0 +31 102018 9#12 0 diff --git a/conf/server/MissionEventsConfig.txt b/conf/server/MissionEventsConfig.txt index 8f46c5404..0369676a8 100644 --- a/conf/server/MissionEventsConfig.txt +++ b/conf/server/MissionEventsConfig.txt @@ -1,8 +1,10 @@ Id Type MissionNum Reward int int int int -1 1 2 2000 -2 1 4 2001 -3 1 5 2002 +1 1 3 2000 +2 1 5 2001 +502 1 4 2001 +3 1 3 2002 +503 1 6 2002 4 1 2 2003 5 1 3 2004 6 1 3 2005 @@ -11,3 +13,5 @@ int int int int 9 1 1 2008 10 1 2 2009 101 2 4 2002 +102 2 3 0 +103 2 1 0 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 4c14436af..66af2d451 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -9,133 +9,133 @@ int int int int int int int int int int int float float float float mut,int#int, 7 3 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null 8 3 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20008 null 9 3 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -10 4 3 0 2 0 1448 522 305 305 240 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20010 null -11 4 3 0 2 0 1448 522 305 305 80 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20011 null -12 4 3 0 2 0 1448 522 305 305 7 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20012 null -13 5 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20013 null -14 5 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20014 null -15 5 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20015 null -16 6 2 0 1 0 2005 90 50 50 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20016 null -17 6 2 0 1 0 2005 90 50 50 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20017 null -18 6 2 0 1 0 2005 90 50 50 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20018 null -19 7 1 0 1 0 6767 271 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20019 null -20 7 1 0 1 0 6767 271 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20020 null -21 7 1 0 1 0 6767 271 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20021 null -22 8 2 0 2 0 9023 277 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20022 null -23 8 2 0 2 0 9023 277 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20023 null -24 8 2 0 2 0 9023 277 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20024 null -25 9 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20025 null -26 9 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20026 null -27 9 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20027 null -28 10 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20028 null -29 10 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20029 null -30 10 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20030 null -31 11 3 0 2 5 30078 924 508 508 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20031 null -32 11 3 0 2 5 30078 924 508 508 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20032 null -33 11 3 0 2 5 30078 924 508 508 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20033 null -34 9 3 0 1 5 16041 725 406 406 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20034 null -35 9 3 0 1 5 16041 725 406 406 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20035 null -36 9 3 0 1 5 16041 725 406 406 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20036 null -37 13 3 0 1 88 20052 906 508 508 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20037 null -38 13 3 0 1 88 20052 906 508 508 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20038 null -39 13 3 0 1 88 20052 906 508 508 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20039 null -40 7 1 0 1 88 23225 947 528 528 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20040 null -41 7 1 0 1 88 23225 947 528 528 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20041 null -42 7 1 0 1 88 23225 947 528 528 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20042 null -43 11 3 0 2 96 33427 1072 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20043 null -44 11 3 0 2 96 33427 1072 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20044 null -45 11 3 0 2 96 33427 1072 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20045 null -46 15 1 0 1 96 25070 1047 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20046 null -47 15 1 0 1 96 25070 1047 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20047 null -48 15 1 0 1 96 25070 1047 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20048 null -49 16 1 0 2 100 33870 1108 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20049 null -50 16 1 0 2 100 33870 1108 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20050 null -51 16 1 0 2 100 33870 1108 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20051 null -52 17 4 0 1 100 25403 1079 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20052 null -53 17 4 0 1 100 25403 1079 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20053 null -54 17 4 0 1 100 25403 1079 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20054 null -55 18 4 0 1 100 23332 1107 603 603 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20055 null -56 18 4 0 1 100 23332 1107 603 603 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20056 null -57 18 4 0 1 100 23332 1107 603 603 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20057 null -58 19 4 0 2 100 33394 1099 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20058 null -59 19 4 0 2 100 33394 1099 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20059 null -60 19 4 0 2 100 33394 1099 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20060 null -61 20 2 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -62 20 2 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -63 20 2 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -64 21 3 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -65 21 3 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -66 21 3 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -67 22 4 0 1 108 39273 1382 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -68 22 4 0 1 108 39273 1382 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -69 22 4 0 1 108 39273 1382 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -70 23 3 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -71 23 3 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -72 23 3 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -73 24 2 0 2 108 58909 1488 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -74 24 2 0 2 108 58909 1488 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -75 24 2 0 2 108 58909 1488 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -76 25 4 0 2 108 40586 1267 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -77 25 4 0 2 108 40586 1267 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -78 25 4 0 2 108 40586 1267 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -79 26 2 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -80 26 2 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -81 26 2 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -82 27 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -83 27 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -84 27 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -85 28 4 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -86 28 4 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -87 28 4 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -88 29 3 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -89 29 3 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -90 29 3 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -91 30 4 0 2 108 47779 1435 764 764 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -92 30 4 0 2 108 47779 1435 764 764 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -93 30 4 0 2 108 47779 1435 764 764 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -94 31 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -95 31 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -96 31 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -97 32 1 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -98 32 1 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -99 32 1 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -100 33 2 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -101 33 2 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -102 33 2 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -103 34 4 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -104 34 4 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -105 34 4 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -106 35 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -107 35 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -108 35 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -109 36 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -110 36 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -111 36 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -112 37 3 0 2 122 74681 2078 1126 1126 3168 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -113 37 3 0 2 122 74681 2078 1126 1126 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -114 37 3 0 2 122 74681 2078 1126 1126 105 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -115 38 2 0 2 124 95567 2225 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -116 38 2 0 2 124 95567 2225 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -117 38 2 0 2 124 95567 2225 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -118 39 2 0 1 124 55715 2028 1120 1120 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -119 39 2 0 1 124 55715 2028 1120 1120 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -120 39 2 0 1 124 55715 2028 1120 1120 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -121 40 4 0 2 126 74098 2079 1117 1117 3264 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -122 40 4 0 2 126 74098 2079 1117 1117 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -123 40 4 0 2 126 74098 2079 1117 1117 108 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -124 41 2 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -125 41 2 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -126 41 2 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -127 42 3 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -128 42 3 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -129 42 3 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -130 43 0 0 2 128 95097 2237 1150 1150 3312 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -131 43 0 0 2 128 95097 2237 1150 1150 1104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -132 43 0 0 2 128 95097 2237 1150 1150 110 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +10 4 3 0 2 0 1448 522 305 305 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20010 null +11 4 3 0 2 0 1448 522 305 305 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20011 null +12 4 3 0 2 0 1448 522 305 305 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20012 null +13 5 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20013 null +14 5 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20014 null +15 5 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20015 null +16 6 2 0 1 0 2005 90 50 50 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20016 null +17 6 2 0 1 0 2005 90 50 50 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20017 null +18 6 2 0 1 0 2005 90 50 50 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20018 null +19 7 1 0 1 0 6767 271 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20019 null +20 7 1 0 1 0 6767 271 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20020 null +21 7 1 0 1 0 6767 271 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20021 null +22 8 2 0 2 0 9023 277 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20022 null +23 8 2 0 2 0 9023 277 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20023 null +24 8 2 0 2 0 9023 277 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20024 null +25 9 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20025 null +26 9 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20026 null +27 9 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20027 null +28 10 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +29 10 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20029 null +30 10 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20030 null +31 11 3 0 2 5 30078 924 508 508 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20031 null +32 11 3 0 2 5 30078 924 508 508 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20032 null +33 11 3 0 2 5 30078 924 508 508 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20033 null +34 9 3 0 1 5 16041 725 406 406 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20034 null +35 9 3 0 1 5 16041 725 406 406 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20035 null +36 9 3 0 1 5 16041 725 406 406 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20036 null +37 13 3 0 1 88 20052 906 508 508 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20037 null +38 13 3 0 1 88 20052 906 508 508 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20038 null +39 13 3 0 1 88 20052 906 508 508 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20039 null +40 7 1 0 1 88 23225 947 528 528 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20040 null +41 7 1 0 1 88 23225 947 528 528 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20041 null +42 7 1 0 1 88 23225 947 528 528 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20042 null +43 11 3 0 2 96 33427 1072 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20043 null +44 11 3 0 2 96 33427 1072 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20044 null +45 11 3 0 2 96 33427 1072 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20045 null +46 15 1 0 1 96 25070 1047 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20046 null +47 15 1 0 1 96 25070 1047 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20047 null +48 15 1 0 1 96 25070 1047 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20048 null +49 16 1 0 2 100 33870 1108 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20049 null +50 16 1 0 2 100 33870 1108 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20050 null +51 16 1 0 2 100 33870 1108 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20051 null +52 17 4 0 1 100 25403 1079 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20052 null +53 17 4 0 1 100 25403 1079 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20053 null +54 17 4 0 1 100 25403 1079 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20054 null +55 18 4 0 1 100 23332 1107 603 603 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20055 null +56 18 4 0 1 100 23332 1107 603 603 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20056 null +57 18 4 0 1 100 23332 1107 603 603 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20057 null +58 19 4 0 2 100 33394 1099 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20058 null +59 19 4 0 2 100 33394 1099 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20059 null +60 19 4 0 2 100 33394 1099 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20060 null +61 20 2 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +62 20 2 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +63 20 2 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +64 21 3 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +65 21 3 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +66 21 3 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +67 22 4 0 1 108 39273 1382 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +68 22 4 0 1 108 39273 1382 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +69 22 4 0 1 108 39273 1382 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +70 23 3 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +71 23 3 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +72 23 3 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +73 24 2 0 2 108 58909 1488 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +74 24 2 0 2 108 58909 1488 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +75 24 2 0 2 108 58909 1488 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +76 25 4 0 2 108 40586 1267 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +77 25 4 0 2 108 40586 1267 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +78 25 4 0 2 108 40586 1267 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +79 26 2 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +80 26 2 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +81 26 2 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +82 27 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +83 27 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +84 27 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +85 28 4 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +86 28 4 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +87 28 4 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +88 29 3 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +89 29 3 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +90 29 3 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +91 30 4 0 2 108 47779 1435 764 764 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +92 30 4 0 2 108 47779 1435 764 764 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +93 30 4 0 2 108 47779 1435 764 764 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +94 31 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +95 31 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +96 31 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +97 32 1 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +98 32 1 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +99 32 1 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +100 33 2 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +101 33 2 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +102 33 2 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +103 34 4 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +104 34 4 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +105 34 4 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +106 35 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +107 35 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +108 35 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +109 36 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +110 36 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +111 36 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +112 37 3 0 2 122 74681 2078 1126 1126 3168 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +113 37 3 0 2 122 74681 2078 1126 1126 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +114 37 3 0 2 122 74681 2078 1126 1126 105 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +115 38 2 0 2 124 95567 2225 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +116 38 2 0 2 124 95567 2225 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +117 38 2 0 2 124 95567 2225 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +118 39 2 0 1 124 55715 2028 1120 1120 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +119 39 2 0 1 124 55715 2028 1120 1120 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +120 39 2 0 1 124 55715 2028 1120 1120 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +121 40 4 0 2 126 74098 2079 1117 1117 3264 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +122 40 4 0 2 126 74098 2079 1117 1117 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +123 40 4 0 2 126 74098 2079 1117 1117 108 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +124 41 2 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +125 41 2 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +126 41 2 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +127 42 3 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +128 42 3 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +129 42 3 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +130 43 0 0 2 128 95097 2237 1150 1150 3312 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +131 43 0 0 2 128 95097 2237 1150 1150 1104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +132 43 0 0 2 128 95097 2237 1150 1150 110 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null 133 1 2 0 1 0 2500 180 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null 134 1 2 0 1 0 2500 180 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20002 null 135 1 2 0 1 0 2500 180 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20003 null -136 5 2 0 1 0 2000 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20014 null +136 5 2 0 1 0 2000 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20014 null 137 3 2 0 1 0 2000 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null 138 3 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null 1001 4 3 0 1 0 3000 180 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20010 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 25b5bba92..6509656c2 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -11,7 +11,7 @@ int mut,int#int,2 mut,int#int,1 string 10108 11#4#6 10108#20108 10109 11#7#9 10109#20109 10110 11 10110#20110 -10111 136#137#138 10111#20111 +10111 136#137#138 10104#20104 10201 16#17#18 10201#20201 10202 20#16#18 10202#20202 10203 23#16#18 10203#20203 @@ -29,8 +29,8 @@ int mut,int#int,2 mut,int#int,1 string 10405 44#34#36 10405#20405 10406 44#37#39 10406#20406 10407 44 10407#20407 -10408 43#45 10408#20408 -10409 43#45#40#42 10409#20409 +10408 43#45 10409#20409 +10409 43#45#40#42 10408#20408 10501 46#48 10501#20501 10502 46#47#48 10502#20502 10503 50#46#48 10503#20503 @@ -72,56 +72,74 @@ int mut,int#int,2 mut,int#int,1 string 11004 122#125#128 11004#21004 11005 122 11005#21005 11006 131 11006#21006 -1010001 1002#1003#1004 1010001#1020001 -1010002 1005#1006#1007 1010002#1020002 -1010003 1008#1009#1010 1010003#1020003 -1010004 1011#1012#1013 1010004#1020004 -1010005 1014#1016 1010005#1020005 -1010006 1014#1015#1016 1010006#1020006 -1010007 1017 1010007#1020007 -1020001 1018#1019#1020 1020001#1030001 -1020002 1021#1022#1023 1020002#1030002 -1020003 1024#1025#1026 1020003#1030003 -1020004 1027#1028#1029 1020004#1030004 -1020005 1030#1031#1032 1020005#1030005 -1020006 1033#1034#1035 1020006#1030006 -1020007 1036#1037#1038 1020007#1030007 -1020008 1039#1040#1041 1020008#1030008 -1020009 1042 1020009#1030009 -1030001 1043#1044#1045 1030001#1040001 -1030002 1046#1047#1048 1030002#1040002 -1030003 1052#1049#1051 1030003#1040003 -1030004 1053 1030004#1040004 -1040001 1054#1055#1056 1040001#1050001 -1040002 1057#1058#1059 1040002#1050002 -1040003 1060#1061#1062 1040003#1050003 -1040004 1063 1040004#1050004 -1040005 1063#1064#1060#1062 1040005#1050005 -1040006 1065#1066#1067 1040006#1050006 -1050001 1069 1050001#1060001 -1050002 1071#1072#1073 1050002#1060002 -1050003 1075#1071#1073 1050003#1060003 -1050004 1078 1050004#1060004 -1050005 1080 1050005#1060005 -1050006 1081#1082 1050006#1060006 -1060001 1083#1084#1085 1060001#1070001 -1060002 1086#1087#1088 1060002#1070002 -1060003 1089#1090#1091 1060003#1070003 -1060004 1092 1060004#1070004 -1060005 1093#1094#1095 1060005#1070005 -1060006 1096#1097#1098 1060006#1070006 -1060007 1099#1101#1102#1104 1060007#1070007 -1070001 1108#1110#1105#1107 1070001#1080001 -1070002 1111 1070002#1080002 -1080001 1112#1114 1080001#1090001 -1080002 1115#1117 1080002#1090002 -1080003 1118#1120 1080003#1090003 -1080004 1121#1123 1080004#1090004 -1080005 1124#1126 1080005#1090005 -1080006 1127#1129 1080006#1090006 -1080007 1130#1131 1080007#1090007 -1080008 1132 1080008#1090008 -1080009 1133 1080009#1090009 -1090001 1134#1135#1136 1090001#1100001 -1090002 1137#1138#1139 1090002#1100002 -1090003 1140 1090003#1100003 +101011 1#2#3 100001#102001#101001 +101021 4#5#6 100002#101001#102002 +101071 11#1#3 100003#101001#101001#102002#102002 +101012 1#2#3 100002#101001#102002 +102011 16#17#18 100012#101005#102008#102008 +102012 16#17#18 100002#102001 +102013 16#17#18 100002#102002#101001 +102014 16#17#18 100003#102002#101001#101001 +102021 20#16#18 100004#101002#102002#102002 +102031 23#16#18 100005#101003#102003#102002 +103011 25#26#27 100002#101001#102003 +103031 32#25#27 100004#102005#101001 +103032 32#25#27 100004#102005#101001#101001 +103041 32#28#30 100004#101001#101001#102003 +103051 32 100004#101001#101001#102003 +103052 32 100004 +103053 32 100005#100002 +103054 32 100006#100002 +1010001 1002#1003#1004 10104#20104 +1010002 1005#1006#1007 100001#100002#102002 +1010003 1008#1009#1010 100001#100002#102002 +1010004 1011#1012#1013 100003#101001#102002 +1010005 1014#1016 100005#101002#102003 +1010006 1014#1015#1016 100005#101002#102003 +1010007 1017 100006#101006#101001#102004 +1020001 1018#1019#1020 10201#20201 +1020002 1021#1022#1023 100003#101001#102002 +1020003 1024#1025#1026 100003#101001#102002 +1020004 1027#1028#1029 100004#101001#101001#102002#102001 +1020005 1030#1031#1032 100002#102001 +1020006 1033#1034#1035 100004#101002#102002 +1020007 1036#1037#1038 100002#102001#101001 +1020008 1039#1040#1041 100004#102001#102002#101002 +1020009 1042 100006#102004#101004 +1030001 1043#1044#1045 100004#102003 +1030002 1046#1047#1048 100004#102003 +1030003 1052#1049#1051 100009#100004#102010#101004#101001 +1030004 1053 100015#102011#102005#101005 +1040001 1054#1055#1056 10404#20404 +1040002 1057#1058#1059 10404#20404 +1040003 1060#1061#1062 10405#20405 +1040004 1063 10406#20406 +1040005 1063#1064#1060#1062 10407#20407 +1040006 1065#1066#1067 10409#20409 +1050001 1069 10501#20501 +1050002 1071#1072#1073 10502#20502 +1050003 1075#1071#1073 10503#20503 +1050004 1078 10504#20504 +1050005 1080 10504#20504 +1050006 1081#1082 10504#20504 +1060001 1083#1084#1085 10601#20601 +1060002 1086#1087#1088 10601#20601 +1060003 1089#1090#1091 10601#20601 +1060004 1092 10602#20602 +1060005 1093#1094#1095 10603#20603 +1060006 1096#1097#1098 10604#20604 +1060007 1099#1101#1102#1104 10605#20605 +1070001 1108#1110#1105#1107 10708#20708 +1070002 1111 10709#20709 +1080001 1112#1114 10808#20808 +1080002 1115#1117 10808#20808 +1080003 1118#1120 10808#20808 +1080004 1121#1123 10808#20808 +1080005 1124#1126 10808#20808 +1080006 1127#1129 10808#20808 +1080007 1130#1131 10809#20809 +1080008 1132 10809#20809 +1080009 1133 10809#20809 +1090001 1134#1135#1136 10906#20906 +1090002 1137#1138#1139 10906#20906 +1090003 1140 10907#20907 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index c63590d15..cb00c01bf 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -15,17 +15,19 @@ int int mut,int#int,2 13 4 3#1 14 4 6#1 15 4 9#1 -10101 3 1#5#100 -10102 3 1#2#100 -10103 3 1#2#200 +10101 3 1#5#300 +10102 3 1#2#650 +10103 3 1#2#500 10104 0 null 10105 0 null -10106 0 null -10107 0 null -10108 6 0#2#5 -10109 6 1#2#5 -10201 6 0#3#6 -10202 6 1#3#6 +10106 6 0#2#3 +10107 6 0#502#1 +10108 6 0#502#2 +10109 6 1#502#2 +10110 6 0#502#3 +10111 6 0#502#4 +10201 6 0#503#6 +10202 6 1#503#6 10301 6 0#4#3 10302 6 1#4#3 10401 6 1#5#4 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 2aa8d614e..c95066141 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -1,25 +1,25 @@ Id AddConditionID BehaviorType BehaviorTypeValues Reward JumpType JumpTypeValues int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100001 0 19 1#100#20#29 null 4 null -100002 0 0 null null 4 null +100002 0 0 null null 0 null 100003 0 0 null null 5 100003 100004 0 0 null null 0 null 100005 0 0 null null 5 100004 100006 0 0 null null 5 100005 -100007 0 0 null null 5 100007 -100008 0 0 null null 0 null -100009 0 0 null null 1 100010 -100010 0 0 null null 0 null +100007 0 0 null null 5 100006 +100008 0 27 2 null 1 100007 +100009 0 11 1|100#2#4#100001 null 1 100008 +100010 0 15 100002 null 4 null 100011 0 0 null null 0 null -100012 0 27 2 null 1 100013 -100013 0 0 null null 0 null -100014 0 0 null null 0 null -100015 0 1 10001 null 5 100017 +100012 0 1 10102 null 1 100011 +100013 0 13 1 null 1 100012 +100014 0 15 100004 null 4 null +100015 0 0 null null 0 null 100016 0 0 null null 0 null 100017 0 0 null null 0 null 100018 0 0 null null 0 null -100019 0 11 1|100#8#4#100001 null 5 100018 -100020 0 15 100002 null 4 null +100019 0 0 null null 0 100018 +100020 0 0 null null 0 null 100021 0 0 null null 1 100020 100022 0 0 null null 1 100021 100023 0 0 null null 1 100022 @@ -41,44 +41,44 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101005 0 0 null null 5 101007 101006 0 0 null null 4 null 101007 0 0 null null 5 101008 -101008 0 1 10101 100001#102001 1 101009 +101008 0 1 101011 null 1 101009 101009 0 0 null null 4 null -101010 0 1 10101 100001#102001#101001 1 101010 +101010 0 1 101011 null 1 101010 101011 0 0 null null 4 null 101012 0 0 null null 1 101011 101013 0 0 null null 1 101012 -101014 0 1 10101 100002#101001#102002 1 101013 +101014 0 1 101011 null 1 101013 101015 0 0 null null 4 null -101016 1 2 1503#1 1002 1 101014 -101017 0 0 null null 1 101014 +101016 0 6 2 1002 1 101014 +101017 0 0 null null 0 null 101018 0 0 null null 4 null 101019 0 0 null null 1 101015 101020 0 0 null null 1 101016 101021 0 0 null null 1 101017 -101022 0 1 10102 100002#101001#102002 1 101018 +101022 0 1 101021 null 1 101018 101023 0 0 null null 4 null 101024 0 0 null null 1 101019 101025 0 0 null null 1 101020 -101026 0 1 10107 100003#101001#101001#102002#102002 1 101021 +101026 0 1 10107 null 1 101021 101027 0 0 null null 4 null 101028 0 0 null null 1 101022 101029 0 0 null null 1 101023 101030 0 0 null null 1 101024 101031 0 0 null null 1 101025 101032 0 0 null null 1 101026 -101033 0 0 null null 6 101027 -101034 0 0 null null 1 101028 -101035 0 0 null null 1 101029 -101036 0 0 null null 1 101030 -101037 0 0 null null 6 101027 -101038 0 28 30 null 1 101035 +101033 0 0 null null 6 101030 +101034 0 0 null null 0 null +101035 0 0 null null 0 null +101036 0 0 null null 0 null +101037 0 0 null null 4 null +101038 10106 0 null null 1 101035 101039 0 0 null null 4 null 101040 0 0 null null 0 null 101041 0 0 null null 0 null 101042 0 0 null null 0 null -101043 0 1 1010002 100001#100002#102002 1 101036 +101043 0 1 1010002 null 1 101036 101044 0 0 null null 4 null -101045 0 1 1010002 100001#100002#102002 1 101037 +101045 0 1 1010002 null 1 101040 101046 0 0 null null 4 null 101047 0 0 null null 0 null 101048 0 0 null null 0 null @@ -89,30 +89,30 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101053 0 0 null null 0 null 101054 0 6 2 100002#100004#101005#102002 1 101041 101055 0 0 null null 4 null -101056 0 1 1010003 100001#100002#102002 1 101044 +101056 0 1 1010003 null 1 101044 101057 0 0 null null 4 null 101058 0 0 null null 0 null 101059 0 0 null null 0 null 101060 0 0 null null 0 null 101061 0 0 null null 0 null -101062 0 1 1010003 100001#100002#102002 5 101045 +101062 0 1 1010003 null 5 101045 101063 0 0 null null 4 null 101064 0 0 null null 5 101046 -101065 0 17 2#101009|101#13#6#101012|101#12#12#101011 null 4 null +101065 0 17 2#101009|101#11#7#101012|101#13#9#101011 null 4 null 101066 0 0 null null 0 null 101067 0 0 null null 0 null 101068 0 0 null null 0 null 101069 0 0 null null 1 101051 101070 0 0 null null 4 null -101071 0 1 10101 100002#101001#102002 1 101053 +101071 0 1 101012 null 1 101053 101072 0 0 null null 4 null 101073 0 0 null null 0 null 101074 0 0 null null 0 null -101075 10102 6 2 20101 1 101055 -101076 0 0 null 102001 1 101055 +101075 0 6 3 20101#102001 1 101055 +101076 0 0 null null 1 101055 101077 0 0 null null 4 null 101078 0 0 null null 0 null -101079 0 1 10101 100002#101001#102002 1 101056 +101079 0 1 101012 null 1 101056 101080 0 0 null null 4 null 101081 0 0 null null 1 101059 101082 0 0 null null 4 null @@ -121,8 +121,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101085 0 0 null null 0 null 101086 0 0 null null 0 null 101087 0 0 null null 0 null -101088 0 1 10101 100002#101001#102002 1 101060 -101089 0 1 10102 100003#101001#101001#102002#102002 1 101061 +101088 0 1 101012 null 1 101060 +101089 0 1 101021 null 1 101061 101090 0 0 null null 4 null 101091 0 0 null null 0 null 101092 0 0 null null 0 null @@ -156,22 +156,22 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101120 0 0 null null 0 null 101121 0 0 null null 0 null 101122 0 0 null null 0 null -101123 0 1 1010004 100003#101001#102002 1 101087 -101124 0 1 1010005 100005#101002#102003 1 101089 +101123 0 1 1010004 null 1 101087 +101124 0 1 1010005 null 1 101089 101125 0 0 null null 0 null -101126 0 1 1010006 100005#101002#102003 1 101090 +101126 0 1 1010006 null 1 101090 101127 0 0 null null 1 101093 -101128 0 6 2 null 3 101091#101092|1#10103 +101128 0 6 2 null 1 101091 101129 0 0 null null 1 101093 101130 0 0 null null 1 101093 -101131 0 1 1010007 100006#101006#101001#102004 5 101095 +101131 0 1 1010007 null 5 101095 0 0 0 null null 0 null 101133 0 0 null null 1 101098 0 0 0 null null 0 null 0 0 0 null null 0 null 101136 0 0 null null 1 101099 101137 0 27 3 null 1 101100 -101138 0 9 2 null 4 null +101138 0 9 502 null 4 null 101139 0 0 null null 0 null 101140 0 0 null null 0 null 101141 0 0 null null 0 null @@ -227,7 +227,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101191 0 0 null null 0 null 101192 0 0 null null 0 null 101193 0 0 null null 1 101141 -101194 0 0 null null 1 101142 +101194 0 27 502 null 1 101142 101195 0 9 2 null 4 null 101196 0 0 null null 5 101144 101197 0 0 null null 5 101145 @@ -245,7 +245,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101209 0 0 null null 4 null 101210 0 0 null null 4 null 101211 0 0 null null 0 null -101212 0 1 10303 100004#102005#101001 1 101159 +101212 0 1 10303 null 1 101159 101213 0 0 null null 4 null 101214 0 0 null null 0 null 101215 0 0 null null 0 null @@ -313,7 +313,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101277 0 0 null null 4 null 101278 0 0 null null 4 null 101279 0 0 null null 0 null -101280 0 0 null null 0 null +101280 0 26 502 null 4 null 101281 0 0 null null 0 null 101282 0 0 null null 0 null 101283 0 0 null null 0 null @@ -326,7 +326,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101290 0 0 null null 4 null 101291 3 0 null null 1 101205 101292 0 0 null null 4 null -101293 0 0 null 100002 1 101206 +101293 0 0 null null 1 101206 101294 0 0 null null 4 null 101295 0 0 null null 4 null 101296 0 0 null null 1 101208 @@ -344,10 +344,27 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101308 0 26 3 null 4 null 101309 0 0 null null 1 101221 101310 0 0 null null 4 null -101311 0 0 null null 4 null +101311 10108 9 502 null 4 null 101312 0 0 null null 1 101223 101313 0 0 null null 4 null 101314 0 0 null null 4 null +101315 0 15 101035 1003#1103#1203#1303 4 null +101316 0 18 2#10101#101036 null 4 null +101317 0 18 2#10103#101037 null 4 null +101318 10109 0 null null 4 null +101319 10107 0 null null 1 101229 +101320 0 0 null null 4 null +101321 0 1 1010004 null 1 101230 +101322 0 18 502#1010004#101016 null 4 null +101323 10110 0 null null 1 101232 +101324 0 0 null null 4 null +101325 0 1 1010005 null 1 101233 +101326 0 18 502#1010005#101038 null 4 null +101327 10111 0 null null 1 101235 +101328 0 0 null null 4 null +101329 0 1 1010006 null 1 101236 +101330 0 1 1010007 null 1 101237 +101331 0 6 2 100002#100004#101005#102002 5 101095 102001 1 2 1503#1#102004 1002#1102#1202#1302 4 null 102002 0 0 null null 4 null 102003 1 2 1503#1#102005 1002#1102#1202#1302 4 null @@ -371,7 +388,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102021 0 0 null null 4 null 102022 0 5 103#19#2 null 4 null 102023 0 0 null null 4 null -102024 6 14 3|1503#1 null 1 102016 +102024 6 14 503|1503#1 null 1 102016 102025 0 0 null null 4 null 102026 0 15 102015 null 4 null 102027 0 0 null null 0 null @@ -386,7 +403,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102036 0 0 null null 1 102026 102037 0 0 null null 1 102027 102038 0 0 null null 1 102028 -102039 0 0 null null 4 null +102039 0 9 3 null 4 null 102040 0 0 null null 0 null 102041 0 0 null null 0 null 102042 0 0 null null 0 null @@ -395,27 +412,27 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102045 0 0 null null 4 null 102046 0 0 null null 5 102036 102047 0 0 null null 4 null -102048 0 18 3#1020001#102019 null 4 null +102048 0 18 503#1020001#102019 null 4 null 102049 0 0 null null 4 null 102050 0 0 null null 5 102039 102051 0 0 null null 4 null -102052 0 18 3#1020001#102020 null 4 null +102052 0 18 503#1020001#102020 null 4 null 102053 0 0 null null 4 null 102054 0 0 null null 5 102042 102055 0 0 null null 4 null -102056 0 18 3#1020001#102021 null 4 null +102056 0 18 503#1020001#102021 null 4 null 102057 0 0 null null 4 null 102058 0 0 null null 1 102045 102059 0 0 null null 4 null 102060 3 0 null null 1 102046 102061 0 0 null null 4 null 102062 0 0 null null 1 102047 -102063 0 1 1020002 100003#101001#102002 1 102048 +102063 0 1 1020002 null 1 102048 102064 0 0 null null 4 null -102065 0 1 1020002 100003#101001#102002 1 102049 +102065 0 1 1020002 null 1 102049 102066 0 0 null null 4 null 102067 0 0 null null 1 102050 -102068 0 1 1020003 100003#101001#102002 1 102051 +102068 0 1 1020003 null 1 102051 102069 0 0 null null 4 null 102070 0 0 null 10102 1 102052 102071 0 0 null null 4 null @@ -426,14 +443,14 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102076 0 0 null null 1 102054#102055|1#8 102077 0 0 null null 1 102056 102078 0 0 null null 1 102056 -102079 0 1 1020004 100004#101001#101001#102002#102001 1 102057 +102079 0 1 1020004 null 1 102057 102080 0 0 null null 4 null 102081 9 6 2 null 5 102058 102082 0 0 null null 4 null 102083 0 0 null null 1 102059 102084 0 0 null null 5 102060 102085 0 0 null null 5 102061 -102086 0 15 101022 null 4 null +102086 0 9 3 null 4 null 102087 0 0 null null 0 null 102088 0 0 null null 0 null 102089 0 0 null null 1 102064 @@ -442,54 +459,54 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102092 0 0 null null 4 null 102093 0 0 null null 1 102066 102094 0 0 null null 1 102067 -102095 0 1 1020005 100002#102001 1 102068 +102095 0 1 1020005 null 1 102068 102096 0 0 null null 4 null -102097 0 1 1020005 100002#102001 1 102069 +102097 0 1 1020005 null 1 102069 102098 0 0 null null 4 null -102099 0 1 1020005 100002#102001 1 102070 +102099 0 1 1020005 null 1 102070 102100 0 0 null null 4 null 102101 0 6 2 10102 1 102071 102102 0 6 2 null 1 102072 102103 0 0 null null 4 null 102104 0 1 1020005 null 1 102073 102105 0 0 null 102002 1 102073 -102106 0 1 1020006 100002#102001 3 102074#102081|1#5 +102106 0 1 1020006 null 1 102074 102107 0 0 null null 4 null -102108 0 1 1020005 100002#102001 1 102075 +102108 0 1 1020005 null 1 102075 102109 0 0 null null 4 null 102110 1 2 1503#1 null 1 102076 102111 0 0 null null 4 null -102112 0 1 1020006 100004#100002#101002#101001#102002#102002 1 102077 +102112 0 1 1020006 null 5 102082 102113 0 0 null null 4 null -102114 0 0 null 10102 6 102078 -102115 0 0 null null 4 null +102114 0 27 102 null 1 102083 +102115 0 9 3 10102 6 102078 102116 0 0 null null 1 102079 102117 0 0 null null 1 102080 102118 0 0 null null 6 102078 102119 0 0 null null 6 102073 102120 0 0 null null 0 null -102121 0 0 null null 0 null +102121 0 27 503 null 5 102077 102122 0 0 null null 0 null 102123 0 0 null null 0 null 102124 0 0 null null 1 102085 102125 0 0 null null 4 null -102126 0 1 1020007 100002#102001 1 102086 +102126 0 1 1020007 null 1 102086 102127 0 0 null null 4 null -102128 0 1 1020007 100002#102001 1 102089 +102128 0 1 1020007 null 1 102089 102129 0 0 null null 4 null 102130 0 0 null null 0 null 102131 0 0 null null 0 null 102132 0 0 null null 0 null 102133 0 0 null null 0 null -102134 0 1 1020007 100002#102001#101001 1 102090 +102134 0 1 1020007 null 1 102090 102135 0 0 null null 4 null -102136 0 1 1020007 100002#102001#101001 1 102091 +102136 0 1 1020007 null 1 102091 102137 0 0 null null 4 null -102138 0 1 1020008 100004#102001#102002#101002 1 102092 +102138 0 1 1020008 null 1 102092 102139 0 0 null null 4 null -102140 0 1 1020008 100004#102001#102002#101002 1 102093 +102140 0 1 1020008 null 1 102093 102141 0 0 null null 4 null -102142 0 1 1020009 100006#102004#101004 1 102094 +102142 0 1 1020009 null 1 102094 102143 0 0 null null 4 null 102144 0 0 null 10102 5 102095 102145 0 0 null null 4 null @@ -501,9 +518,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102151 0 0 null null 1 102101 102152 0 0 null null 1 102102 102153 0 0 null null 1 102103 -102154 0 0 null null 1 102104 -102155 0 27 4 null 1 102105 -102156 0 9 3 null 4 null +102154 0 27 4 null 1 102104 +102155 0 27 103 null 1 102105 +102156 0 9 503 null 4 null 102157 0 0 null null 4 null 102158 0 0 null null 4 null 102159 0 1 10505 null 1 102109 @@ -549,11 +566,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102199 0 0 null null 4 null 102200 0 0 null null 1 102139 102201 0 0 null null 4 null -102202 0 1 10101 100012#101005#102008#102008 1 102140 +102202 0 1 102011 null 1 102140 102203 0 0 null null 4 null 102204 0 0 null null 1 102142 102205 0 0 null null 4 null -102206 0 1 10101 100002#102001 5 102143 +102206 0 1 102012 null 5 102143 102207 0 0 null null 4 null 102208 0 0 null null 5 102144 102209 0 6 2 null 3 102145#102168|1#3 @@ -561,14 +578,14 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102211 0 0 null null 1 102146 102212 0 0 null null 1 102147 102213 0 0 null null 1 102148 -102214 0 1 10101 100002#102001 1 102148 -102215 0 1 10101 100002#102001 1 102149 -102216 0 1 10101 100002#102001 1 102150 -102217 0 1 10104 100004#101002#102002#102002 1 102151 +102214 0 1 102012 null 1 102148 +102215 0 1 102012 null 1 102149 +102216 0 1 102012 null 1 102150 +102217 0 1 102021 null 1 102151 102218 0 6 2 null 1 102152 -102219 0 1 10107 100005#101003#102003#102002 1 102153 +102219 0 1 102031 null 1 102153 102220 0 0 null null 5 102169 -102221 0 0 null null 0 null +102221 0 26 503 null 4 null 102222 0 0 null null 0 null 102223 0 0 null null 0 null 102224 0 0 null null 0 null @@ -582,16 +599,16 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102232 0 0 null null 0 null 102233 0 0 null null 1 102157 102234 0 0 null null 4 null -102235 0 1 10102 100002#102002#101001 1 102158 +102235 0 1 102013 null 1 102158 102236 0 0 null null 4 null -102237 0 1 10102 100002#102002#101001 1 102159 +102237 0 1 102013 null 1 102159 102238 0 0 null null 4 null 102239 0 0 null null 1 102160 102240 0 0 null null 4 null 102241 0 0 null 102002#102001 1 102161 102242 0 0 null null 1 102161 102243 0 0 null null 4 null -102244 0 1 10102 100003#102002#101001#101001 1 102162 +102244 0 1 102014 null 1 102162 102245 0 0 null null 4 null 102246 0 0 null null 4 null 102247 0 26 4 null 4 null @@ -605,7 +622,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102255 0 0 null null 1 102170 102256 0 0 null null 5 102171 102257 0 0 null null 5 102172 -102258 0 0 null null 4 null +102258 0 9 103 null 4 null +102259 0 26 102 null 4 null +102260 0 26 103 null 4 null 103001 1 2 1503#1#103004 1003#1103#1203#1303 4 null 103002 0 0 null null 4 null 103003 1 2 1503#1#103005 1003#1103#1203#1303 4 null @@ -638,7 +657,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103030 0 0 null null 5 103025 103031 0 0 null null 5 103026 103032 0 0 null null 5 103027 -103033 0 1 1030004 100015#102011#102005#101005 5 103028 +103033 0 1 1030004 null 5 103028 103034 0 0 null null 4 null 103035 0 0 null null 1 103033 103036 0 0 null null 0 null @@ -656,7 +675,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103048 0 15 103018 null 4 null 103049 0 0 null null 1 103043 103050 0 0 null null 4 null -103051 0 1 1030001 100004#102003 1 103044 +103051 0 1 1030001 null 1 103044 103052 0 0 null null 4 null 103053 0 0 null null 1 103048 103054 2 0 null null 1 103048 @@ -665,7 +684,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103057 0 0 null null 0 null 103058 0 0 null null 0 null 103059 0 0 null null 0 null -103060 0 1 1030001 100004#102003 1 103049 +103060 0 1 1030001 null 1 103049 103061 0 0 null null 4 null 103062 0 0 null null 5 103050 103063 0 0 null null 5 103051 @@ -674,9 +693,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103066 0 0 null null 0 null 103067 0 0 null null 0 null 103068 0 0 null null 1 103055 -103069 0 1 1030002 100004#102003 1 103056 -103070 0 1 1030002 100004#102003 1 103057 -103071 0 1 1030003 100009#100004#102010#101004#101001 5 103058 +103069 0 1 1030002 null 1 103056 +103070 0 1 1030002 null 1 103057 +103071 0 1 1030003 null 5 103058 103072 0 0 null null 1 103059 103073 0 0 null null 1 103060 103074 0 0 null null 1 103061 @@ -719,13 +738,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103111 0 0 null null 6 103086 103112 0 0 null null 1 103090 103113 0 0 null null 4 null -103114 0 1 10301 100002#101001#102003 1 103091 +103114 0 1 103011 null 1 103091 103115 0 0 null null 4 null 103116 0 0 null null 1 103092 103117 0 0 null null 4 null -103118 0 1 10301 100002#101001#102003 1 103093 +103118 0 1 103011 null 1 103093 103119 0 0 null null 4 null -103120 0 1 10301 100002#101001#102003 1 103094 +103120 0 1 103011 null 1 103094 103121 0 0 null null 4 null 103122 1 2 1503#1 1004#1204#1304#1404 4 null 103123 0 0 null null 4 null @@ -745,7 +764,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103137 0 0 null null 4 null 103138 0 0 null null 1 103103 103139 0 0 null null 4 null -103140 0 1 10301 100002#102003#101001 1 103104 +103140 0 1 103011 null 1 103104 103141 0 0 null null 4 null 103142 0 0 null null 1 103107 103143 0 0 null null 1 103107 @@ -758,16 +777,16 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103150 0 0 null null 0 null 103151 0 0 null null 0 null 103152 0 0 null null 0 null -103153 0 1 10303 100004#102005#101001#101001 1 103108 +103153 0 1 103032 null 1 103108 103154 0 0 null null 4 null -103155 0 1 10303 100004#102005#101001#101001 1 103109 +103155 0 1 103032 null 1 103109 103156 0 0 null null 4 null 103157 0 0 null 10102 4 null 103158 0 0 null null 1 103111 103159 0 0 null null 4 null 103160 0 0 null null 3 103112#103124|1#3 103161 0 0 null null 4 null -103162 0 1 10305 100004#101001#101001#102003 1 103113 +103162 0 1 103051 null 1 103113 103163 0 0 null null 4 null 103164 0 0 null null 1 103114 103165 0 0 null null 4 null @@ -775,7 +794,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103167 0 0 null null 4 null 103168 0 6 2 10102 1 103116 103169 0 0 null null 4 null -103170 0 1 10304 100004#101001#101001#102003 1 103117 +103170 0 1 103041 null 1 103117 103171 0 0 null null 4 null 103172 0 0 null null 3 103118#103119|1#2 103173 0 0 null null 1 103119 @@ -787,7 +806,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103179 0 0 null null 4 null 103180 0 0 null null 1 103122 103181 0 0 null null 4 null -103182 0 1 10304 100004#101001#101001#102003 1 103123 +103182 0 1 103041 null 1 103123 103183 0 0 null null 4 null 103184 0 0 null null 4 null 103185 0 0 null null 4 null @@ -800,15 +819,15 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103192 0 0 null null 4 null 103193 0 0 null null 1 103131 103194 0 0 null null 4 null -103195 0 1 10305 100004 1 103132 +103195 0 1 103052 null 1 103132 103196 0 0 null null 4 null 103197 0 0 null null 1 103133 103198 0 0 null null 1 103133 -103199 0 1 10305 100005#100002 1 103134 +103199 0 1 103053 null 1 103134 103200 0 0 null null 4 null 103201 0 0 null null 1 103135 103202 0 0 null null 1 103135 -103203 0 1 10305 100006#100002 1 103136 +103203 0 1 103054 null 1 103136 103204 0 0 null null 4 null 103205 0 0 null 100003#102010 4 null 104001 1 2 1503#1#104005 1004#1104#1204#1304 4 null diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index 571f321ef..c5792d96c 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -718,4 +718,4 @@ int int int float int int 102018 3 100 1.0 0 0 102019 3 100 1.0 0 0 102020 3 100 1.0 0 0 -0 0 0 1.0 0 0 +0 0 0 0 0 0 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java index 7967ad3f8..fb3be2346 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java @@ -66,6 +66,12 @@ public class RedisKey { */ public static final String NEED_DESORY_XY = "NEED_DESORY_XY"; + /** + * 战斗事件更新eventId 放在战斗胜利之后 + * sub_key + */ + public static final String NEXT_EVENT_ID = "NEXT_EVENT_ID"; + /** * 过期事件 */ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java index 511ba834e..a00371a0c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java @@ -5,4 +5,5 @@ public interface GlobalGm { int ADD_CARD = 2; //添加卡牌 int SEND_MAIIL = 3;// 发送邮件 int HERO_STAR = 4;// 添加指定星级英雄 + int OPEN_MAP = 5; // 开启到指定关卡 } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 1719b52bb..6e3b9270f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.handler.GameGM; import com.ljsd.jieling.config.SCHero; import com.ljsd.jieling.config.SCHeroRankUpConfig; +import com.ljsd.jieling.config.SCMapConfig; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.globals.Global; @@ -48,7 +49,7 @@ public class GMRequestHandler extends BaseHandler{ int prarm1 = 0, prarm2 = 0; if (gmCommandType == 0){ prarm1 = Integer.parseInt(commandArray[1]); - }else if (gmCommandType == 1 || gmCommandType ==2 || gmCommandType ==3 || gmCommandType ==4){ + }else { prarm1 = Integer.parseInt(commandArray[1]); prarm2 = Integer.parseInt(commandArray[2]); } @@ -80,9 +81,21 @@ public class GMRequestHandler extends BaseHandler{ hero.setLevel(scHeroRankUpConfig.getLimitLevel()); hero.setBreakId(scHeroRankUpConfig.getId()); } - - break; + case GlobalGm.OPEN_MAP: + SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(100 + prarm1); + if (scMapConfig != null) { + for (int i = 0; i <= prarm1; i++) { + int mapId = 100 + prarm1; + SCMapConfig crossMap = SCMapConfig.getsCMapSize().get(mapId); + cUser.getPlayerInfoManager().setMapId(mapId); + if (crossMap.getOpenRule() != null && crossMap.getOpenRule().length > 0) { + cUser.getMissionManager().getFinishMissions().add(crossMap.getOpenRule()[0]); + } + } + } + // giveItem(cUser,prarm1,prarm2); + break; default: break; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 83ac29dc2..e7dcbc24f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -50,7 +50,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ } - CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getMapManager().getMaxMapId(), user.getMapManager().getCurMapId()); + CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getPlayerInfoManager().getMapId(), user.getMapManager().getCurMapId(),user.getMapManager()); PlayerInfoProto.GetPlayerInfoResponse getPlayerInfoResponse = PlayerInfoProto.GetPlayerInfoResponse.newBuilder() .setPlayer(player) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 578475e61..4d0bbfe23 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -68,15 +68,15 @@ public class MapLogic { public void enterMap(ISession iSession, int mapId, int teamId, MessageTypeProto.MessageType messageType) throws Exception { int uid = iSession.getUid(); User user = UserManager.getUser(uid); - int energy = user.getPlayerInfoManager().getEnergy(); MapManager mapManager = user.getMapManager(); + int energy = mapManager.getEnergy(); if (teamId == 0) { LOGGER.info("enterMap() uid=>{} teamId =>{} ", uid, teamId); MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), ""); return; } // 初始序章地图 - if (mapManager.getMaxMapId() == 0) { + if (user.getPlayerInfoManager().getMapId() == 0) { String error = initTeamInfo(teamId, uid, user, mapManager); if (!error.isEmpty()){ LOGGER.info("enterMap() uid=>{} error =>{} ", uid, error); @@ -85,7 +85,6 @@ public class MapLogic { } user.getPlayerInfoManager().setMapId(100); mapManager.setCurMapId(100); - mapManager.setMaxMapId(100); initMap(mapManager, user); user.setMapManager(mapManager); } @@ -112,11 +111,11 @@ public class MapLogic { return; } } - if (mapManager.getMaxMapId() < mapId) { - mapManager.setMaxMapId(mapId); + if (user.getPlayerInfoManager().getMapId() < mapId) { + user.getPlayerInfoManager().setMapId(mapId); } - if (mapId > mapManager.getMaxMapId()) { - LOGGER.info("enterMap() uid=>{} mapManager.getMaxMapId()=>{} mapId =>{} ", uid, mapManager.getMaxMapId(), mapId); + if (mapId > user.getPlayerInfoManager().getMapId()) { + LOGGER.info("enterMap() uid=>{} mapManager.getMaxMapId()=>{} mapId =>{} ", uid, user.getPlayerInfoManager().getMapId(), mapId); MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), ""); return; } @@ -133,7 +132,7 @@ public class MapLogic { return; } int leftEnergy = energy - scMapConfig.getEnergyConfused(); - user.getPlayerInfoManager().setEnergy(leftEnergy); + mapManager.setEnergy(leftEnergy); mapManager.setCurMapId(mapId); initMap(mapManager, user); user.setMapManager(mapManager); @@ -209,12 +208,16 @@ public class MapLogic { if (doingMissions.containsKey(doingMissionId)) { Mission mission = doingMissions.get(doingMissionId); missions.add(mission); + for (Map.Entry missionEntry : mission.getMissionInfos().entrySet()) { + newMap.put(missionEntry.getKey(), missionEntry.getValue()); + } } } } CrossMapCell crossMapCell = user.getMapManager().getCrossMapInfos().get(mapManager.getCurMapId()); for (Map.Entry entry : scMap.entrySet()) { SCMap scMap1 = entry.getValue(); + // 必出现的事件点 if (scMap1.getIsMustAppear() == 1) { for (int i = 0; i < scMap1.getGroups().length; i++) { int x = scMap1.getGroups()[i][0]; @@ -226,6 +229,7 @@ public class MapLogic { } continue; } + // 随机出现的事件点 int randomIndex = random.nextInt(scMap1.getGroups().length); int x = scMap1.getGroups()[randomIndex][0]; int y = scMap1.getGroups()[randomIndex][1]; @@ -236,6 +240,7 @@ public class MapLogic { continue; } int initialEventId = mapPointConfig.getInitialEventId(); + // 每天刷新的事件点 if (crossMapCell != null && crossMapCell.getDayRefreshs().containsKey(mapPointConfig.getId())) { int eventId = crossMapCell.getDayRefreshs().get(mapPointConfig.getId()); if (eventId == -1) { @@ -244,6 +249,7 @@ public class MapLogic { initialEventId = eventId; } } + // 一次性事件点 if (crossMapCell != null && crossMapCell.getPermanents().containsKey(mapPointConfig.getId())) { int eventId = crossMapCell.getPermanents().get(mapPointConfig.getId()); if (eventId == -1) { @@ -252,14 +258,11 @@ public class MapLogic { initialEventId = eventId; } } + // 任务触发的事件点 for (Mission mission : missions) { if (mission.getMapPoints().containsKey(mapPointConfig.getId())) { - for (Map.Entry missionEntry : mission.getMissionInfos().entrySet()) { - newMap.put(missionEntry.getKey(), missionEntry.getValue()); - } Cell cellValue = new Cell(xy, mission.getMapPoints().get(mapPointConfig.getId()), mapPointConfig.getId()); newMap.put(xy, cellValue); - break; } } Cell cellValue = new Cell(xy, initialEventId, mapPointConfig.getId()); @@ -272,7 +275,7 @@ public class MapLogic { newMap.put(xy, cellValue); } } - if (mapManager.getMaxMapId() == 100) { + if (user.getPlayerInfoManager().getMapId() == 100) { SGameSetting sGameSetting = SGameSetting.getGameSetting(); int xy = CellUtil.xy2Pos(sGameSetting.getBornPosition()[0], sGameSetting.getBornPosition()[1]); mapManager.setCurXY(xy); @@ -295,13 +298,13 @@ public class MapLogic { int moveConfused = scMapConfig.getMoveConfused(); if (moveConfused > 0) { int leftStep = mapManager.getTotalStep() - cells.size() * moveConfused; - if (leftStep <0) { + if (leftStep <= 0) { leftStep = 0; resetMapInfo(user, false); LOGGER.info("updateMap() uid=>{}, leftStep=>{}", uid, leftStep); mapManager.setTotalStep(leftStep); MapInfoProto.MapUpdateResponse mapUpdateResponse = MapInfoProto.MapUpdateResponse.newBuilder().build(); - MessageUtil.sendMessage(session, 0, messageType.getNumber(), mapUpdateResponse, true); + MessageUtil.sendMessage(session, 1, messageType.getNumber(), mapUpdateResponse, true); return true; } updateMapMission(mapManager,EventType.updateEvent,MapMissionType.CONSUME_ACTION_POWER_EVENT.getMissionTypeValue(),cells.size() * moveConfused); @@ -369,9 +372,12 @@ public class MapLogic { } Cell cell = mapManager.getMapInfo().get(triggerXY); if (cell == null) { - LOGGER.info("xy is wrong =>{} triggerXY=>{}", curXY, triggerXY); - MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), ""); - return; + cell = mapManager.getMapInfo().get(curXY); + if (cell == null) { + LOGGER.info("xy is wrong =>{} triggerXY=>{}", curXY, triggerXY); + MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), ""); + return; + } } mapManager.setTriggerXY(triggerXY); mapManager.addWalkCells(new HashSet<>(cells)); @@ -452,6 +458,7 @@ public class MapLogic { int[][] behaviorTypeValues = sOptionConfig.getBehaviorTypeValues(); BaseBehavior baseBehavior = baseBehaviorMap.get(behaviorType); MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse = MapInfoProto.EventUpdateResponse.newBuilder(); + int targetEventId = cell.getEventId(); if (baseBehavior != null) { boolean isSuccess = baseBehavior.process(user, behaviorTypeValues, eventUpdateResponse); if (!isSuccess) { @@ -512,11 +519,19 @@ public class MapLogic { cell = mapManager.getMapInfo().get(mapManager.getCurXY()); } + // 战斗事件处理需要放到战斗胜利 + if (behaviorType == EventType.fight || behaviorType == EventType.fightAndDestroyPoint ) { + BehaviorUtil.addFightReady(user.getId(), nextEventId); + } // 检测该事件点是否已被销毁 - if (cell != null && nextEventId != 0) { + else if (cell != null && nextEventId != 0) { cell.setEventId(nextEventId); mapManager.addOrUpdateCell(mapManager.getCurXY(), cell); + targetEventId = nextEventId; } + + updateMapMission(mapManager,EventType.updateEvent, targetEventId,0); + updateMapMission(mapManager,EventType.updateEvent, pointId,0); if (behaviorType == EventType.dun && eventUpdateResponse.getMissionCount() > 0) { for (CommonProto.Mission missionProto : eventUpdateResponse.getMissionList()) { Mission mission = user.getMissionManager().getDoingMissions().get(missionProto.getItemId()); @@ -552,7 +567,7 @@ public class MapLogic { // LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{} {} sOptionConfig.getReward()=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(), // cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon,eventUpdateResponse.getDrop(), sOptionConfig.getReward()); saveRefreshInfo(pointId, mapManager, mapPointConfig, nextEventId); - updateMapMission(mapManager,EventType.updateEvent,pointId,0); + LOGGER.info("updatemap() uid=>{},nextEventId={},eventId={}", uid, nextEventId, cell == null ? 0 : cell.getEventId()); MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true); } @@ -756,6 +771,8 @@ public class MapLogic { mapManager.setCurXY(0); mapManager.setCurMapId(0); mapManager.setTotalStep(0); + mapManager.setTriggerXY(0); + mapManager.setFoodBuffers(new ArrayList<>()); TemporaryItems temporaryItems = mapManager.getTemporaryItems(); if (temporaryItems != null) { ItemUtil.addTemporaryItemToBag(user, temporaryItems, needTemporaryItem); @@ -796,7 +813,7 @@ public class MapLogic { String fightReadyKey = RedisKey.getKey(RedisKey.FIGHT_READY, Integer.toString(uid), false); String fightReady = (String) RedisUtil.getInstence().get(fightReadyKey); int groupId, destoryXY = 0; - String missionId = "0", destroyId = "0"; + String missionId = "0", destroyId = "0", nextEventId = "0"; if (fightReady != null) { String[] split = fightReady.split("#"); RedisUtil.getInstence().del(fightReadyKey); @@ -807,6 +824,9 @@ public class MapLogic { if (split.length > 2) { destroyId = split[2]; } + if (split.length > 3) { + nextEventId = split[3]; + } } else { int[] option = sEventPointConfig.getOption(); if (option == null) { @@ -818,7 +838,7 @@ public class MapLogic { destoryXY = mapManager.getTriggerXY(); } FightInfoProto.FightStartResponse.Builder fightStartResponse = FightInfoProto.FightStartResponse.newBuilder(); - BehaviorUtil.getFightInfo(user, groupId, fightStartResponse, missionId, destroyId, destoryXY); + BehaviorUtil.getFightInfo(user, groupId, fightStartResponse, missionId, destroyId, destoryXY, nextEventId); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightStartResponse.build(), true); } @@ -904,6 +924,7 @@ public class MapLogic { int missionId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_MISSION_ID)); int destoryId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_DESORY_ID)); int destoryXY = Integer.parseInt((String)valueMap.get(RedisKey.NEED_DESORY_XY)); + int nextEventId = Integer.parseInt((String)valueMap.get(RedisKey.NEXT_EVENT_ID)); if (missionId != 0) { MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse = MapInfoProto.EventUpdateResponse.newBuilder(); BehaviorUtil.updateMission(user, missionId, eventUpdateResponse); @@ -915,6 +936,16 @@ public class MapLogic { if (destoryXY != 0) { BehaviorUtil.distoryApointXY(user, destoryXY); } + if (nextEventId != 0) { + int triggerXY = user.getMapManager().getTriggerXY(); + Cell cell = user.getMapManager().getMapInfo().get(triggerXY); + if (cell != null) { + cell.setEventId(nextEventId); + user.getMapManager().addOrUpdateCell(triggerXY, cell); + updateMapMission(user.getMapManager(),EventType.updateEvent,cell.getEventId(),0); + } + } + LOGGER.info("endFight() uid=>{},nextEventId", uid, nextEventId); updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId); // LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} drop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getDrop()); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); @@ -998,20 +1029,23 @@ public class MapLogic { } } } - if(logic == MapMissionType.DIGGER_EVENT.getMissionTypeValue()){ - MapPointConfig mapPointConfig = MapPointConfig.getScMapEventMap().get(eventId); - if(mapPointConfig!=null&&mapPointConfig.getStyle() == 2){ - if(missionValue allMissionProgress = new ConcurrentHashMap<>(); + private int energy; + + private int lastUpdateEnergyTime; + public MapManager() { this.setRootCollection(User._COLLECTION_NAME); } @@ -62,6 +68,11 @@ public class MapManager extends MongoBase { } public void setCurMapId(int curMapId) throws Exception { + if(curMapId == 0){ + setLastUpdateEnergyTime((int)(System.currentTimeMillis()/1000)); + }else{ + setLastUpdateEnergyTime(GlobalsDef.BATTLING); + } updateString("curMapId", curMapId); this.curMapId = curMapId; } @@ -126,15 +137,6 @@ public class MapManager extends MongoBase { } } - public int getMaxMapId() { - return maxMapId; - } - - public void setMaxMapId(int maxMapId) throws Exception { - updateString( "maxMapId", maxMapId); - this.maxMapId = maxMapId; - } - public int getTotalStep() { return totalStep; } @@ -202,4 +204,34 @@ public class MapManager extends MongoBase { updateString( "allMissionProgress." + mapMission.getMapId(), mapMission); allMissionProgress.put(mapMission.getMapId(),mapMission); } + + + + public int getEnergy() { + if(curMapId==0 && energy< SGameSetting.getGameSetting().getInitialEnergy()){ + int updateTime = (int)(System.currentTimeMillis()/1000); + int[] energyRecoverSpeed = SGameSetting.getGameSetting().getEnergyRecoverSpeed(); + int addValue = (updateTime - lastUpdateEnergyTime)/60/energyRecoverSpeed[1] * energyRecoverSpeed[0]; + if(addValue != 0){ + int curEnergy = MathUtils.setBetweenWithMax(energy + addValue,0,SGameSetting.getGameSetting().getInitialEnergy()); + setEnergy(curEnergy); + setLastUpdateEnergyTime(updateTime); + } + } + return energy; + } + + public void setLastUpdateEnergyTime(int lastUpdateEnergyTime) { + updateString("lastUpdateEnergyTime", lastUpdateEnergyTime); + this.lastUpdateEnergyTime = lastUpdateEnergyTime; + } + + public void setEnergy(int energy) { + updateString("energy", energy); + this.energy = energy; + } + + public int getLastUpdateEnergyTime() { + return lastUpdateEnergyTime; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java index d6e8df4f8..e0c2eb991 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BaseBehavior.java @@ -2,9 +2,12 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; +import org.slf4j.LoggerFactory; public abstract class BaseBehavior { + protected static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(BaseBehavior.class); + public abstract int getBehaviorType(); public abstract boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java index c5adf1f49..061070c3f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java @@ -41,6 +41,16 @@ public class BehaviorUtil { needDelete.add(entry.getKey()); } } + Map doingMissions = user.getMissionManager().getDoingMissions(); + for (Map.Entry entry : doingMissions.entrySet()) { + Mission mission = entry.getValue(); + Map missionInfos = mission.getMissionInfos(); + for (Integer xy : needDelete) { + if (missionInfos.containsKey(xy)){ + mission.removeMissionInfos(xy); + } + } + } for (Integer xy : needDelete) { mapInfo.remove(xy); } @@ -87,6 +97,13 @@ public class BehaviorUtil { RedisUtil.getInstence().set(key, readyInfo, RedisKey.EXPIRE_TIME); } + public static void addFightReady(String uid, int nextEventId) { + String key = RedisKey.getKey(RedisKey.FIGHT_READY, uid, false); + String readyInfo = (String) RedisUtil.getInstence().get(key); + readyInfo = readyInfo + "#" + nextEventId; + RedisUtil.getInstence().set(key, readyInfo, RedisKey.EXPIRE_TIME); + } + /** * 获取战斗数据 * @param user @@ -94,7 +111,8 @@ public class BehaviorUtil { * @param fightStartRespons * @throws Exception */ - public static void getFightInfo(User user, int groupId, FightInfoProto.FightStartResponse.Builder fightStartRespons, String missionId, String destoryId, int destoryXY) throws Exception { + public static void getFightInfo(User user, int groupId, FightInfoProto.FightStartResponse.Builder fightStartRespons, String missionId, + String destoryId, int destoryXY, String nextEventId) throws Exception { MapManager mapManager = user.getMapManager(); int teamId = mapManager.getTeamId(); @@ -153,6 +171,7 @@ public class BehaviorUtil { fightInfo.put(RedisKey.NEED_MISSION_ID, missionId); fightInfo.put(RedisKey.NEED_DESORY_ID, destoryId); fightInfo.put(RedisKey.NEED_DESORY_XY, Integer.toString(destoryXY)); + fightInfo.put(RedisKey.NEXT_EVENT_ID, nextEventId); RedisUtil.getInstence().hmset(key, fightInfo, RedisKey.EXPIRE_TIME); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java index df5971eb2..32281e0d3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java @@ -70,9 +70,7 @@ public class DunBehavior extends BaseBehavior { mission.setMissionStep(0); mission.getMissionInfos().putAll(newDunEvents); mission.setMissionInfo(mapManager.getCurXY() + "#" + behaviorTypeValues[0][2]); - Map doingMissions = user.getMissionManager().getDoingMissions(); - doingMissions.put(behaviorTypeValues[0][0], mission); - user.getMissionManager().updateDoingMissions(doingMissions); + user.getMissionManager().updateOneDoingMissions(behaviorTypeValues[0][0], mission); CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission); eventUpdateResponse.addMission(missionProto); CrossMapCell crossMapInfo = mapManager.getCrossMapInfos().get(mapManager.getCurMapId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java index b1033afce..6a0ac9d60 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java @@ -14,7 +14,8 @@ public class FightBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - BehaviorUtil.fightReady(user.getId(), Integer.toString(behaviorTypeValues[0][0])); + String readyInfo = Integer.toString(behaviorTypeValues[0][0]) + "#" + 0 + "#" + 0; + BehaviorUtil.fightReady(user.getId(), readyInfo); return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java index 6db478eb8..e5ac7cee9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/JumpBehavior.java @@ -17,7 +17,7 @@ public class JumpBehavior extends BaseBehavior { public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { if (behaviorTypeValues[0][0] != 0) { user.getMapManager().setCurMapId(behaviorTypeValues[0][0]); - user.getMapManager().setMaxMapId(behaviorTypeValues[0][0]); + user.getPlayerInfoManager().setMapId(behaviorTypeValues[0][0]); MapLogic.getInstance().initMap(user.getMapManager(), user); return true; } else { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java index a2b4ad49c..e47bc6dc6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java @@ -2,12 +2,16 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.config.MapPointConfig; import com.ljsd.jieling.handler.map.Cell; +import com.ljsd.jieling.handler.map.CrossMapCell; import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.CellUtil; import org.springframework.stereotype.Component; +import java.util.Map; + @Component public class MonitorMissionAndDestroyPointBehavior extends BaseBehavior { @Override @@ -21,7 +25,9 @@ public class MonitorMissionAndDestroyPointBehavior extends BaseBehavior { BehaviorUtil.updateMission(user, behaviorTypeValues[0][0], eventUpdateResponse); // 销毁事件点 BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][1]); - // 开新事件 + // 开新事件 新事件需要和任务绑定 + Map doingMissions = user.getMissionManager().getDoingMissions(); + Mission mission = doingMissions.get(behaviorTypeValues[0][0]); if (user.getMapManager().getCurMapId() == behaviorTypeValues[1][0]) { for (int i = 1; i < behaviorTypeValues.length; i++) { int x = behaviorTypeValues[i][1]; @@ -30,6 +36,15 @@ public class MonitorMissionAndDestroyPointBehavior extends BaseBehavior { MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(behaviorTypeValues[i][3]); Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId()); user.getMapManager().addOrUpdateCell(xy, cellValue); + if (mission != null) { + mission.updateMissionInfos(xy, cellValue); + mission.updateMapPoints(cellValue.getPointId(), cellValue.getEventId()); + CrossMapCell crossMapCell = user.getMapManager().getCrossMapInfos().get(user.getMapManager().getCurMapId()); + if (crossMapCell == null) { + crossMapCell = new CrossMapCell(); + } + crossMapCell.getMissionIds().add(behaviorTypeValues[0][0]); + } } } return true; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenAppointMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenAppointMissionBehavior.java index d392e394d..71013375b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenAppointMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenAppointMissionBehavior.java @@ -24,9 +24,7 @@ public class OpenAppointMissionBehavior extends BaseBehavior { mission.setMissionStep(0); mission.setOpen(true); mission.setMissionInfo(user.getMapManager().getCurMapId() + "#" + behaviorTypeValues[0][0]); - Map doingMissions = user.getMissionManager().getDoingMissions(); - doingMissions.put(behaviorTypeValues[0][0], mission); - user.getMissionManager().updateDoingMissions(doingMissions); + user.getMissionManager().updateOneDoingMissions(behaviorTypeValues[0][0], mission); CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission); eventUpdateResponse.addMission(missionProto); return true; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenNotDoMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenNotDoMissionBehavior.java index 3529f7fad..4b5c977f0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenNotDoMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenNotDoMissionBehavior.java @@ -8,8 +8,6 @@ import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; -import java.util.Map; - @Component public class OpenNotDoMissionBehavior extends BaseBehavior { @Override @@ -24,9 +22,7 @@ public class OpenNotDoMissionBehavior extends BaseBehavior { mission.setMissionStep(0); mission.setOpen(false); mission.setMissionInfo(user.getMapManager().getCurMapId() + "#" + behaviorTypeValues[0][0]); - Map doingMissions = user.getMissionManager().getDoingMissions(); - doingMissions.put(behaviorTypeValues[0][0], mission); - user.getMissionManager().updateDoingMissions(doingMissions); + user.getMissionManager().updateOneDoingMissions(behaviorTypeValues[0][0], mission); CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission); eventUpdateResponse.addMission(missionProto); return true; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java index bb5323e4e..27bb09e93 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java @@ -47,6 +47,11 @@ public class Mission extends MongoBase { this.missionInfos.put(xy, cell); } + public void removeMissionInfos(int xy) throws Exception { + removeString(getMongoKey() + ".missionInfos." + xy); + this.missionInfos.remove(xy); + } + public String getMissionInfo() { return missionInfo; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java index 53b23930d..563fff853 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionLogic.java @@ -107,9 +107,7 @@ public class MissionLogic { if (mission.getMissionInfo() != null) { checkMissionReturn.newEventId = mission.getMissionInfo(); } - Map doingMissions = user.getMissionManager().getDoingMissions(); - doingMissions.remove(mission.getMissionId()); - user.getMissionManager().updateDoingMissions(doingMissions); + user.getMissionManager().removeDoingMissions(mission.getMissionId()); Set finishMissions = user.getMissionManager().getFinishMissions(); finishMissions.add(mission.getMissionId()); user.getMissionManager().updateFinishMissions(finishMissions); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java index 5af9a0958..9c6be7704 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java @@ -35,16 +35,17 @@ public class MissionManager extends MongoBase { return takeRewardMissions; } - public void updateDoingMissions(Map doingMissions) throws Exception { - this.doingMissions = doingMissions; - updateString( "doingMissions", doingMissions); - } - public void updateOneDoingMissions(int missionId, Mission mission) throws Exception { + mission.init(this.getRootId(), getMongoKey() + ".doingMissions." + missionId); this.doingMissions.put(missionId, mission); updateString( "doingMissions." + missionId, mission); } + public void removeDoingMissions(int missionId) throws Exception { + this.doingMissions.remove(missionId); + removeString( getMongoKey() + ".doingMissions." + missionId); + } + public void updateFinishMissions(Set finishMissions) throws Exception { this.finishMissions = finishMissions; updateString( "finishMissions", finishMissions); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 9bbc2130b..15a76f448 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -32,10 +32,6 @@ public class PlayerManager extends MongoBase { private int mapId; - private int energy; - - private int lastUpdateEnergyTime; - private long createTime; //创建时间 private String clientVersion; @@ -138,12 +134,6 @@ public class PlayerManager extends MongoBase { } public void setMapId(int mapId) throws Exception { - if(mapId == 0){ - setLastUpdateEnergyTime((int)(System.currentTimeMillis()/1000)); - } - if(mapId != 0 ){ - setLastUpdateEnergyTime(GlobalsDef.BATTLING); - } updateString("mapId", mapId); this.mapId = mapId; } @@ -166,31 +156,4 @@ public class PlayerManager extends MongoBase { this.clientVersion = clientVersion; } - public int getEnergy() { - if(lastUpdateEnergyTime != GlobalsDef.BATTLING && energy< SGameSetting.getGameSetting().getInitialEnergy()){ - int updateTime = (int)(System.currentTimeMillis()/1000); - int[] energyRecoverSpeed = SGameSetting.getGameSetting().getEnergyRecoverSpeed(); - int addValue = (updateTime - lastUpdateEnergyTime)/60/energyRecoverSpeed[1] * energyRecoverSpeed[0]; - if(addValue != 0){ - int curEnergy = MathUtils.setBetweenWithMax(energy + addValue,0,SGameSetting.getGameSetting().getInitialEnergy()); - setEnergy(curEnergy); - setLastUpdateEnergyTime(updateTime); - } - } - return energy; - } - - public void setLastUpdateEnergyTime(int lastUpdateEnergyTime) { - updateString("lastUpdateEnergyTime", lastUpdateEnergyTime); - this.lastUpdateEnergyTime = lastUpdateEnergyTime; - } - - public void setEnergy(int energy) { - updateString("energy", energy); - this.energy = energy; - } - - public int getLastUpdateEnergyTime() { - return lastUpdateEnergyTime; - } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index a18bf0085..fd5d101d7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.util; import com.ljsd.jieling.config.SGameSetting; import com.ljsd.jieling.config.SMonsterConfig; import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.handler.map.MapMission; import com.ljsd.jieling.handler.map.TemporaryItems; import com.ljsd.jieling.logic.dao.*; @@ -17,7 +18,7 @@ import java.util.concurrent.CopyOnWriteArrayList; public class CBean2Proto { - public static CommonProto.Player getPlayer(int uid, PlayerManager playerManager, int maxMapId, int mapId) { + public static CommonProto.Player getPlayer(int uid, PlayerManager playerManager, int maxMapId, int mapId, MapManager mapManager) { CommonProto.Player player = CommonProto.Player .newBuilder() .setUid(uid) @@ -28,8 +29,8 @@ public class CBean2Proto { .setFamilyId(playerManager.getFamilyId()) .setHead(playerManager.getHead()) .setCurMapId((maxMapId == 0 && mapId == 0) ? 100 : mapId) - .setEnergy(playerManager.getEnergy()) - .setLastUpdateEnergyTime(playerManager.getLastUpdateEnergyTime()) + .setEnergy(mapManager.getEnergy()) + .setLastUpdateEnergyTime(mapManager.getLastUpdateEnergyTime()) .setServerTime((int)(System.currentTimeMillis()/1000)) .build(); return player;