竞技场重写七版,本服竞技场和机器人不显示区服名称

master_dev
grimm 2024-02-21 11:47:57 +08:00
parent 4a0065bfc5
commit 0a68e0ebc1
3 changed files with 9 additions and 12 deletions

View File

@ -125,10 +125,7 @@ public class GmBuyGoodHandler extends BaseHandler<PlayerInfoProto.GmBuyGoodReque
/**
*
* @param user
* @param goodId
* @param state 0: 1
* @return
*/
private static boolean checkGoodStatus(User user, int goodId, int state){
SRechargeCommodityNewConfig recharge = SRechargeCommodityNewConfig.getConfigById(goodId);

View File

@ -353,7 +353,7 @@ public class PlayerLogic {
//如果这个权限是活动 且永久了 那么需要修复
SPrivilegeTypeConfig config = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(vipInfoItem.getKey());
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());
continue;
}
@ -369,7 +369,7 @@ public class PlayerLogic {
CombatLogic.getInstance().getNewAdventureReward(user,true,vipInfoItem.getValue().getEffectTime());
}
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);

View File

@ -1478,9 +1478,7 @@ public class CBean2Proto {
NewArenaRank rank = (NewArenaRank) RankEnum.toRank(RankEnum.NEW_ARENA_RANK.getType());
int ranking = rank.getRanking(roomId, uid);
long score = rank.getScore(roomId, uid);
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
return CommonProto.ArenaPersonInfo.newBuilder()
.setServername(serverName)
CommonProto.ArenaPersonInfo.Builder build = CommonProto.ArenaPersonInfo.newBuilder()
.setRank(ranking)
.setScore(score)
.setUid(csPlayer.getUserId())
@ -1491,21 +1489,23 @@ public class CBean2Proto {
.setUserMount(csPlayer.getUserMount())
.setGender(csPlayer.getSex())
.setUserSkin(csPlayer.getSkin())
.setPracticeLevel(csPlayer.getPracticeLevel())
.build();
.setPracticeLevel(csPlayer.getPracticeLevel());
if (SArenaRoom.getCrossRooms().contains(roomId)){
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
build.setServername(serverName);
}
return build.build();
}
/**
* proto
*/
public static CommonProto.ArenaPersonInfo getNewArenaRobotProto(int robotId) {
String serverName = CrossServiceLogic.simplifyServerName(GameApplication.serverId);
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(robotId);
if (sArenaRobotConfig == null){
return null;
}
return CommonProto.ArenaPersonInfo.newBuilder()
.setServername(serverName)
.setUid(robotId)
.setLevel(sArenaRobotConfig.getRobotLevel())
.setName(sArenaRobotConfig.getRobotName())