Merge branch 'master_test'

zhangshanxue 2020-08-09 22:38:14 +08:00
commit e5ae741308
2 changed files with 2 additions and 2 deletions

View File

@ -142,7 +142,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
int equipPool = user.getEquipManager().getSoulEquipPool();
CommonProto.EndlessInfo.Builder endless = CommonProto.EndlessInfo.newBuilder();
endless.setMapId(MapLogic.getEndlessMapId());
endless.setWorldLevel(MongoUtil.getInstence().getMyMongoTemplate().findById(1, ServerConfig.class).getWorldLevel());
endless.setWorldLevel(1);
endless.setBloodScore(RedisUtil.getInstence().getZSetScore(RedisKey.BLOODY_RANK,Integer.toString(1), Integer.toString(userId)).intValue());
List<CommonProto.GiftGoodsInfo> goodsBagInfo = new ArrayList<>(SRechargeCommodityConfig.rechargeCommodityConfigMap.size());
BuyGoodsLogic.getGoodsBagInfo(userId,goodsBagInfo,true);

View File

@ -193,7 +193,7 @@ public class ItemLogic {
throw new ErrorCodeException(ErrorCode.ITEM_USE_ONE_MAX);
}
if (sItem.getUseType() !=2){ //n 选1
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
LOGGER.info("Exception::useItem ==>uid={},itemNum={},openBoxLimits={}",uid,item.getItemNum(),openBoxLimits);
}
}