diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 2b4b31e47..af142624e 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"5", - "tables":"" + "version":"6", + "tables":"GlobalActivity" } \ No newline at end of file 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 b5836c905..fd2b45f17 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 @@ -1749,13 +1749,12 @@ public class MapLogic { // 关卡信息 openNextMainLevel(session, user, fightId); // 排行榜 - SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId); - RankContext.getRankEnum(RankEnum.MAIN_LEVEL_RANK.getType()).addRank(user.getId(), "", sMainLevelConfig.getVirtureId(), user.getPlayerInfoManager().getMaxForce()); // 推送 MainLevelManager mainLevelManager = user.getMainLevelManager(); FightInfoProto.MainLevelFightUpdateIndication build = FightInfoProto.MainLevelFightUpdateIndication.newBuilder().setState(mainLevelManager.getState()).setFightId(mainLevelManager.getFightId()).build(); MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.MAIN_LEVEL_FIGHT_UPDATE_INDICATION_VALUE, build, true); // 打点,现在不用 + SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId); ReportUtil.onReportEvent(user, ReportEventEnum.PASS_STAGE.getType(), String.valueOf(fightId), "", sMainLevelConfig.getReward(), new Date()); // 奖励道具 return ItemUtil.dropToPrivilege(user, sMainLevelConfig.getReward(), BIReason.LEVELDIFFICULTY_FIGHT_REWARD); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GiveEndlessDrawActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GiveEndlessDrawActivity.java index d39f2d1b7..c9fc55e78 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GiveEndlessDrawActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GiveEndlessDrawActivity.java @@ -15,7 +15,7 @@ import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import config.SActivityRewardConfig; -import config.SMainLevelConfig; +import config.SSoldierStageConfig; import rpc.protocols.CommonProto; import rpc.protocols.PlayerInfoProto; import util.TimeUtils; @@ -96,7 +96,7 @@ public class GiveEndlessDrawActivity extends AbstractActivity { */ private int getState(User user, SActivityRewardConfig reward, ActivityProgressInfo progress){ // 当前关卡id - int mainLvId = user.getMainLevelManager().getFightId(); + int soldierLayerId = user.getMainLevelManager().getSoldierLayerId(); // 任务类型,0:一次性奖励,1:每日奖励 int type = reward.getValues()[0][0]; // 任务条件(关卡id) @@ -115,11 +115,11 @@ public class GiveEndlessDrawActivity extends AbstractActivity { } // 首次领取 else { - SMainLevelConfig value = SMainLevelConfig.config.get(valueId); - SMainLevelConfig mainLv = SMainLevelConfig.config.get(mainLvId); - if (value != null && mainLv != null){ + SSoldierStageConfig value = SSoldierStageConfig.idMap.get(valueId); + SSoldierStageConfig layer = SSoldierStageConfig.idMap.get(soldierLayerId); + if (value != null && layer != null){ //关卡满足 - if (mainLv.getVirtureId() > value.getVirtureId()){ + if (layer.getId() >= value.getId()){ state = 1; } } @@ -129,10 +129,6 @@ public class GiveEndlessDrawActivity extends AbstractActivity { /** * 领取奖励 - * @param session - * @param missionId - * @return - * @throws Exception */ @Override public boolean takeReward(ISession session, int missionId) throws Exception { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java index fc5e85b31..e12f79675 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java @@ -10,6 +10,9 @@ import com.ljsd.jieling.logic.activity.event.SaveHeroForceEvent; 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.rank.RankContext; +import com.ljsd.jieling.logic.rank.RankEnum; +import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.ItemUtil; @@ -294,6 +297,9 @@ public class SoldierLogic { CommonProto.Drop.Builder drop = ItemUtil.drop(user, stageConfig.getReward(), 1, BIReason.SOLDIER_MIAN_LEVEL_REWARD); builder.setDrop(drop); builder.setResult(1); + // 排行榜 + AbstractRank rank = RankContext.getRankEnum(RankEnum.MAIN_LEVEL_RANK.getType()); + rank.addRank(user.getId(), "", stageConfig.getId(), user.getPlayerInfoManager().getMaxForce()); } MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.SoldierFightCheckResponse_VALUE, builder.build(), true);