From cf11f258596e549483eb37a0ee202005784269b4 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Fri, 29 Oct 2021 00:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=9A=E7=A4=BC=E6=9C=88?= =?UTF-8?q?=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/globals/Global.java | 1 + .../CrossYuxulundaoChallengeHandler.java | 20 +++++++++++++++---- .../ljsd/jieling/logic/dao/PlayerManager.java | 2 ++ .../jieling/logic/store/BuyGoodsNewLogic.java | 11 +++++++++- .../newRechargeInfo/NewRechargeInfo.java | 11 ++++++++++ 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java index 0bebf29f2..b5fae96ab 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java @@ -76,4 +76,5 @@ public interface Global { int MONTHCARDID =1;//1月卡 int LMONTHCARDID =2;//2豪华月卡 + int SINCERECARDID =3;//3挚礼月卡 } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index 16ba5176b..91fb76e62 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -75,12 +75,12 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler yuxuTeamId = Lists.newArrayList(); yuxuTeamId.add(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE); yuxuTeamId.add(GlobalsDef.CROSS_YU_XU_LUN_DAO_TWO); @@ -373,6 +373,18 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler> teamPosForHero = user.getTeamPosManager().getTeamPosForHero(); if(!teamPosForHero.containsKey(myteamId[i]) || teamPosForHero.get(myteamId[i]).size() == 0){ result[i] = 0; + CommonProto.FightTeamInfo defteamInfo = FightUtil.makeCrossPersonData(csPlayer, defTeamId[i], arenaRecord, crossArenaManager); + CommonProto.FightData build = CommonProto.FightData.newBuilder() + .addMonsterList(defteamInfo).build(); + //数据互换 + byte[] snapRecord = build.toByteArray(); + if (i == 0) { + arenaRecord.setYxldFightData1(snapRecord); + } else if (i == 1) { + arenaRecord.setYxldFightData2(snapRecord); + } else if (i == 2) { + arenaRecord.setYxldFightData3(snapRecord); + } if (GameApplication.serverId == csPlayer.getServerId()) { User defuser = UserManager.getUser(csPlayer.getUserId()); int addforce = HeroLogic.getInstance().calTeamTotalForce(defuser, myteamId[i], false); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 0950f922c..95b76399f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -915,6 +915,8 @@ public class PlayerManager extends MongoBase { newRechargeInfo.setMonthRr(0); }else if(key ==Global.LMONTHCARDID){ newRechargeInfo.setsMonthRr(0); + }else if(key ==Global.SINCERECARDID){ + newRechargeInfo.setSinceremonth(0); } } } 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 d3a331c7f..b629a0bb3 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 @@ -406,11 +406,12 @@ public class BuyGoodsNewLogic { } /** - * 激活月卡 + * 激活月卡 //TODO 孟某某写的啥玩意 咋兼容老数据 后人注意这块 新加的月卡 策划大大讨论后从0开始计算 */ public static void activeMonthCard(User user,double price,NewRechargeInfo info){ int monthline = STableManager.getConfig(SMonthcardConfig.class).get(Global.MONTHCARDID).getPrice(); int lmonthline = STableManager.getConfig(SMonthcardConfig.class).get(Global.LMONTHCARDID).getPrice(); + int sinceremonthline = STableManager.getConfig(SMonthcardConfig.class).get(Global.SINCERECARDID).getPrice(); boolean sendneed =false; if(info.getMonthRr()= sinceremonthline){ + sendneed=true; + user.getPlayerInfoManager().putMonthCard(Global.SINCERECARDID, (int) (System.currentTimeMillis() / 1000)); + } + } if(sendneed){ ISession session = OnlineUserManager.sessionMap.get(user.getId()); if(session!=null){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java index bb9973881..b296d99e9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java @@ -16,6 +16,8 @@ public class NewRechargeInfo extends MongoBase { private double monthRr ; //月卡累计总额 private double sMonthRr ; //豪华月卡累计总额 + private double sinceremonth ; //挚礼月卡累计总额 + private boolean isFirst;//是否首冲过 private long firstTime;//首冲时间 @@ -121,6 +123,15 @@ public class NewRechargeInfo extends MongoBase { updateString("sMonthRr",sMonthRr); } + public double getSinceremonth() { + return sinceremonth; + } + + public void setSinceremonth(double sinceremonth) { + this.sinceremonth = sinceremonth; + updateString("sinceremonth",sinceremonth); + } + public boolean getIsFirst() { return isFirst; }