鸿蒙阵修改

back_recharge
duhui 2022-12-23 14:47:38 +08:00
parent 7d69dcabb4
commit 5f83cc7f81
3 changed files with 56 additions and 56 deletions

View File

@ -280,19 +280,19 @@ public class Hero extends MongoBase implements Comparable<Hero>,Cloneable {
} }
public Map<Integer, Integer> getEquipByHongmengPositionMap(HeroManager heroManager) { public Map<Integer, Integer> getEquipByHongmengPositionMap(HeroManager heroManager) {
if (!equipByPositionMap.isEmpty()) { // if (!equipByPositionMap.isEmpty()) {
return equipByPositionMap; // return equipByPositionMap;
} // }
// 英雄在共鸣池中 // 英雄在共鸣池中
if (heroManager.getResonances().values().contains(id)) { // if (heroManager.getResonances().values().contains(id)) {
// 模板,取装备 // // 模板,取装备
HongMengAddAttribute hongMengByEquip = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP); // HongMengAddAttribute hongMengByEquip = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP);
if (hongMengByEquip != null && hongMengByEquip.value != -1) { // if (hongMengByEquip != null && hongMengByEquip.value != -1) {
// 根据星级获取装备位置和信息 // // 根据星级获取装备位置和信息
Map<Integer, Integer> map = SEquipConfig.starByPositionMap.get(hongMengByEquip.value); // Map<Integer, Integer> map = SEquipConfig.starByPositionMap.get(hongMengByEquip.value);
return map == null ? new HashMap<>() : map; // return map == null ? new HashMap<>() : map;
} // }
} // }
return equipByPositionMap; return equipByPositionMap;
} }
@ -432,7 +432,7 @@ public class Hero extends MongoBase implements Comparable<Hero>,Cloneable {
public int getEspecialEquipLevel() { public int getEspecialEquipLevel() {
int max = SSpecialConfig.getIntegerValue(SSpecialConfig.EquipTalismanaUpperLimit); int max = SSpecialConfig.getIntegerValue(SSpecialConfig.EquipTalismanaUpperLimit);
return especialEquipLevel>max ? max : especialEquipLevel; return Math.min(especialEquipLevel, max);
} }
public int getOriginalEspecialEquipLevel() { public int getOriginalEspecialEquipLevel() {

View File

@ -83,27 +83,27 @@ public class Jewel extends PropertyItem implements Cloneable {
public int getLevelByHongMeng(HeroManager heroManager,String heroId) { public int getLevelByHongMeng(HeroManager heroManager,String heroId) {
// 英雄在共鳴池中 // 英雄在共鳴池中
if (heroManager.getResonances().containsValue(heroId)) { // if (heroManager.getResonances().containsValue(heroId)) {
// 1:魂宝2灵宝 // // 1:魂宝2灵宝
HongMengAddAttribute hongMengAddAttribute = null; // HongMengAddAttribute hongMengAddAttribute = null;
if (jewelType == 1){ // if (jewelType == 1){
hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SOUL_EQUIP); // hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SOUL_EQUIP);
} // }
if (jewelType == 2){ // if (jewelType == 2){
hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SPIRIT_EQUIP); // hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SPIRIT_EQUIP);
} // }
// 读配置表 // // 读配置表
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(getEquipId()); // SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(getEquipId());
// 0最大等级1最大精炼等级 // // 0最大等级1最大精炼等级
int[] max = config.getMax(); // int[] max = config.getMax();
if (hongMengAddAttribute != null){ // if (hongMengAddAttribute != null){
// 比较当前等级和共鸣等级 // // 比较当前等级和共鸣等级
int newLevel = Math.max(getLevel(), hongMengAddAttribute.value); // int newLevel = Math.max(getLevel(), hongMengAddAttribute.value);
// 第一次结果和最大等级限制比较 // // 第一次结果和最大等级限制比较
newLevel = Math.min(max[0], newLevel); // newLevel = Math.min(max[0], newLevel);
return newLevel; // return newLevel;
} // }
} // }
return getLevel(); return getLevel();
} }

View File

@ -5267,7 +5267,7 @@ public class HeroLogic {
/** /**
* 鸿 * 鸿
* * 2022-12-23 鸿
* @param session * @param session
* @param judge truefalse * @param judge truefalse
*/ */
@ -5423,9 +5423,9 @@ public class HeroLogic {
especialEquipLevel.value = -1; especialEquipLevel.value = -1;
} }
resonanceAddition.put(HongMengAttributeEnum.LEVEL, resonanceLevel); resonanceAddition.put(HongMengAttributeEnum.LEVEL, resonanceLevel);
resonanceAddition.put(HongMengAttributeEnum.EQUIP, hongMengAddAttributeEquip); // resonanceAddition.put(HongMengAttributeEnum.EQUIP, hongMengAddAttributeEquip);
resonanceAddition.put(HongMengAttributeEnum.SOUL_EQUIP, soulEquip); // resonanceAddition.put(HongMengAttributeEnum.SOUL_EQUIP, soulEquip);
resonanceAddition.put(HongMengAttributeEnum.SPIRIT_EQUIP, spiritEquip); // resonanceAddition.put(HongMengAttributeEnum.SPIRIT_EQUIP, spiritEquip);
heroManager.setResonanceAddition(resonanceAddition); heroManager.setResonanceAddition(resonanceAddition);
/*** ============================= 开始组装鸿蒙阵信息 ==================================== **/ /*** ============================= 开始组装鸿蒙阵信息 ==================================== **/
@ -5652,7 +5652,7 @@ public class HeroLogic {
LOGGER.info("resonance uid=>{} no the heroId=>{}", user.getId(), heroId); LOGGER.info("resonance uid=>{} no the heroId=>{}", user.getId(), heroId);
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF);
} }
if (heroManager.getHongmengGuards().values().contains(heroId)) { if (heroManager.getHongmengGuards().containsValue(heroId)) {
LOGGER.info("resonance uid=>{} the heroId=>{} is HongmengGuard", user.getId(), heroId); LOGGER.info("resonance uid=>{} the heroId=>{} is HongmengGuard", user.getId(), heroId);
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF);
} }
@ -5663,28 +5663,28 @@ public class HeroLogic {
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF);
} }
Map<Integer, Long> resonancesTime = heroManager.getResonancesTime(); Map<Integer, Long> resonancesTime = heroManager.getResonancesTime();
if (resonancesTime.get(index) != null && resonancesTime.get(index) > TimeUtils.now() / 1000) { if (resonancesTime.get(index) != null && resonancesTime.get(index) > TimeUtils.nowInt()) {
LOGGER.info("resonance uid=>{} time =>{}", user.getId(), resonancesTime.get(index)); LOGGER.info("resonance uid=>{} time =>{}", user.getId(), resonancesTime.get(index));
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF);
} }
// 添加到共鸣区 // 添加到共鸣区
heroManager.updateResonances(index, heroId); heroManager.updateResonances(index, heroId);
HongMengAddAttribute hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP); // HongMengAddAttribute hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP);
if (hongMengAddAttribute.value != -1) { // if (hongMengAddAttribute.value != -1) {
Map<Integer, Integer> equipByPositionMap = hero.getEquipByPositionMap(); // Map<Integer, Integer> equipByPositionMap = hero.getEquipByPositionMap();
//
if (equipByPositionMap.size() > 0) { // if (equipByPositionMap.size() > 0) {
ArrayList<String> strings = new ArrayList<>(); // ArrayList<String> strings = new ArrayList<>();
equipByPositionMap.forEach((k, v) -> { // equipByPositionMap.forEach((k, v) -> {
strings.add(String.valueOf(v)); // strings.add(String.valueOf(v));
}); // });
// 卸下装备 // // 卸下装备
getInstance().unloadEquipOpt(session, heroId, strings, 1); // getInstance().unloadEquipOpt(session, heroId, strings, 1);
} // }
//
equipByPositionMap.clear(); // equipByPositionMap.clear();
hero.setEquipByPositionMap(equipByPositionMap); // hero.setEquipByPositionMap(equipByPositionMap);
} // }
// 更新战力 // 更新战力
Poster.getPoster().dispatchEvent(new SaveHeroForceEvent(user.getId(),heroId)); Poster.getPoster().dispatchEvent(new SaveHeroForceEvent(user.getId(),heroId));