Merge branch 'master_test_gn_zf' into master_test_gn
commit
010f1b97ff
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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<Integer, Map<Integer, SJewelRankupConfig>> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool());
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue