猎妖之路时间和boss节点圣物取消
parent
03dd7f0804
commit
908fdb1d5b
|
|
@ -123,8 +123,8 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
|
||||||
|
|
||||||
if (resultCode != 1) {
|
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
|
//updata node
|
||||||
Set<CommonProto.ExpeditionNodeInfo> nodeInfos = ExpeditionLogic.openLay(user,nodeInfo.getLay(),nodeId);
|
Set<CommonProto.ExpeditionNodeInfo> nodeInfos = ExpeditionLogic.openLay(user,nodeInfo.getLay(),nodeId);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import com.ljsd.jieling.core.HandlerLogicThread;
|
||||||
import com.ljsd.jieling.exception.ErrorCode;
|
import com.ljsd.jieling.exception.ErrorCode;
|
||||||
import com.ljsd.jieling.exception.ErrorCodeException;
|
import com.ljsd.jieling.exception.ErrorCodeException;
|
||||||
import com.ljsd.jieling.handler.BaseHandler;
|
import com.ljsd.jieling.handler.BaseHandler;
|
||||||
|
import com.ljsd.jieling.logic.GlobalDataManaager;
|
||||||
import com.ljsd.jieling.logic.dao.*;
|
import com.ljsd.jieling.logic.dao.*;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
|
import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
|
||||||
|
|
@ -18,6 +19,7 @@ import com.ljsd.jieling.util.MessageUtil;
|
||||||
import config.SExpeditionSetting;
|
import config.SExpeditionSetting;
|
||||||
import config.SGlobalSystemConfig;
|
import config.SGlobalSystemConfig;
|
||||||
import manager.STableManager;
|
import manager.STableManager;
|
||||||
|
import util.TimeUtils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -83,6 +85,13 @@ public class GetExpeditionRequestHandler extends BaseHandler<Expedition.GetExped
|
||||||
soulEquipList.add(CBean2Proto.getEquipProto(equipInfo));
|
soulEquipList.add(CBean2Proto.getEquipProto(equipInfo));
|
||||||
}
|
}
|
||||||
builder.addAllEquip(soulEquipList);
|
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);
|
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_GET_EXPEDITION_RESONSE_VALUE, builder.build(), true);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue