Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
40d69786a4
|
@ -17,14 +17,10 @@ import com.ljsd.jieling.protocols.MessageTypeProto;
|
|||
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import com.ljsd.jieling.util.TimeUtils;
|
||||
import com.mongodb.Mongo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
public class GlobalDataManaager {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(GlobalDataManaager.class);
|
||||
|
@ -195,13 +191,13 @@ public class GlobalDataManaager {
|
|||
long passTims = now - seasonOpenLong;
|
||||
if(passTims>0){
|
||||
long mod = passTims % (diffTime + seasonInterval);
|
||||
if(mod < diffTime ){//新的周期开启
|
||||
//计算开启时间、关闭时间
|
||||
long turns = passTims / ((diffTime + seasonInterval));
|
||||
long addTim = turns * (diffTime + seasonInterval);
|
||||
timeOpenOfThis =seasonOpenLong+addTim;
|
||||
timeCloseOfThis =seasonEndLong+addTim;
|
||||
long turns = passTims / ((diffTime + seasonInterval));
|
||||
if(mod > diffTime ){
|
||||
turns++;
|
||||
}
|
||||
long addTim = turns * (diffTime + seasonInterval);
|
||||
timeOpenOfThis =seasonOpenLong+addTim;
|
||||
timeCloseOfThis =seasonEndLong+addTim;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ public class RechargeInfo extends MongoBase{
|
|||
|
||||
|
||||
public void setFirst(int first) {
|
||||
updateString("first",first);
|
||||
updateString("isFirst",first);
|
||||
isFirst = first;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue