From 0226f85fec4bc183e7c5d2a0bd52c1373712f4d4 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 20:08:29 +0800 Subject: [PATCH 1/2] fix recharge --- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 +++ serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 4 ++++ 2 files changed, 7 insertions(+) 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 d1ec56980..ab9051f34 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 @@ -381,6 +381,9 @@ public class PlayerLogic { if(days == 0){ continue; } + if(days == sRechargeCommodityConfig.getContiueDays()){ + days-=1; + } remainDays = TimeUtils.differentDays(nowTime * 1000L, goodsInfo.getValue()*1000L)-1; }else{ continue; 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 fb0fb6d1a..5cfd86ece 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -273,6 +273,7 @@ public class ItemUtil { public static String getReward(Map itemMap,Map cardMap,Map equipMap, Map randomMap) { StringBuilder reward= new StringBuilder(); for (Map.Entry entry : itemMap.entrySet()){ + if(entry.getValue() == 0){continue;} if (reward.length() == 0){ reward = new StringBuilder(entry.getKey() + "#" + entry.getValue()); }else{ @@ -280,6 +281,7 @@ public class ItemUtil { } } for (Map.Entry entry : cardMap.entrySet()){ + if(entry.getValue() == 0){continue;} if (reward.length() == 0){ reward = new StringBuilder(entry.getKey() + "#" + entry.getValue()); }else{ @@ -287,6 +289,7 @@ public class ItemUtil { } } for (Map.Entry entry : equipMap.entrySet()){ + if(entry.getValue() == 0){continue;} if (reward.length() == 0){ reward = new StringBuilder(entry.getKey() + "#" + entry.getValue()); }else{ @@ -294,6 +297,7 @@ public class ItemUtil { } } for (Map.Entry entry : randomMap.entrySet()){ + if(entry.getValue() == 0){continue;} if (reward.length() == 0){ reward = new StringBuilder(entry.getKey() + "#" + entry.getValue()); }else{ From 06ea43d6bd6b5ae0fcb5981b355c79cedef43d62 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 11 Oct 2019 10:02:01 +0800 Subject: [PATCH 2/2] fix rank --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 5 +++-- 1 file changed, 3 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 951c9587e..5f6be219b 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 @@ -2230,14 +2230,15 @@ public class MapLogic { }); rank =1; int myRank =-1; + int uid = session.getUid(); for(CommonProto.MainLevelRankInfo.Builder builder1 : mainLevelRankInfoList){ builder1.setRank(rank++); builder.addMainLevelRankInfo(builder1.build()); - if(builder1.getUid() == myRank){ + if(builder1.getUid() == uid){ myRank = builder1.getRank(); } } - int uid = session.getUid(); + int score = RedisUtil.getInstence().getZSetScore(RedisKey.MAINLEVEL_RANK,"", Integer.toString(uid)).intValue(); if(score == -1){ score = 1011;