diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index f3705d8a1..71e230247 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -33,11 +33,6 @@ public class HeroManager extends MongoBase { 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 map){ randomPoolByType.put(type,map); updateString("randomPoolByType." + type, map); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 5e8e192ae..1aed856c8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -744,8 +744,8 @@ public class CombatLogic { return ""; } - public List passiveskillEffect(User user,Hero targetHero,int teamId){ - List passiveskillEffect = new ArrayList<>(); + public Set passiveskillEffect(User user,Hero targetHero,int teamId){ + Set passiveskillEffect = new HashSet<>(); List heroSkillList = HeroLogic.getInstance().getHeroSkillList(user, targetHero); heroSkillList.forEach(skill->{ SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill); @@ -772,7 +772,7 @@ public class CombatLogic { List heroSkillListTmp = HeroLogic.getInstance().getHeroSkillList(user, hero); heroSkillListTmp.forEach(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()); } }); @@ -789,7 +789,7 @@ public class CombatLogic { }else{ heroSkillList.forEach(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()); } }); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 466f522fd..217507430 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -325,7 +325,6 @@ public class HeroLogic{ } } SLotteryRewardConfig sLotteryRewardConfig; - boolean isBestCard = false; //是否有必出 if(mustSet.isEmpty()){ sLotteryRewardConfig = randomHeroByPoolId(getPooId(sLotterySetting), 1, user.getPlayerInfoManager().getLevel()); @@ -333,7 +332,6 @@ public class HeroLogic{ if(randomPoolByType.get(mergePool)!=null) { for (int key : randomPoolByType.get(mergePool).keySet()) { if (star == key) { - isBestCard = true; randomPoolByType.get(mergePool).put(key, 0); } else { int curValue = randomPoolByType.get(mergePool).getOrDefault(key, 0); @@ -349,7 +347,6 @@ public class HeroLogic{ maxId = mustId>maxId?mustId:maxId; } System.out.println("触发必出"+maxId); - isBestCard = true; SLotterySpecialConfig onConfig = null; for(SLotterySpecialConfig everyConfig:specialConfigs){ if(everyConfig.getDifferentType()!=maxId){ @@ -1495,7 +1492,7 @@ public class HeroLogic{ } //被动技能加成 - List heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero,teamId); + Set heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero,teamId); if(teamId==GlobalsDef.EXPEDITION_TEAM){ ExpeditionManager expeditionManager = user.getExpeditionManager(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 65ba9bd67..c96138bf6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -76,7 +76,11 @@ public class BuyGoodsLogic { if(isDiscount!=0){ price=(int)(sRechargeCommodityConfig.getPrice() * (10 + isDiscount)/10f); } - ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),"",price,"","","","",String.valueOf(goodsId),sRechargeCommodityConfig.getBaseReward()); + List 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); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java index ee985df4f..e4705a520 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java @@ -20,8 +20,10 @@ public class DataReportTask extends Thread { // return; // } try { - ReportUserEvent event = ReportUtil.queue.take(); - ReportUtil.doReport(event); + while(true){ + ReportUserEvent event = ReportUtil.queue.take(); + ReportUtil.doReport(event); + } } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index 2082d7612..c2a433a15 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -304,13 +304,17 @@ public class FightDataUtil { int skillDisplay =sSkillLogicVo.getSkillDisplay(); SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay); int KeyFrame = sCombatControl.getKeyFrame(); + int SkillDuration = sCombatControl.getSkillDuration(); + int SkillNumber = sCombatControl.getSkillNumber(); effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId())); effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f)); + effect.rawset(3, LuaValue.valueOf(SkillDuration/1000f)); + effect.rawset(4, LuaValue.valueOf(SkillNumber)); List effectValueList = getEffectArgs(skillTargetVos.getEffectVale()); int size = effectValueList.size(); if (size > 0) { for (int i = 0; i < size; i++) { - effect.rawset(i + 3, effectValueList.get(i)); + effect.rawset(i + 5, effectValueList.get(i)); } } effectList.add(effect); diff --git a/tablemanager/src/main/java/config/SCombatControl.java b/tablemanager/src/main/java/config/SCombatControl.java index b9c6ef3e2..7de2b12e7 100644 --- a/tablemanager/src/main/java/config/SCombatControl.java +++ b/tablemanager/src/main/java/config/SCombatControl.java @@ -12,7 +12,10 @@ public class SCombatControl implements BaseConfig { private int keyFrame; - + private int skillDuration; + + private int skillNumber; + @Override public void init() throws Exception { @@ -27,5 +30,11 @@ public class SCombatControl implements BaseConfig { return keyFrame; } + public int getSkillDuration() { + return skillDuration; + } + public int getSkillNumber() { + return skillNumber; + } } \ No newline at end of file