back_recharge
wangyuan 2019-08-17 15:23:40 +08:00
parent 4c9dc4245b
commit 8005f5d2c7
1 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,6 @@
package com.ljsd.jieling.handler; package com.ljsd.jieling.handler;
import com.ljsd.jieling.config.SChallengeConfig;
import com.ljsd.jieling.config.SLotterySetting; import com.ljsd.jieling.config.SLotterySetting;
import com.ljsd.jieling.config.SRechargeCommodityConfig; import com.ljsd.jieling.config.SRechargeCommodityConfig;
import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisKey;
@ -77,8 +78,12 @@ public class GetPlayerInfoHandler extends BaseHandler{
RoomInfo roomInfo = user.getRoomInfo(); RoomInfo roomInfo = user.getRoomInfo();
MapManager mapManager = user.getMapManager(); MapManager mapManager = user.getMapManager();
if(user.getMapManager().getCurMapId()!=0 && user.getMapManager().getMission() == null){ if(user.getMapManager().getCurMapId()!=0 && user.getMapManager().getMission() == null){
int type = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId()).getType();
if(type == 1 || type == 3){
user.getMapManager().setCurMapId(0); user.getMapManager().setCurMapId(0);
} }
}
CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getPlayerInfoManager().getMapId(), user.getMapManager().getCurMapId(),user.getMapManager(),roomInfo); CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getPlayerInfoManager().getMapId(), user.getMapManager().getCurMapId(),user.getMapManager(),roomInfo);
CommonProto.SuddenlyBossInfo suddenlyBossInfo = CommonProto.SuddenlyBossInfo.newBuilder().setSuddBossId(mapManager.getSuddenlyBoss()).setEndTime(mapManager.getSuddenlyBossEndTime()).setFindMapId(mapManager.getFindSuddenlyBossMapId()).build(); CommonProto.SuddenlyBossInfo suddenlyBossInfo = CommonProto.SuddenlyBossInfo.newBuilder().setSuddBossId(mapManager.getSuddenlyBoss()).setEndTime(mapManager.getSuddenlyBossEndTime()).setFindMapId(mapManager.getFindSuddenlyBossMapId()).build();
CommonProto.VipBaseInfo vipInfoProto = CommonProto.VipBaseInfo.newBuilder() CommonProto.VipBaseInfo vipInfoProto = CommonProto.VipBaseInfo.newBuilder()