代码优化

back_recharge
duhui 2023-02-16 16:43:21 +08:00
parent 2cf97cce54
commit ce53589c72
1 changed files with 13 additions and 30 deletions

View File

@ -20,9 +20,7 @@ import com.ljsd.jieling.logic.player.PlayerLogic;
import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.server.ProtocolsManager;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.util.*; import com.ljsd.jieling.util.*;
import com.sun.tools.javac.comp.Todo;
import config.SPlayerLevelConfig; import config.SPlayerLevelConfig;
import config.SPrestigeConfig;
import config.SStoreConfig; import config.SStoreConfig;
import config.SStoreTypeConfig; import config.SStoreTypeConfig;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -162,10 +160,6 @@ public class StoreLogic implements IEventHandler {
StoreInfo storeInfo = user.getStoreManager().getStoreInfoMap().get(sStoreTypeConfig.getId()); StoreInfo storeInfo = user.getStoreManager().getStoreInfoMap().get(sStoreTypeConfig.getId());
Map<Integer, Integer> storeItem = getStoreItem(sStoreTypeConfig.getId(), sStoreTypeConfig, user); Map<Integer, Integer> 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){ if(sStoreTypeConfig.getId()==57){
Poster.getPoster().dispatchEvent(new GoldRefreshEvent(session.getUid())); Poster.getPoster().dispatchEvent(new GoldRefreshEvent(session.getUid()));
} }
@ -332,7 +326,6 @@ public class StoreLogic implements IEventHandler {
StoreInfo storeInfo = storeManager.getStoreInfoMap().get(storeType); StoreInfo storeInfo = storeManager.getStoreInfoMap().get(storeType);
if(storeInfo==null){ if(storeInfo==null){
long now = TimeUtils.now(); long now = TimeUtils.now();
long startTime = now;
long endTime = 0; long endTime = 0;
if(sStoreTypeConfig.getStoreOpenRule() == 2 ){ if(sStoreTypeConfig.getStoreOpenRule() == 2 ){
endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000L + now; endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000L + now;
@ -343,7 +336,7 @@ public class StoreLogic implements IEventHandler {
return; return;
} }
itemNumMap.put(rewardId, 0); itemNumMap.put(rewardId, 0);
storeManager.newStoreInfo(sStoreTypeConfig.getId(),System.currentTimeMillis(),startTime,endTime,itemNumMap); storeManager.newStoreInfo(sStoreTypeConfig.getId(),System.currentTimeMillis(), now,endTime,itemNumMap);
}else{ }else{
Map<Integer, Integer> itemNumMap = storeInfo.getItemNumMap(); Map<Integer, Integer> itemNumMap = storeInfo.getItemNumMap();
int rewardId = getRewardId(storeType,sort,user); int rewardId = getRewardId(storeType,sort,user);
@ -454,16 +447,11 @@ public class StoreLogic implements IEventHandler {
} }
// 额外开启条件 // 额外开启条件
int[] openRule = sStoreConfig.getOpenRule(); int[] openRule = sStoreConfig.getOpenRule();
switch (openRule[0]){ if (openRule[0] == 1) {// 杀敌数
case 1: int killNum = playerInfoManager.getExploreKillTotalNum();
// 杀敌数 if (killNum < openRule[1]) {
int killNum = playerInfoManager.getExploreKillTotalNum(); continue;
if (killNum < openRule[1]){ }
continue;
}
break;
default:
break;
} }
totalWeight += sStoreConfig.getWeight(); totalWeight += sStoreConfig.getWeight();
randomSstoreConfigList.add(sStoreConfig); 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 { public static CommonProto.Drop buyStoreItem(int uid,int storeId, int itemId,int itemNum) throws Exception {
User user = UserManager.getUser(uid); User user = UserManager.getUser(uid);
@ -504,7 +489,7 @@ public class StoreLogic implements IEventHandler {
int length = goods.length; int length = goods.length;
int[][] extraAdd = sStoreConfig.getExtraAdd(); int[][] extraAdd = sStoreConfig.getExtraAdd();
int add = 10000; int add = 10000;
if(extraAdd!=null && extraAdd.length>0){ if(extraAdd != null){
for(int[] extra : extraAdd){ for(int[] extra : extraAdd){
int type = extra[0]; int type = extra[0];
if(type == 2){ if(type == 2){
@ -755,14 +740,12 @@ public class StoreLogic implements IEventHandler {
long nowTime = System.currentTimeMillis(); long nowTime = System.currentTimeMillis();
switch (type){ switch (type){
case 2: case 2:
for(int i=1;i<sStoreTypeConfig.getRefreshType().length;i++){ boolean overTime = TimeUtils.isOverTime(1, storeInfo.getLastRefreshTime());
boolean overTime = TimeUtils.isOverTime(i, storeInfo.getLastRefreshTime()); if (overTime){
if (overTime){ itemNumMap = getStoreItem(sStoreTypeConfig.getId(),sStoreTypeConfig,user);
itemNumMap = getStoreItem(sStoreTypeConfig.getId(),sStoreTypeConfig,user); storeInfo.setLastRefreshTime(nowTime);
storeInfo.setLastRefreshTime(nowTime);
}
break;
} }
break;
case 3: case 3:
long lastRefreshTime = storeInfo.getLastRefreshTime(); long lastRefreshTime = storeInfo.getLastRefreshTime();
int intervalTime = time * 1000 * 60 * 60; int intervalTime = time * 1000 * 60 * 60;
@ -799,7 +782,7 @@ public class StoreLogic implements IEventHandler {
} }
if(sStoreTypeConfig.getStoreType() == storeType.getType()){ if(sStoreTypeConfig.getStoreType() == storeType.getType()){
return true; return true;
}; }
} }
return false; return false;
} }