功能开启问题修改
parent
47e195c76a
commit
74e392be4d
|
@ -146,6 +146,9 @@ public class CommonStaticConfig extends AbstractClassStaticConfig {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sGlobalSystemConfig.setSystemOpenLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSystemOpen(), TimeUtils.Stand_CeHua_Data_format));
|
||||||
|
sGlobalSystemConfig.setSystemEndLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSystemEnd(), TimeUtils.Stand_CeHua_Data_format));
|
||||||
|
|
||||||
int[] openRules = sGlobalSystemConfig.getOpenRules();
|
int[] openRules = sGlobalSystemConfig.getOpenRules();
|
||||||
int openType = openRules[0];
|
int openType = openRules[0];
|
||||||
int openCondition = openRules[1];
|
int openCondition = openRules[1];
|
||||||
|
@ -205,18 +208,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig {
|
||||||
}
|
}
|
||||||
sWorkTechMapByTechIdAndLevelTmp.get(techId).put(level, sWorkShopTechnology);
|
sWorkTechMapByTechIdAndLevelTmp.get(techId).put(level, sWorkShopTechnology);
|
||||||
professByTechIdMapTmp.put(sWorkShopTechnology.getTechId(), sWorkShopTechnology.getProfession());
|
professByTechIdMapTmp.put(sWorkShopTechnology.getTechId(), sWorkShopTechnology.getProfession());
|
||||||
|
|
||||||
SWorkShopTechnology sWorkShopTechnologyTmp = sWorkTechMapByTechIdAndLevelTmp.get(techId).get(level - 1);
|
|
||||||
// if (sWorkShopTechnologyTmp != null) {
|
|
||||||
// Map<Integer, Integer> mineWillReturn = new HashMap<>();
|
|
||||||
// Map<Integer, Integer> willReturn = sWorkShopTechnologyTmp.getWillReturn();
|
|
||||||
// if (willReturn != null) {
|
|
||||||
// mineWillReturn.putAll(willReturn);
|
|
||||||
// }
|
|
||||||
// int[][] consume = sWorkShopTechnologyTmp.getConsume();
|
|
||||||
// HeroLogic.getInstance().combinedAttribute(consume, mineWillReturn);
|
|
||||||
// sWorkShopTechnology.setWillReturn(mineWillReturn);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sChampionshipSetting = STableManager.getConfig(SChampionshipSetting.class).get(1);
|
sChampionshipSetting = STableManager.getConfig(SChampionshipSetting.class).get(1);
|
||||||
|
@ -249,9 +240,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig {
|
||||||
leve2ids.put(sExpeditionFloorConfig.getFloor(), ids);
|
leve2ids.put(sExpeditionFloorConfig.getFloor(), ids);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("SExpeditionFloorConfig init fail",e);
|
LOGGER.error("SExpeditionFloorConfig init fail",e);
|
||||||
}
|
}
|
||||||
|
@ -287,9 +275,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig {
|
||||||
LOGGER.error("ExpeditionRecruitConfig init fail",e);
|
LOGGER.error("ExpeditionRecruitConfig init fail",e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -114,15 +114,11 @@ public class GlobalDataManaager implements IManager {
|
||||||
int id = sGlobalSystemConfig.getId();
|
int id = sGlobalSystemConfig.getId();
|
||||||
long systemOpenLong = sGlobalSystemConfig.getSystemOpenLong();
|
long systemOpenLong = sGlobalSystemConfig.getSystemOpenLong();
|
||||||
long systemEndLong = sGlobalSystemConfig.getSystemEndLong();
|
long systemEndLong = sGlobalSystemConfig.getSystemEndLong();
|
||||||
|
//强制关闭
|
||||||
if (now < systemOpenLong || now > systemEndLong) {
|
if (now < systemOpenLong || now > systemEndLong) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(openTimeOfFuntionCache.containsKey(id)){
|
if(openTimeOfFuntionCache.containsKey(id)){
|
||||||
//强制关闭
|
|
||||||
if(now<systemOpenLong || (now>systemEndLong)){
|
|
||||||
closeList.add(id);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
//开服几天后开启
|
//开服几天后开启
|
||||||
if(getServerOpenTimeCompareSpecialTimeResult()){
|
if(getServerOpenTimeCompareSpecialTimeResult()){
|
||||||
int[]limitDay = sGlobalSystemConfig.getIfOpen();
|
int[]limitDay = sGlobalSystemConfig.getIfOpen();
|
||||||
|
@ -239,7 +235,6 @@ public class GlobalDataManaager implements IManager {
|
||||||
}
|
}
|
||||||
closeAction(closeList);
|
closeAction(closeList);
|
||||||
updateGetFunctionOfTimeResponse();
|
updateGetFunctionOfTimeResponse();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void openAction(List<Integer> ids) throws Exception {
|
public void openAction(List<Integer> ids) throws Exception {
|
||||||
|
|
Loading…
Reference in New Issue