From 13cb402343737673129d75eb0b416bc24f9dbe1d Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 28 Sep 2019 11:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B8=E8=BF=90=E6=8E=A2=E5=AE=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/core/SimpleTransaction.java | 3 +++ .../activity/GetLuckWheelRandHandler.java | 17 ++++++++++++++++- .../ljsd/jieling/logic/OnlineUserManager.java | 19 ------------------- .../logic/activity/ForceRankActivity.java | 3 ++- .../logic/activity/LuckWheelActivity.java | 7 ++++--- .../jieling/logic/dao/LuckWheelPosInfo.java | 2 +- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/SimpleTransaction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/SimpleTransaction.java index 1610598b4..2bb5c9afe 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/SimpleTransaction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/SimpleTransaction.java @@ -132,6 +132,9 @@ public class SimpleTransaction { tasks.clear(); } + /** + * 合并策略后的协议先发 + */ private void doAddSendCache() { for (Map.Entry entry : combineMsgId.entrySet()) { if (sendCacheMap.containsKey(entry.getKey())) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java index 217c9fa0a..64d256a30 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java @@ -20,6 +20,8 @@ import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import org.springframework.stereotype.Component; +import java.util.*; + /** * Description: 随机转盘奖励 * Author: zsx @@ -63,6 +65,7 @@ public class GetLuckWheelRandHandler extends BaseHandler posSet = new HashSet<>(); int[][] drops = new int[time][]; for (int i = 0; i < time; i++) { @@ -71,16 +74,28 @@ public class GetLuckWheelRandHandler extends BaseHandler rewardPosInfoList = new LinkedList<>(); + for (Integer pos : posSet) { + LuckWheelPosInfo luckWheelPosInfo = luckWheelMission.getPosInfoMap().get(pos); + CommonProto.LuckWheelRewardPosInfo.Builder builder = CommonProto.LuckWheelRewardPosInfo.newBuilder(); + builder.setLuckId(luckWheelPosInfo.getLuckId()); + builder.setPos(pos); + builder.setLuckTimes(luckWheelPosInfo.getProgrss()); + rewardPosInfoList.add(builder.build()); + } + PlayerInfoProto.GetLuckWheelRandRewardResponse.Builder builder = PlayerInfoProto.GetLuckWheelRandRewardResponse.newBuilder(); builder.setActivityId(proto.getActivityId()); builder.setDrop(drop); - builder.setPos(lastpos); + builder.addAllPosInfos(rewardPosInfoList); MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_LUCKWHEEL_RANDREWARD_RESPONSE_VALUE, builder.build(), true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/OnlineUserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/OnlineUserManager.java index 5bcfb4f1c..37463589a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/OnlineUserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/OnlineUserManager.java @@ -1,13 +1,9 @@ package com.ljsd.jieling.logic; -import com.google.common.collect.Sets; -import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.network.session.ISession; -import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; @@ -15,8 +11,6 @@ public class OnlineUserManager { public static Map sessionMap = new ConcurrentHashMap<>(); - public static Map onlineUserMap = new ConcurrentHashMap<>(10000); - public static void userOnline(int uid, ISession session) { sessionMap.put(uid, session); } @@ -35,19 +29,6 @@ public class OnlineUserManager { sessionMap.remove(uid); } - - public static void addPlayerToMap(int uid, PlayerManager player) { - onlineUserMap.putIfAbsent(uid,player); - } - - public static void removePlayerFromMap(int uid) { - onlineUserMap.remove(uid); - } - - public static PlayerManager getPlayerFromMap(int uid) { - return onlineUserMap.get(uid); - } - /** * 通过uid获取Session * @param uid diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java index bfc0d7f67..d55ae9f89 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java @@ -84,7 +84,7 @@ class ForceRankActivity extends AbstractActivity { if (activityMission == null || activityMission.getActivityState() != ActivityType.OPEN_STATE || activityMission.getOpenType() == 0) { continue; } - int missionId = rank2miss.get(rank++); + int missionId = rank2miss.get(rank); ActivityProgressInfo activityProgressInfo = activityMission.getActivityProgressInfoMap().get(missionId); if (activityProgressInfo == null || activityProgressInfo.getState() == ActivityType.HAD_TAKED) { continue; @@ -105,6 +105,7 @@ class ForceRankActivity extends AbstractActivity { String content = SErrorCodeEerverConfig.getI18NMessage("powerrank_activity_txt", new Object[]{rank}); String mailReward = ItemUtil.getMailReward(sActivityRewardConfig.getReward()); MailLogic.getInstance().sendMail(uid, title, content, mailReward, nowTime, Global.MAIL_EFFECTIVE_TIME); + rank++; //暂时不删 // RedisUtil.getInstence().del(key); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelActivity.java index 0b86de4a3..4f7b340cc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelActivity.java @@ -91,12 +91,13 @@ public abstract class LuckWheelActivity extends AbstractActivity { LuckWheelMission luckWheelMission = user.getActivityManager().getLuckWheel(type); for (Map.Entry entry : luckWheelMission.getPosInfoMap().entrySet()) { int luckId = entry.getValue().getLuckId(); - int limitnum = SDialRewardConfig.getsDialRewardConfigMap().get(luckId).getLimitNum(); - if (limitnum != 0 && entry.getValue().getProgrss() >= SDialRewardConfig.getsDialRewardConfigMap().get(luckId).getLimitNum()) - continue; +// int limitnum = SDialRewardConfig.getsDialRewardConfigMap().get(luckId).getLimitNum(); +// if (limitnum != 0 && entry.getValue().getProgrss() >= SDialRewardConfig.getsDialRewardConfigMap().get(luckId).getLimitNum()) +// continue; CommonProto.LuckWheelRewardPosInfo.Builder builder = CommonProto.LuckWheelRewardPosInfo.newBuilder(); builder.setLuckId(entry.getValue().getLuckId()); builder.setPos(entry.getKey()); + builder.setLuckTimes(entry.getValue().getProgrss()); rewardPosInfoList.add(builder.build()); } return rewardPosInfoList; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelPosInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelPosInfo.java index cae4b55ef..976a21ae5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelPosInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelPosInfo.java @@ -26,7 +26,7 @@ public class LuckWheelPosInfo { } public void addProgrss() { - this.progrss = +1; + this.progrss +=1; } public int getLuckId() {