diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java index dda3657b9..b087690dc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/cross/CSPlayer.java @@ -1,5 +1,8 @@ package com.ljsd.jieling.logic.dao.cross; +import com.ljsd.GameApplication; +import com.ljsd.jieling.db.mongo.AreaManager; + /** * @Author hj * @Date 2021/8/31 15:30:04 @@ -189,6 +192,7 @@ public class CSPlayer { } public int getServerId() { + int serverId = AreaManager.getInstance().getServerIdByUid(userId, GameApplication.serverId); return serverId; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index e9f8c975f..3d14c1206 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.logic.hero; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; import com.ljsd.GameApplication; import com.ljsd.fight.FamilyHeroInfo; import com.ljsd.jieling.chat.logic.ChatLogic; @@ -2685,7 +2687,16 @@ public class HeroLogic { if (propertyItem == null) { continue; } - Jewel j = (Jewel) propertyItem; + Jewel j = null; + if (propertyItem instanceof Jewel){ + j = (Jewel) propertyItem; + }else { + j = new Jewel(); + j.setHeroId(propertyItem.getHeroId()); + j.setLevel(propertyItem.getLevel()); + j.setEquipId(propertyItem.getEquipId()); + j.setBuildLevel(1); + } SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(j.getEquipId()); // 进阶 Map> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 1f415f213..ccd9b0717 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1739,7 +1739,8 @@ public class PlayerLogic { return null; } } - if (userStr == null) { + if (userStr == null || userStr.isEmpty()) { + LOGGER.error("getUserByRpc ,userStr == null uid={}", uid); return null; } Gson gson = RedisUtil.getInstence().getGson();