store
parent
12996dc439
commit
c8fdd5b47d
|
@ -324,10 +324,12 @@ public class ActivityLogic implements IEventHandler{
|
|||
}
|
||||
//非角色活动开启通知
|
||||
openNewActivityIds.add(openActivityId);
|
||||
if(sGlobalActivity.getShopId()!=0){
|
||||
if(sGlobalActivity.getShopId()!=null && sGlobalActivity.getShopId().length>0){
|
||||
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 1);
|
||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 2);
|
||||
checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime);
|
||||
for (int shopId : sGlobalActivity.getShopId()) {
|
||||
checkNeedOpenStore(user,shopId,startTime,endTime);
|
||||
}
|
||||
}
|
||||
}
|
||||
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
|
||||
|
@ -367,14 +369,17 @@ public class ActivityLogic implements IEventHandler{
|
|||
abstractActivity.initActivity(user);
|
||||
// if(!initOtherActivity(user, sGlobalActivity)){
|
||||
initAllActivityMission(activityManager.getActivityMissionMap(),activityId);
|
||||
// }
|
||||
//
|
||||
int activityOpenState = getActivityOpenState(user, activityId );
|
||||
abstractActivity.setOpenState(user,activityOpenState);
|
||||
if(activityOpenState == ActivityType.UNOPEN_STATE){
|
||||
continue;
|
||||
}
|
||||
openNewActivityIds.add(activityId);
|
||||
checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime);
|
||||
for (int shopID : sGlobalActivity.getShopId()) {
|
||||
checkNeedOpenStore(user,shopID,startTime,endTime);
|
||||
}
|
||||
|
||||
} else {
|
||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),userCreateTime, 2);
|
||||
goRewardActivity(user,activityId,builder,now>endTime + sGlobalActivity.getGapTime()*TimeUtils.ONE_DAY);
|
||||
|
|
|
@ -54,10 +54,13 @@ public class FightMainEventHandler implements IEventHandler{
|
|||
if(mineMainLevelConfig!=null && virtureId <= mineMainLevelConfig.getVirtureId()){
|
||||
activityMission.setActivityState(ActivityType.OPEN_STATE);
|
||||
ActivityLogic.getInstance().sendActivityInfo(user,sGlobalActivity.getId());
|
||||
if(sGlobalActivity.getShopId()!=0){
|
||||
if(sGlobalActivity.getShopId().length>0){
|
||||
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 1);
|
||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 2);
|
||||
ActivityLogic.getInstance().checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime);
|
||||
for (int shopId : sGlobalActivity.getShopId()) {
|
||||
ActivityLogic.getInstance().checkNeedOpenStore(user,shopId,startTime,endTime);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -57,10 +57,13 @@ public class UserLevelEventHandler implements IEventHandler,IPrivilegeChange{
|
|||
if(userLevelEvent.getLevel()>=openRules[1]){
|
||||
activityMission.setActivityState(ActivityType.OPEN_STATE);
|
||||
ActivityLogic.getInstance().sendActivityInfo(user,sGlobalActivity.getId());
|
||||
if(sGlobalActivity.getShopId()!=0){
|
||||
if(sGlobalActivity.getShopId().length>0){
|
||||
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 1);
|
||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 2);
|
||||
ActivityLogic.getInstance().checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime);
|
||||
for (int shopId : sGlobalActivity.getShopId()) {
|
||||
ActivityLogic.getInstance().checkNeedOpenStore(user,shopId,startTime,endTime);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ public class SGlobalActivity implements BaseConfig {
|
|||
|
||||
private int[] ifOpen;
|
||||
|
||||
private int shopId;
|
||||
private int[] shopId;
|
||||
|
||||
private int resetGrade;
|
||||
|
||||
|
@ -132,7 +132,7 @@ public class SGlobalActivity implements BaseConfig {
|
|||
return ifOpen;
|
||||
}
|
||||
|
||||
public int getShopId() {
|
||||
public int[] getShopId() {
|
||||
return shopId;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue