From 63b2d8730aeb807f7d4d10e66ec873b7499bbc84 Mon Sep 17 00:00:00 2001 From: "DESKTOP-C3M45P4\\dengdan" Date: Tue, 11 Nov 2025 15:06:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=95=E5=AE=9D=E8=81=9A?= =?UTF-8?q?=E7=81=B5=E6=8A=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=AF=8F=E5=91=A8?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=97=A5=E6=9C=9F=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/DesireDrawCardHandler.java | 6 +++ .../jieling/handler/GetPlayerInfoHandler.java | 5 +++ .../handler/GetWishDrawCardInfoHandler.java | 4 ++ .../jieling/logic/GlobalDataManaager.java | 5 +++ .../jieling/logic/activity/ActivityLogic.java | 20 +++++++++ .../jieling/logic/store/BuyGoodsNewLogic.java | 13 +++++- .../newRechargeInfo/PushRechargeType.java | 2 + .../src/main/java/config/STrumpLottery.java | 45 +++++++++++++++++++ 8 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 tablemanager/src/main/java/config/STrumpLottery.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/DesireDrawCardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/DesireDrawCardHandler.java index eeeb44c2e..e50918f6e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/DesireDrawCardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/DesireDrawCardHandler.java @@ -47,6 +47,12 @@ public class DesireDrawCardHandler extends BaseHandler trumpList = ActivityLogic.getInstance().getDesireOpenTrumpList(); + if (trumpList.contains(tempId) || tempId == 0){ + playerManager.putDesireDraw(type, tempId); + } + break; default: throw new ErrorCodeException(ErrorCode.SYS_ERROR_CODE); } 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 3dacfbac2..75d747fac 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -98,6 +98,11 @@ public class GetPlayerInfoHandler extends BaseHandler{ long haveTime = now - openTime; int nowDay = (int)(haveTime/TimeUtils.ONE_DAY) + 1; BuyGoodsNewLogic.openPush(iSession, user, PushRechargeType.OPEN_DAY.getType(),nowDay); + Calendar calendar = Calendar.getInstance(); + int hour = calendar.get(Calendar.HOUR_OF_DAY); + int minute = calendar.get(Calendar.MINUTE); + int w = calendar.get(Calendar.DAY_OF_WEEK) - 1; + BuyGoodsNewLogic.openPush(iSession, user, PushRechargeType.WEEK_DAY.getType(),w); playerInfoManager.setLoginTime(now); List list = new ArrayList<>(); Map guidePoints = playerInfoManager.getGuidePoints(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetWishDrawCardInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetWishDrawCardInfoHandler.java index 7e942b556..1aeb84b6a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetWishDrawCardInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetWishDrawCardInfoHandler.java @@ -41,6 +41,10 @@ public class GetWishDrawCardInfoHandler extends BaseHandler map = STrumpLottery.map; + for (STrumpLottery lottery : map.values()) { + long start = TimeUtils.stringToTimeLong(lottery.getStartTime(), TimeUtils.Stand_CeHua_Data_format); + long end = TimeUtils.stringToTimeLong(lottery.getEndtime(), TimeUtils.Stand_CeHua_Data_format); + if (now >= start && now < end){ + result = Arrays.stream(lottery.getDrop()).boxed().collect(Collectors.toSet()); + break; + } + } + return result; + } + + /** + * 获取新加入的心愿法宝聚灵 + */ + public Set getDesireOpenTrumpList() { + Set result = new HashSet<>(); + // 当前时间戳 + long now = TimeUtils.now(); + Map map = SEquipTalismanaLottery.map; for (SEquipTalismanaLottery lottery : map.values()) { long start = TimeUtils.stringToTimeLong(lottery.getStartTime(), TimeUtils.Stand_CeHua_Data_format); 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 d1386dcff..e33f1f9c1 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 @@ -1025,7 +1025,8 @@ public class BuyGoodsNewLogic { type == PushRechargeType.XUNAXIAN_ZHOAHUAN.getType() || type == PushRechargeType.XIANDOU_ZHOAHUAN.getType() || type == PushRechargeType.QIANNENG_UP.getType()|| - type == PushRechargeType.OPEN_DAY.getType()){ + type == PushRechargeType.OPEN_DAY.getType()|| + type == PushRechargeType.WEEK_DAY.getType()){ int[] bagIds = judgePushConditionMulti(user,con,true); // todo DayPushNum和AllPuthNum可以放到redis里操作 if (statistics >0 && info.getDayPushNum(pushId)>= statistics && count > 0 && info.getAllPuthNum(pushId)>= count){ @@ -1180,6 +1181,16 @@ public class BuyGoodsNewLogic { return false; } break; + case 21://每周指定日期礼包 + int dayOfWeek = condition[1]; + Calendar calendar = Calendar.getInstance(); + int hour = calendar.get(Calendar.HOUR_OF_DAY); + int minute = calendar.get(Calendar.MINUTE); + int w = calendar.get(Calendar.DAY_OF_WEEK) - 1; + if(w != dayOfWeek){ + return false; + } + break; default:break; } return true; 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 a8e520e00..661a7184d 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 @@ -45,6 +45,8 @@ public enum PushRechargeType { QIANNENG_UP(19), //开服天数 OPEN_DAY(20), + //每周指定天数 + WEEK_DAY(21), ; private int type; diff --git a/tablemanager/src/main/java/config/STrumpLottery.java b/tablemanager/src/main/java/config/STrumpLottery.java new file mode 100644 index 000000000..fa291bb69 --- /dev/null +++ b/tablemanager/src/main/java/config/STrumpLottery.java @@ -0,0 +1,45 @@ +package config; + +import manager.STableManager; +import manager.Table; + +import java.util.HashMap; +import java.util.Map; + +@Table(name ="TrumpLottery") +public class STrumpLottery implements BaseConfig { + + private int id; + + private int[] drop; + + private String startTime; + + private String endtime; + + public static Map map = new HashMap<>(); + + @Override + public void init() throws Exception { + map = STableManager.getConfig(STrumpLottery.class); + } + + + public int getId() { + return id; + } + + public int[] getDrop() { + return drop; + } + + public String getStartTime() { + return startTime; + } + + public String getEndtime() { + return endtime; + } + + +} \ No newline at end of file