From ead65db5c4a131f904c739c79b4aee4fbe6de26a Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 24 Nov 2023 18:45:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/dao/Hero.java | 11 ++++++++--- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 +-- .../main/java/com/ljsd/jieling/util/CBean2Proto.java | 3 --- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 3 +-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 4ec7da4c1..7835a6eca 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -56,6 +56,7 @@ public class Hero extends MongoBase implements Comparable,Cloneable { this.setRootCollection(User._COLLECTION_NAME); } + // 置换 public Hero(int uid, int heroTid, int initStar, Hero hero) { this.setRootCollection(User._COLLECTION_NAME); this.id = KeyGenUtils.produceIdByModule(UUIDEnum.HERO, uid); @@ -83,9 +84,11 @@ public class Hero extends MongoBase implements Comparable,Cloneable { this.createTime = TimeUtils.nowInt(); this.speed = hero.speed; this.createType = 1; + this.training = new Training(); } /** + * 大脑天宫 * 初始化英雄,不入英雄背包 */ public Hero(Hero hero,int uid,int heroTid,int level) { @@ -108,10 +111,12 @@ public class Hero extends MongoBase implements Comparable,Cloneable { this.jewelInfo = new HashSet<>(hero.getJewelInfo()); } + /** + * 创建默认英雄 + */ public Hero(int uid, int heroTid, int initStar){ this.setRootCollection(User._COLLECTION_NAME); this.id = KeyGenUtils.produceIdByModule(UUIDEnum.HERO, uid); - SCHero scHero = SCHero.getsCHero().get(heroTid); this.templateId = scHero.getId(); this.setPropertyId(scHero.getPropertyName()); @@ -126,10 +131,10 @@ public class Hero extends MongoBase implements Comparable,Cloneable { starBreakId = scHeroRankUpConfig.getId(); } } - - createTime = (int) (System.currentTimeMillis() / 1000); + createTime = TimeUtils.nowInt(); breakId = 0; jewelInfo = new HashSet<>(2); + training = new Training(); } //无尽和玉虚使用固定配置英雄 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 12bdf83f9..43e2452ec 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -3869,8 +3869,7 @@ public class HeroLogic { public boolean isBattleArray(User user, String heroId, int[] teamId) { Map> teamPosForHero = user.getTeamPosManager().getTeamPosForHero(); //判断是否不可下阵中有该英雄 - - + List list = new ArrayList<>(); Arrays.stream(teamId).forEach(list::add); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 9349709da..e67ea9b6c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -385,9 +385,6 @@ public class CBean2Proto { public static CommonProto.HeroTraining getTrainingProto(Hero hero){ CommonProto.HeroTraining.Builder builder = CommonProto.HeroTraining.newBuilder(); Training training = hero.getTraining(); - if (training.getLv() == 0){ - return builder.build(); - } builder.setHeroId(hero.getId()); builder.setTrainingLv(training.getLv()); builder.setAttackExp(training.getAttackExp()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index d76ec7659..ae3a63c93 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -22,7 +22,6 @@ import com.ljsd.jieling.logic.activity.activityLogic.GmActivityLogic; import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.home.event.HomeEvent; import com.ljsd.jieling.logic.item.ItemLog; import com.ljsd.jieling.logic.item.ItemLogic; @@ -1423,7 +1422,7 @@ public class ItemUtil { } heroManager.addHero(hero); // 鸿蒙阵推送 - HeroLogic.getInstance().addOrUpdateHongmeng(OnlineUserManager.getSessionByUid(user.getId())); +// HeroLogic.getInstance().addOrUpdateHongmeng(OnlineUserManager.getSessionByUid(user.getId())); heroList.add(CBean2Proto.getHero(hero)); if (reason != BIReason.HERO_RETURN) { if (scHero.getStar() >= SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_lottery_content_parm)) { //策划资质改成星级