修改到期时间
parent
eda6fd40f4
commit
831653bde4
File diff suppressed because it is too large
Load Diff
|
@ -47,8 +47,6 @@ public class ActivityLogic implements IEventHandler{
|
||||||
|
|
||||||
private Set<Integer> openActivityIds = new HashSet<>();
|
private Set<Integer> openActivityIds = new HashSet<>();
|
||||||
|
|
||||||
private Set<Integer> prepareActivityIds = new HashSet<>();
|
|
||||||
|
|
||||||
private int secretBoxSeasonTimes = 0; //秘盒赛季
|
private int secretBoxSeasonTimes = 0; //秘盒赛季
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -59,9 +57,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Set<Integer> getPrepareActivityIds() {
|
|
||||||
return prepareActivityIds;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void flushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
|
public void flushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
|
||||||
|
|
||||||
|
@ -121,11 +117,11 @@ public class ActivityLogic implements IEventHandler{
|
||||||
for (SGlobalActivity sGlobalActivity : sGlobalActivityMap.values()) {
|
for (SGlobalActivity sGlobalActivity : sGlobalActivityMap.values()) {
|
||||||
int time = sGlobalActivity.getTime();
|
int time = sGlobalActivity.getTime();
|
||||||
ActivityTypeEnum.getActicityType(sGlobalActivity.getId());
|
ActivityTypeEnum.getActicityType(sGlobalActivity.getId());
|
||||||
if (time == 2) {
|
if (time == ActivityType.OPEN_TYPE_ROLE) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 1);
|
long startTime = sGlobalActivity.getStartTimeLong();
|
||||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 2);
|
long endTime =sGlobalActivity.getEndTimeLong();
|
||||||
if (now < startTime) {
|
if (now < startTime) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -137,17 +133,6 @@ public class ActivityLogic implements IEventHandler{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
long prepareTime = ToolsUtil.getEndTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, sGlobalActivity.getGapTime());
|
|
||||||
if(now>endTime&&now<prepareTime){
|
|
||||||
if(!prepareActivityIds.contains(sGlobalActivity.getId())) {
|
|
||||||
prepareActivityIds.add(sGlobalActivity.getId());
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
if(prepareActivityIds.contains(sGlobalActivity.getId())){
|
|
||||||
prepareActivityIds.remove(sGlobalActivity.getId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (endTime != 0 && now > endTime) {
|
if (endTime != 0 && now > endTime) {
|
||||||
if (openActivityIds.contains(sGlobalActivity.getId())) {
|
if (openActivityIds.contains(sGlobalActivity.getId())) {
|
||||||
openActivityIds.remove(sGlobalActivity.getId());
|
openActivityIds.remove(sGlobalActivity.getId());
|
||||||
|
@ -288,20 +273,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (endTime != 0 && now > endTime) {
|
if (endTime != 0 && now > endTime) {
|
||||||
// ActivityMission activityMission = activityMissionMap.get(activityId);
|
goRewardActivity(user,activityId,builder,now>endTime+sGlobalActivity.getGapTime());
|
||||||
// if (activityMission != null) {
|
|
||||||
// AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(sGlobalActivity.getId());
|
|
||||||
// if (null==abstractActivity) {
|
|
||||||
// continue;
|
|
||||||
// }
|
|
||||||
// abstractActivity .onActivityEndSelfWithDealReward(user);
|
|
||||||
// activityManager.removeActivity(activityId);
|
|
||||||
// LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
|
||||||
// if (builder != null) {
|
|
||||||
// builder.addCloseActivityId(activityId);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
goRewardActivity(user,activityId,builder,true);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ActivityMission activityMission = activityMissionMap.get(activityId);
|
ActivityMission activityMission = activityMissionMap.get(activityId);
|
||||||
|
@ -324,7 +296,8 @@ public class ActivityLogic implements IEventHandler{
|
||||||
openNewActivityIds.add(activityId);
|
openNewActivityIds.add(activityId);
|
||||||
checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime);
|
checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime);
|
||||||
} else {
|
} else {
|
||||||
goRewardActivity(user,activityId,builder,true);
|
long endTime = sGlobalActivity.getEndTimeLong();
|
||||||
|
goRewardActivity(user,activityId,builder,now>endTime + sGlobalActivity.getGapTime());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return openNewActivityIds;
|
return openNewActivityIds;
|
||||||
|
@ -337,7 +310,11 @@ public class ActivityLogic implements IEventHandler{
|
||||||
if (null==abstractActivity) {
|
if (null==abstractActivity) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
abstractActivity.onActivityEndSelfWithDealReward(user);
|
if(activityMission.getOpenType()!=ActivityType.CLOSE_STATE){
|
||||||
|
abstractActivity.setOpenState(user,ActivityType.CLOSE_STATE);
|
||||||
|
abstractActivity.onActivityEndSelfWithDealReward(user);
|
||||||
|
}
|
||||||
|
|
||||||
if(isRemoveInfo){
|
if(isRemoveInfo){
|
||||||
user.getActivityManager().removeActivity(activityId);
|
user.getActivityManager().removeActivity(activityId);
|
||||||
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
||||||
|
@ -363,14 +340,6 @@ public class ActivityLogic implements IEventHandler{
|
||||||
List<CommonProto.ActivityInfo> activityInfoList = getActivityInfos(user.getActivityManager().getActivityMissionMap(), createTime);
|
List<CommonProto.ActivityInfo> activityInfoList = getActivityInfos(user.getActivityManager().getActivityMissionMap(), createTime);
|
||||||
PlayerInfoProto.GetAllActivityResponse.Builder builder = PlayerInfoProto.GetAllActivityResponse.newBuilder();
|
PlayerInfoProto.GetAllActivityResponse.Builder builder = PlayerInfoProto.GetAllActivityResponse.newBuilder();
|
||||||
|
|
||||||
if(!prepareActivityIds.isEmpty()){
|
|
||||||
for(int id:prepareActivityIds){
|
|
||||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
|
||||||
long prepareTime = ToolsUtil.getEndTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, sGlobalActivity.getGapTime());
|
|
||||||
activityInfoList.add(CommonProto.ActivityInfo.newBuilder().setActivityId(id).setEndTime((int)(prepareTime/1000)).build());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
builder.addAllActivityInfo(activityInfoList);
|
builder.addAllActivityInfo(activityInfoList);
|
||||||
sendLuckWheelPool(user,session);
|
sendLuckWheelPool(user,session);
|
||||||
MessageUtil.sendMessage(session, 1, rewardResponseValue, builder.build(), true);
|
MessageUtil.sendMessage(session, 1, rewardResponseValue, builder.build(), true);
|
||||||
|
@ -400,11 +369,16 @@ public class ActivityLogic implements IEventHandler{
|
||||||
if(activityStatus == -1){
|
if(activityStatus == -1){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(activityId);
|
||||||
|
|
||||||
if (sGlobalActivityMap.get(activityId).getIsSaving()==0 && activityStatus != ActivityType.OPEN_STATE) {
|
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());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sGlobalActivity.getIsSaving()==0 && activityStatus != ActivityType.OPEN_STATE) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(activityId);
|
|
||||||
int startTime = (int) (ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),createTime, 1) / 1000);
|
int startTime = (int) (ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),createTime, 1) / 1000);
|
||||||
int endTime;
|
int endTime;
|
||||||
if(sGlobalActivity.getGapTime()!=0){
|
if(sGlobalActivity.getGapTime()!=0){
|
||||||
|
@ -420,6 +394,9 @@ public class ActivityLogic implements IEventHandler{
|
||||||
ActivityProgressInfo activityProgressInfo = missionProgress.getValue();
|
ActivityProgressInfo activityProgressInfo = missionProgress.getValue();
|
||||||
missionInfos.add(CommonProto.ActivityInfo.MissionInfo.newBuilder().setMissionId(missionId).setProgress(activityProgressInfo.getProgrss()).setState(activityProgressInfo.getState()).build());
|
missionInfos.add(CommonProto.ActivityInfo.MissionInfo.newBuilder().setMissionId(missionId).setProgress(activityProgressInfo.getProgrss()).setState(activityProgressInfo.getState()).build());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
activityInfoList.add(CommonProto.ActivityInfo.newBuilder().setActivityId(activityId).addAllMission(missionInfos).setStartTime(startTime).setEndTime(endTime).setValue(activityMission.getValue()).setReallyOpen(activityMission.getOpenType()).build());
|
activityInfoList.add(CommonProto.ActivityInfo.newBuilder().setActivityId(activityId).addAllMission(missionInfos).setStartTime(startTime).setEndTime(endTime).setValue(activityMission.getValue()).setReallyOpen(activityMission.getOpenType()).build());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,7 +115,7 @@ public class BuyGoodsLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(endTime == null || nowTime>endTime){
|
if(endTime == null || nowTime>endTime){
|
||||||
endTime = (int)(TimeUtils.getAppointTimeInXDay(nowTime*1000L,0)/1000);
|
endTime = (int)(TimeUtils.getAppointTimeInXDay(nowTime*1000L,0)/1000)-1;
|
||||||
needSendMail = true;
|
needSendMail = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue