Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.javaback_recharge
commit
6e8dc9fb64
|
@ -333,6 +333,9 @@ public class HardStageLogic {
|
|||
}
|
||||
|
||||
private static boolean addDropAndStar(HardStageNode node, List<Integer> dropList, int rewardGroupId, User user) throws Exception {
|
||||
if(!node.getRewardMap().containsKey(rewardGroupId)){
|
||||
node.getRewardMap().put(rewardGroupId,false);
|
||||
}
|
||||
if (!node.getRewardMap().get(rewardGroupId)) {
|
||||
dropList.add(rewardGroupId);
|
||||
node.getRewardMap().put(rewardGroupId, true);
|
||||
|
|
|
@ -403,7 +403,6 @@ public class HeroLogic{
|
|||
}
|
||||
//记录卡池抽奖次数
|
||||
heroManager.putRandomType(type,num+result[1]);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue