修改推荐妖灵师奖励
parent
1793ddffd9
commit
65f2bd5692
|
@ -35,11 +35,17 @@ public class MongoUpdateCache {
|
|||
Map.Entry<String, UpdateRequest> entry = it.next();
|
||||
String key1 = entry.getKey();
|
||||
if(!fullKey.equals(key1)){
|
||||
//解决类似 item.1 item.11 问题
|
||||
if (fullKey.contains(key1)) {
|
||||
return;
|
||||
if(checkOverride(key1,fullKey)){
|
||||
return;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (key1.contains(fullKey)) {
|
||||
it.remove();
|
||||
if(checkOverride(key1,fullKey)){
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -49,6 +55,15 @@ public class MongoUpdateCache {
|
|||
listRequest.put(fullKey, request);
|
||||
}
|
||||
|
||||
public boolean checkOverride(String key1,String key2){
|
||||
String[] fullKeyArray = key1.split(".");
|
||||
String[] key1Array = key2.split(".");
|
||||
if(fullKeyArray.length == key1Array.length && !fullKeyArray[fullKeyArray.length -1].equals(key1Array[key1Array.length -1])){
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected void update(LjsdMongoTemplate ljsdMongoTemplate) throws IllegalAccessException {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Id OpenLevel RecommendForce RecommendHeroIds MinNum BaseRewardGroup RandomRewardGroup RecommendRewardGroup
|
||||
int int int mut,int#int,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1
|
||||
1 101001 1000 3#1#2 5 101 1001#1002 2001#2002#2003
|
||||
2 102001 2000 3#1#2 5 102 1001#1002 2001#2002#2003
|
||||
3 102001 3000 3#1#2 5 103 1001#1002 2001#2002#2003
|
||||
4 102001 4000 3#1#2 5 104 1001#1002 2001#2002#2003
|
||||
5 102001 5000 3#1#2 5 105 1001#1002 2001#2002#2003
|
||||
int int int mut,int#int,1 int mut,int#int,1 mut,int#int,1 mut,int#int,2
|
||||
1 101001 1000 2#1#2 5 101 111 2001#2002#2003|2001#2002#2003
|
||||
2 102001 2000 2#1#2 5 102 112 2001#2002#2003|2001#2002#2003
|
||||
3 102001 3000 2#1#2 5 103 113 2001#2002#2003|2001#2002#2003
|
||||
4 102001 4000 2#1#2 5 104 114 2001#2002#2003|2001#2002#2003
|
||||
5 102001 5000 2#1#2 5 105 115 2001#2002#2003|2001#2002#2003
|
||||
|
|
|
@ -32,8 +32,6 @@ int mut,int#int,1
|
|||
100030 100032
|
||||
100031 100033
|
||||
100032 100034
|
||||
100033 100035
|
||||
100034 100036
|
||||
101001 10101
|
||||
101002 10102
|
||||
101003 10110
|
||||
|
@ -249,6 +247,10 @@ int mut,int#int,1
|
|||
101213 101302
|
||||
101214 101303
|
||||
101215 101304
|
||||
101216 101305
|
||||
101217 101306
|
||||
101218 101307
|
||||
101219 101308
|
||||
102001 10101
|
||||
102002 10102
|
||||
102003 10104
|
||||
|
@ -411,6 +413,7 @@ int mut,int#int,1
|
|||
102160 102242#102243
|
||||
102161 102244#102245
|
||||
102162 102246
|
||||
102163 102247
|
||||
103001 10301
|
||||
103002 10303
|
||||
103003 10305
|
||||
|
@ -535,6 +538,7 @@ int mut,int#int,1
|
|||
103122 103179#103180
|
||||
103123 103181#103182
|
||||
103124 103183
|
||||
103125 103184
|
||||
104001 10401
|
||||
104002 10403
|
||||
104003 10407
|
||||
|
@ -677,6 +681,22 @@ int mut,int#int,1
|
|||
104139 104169#104170
|
||||
104140 104171#104172
|
||||
104141 104173
|
||||
104142 104174
|
||||
104143 104175
|
||||
104144 104176
|
||||
104145 104177
|
||||
104146 104178
|
||||
104147 104179
|
||||
104148 104180
|
||||
104149 104181
|
||||
104150 104182
|
||||
104151 104183
|
||||
104152 104184
|
||||
104153 104185
|
||||
104154 104186
|
||||
104155 104187
|
||||
104156 104188
|
||||
104157 104189
|
||||
105001 10501
|
||||
105002 10502
|
||||
105003 10503
|
||||
|
@ -787,6 +807,27 @@ int mut,int#int,1
|
|||
105108 105166#105167
|
||||
105109 105168#105169
|
||||
105110 105170
|
||||
105111 105171
|
||||
105112 105172
|
||||
105113 105173
|
||||
105114 105174
|
||||
105115 105175
|
||||
105116 105176
|
||||
105117 105177
|
||||
105118 105178
|
||||
105119 105179
|
||||
105120 105180
|
||||
105121 105181
|
||||
105122 105182
|
||||
105123 105183
|
||||
105124 105184
|
||||
105125 105185
|
||||
105126 105186
|
||||
105127 105187
|
||||
105128 105188
|
||||
105129 105189
|
||||
105130 105190
|
||||
105131 105191
|
||||
106001 10601
|
||||
106002 10602
|
||||
106003 10604
|
||||
|
@ -871,6 +912,13 @@ int mut,int#int,1
|
|||
106082 10603
|
||||
106083 106119
|
||||
106084 106120
|
||||
106085 106121
|
||||
106086 106122
|
||||
106087 106123
|
||||
106088 106124
|
||||
106089 106125
|
||||
106090 106126
|
||||
106091 106127
|
||||
107001 null
|
||||
107002 null
|
||||
107003 null
|
||||
|
|
|
@ -5,8 +5,8 @@ int int int int
|
|||
3 1 6 2002
|
||||
4 1 3 2003
|
||||
5 1 4 2004
|
||||
6 1 3 2005
|
||||
7 1 2 2006
|
||||
6 1 4 2005
|
||||
7 1 3 2006
|
||||
8 1 2 2007
|
||||
9 1 1 2008
|
||||
10 1 2 2009
|
||||
|
|
|
@ -29,18 +29,16 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
100027 0 0 null null 1 100026
|
||||
100028 0 0 null null 1 100027
|
||||
100029 0 0 null null 1 100028
|
||||
100030 0 27 2#101 null 1 100029
|
||||
100030 0 27 2 null 1 100029
|
||||
100031 0 19 1#100#20#29 null 4 null
|
||||
100032 0 0 null null 1 null
|
||||
100032 0 26 2 null 4 null
|
||||
100033 0 0 null null 1 null
|
||||
100034 0 26 2 null 4 null
|
||||
100035 0 0 null null 1 null
|
||||
100036 0 26 101 null 4 null
|
||||
100034 0 26 101 null 4 null
|
||||
101001 1 2 1503#1 1001#1101#1201#1301 4 null
|
||||
101002 0 0 null null 4 null
|
||||
101003 0 19 2#0 null 4 null
|
||||
101003 0 0 null null 5 102111
|
||||
101004 0 0 null null 4 null
|
||||
101005 0 0 null null 5 101007
|
||||
101005 0 27 101 null 5 101007
|
||||
101006 0 0 null null 4 null
|
||||
101007 0 0 null null 5 101008
|
||||
101008 0 1 10101 null 1 101009
|
||||
|
@ -172,7 +170,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
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
|
||||
101137 0 0 null null 1 101100
|
||||
101138 0 9 2 null 4 null
|
||||
101139 0 0 null null 0 null
|
||||
101140 0 0 null null 0 null
|
||||
|
@ -339,7 +337,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
101301 0 0 null null 1 101213
|
||||
101302 0 0 null null 4 null
|
||||
101303 0 0 null null 1 null
|
||||
101304 0 26 3 null 4 null
|
||||
101304 0 0 null null 1 null
|
||||
101305 0 0 null null 1 null
|
||||
101306 0 0 null null 1 null
|
||||
101307 0 0 null null 1 null
|
||||
101308 0 26 3 null 4 null
|
||||
102001 1 2 1503#1 1002#1102#1202#1302 4 null
|
||||
102002 0 0 null null 4 null
|
||||
102003 1 2 1503#1 1002#1102#1202#1302 4 null
|
||||
|
@ -359,9 +361,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
102017 0 0 null 10102 4 null
|
||||
102018 0 0 null 10102 4 null
|
||||
102019 0 0 null 10102 4 null
|
||||
102020 0 5 0 null 4 null
|
||||
102020 0 19 3#0 null 5 null
|
||||
102021 0 0 null null 4 null
|
||||
102022 0 19 3#103#19#2 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
|
||||
102025 0 0 null null 4 null
|
||||
|
@ -494,7 +496,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
102152 0 0 null null 1 102102
|
||||
102153 0 0 null null 1 102103
|
||||
102154 0 0 null null 1 102104
|
||||
102155 0 0 null null 1 102105
|
||||
102155 0 27 4 null 1 102105
|
||||
102156 0 9 3 null 4 null
|
||||
102157 0 0 null null 4 null
|
||||
102158 0 0 null null 4 null
|
||||
|
@ -506,8 +508,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
102164 0 0 null null 1 102113
|
||||
102165 0 0 null null 1 102114
|
||||
102166 0 0 null null 1 102115
|
||||
102167 0 0 null null 1 102116
|
||||
102168 0 0 null null 4 null
|
||||
102167 0 27 3 null 1 102116
|
||||
102168 0 19 2#0 null 4 null
|
||||
102169 0 0 null null 5 102118
|
||||
102170 0 0 null null 1 102119
|
||||
102171 0 0 null null 1 102120
|
||||
|
@ -586,6 +588,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
102244 0 1 10102 null 1 102162
|
||||
102245 0 0 null null 4 null
|
||||
102246 0 0 null null 4 null
|
||||
102247 0 26 4 null 4 null
|
||||
103001 1 2 1503#1 1003#1103#1203#1303 4 null
|
||||
103002 0 0 null null 4 null
|
||||
103003 1 2 1503#1 1003#1103#1203#1303 4 null
|
||||
|
@ -600,9 +603,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
103012 0 0 null null 4 null
|
||||
103013 1 2 1503#1 1003#1103#1203#1303 4 null
|
||||
103014 0 0 null null 4 null
|
||||
103015 0 5 0 null 4 null
|
||||
103015 0 19 4#0 null 4 null
|
||||
103016 0 0 null null 4 null
|
||||
103017 0 19 4#104#2#3 null 4 null
|
||||
103017 0 0 null null 4 null
|
||||
103018 0 0 null null 4 null
|
||||
103019 0 1 10301 null 1 103014
|
||||
103020 0 0 null null 4 null
|
||||
|
@ -633,7 +636,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
103045 0 0 null null 1 103041
|
||||
103046 0 0 null null 0 null
|
||||
103047 0 0 null null 0 null
|
||||
103048 0 11 4|103#13#15#103012 null 4 null
|
||||
103048 0 27 5 null 4 null
|
||||
103049 0 0 null null 1 103043
|
||||
103050 0 0 null null 4 null
|
||||
103051 0 1 10301 null 1 103044
|
||||
|
@ -769,6 +772,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
103181 0 1 10305 null 1 103124
|
||||
103182 0 0 null null 4 null
|
||||
103183 0 0 null null 4 null
|
||||
103184 0 26 5 null 4 null
|
||||
104001 1 2 1503#1 1004#1104#1204#1304 4 null
|
||||
104002 0 0 null null 4 null
|
||||
104003 1 2 1503#1 1004#1104#1204#1304 4 null
|
||||
|
@ -785,9 +789,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
104014 0 0 null null 4 null
|
||||
104015 1 2 1503#1 1004#1104#1204#1304 4 null
|
||||
104016 0 0 null null 4 null
|
||||
104017 0 5 0 null 4 null
|
||||
104017 0 19 5#0 null 4 null
|
||||
104018 0 0 null null 4 null
|
||||
104019 0 19 5#105#14#4 null 4 null
|
||||
104019 0 0 null null 4 null
|
||||
104020 0 0 null null 4 null
|
||||
104021 0 0 null null 1 104018
|
||||
104022 0 0 null null 4 null
|
||||
|
@ -916,7 +920,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
104145 0 0 null null 0 null
|
||||
104146 0 0 null null 0 null
|
||||
104147 0 0 null null 1 104110
|
||||
104148 0 11 5|104#40#3#104014 null 1 104119
|
||||
104148 0 27 6 null 1 104119
|
||||
104149 0 15 104026 null 4 null
|
||||
104150 0 0 null null 0 null
|
||||
104151 0 0 null null 0 null
|
||||
|
@ -942,6 +946,22 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
104171 0 1 10505 null 1 104141
|
||||
104172 0 0 null null 4 null
|
||||
104173 0 0 null null 4 null
|
||||
104174 0 0 null null 5 null
|
||||
104175 0 0 null null 5 null
|
||||
104176 0 0 null null 5 null
|
||||
104177 0 0 null null 5 null
|
||||
104178 0 26 6 null 4 null
|
||||
104179 0 0 null null 0 null
|
||||
104180 0 0 null null 0 null
|
||||
104181 0 0 null null 0 null
|
||||
104182 0 0 null null 0 null
|
||||
104183 0 0 null null 0 null
|
||||
104184 0 0 null null 0 null
|
||||
104185 0 0 null null 0 null
|
||||
104186 0 0 null null 0 null
|
||||
104187 0 0 null null 0 null
|
||||
104188 0 0 null null 0 null
|
||||
104189 0 0 null null 0 null
|
||||
105001 1 2 1503#1 1005#1105#1205#1305 4 null
|
||||
105002 0 0 null null 4 null
|
||||
105003 1 2 1503#1 1005#1105#1205#1305 4 null
|
||||
|
@ -958,9 +978,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
105014 0 0 null null 4 null
|
||||
105015 1 2 1503#1 1005#1105#1205#1305 4 null
|
||||
105016 0 0 null null 4 null
|
||||
105017 0 5 0 null 4 null
|
||||
105017 0 19 6#0 null 4 null
|
||||
105018 0 0 null null 4 null
|
||||
105019 0 19 6#106#6#17 null 4 null
|
||||
105019 0 0 null null 4 null
|
||||
105020 0 0 null null 4 null
|
||||
105021 3 0 null 10102 4 null
|
||||
105022 0 0 null null 4 null
|
||||
|
@ -1059,7 +1079,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
105115 0 0 null null 1 105074
|
||||
105116 0 0 null null 5 105075
|
||||
105117 0 0 null null 5 105076
|
||||
105118 0 11 6|105#3#20#105014 null 1 105077
|
||||
105118 0 27 7 null 1 105077
|
||||
105119 0 15 105032 null 4 null
|
||||
105120 0 0 null null 4 null
|
||||
105121 0 0 null null 4 null
|
||||
|
@ -1112,6 +1132,27 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
105168 0 0 null 10102 1 105110
|
||||
105169 0 0 null null 4 null
|
||||
105170 0 0 null null 4 null
|
||||
105171 0 0 null null 1 null
|
||||
105172 0 0 null null 1 null
|
||||
105173 0 26 7 null 4 null
|
||||
105174 0 0 null null 1 105115
|
||||
105175 0 0 null null 5 105116
|
||||
105176 0 0 null null 5 105117
|
||||
105177 0 0 null null 5 105118
|
||||
105178 0 0 null null 5 105119
|
||||
105179 0 0 null null 5 105120
|
||||
105180 0 0 null null 5 105121
|
||||
105181 0 0 null null 5 105122
|
||||
105182 0 0 null null 5 105123
|
||||
105183 0 0 null null 4 null
|
||||
105184 0 0 null null 1 105125
|
||||
105185 0 0 null null 1 105126
|
||||
105186 0 0 null null 1 105127
|
||||
105187 0 0 null null 1 105128
|
||||
105188 0 0 null null 5 105129
|
||||
105189 0 0 null null 5 105130
|
||||
105190 0 0 null null 1 105131
|
||||
105191 0 0 null null 4 null
|
||||
106001 1 2 1503#1 10102 4 null
|
||||
106002 0 0 null null 4 null
|
||||
106003 1 2 1503#1 10102 4 null
|
||||
|
@ -1128,9 +1169,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
106014 0 0 null null 4 null
|
||||
106015 1 2 1503#1 10102 4 null
|
||||
106016 0 0 null null 4 null
|
||||
106017 0 5 0 null 4 null
|
||||
106017 0 19 7#0 null 4 null
|
||||
106018 0 0 null null 4 null
|
||||
106019 0 19 8#107#26#29 null 4 null
|
||||
106019 0 0 null null 4 null
|
||||
106020 0 0 null null 4 null
|
||||
106021 0 1 10101 null 4 null
|
||||
106022 0 0 null null 4 null
|
||||
|
@ -1232,6 +1273,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
106118 0 0 null null 0 null
|
||||
106119 0 0 null null 4 null
|
||||
106120 0 0 null null 4 null
|
||||
106121 0 0 null null 1 106086
|
||||
106122 0 0 null null 1 106087
|
||||
106123 0 0 null null 4 null
|
||||
106124 0 0 null null 1 106089
|
||||
106125 0 0 null null 1 106090
|
||||
106126 0 0 null null 1 106091
|
||||
106127 0 0 null null 4 null
|
||||
107001 1 2 1503#1 10102 4 null
|
||||
107002 0 0 null null 4 null
|
||||
107003 1 2 1503#1 10102 4 null
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Id ItemId Chance GrowChance RandomMin RandomMax
|
||||
int int int float int int
|
||||
100 3001 0 1.0 0 0
|
||||
100 3001 1 1.0 0 0
|
||||
101 3001 100 1.0 1 1
|
||||
102 3002 100 1.0 1 1
|
||||
103 3003 100 1.0 1 1
|
||||
|
|
|
@ -662,93 +662,93 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float
|
|||
500108 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||
500109 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||
500110 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||
500201 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500202 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500203 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500204 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500205 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500206 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500207 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500208 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500209 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500210 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500301 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500302 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500303 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500304 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500305 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500306 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500307 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500308 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500309 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500310 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500401 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500402 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500403 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500404 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500405 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500406 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500407 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500408 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500409 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500410 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500501 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500502 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500503 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500504 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500505 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500506 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500507 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500508 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500509 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500510 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500601 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500602 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500603 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500604 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500605 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500606 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500607 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500608 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500609 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500610 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500701 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500702 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500703 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500704 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500705 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500706 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500707 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500708 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500709 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500710 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500801 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500802 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500803 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500804 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500805 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500806 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500807 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500808 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500809 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500810 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500901 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500902 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500903 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500904 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500905 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500906 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500907 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500908 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500909 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500910 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
501001 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501002 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501003 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501004 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501005 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501006 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501007 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501008 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501009 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501010 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
500201 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500202 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500203 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500204 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500205 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500206 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500207 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500208 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500209 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500210 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500301 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500302 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500303 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500304 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500305 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500306 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500307 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500308 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500309 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500310 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500401 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500402 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500403 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500404 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500405 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500406 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500407 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500408 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500409 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500410 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500501 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500502 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500503 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500504 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500505 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500506 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500507 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500508 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500509 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500510 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500601 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500602 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500603 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500604 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500605 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500606 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500607 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500608 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500609 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500610 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500701 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500702 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500703 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500704 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500705 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500706 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500707 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500708 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500709 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500710 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500801 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500802 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500803 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500804 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500805 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500806 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500807 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500808 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500809 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500810 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500901 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500902 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500903 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500904 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500905 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500906 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500907 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500908 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500909 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500910 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
501001 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501002 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501003 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501004 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501005 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501006 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501007 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501008 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501009 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501010 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
|
|
|
@ -26,26 +26,14 @@ public class SAdventureConfig implements BaseConfig {
|
|||
|
||||
private int[] randomRewardGroup;
|
||||
|
||||
private int[] recommendRewardGroup;
|
||||
|
||||
private int pooId;
|
||||
|
||||
private Set<Integer> recommendHeroSets;
|
||||
private int[][] recommendRewardGroup;
|
||||
|
||||
|
||||
@Override
|
||||
public void init() throws Exception {
|
||||
|
||||
Map<Integer, SAdventureConfig> config = STableManager.getConfig(SAdventureConfig.class);
|
||||
for(SAdventureConfig sAdventureConfig : config.values()){
|
||||
int[] recommendHeroIds = sAdventureConfig.getRecommendHeroIds();
|
||||
Set<Integer> recommendHeroSetTmp = new HashSet<>(recommendHeroIds.length);
|
||||
for(int i=0;i<recommendHeroIds.length;i++){
|
||||
recommendHeroSetTmp.add(recommendHeroIds[i]);
|
||||
}
|
||||
sAdventureConfig.setRecommendHeroSets(recommendHeroSetTmp);
|
||||
}
|
||||
sAdventureConfigMap = config;
|
||||
sAdventureConfigMap = STableManager.getConfig(SAdventureConfig.class);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
@ -57,14 +45,6 @@ public class SAdventureConfig implements BaseConfig {
|
|||
return sAdventureConfigMap;
|
||||
}
|
||||
|
||||
public Set<Integer> getRecommendHeroSets() {
|
||||
return recommendHeroSets;
|
||||
}
|
||||
|
||||
public void setRecommendHeroSets(Set<Integer> recommendHeroSets) {
|
||||
this.recommendHeroSets = recommendHeroSets;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
@ -93,11 +73,8 @@ public class SAdventureConfig implements BaseConfig {
|
|||
return randomRewardGroup;
|
||||
}
|
||||
|
||||
public int[] getRecommendRewardGroup() {
|
||||
public int[][] getRecommendRewardGroup() {
|
||||
return recommendRewardGroup;
|
||||
}
|
||||
|
||||
public int getPooId() {
|
||||
return pooId;
|
||||
}
|
||||
}
|
|
@ -33,8 +33,11 @@ public class SVipLevelConfig implements BaseConfig {
|
|||
for(int[] temp : privileges){
|
||||
privilegeMap.put(temp[0],temp[1]);
|
||||
}
|
||||
sVipLevelConfig.setPrivilegeMap(privilegeMap);
|
||||
|
||||
}
|
||||
}
|
||||
sVipLevelConfigMap =config;
|
||||
}
|
||||
|
||||
public static Map<Integer, SVipLevelConfig> getsVipLevelConfigMap() {
|
||||
|
@ -64,4 +67,8 @@ public class SVipLevelConfig implements BaseConfig {
|
|||
public Map<Integer, Integer> getPrivilegeMap() {
|
||||
return privilegeMap;
|
||||
}
|
||||
|
||||
public void setPrivilegeMap(Map<Integer, Integer> privilegeMap) {
|
||||
this.privilegeMap = privilegeMap;
|
||||
}
|
||||
}
|
|
@ -154,8 +154,7 @@ public class CombatLogic {
|
|||
return;
|
||||
}
|
||||
|
||||
int pooId = sAdventureConfig.getPooId();
|
||||
SAdventureSetting sAdventureSetting = SAdventureSetting.getsAdventureSetting(pooId);
|
||||
SAdventureSetting sAdventureSetting = SAdventureSetting.getsAdventureSetting(position);
|
||||
if(hourDuration > sAdventureSetting.getPerMapMaxHour()){
|
||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"超出时长");
|
||||
return;
|
||||
|
@ -173,7 +172,7 @@ public class CombatLogic {
|
|||
int allowTime =0;
|
||||
if(!adventureManager.getAllowTimeMap().containsKey(position)){
|
||||
int vipLevel = user.getPlayerInfoManager().getVipLevel();
|
||||
allowTime = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel).getPrivilegeMap().get(vipLevel) -hourDuration;
|
||||
allowTime = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel).getPrivilegeMap().get(1) -hourDuration;
|
||||
}else{
|
||||
Integer remainAllowTime = adventureManager.getAllowTimeMap().get(position);
|
||||
allowTime = remainAllowTime - hourDuration;
|
||||
|
@ -196,7 +195,7 @@ public class CombatLogic {
|
|||
HeroManager heroManager = user.getHeroManager();
|
||||
int myRecommendHeroSize=0;
|
||||
int totalForce=0;
|
||||
Set<Integer> recommendHeroSets = sAdventureConfig.getRecommendHeroSets();
|
||||
Set<Integer> recommendHeroSets =adventureSeasonInfoCache.getRecommendFinalHeroMap().get(position);
|
||||
Set<Integer> cacheHeroTid = new HashSet<>(recommendHeroSets.size());
|
||||
for(String heroId : heroIds){
|
||||
Hero hero = heroManager.getHero(heroId);
|
||||
|
@ -235,8 +234,8 @@ public class CombatLogic {
|
|||
SAdventureConfig sAdventureConfig = SAdventureConfig.getsAdventureConfigByPosition(position);
|
||||
int recommendForce = sAdventureConfig.getRecommendForce();
|
||||
|
||||
int pooId = sAdventureConfig.getPooId();
|
||||
SAdventureSetting sAdventureSetting = SAdventureSetting.getsAdventureSetting(pooId);
|
||||
|
||||
SAdventureSetting sAdventureSetting = SAdventureSetting.getsAdventureSetting(position);
|
||||
|
||||
|
||||
float[][] baseRewardRatio = sAdventureSetting.getBaseRewardRatio();
|
||||
|
@ -251,13 +250,20 @@ public class CombatLogic {
|
|||
float baseRewardRatioTmp = calRatio(myForceRatio, baseRewardRatio) * hourRewardRatioTmp;
|
||||
float randomRewardRatioTmp = calRatio(myForceRatio, randomRewardRatio) * hourRewardRatioTmp;
|
||||
int[] baseRewardGroup = sAdventureConfig.getBaseRewardGroup();
|
||||
int[] recommendRewardGroup = sAdventureConfig.getRecommendRewardGroup();
|
||||
int[][] recommendRewardGroup = sAdventureConfig.getRecommendRewardGroup();
|
||||
int[] randomRewardGroup = sAdventureConfig.getRandomRewardGroup();
|
||||
Map<int[],Float> dropInfoMap = new HashMap<>();
|
||||
dropInfoMap.put(baseRewardGroup,baseRewardRatioTmp);
|
||||
dropInfoMap.put(randomRewardGroup,randomRewardRatioTmp);
|
||||
if(myRecommendHeroSize>0){
|
||||
dropInfoMap.put(new int[]{recommendRewardGroup[myRecommendHeroSize-1]},myRecommendHeroSize*1.0f);
|
||||
int[] recommendRewardGroupDetail = recommendRewardGroup[myRecommendHeroSize - 1];
|
||||
for(int i=0;i<recommendRewardGroupDetail.length;i=i+2){
|
||||
int hourLimit = recommendRewardGroupDetail[i];
|
||||
if(hourDuration<=hourLimit){
|
||||
dropInfoMap.put(new int[]{recommendRewardGroupDetail[i+1]},1.0f);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropInfoMap);
|
||||
//清除占领
|
||||
|
|
|
@ -741,6 +741,7 @@ public class HeroLogic {
|
|||
|
||||
public int calHeoForce(User user, Hero hero){
|
||||
Map<Integer, Integer> heroAllAttribute = calHeroFinalAttribute(user, hero);
|
||||
heroAllAttribute.remove(0);
|
||||
double result = 0;
|
||||
for(Map.Entry<Integer, Integer> item : heroAllAttribute.entrySet()){
|
||||
Integer propertyId = item.getKey();
|
||||
|
|
Loading…
Reference in New Issue