diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index d35127e38..d1439cfa6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -20,9 +20,7 @@ import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.*; -import com.sun.tools.javac.comp.Todo; import config.SPlayerLevelConfig; -import config.SPrestigeConfig; import config.SStoreConfig; import config.SStoreTypeConfig; import org.slf4j.Logger; @@ -162,10 +160,6 @@ public class StoreLogic implements IEventHandler { StoreInfo storeInfo = user.getStoreManager().getStoreInfoMap().get(sStoreTypeConfig.getId()); Map storeItem = getStoreItem(sStoreTypeConfig.getId(), sStoreTypeConfig, user); - if(storeItem == null){ - LOGGER.error("the uid={},the storeID={} is null",user.getId(),sStoreTypeConfig.getId()); - return; - } if(sStoreTypeConfig.getId()==57){ Poster.getPoster().dispatchEvent(new GoldRefreshEvent(session.getUid())); } @@ -332,7 +326,6 @@ public class StoreLogic implements IEventHandler { StoreInfo storeInfo = storeManager.getStoreInfoMap().get(storeType); if(storeInfo==null){ long now = TimeUtils.now(); - long startTime = now; long endTime = 0; if(sStoreTypeConfig.getStoreOpenRule() == 2 ){ endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000L + now; @@ -343,7 +336,7 @@ public class StoreLogic implements IEventHandler { return; } itemNumMap.put(rewardId, 0); - storeManager.newStoreInfo(sStoreTypeConfig.getId(),System.currentTimeMillis(),startTime,endTime,itemNumMap); + storeManager.newStoreInfo(sStoreTypeConfig.getId(),System.currentTimeMillis(), now,endTime,itemNumMap); }else{ Map itemNumMap = storeInfo.getItemNumMap(); int rewardId = getRewardId(storeType,sort,user); @@ -454,16 +447,11 @@ public class StoreLogic implements IEventHandler { } // 额外开启条件 int[] openRule = sStoreConfig.getOpenRule(); - switch (openRule[0]){ - case 1: - // 杀敌数 - int killNum = playerInfoManager.getExploreKillTotalNum(); - if (killNum < openRule[1]){ - continue; - } - break; - default: - break; + if (openRule[0] == 1) {// 杀敌数 + int killNum = playerInfoManager.getExploreKillTotalNum(); + if (killNum < openRule[1]) { + continue; + } } totalWeight += sStoreConfig.getWeight(); randomSstoreConfigList.add(sStoreConfig); @@ -489,9 +477,6 @@ public class StoreLogic implements IEventHandler { /** * 购买商店物品 - * @param storeId - * @param itemId - * @throws Exception */ public static CommonProto.Drop buyStoreItem(int uid,int storeId, int itemId,int itemNum) throws Exception { User user = UserManager.getUser(uid); @@ -504,7 +489,7 @@ public class StoreLogic implements IEventHandler { int length = goods.length; int[][] extraAdd = sStoreConfig.getExtraAdd(); int add = 10000; - if(extraAdd!=null && extraAdd.length>0){ + if(extraAdd != null){ for(int[] extra : extraAdd){ int type = extra[0]; if(type == 2){ @@ -755,14 +740,12 @@ public class StoreLogic implements IEventHandler { long nowTime = System.currentTimeMillis(); switch (type){ case 2: - for(int i=1;i