Merge branch 'master_test_gn_zf' into master_test_gn

jiahuiwen 2021-11-17 10:37:02 +08:00
commit 010f1b97ff
3 changed files with 18 additions and 2 deletions

View File

@ -1,5 +1,8 @@
package com.ljsd.jieling.logic.dao.cross; package com.ljsd.jieling.logic.dao.cross;
import com.ljsd.GameApplication;
import com.ljsd.jieling.db.mongo.AreaManager;
/** /**
* @Author hj * @Author hj
* @Date 2021/8/31 15:30:04 * @Date 2021/8/31 15:30:04
@ -189,6 +192,7 @@ public class CSPlayer {
} }
public int getServerId() { public int getServerId() {
int serverId = AreaManager.getInstance().getServerIdByUid(userId, GameApplication.serverId);
return serverId; return serverId;
} }

View File

@ -1,5 +1,7 @@
package com.ljsd.jieling.logic.hero; package com.ljsd.jieling.logic.hero;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.ljsd.GameApplication; import com.ljsd.GameApplication;
import com.ljsd.fight.FamilyHeroInfo; import com.ljsd.fight.FamilyHeroInfo;
import com.ljsd.jieling.chat.logic.ChatLogic; import com.ljsd.jieling.chat.logic.ChatLogic;
@ -2685,7 +2687,16 @@ public class HeroLogic {
if (propertyItem == null) { if (propertyItem == null) {
continue; 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()); SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(j.getEquipId());
// 进阶 // 进阶
Map<Integer, Map<Integer, SJewelRankupConfig>> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool()); Map<Integer, Map<Integer, SJewelRankupConfig>> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool());

View File

@ -1739,7 +1739,8 @@ public class PlayerLogic {
return null; return null;
} }
} }
if (userStr == null) { if (userStr == null || userStr.isEmpty()) {
LOGGER.error("getUserByRpc userStr == null uid={}", uid);
return null; return null;
} }
Gson gson = RedisUtil.getInstence().getGson(); Gson gson = RedisUtil.getInstence().getGson();