diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java index e77f9fdb4..1f1b0741c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java @@ -346,7 +346,7 @@ public class BehaviorUtil { int robotLevel = sArenaRobotConfig.getRoleLv(); Map robotHeroAttribute =HeroLogic.getInstance(). calRobotHeroAttribute(scHero, robotLevel, sArenaRobotConfig.getBreakId(), differDemonsId, differDemonsLv,false); - if(remainHp.containsKey(heroTid.toString())){ + if(remainHp!=null&&remainHp.containsKey(heroTid.toString())){ robotHeroAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),(int)(remainHp.getOrDefault(heroTid.toString(),1d)*robotHeroAttribute.get(HeroAttributeEnum.Hp.getPropertyId()))); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java index 64ce0212d..061be96db 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java @@ -1,14 +1,51 @@ package com.ljsd.jieling.kefu; +import com.google.gson.Gson; +import com.ljsd.jieling.core.VipPrivilegeType; +import com.ljsd.jieling.logic.dao.ExpeditionManager; +import com.ljsd.jieling.logic.dao.SnapFightInfo; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.expedition.ExpeditionLogic; +import com.ljsd.jieling.logic.player.PlayerLogic; +import com.ljsd.jieling.protocols.Expedition; +import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.util.MessageUtil; + /** * Description: 热修复玩家信息 分发到玩家线程 - * Author: zsx + * Author: zsx .//role_gm 10041063 + * + * //role_gm 10040936 * CreateDate: 2019/9/26 11:48 */ public class Cmd_role_gm extends GmRoleAbstract { @Override public boolean exec(String[] args) throws Exception { + // ExpeditionLogic.getInstance().flushUserdataEveryDay(getUser()); + boolean check = PlayerLogic.getInstance().check(getUser(), VipPrivilegeType.EXPEDITION_RELIVE, 1); + + System.out.println("c"+check); +// User user = getUser(); +// ExpeditionManager manager = user.getExpeditionManager(); +// Expedition.GetExpeditionResponse.Builder builder = Expedition.GetExpeditionResponse.newBuilder(); +// builder.addAllLay(manager.getRewardBox()); +// // builder.addAllHeroInfo(ExpeditionLogic.getInstance().getAllHeroInfo(user)); +// // builder.addAllEquipIds(ExpeditionLogic.getInstance().getEquipnfo(user)); +// ExpeditionLogic.getInstance().getNodeInfo(user).forEach(expeditionNodeInfo -> { +// if(expeditionNodeInfo.getType()!=1&&expeditionNodeInfo.getType()!=5&&expeditionNodeInfo.getType()!=2){ +// return; +// } +//// builder.addNodeInfo(expeditionNodeInfo); +// +// SnapFightInfo snapFightInfo = user.getExpeditionManager().getExpeditionNodeInfos().get(expeditionNodeInfo.getSortId()).getSnapFightInfo(); +// System.out.println(expeditionNodeInfo.getSortId()+"::"+snapFightInfo.getHeroAttribute().keySet().toString()+"::"+snapFightInfo.getForce()+"\r\n"); +// }); +// +// // System.out.println(new Gson().toJson(snapFightInfo)); +//// builder.addAllNodeInfo(ExpeditionLogic.getInstance().getNodeInfo(user)); +// System.out.println(builder.build().toString()); return true; } }