普通奖励修改

back_recharge
lvxinran 2020-10-19 09:59:56 +08:00
parent 3f862e1ce3
commit 674e421e27
1 changed files with 12 additions and 12 deletions

View File

@ -241,9 +241,9 @@ public class JourneyMap {
SFreeTravel travelConfig = SFreeTravel.journeyMapByMapId.get(mapId); SFreeTravel travelConfig = SFreeTravel.journeyMapByMapId.get(mapId);
int[] consume = travelConfig.getConsume(); int[] consume = travelConfig.getConsume();
Map<Integer, Integer> map = ItemUtil.arrayToMap(new int[][]{consume}); Map<Integer, Integer> map = ItemUtil.arrayToMap(new int[][]{consume});
if(!ItemUtil.checkCost(user,map)){ // if(!ItemUtil.checkCost(user,map)){
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); // throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
} // }
int diceNum = pathInfo.getDiceNum(); int diceNum = pathInfo.getDiceNum();
List<Integer> randomNum = new ArrayList<>(); List<Integer> randomNum = new ArrayList<>();
@ -282,7 +282,7 @@ public class JourneyMap {
for(int i=0;i<commonRewardArray.length;i++){ for(int i=0;i<commonRewardArray.length;i++){
commonRewardArray[i] = common[randomNum.get(i)-1]; commonRewardArray[i] = common[randomNum.get(i)-1];
} }
CommonProto.Drop.Builder drop = ItemUtil.drop(user,commonRewardArray,1,0, BIReason.JOURNEY_COMMON_REWARD); CommonProto.Drop.Builder drop = null;// ItemUtil.drop(user,commonRewardArray,1,0, BIReason.JOURNEY_COMMON_REWARD);
//地图点判断 //地图点判断
if(mapPointId==0){ if(mapPointId==0){
@ -302,7 +302,6 @@ public class JourneyMap {
// int[] reward = MathUtils.randomFromWeightWithTaking(treasureChest, 1); // int[] reward = MathUtils.randomFromWeightWithTaking(treasureChest, 1);
// commonRewardArray[commonRewardArray.length-1] = reward[0]; // commonRewardArray[commonRewardArray.length-1] = reward[0];
commonRewardArray[commonRewardArray.length-1] = arrivePath.getRewardId(); commonRewardArray[commonRewardArray.length-1] = arrivePath.getRewardId();
drop = ItemUtil.drop(user,commonRewardArray,1,0, BIReason.JOURNEY_COMMON_REWARD);
pathType = 1; pathType = 1;
break; break;
case EventType.random: case EventType.random:
@ -374,11 +373,12 @@ public class JourneyMap {
case EventType.doubleReward: case EventType.doubleReward:
//倍数 //倍数
int mutiNum = config.getInitialEventId(); int mutiNum = config.getInitialEventId();
List<CommonProto.Item> itemlistList = drop.getItemlistList(); commonRewardArray = new int[randomNum.size()*mutiNum];
itemlistList.forEach(item->{ for(int j=0;j<randomNum.size();j++){//1
item.toBuilder().setItemNum(item.getItemNum()*mutiNum).build(); for(int i = 0;i<mutiNum;i++){//2
}); commonRewardArray[i+j*mutiNum] = common[randomNum.get(j)-1];
}
}
pathType = 2; pathType = 2;
break; break;
case EventType.journeyFinal: case EventType.journeyFinal:
@ -389,7 +389,6 @@ public class JourneyMap {
} }
int finalReward = travelConfig.getFinalReward(); int finalReward = travelConfig.getFinalReward();
commonRewardArray[commonRewardArray.length-1] = finalReward; commonRewardArray[commonRewardArray.length-1] = finalReward;
drop = ItemUtil.drop(user,commonRewardArray,1,0, BIReason.JOURNEY_COMMON_REWARD);
break; break;
default: default:
break; break;
@ -397,10 +396,11 @@ public class JourneyMap {
builder.setPathType(pathType); builder.setPathType(pathType);
} }
drop = ItemUtil.drop(user,commonRewardArray,1,0, BIReason.JOURNEY_COMMON_REWARD);
builder.setDrop(drop); builder.setDrop(drop);
arrivePath.setMapPointId(0); arrivePath.setMapPointId(0);
user.getMapManager().updateJourneyInfoByMapId(mapId,pathInfo); user.getMapManager().updateJourneyInfoByMapId(mapId,pathInfo);
ItemUtil.itemCost(user,map,BIReason.JOURNEY_DO_CONSUME,1); // ItemUtil.itemCost(user,map,BIReason.JOURNEY_DO_CONSUME,1);
MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build(),true); MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build(),true);
} }