master_ob2
parent
fb2d6919b5
commit
97080e3da5
|
@ -12,7 +12,6 @@ gamecommon/src/main/java/rpc/protocols
|
|||
*.class
|
||||
out
|
||||
build
|
||||
out
|
||||
tmp/
|
||||
luafight/LogError/*.txt
|
||||
luafight/LogError/*.json
|
||||
|
|
|
@ -439,7 +439,7 @@ public class HeroLogic {
|
|||
|
||||
//记录卡池抽奖次数
|
||||
heroManager.putRandomType(type, num + result[1]);
|
||||
int[]rewardArr=new int[result.length];
|
||||
int[] rewardArr = new int[result.length];
|
||||
System.arraycopy(result, 0, rewardArr, 0, result.length);
|
||||
return rewardArr;
|
||||
}
|
||||
|
@ -924,16 +924,6 @@ public class HeroLogic {
|
|||
if (mustSet.isEmpty()) {
|
||||
int pooId = getPooId(sLotterySetting);
|
||||
sLotteryRewardConfig = randomHeroByPoolId(pooId, user);
|
||||
// if(randomPoolByType.get(mergePool)!=null) {
|
||||
// for (int key : randomPoolByType.get(mergePool).keySet()) {
|
||||
// if (star == key) {
|
||||
// randomPoolByType.get(mergePool).put(key, 0);
|
||||
// } else {
|
||||
// int curValue = randomPoolByType.get(mergePool).getOrDefault(key, 0);
|
||||
// randomPoolByType.get(mergePool).put(key, curValue + 1);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
if (sLotteryRewardConfig != null) {
|
||||
currStarId = sLotteryRewardConfig.getStar();
|
||||
// LOGGER.info("随机到了{}-->对应star-->{}", sLotteryRewardConfig.getId(), currStarId);
|
||||
|
@ -943,7 +933,7 @@ public class HeroLogic {
|
|||
//有必出时比较各个优先级,取优先级高的
|
||||
int maxId = 0;
|
||||
for (int mustId : mustSet) {
|
||||
maxId = mustId > maxId ? mustId : maxId;
|
||||
maxId = Math.max(mustId, maxId);
|
||||
}
|
||||
// LOGGER.info("randomOne uid=>{} 触发必出=>{}", user.getId(), maxId);
|
||||
SLotterySpecialConfig onConfig = null;
|
||||
|
|
Loading…
Reference in New Issue