Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
ce44abc594
|
@ -1305,7 +1305,7 @@ public class GuildFightLogic {
|
||||||
setBattleStartTime(battleStartTime).setGrabStartTime(grapStartTime).
|
setBattleStartTime(battleStartTime).setGrabStartTime(grapStartTime).
|
||||||
build();
|
build();
|
||||||
sendAllProgressUpdate();
|
sendAllProgressUpdate();
|
||||||
System.out.println(JsonFormat.printToString(carDelayProgressIndication) + "--");
|
// System.out.println(JsonFormat.printToString(carDelayProgressIndication) + "--");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2251,7 +2251,6 @@ public class HeroLogic{
|
||||||
int uid = iSession.getUid();
|
int uid = iSession.getUid();
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
String heroId = optHeroSoul.getHeroId();
|
String heroId = optHeroSoul.getHeroId();
|
||||||
System.out.println(heroId);
|
|
||||||
Hero hero = user.getHeroManager().getHero(heroId);
|
Hero hero = user.getHeroManager().getHero(heroId);
|
||||||
checkAllowedOpt(2,user,hero.getStar());
|
checkAllowedOpt(2,user,hero.getStar());
|
||||||
checkAllowedWear(user,hero,optHeroSoul.getSoulEquipIdsList(),unload);
|
checkAllowedWear(user,hero,optHeroSoul.getSoulEquipIdsList(),unload);
|
||||||
|
|
|
@ -265,7 +265,6 @@ public class PlayerLogic {
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
if(user.getTeamPosManager().getTeamPosForHero().containsKey(teamId)){
|
if(user.getTeamPosManager().getTeamPosForHero().containsKey(teamId)){
|
||||||
int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false);
|
int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false);
|
||||||
System.out.println(teamForce);
|
|
||||||
if(user.getPlayerInfoManager().getMaxForce() < teamForce){
|
if(user.getPlayerInfoManager().getMaxForce() < teamForce){
|
||||||
if(user.getPlayerInfoManager().getGuildId()!=0){
|
if(user.getPlayerInfoManager().getGuildId()!=0){
|
||||||
Poster.getPoster().dispatchEvent(new GuildForceChangeEvent(user.getId(),user.getPlayerInfoManager().getGuildId(),2,teamForce-user.getPlayerInfoManager().getMaxForce()));
|
Poster.getPoster().dispatchEvent(new GuildForceChangeEvent(user.getId(),user.getPlayerInfoManager().getGuildId(),2,teamForce-user.getPlayerInfoManager().getMaxForce()));
|
||||||
|
|
Loading…
Reference in New Issue