From 68726ee38d7800ef0f525802e6ad397b586ff9df Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Mon, 10 Jul 2023 16:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/BuyGoldActivity.java | 3 --- .../logic/expedition/ExpeditionLogic.java | 11 +++++------ .../ljsd/jieling/logic/player/PlayerLogic.java | 17 ++++++++++------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java index 13db02694..f29ae8a97 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java @@ -18,7 +18,6 @@ class BuyGoldActivity extends AbstractActivity { public BuyGoldActivity(int id) { super(id); -// Poster.getPoster().listenEvent(this, UserOnlineEvent.class); Poster.getPoster().listenEvent(this, GoldRefreshEvent.class); } @@ -34,8 +33,6 @@ class BuyGoldActivity extends AbstractActivity { listValue.add(151); listValue.add(152); listValue.forEach(type -> { -// SPrivilegeTypeConfig.privilegeByType.get(type).forEach(sPrivilegeTypeConfig -> { -// int innerId = sPrivilegeTypeConfig.getId(); ids.add(type); if (!user.getPlayerInfoManager().containPrivilageId(type)) user.getPlayerInfoManager().addVipByTime(type, time); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index a6d82d2b7..742137441 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -38,7 +38,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * Description: 远征 猎妖之路 + * Description: 大闹天宫 * Author: zsx * CreateDate: 2020/1/7 11:46 * @@ -471,13 +471,12 @@ public class ExpeditionLogic { integers.add(sortId+1); return integers; } - if(sortId==0){ integers.add(1); integers.add(2); return integers; } - int mod = sortId%5; + int mod = sortId % 5; if(mod==0){ integers.add(sortId+2); return integers; @@ -528,14 +527,14 @@ public class ExpeditionLogic { } private static void checkAndResetTreasure(User user) throws Exception { -// SExpeditionSetting sExpeditionSetting = STableManager.getConfig(SExpeditionSetting.class).get(1); WorldTreasureReward worldTreasureReward = user.getExpeditionManager().getWorldTreasureReward(); - if(worldTreasureReward.getFirstStartTime()>TimeUtils.nowInt()){ + int nowInt = TimeUtils.nowInt(); + if(worldTreasureReward.getFirstStartTime()> nowInt){ return; } int createTime =worldTreasureReward.getCreateTime(); //重置 - if(TimeUtils.nowInt()>=createTime){ + if(nowInt >=createTime){ user.getExpeditionManager().resetTreasureReward(); // 天宫秘宝礼包刷新 ReceiveWelfareBag bagInfo = (ReceiveWelfareBag) user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(106); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 2f9f5d121..ee1ffcf3d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -406,13 +406,16 @@ public class PlayerLogic { public Set getPrivilege(User user, Collection collection) { Map vipInfo = user.getPlayerInfoManager().getVipInfo(); - return vipInfo.entrySet().stream() - .filter(integerVipInfoEntry -> collection.contains(integerVipInfoEntry.getKey())) - .map(integerVipInfoEntry -> CommonProto.Privilege.newBuilder() - .setId(integerVipInfoEntry.getKey()) - .setUsedTimes(integerVipInfoEntry.getValue().getCount()) - .setEffectTime(integerVipInfoEntry.getValue().getEffectTime()) - .build()).collect(Collectors.toSet()); + HashSet set = new HashSet<>(); + for (Map.Entry entry : vipInfo.entrySet()) { + Integer key = entry.getKey(); + VipInfo value = entry.getValue(); + if (collection.contains(key)){ + CommonProto.Privilege build = CommonProto.Privilege.newBuilder().setId(key).setUsedTimes(value.getCount()).setEffectTime(value.getEffectTime()).build(); + set.add(build); + } + } + return set; } public void sendVipDailyOrLevelUpReward(User user, int reson) throws Exception {