公会修改、试炼修改

back_recharge
lvxinran 2019-09-07 15:03:33 +08:00
parent c7d61c098d
commit d6f2b203e0
4 changed files with 26 additions and 8 deletions

View File

@ -163,7 +163,7 @@ public class GMRequestHandler extends BaseHandler{
int itemId = sItem.getId();
int itemType = sItem.getItemType();
int itemNum = 9999;
if(itemType == GlobalItemType.CARD ||itemType == GlobalItemType.EQUIP ||itemType == GlobalItemType.ESPECIAL_EQUIP){
if(itemType == GlobalItemType.CARD ||itemType == GlobalItemType.EQUIP ||itemType == GlobalItemType.ESPECIAL_EQUIP||itemType==GlobalItemType.SOUL_MARK){
itemNum =1;
}
gmDrop[i++] = new int[]{itemId,itemNum};

View File

@ -2651,9 +2651,9 @@ public class MapLogic {
int[][] bossType = config.getRandomBossType();
type = MathUtils.randomFromWeight(bossType);
if(mapManager.getTower()%5!=0){
type = 3;
}
// if(mapManager.getTower()%5!=0){
// type = 3;
// }
LOGGER.info("trigger!!!!!!!!!!!!!!!!!-------->{},{}",CellUtil.pos2XY(mapManager.getCurXY())[0],CellUtil.pos2XY(mapManager.getCurXY())[1]);
int[][][] pointId = config.getRandomMapPointId();
int mapId = config.getMapId();

View File

@ -44,6 +44,9 @@ public class BloodLogic {
HeroManager heroManager = user.getHeroManager();
TeamPosManager teamPosManager = user.getTeamPosManager();
List<TeamPosHeroInfo> teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(teamId);
if(teamPosHeroInfos==null){
teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(1);
}
Iterator<TeamPosHeroInfo> it = teamPosHeroInfos.iterator();
Map<String, FamilyHeroInfo> heroAllAttribute = new HashMap<>();
while (it.hasNext()) {

View File

@ -67,12 +67,16 @@ public class GuildFightLogic {
Family.FamilyDefendViewResponse.Builder response = Family.FamilyDefendViewResponse.newBuilder();
SGuildSetting guildSetting = sGuildSetting;
for (Map.Entry<Integer, Integer> entry : defendInfo.entrySet()) {
int force = HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 501, false);
if(force==0){
force = HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 1, false);
}
int memberType = GuildLogic.getMemberType(entry.getKey(), guildInfo.getMembers());
Family.FamilyDefendInfo.Builder defend = Family.FamilyDefendInfo.newBuilder();
defend.setStarCount(guildSetting.getStarNum()[memberType-1]);
defend.setUid(entry.getKey());
defend.setBuildId(entry.getValue());
defend.setCurForce(HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 501, false));
defend.setCurForce(force);
response.addInfo(defend);
}
MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true);
@ -108,12 +112,19 @@ public class GuildFightLogic {
}
}else{
List<TeamPosHeroInfo> teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(501);
if(teamPosHeroInfos==null){
teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(1);
}
for(TeamPosHeroInfo heroInfo:teamPosHeroInfos){
team.addHeroTid(user.getHeroManager().getHero(heroInfo.getHeroId()).getTemplateId());
}
}
oneInfo.setTeam(team);
oneInfo.setTotalForce(HeroLogic.getInstance().calTeamTotalForce(user, 501, false));
int force = HeroLogic.getInstance().calTeamTotalForce(user, 501, false);
if(force==0){
force = HeroLogic.getInstance().calTeamTotalForce(user, 1, false);
}
oneInfo.setTotalForce(force);
if (teamPosManager.getTeamPosForPoken().get(1) != null && teamPosManager.getTeamPosForPoken().get(1).size() > 0) {
for (TeamPosForPokenInfo posForPokenInfo : teamPosManager.getTeamPosForPoken().get(1)) {
oneInfo.addPokemonInfos(posForPokenInfo.getPokenId());
@ -171,6 +182,10 @@ public class GuildFightLogic {
fightInfo.addBuildBuff(buffInfo);
}
for (Map.Entry<Integer, Integer> entry : defendInfo.entrySet()) {
int force = HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 501, false);
if(force==0){
force = HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 1, false);
}
Family.FamilyFightPlayerInfo.Builder playerInfo = Family.FamilyFightPlayerInfo.newBuilder();
playerInfo.setBuildId(entry.getValue());
playerInfo.setStarCount(fightValues.get(entry.getKey()).getStarCount());
@ -180,7 +195,7 @@ public class GuildFightLogic {
.setUserName(playerManager.getNickName())
.setUserLevel(playerManager.getLevel())
.setPosition(GuildLogic.getMemberType(entry.getKey(),GuilidManager.guildInfoMap.get(guildId).getMembers()))
.setSoulForce(HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 501, false))
.setSoulForce(force)
.setHead(playerManager.getHead())
.setFrame(playerManager.getHeadFrame())
.setContribute(0);
@ -589,7 +604,7 @@ public class GuildFightLogic {
}
}
//清除布防信息
GuilidManager.guildInfoMap.get(Integer.valueOf(index)).removeAllDefendInfo();
// GuilidManager.guildInfoMap.get(Integer.valueOf(index)).removeAllDefendInfo();
}
redisUtil.del(matchingKey);
redisUtil.del(attackCountKey);