Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
cf91ff167b
|
|
@ -195,6 +195,7 @@ public class ActivityLogic implements IEventHandler{
|
|||
// 开服条件判断
|
||||
boolean open = SGlobalActivity.checkActivityIfOpen(sGlobalActivity.getId(),0,GameApplication.serverConfig.getCacheOpenTime());
|
||||
if (!open){
|
||||
openActivityIds.remove(sGlobalActivity.getId());
|
||||
continue;
|
||||
}
|
||||
if (endTime != 0 && now > endTime) {
|
||||
|
|
@ -586,6 +587,12 @@ public class ActivityLogic implements IEventHandler{
|
|||
for (Map.Entry<Integer, ActivityMission> activityState : activityMissionMap.entrySet()) {
|
||||
Integer activityId = activityState.getKey();
|
||||
ActivityMission activityMission = activityState.getValue();
|
||||
|
||||
boolean open = SGlobalActivity.checkActivityIfOpen(activityId,user.getPlayerInfoManager().getCreateTime(),GameApplication.serverConfig.getCacheOpenTime());
|
||||
if (!open){
|
||||
// 开服条件判断
|
||||
continue;
|
||||
}
|
||||
//todo 活动未初始化成功
|
||||
if (activityMission == null) {
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class RechargeSumDayActivity extends AbstractActivity {
|
|||
if (activityMission.getV() <= 0 || activityMission.getV() >= 15) {
|
||||
return;
|
||||
}
|
||||
if (user.getPlayerInfoManager().getRechargedaily() > 0 ) {//充值0.99不触发修改
|
||||
if (user.getPlayerInfoManager().getRechargedaily() >= 6 ) {//充值小于六块不触发修改
|
||||
// SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0]
|
||||
activityMission.setV(activityMission.getV() + 1);
|
||||
}
|
||||
|
|
@ -54,7 +54,7 @@ class RechargeSumDayActivity extends AbstractActivity {
|
|||
if (activityMission.getV() <= 0 || activityMission.getV() >= 15) {
|
||||
return;
|
||||
}
|
||||
if (count>0 ) {//只要是充值就算
|
||||
if (count>=6000 ) {//大于6块钱才算
|
||||
//>= SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0]
|
||||
activityProgressInfo.setProgrss(1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,12 @@ public class PerpetualWelfareBag extends AbstractWelfareBag {
|
|||
setStartTime(TimeUtils.getCurWeekdayStartTime(1,0));
|
||||
setRefreshTime(TimeUtils.getCurWeekdayStartTime(1,0) + TimeUtils.WEEK);
|
||||
}else if(config.getTime() == 8){//自然月
|
||||
setStartTime(TimeUtils.getCurMonthStartTime(1));
|
||||
//TODO 不支持礼包每天刷新 用类型8有瑕疵 之后容错
|
||||
if(config.getId() == 1005 || config.getId() == 1006|| config.getId() == 1007){
|
||||
TimeUtils.getAppointTime(0);
|
||||
}else{
|
||||
setStartTime(TimeUtils.getCurMonthStartTime(1));
|
||||
}
|
||||
setRefreshTime(TimeUtils.getMonthStartTime(1,1));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue