被动技能129类型添加

back_recharge
lvxinran 2020-07-14 17:09:39 +08:00
parent f999e84929
commit a3682f79ca
5 changed files with 14 additions and 16 deletions

View File

@ -33,11 +33,6 @@ public class HeroManager extends MongoBase {
totalCount.put(type,count); totalCount.put(type,count);
} }
public void updateRandPoolTypeCount(int type,int profession,int count){
updateString("randomPoolByType." + type+"."+profession, count);
randomPoolByType.get(type).put(profession,count);
}
public void updateRandomPoolByType(int type,Map<Integer,Integer> map){ public void updateRandomPoolByType(int type,Map<Integer,Integer> map){
randomPoolByType.put(type,map); randomPoolByType.put(type,map);
updateString("randomPoolByType." + type, map); updateString("randomPoolByType." + type, map);

View File

@ -744,8 +744,8 @@ public class CombatLogic {
return ""; return "";
} }
public List<Integer> passiveskillEffect(User user,Hero targetHero,int teamId){ public Set<Integer> passiveskillEffect(User user,Hero targetHero,int teamId){
List<Integer> passiveskillEffect = new ArrayList<>(); Set<Integer> passiveskillEffect = new HashSet<>();
List<Integer> heroSkillList = HeroLogic.getInstance().getHeroSkillList(user, targetHero); List<Integer> heroSkillList = HeroLogic.getInstance().getHeroSkillList(user, targetHero);
heroSkillList.forEach(skill->{ heroSkillList.forEach(skill->{
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill); SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);
@ -772,7 +772,7 @@ public class CombatLogic {
List<Integer> heroSkillListTmp = HeroLogic.getInstance().getHeroSkillList(user, hero); List<Integer> heroSkillListTmp = HeroLogic.getInstance().getHeroSkillList(user, hero);
heroSkillListTmp.forEach(skill->{ heroSkillListTmp.forEach(skill->{
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill); SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);
if(config!=null &&config.getEffectiveRange()!=1 && config.getType()==94){ if(config!=null &&config.getEffectiveRange()==3 && PassiveskillCalEnum.contains(config.getType())){
passiveTeamskillEffect.add(config.getId()); passiveTeamskillEffect.add(config.getId());
} }
}); });
@ -789,7 +789,7 @@ public class CombatLogic {
}else{ }else{
heroSkillList.forEach(skill->{ heroSkillList.forEach(skill->{
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill); SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);
if(config!=null &&config.getEffectiveRange()!=1 && config.getType()==94){ if(config!=null &&config.getEffectiveRange()==3 && PassiveskillCalEnum.contains(config.getType())){
passiveskillEffect.add(config.getId()); passiveskillEffect.add(config.getId());
} }
}); });

View File

@ -325,7 +325,6 @@ public class HeroLogic{
} }
} }
SLotteryRewardConfig sLotteryRewardConfig; SLotteryRewardConfig sLotteryRewardConfig;
boolean isBestCard = false;
//是否有必出 //是否有必出
if(mustSet.isEmpty()){ if(mustSet.isEmpty()){
sLotteryRewardConfig = randomHeroByPoolId(getPooId(sLotterySetting), 1, user.getPlayerInfoManager().getLevel()); sLotteryRewardConfig = randomHeroByPoolId(getPooId(sLotterySetting), 1, user.getPlayerInfoManager().getLevel());
@ -333,7 +332,6 @@ public class HeroLogic{
if(randomPoolByType.get(mergePool)!=null) { if(randomPoolByType.get(mergePool)!=null) {
for (int key : randomPoolByType.get(mergePool).keySet()) { for (int key : randomPoolByType.get(mergePool).keySet()) {
if (star == key) { if (star == key) {
isBestCard = true;
randomPoolByType.get(mergePool).put(key, 0); randomPoolByType.get(mergePool).put(key, 0);
} else { } else {
int curValue = randomPoolByType.get(mergePool).getOrDefault(key, 0); int curValue = randomPoolByType.get(mergePool).getOrDefault(key, 0);
@ -349,7 +347,6 @@ public class HeroLogic{
maxId = mustId>maxId?mustId:maxId; maxId = mustId>maxId?mustId:maxId;
} }
System.out.println("触发必出"+maxId); System.out.println("触发必出"+maxId);
isBestCard = true;
SLotterySpecialConfig onConfig = null; SLotterySpecialConfig onConfig = null;
for(SLotterySpecialConfig everyConfig:specialConfigs){ for(SLotterySpecialConfig everyConfig:specialConfigs){
if(everyConfig.getDifferentType()!=maxId){ if(everyConfig.getDifferentType()!=maxId){
@ -1495,7 +1492,7 @@ public class HeroLogic{
} }
//被动技能加成 //被动技能加成
List<Integer> heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero,teamId); Set<Integer> heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero,teamId);
if(teamId==GlobalsDef.EXPEDITION_TEAM){ if(teamId==GlobalsDef.EXPEDITION_TEAM){
ExpeditionManager expeditionManager = user.getExpeditionManager(); ExpeditionManager expeditionManager = user.getExpeditionManager();

View File

@ -76,7 +76,11 @@ public class BuyGoodsLogic {
if(isDiscount!=0){ if(isDiscount!=0){
price=(int)(sRechargeCommodityConfig.getPrice() * (10 + isDiscount)/10f); price=(int)(sRechargeCommodityConfig.getPrice() * (10 + isDiscount)/10f);
} }
ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),"",price,"","","","",String.valueOf(goodsId),sRechargeCommodityConfig.getBaseReward()); List<Integer> itemList = new ArrayList<>();
for(int[] item:sRechargeCommodityConfig.getBaseReward()){
itemList.add(item[0]);
}
ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),"",price,"","","","",String.valueOf(goodsId),itemList);
// KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,System.currentTimeMillis()+"",result.getResultCode(),price*10); // KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,System.currentTimeMillis()+"",result.getResultCode(),price*10);
} }

View File

@ -20,8 +20,10 @@ public class DataReportTask extends Thread {
// return; // return;
// } // }
try { try {
ReportUserEvent event = ReportUtil.queue.take(); while(true){
ReportUtil.doReport(event); ReportUserEvent event = ReportUtil.queue.take();
ReportUtil.doReport(event);
}
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }