Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
29d1439c50
|
@ -85,6 +85,16 @@ public class CommonStaticConfig extends AbstractClassStaticConfig {
|
|||
long cacheOpenTime = GameApplication.serverConfig.getCacheOpenTime();
|
||||
sGlobalSystemConfig.setSeasonOpenLong(cacheOpenTime + Integer.parseInt(sGlobalSystemConfig.getSeasonOpen()) * 1000);
|
||||
sGlobalSystemConfig.setSeasonEndLong(cacheOpenTime + Integer.parseInt(sGlobalSystemConfig.getSeasonEnd()) * 1000);
|
||||
} else if( 4 == sGlobalSystemConfig.getType()){
|
||||
long cacheOpenTime = GameApplication.serverConfig.getCacheOpenTime();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTimeInMillis(cacheOpenTime);
|
||||
calendar.set(Calendar.HOUR_OF_DAY,0);
|
||||
calendar.set(Calendar.MINUTE,0);
|
||||
calendar.set(Calendar.SECOND,0);
|
||||
long timeInMillis = calendar.getTimeInMillis();
|
||||
sGlobalSystemConfig.setSeasonOpenLong(timeInMillis + Integer.parseInt(sGlobalSystemConfig.getSeasonOpen()) * 1000);
|
||||
sGlobalSystemConfig.setSeasonEndLong(timeInMillis + Integer.parseInt(sGlobalSystemConfig.getSeasonEnd()) * 1000);
|
||||
} else {
|
||||
sGlobalSystemConfig.setSeasonOpenLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSeasonOpen(), TimeUtils.Stand_CeHua_Data_format));
|
||||
sGlobalSystemConfig.setSeasonEndLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSeasonEnd(), TimeUtils.Stand_CeHua_Data_format));
|
||||
|
|
|
@ -138,6 +138,7 @@ public enum ErrorCode implements IErrorCode {
|
|||
SOUL_EQUIP_LEVE_MAX(103,"最高等级"),
|
||||
MAP_IN(105,"在地图探索中,不可以操作"),
|
||||
HERO_LIVE_AGAIN(106,"英雄{0}秒后复活"),
|
||||
REWARD_COLLECTING(107,"奖励正在积攒中!"),
|
||||
|
||||
;
|
||||
private static final Set<Integer> CodeSet = new HashSet<>();
|
||||
|
|
|
@ -200,6 +200,9 @@ public class CombatLogic {
|
|||
Map<Integer, CommonProto.Drop> adventureFastReward =null;
|
||||
if(type == 2){
|
||||
adventureFastReward = getNewAdventureReward(user,false);
|
||||
if(adventureFastReward.get(1).getItemlistCount()==0){
|
||||
throw new ErrorCodeException(ErrorCode.REWARD_COLLECTING);
|
||||
}
|
||||
}else{
|
||||
String err ="";
|
||||
if(position == 0){
|
||||
|
|
Loading…
Reference in New Issue