diff --git a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java index 6ff7b88ea..802fdcabc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java @@ -149,8 +149,8 @@ public enum ErrorCode implements IErrorCode { NO_FRIEND_APPLY(115,"暂无可添加好友"), NO_USE_SAME_HERO(116,"不可上阵重复英雄"), DAILY_ALREADY_PASS(117,"已通关,不可重复挑战"), - DAILY_NO_OPEN(118,"进入副本条件不足") - + DAILY_NO_OPEN(118,"进入副本条件不足"), + HAD_TAKE_REWARD(124,"奖励已领取") ; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index 3b5b02df8..fc2683fd7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -116,6 +116,7 @@ public interface BIReason { int UNLOAD_SOUL_REWARD = 67;//脱下魂印 + int ARENA_BOX_REWARD = 68;//竞技场宝箱奖励 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index 346ed61ee..2a9b1e59c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.handler.Expedition; import com.ljsd.fight.CheckFight; +import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.exception.ErrorCode; @@ -234,19 +235,22 @@ public class EndExpeditionBattleRequest extends BaseHandler nodeInfos = ExpeditionLogic.openLay(user,nodeInfo.getLay(),nodeId); //更新节点 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 0b88497f7..44785b33e 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 @@ -9,6 +9,7 @@ import com.ljsd.jieling.util.KeyGenUtils; import com.ljsd.jieling.util.UUIDEnum; import config.SCHero; import config.SCHeroRankUpConfig; +import config.SItem; import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +60,8 @@ public class Hero extends MongoBase { this.id = KeyGenUtils.produceIdByModule(UUIDEnum.HERO, uid); this.templateId = heroTid; this.level = initStar; - this.star =hero.getStar() ; + int[] heroStar = SItem.getsItemMap().get(heroTid).getHeroStar(); + this.star =heroStar[1] ; this.equipByPositionMap = new HashMap<>(); this.soulEquipByPositionMap = hero.soulEquipByPositionMap; this.breakId = hero.breakId; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 1af872d9b..091b4ef78 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -220,10 +220,16 @@ public class ExpeditionLogic { //生成新英雄的血量信息 Map heroHP = user.getExpeditionManager().getHeroHPWithChange(); for (Map.Entry entry : heroMap.entrySet()) { - if (!heroHP.keySet().contains(entry.getKey())&&!heroMapTemp.keySet().contains(entry.getKey())) { + if (!heroHP.keySet().contains(entry.getKey())) { heroHP.put(entry.getKey(), 1d); } } + for (Map.Entry entry : heroMapTemp.entrySet()) { + if (!heroHP.keySet().contains(entry.getKey())) { + heroHP.put(entry.getKey(), 1d); + } + } + //移除已经删除的hero Set removeId = heroHP.keySet().stream().filter(k -> { if(heroMap.keySet().contains(k)) @@ -476,6 +482,7 @@ public class ExpeditionLogic { try { ints = MathUtils.randomFromWeight(cfg.getHolyProbability()); }catch (Exception e){ + break; // e.printStackTrace(); } Map type2holy2weight = STableManager.getFigureConfig(CommonStaticConfig.class).getType2holy2weight(ints); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index a5ee13d28..2f15ca05d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -1384,6 +1384,7 @@ public class GuildLogic { Family.GuildHelpInfoIndication.Builder build = Family.GuildHelpInfoIndication.newBuilder(); for (Map.Entry entry : user.getGuildMyInfo().getGuidHelpInfo().entrySet()) { //通知前端清除公会成员援助信息 + build.setUid(user.getId()); build.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder().setType(entry.getKey()).setNum(-1)); } GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(user.getPlayerInfoManager().getGuildId()), MessageTypeProto.MessageType.GuildHelpInfoIndication,build.build()); diff --git a/tablemanager/src/main/java/config/SChampionshipSetting.java b/tablemanager/src/main/java/config/SChampionshipSetting.java index 8d4e8f340..9133fc759 100644 --- a/tablemanager/src/main/java/config/SChampionshipSetting.java +++ b/tablemanager/src/main/java/config/SChampionshipSetting.java @@ -40,6 +40,8 @@ public class SChampionshipSetting implements BaseConfig { private int knockoutGroup; + private int guessRatio; + @Override public void init() throws Exception { @@ -110,4 +112,8 @@ public class SChampionshipSetting implements BaseConfig { public int getSettleTime() { return settleTime; } + + public int getGuessRatio() { + return guessRatio; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SExpeditionNodeConfig.java b/tablemanager/src/main/java/config/SExpeditionNodeConfig.java index 226483e5a..26ac0caf4 100644 --- a/tablemanager/src/main/java/config/SExpeditionNodeConfig.java +++ b/tablemanager/src/main/java/config/SExpeditionNodeConfig.java @@ -3,6 +3,7 @@ package config; import manager.STableManager; import manager.Table; +import java.util.Map; @Table(name ="ExpeditionNodeConfig") public class SExpeditionNodeConfig implements BaseConfig { @@ -11,7 +12,7 @@ public class SExpeditionNodeConfig implements BaseConfig { private int type; - private int[] reward; + private float reward; private int poolId; @@ -34,7 +35,7 @@ public class SExpeditionNodeConfig implements BaseConfig { return type; } - public int[] getreward() { + public float getReward() { return reward; }