back_recharge
parent
9b45351ae2
commit
9dd949808d
|
@ -354,7 +354,7 @@ public class GlobalDataManaager implements IManager {
|
|||
|
||||
public static void flushGoodsTimes(User user){
|
||||
Map<Integer, Integer> buyGoodsTimes = user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes();
|
||||
if(buyGoodsTimes!=null && buyGoodsTimes.isEmpty()){
|
||||
if(buyGoodsTimes!=null && !buyGoodsTimes.isEmpty()){
|
||||
Iterator<Integer> iterator = buyGoodsTimes.keySet().iterator();
|
||||
boolean update = false;
|
||||
while (iterator.hasNext()){
|
||||
|
|
|
@ -297,7 +297,7 @@ public class ActivityLogic implements IEventHandler{
|
|||
checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime);
|
||||
} else {
|
||||
long endTime = sGlobalActivity.getEndTimeLong();
|
||||
goRewardActivity(user,activityId,builder,now>endTime + sGlobalActivity.getGapTime());
|
||||
goRewardActivity(user,activityId,builder,now>endTime + sGlobalActivity.getGapTime()*TimeUtils.ONE_DAY);
|
||||
}
|
||||
}
|
||||
return openNewActivityIds;
|
||||
|
@ -355,7 +355,7 @@ public class ActivityLogic implements IEventHandler{
|
|||
MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.LUCKWHEEL_POOL_INDICATION_VALUE, builder.build(), true);
|
||||
}
|
||||
|
||||
private List<CommonProto.ActivityInfo> getActivityInfos(Map<Integer, ActivityMission> activityMissionMap, long createTime) {
|
||||
private List<CommonProto.ActivityInfo> getActivityInfos(Map<Integer, ActivityMission> activityMissionMap, long createTime) {
|
||||
Map<Integer, SGlobalActivity> sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap();
|
||||
List<CommonProto.ActivityInfo> activityInfoList = new ArrayList<>(activityMissionMap.size());
|
||||
for (Map.Entry<Integer, ActivityMission> activityState : activityMissionMap.entrySet()) {
|
||||
|
@ -374,6 +374,7 @@ public class ActivityLogic implements IEventHandler{
|
|||
if(activityStatus == ActivityType.CLOSE_STATE){
|
||||
long prepareTime = ToolsUtil.getEndTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, sGlobalActivity.getGapTime());
|
||||
activityInfoList.add(CommonProto.ActivityInfo.newBuilder().setActivityId(activityId).setEndTime((int)(prepareTime/1000)).build());
|
||||
continue;
|
||||
}
|
||||
|
||||
if (sGlobalActivity.getIsSaving()==0 && activityStatus != ActivityType.OPEN_STATE) {
|
||||
|
|
Loading…
Reference in New Issue