diff --git a/conf/server/Map_102.txt b/conf/server/Map_102.txt index 8827b8c50..d74538df5 100644 --- a/conf/server/Map_102.txt +++ b/conf/server/Map_102.txt @@ -1,39 +1,38 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 102011 5#17 0 -2 102012 1#5 0 -3 102033 10#12 0 -4 102013 14#20 0 -5 102032 11#4 0 -6 102010 5#18|6#18|4#19|5#19|4#20 0 -7 102004 10#1|11#1|10#2|11#2|10#3 0 -8 102004 9#15|10#15|9#16|10#16|9#17 0 -9 102002 11#18|12#18|11#19|12#19|13#19|11#20 0 -10 102001 10#18|9#19|10#19|8#20|9#20 0 -11 102001 2#6|1#7|2#7|1#8|1#9|2#9 0 -12 102004 13#17|14#17|15#17|13#18|14#18 0 -13 102026 14#14 0 -14 102009 1#14|2#14|2#15|3#15|2#16 0 -15 102022 15#3 0 -16 102023 8#3 0 -17 102001 7#8|8#8|6#9|7#9|7#10|6#11 0 -18 102024 9#10 0 -19 102002 14#10|14#11|15#11|14#12|14#13 0 -20 102001 13#12|13#13|13#14|13#15 0 -21 102025 7#19 0 -22 102004 2#1|2#2|1#3|2#3|2#4 0 -23 102002 11#7|12#7|11#8|12#8|10#9|11#9 0 -24 102001 4#2|5#2|6#2|7#2|5#3|5#4 0 -25 102020 11#14 0 -26 102021 15#10 0 -27 102004 5#6|3#7|4#7|5#7|4#8 0 -28 102001 13#2|12#3|13#3|13#4|14#4|14#5 0 -29 102002 7#16|6#17|7#17|7#18|8#18 0 -30 102019 12#20 0 -31 102001 4#11|3#12|4#12|2#13|3#13|4#13 0 -32 102004 14#1|14#2|15#2|14#3|15#4 0 -33 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 -34 102015 5#14 0 -35 102004 7#5|8#5|9#5|8#6|8#7 0 -36 102017 2#11 0 -37 102018 8#12 0 +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 diff --git a/conf/server/Map_103.txt b/conf/server/Map_103.txt index be8010640..aa07dc7c1 100644 --- a/conf/server/Map_103.txt +++ b/conf/server/Map_103.txt @@ -13,31 +13,29 @@ int int mut,int#int,2 int 11 103016 12#1|13#1|14#1|16#1|17#1|18#1|19#1|20#1|11#2|16#2|17#2|18#2|19#2|20#2|10#3|8#4|7#5|7#6|7#7|7#8|1#9|2#9|3#9|4#9|5#9|6#9|5#10|6#10|7#10|2#11|3#11|4#11|5#11|7#11|8#11|9#11|10#11|11#11|18#11|19#11|20#11|1#12|2#12|17#12|18#12|19#12|20#12|12#13|14#13|15#13|16#13|17#13|18#13|19#13|20#13|11#14|12#14|13#14|14#14|15#14|16#14|17#14|18#14|19#14|20#14|11#15|12#15|13#15|14#15|15#15|16#15|17#15|18#15|19#15|20#15 1 12 103017 11#13 0 13 103004 17#7|18#7|17#8|17#9 0 -14 103019 16#10 0 -15 103018 9#3 0 -16 103001 15#1|15#2|15#3 0 -17 103002 5#14|6#14|7#14|5#15|7#15 0 -18 103008 6#7|6#8 0 -19 103001 12#7|10#8|11#8|12#8|11#9 0 -20 103001 11#3|11#4|12#4|10#5|11#5 0 -21 103001 20#9|19#10 0 -22 103001 7#1|8#1|7#2 0 -23 101017 20#10 0 -24 103002 2#13|1#14|2#14|3#14|4#14|2#15 0 -25 103001 8#9|9#9|8#10 0 -26 103030 5#2 0 -27 103004 5#3|4#4|5#4|5#5 0 -28 103011 20#3 0 -29 103004 13#2|14#2|13#3|14#3 0 -30 103001 15#6|16#6|14#7|15#7|15#8|15#9 0 -31 103015 6#15 0 -32 103002 1#1|2#1|3#1|2#2|3#2 0 -33 103014 1#2 0 -34 103028 7#9 0 -35 103008 3#7|4#7|3#8|4#8 0 -36 103029 13#9 0 -37 103001 9#12|9#13|9#14|9#15 0 -38 101024 10#15 0 -39 101023 13#4 0 -40 103001 19#4|18#5|19#5|19#6 0 -41 103004 14#12|15#12 0 +14 103018 9#3 0 +15 103001 15#1|15#2|15#3 0 +16 103002 5#14|6#14|7#14|5#15|7#15 0 +17 103008 6#7|6#8 0 +18 103001 12#7|10#8|11#8|12#8|11#9 0 +19 103001 11#3|11#4|12#4|10#5|11#5 0 +20 103001 20#9|19#10 0 +21 103001 7#1|8#1|7#2 0 +22 101017 20#10 0 +23 103002 2#13|1#14|2#14|3#14|4#14|2#15 0 +24 103001 8#9|9#9|8#10 0 +25 103030 5#2 0 +26 103004 5#3|4#4|5#4|5#5 0 +27 103011 20#3 0 +28 103004 13#2|14#2|13#3|14#3 0 +29 103001 15#6|16#6|14#7|15#7|15#8|15#9 0 +30 103015 6#15 0 +31 103002 1#1|2#1|3#1|2#2|3#2 0 +32 103014 1#2 0 +33 103028 7#9 0 +34 103008 3#7|4#7|3#8|4#8 0 +35 103029 13#9 0 +36 103001 9#12|9#13|9#14|9#15 0 +37 101024 10#15 0 +38 101023 13#4 0 +39 103004 14#12|15#12 0 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 840aec9de..4f0ec3ca5 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -41,32 +41,32 @@ 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 null 1 101009 +101008 0 1 10101 100001#102001 1 101009 101009 0 0 null null 4 null -101010 0 1 10101 null 1 101010 +101010 0 1 10101 100001#102001#101001 1 101010 101011 0 0 null null 4 null -101012 0 0 null 100001 1 101011 +101012 0 0 null null 1 101011 101013 0 0 null null 1 101012 -101014 0 1 10101 null 1 101013 +101014 0 1 10101 100002#101001#102002 1 101013 101015 0 0 null null 4 null -101016 1 2 1503#1 100001 1 101014 +101016 1 2 1503#1 1002 1 101014 101017 0 0 null null 1 101014 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 100001 1 101017 -101022 0 1 10102 null 1 101018 +101021 0 0 null null 1 101017 +101022 0 1 10102 100002#101001#102002 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 null 1 101021 +101026 0 1 10107 100003#101001#101001#102002#102002 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 100001 6 101027 +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 @@ -74,11 +74,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101038 0 0 null null 1 101035 101039 0 0 null null 4 null 101040 0 0 null null 0 null -101041 10102 5 0 null 4 null +101041 0 0 null null 0 null 101042 0 0 null null 0 null -101043 0 1 1010002 null 1 101036 +101043 0 1 1010002 100001#100002#102002 1 101036 101044 0 0 null null 4 null -101045 0 1 1010002 null 1 101037 +101045 0 1 1010002 100001#100002#102002 1 101037 101046 0 0 null null 4 null 101047 0 0 null null 0 null 101048 0 0 null null 0 null @@ -87,15 +87,15 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101051 0 0 null null 1 101040 101052 0 0 null null 1 101040 101053 0 0 null null 0 null -101054 0 6 2 20101 1 101041 +101054 0 6 2 100002#100004#101005#102002 1 101041 101055 0 0 null null 4 null -101056 0 1 1010003 null 1 101044 +101056 0 1 1010003 100001#100002#102002 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 null 5 101045 +101062 0 1 1010003 100001#100002#102002 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 @@ -104,25 +104,25 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 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 null 1 101053 +101071 0 1 10101 100002#101001#102002 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 20101 1 101055 +101076 0 0 null 102001 1 101055 101077 0 0 null null 4 null 101078 0 0 null null 0 null -101079 0 1 10101 null 1 101056 +101079 0 1 10101 100002#101001#102002 1 101056 101080 0 0 null null 4 null -101081 0 1 10103 null 1 101059 +101081 0 0 null null 1 101059 101082 0 0 null null 4 null 101083 0 0 null null 0 null 101084 0 0 null null 0 null 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 null 1 101060 -101089 0 1 10102 null 1 101061 +101088 0 1 10101 100002#101001#102002 1 101060 +101089 0 1 10102 100003#101001#101001#102002#102002 1 101061 101090 0 0 null null 4 null 101091 0 0 null null 0 null 101092 0 0 null null 0 null @@ -156,15 +156,15 @@ 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 null 1 101087 -101124 0 1 1010005 null 1 101089 +101123 0 1 1010004 100003#101001#102002 1 101087 +101124 0 1 1010005 100005#101002#102003 1 101089 101125 0 0 null null 0 null -101126 0 1 1010006 null 1 101090 +101126 0 1 1010006 100005#101002#102003 1 101090 101127 0 0 null null 1 101093 101128 0 6 2 null 3 101091#101092|1#10103 101129 0 0 null null 1 101093 101130 0 0 null null 1 101093 -101131 0 1 1010007 null 5 101095 +101131 0 1 1010007 100006#101006#101001#102004 5 101095 0 0 0 null null 0 null 101133 0 0 null null 1 101098 0 0 0 null null 0 null @@ -241,11 +241,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101205 0 0 null null 4 null 101206 0 0 null null 1 101155 101207 0 0 null null 4 null -101208 3 0 null null 1 101157#101156|1#3 +101208 0 0 null null 1 101157#101156|1#3 101209 0 0 null null 4 null 101210 0 0 null null 4 null 101211 0 0 null null 0 null -101212 0 1 10401 null 1 101159 +101212 0 1 10303 100004#102005#101001 1 101159 101213 0 0 null null 4 null 101214 0 0 null null 0 null 101215 0 0 null null 0 null @@ -254,9 +254,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101218 0 0 null 100002 1 101161 101219 0 0 null null 1 101162 101220 0 0 null null 1 101162 -101221 0 0 null 100001 1 101163 +101221 0 0 null null 1 101163 101222 0 0 null null 4 null -101223 0 1 10402 null 1 101164 +101223 0 1 10303 100004#102005#101001#101001 1 101164 101224 0 0 null null 4 null 101225 0 0 null null 4 null 101226 0 0 null null 0 null @@ -297,9 +297,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101261 0 0 null 100003 4 null 101262 0 0 null null 1 101189 101263 0 0 null null 4 null -101264 0 1 10501 null 1 101190 +101264 0 1 10301 100001#102003#101001 1 101190 101265 0 0 null null 4 null -101266 0 1 10502 null 1 101191 +101266 0 1 10302 100001#102003#101001 1 101191 101267 0 0 null null 4 null 101268 0 0 null null 1 101192 101269 0 0 null null 4 null @@ -309,7 +309,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101273 0 0 null null 4 null 101274 0 0 null null 4 null 101275 0 0 null null 0 null -101276 0 1 10502 null 1 101196 +101276 0 1 10304 100004#102005#101001#101001 1 101196 101277 0 0 null null 4 null 101278 0 0 null null 4 null 101279 0 0 null null 0 null @@ -410,12 +410,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 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 null 1 102048 +102063 0 1 1020002 100003#101001#102002 1 102048 102064 0 0 null null 4 null -102065 0 1 1020002 null 1 102049 +102065 0 1 1020002 100003#101001#102002 1 102049 102066 0 0 null null 4 null 102067 0 0 null null 1 102050 -102068 0 1 1020003 null 1 102051 +102068 0 1 1020003 100003#101001#102002 1 102051 102069 0 0 null null 4 null 102070 0 0 null 10102 1 102052 102071 0 0 null null 4 null @@ -426,7 +426,7 @@ 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 null 1 102057 +102079 0 1 1020004 100004#101001#101001#102002#102001 1 102057 102080 0 0 null null 4 null 102081 9 6 2 null 5 102058 102082 0 0 null null 4 null @@ -442,24 +442,24 @@ 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 null 1 102068 +102095 0 1 1020005 100002#102001 1 102068 102096 0 0 null null 4 null -102097 0 1 1020005 null 1 102069 +102097 0 1 1020005 100002#102001 1 102069 102098 0 0 null null 4 null -102099 0 1 1020005 null 1 102070 +102099 0 1 1020005 100002#102001 1 102070 102100 0 0 null null 4 null -102101 0 6 2 null 1 102071 +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 10102 1 102073 -102105 0 0 null 10102 1 102073 -102106 0 1 1020006 null 3 102074#102081|1#5 +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 102107 0 0 null null 4 null -102108 0 1 1020005 null 1 102075 +102108 0 1 1020005 100002#102001 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 null 1 102077 +102112 0 1 1020006 100004#100002#101002#101001#102002#102002 1 102077 102113 0 0 null null 4 null 102114 0 0 null 10102 6 102078 102115 0 0 null null 4 null @@ -473,23 +473,23 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 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 null 1 102086 +102126 0 1 1020007 100002#102001 1 102086 102127 0 0 null null 4 null -102128 0 1 1020007 null 1 102089 +102128 0 1 1020007 100002#102001 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 null 1 102090 +102134 0 1 1020007 100002#102001#101001 1 102090 102135 0 0 null null 4 null -102136 0 1 1020007 null 1 102091 +102136 0 1 1020007 100002#102001#101001 1 102091 102137 0 0 null null 4 null -102138 0 1 1020008 null 1 102092 +102138 0 1 1020008 100004#102001#102002#101002 1 102092 102139 0 0 null null 4 null -102140 0 1 1020008 null 1 102093 +102140 0 1 1020008 100004#102001#102002#101002 1 102093 102141 0 0 null null 4 null -102142 0 1 1020009 null 1 102094 +102142 0 1 1020009 100006#102004#101004 1 102094 102143 0 0 null null 4 null 102144 0 0 null 10102 5 102095 102145 0 0 null null 4 null @@ -549,11 +549,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 10105 null 1 102140 +102202 0 1 10101 100012#101005#102008#102008 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 null 5 102143 +102206 0 1 10101 100002#102001 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,12 +561,12 @@ 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 0 null null 1 102148 -102215 0 1 10101 null 1 102149 -102216 0 0 null null 1 102150 -102217 0 1 10101 null 1 102151 +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 102218 0 6 2 null 1 102152 -102219 0 1 10102 null 1 102153 +102219 0 1 10107 100005#101003#102003#102002 1 102153 102220 0 0 null null 5 102169 102221 0 0 null null 0 null 102222 0 0 null null 0 null @@ -582,16 +582,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 null 1 102158 +102235 0 1 10102 100002#102002#101001 1 102158 102236 0 0 null null 4 null -102237 0 1 10102 null 1 102159 +102237 0 1 10102 100002#102002#101001 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 10102 1 102161 +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 null 1 102162 +102244 0 1 10102 100003#102002#101001#101001 1 102162 102245 0 0 null null 4 null 102246 0 0 null null 4 null 102247 0 26 4 null 4 null @@ -638,7 +638,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 null 5 103028 +103033 0 1 1030004 100015#102011#102005#101005 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 +656,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 null 1 103044 +103051 0 1 1030001 100004#102003 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 +665,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 null 1 103049 +103060 0 1 1030001 100004#102003 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 +674,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 null 1 103056 -103070 0 1 1030002 null 1 103057 -103071 0 1 1030003 null 5 103058 +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 103072 0 0 null null 1 103059 103073 0 0 null null 1 103060 103074 0 0 null null 1 103061 @@ -719,15 +719,15 @@ 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 null 1 103091 +103114 0 1 10301 100002#101001#102003 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 null 1 103093 +103118 0 1 10301 100002#101001#102003 1 103093 103119 0 0 null null 4 null -103120 0 1 10301 10102 1 103094 +103120 0 1 10301 100002#101001#102003 1 103094 103121 0 0 null null 4 null -103122 0 0 null null 1 103095 +103122 1 2 1503#1 1004#1204#1304#1404 4 null 103123 0 0 null null 4 null 103124 0 0 null null 0 null 103125 0 0 null null 0 null @@ -745,10 +745,10 @@ 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 null 1 103104 +103140 0 1 10301 100002#102003#101001 1 103104 103141 0 0 null null 4 null -103142 0 0 null null 1 103108 -103143 0 0 null null 1 103108 +103142 0 0 null null 1 103107 +103143 0 0 null null 1 103107 103144 0 0 null null 4 null 103145 0 0 null null 0 null 103146 0 0 null null 0 null @@ -758,36 +758,36 @@ 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 null 1 103110 +103153 0 1 10303 100004#102005#101001#101001 1 103108 103154 0 0 null null 4 null -103155 0 1 10303 null 1 103111 +103155 0 1 10303 100004#102005#101001#101001 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 10301 null 1 103113 +103162 0 1 10305 100004#101001#101001#102003 1 103113 103163 0 0 null null 4 null 103164 0 0 null null 1 103114 103165 0 0 null null 4 null 103166 0 0 null null 1 103115 103167 0 0 null null 4 null -103168 0 0 null 10102 1 103116 +103168 0 6 2 10102 1 103116 103169 0 0 null null 4 null -103170 0 1 10302 null 1 103117 +103170 0 1 10304 100004#101001#101001#102003 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 103174 0 0 null null 4 null -103175 0 0 null null 4 null -103176 0 0 null 10102 1 103120 +103175 0 0 null null 1 103119 +103176 0 6 2 null 1 103120 103177 0 0 null null 4 null -103178 0 0 null null 1 103121 +103178 0 0 null 102007 1 103121 103179 0 0 null null 4 null 103180 0 0 null null 1 103122 103181 0 0 null null 4 null -103182 0 1 10305 null 1 103123 +103182 0 1 10304 100004#101001#101001#102003 1 103123 103183 0 0 null null 4 null 103184 0 0 null null 4 null 103185 0 0 null null 4 null @@ -800,17 +800,17 @@ 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 10302 10102 1 103132 +103195 0 1 10305 100004 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 10303 10102 1 103134 +103199 0 1 10305 100005#100002 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 10304 10102 1 103136 +103203 0 1 10305 100006#100002 1 103136 103204 0 0 null null 4 null -103205 0 0 null 10102 4 null +103205 0 0 null 100003#102010 4 null 104001 1 2 1503#1#104005 1004#1104#1204#1304 4 null 104002 0 0 null null 4 null 104003 1 2 1503#1#104006 1004#1104#1204#1304 4 null diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index 3ccd48f1e..d17e1aa3d 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -173,9 +173,9 @@ int int mut,int#int,1 int int 1321 2 100 1 0 1322 2 100 1 0 1323 2 100 1 0 -2000 1 6000#6059#6060 3 0 -2001 1 6001#6005#6007#6008#6036 5 0 -2002 1 6002#6006#6007#6008#6037 5 0 +2000 1 6000#6059#6060#100010 3 0 +2001 1 6001#6005#6007#6008#6036#100015 5 0 +2002 1 6002#6006#6007#6008#6037#100016 5 0 2003 1 6003#6005#6007#6008#6038 5 0 2004 1 6004#6006#6007#6008#6039 5 0 2005 1 6009#6014#6016#6017#6040 5 0 @@ -338,6 +338,71 @@ int int mut,int#int,1 int int 21004 2 100#301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318 1 0 21005 2 100#301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318 1 0 21006 2 100#301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318 1 0 -100001 1 10001 1 0 -100002 1 1001#2000 1 0 -100003 2 101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0 +0 0 null 0 0 +0 0 null 0 0 +0 0 null 0 0 +100001 1 100001 1 0 +100002 1 100002 1 0 +100003 1 100003 1 0 +100004 1 100004 1 0 +100005 1 100005 1 0 +100006 1 100006 1 0 +100007 1 100007 1 0 +100008 1 100008 1 0 +100009 1 100009 1 0 +100010 1 100010 1 0 +100011 1 100011 1 0 +100012 1 100012 1 0 +100013 1 100013 1 0 +100014 1 100014 1 0 +100015 1 100015 1 0 +100016 1 100016 1 0 +100017 0 null 0 0 +100018 0 null 0 0 +100019 0 null 0 0 +100020 0 null 0 0 +100021 0 null 0 0 +100022 0 null 0 0 +100023 0 null 0 0 +100024 0 null 0 0 +100025 0 null 0 0 +100026 0 null 0 0 +101001 1 101001 1 0 +101002 1 101002 1 0 +101003 1 101003 1 0 +101004 1 101004 1 0 +101005 1 101005 1 0 +101006 1 101006 1 0 +101007 1 101007 1 0 +101008 1 101008 1 0 +101009 0 null 0 0 +101010 0 null 0 0 +101011 0 null 0 0 +101012 0 null 0 0 +101013 0 null 0 0 +101014 0 null 0 0 +101015 0 null 0 0 +101016 0 null 0 0 +101017 0 null 0 0 +101018 0 null 0 0 +101019 0 null 0 0 +101020 0 null 0 0 +101021 0 null 0 0 +101022 0 null 0 0 +101023 0 null 0 0 +102001 1 102001 1 0 +102002 1 102002 1 0 +102003 1 102003 1 0 +102004 1 102004 1 0 +102005 1 102005 1 0 +102006 1 102006 1 0 +102007 1 102007 1 0 +102008 1 102008 1 0 +102009 1 102009 1 0 +102010 1 102010 1 0 +102011 1 102011 1 0 +102012 1 102012 1 0 +102013 1 102013 1 0 +102014 0 null 0 0 +102015 0 null 0 0 +102016 0 null 0 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index 967ecb3cf..f185a7f42 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -656,3 +656,63 @@ int int int float int int 20050 10050 100 1.0 1 1 20051 10051 100 1.0 1 1 20052 10052 100 1.0 1 1 +100001 14 100 1.0 5000 5000 +100002 14 100 1.0 10000 10000 +100003 14 100 1.0 20000 20000 +100004 14 100 1.0 30000 30000 +100005 14 100 1.0 50000 50000 +100006 14 100 1.0 80000 80000 +100007 14 100 1.0 100000 100000 +100008 14 100 1.0 120000 120000 +100009 14 100 1.0 150000 150000 +100010 14 100 1.0 200000 200000 +100011 14 100 1.0 230000 230000 +100012 14 100 1.0 250000 250000 +100013 14 100 1.0 300000 300000 +100014 14 100 1.0 350000 350000 +100015 14 100 1.0 400000 400000 +100016 14 100 1.0 1000000 1000000 +100017 14 100 1.0 0 0 +100018 14 100 1.0 0 0 +100019 14 100 1.0 0 0 +100020 14 100 1.0 0 0 +101001 4 100 1.0 10 10 +101002 4 100 1.0 30 3 +101003 4 100 1.0 50 50 +101004 4 100 1.0 80 80 +101005 4 100 1.0 100 100 +101006 4 100 1.0 120 120 +101007 4 100 1.0 150 150 +101008 4 100 1.0 200 200 +101009 4 100 1.0 0 0 +101010 4 100 1.0 0 0 +101011 4 100 1.0 0 0 +101012 4 100 1.0 0 0 +101013 4 100 1.0 0 0 +101014 4 100 1.0 0 0 +101015 4 100 1.0 0 0 +101016 4 100 1.0 0 0 +101017 4 100 1.0 0 0 +101018 4 100 1.0 0 0 +101019 4 100 1.0 0 0 +101020 4 100 1.0 0 0 +102001 3 100 1.0 100 100 +102002 3 100 1.0 200 200 +102003 3 100 1.0 500 500 +102004 3 100 1.0 800 800 +102005 3 100 1.0 1000 1000 +102006 3 100 1.0 1200 1200 +102007 3 100 1.0 1500 1500 +102008 3 100 1.0 2000 2000 +102009 3 100 1.0 2500 2500 +102010 3 100 1.0 3000 3000 +102011 3 100 1.0 5000 5000 +102012 3 100 1.0 8000 8000 +102013 3 100 1.0 10000 10000 +102014 3 100 1.0 0 0 +102015 3 100 1.0 0 0 +102016 3 100 1.0 0 0 +102017 3 100 1.0 0 0 +102018 3 100 1.0 0 0 +102019 3 100 1.0 0 0 +102020 3 100 1.0 0 0 diff --git a/luafight/Modules/Battle/Logic/BattleLogic.lua b/luafight/Modules/Battle/Logic/BattleLogic.lua index e7a6ca993..8fe676ea0 100644 --- a/luafight/Modules/Battle/Logic/BattleLogic.lua +++ b/luafight/Modules/Battle/Logic/BattleLogic.lua @@ -43,6 +43,8 @@ BattleLogic.TotalOrder = 0 --当前波次 BattleLogic.CurOrder = 0 +local maxFrame = BattleLogic.GameFrameRate * 300 --战斗最大用时5分钟,超时判负 + local actionPool = BattleObjectPool.New(function () return { 0, 0 } end) @@ -317,6 +319,10 @@ local tmpObj, index, bMyAllDead, bEnemyAllDead function BattleLogic.Update() curFrame = curFrame + 1 + if curFrame > maxFrame then + BattleLogic.BattleEnd(0) + return + end for i=1, #optionRecord do if optionRecord[i][1] == curFrame then