Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
lvxinran 2019-12-17 00:41:09 +08:00
commit 1ab6d2a649
2 changed files with 20 additions and 1 deletions

View File

@ -3265,10 +3265,21 @@ public class MapLogic {
MessageUtil.sendIndicationMessage(entry.getValue(),1,MessageTypeProto.MessageType.MAP_OUT_INDICATION_VALUE,null,true);
// resetMapInfo(user,false);
}
endLessClear(entry.getValue());
}
updateEndlessSeason(0);
}
public void endLessClear(ISession session) throws Exception {
User user = UserManager.getUser(session.getUid());
MapManager mapManager = user.getMapManager();
mapManager.setEndlessMapInfo(new EndlessMapInfo());
if(mapManager.getCurMapId()!=0&&SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
MessageUtil.sendIndicationMessage(session,1,MessageTypeProto.MessageType.MAP_OUT_INDICATION_VALUE,null,true);
resetMapInfo(user,false);
}
}
public void clearEndlessItem(User user) throws Exception {
SEndlessMapConfig config = SEndlessMapConfig.sEndlessMapConfigMap.get(MapLogic.getEndlessMapId());
int[] mapItem = config.getMapItem();
@ -3345,4 +3356,8 @@ public class MapLogic {
UserManager.getUser(session.getUid()).getMapManager().updateEndlessSkipFight(type);
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
}
public static int getEndlessSeason() {
return endlessSeason;
}
}

View File

@ -10,6 +10,7 @@ import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.handler.map.MapLogic;
import com.ljsd.jieling.ktbeans.KtEventUtils;
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
import com.ljsd.jieling.logic.GlobalDataManaager;
@ -299,6 +300,9 @@ public class ProtocolsManager implements ProtocolsAbstract {
PlayerInfoProto.UpdateBagIndication build = PlayerInfoProto.UpdateBagIndication.newBuilder().addAllItem(allItemList).setType(0).build();
MessageUtil.sendIndicationMessage(session,1,MessageTypeProto.MessageType.UPDATE_BAG_INDICATION_VALUE,build,true);
}
if(userInMem.getMapManager().getEndlessMapInfo().getSeason()!=MapLogic.getEndlessSeason()){
MapLogic.getInstance().endLessClear(session);
}
MongoUtil.getLjsdMongoTemplate().lastUpdate();
} catch (Exception e) {
LOGGER.error("the uid={} processFlush wrong ,e={}",session.getUid(),e);