非空验证
parent
e8c2e92c13
commit
a6d7f97a43
|
@ -4,6 +4,7 @@ import com.ljsd.jieling.logic.dao.Faxiang;
|
||||||
import com.ljsd.jieling.logic.dao.Hero;
|
import com.ljsd.jieling.logic.dao.Hero;
|
||||||
import com.ljsd.jieling.logic.dao.Jewel;
|
import com.ljsd.jieling.logic.dao.Jewel;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -54,9 +55,9 @@ public class HelpHero {
|
||||||
/**
|
/**
|
||||||
* 家园装备强化信息
|
* 家园装备强化信息
|
||||||
*/
|
*/
|
||||||
private Map<Integer, Integer> homeEquipMap = new HashMap<>(5);
|
private final Map<Integer, Integer> homeEquipMap = new HashMap<>(5);
|
||||||
|
|
||||||
private List<Faxiang> faxiangs;
|
private List<Faxiang> faxiangs = new ArrayList<>();
|
||||||
|
|
||||||
public int getUid() {
|
public int getUid() {
|
||||||
return uid;
|
return uid;
|
||||||
|
|
|
@ -2066,13 +2066,15 @@ public class HeroLogic {
|
||||||
|
|
||||||
//法相
|
//法相
|
||||||
Map<String, Faxiang> faxiangMap = heroVo.getFaxiangMap();
|
Map<String, Faxiang> faxiangMap = heroVo.getFaxiangMap();
|
||||||
for (Faxiang faxiang : faxiangMap.values()) {
|
if (faxiangMap != null && !faxiangMap.isEmpty()){
|
||||||
SFaxiangConfig faxiangConfig = SFaxiangConfig.faxiangMap.get(faxiang.getItemId());
|
for (Faxiang faxiang : faxiangMap.values()) {
|
||||||
if (faxiangConfig == null){
|
SFaxiangConfig faxiangConfig = SFaxiangConfig.faxiangMap.get(faxiang.getItemId());
|
||||||
continue;
|
if (faxiangConfig == null){
|
||||||
}
|
continue;
|
||||||
for (int i = 0; i < faxiang.getStar(); i++) {
|
}
|
||||||
skillList.add(faxiangConfig.getPassiveSkill()[i][0]);
|
for (int i = 0; i < faxiang.getStar(); i++) {
|
||||||
|
skillList.add(faxiangConfig.getPassiveSkill()[i][0]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3104,20 +3106,22 @@ public class HeroLogic {
|
||||||
|
|
||||||
// 法相加成
|
// 法相加成
|
||||||
Set<String> faxiangList = hero.getFaxiangList();
|
Set<String> faxiangList = hero.getFaxiangList();
|
||||||
for (String id : faxiangList) {
|
if (faxiangList != null && !faxiangList.isEmpty()){
|
||||||
Faxiang faxiang = equipManager.getFaxiang(id);
|
for (String id : faxiangList) {
|
||||||
SFaxiangConfig config = SFaxiangConfig.faxiangMap.get(faxiang.getItemId());
|
Faxiang faxiang = equipManager.getFaxiang(id);
|
||||||
SFaxiangLevelConfig levelConfig = SFaxiangLevelConfig.poolMap.get(config.getLevelUpPool()).get(faxiang.getStrongLv());
|
SFaxiangConfig config = SFaxiangConfig.faxiangMap.get(faxiang.getItemId());
|
||||||
SFaxiangStarConfig starConfig = SFaxiangStarConfig.poolMap.get(config.getStar()).get(faxiang.getStar());
|
SFaxiangLevelConfig levelConfig = SFaxiangLevelConfig.poolMap.get(config.getLevelUpPool()).get(faxiang.getStrongLv());
|
||||||
int[][] levelPara = levelConfig.getLevelPara();
|
SFaxiangStarConfig starConfig = SFaxiangStarConfig.poolMap.get(config.getStar()).get(faxiang.getStar());
|
||||||
int[][] property = new int[levelPara.length][2];
|
int[][] levelPara = levelConfig.getLevelPara();
|
||||||
for (int i = 0; i < levelPara.length; i++) {
|
int[][] property = new int[levelPara.length][2];
|
||||||
int[] alone = levelPara[i];
|
for (int i = 0; i < levelPara.length; i++) {
|
||||||
property[i][0] = alone[0];
|
int[] alone = levelPara[i];
|
||||||
int value = (int)(alone[1] * (starConfig.getStarPara()/10000d+1));
|
property[i][0] = alone[0];
|
||||||
property[i][1] = value;
|
int value = (int)(alone[1] * (starConfig.getStarPara()/10000d+1));
|
||||||
|
property[i][1] = value;
|
||||||
|
}
|
||||||
|
combinedAttribute(property, heroAllAttribute);
|
||||||
}
|
}
|
||||||
combinedAttribute(property, heroAllAttribute);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//魂印
|
//魂印
|
||||||
|
|
|
@ -252,7 +252,10 @@ public class CBean2Proto {
|
||||||
helpHero.getJewels().forEach(item->jewels.add(getEquipProto(item)));
|
helpHero.getJewels().forEach(item->jewels.add(getEquipProto(item)));
|
||||||
// 法相
|
// 法相
|
||||||
List<CommonProto.Equip> faxiang = new ArrayList<>();
|
List<CommonProto.Equip> faxiang = new ArrayList<>();
|
||||||
helpHero.getFaxiangs().forEach(item->faxiang.add(getFaxiangEquipProto(item)));
|
List<Faxiang> faxiangs = helpHero.getFaxiangs();
|
||||||
|
if (faxiangs != null && !faxiangs.isEmpty()){
|
||||||
|
faxiangs.forEach(item->faxiang.add(getFaxiangEquipProto(item)));
|
||||||
|
}
|
||||||
// 装备详细信息
|
// 装备详细信息
|
||||||
List<CommonProto.Equip> equips = new ArrayList<>();
|
List<CommonProto.Equip> equips = new ArrayList<>();
|
||||||
Map<Integer, Integer> equip = helpHero.getHero().getEquipByHongmengPositionMap(otherUser.getHeroManager());
|
Map<Integer, Integer> equip = helpHero.getHero().getEquipByHongmengPositionMap(otherUser.getHeroManager());
|
||||||
|
@ -1428,12 +1431,14 @@ public class CBean2Proto {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 本服,获取法相
|
* 本服,获取法相
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
public static Map<String, Faxiang> faxiangOfLocal(User user, Hero hero){
|
public static Map<String, Faxiang> faxiangOfLocal(User user, Hero hero){
|
||||||
HashMap<String, Faxiang> result = new HashMap<>();
|
HashMap<String, Faxiang> result = new HashMap<>();
|
||||||
try {
|
try {
|
||||||
Map<String, Faxiang> faxiangMap = user.getEquipManager().getFaxiangMap();
|
Map<String, Faxiang> faxiangMap = user.getEquipManager().getFaxiangMap();
|
||||||
|
if (faxiangMap == null || faxiangMap.isEmpty()){
|
||||||
|
return result;
|
||||||
|
}
|
||||||
for (String faxiangId : hero.getFaxiangList()) {
|
for (String faxiangId : hero.getFaxiangList()) {
|
||||||
Faxiang faxiang = faxiangMap.get(faxiangId);
|
Faxiang faxiang = faxiangMap.get(faxiangId);
|
||||||
if (faxiang == null){
|
if (faxiang == null){
|
||||||
|
|
Loading…
Reference in New Issue