跨服修改
parent
4b641f5109
commit
a9802099c0
|
@ -91,7 +91,7 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
|
||||||
if (!ArenaWorldLogic.checkJoin(String.valueOf(iSession.getUid()))) {
|
if (!ArenaWorldLogic.checkJoin(String.valueOf(iSession.getUid()))) {
|
||||||
throw new ErrorCodeException(ErrorCode.WORLD_LEVELIMIT);
|
throw new ErrorCodeException(ErrorCode.WORLD_LEVELIMIT);
|
||||||
}
|
}
|
||||||
boolean check = PlayerLogic.getInstance().checkAndUpdate(user, VipPrivilegeType.WORLD_ARENA_CHALLENGE_TIMES, 1);
|
boolean check = PlayerLogic.getInstance().check(user, VipPrivilegeType.WORLD_ARENA_CHALLENGE_TIMES, 1);
|
||||||
if(!check){
|
if(!check){
|
||||||
throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT);
|
throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT);
|
||||||
}
|
}
|
||||||
|
@ -108,6 +108,8 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
|
||||||
reward[0]=setting.getRespectReward();
|
reward[0]=setting.getRespectReward();
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.drop(UserManager.getUser(iSession.getUid()), reward, BIReason.WORLD_PRO_DROP);
|
CommonProto.Drop.Builder drop = ItemUtil.drop(UserManager.getUser(iSession.getUid()), reward, BIReason.WORLD_PRO_DROP);
|
||||||
builder1.setDrop(drop);
|
builder1.setDrop(drop);
|
||||||
|
PlayerLogic.getInstance().checkAndUpdate(user, VipPrivilegeType.WORLD_ARENA_CHALLENGE_TIMES, 1);
|
||||||
|
|
||||||
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.GetWorldArenaChallengeResponse.getNumber(),builder1.build(),true);
|
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.GetWorldArenaChallengeResponse.getNumber(),builder1.build(),true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -243,6 +245,7 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
|
||||||
builder.setOldrank(newRank==-1?9999:newRank);
|
builder.setOldrank(newRank==-1?9999:newRank);
|
||||||
RedisUtil.getInstence().putMapEntry(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(proto.getChallengeUid()), s, builder.build().toByteArray());
|
RedisUtil.getInstence().putMapEntry(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(proto.getChallengeUid()), s, builder.build().toByteArray());
|
||||||
}
|
}
|
||||||
|
PlayerLogic.getInstance().checkAndUpdate(user, VipPrivilegeType.WORLD_ARENA_CHALLENGE_TIMES, 1);
|
||||||
//保存自己的编队
|
//保存自己的编队
|
||||||
CrossServiceLogic.getInstance().dispose(user);
|
CrossServiceLogic.getInstance().dispose(user);
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ public class CrossServiceLogic {
|
||||||
|
|
||||||
Map<String, PropertyItem> equipMap = user.getEquipManager().getEquipMap();
|
Map<String, PropertyItem> equipMap = user.getEquipManager().getEquipMap();
|
||||||
heroMap.values().forEach(v-> v.getJewelInfo().forEach(v2->{
|
heroMap.values().forEach(v-> v.getJewelInfo().forEach(v2->{
|
||||||
PropertyItem item = (PropertyItem)equipMap.get(v2).clone();
|
PropertyItem item = equipMap.get(v2);
|
||||||
jewels.put(v2,item);
|
jewels.put(v2,item);
|
||||||
}));
|
}));
|
||||||
// 总战力
|
// 总战力
|
||||||
|
|
|
@ -733,7 +733,11 @@ public class ArenaLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
MongoUtil.getInstence().lastUpdate();
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
LOGGER.info("罗浮争霸:转到休息状态,nowstate:{} to RELAX_STATE",state);
|
LOGGER.info("罗浮争霸:转到休息状态,nowstate:{} to RELAX_STATE",state);
|
||||||
setState(RELAX_STATE);
|
setState(RELAX_STATE);
|
||||||
|
@ -949,6 +953,7 @@ public class ArenaLogic {
|
||||||
.setUserMount(enemy.getPlayerManager().getUserMount())
|
.setUserMount(enemy.getPlayerManager().getUserMount())
|
||||||
.setGender(enemy.getPlayerManager().getGender())
|
.setGender(enemy.getPlayerManager().getGender())
|
||||||
.setUserSkin(enemy.getPlayerManager().getSkin())
|
.setUserSkin(enemy.getPlayerManager().getSkin())
|
||||||
|
.setPracticeLevel(enemy.getPlayerManager().getPracticeLevel())
|
||||||
.setRank(rank)
|
.setRank(rank)
|
||||||
.build();
|
.build();
|
||||||
return CommonProto.ArenaEnemy.newBuilder()
|
return CommonProto.ArenaEnemy.newBuilder()
|
||||||
|
|
|
@ -129,8 +129,8 @@ public class PropertyItem extends MongoBase implements Cloneable {
|
||||||
try {
|
try {
|
||||||
clone = (PropertyItem) super.clone();
|
clone = (PropertyItem) super.clone();
|
||||||
|
|
||||||
clone.propertyValueByIdMap = new HashMap<>(clone.propertyValueByIdMap);
|
clone.propertyValueByIdMap = new HashMap<>(this.propertyValueByIdMap);
|
||||||
clone.secondValueByIdMap = new HashMap<>(clone.secondValueByIdMap);
|
clone.secondValueByIdMap = new HashMap<>(this.secondValueByIdMap);
|
||||||
} catch (CloneNotSupportedException e) {
|
} catch (CloneNotSupportedException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
|
@ -667,6 +667,7 @@ public class PlayerLogic {
|
||||||
.setLevel(query.getPlayerManager().getLevel())
|
.setLevel(query.getPlayerManager().getLevel())
|
||||||
.setName(query.getPlayerManager().getName())
|
.setName(query.getPlayerManager().getName())
|
||||||
.setGuildName(query.getPlayerManager().getGuildName())
|
.setGuildName(query.getPlayerManager().getGuildName())
|
||||||
|
.setPracticeLevel(query.getPlayerManager().getPracticeLevel())
|
||||||
.setUid(id);
|
.setUid(id);
|
||||||
CommonProto.TeamOneTeamInfo.Builder teamOneTeamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
CommonProto.TeamOneTeamInfo.Builder teamOneTeamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||||
List<TeamPosHeroInfo> teamPosHeroInfos = query.getHeroManager().getTeams().get(teamId);
|
List<TeamPosHeroInfo> teamPosHeroInfos = query.getHeroManager().getTeams().get(teamId);
|
||||||
|
@ -678,6 +679,14 @@ public class PlayerLogic {
|
||||||
teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(entry.getValue(), entry.getKey()));
|
teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(entry.getValue(), entry.getKey()));
|
||||||
}
|
}
|
||||||
teamOneTeamInfo.setTotalForce(query.getHeroManager().getTotalForce());
|
teamOneTeamInfo.setTotalForce(query.getHeroManager().getTotalForce());
|
||||||
|
for(Map.Entry<Integer, PurpleMansionSeal> entry:query.getSeals().entrySet()){
|
||||||
|
PurpleMansionSeal value = entry.getValue();
|
||||||
|
ArenaOfHero arenaOfHero = query.getHeroManager().getHeros().get(value.getSubId());
|
||||||
|
if(value.getState()==0){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
teamOneTeamInfo.addSealShow(CommonProto.PurpleSealShowInfo.newBuilder().setType(value.getType()).setId(value.getSealId()).setHeroTId(arenaOfHero==null?0:arenaOfHero.getTemplateId()));
|
||||||
|
}
|
||||||
builder.setTeam(teamOneTeamInfo.build());
|
builder.setTeam(teamOneTeamInfo.build());
|
||||||
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(builder.build());
|
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(builder.build());
|
||||||
return playerTeamInfo.build();
|
return playerTeamInfo.build();
|
||||||
|
@ -763,6 +772,10 @@ public class PlayerLogic {
|
||||||
heroBuilder.addEquipIdList(equipId);
|
heroBuilder.addEquipIdList(equipId);
|
||||||
builder.addEquip(CBean2Proto.getEquipProto(equipId));
|
builder.addEquip(CBean2Proto.getEquipProto(equipId));
|
||||||
}
|
}
|
||||||
|
Map<Integer, Integer> soulEquipByPositionMap = hero.getSoulEquipByPositionMap();
|
||||||
|
for(Map.Entry<Integer,Integer> entry: soulEquipByPositionMap.entrySet()){
|
||||||
|
heroBuilder.addSoulPos(CommonProto.SoulPos.newBuilder().setEquipId(entry.getValue()).setPosition(entry.getKey()));
|
||||||
|
}
|
||||||
builder.setForce(HeroLogic.getInstance().calForce(heroNotBufferAttribute));
|
builder.setForce(HeroLogic.getInstance().calForce(heroNotBufferAttribute));
|
||||||
builder.setHero(heroBuilder);
|
builder.setHero(heroBuilder);
|
||||||
return builder.build();
|
return builder.build();
|
||||||
|
|
|
@ -83,6 +83,7 @@ public class CrossArenaRank extends AbstractRank {
|
||||||
.setUserMount(query.getPlayerManager().getUserMount())
|
.setUserMount(query.getPlayerManager().getUserMount())
|
||||||
.setRankInfo(everyRankInfo)
|
.setRankInfo(everyRankInfo)
|
||||||
.setForce(query.getHeroManager().getTotalForce())
|
.setForce(query.getHeroManager().getTotalForce())
|
||||||
|
.setPracticeLevel(query.getPlayerManager().getPracticeLevel())
|
||||||
.setSex(0);
|
.setSex(0);
|
||||||
builder.addRanks(everyRank);
|
builder.addRanks(everyRank);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue