From ba8cad8cefdc21c6f80ccdc20538de7a70130619 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 14:33:57 +0800 Subject: [PATCH 1/6] fix rank --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bdc1bba69..8e1c4ef58 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 @@ -2195,7 +2195,7 @@ public class MapLogic { public void getMainLevelRankInfo(ISession session) throws Exception { int rankEndLine = SSpecialConfig.getIntegerValue(SSpecialConfig.Level_RankingShowNum); - Set> arenaRankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.MAINLEVEL_RANK, "", 0, rankEndLine); + Set> arenaRankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.MAINLEVEL_RANK, "", 0, rankEndLine-1); int rank =1; FightInfoProto.MainLevelRankInfoResponse.Builder builder = FightInfoProto.MainLevelRankInfoResponse.newBuilder(); List mainLevelRankInfoList = new ArrayList<>(rankEndLine); From ba4a28d79260d82c662f9733116a13e27adb1c3e Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 14:44:53 +0800 Subject: [PATCH 2/6] fix rank --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8e1c4ef58..33abeede4 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 @@ -2225,7 +2225,7 @@ public class MapLogic { o2.setRank(rank); } } - return o2.getFightId()-o1.getFightId(); + return o1.getRank()-o2.getRank(); } }); for(CommonProto.MainLevelRankInfo.Builder builder1 : mainLevelRankInfoList){ From 698bab2122b47cd3a37c2e2f78ecc2692356abfd Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 15:49:58 +0800 Subject: [PATCH 3/6] fix rank --- .../java/com/ljsd/jieling/handler/map/MapLogic.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 33abeede4..951c9587e 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 @@ -2228,16 +2228,23 @@ public class MapLogic { return o1.getRank()-o2.getRank(); } }); + rank =1; + int myRank =-1; for(CommonProto.MainLevelRankInfo.Builder builder1 : mainLevelRankInfoList){ + builder1.setRank(rank++); builder.addMainLevelRankInfo(builder1.build()); + if(builder1.getUid() == myRank){ + myRank = builder1.getRank(); + } } int uid = session.getUid(); int score = RedisUtil.getInstence().getZSetScore(RedisKey.MAINLEVEL_RANK,"", Integer.toString(uid)).intValue(); - int myRank =-1; if(score == -1){ score = 1011; }else{ - myRank= RedisUtil.getInstence().getZSetreverseRank(RedisKey.MAINLEVEL_RANK,"",Integer.toString(uid)).intValue(); + if(myRank==-1){ + myRank= RedisUtil.getInstence().getZSetreverseRank(RedisKey.MAINLEVEL_RANK,"",Integer.toString(uid)).intValue(); + } } User user = UserManager.getUser(uid); PlayerManager playerInfoManager = user.getPlayerInfoManager(); From 3c103fac3edb1715d5875e23955f91a59cf77fe1 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 15:55:37 +0800 Subject: [PATCH 4/6] check --- .../main/java/com/ljsd/jieling/logic/item/ItemLogic.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 6ff26809b..2e554cfe7 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 @@ -445,6 +445,10 @@ public class ItemLogic { public void especialEquipUpStar(ISession session, String equipId, List materials) throws Exception { User user = UserManager.getUser(session.getUid()); EspecialEquip especialEquip = user.getEquipManager().getEspecialEquipMap().get(equipId); + if(especialEquip == null){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,"not exists"); + return; + } SEquipTalismana sEquipTalismana = SEquipTalismana.equipTalismanaStarMap.get(especialEquip.getEquipId()).get(especialEquip.getStar()); Map equipTalismanaRankupMap = SEquipTalismanaRankup.equipTalismanaRankupMap; boolean success = true; @@ -458,6 +462,10 @@ public class ItemLogic { } SEquipTalismanaRankup sEquipTalismanaRankup = equipTalismanaRankupMap.get(sEquipTalismana.getRankupConsumeMaterial()[i][1]); for(String materEquip:material.getHeroIdsList()){ + if(equipId.equals(materEquip)){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,"不能吞自己"); + return; + } EspecialEquip especialEquip1 = user.getEquipManager().getEspecialEquipMap().get(materEquip); //材料种类判断 if(sEquipTalismanaRankup.getIssame()==1){ From 23382f5e74fa46cf05c4f817d2c2dde18024396d Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 17:08:05 +0800 Subject: [PATCH 5/6] fix bug --- .../java/com/ljsd/jieling/config/STreasureTaskConfig.java | 5 ++++- .../src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java index 1d44c844e..866e7a17a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java @@ -45,8 +45,11 @@ public class STreasureTaskConfig implements BaseConfig { if(!treasureTaskConfigByActivityMap.containsKey(activityId)){ treasureTaskConfigByActivityMap.put(activityId,new ArrayList<>()); } - + if(!sTreasureTaskConfigListByTypeMapTmp.containsKey(sTreasureTaskConfig.getTaskType())){ + sTreasureTaskConfigListByTypeMapTmp.put(sTreasureTaskConfig.getTaskType(),new ArrayList<>()); + } treasureTaskConfigByActivityMap.get(activityId).add(sTreasureTaskConfig); + sTreasureTaskConfigListByTypeMapTmp.get(sTreasureTaskConfig.getTaskType()).add(sTreasureTaskConfig); if(sTreasureTaskConfig.getTaskType() == MissionType.SENVER_HAPPY.getMissionTypeValue()){ sTreasureSevenTaskConfigByActivityMapTmp.put(sTreasureTaskConfig.getActivityId(),sTreasureTaskConfig); } 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 2e554cfe7..129a48c34 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 @@ -453,6 +453,10 @@ public class ItemLogic { Map equipTalismanaRankupMap = SEquipTalismanaRankup.equipTalismanaRankupMap; boolean success = true; //按槽位遍历所需材料 + if(sEquipTalismana.getRankupConsumeMaterial().length != materials.size()){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,"卡槽数量不对"); + return; + } for(int i = 0 ; i Date: Thu, 10 Oct 2019 17:23:47 +0800 Subject: [PATCH 6/6] fix bug --- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 837a52673..d1ec56980 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -392,7 +392,7 @@ public class PlayerLogic { int[][] rewardTemplates = sRechargeCommodityConfig.getExtraReward()[0]; int[][] rewards = new int[rewardTemplates.length][]; for(int i=0;i