Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
commit
97de16f24a
|
@ -344,10 +344,11 @@ public class ItemLogic {
|
||||||
Map<Integer,Integer> baseRandomMap = new HashMap<>();
|
Map<Integer,Integer> baseRandomMap = new HashMap<>();
|
||||||
|
|
||||||
for (int[] ints:items) {
|
for (int[] ints:items) {
|
||||||
if(baseItemMap.containsKey(ints[0])){
|
Map<Integer, Integer> mapRe = ItemUtil.getMapRe(ints[0], baseItemMap, baseCardMap, baseEquipMap, baseRandomMap);
|
||||||
baseItemMap.put(ints[0],baseItemMap.get(ints[0])+ints[1]);
|
if(mapRe.containsKey(ints[0])){
|
||||||
|
mapRe.put(ints[0],mapRe.get(ints[0])+ints[1]);
|
||||||
}else {
|
}else {
|
||||||
baseItemMap.put(ints[0],ints[1]);
|
mapRe.put(ints[0],ints[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ItemUtil.drop(user,drop,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,BIReason.JEWEL_DECOMPOSE);
|
ItemUtil.drop(user,drop,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,BIReason.JEWEL_DECOMPOSE);
|
||||||
|
|
Loading…
Reference in New Issue