Merge branch 'project0.95'
commit
521564b871
|
|
@ -347,6 +347,7 @@ public class GlobalDataManaager implements IManager {
|
||||||
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
||||||
flushGoodsTimes(user);
|
flushGoodsTimes(user);
|
||||||
}
|
}
|
||||||
|
user.getPlayerInfoManager().setLoginTime(TimeUtils.now());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,13 @@ public class MainLevelRank extends AbstractRank {
|
||||||
}
|
}
|
||||||
return o1.getRankInfo().getRank()-o2.getRankInfo().getRank();
|
return o1.getRankInfo().getRank()-o2.getRankInfo().getRank();
|
||||||
});
|
});
|
||||||
|
List<CommonProto.UserRank> buildersCopy = new ArrayList<>(ranksBuilderList.size());
|
||||||
|
for(CommonProto.UserRank userRank : builders){
|
||||||
|
buildersCopy.add(userRank.toBuilder().setRankInfo(userRank.toBuilder().getRankInfo().toBuilder().setRank(start).build()).build());
|
||||||
|
start++;
|
||||||
|
}
|
||||||
PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder();
|
PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder();
|
||||||
response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(builders);
|
response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(buildersCopy);
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ public class MessageUtil {
|
||||||
backMessage = new byte[0];
|
backMessage = new byte[0];
|
||||||
} else {
|
} else {
|
||||||
backMessage = generatedMessage.toByteArray();
|
backMessage = generatedMessage.toByteArray();
|
||||||
LOGGER.info(JsonFormat.printToString(generatedMessage));
|
// LOGGER.info(JsonFormat.printToString(generatedMessage));
|
||||||
}
|
}
|
||||||
|
|
||||||
int length = PackageConstant.UID_FIELD_LEN + PackageConstant.TOKEN_LEN
|
int length = PackageConstant.UID_FIELD_LEN + PackageConstant.TOKEN_LEN
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue