Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
c588030e47
|
|
@ -2230,14 +2230,15 @@ public class MapLogic {
|
||||||
});
|
});
|
||||||
rank =1;
|
rank =1;
|
||||||
int myRank =-1;
|
int myRank =-1;
|
||||||
|
int uid = session.getUid();
|
||||||
for(CommonProto.MainLevelRankInfo.Builder builder1 : mainLevelRankInfoList){
|
for(CommonProto.MainLevelRankInfo.Builder builder1 : mainLevelRankInfoList){
|
||||||
builder1.setRank(rank++);
|
builder1.setRank(rank++);
|
||||||
builder.addMainLevelRankInfo(builder1.build());
|
builder.addMainLevelRankInfo(builder1.build());
|
||||||
if(builder1.getUid() == myRank){
|
if(builder1.getUid() == uid){
|
||||||
myRank = builder1.getRank();
|
myRank = builder1.getRank();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int uid = session.getUid();
|
|
||||||
int score = RedisUtil.getInstence().getZSetScore(RedisKey.MAINLEVEL_RANK,"", Integer.toString(uid)).intValue();
|
int score = RedisUtil.getInstence().getZSetScore(RedisKey.MAINLEVEL_RANK,"", Integer.toString(uid)).intValue();
|
||||||
if(score == -1){
|
if(score == -1){
|
||||||
score = 1011;
|
score = 1011;
|
||||||
|
|
|
||||||
|
|
@ -381,6 +381,9 @@ public class PlayerLogic {
|
||||||
if(days == 0){
|
if(days == 0){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if(days == sRechargeCommodityConfig.getContiueDays()){
|
||||||
|
days-=1;
|
||||||
|
}
|
||||||
remainDays = TimeUtils.differentDays(nowTime * 1000L, goodsInfo.getValue()*1000L)-1;
|
remainDays = TimeUtils.differentDays(nowTime * 1000L, goodsInfo.getValue()*1000L)-1;
|
||||||
}else{
|
}else{
|
||||||
continue;
|
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) {
|
public static String getReward(Map<Integer, Integer> itemMap,Map<Integer, Integer> cardMap,Map<Integer, Integer> equipMap, Map<Integer,Integer> randomMap) {
|
||||||
StringBuilder reward= new StringBuilder();
|
StringBuilder reward= new StringBuilder();
|
||||||
for (Map.Entry<Integer, Integer> entry : itemMap.entrySet()){
|
for (Map.Entry<Integer, Integer> entry : itemMap.entrySet()){
|
||||||
|
if(entry.getValue() == 0){continue;}
|
||||||
if (reward.length() == 0){
|
if (reward.length() == 0){
|
||||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -280,6 +281,7 @@ public class ItemUtil {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (Map.Entry<Integer, Integer> entry : cardMap.entrySet()){
|
for (Map.Entry<Integer, Integer> entry : cardMap.entrySet()){
|
||||||
|
if(entry.getValue() == 0){continue;}
|
||||||
if (reward.length() == 0){
|
if (reward.length() == 0){
|
||||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -287,6 +289,7 @@ public class ItemUtil {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()){
|
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()){
|
||||||
|
if(entry.getValue() == 0){continue;}
|
||||||
if (reward.length() == 0){
|
if (reward.length() == 0){
|
||||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -294,6 +297,7 @@ public class ItemUtil {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (Map.Entry<Integer, Integer> entry : randomMap.entrySet()){
|
for (Map.Entry<Integer, Integer> entry : randomMap.entrySet()){
|
||||||
|
if(entry.getValue() == 0){continue;}
|
||||||
if (reward.length() == 0){
|
if (reward.length() == 0){
|
||||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||||
}else{
|
}else{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue