公会相关
parent
ffd91d6adb
commit
04002b3fac
|
@ -8,6 +8,7 @@ import com.ljsd.jieling.config.SGuildSetting;
|
|||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.globals.Global;
|
||||
import com.ljsd.jieling.handler.map.behavior.BehaviorUtil;
|
||||
import com.ljsd.jieling.logic.blood.BloodLogic;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
|
@ -18,6 +19,7 @@ import com.ljsd.jieling.logic.fight.CheckFight;
|
|||
import com.ljsd.jieling.logic.fight.FightType;
|
||||
import com.ljsd.jieling.logic.hero.HeroAttributeEnum;
|
||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
|
@ -760,13 +762,20 @@ public class GuildFightLogic {
|
|||
}else{
|
||||
guildInfo.updateExp(guildInfo.getExp()+getExp);
|
||||
}
|
||||
//个人奖励
|
||||
// //个人奖励
|
||||
// Set<ZSetOperations.TypedTuple<String>> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.FAMILY_FIGHT_STAR_RANK, String.valueOf(guildId), 0, 20);
|
||||
// if(zsetreverseRangeWithScores.size()<1){
|
||||
// continue;
|
||||
// }
|
||||
// Iterator<ZSetOperations.TypedTuple<String>> it = zsetreverseRangeWithScores.iterator();
|
||||
// int rank = 1;
|
||||
// int userRank = 1;
|
||||
// int userResultRank = 1;
|
||||
// Family.PersonalFightResultResponse.Builder response = Family.PersonalFightResultResponse.newBuilder();
|
||||
//// response.addResult(Family.PersonalFightResult.newBuilder().setRank(userRank).set.build())
|
||||
// while (it.hasNext()){
|
||||
// rank++;
|
||||
// ZSetOperations.TypedTuple<String> next = it.next();
|
||||
//// MailLogic.getInstance().sendMail(Integer.parseInt(next.getValue()),"公会战奖励","恭喜你在此次工会战中获得第"+userResultRank,,Global.MAIL_EFFECTIVE_TIME);
|
||||
// userRank++;
|
||||
// }
|
||||
}
|
||||
MongoUtil.getLjsdMongoTemplate().lastUpdate();
|
||||
|
|
|
@ -550,9 +550,11 @@ public class GuildLogic {
|
|||
MessageUtil.sendErrorResponse(session,0, msgId,"公会战期间不允许任命");
|
||||
return;
|
||||
}
|
||||
if(guildInfo.getMembers().get(2)!=null&&guildInfo.getMembers().get(2).size()>=SGuildLevelConfig.sGuildLevelConfigMap.get(guildInfo.getLevel()).getOfficalNum()){
|
||||
MessageUtil.sendErrorResponse(session,0,msgId,"官员人数已上限");
|
||||
return;
|
||||
if(position==2){
|
||||
if(guildInfo.getMembers().get(2)!=null&&guildInfo.getMembers().get(2).size()>=SGuildLevelConfig.sGuildLevelConfigMap.get(guildInfo.getLevel()).getOfficalNum()){
|
||||
MessageUtil.sendErrorResponse(session,0,msgId,"官员人数已上限");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
guildInfo.removeMember(targetType,targetUid);
|
||||
|
|
Loading…
Reference in New Issue