From 1b4426b9e40eca4b87c175ac256291d3948ffb4a Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 22 Sep 2021 18:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityLogic.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 8342da2e9..d7f876ff6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -1731,13 +1731,11 @@ public class ActivityLogic implements IEventHandler{ ActivityProto.qiMenDunJiaDrawResponse.Builder response = ActivityProto.qiMenDunJiaDrawResponse.newBuilder(); ArrayList hits = new ArrayList<>(); List list = new ArrayList<>(); - // 根据返回判断是否需要抽外圈 - boolean result = qiMenRandom(user, 2, list, hits); + // 小圈抽奖,根据返回判断是否需要抽外圈 + boolean result = qiMenRandom(user, activityId,2, list, hits); if (result){ - // 外圈抽奖 - qiMenRandom(user, 1, list, hits); - // 事件分发 - Poster.getPoster().dispatchEvent(new QiMenDunJiaEvent(user.getId(),activityId,1)); + // 大圈/外圈抽奖 + qiMenRandom(user, activityId, 1, list, hits); } // 处理奖励 int[][] rewards = Utils.changeList(list); @@ -1774,7 +1772,7 @@ public class ActivityLogic implements IEventHandler{ * @param hits 抽中的索引id * @return true:需要进行外圈抽奖 false:不需要外圈抽奖 */ - private boolean qiMenRandom(User user, int type, List list, List hits){ + private boolean qiMenRandom(User user,int activityId, int type, List list, List hits){ boolean result = false; // 根据类型获取卡池 @@ -1810,6 +1808,10 @@ public class ActivityLogic implements IEventHandler{ // 外圈抽奖用,抽中全部 if (rewardPool.size() >= SLingLongPool.map.get(type).size()){ + if (type == 1){ + // 事件分发 + Poster.getPoster().dispatchEvent(new QiMenDunJiaEvent(user.getId(),activityId,1)); + } rewardPool.clear(); }