diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/QiMenDunJiaDrawHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/QiMenDunJiaDrawHandler.java index 1c1b0a8ca..99d757a7a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/QiMenDunJiaDrawHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/QiMenDunJiaDrawHandler.java @@ -32,6 +32,6 @@ public class QiMenDunJiaDrawHandler extends BaseHandler hits = new ArrayList<>(); List list = new ArrayList<>(); - // 小圈抽奖,根据返回判断是否需要抽外圈 - boolean result = qiMenRandom(user, activityId,2, list, hits); - if (result){ - // 大圈/外圈抽奖 - qiMenRandom(user, activityId, 1, list, hits); + for (int i = 0; i < num; i++) { + // 小圈抽奖,根据返回判断是否需要抽外圈 + boolean result = qiMenRandom(user, activityId,2, list, hits); + if (result){ + // 大圈/外圈抽奖 + qiMenRandom(user, activityId, 1, list, hits); + } } // 处理奖励 int[][] rewards = Utils.changeList(list); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 6232e283d..86c1527de 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -80,6 +80,7 @@ public interface ActivityType { int JADE_DYNASTY_SHOP = 20001;//破阵诛仙限时商市 int JADE_DYNASTY_RARE_SHOP = 20002;//破阵诛仙珍奇宝阁 int CHOICE_DRAW_CRAD = 20003;//心愿抽奖(选择抽卡) + int LING_LONG_PAVILION = 20005;//玲珑宝阁 int ITEMS_STORE= 6000;//百宝商会 int TRIAL_EXPERT = 70;//幻境达人 int SHEJI_ACTIVITY = 60;//社稷大典 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 0aed3e43c..4dfc20183 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -84,6 +84,7 @@ public enum ActivityTypeEnum { THEME_ACTIVITY_SHOP(ActivityType.THEME_ACTIVITY_SHOP,DefaultEmptyActivity::new), XUN_BAO_MI_ZONG(ActivityType.XUN_BAO_MI_ZONG,XunBaoMiZongActivity::new), SEVEN_WORLD_TREASURE(ActivityType.SEVEN_WORLD_TREASURE,SevenWorldActivity::new), + LING_LONG_PAVILION(ActivityType.LING_LONG_PAVILION,DefaultEmptyActivity::new), ; private int type; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/TimeLimitWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/TimeLimitWelfareBag.java index dbe0f10bd..760615926 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/TimeLimitWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/TimeLimitWelfareBag.java @@ -1,23 +1,16 @@ package com.ljsd.jieling.logic.store.newRechargeInfo.bean; -import com.ljsd.GameApplication; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.util.KeyGenUtils; -import com.ljsd.jieling.util.UUIDEnum; -import config.SGlobalActivity; import config.SRechargeCommodityNewConfig; import util.TimeUtils; -import java.util.List; -import java.util.concurrent.TimeUnit; - /** * 时限礼包(活动) */ public class TimeLimitWelfareBag extends AbstractWelfareBag { - public TimeLimitWelfareBag(User user, SRechargeCommodityNewConfig config) throws Exception{ + public TimeLimitWelfareBag(User user, SRechargeCommodityNewConfig config){ super(user,config); for(String[] I : getCondition()){ if(I[0].equals("3")){