Merge branch 'master_test_gn_zf' into master_prb_gn
commit
457649facd
|
@ -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());
|
||||||
|
|
Loading…
Reference in New Issue