From 195409ee4e82d2dd9000f62dbfaad87c54c2d5f5 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sun, 1 Sep 2019 17:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E8=A6=81=E5=8F=98=E5=BC=BA=E3=80=81?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/config/SGuildLevelConfig.java | 4 ++-- .../handler/activity/ToBeStrongerHandler.java | 21 +++++++++++++++++++ .../jieling/logic/activity/ActivityLogic.java | 14 ++++++++++++- .../ljsd/jieling/logic/family/GuildLogic.java | 10 ++++----- 4 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGuildLevelConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGuildLevelConfig.java index 6848672cb..b428137b3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGuildLevelConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGuildLevelConfig.java @@ -14,7 +14,7 @@ public class SGuildLevelConfig implements BaseConfig { private int num; - private int[] shopSort; + private int shopSort; private int officalNum; @@ -39,7 +39,7 @@ public class SGuildLevelConfig implements BaseConfig { return num; } - public int[] getShopSort() { + public int getShopSort() { return shopSort; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java new file mode 100644 index 000000000..946ed17c7 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java @@ -0,0 +1,21 @@ +package com.ljsd.jieling.handler.activity; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.protocols.PlayerInfoProto; +import org.springframework.stereotype.Component; + +@Component +public class ToBeStrongerHandler extends BaseHandler{ + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.TO_BE_STRONGER_REQUEST; + } + + @Override + public void processWithProto(ISession iSession, PlayerInfoProto.GetToBeStrongerRequest proto){ + ActivityLogic.getInstance().toBeStronger(iSession,proto.getTempId(),MessageTypeProto.MessageType.TO_BE_STRONGER_RESPONSE); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 4779ab5ae..bb01c7216 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -1046,5 +1046,17 @@ public class ActivityLogic { } - + /** + * 我要变强 + * @param session + * @param messageType + */ + public void toBeStronger(ISession session, int tempId,MessageTypeProto.MessageType messageType){ + PlayerInfoProto.GetToBeStrongerResponse.Builder response = PlayerInfoProto.GetToBeStrongerResponse.newBuilder(); + for(int i = 0 ; i <6;i++){ + CommonProto.StrongerInfo.Builder info = CommonProto.StrongerInfo.newBuilder().setCurScore(1000).setMaxScore(6000); + response.addInfos(info); + } + MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index e8aba972e..c870da075 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -196,13 +196,13 @@ public class GuildLogic { MessageUtil.sendErrorResponse(session,0,msgId,"已达申请上线,无法继续申请"); return; } - Map applyGuildFamilyInfos = GuilidManager.getApplyGuildInfos(session.getUid(), 0); - if(applyGuildFamilyInfos.size()>=guildSetting.getBeApplyLimit()){ - MessageUtil.sendErrorResponse(session,0,msgId,"当前公会被申请已达上线,无法继续申请"); - return; - } for(Integer applyGuildId : applyGuilds){ GuildApply guildApply = new GuildApply(uid,applyGuildId); + Map applyGuildFamilyInfos = GuilidManager.getApplyGuildInfos(applyGuildId, 0); + if(applyGuildFamilyInfos.size()>=guildSetting.getBeApplyLimit()){ + MessageUtil.sendErrorResponse(session,0,msgId,"当前公会被申请已达上线,无法继续申请"); + continue; + } GuilidManager.addApplyGuildInfo(guildApply); } MessageUtil.sendMessage(session,1,msgId,null,true);