From 0cf0f239d03334291654f51661bab2409c4bfa02 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Thu, 2 Sep 2021 13:46:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E7=89=A9=E5=93=81=E8=B4=A8=20?= =?UTF-8?q?=E5=AE=9D=E7=89=A9=E7=B2=BE=E7=82=BC=20=E8=BD=A9=E8=BE=95?= =?UTF-8?q?=E5=AE=9D=E5=A2=83=20=E7=A4=BC=E5=8C=85=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/SituationLogic.java | 4 ++- .../ljsd/jieling/logic/item/ItemLogic.java | 4 +++ .../jieling/logic/store/BuyGoodsNewLogic.java | 7 ----- .../newRechargeInfo/PushRechargeType.java | 27 +++++++++++++++++++ .../java/com/ljsd/jieling/util/ItemUtil.java | 6 +++++ .../main/java/config/SRaceTowerConfig.java | 6 +++++ 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java index 4799234c6..4535b791c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java @@ -22,6 +22,8 @@ import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.rank.RankContext; import com.ljsd.jieling.logic.rank.RankEnum; import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; +import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; import rpc.protocols.CommonProto; import rpc.protocols.MapInfoProto; @@ -290,7 +292,7 @@ public class SituationLogic { } // 埋点报送 ReportUtil.onReportEvent(user, ReportEventEnum.START_SKY_REALM.getType(), sRaceTowerConfig.getType(),id,combat_results,dropResult); - + BuyGoodsNewLogic.openPush(session, user, PushRechargeType.XIANYUAN_BAOJING.getType(), sRaceTowerConfig.getQuality(), 1); // user.getUserMissionManager().onGameEvent(user, GameEvent.DAILY_CHALLENGE,sDailyChallengeConfig.getType()); MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index b58507844..a3808565f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -25,6 +25,8 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.hero.HongMengFunctionEnum; import com.ljsd.jieling.logic.mission.GameEvent; +import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.ItemMap; @@ -889,6 +891,8 @@ public class ItemLogic { jewel.setLevel(jewel.getLevel() + 1); } else {//精炼 jewel.setBuildLevel(jewel.getBuildLevel() + 1); + + BuyGoodsNewLogic.openPush(iSession, user, PushRechargeType.BAOWU_JINGLIAN.getType(), jewel.getBuildLevel(), 1); } if (HeroLogic.getInstance().isInTeam(user, jewel.getHeroId(), 1)) { Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(user.getId())); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 9ba89369d..52fe2a294 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -768,9 +768,7 @@ public class BuyGoodsNewLogic { int popup = 0; boolean push = false; for(SPackPushConfig con : list){ - LOGGER.info("判断的id:{}",con.getId()); int bagId = judgePushCondition(user,con); - LOGGER.info("判断结果为:{}",bagId); //条件成功 if(bagId > 0 && info.getNextPushTime() < System.currentTimeMillis()){ popup = bagId; @@ -803,25 +801,21 @@ public class BuyGoodsNewLogic { if(scope[0] == 1){//主线关卡 int mainLevel = user.getMainLevelManager().getFightId(); if(mainLevel < scope[1]){ - LOGGER.info("aaaa"); return -1; } }else if(scope[0] == 2){//爬塔 int towerLevel = con.getConditionId()[1]; if(towerLevel < scope[1]){ - LOGGER.info("bbbb"); return -1; } }else if(scope[0] == 3){//玩家等级 int level = user.getPlayerInfoManager().getLevel(); if(level < scope[1]){ - LOGGER.info("cccc"); return -1; } }else if(scope[0] == 7){ double mxr = user.getPlayerInfoManager().getNewRechargeInfo().getMaxSingleR(); if(mxr < scope[1]){ - LOGGER.info("dddd"); return -1; } } @@ -834,7 +828,6 @@ public class BuyGoodsNewLogic { } } if(con.getPersonas()[index] > rr){ - LOGGER.info("eeee"); return -1; } return con.getPacks()[index]; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/PushRechargeType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/PushRechargeType.java index 243dad810..c27995102 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/PushRechargeType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/PushRechargeType.java @@ -1,6 +1,27 @@ package com.ljsd.jieling.logic.store.newRechargeInfo; public enum PushRechargeType { + + /** + * 1 关卡通过 主线关卡 + * 2 关卡通过 爬塔 + * 3 用户养成 玩家等级 + * 4 道具获取 卡牌星级 + * 5 关卡失败累计 + * 6 爬塔失败累计 + * 7 一次性支付过XX元 + * 8 用户养成 灵兽品质 + * 9 用户养成 灵兽星级 + * 10 购买指定礼包 + * + * 11 道具获取 宝物品质 + * 12 用户养成 宝物进阶 + * 13 关卡通过 轩辕宝境 + * 14 关卡通过 4灵试炼 + * 15 用户养成 宝物神应 + */ + + main_line(1), tower(2), user_level(3), @@ -11,6 +32,12 @@ public enum PushRechargeType { pokemon_quality(8), pokemon_star(9), point_recharge(10), + + BAOWU_PINGZHI(11), + BAOWU_JINGLIAN(12), + XIANYUAN_BAOJING(13), + FORE_SHILIAN(14), + BAOWU_SHENYING(15), ; private int type; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 8d2101677..38722c32c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -30,6 +30,7 @@ import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; import rpc.protocols.CommonProto; import rpc.protocols.MessageTypeProto; @@ -1207,6 +1208,11 @@ public class ItemUtil { equipManager.addEquip(user,equip); jewelList.add(CBean2Proto.getEquipProto(equip)); msgTem="lamp_lottery_equip_content"; + + ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); + if (sessionByUid != null) { + BuyGoodsNewLogic.openPush(sessionByUid, user, PushRechargeType.BAOWU_PINGZHI.getType(), item.getQuantity(), 1); + } } if (item.getQuantity() >= SSpecialConfig.getIntegerValue(msgTem+"_parm")) { String nickName = user.getPlayerInfoManager().getNickName(); diff --git a/tablemanager/src/main/java/config/SRaceTowerConfig.java b/tablemanager/src/main/java/config/SRaceTowerConfig.java index 35b916133..31fb4492f 100644 --- a/tablemanager/src/main/java/config/SRaceTowerConfig.java +++ b/tablemanager/src/main/java/config/SRaceTowerConfig.java @@ -14,6 +14,8 @@ public class SRaceTowerConfig implements BaseConfig { private int openRules; + private int quality; + private int[] reward; private int[] firstReward; @@ -74,4 +76,8 @@ public class SRaceTowerConfig implements BaseConfig { public int getFormation() { return formation; } + + public int getQuality() { + return quality; + } } \ No newline at end of file