fix item
parent
e1fc69d05c
commit
76f1408171
|
@ -925,8 +925,8 @@ public class CombatLogic {
|
|||
}
|
||||
lastTimeTakes=times;
|
||||
}
|
||||
ItemUtil.extraAddItem(user,baseItemMap);
|
||||
ItemUtil.extraAddItem(user,randomItemMap);
|
||||
ItemUtil.extraAddItem(user,baseItemMap,BIReason.ADVENTURE_BASE_REWARD);
|
||||
ItemUtil.extraAddItem(user,randomItemMap,BIReason.ADVENTURE_RANDOM_REWARDD);
|
||||
if(viewBaseReward){
|
||||
myResult = true;
|
||||
rewardStr = ItemUtil.getReward(baseItemMap, baseCardMap, baseEquipMap, baseRandomMap);
|
||||
|
|
|
@ -93,7 +93,7 @@ public class ThreadManager {
|
|||
long lastMilis = System.currentTimeMillis();
|
||||
try { Thread.sleep(10000L); } catch (InterruptedException e) { }
|
||||
long millis = System.currentTimeMillis();
|
||||
if((millis - lastMilis)-10000>10||(millis - lastMilis)-10000<-10){
|
||||
if((millis - lastMilis)-10000>5000||(millis - lastMilis)-10000<-5000){
|
||||
reStart();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -260,18 +260,18 @@ public class ItemUtil {
|
|||
public static void combineReward(User user,boolean isLoop,int[] dropGroupIds,float dropRatio, Map<Integer, Integer> itemMap, Map<Integer, Integer> cardMap, Map<Integer, Integer> equipMap, Map<Integer, Integer> randomMap,int reason){
|
||||
combineRewardDropGroup(user, dropGroupIds, dropRatio, itemMap, cardMap, equipMap, randomMap);
|
||||
if(!isLoop){
|
||||
extraAddItem(user,itemMap);
|
||||
extraAddItem(user,itemMap,reason);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void extraAddItem(User user, Map<Integer, Integer> itemMap){
|
||||
public static void extraAddItem(User user, Map<Integer, Integer> itemMap,int resson){
|
||||
ItemManager itemManager = user.getItemManager();
|
||||
for(Map.Entry<Integer,Integer> item : itemMap.entrySet()){
|
||||
Integer itemId = item.getKey();
|
||||
Integer value = item.getValue();
|
||||
SItem sItem = SItem.getsItemMap().get(itemId);
|
||||
int itemNums = privilegeAdd(user, 1, sItem.getItemType(), value);
|
||||
int itemNums = privilegeAdd(user, resson, sItem.getItemType(), value);
|
||||
Item hadItem = itemManager.getItem(itemId);
|
||||
int hadNums = 0;
|
||||
if(hadItem !=null){
|
||||
|
|
Loading…
Reference in New Issue