Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
c588030e47
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -273,6 +273,7 @@ public class ItemUtil {
|
|||
public static String getReward(Map<Integer, Integer> itemMap,Map<Integer, Integer> cardMap,Map<Integer, Integer> equipMap, Map<Integer,Integer> randomMap) {
|
||||
StringBuilder reward= new StringBuilder();
|
||||
for (Map.Entry<Integer, Integer> 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<Integer, Integer> 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<Integer, Integer> 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<Integer, Integer> entry : randomMap.entrySet()){
|
||||
if(entry.getValue() == 0){continue;}
|
||||
if (reward.length() == 0){
|
||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||
}else{
|
||||
|
|
|
|||
Loading…
Reference in New Issue