Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
682d33f6cd
|
@ -226,7 +226,6 @@ public class CombatLogic {
|
|||
flushBossNextTime = nextFlushTime;
|
||||
}
|
||||
}
|
||||
flushBossNextTime=30;
|
||||
return flushBossNextTime;
|
||||
}
|
||||
|
||||
|
@ -345,7 +344,7 @@ public class CombatLogic {
|
|||
int now = (int)(System.currentTimeMillis()/1000);
|
||||
SGameSetting gameSetting = SGameSetting.getGameSetting();
|
||||
int adventureRefresh = gameSetting.getAdventureRefresh();
|
||||
int adventureOffline = gameSetting.getAdventureOffline();
|
||||
int adventureOffline = gameSetting.getAdventureOffline()*60*60/adventureRefresh;
|
||||
Map<Integer, Integer> baseItemMap = new HashMap<>();
|
||||
Map<Integer, Integer> baseCardMap = new HashMap<>();
|
||||
Map<Integer, Integer> baseEquipMap = new HashMap<>();
|
||||
|
@ -364,9 +363,10 @@ public class CombatLogic {
|
|||
}
|
||||
int startTime = adventureStateInfoTmp.getStartTime();
|
||||
int times = (now - startTime) / adventureRefresh;
|
||||
int refreshTimes = times;
|
||||
times = adventureOffline > times ? times : adventureOffline;
|
||||
if (times > 0) {
|
||||
adventureStateInfoTmp.setStartTime(startTime + times * adventureRefresh);
|
||||
adventureStateInfoTmp.setStartTime(startTime + refreshTimes * adventureRefresh);
|
||||
SAdventureConfig sAdventureConfig = SAdventureConfig.getConfig().get(positionTmp);
|
||||
int baseRewardGroup[] = sAdventureConfig.getBaseRewardGroup();
|
||||
int[][] randomRewardGroup = sAdventureConfig.getRandomRewardGroup();
|
||||
|
|
Loading…
Reference in New Issue