灵宝空值校验

back_recharge
duhui 2023-01-06 16:11:27 +08:00
parent 54315803ca
commit 97edfd2e2a
2 changed files with 11 additions and 6 deletions

View File

@ -1,6 +1,7 @@
package com.ljsd.jieling.handler.Expedition; package com.ljsd.jieling.handler.Expedition;
import com.ljsd.fight.CheckFight; import com.ljsd.fight.CheckFight;
import com.ljsd.fight.DefFightSnapData;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.db.redis.RedisUtil;
@ -15,7 +16,6 @@ import com.ljsd.jieling.logic.activity.event.Poster;
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;
import com.ljsd.fight.DefFightSnapData;
import com.ljsd.jieling.logic.fight.FightUtil; import com.ljsd.jieling.logic.fight.FightUtil;
import com.ljsd.jieling.logic.fight.GameFightType; import com.ljsd.jieling.logic.fight.GameFightType;
import com.ljsd.jieling.logic.fight.result.FightResult; import com.ljsd.jieling.logic.fight.result.FightResult;
@ -23,17 +23,19 @@ import com.ljsd.jieling.logic.hero.HeroAttributeEnum;
import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.mission.GameEvent;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import rpc.protocols.CommonProto;
import rpc.protocols.Expedition;
import rpc.protocols.MessageTypeProto;
import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.CBean2Proto;
import com.ljsd.jieling.util.FightDataUtil; import com.ljsd.jieling.util.FightDataUtil;
import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.MessageUtil;
import config.*; import config.SExpeditionFloorConfig;
import config.SExpeditionNodeConfig;
import config.SExpeditionSetting;
import config.SMonsterConfig;
import manager.STableManager; import manager.STableManager;
import org.luaj.vm2.LuaValue; import org.luaj.vm2.LuaValue;
import util.StringUtil; import rpc.protocols.CommonProto;
import rpc.protocols.Expedition;
import rpc.protocols.MessageTypeProto;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;

View File

@ -1381,6 +1381,9 @@ public class CBean2Proto {
Map<String, PropertyItem> itemMap = user.getEquipManager().getEquipMap(); Map<String, PropertyItem> itemMap = user.getEquipManager().getEquipMap();
for (String id : hero.getJewelInfo()) { for (String id : hero.getJewelInfo()) {
Jewel jewel = (Jewel) itemMap.get(id); Jewel jewel = (Jewel) itemMap.get(id);
if (jewel == null){
continue;
}
result.put(id,jewel); result.put(id,jewel);
} }
return result; return result;