parent
c82267c4ea
commit
8946f22d57
|
@ -2677,6 +2677,7 @@ public class HeroLogic {
|
|||
for (STrumpStar star : trumpStars) {
|
||||
if (sumStar >= star.getStarNum()){
|
||||
combinedAttribute(star.getPropList(), heroAllAttribute);
|
||||
break;
|
||||
}
|
||||
}
|
||||
//玩家皮肤加成
|
||||
|
|
|
@ -1681,22 +1681,19 @@ public class PlayerLogic {
|
|||
String ip = rpcString.split(":")[0];
|
||||
String port = rpcString.split(":")[3];
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("RPCCORE").append("|")
|
||||
.append(ip).append("|")
|
||||
.append(port);
|
||||
sb.append("RPCCORE").append("|").append(ip).append("|").append(port);
|
||||
ClientAdapterPo<RPCRequestIFace.Client> rPCClient = null;
|
||||
String userStr = null ;
|
||||
try{
|
||||
rPCClient = ClientAdapterPo.getClientAdapterPo(sb.toString());
|
||||
userStr = rPCClient.getClient().getUserByRPC(uid);
|
||||
}catch (Exception e) {
|
||||
LOGGER.error("callback=>{}", e);
|
||||
LOGGER.error("callback=>{}", e.getMessage());
|
||||
} finally {
|
||||
if(rPCClient != null){
|
||||
rPCClient.returnObject(sb.toString());
|
||||
}else{
|
||||
LOGGER.info("callback=> rPCClient is null ");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
if (userStr == null || userStr.isEmpty()) {
|
||||
|
@ -1704,8 +1701,7 @@ public class PlayerLogic {
|
|||
return null;
|
||||
}
|
||||
Gson gson = RedisUtil.getInstence().getGson();
|
||||
User user = gson.fromJson(userStr, User.class);
|
||||
return user;
|
||||
return gson.fromJson(userStr, User.class);
|
||||
}
|
||||
|
||||
//森罗幻境自动挂机奖励展示
|
||||
|
|
|
@ -252,20 +252,24 @@ public class RidingSwardLogic{
|
|||
else {
|
||||
// 跨服排行榜玩家排名玩家信息
|
||||
ArrayList<CommonProto.ModelUserInfo> infos = new ArrayList<>(4);
|
||||
// 跨服排行数据
|
||||
AbstractRank rank = RankContext.getRankEnum(RankEnum.CROSS_FORCE_CURR_RANK.getType());
|
||||
Set<ZSetOperations.TypedTuple<String>> tupleSet = rank.getCrossRankByKey("", 1, 4);
|
||||
for (ZSetOperations.TypedTuple<String> tuple : tupleSet) {
|
||||
// 跨服排行榜玩家数据
|
||||
CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(Integer.parseInt(tuple.getValue()));
|
||||
if (csPlayer == null){
|
||||
continue;
|
||||
try {
|
||||
// 跨服排行数据
|
||||
AbstractRank rank = RankContext.getRankEnum(RankEnum.CROSS_FORCE_CURR_RANK.getType());
|
||||
Set<ZSetOperations.TypedTuple<String>> tupleSet = rank.getCrossRankByKey("", 1, 4);
|
||||
for (ZSetOperations.TypedTuple<String> tuple : tupleSet) {
|
||||
// 跨服排行榜玩家数据
|
||||
CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(Integer.parseInt(tuple.getValue()));
|
||||
if (csPlayer == null){
|
||||
continue;
|
||||
}
|
||||
CommonProto.ModelUserInfo.Builder builder = CommonProto.ModelUserInfo.newBuilder()
|
||||
.setUserName(csPlayer.getName())
|
||||
.setSex(csPlayer.getSex())
|
||||
.setPracticeLevel(csPlayer.getPracticeLevel());
|
||||
infos.add(builder.build());
|
||||
}
|
||||
CommonProto.ModelUserInfo.Builder builder = CommonProto.ModelUserInfo.newBuilder()
|
||||
.setUserName(csPlayer.getName())
|
||||
.setSex(csPlayer.getSex())
|
||||
.setPracticeLevel(csPlayer.getPracticeLevel());
|
||||
infos.add(builder.build());
|
||||
}catch (Exception e){
|
||||
LOGGER.error(e.getMessage());
|
||||
}
|
||||
build.addAllModelInfo(infos);
|
||||
build.setState(getState());
|
||||
|
|
|
@ -12,6 +12,8 @@ public class STrumpStar implements BaseConfig {
|
|||
|
||||
private int starNum;
|
||||
|
||||
private int[][] propListShow;
|
||||
|
||||
private int[][] propList;
|
||||
|
||||
|
||||
|
@ -33,5 +35,7 @@ public class STrumpStar implements BaseConfig {
|
|||
return propList;
|
||||
}
|
||||
|
||||
|
||||
public int[][] getPropListShow() {
|
||||
return propListShow;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue