无尽副本信息,公户战修改

back_recharge
lvxinran 2019-08-29 03:00:03 +08:00
parent 1b7c67346c
commit caa57c1d5d
4 changed files with 5 additions and 25 deletions

View File

@ -113,6 +113,10 @@ public class GetPlayerInfoHandler extends BaseHandler{
Set<Integer> equipHandBookSet = user.getEquipManager().getEquipHandBook().keySet();
//试炼已领取奖励层数
Set<Integer> towerFloorReceivedReward = mapManager.getTowerReceivedReward().keySet();
CommonProto.EndlessInfo.Builder endless = CommonProto.EndlessInfo.newBuilder();
endless.setMapId(4001);
endless.setNextTime((int)(TimeUtils.getNextWeekdayStartTime(TimeUtils.now(), 1)/1000));
endless.setWorldLevel(99);
PlayerInfoProto.GetPlayerInfoResponse getPlayerInfoResponse
= PlayerInfoProto.GetPlayerInfoResponse.newBuilder()
.setPlayer(player)
@ -134,6 +138,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
.setMonsterAttackTime(user.getMapManager().getLastMonsterAttack())
.setFirstTenth(user.getHeroManager().getFirstTenth())
.setIsDayFirst(playerInfoManager.getIsdayFirst())
.setEndInfo(endless)
.build();
try {
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true);

View File

@ -1,14 +0,0 @@
package com.ljsd.jieling.handler.family;
public class FamilyRound {
public static final int FAMILY_FIGHT_START = 9;
public static final int FAMILY_FIGHT_DEFEND_END = 10;
public static final int FAMILY_FIGHT_MATCHING_END =11;
public static final int FAMILY_FIGHT_ATTACK_END = 12;
public static final int FAMILY_FIGHT_END = 13;
}

View File

@ -1,6 +1,5 @@
package com.ljsd.jieling.logic.family;
import com.google.gson.Gson;
import com.ljsd.jieling.config.SArenaSetting;
import com.ljsd.jieling.config.SGuildLevelConfig;
import com.ljsd.jieling.config.SGuildScoreConfig;
@ -8,14 +7,12 @@ 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.handler.family.FamilyRound;
import com.ljsd.jieling.handler.map.behavior.BehaviorUtil;
import com.ljsd.jieling.logic.blood.BloodLogic;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.CheckFight;
import com.ljsd.jieling.logic.fight.CombatLogic;
import com.ljsd.jieling.logic.hero.HeroAttributeEnum;
import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.network.session.ISession;

View File

@ -1,7 +1,6 @@
package com.ljsd.jieling.logic.family;
import com.google.protobuf.GeneratedMessage;
import com.ljsd.jieling.config.SChallengeMapConfig;
import com.ljsd.jieling.config.SErrorCodeEerverConfig;
import com.ljsd.jieling.config.SGuildSetting;
import com.ljsd.jieling.core.GlobalsDef;
@ -12,25 +11,18 @@ import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.handler.family.FamilyRound;
import com.ljsd.jieling.handler.map.MapManager;
import com.ljsd.jieling.handler.map.behavior.BehaviorUtil;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.GuildApply;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.dao.root.GuildLog;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.CheckFight;
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.network.session.ISession;
import com.ljsd.jieling.protocols.CommonProto;
import com.ljsd.jieling.protocols.Family;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.util.*;
import org.luaj.vm2.LuaValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;