From 3f1ff48f3a4acd022c81a9daaf3ecef914d2bb67 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 30 Jun 2021 11:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E6=84=BF=E6=8A=BD=E5=8D=A1=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/GetPlayerInfoHandler.java | 1 + .../com/ljsd/jieling/logic/hero/HeroLogic.java | 3 ++- .../java/com/ljsd/jieling/util/CBean2Proto.java | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 3653f0d2b..6e6acdab9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -218,6 +218,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ .addAllSealList(CBean2Proto.getPurpleMansionSealInfo(user)) .setDailyredpack(playerInfoManager.getDailyWelfareRedPacket()) .setRandomCount(randomCount) + .addAllDrawTimes(CBean2Proto.getRandomTypeNums(user)) .build(); ReportUtil.onReportEvent(user, ReportEventEnum.APP_LOGIN.getType()); try { 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 6d773ba47..1ae88c7e7 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 @@ -338,7 +338,7 @@ public class HeroLogic{ resultRandom[i] = sLotteryRewardConfig.getReward(); } //记录次数 - heroManager.putRandomCount(sLotterySetting.getLotteryType(),num++); + heroManager.putRandomCount(sLotterySetting.getLotteryType(),num+1); index = i; } //上报抽卡 @@ -369,6 +369,7 @@ public class HeroLogic{ fiveStarPushByRandom(user,resultRandom); fiveStarPokemonPushByRandom(user,resultRandom); builder.setDrop(drop); + builder.addAllDrawTimes(CBean2Proto.getRandomTypeNums(user)); MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE, builder.build(), true); // System.out.println(System.currentTimeMillis()-time); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 32559df33..9254fd3e2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -880,4 +880,19 @@ public class CBean2Proto { }); return list; } + + /** + * 获取类型抽卡总次数 + * @param user + * @return + */ + public static List getRandomTypeNums(User user){ + List list = new ArrayList<>(); + Map countByType = user.getHeroManager().getRandomCountByType(); + for (Map.Entry entry : countByType.entrySet()) { + CommonProto.randomTypeNum.Builder builder = CommonProto.randomTypeNum.newBuilder().setType(entry.getKey()).setNum(entry.getValue()); + list.add(builder.build()); + } + return list; + } }