Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
e1c8e2fdc6
|
@ -2331,7 +2331,7 @@ public class MapLogic {
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
String fightKey = RedisKey.getKey(RedisKey.CHALLENGE_MONSTER_INFO, String.valueOf(uid), false);
|
String fightKey = RedisKey.getKey(RedisKey.CHALLENGE_MONSTER_INFO, String.valueOf(uid), false);
|
||||||
String fightInfos = (String) RedisUtil.getInstence().get(fightKey);
|
String fightInfos = (String) RedisUtil.getInstence().get(fightKey);
|
||||||
if (fightInfos.isEmpty()) {
|
if (fightInfos == null|| fightInfos.isEmpty()) {
|
||||||
LOGGER.info("endFight() uid=>{} fightKey={},fightId={} fightInfos == null", uid, fightKey);
|
LOGGER.info("endFight() uid=>{} fightKey={},fightId={} fightInfos == null", uid, fightKey);
|
||||||
MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), "");
|
MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), "");
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -198,8 +198,11 @@ public class ActivityLogic {
|
||||||
if (null==abstractActivity) {
|
if (null==abstractActivity) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
abstractActivity .onActivityEndSelfWithDealReward(user);
|
abstractActivity.onActivityEndSelfWithDealReward(user);
|
||||||
activityManager.removeActivity(activityId);
|
activityManager.removeActivity(activityId);
|
||||||
|
if(sGlobalActivity.getShopId()!=0){
|
||||||
|
user.getStoreManager().removeStoreInfo(sGlobalActivity.getShopId());
|
||||||
|
}
|
||||||
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
||||||
if (builder != null) {
|
if (builder != null) {
|
||||||
builder.addCloseActivityId(activityId);
|
builder.addCloseActivityId(activityId);
|
||||||
|
|
|
@ -1301,11 +1301,7 @@ public class HeroLogic {
|
||||||
|
|
||||||
public int calHeoForce(User user, Hero hero,boolean isMyself){
|
public int calHeoForce(User user, Hero hero,boolean isMyself){
|
||||||
Map<Integer, Integer> heroAllAttribute;
|
Map<Integer, Integer> heroAllAttribute;
|
||||||
if(!isMyself || user.getMapManager().getCurMapId() == 0){
|
heroAllAttribute = calHeroFinalAttributeWhenInMap(user, hero,true,0);
|
||||||
heroAllAttribute=calHeroNotBufferAttribute(user, hero,true,0);
|
|
||||||
}else{
|
|
||||||
heroAllAttribute = calHeroFinalAttributeWhenInMap(user, hero,true,0);
|
|
||||||
}
|
|
||||||
//战力保存
|
//战力保存
|
||||||
int force = calForce(heroAllAttribute);
|
int force = calForce(heroAllAttribute);
|
||||||
return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId());
|
return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId());
|
||||||
|
|
|
@ -271,7 +271,7 @@ public class PlayerLogic {
|
||||||
int uid = iSession.getUid();
|
int uid = iSession.getUid();
|
||||||
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, true);
|
int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false);
|
||||||
if(user.getPlayerInfoManager().getMaxForce() < teamForce){
|
if(user.getPlayerInfoManager().getMaxForce() < teamForce){
|
||||||
user.getPlayerInfoManager().setMaxForce(teamForce);
|
user.getPlayerInfoManager().setMaxForce(teamForce);
|
||||||
String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false);
|
String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false);
|
||||||
|
|
Loading…
Reference in New Issue