惊喜礼盒,bug修改
parent
6cd02d8979
commit
bae043a10a
|
@ -176,11 +176,11 @@ public class SuperBoxActivity extends AbstractActivity {
|
||||||
long startTime = 0;
|
long startTime = 0;
|
||||||
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
// 绝对时间
|
// 绝对时间
|
||||||
if (activity.getType() == ActivityType.OPEN_TYPE_TIME){
|
if (activity.getTime() == ActivityType.OPEN_TYPE_TIME){
|
||||||
startTime = activity.getStartTimeLong();
|
startTime = activity.getStartTimeLong();
|
||||||
}
|
}
|
||||||
// 开服时间
|
// 开服时间
|
||||||
else if (activity.getType() == 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);
|
startTime = TimeUtils.stringToTimeLong2(openTime);
|
||||||
}
|
}
|
||||||
|
@ -195,11 +195,11 @@ public class SuperBoxActivity extends AbstractActivity {
|
||||||
long endTime = 0;
|
long endTime = 0;
|
||||||
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
// 绝对时间
|
// 绝对时间
|
||||||
if (activity.getType() == ActivityType.OPEN_TYPE_TIME){
|
if (activity.getTime() == ActivityType.OPEN_TYPE_TIME){
|
||||||
endTime = activity.getEndTimeLong();
|
endTime = activity.getEndTimeLong();
|
||||||
}
|
}
|
||||||
// 开服时间
|
// 开服时间
|
||||||
else if (activity.getType() == ActivityType.OPEN_TYPE_SERVER) {
|
else if (activity.getTime() == ActivityType.OPEN_TYPE_SERVER) {
|
||||||
String openTime = GameApplication.serverConfig.getOpenTime();
|
String openTime = GameApplication.serverConfig.getOpenTime();
|
||||||
long timeLong2 = TimeUtils.stringToTimeLong2(openTime);
|
long timeLong2 = TimeUtils.stringToTimeLong2(openTime);
|
||||||
endTime = timeLong2 + activity.getEndTimeLong() * 1000;
|
endTime = timeLong2 + activity.getEndTimeLong() * 1000;
|
||||||
|
|
Loading…
Reference in New Issue