Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
efe69e34b7
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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<PlayerInfoProto.GetToBeStrongerRequest>{
|
||||
@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);
|
||||
}
|
||||
}
|
|
@ -1048,5 +1048,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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -196,13 +196,13 @@ public class GuildLogic {
|
|||
MessageUtil.sendErrorResponse(session,0,msgId,"已达申请上线,无法继续申请");
|
||||
return;
|
||||
}
|
||||
Map<Integer, GuildApply> 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<Integer, GuildApply> 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);
|
||||
|
|
Loading…
Reference in New Issue