公会邮件修改

back_recharge
lvxinran 2019-10-21 15:25:11 +08:00
parent d3158986b2
commit 554c62964b
5 changed files with 27 additions and 10 deletions

View File

@ -8,6 +8,7 @@ public interface GlobalsDef {
int CHAIRMAN = 1;
int ADMINISTRATORS =2;
int MEMBER = 3;
int CHAIRMAN_TO_MENBER = 4;
int RANDOM_LOTTERY_TYPE = 1;

View File

@ -255,12 +255,12 @@ public class GuildFightLogic {
continue;
}
Map<Integer, SGuildLevelConfig> configMap = STableManager.getConfig(SGuildLevelConfig.class);
//匹配处理
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
//todo 人数限制
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
if(guildInfo.getDefendInfo().size()<configMap.get(guildInfo.getLevel()).getDefendNum()){
continue;
}
//匹配处理
int totalForce = 0;
for(Map.Entry<Integer, Set<Integer>> entry:guildInfo.getMembers().entrySet()){
for(Integer uid:entry.getValue()){
@ -561,6 +561,7 @@ public class GuildFightLogic {
.setRoundEndTime(roundEndTime)
.setAttackCount(attackCount)
.setJoinType(1);
if (enemyFamily != -1) {
GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class);
// GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);
@ -583,6 +584,12 @@ public class GuildFightLogic {
}
}
}
//todo 人数限制
Map<Integer, SGuildLevelConfig> configMap = STableManager.getConfig(SGuildLevelConfig.class);
if(GuilidManager.guildInfoMap.get(guildId).getDefendInfo().size()<configMap.get(GuilidManager.guildInfoMap.get(guildId).getLevel()).getDefendNum()){
response.setType(-1);
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
}
if(GuilidManager.guildInfoMap.get(guildId)!=null){
long createTime = GuilidManager.guildInfoMap.get(guildId).getCreateTime();
if(createTime/1000>roundStartTime&&createTime/1000<roundEndTime){
@ -652,6 +659,7 @@ public class GuildFightLogic {
private static void removeMatchingInfo(){
startMatching = true;
RedisUtil redisUtil = RedisUtil.getInstence();
String fightKey = RedisKey.getKey(RedisKey.FAMILY_FIGHT,"",false);
//匹配信息
String matchingKey = RedisKey.getKey(RedisKey.FAMILY_FIGHT_MATCHING_RANK,"",false);
//攻击次数信息
@ -700,6 +708,7 @@ public class GuildFightLogic {
//清除布防信息
// GuilidManager.guildInfoMap.get(Integer.valueOf(index)).removeAllDefendInfo();
}
redisUtil.del(fightKey);
redisUtil.del(matchingKey);
redisUtil.del(attackCountKey);
redisUtil.del(extraStar);
@ -830,6 +839,9 @@ public class GuildFightLogic {
lastStar = next.getScore().intValue();
userResultRank = userRank;
}
if(userResultRank==0){
continue;
}
String title = SErrorCodeEerverConfig.getI18NMessage("family_fight_rank_reward_title");
String content = SErrorCodeEerverConfig.getI18NMessage("family_fight_rank_reward_txt",new Object[]{String.valueOf(userResultRank)});
MailLogic.getInstance().sendMail(Integer.parseInt(next.getValue()),title,content,SGuildRewardConfig.rewardMap.get(userResultRank),(int) (TimeUtils.now()/1000), Global.MAIL_EFFECTIVE_TIME);

View File

@ -613,11 +613,10 @@ public class GuildLogic {
sendPositionChange(targetUid,position);
User targetUser = UserManager.getUser(targetUid);
if(position == GlobalsDef.CHAIRMAN){
MailLogic.getInstance().sendMail(uid,SErrorCodeEerverConfig.getI18NMessage("family_relieve_title"),SErrorCodeEerverConfig.getI18NMessage("family_relieve_txt"),"",(int)(TimeUtils.now()/1000),Global.MAIL_EFFECTIVE_TIME);
guildInfo.removeMember(GlobalsDef.CHAIRMAN,uid);
PlayerLogic.getInstance().playerInfoUpdate(user);
guildInfo.addMembers(GlobalsDef.MEMBER,uid);
sendPositionChange(uid,GlobalsDef.MEMBER);
sendPositionChange(uid,GlobalsDef.CHAIRMAN_TO_MENBER);
addGuildLog(guildInfo.getId(),GuildDef.Log.TRANSFER,targetUser.getPlayerInfoManager().getNickName());
}else{
addGuildLog(guildInfo.getId(),GuildDef.Log.APPOINTMENT,targetUser.getPlayerInfoManager().getNickName());
@ -833,6 +832,10 @@ public class GuildLogic {
title = SErrorCodeEerverConfig.getI18NMessage("family_relieve_title");
content = SErrorCodeEerverConfig.getI18NMessage("family_relieve_txt");
break;
case 4:
title = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_title");
content = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_txt");
break;
default:
break;
}

View File

@ -185,7 +185,7 @@ public class MailLogic {
MessageUtil.sendErrorResponse(iSession,0,msgId,"");
return;
}
if (mail.getMailItem().isEmpty()){
if (mail.getMailItem()==null||mail.getMailItem().isEmpty()){
mail.setState(Global.MAIL_STATE_READ);
mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME);
}else{

View File

@ -108,19 +108,20 @@ public class CBean2Proto {
}
public static CommonProto.Mail getMail(Mail mail){
CommonProto.Mail mailProto = CommonProto.Mail
CommonProto.Mail.Builder mailProto = CommonProto.Mail
.newBuilder()
.setMailId(mail.getId())
.setHead(mail.getHead())
.setContent(mail.getContent())
.setState(mail.getState())
.setMailItem(mail.getMailItem())
.setEffectiveTime(mail.getEffectiveTime())
.setSendTime(mail.getSendTime())
.setSendName(mail.getSendName())
.setMailType(mail.getMailType())
.build();
return mailProto;
.setMailType(mail.getMailType());
if(mail.getMailItem()!=null){
mailProto.setMailItem(mail.getMailItem());
}
return mailProto.build();
}