Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
ef19e67afe
|
@ -192,7 +192,8 @@ public class SuperBoxActivity extends AbstractActivity {
|
||||||
// 开服时间
|
// 开服时间
|
||||||
else if (activity.getTime() == ActivityType.OPEN_TYPE_SERVER) {
|
else if (activity.getTime() == ActivityType.OPEN_TYPE_SERVER) {
|
||||||
String openTime = GameApplication.serverConfig.getOpenTime();
|
String openTime = GameApplication.serverConfig.getOpenTime();
|
||||||
startTime = TimeUtils.stringToTimeLong2(openTime);
|
long timeLong2 = TimeUtils.stringToTimeLong2(openTime);
|
||||||
|
startTime = timeLong2 + activity.getStartTimeLong() * 1000;
|
||||||
}
|
}
|
||||||
return startTime;
|
return startTime;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue