Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
5ef80fab01
|
@ -990,14 +990,14 @@ public class ExpeditionLogic {
|
|||
|
||||
Expedition.ExpeditionTreasureInfoResponse.Builder response = Expedition.ExpeditionTreasureInfoResponse.newBuilder();
|
||||
Map<Integer, Integer> rewardStatusMap = worldTreasureReward.getRewardStatusMap();
|
||||
if(!rewardStatusMap.isEmpty()){
|
||||
List<Expedition.TreasureRewardState> states = new ArrayList<>(100);
|
||||
for(Map.Entry<Integer, Integer> entry:rewardStatusMap.entrySet()){
|
||||
Expedition.TreasureRewardState.Builder builder = Expedition.TreasureRewardState.newBuilder().setId(entry.getKey()).setState(entry.getValue());
|
||||
states.add(builder.build());
|
||||
}
|
||||
response.addAllTreasureRewardState(states);
|
||||
}
|
||||
WorldBossTreasureStaticConfig worldBossTreasureStaticConfig = STableManager.getFigureConfig(WorldBossTreasureStaticConfig.class);
|
||||
Set<SWorldBossTreasureConfig> sWorldBossTreasureConfigs = worldBossTreasureStaticConfig.getIdsByPeriods().get(worldTreasureReward.getRound());
|
||||
List<Expedition.TreasureRewardState> states = new ArrayList<>(100);
|
||||
sWorldBossTreasureConfigs.forEach(item->{
|
||||
Expedition.TreasureRewardState.Builder builder = Expedition.TreasureRewardState.newBuilder().setId(item.getId()).setState(rewardStatusMap.getOrDefault(item.getId(),0));
|
||||
states.add(builder.build());
|
||||
});
|
||||
response.addAllTreasureRewardState(states);
|
||||
response.setScore(worldTreasureReward.getScore());
|
||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
|
||||
}
|
||||
|
|
|
@ -267,18 +267,20 @@ public class HeroLogic{
|
|||
}
|
||||
|
||||
int j=0;
|
||||
//标记是否触发保底
|
||||
boolean specialTrigger=false;
|
||||
for(int i=0;i<perCount;i++){
|
||||
randCount++;
|
||||
poolCount++;
|
||||
int randomPoolId = pooId;
|
||||
int specialPoolId = getSpecialPoolByRandcount(sLotterySetting, randCount,poolCount);
|
||||
if(specialPoolId == 0){
|
||||
if(randomPoolId==0){
|
||||
randomPoolId = getPooId(sLotterySetting);
|
||||
}
|
||||
}else{
|
||||
randomPoolId =specialPoolId;
|
||||
if(!specialTrigger){
|
||||
randomPoolId = getSpecialPoolByRandcount(sLotterySetting, randCount,poolCount);
|
||||
specialTrigger=true;
|
||||
}
|
||||
if(randomPoolId==0){
|
||||
randomPoolId = getPooId(sLotterySetting);
|
||||
}
|
||||
|
||||
totalCount++;
|
||||
SLotteryRewardConfig sLotteryRewardConfig = randomHeroByPoolId(randomPoolId, totalCount, user.getPlayerInfoManager().getLevel());
|
||||
LOGGER.info("the uid={},the type={},the poolId={},reward={},poolCount={}",uid,type,randomPoolId,sLotteryRewardConfig.getId(),poolCount);
|
||||
|
|
Loading…
Reference in New Issue