From ec0000e220c9d410eaf0cf4a8f428ffa5d5906a9 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 20 Aug 2019 08:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=8D=81=E8=BF=9E?= =?UTF-8?q?=E6=8A=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/core/HandlerLogicThread.java | 2 ++ .../jieling/handler/GetPlayerInfoHandler.java | 1 + .../com/ljsd/jieling/logic/dao/HeroManager.java | 12 ++++++++++++ .../com/ljsd/jieling/logic/hero/HeroLogic.java | 16 ++++------------ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java index 1c0e605d4..39df40822 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java @@ -78,6 +78,8 @@ public class HandlerLogicThread extends Thread{ whiteMsg.add(MessageTypeProto.MessageType.SERVER_FIVE_REQEUST_VALUE); whiteMsg.add(MessageTypeProto.MessageType.SERVER_ZERO_REQUEST_VALUE); + whiteMsg.add(MessageTypeProto.MessageType.FAMILY_FIGHT_ROUND_INFO_REQUEST_VALUE); + 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 3020a277b..b440bd5a1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -122,6 +122,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ .setHadBuyTreasure(playerInfoManager.getHadBuyTreasure()) .setTreasureScore(playerInfoManager.getTreasureScore()) .setSignInInfo(CommonProto.SignInInfo.newBuilder().setDays(playerInfoManager.getSign()+1).setState(playerInfoManager.getSignTotay()).build()) + .setFirstTenth(user.getHeroManager().getFirstTenth()) .build(); try { MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index ad4d6bc66..9aadf029b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -15,6 +15,8 @@ public class HeroManager extends MongoBase { Map heroHandBook; + private int firstTenth; + public HeroManager() { heroMap = new HashMap(); @@ -74,4 +76,14 @@ public class HeroManager extends MongoBase { public Map getHeroHandBook() { return heroHandBook; } + + public int getFirstTenth() { + return firstTenth; + } + + public void updateFirstTenth() { + this.firstTenth = 1; + updateString("firstTenth" , 1); + + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index b1523d79f..4e437ed6c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1,22 +1,16 @@ package com.ljsd.jieling.logic.hero; import com.ljsd.GameApplication; -import com.ljsd.common.mogodb.util.GlobalData; import com.ljsd.jieling.chat.logic.ChatLogic; import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.core.VipPrivilegeType; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.ktbeans.KtEventUtils; -import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; -import com.ljsd.jieling.logic.activity.ActivityLogic; -import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.activity.event.HeroUpStarEvent; import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.fight.CombatLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.network.session.ISession; @@ -24,13 +18,9 @@ import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.HeroInfoProto; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.util.*; -import com.sun.org.apache.regexp.internal.RE; -import org.omg.CORBA.PUBLIC_MEMBER; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.logging.Slf4JLoggingSystem; -import java.rmi.ServerError; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -147,11 +137,13 @@ public class HeroLogic { int uid = session.getUid(); User user = UserManager.getUser(uid); SLotterySetting sLotterySetting = SLotterySetting.getsLotterySettingMap().get(type); - + HeroManager heroManager = user.getHeroManager(); + if(type==11&&heroManager.getFirstTenth()==0){ + heroManager.updateFirstTenth(); + } //筛选卡池 int pooId =0; int perCount = sLotterySetting.getPerCount(); - HeroManager heroManager = user.getHeroManager(); if(heroManager!=null&& heroManager.getHeroMap()!=null){ if(heroManager.getHeroMap().size() + perCount > SGameSetting.getGameSetting().getHeroNumlimit()){ MessageUtil.sendErrorResponse(session, 0, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE,"超出数量上限");