Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
ff2593d4de
|
@ -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);
|
||||||
|
|
|
@ -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());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,10 @@ public class DataReportTask extends Thread {
|
||||||
// return;
|
// return;
|
||||||
// }
|
// }
|
||||||
try {
|
try {
|
||||||
|
while(true){
|
||||||
ReportUserEvent event = ReportUtil.queue.take();
|
ReportUserEvent event = ReportUtil.queue.take();
|
||||||
ReportUtil.doReport(event);
|
ReportUtil.doReport(event);
|
||||||
|
}
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
|
@ -304,13 +304,17 @@ public class FightDataUtil {
|
||||||
int skillDisplay =sSkillLogicVo.getSkillDisplay();
|
int skillDisplay =sSkillLogicVo.getSkillDisplay();
|
||||||
SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay);
|
SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay);
|
||||||
int KeyFrame = sCombatControl.getKeyFrame();
|
int KeyFrame = sCombatControl.getKeyFrame();
|
||||||
|
int SkillDuration = sCombatControl.getSkillDuration();
|
||||||
|
int SkillNumber = sCombatControl.getSkillNumber();
|
||||||
effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId()));
|
effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId()));
|
||||||
effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f));
|
effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f));
|
||||||
|
effect.rawset(3, LuaValue.valueOf(SkillDuration/1000f));
|
||||||
|
effect.rawset(4, LuaValue.valueOf(SkillNumber));
|
||||||
List<LuaValue> effectValueList = getEffectArgs(skillTargetVos.getEffectVale());
|
List<LuaValue> effectValueList = getEffectArgs(skillTargetVos.getEffectVale());
|
||||||
int size = effectValueList.size();
|
int size = effectValueList.size();
|
||||||
if (size > 0) {
|
if (size > 0) {
|
||||||
for (int i = 0; i < size; i++) {
|
for (int i = 0; i < size; i++) {
|
||||||
effect.rawset(i + 3, effectValueList.get(i));
|
effect.rawset(i + 5, effectValueList.get(i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
effectList.add(effect);
|
effectList.add(effect);
|
||||||
|
|
|
@ -12,6 +12,9 @@ public class SCombatControl implements BaseConfig {
|
||||||
|
|
||||||
private int keyFrame;
|
private int keyFrame;
|
||||||
|
|
||||||
|
private int skillDuration;
|
||||||
|
|
||||||
|
private int skillNumber;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() throws Exception {
|
public void init() throws Exception {
|
||||||
|
@ -27,5 +30,11 @@ public class SCombatControl implements BaseConfig {
|
||||||
return keyFrame;
|
return keyFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getSkillDuration() {
|
||||||
|
return skillDuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSkillNumber() {
|
||||||
|
return skillNumber;
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue