猎妖之路时间和boss节点圣物取消

back_recharge
zhangshanxue 2020-06-15 16:11:15 +08:00
parent 03dd7f0804
commit 908fdb1d5b
2 changed files with 11 additions and 2 deletions

View File

@ -123,8 +123,8 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
if (resultCode != 1) {
if (nodeInfo.getType() == ExpeditionLogic.NODETYPE_GREED) {
if (nodeInfo.getType() == ExpeditionLogic.NODETYPE_GREED||(expeditionManager.getExpeditionLeve()>2&&nodeInfo.getType() == ExpeditionLogic.NODETYPE_BOSS)) {
//贪婪节点只有1次战斗机会若战斗失败后敌人将会逃走玩家视为通过此节点
//updata node
Set<CommonProto.ExpeditionNodeInfo> nodeInfos = ExpeditionLogic.openLay(user,nodeInfo.getLay(),nodeId);

View File

@ -5,6 +5,7 @@ import com.ljsd.jieling.core.HandlerLogicThread;
import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.exception.ErrorCodeException;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.logic.GlobalDataManaager;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
@ -18,6 +19,7 @@ import com.ljsd.jieling.util.MessageUtil;
import config.SExpeditionSetting;
import config.SGlobalSystemConfig;
import manager.STableManager;
import util.TimeUtils;
import java.util.ArrayList;
import java.util.List;
@ -83,6 +85,13 @@ public class GetExpeditionRequestHandler extends BaseHandler<Expedition.GetExped
soulEquipList.add(CBean2Proto.getEquipProto(equipInfo));
}
builder.addAllEquip(soulEquipList);
TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.Expedition);
if( null != timeControllerOfFunction){
builder.setStartTime((int)(timeControllerOfFunction.getStartTime()/1000));
}
}
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_GET_EXPEDITION_RESONSE_VALUE, builder.build(), true);
}