diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 6adbb5884..e29e2ab20 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -3227,7 +3227,9 @@ public class MapLogic { skinId = 0; skinTime = 0; } - TrailHero trailHero = new TrailHero(hero.getTemplateId(),HeroLogic.getInstance().calHeroNotBufferAttribute(user,hero,false,0),hero.getStar(),heroSkill,hero.getLevel(),skinId,skinTime); + TrailHero trailHero = new TrailHero(hero.getTemplateId(),HeroLogic.getInstance().calHeroNotBufferAttribute(user,hero,false,0),hero.getStar(),heroSkill,hero.getLevel()); + trailHero.setSkinId(skinId); + trailHero.setSkinTime(skinTime); heroInfo.put(id,trailHero); } mapManager.updateTrailHeroInfo(heroInfo); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrailHero.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrailHero.java index ba84683df..e78489870 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrailHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrailHero.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.handler.map; +import com.ljsd.common.mogodb.MongoBase; + import java.util.Map; /** @@ -7,7 +9,7 @@ import java.util.Map; * @date 2020/5/28 * @discribe */ -public class TrailHero { +public class TrailHero extends MongoBase { private int tmpId; @@ -47,14 +49,12 @@ public class TrailHero { this.star = star; } - public TrailHero(int tmpId, Map property, int star,String heroSkills,int level,int skinId,int skinTime) { + public TrailHero(int tmpId, Map property, int star,String heroSkills,int level) { this.tmpId = tmpId; this.property = property; this.star = star; this.heroSkills = heroSkills; this.level = level; - this.skinId = skinId; - this.skinTime = skinTime; } public int getSkinId() { @@ -80,4 +80,12 @@ public class TrailHero { public void setLevel(int level) { this.level = level; } + + public void setSkinId(int skinId) { + this.skinId = skinId; + } + + public void setSkinTime(int skinTime) { + this.skinTime = skinTime; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java index e4fb7c9a9..a1bc7c7d6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.handler.map; +import com.ljsd.common.mogodb.MongoBase; + import java.util.*; /** @@ -7,7 +9,7 @@ import java.util.*; * @date 2020/5/16 * @discribe 试炼信息 */ -public class TrialInfo { +public class TrialInfo extends MongoBase { //默认一层 private int floor = 1; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 3fae9862a..6f0a377de 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -212,7 +212,9 @@ public class ItemLogic { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } user.getHeroManager().addSkin(sHeroSkin.getType(),time); - ItemUtil.drop(user,new int[][]{sHeroSkin.getHeadIcon()},BIReason.SKIN_USE_REWARD); + if(sHeroSkin.getHeadIcon()!=null&&sHeroSkin.getHeadIcon().length>0){ + ItemUtil.drop(user,new int[][]{sHeroSkin.getHeadIcon()},BIReason.SKIN_USE_REWARD); + } HeroInfoProto.GetSkinIndication indication = HeroInfoProto.GetSkinIndication.newBuilder() .setSkinInfo(CommonProto.SkinInfo.newBuilder().setSkinId(sHeroSkin.getType()).setOverTime(time)) .build();