竞技场重写七版,本服竞技场和机器人不显示区服名称
parent
4a0065bfc5
commit
0a68e0ebc1
|
@ -125,10 +125,7 @@ public class GmBuyGoodHandler extends BaseHandler<PlayerInfoProto.GmBuyGoodReque
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 验证礼包是否购买
|
* 验证礼包是否购买
|
||||||
* @param user
|
|
||||||
* @param goodId
|
|
||||||
* @param state 0:是否可买, 1:是否买过
|
* @param state 0:是否可买, 1:是否买过
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
private static boolean checkGoodStatus(User user, int goodId, int state){
|
private static boolean checkGoodStatus(User user, int goodId, int state){
|
||||||
SRechargeCommodityNewConfig recharge = SRechargeCommodityNewConfig.getConfigById(goodId);
|
SRechargeCommodityNewConfig recharge = SRechargeCommodityNewConfig.getConfigById(goodId);
|
||||||
|
|
|
@ -353,7 +353,7 @@ public class PlayerLogic {
|
||||||
//如果这个权限是活动 且永久了 那么需要修复
|
//如果这个权限是活动 且永久了 那么需要修复
|
||||||
SPrivilegeTypeConfig config = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(vipInfoItem.getKey());
|
SPrivilegeTypeConfig config = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(vipInfoItem.getKey());
|
||||||
if (config == null){
|
if (config == null){
|
||||||
LOGGER.info("特权刷新删除日志1:{}-{}",vipInfoItem.getKey(),vipInfoItem.getValue().getEffectTime());
|
LOGGER.info("特权刷新删除日志1:{}-{}-{}",user.getId(),vipInfoItem.getKey(),vipInfoItem.getValue().getEffectTime());
|
||||||
removePrivileges.add(vipInfoItem.getKey());
|
removePrivileges.add(vipInfoItem.getKey());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -369,7 +369,7 @@ public class PlayerLogic {
|
||||||
CombatLogic.getInstance().getNewAdventureReward(user,true,vipInfoItem.getValue().getEffectTime());
|
CombatLogic.getInstance().getNewAdventureReward(user,true,vipInfoItem.getValue().getEffectTime());
|
||||||
}
|
}
|
||||||
removePrivileges.add(vipInfoItem.getKey());
|
removePrivileges.add(vipInfoItem.getKey());
|
||||||
LOGGER.info("特权刷新删除日志2:{}-{}",vipInfoItem.getKey(),vipInfoItem.getValue().getEffectTime());
|
LOGGER.info("特权刷新删除日志2:{}-{}-{}",user.getId(),vipInfoItem.getKey(),vipInfoItem.getValue().getEffectTime());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
playerInfoManager.vipFlush(removePrivileges);
|
playerInfoManager.vipFlush(removePrivileges);
|
||||||
|
|
|
@ -1478,9 +1478,7 @@ public class CBean2Proto {
|
||||||
NewArenaRank rank = (NewArenaRank) RankEnum.toRank(RankEnum.NEW_ARENA_RANK.getType());
|
NewArenaRank rank = (NewArenaRank) RankEnum.toRank(RankEnum.NEW_ARENA_RANK.getType());
|
||||||
int ranking = rank.getRanking(roomId, uid);
|
int ranking = rank.getRanking(roomId, uid);
|
||||||
long score = rank.getScore(roomId, uid);
|
long score = rank.getScore(roomId, uid);
|
||||||
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
|
CommonProto.ArenaPersonInfo.Builder build = CommonProto.ArenaPersonInfo.newBuilder()
|
||||||
return CommonProto.ArenaPersonInfo.newBuilder()
|
|
||||||
.setServername(serverName)
|
|
||||||
.setRank(ranking)
|
.setRank(ranking)
|
||||||
.setScore(score)
|
.setScore(score)
|
||||||
.setUid(csPlayer.getUserId())
|
.setUid(csPlayer.getUserId())
|
||||||
|
@ -1491,21 +1489,23 @@ public class CBean2Proto {
|
||||||
.setUserMount(csPlayer.getUserMount())
|
.setUserMount(csPlayer.getUserMount())
|
||||||
.setGender(csPlayer.getSex())
|
.setGender(csPlayer.getSex())
|
||||||
.setUserSkin(csPlayer.getSkin())
|
.setUserSkin(csPlayer.getSkin())
|
||||||
.setPracticeLevel(csPlayer.getPracticeLevel())
|
.setPracticeLevel(csPlayer.getPracticeLevel());
|
||||||
.build();
|
if (SArenaRoom.getCrossRooms().contains(roomId)){
|
||||||
|
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
|
||||||
|
build.setServername(serverName);
|
||||||
|
}
|
||||||
|
return build.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 转换proto竞技场机器人信息对象
|
* 转换proto竞技场机器人信息对象
|
||||||
*/
|
*/
|
||||||
public static CommonProto.ArenaPersonInfo getNewArenaRobotProto(int robotId) {
|
public static CommonProto.ArenaPersonInfo getNewArenaRobotProto(int robotId) {
|
||||||
String serverName = CrossServiceLogic.simplifyServerName(GameApplication.serverId);
|
|
||||||
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(robotId);
|
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(robotId);
|
||||||
if (sArenaRobotConfig == null){
|
if (sArenaRobotConfig == null){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return CommonProto.ArenaPersonInfo.newBuilder()
|
return CommonProto.ArenaPersonInfo.newBuilder()
|
||||||
.setServername(serverName)
|
|
||||||
.setUid(robotId)
|
.setUid(robotId)
|
||||||
.setLevel(sArenaRobotConfig.getRobotLevel())
|
.setLevel(sArenaRobotConfig.getRobotLevel())
|
||||||
.setName(sArenaRobotConfig.getRobotName())
|
.setName(sArenaRobotConfig.getRobotName())
|
||||||
|
|
Loading…
Reference in New Issue