Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
20a228b9b9
|
@ -173,6 +173,8 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
|
||||||
itemArrs.add(reward);
|
itemArrs.add(reward);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(itemArrs.size()==0)
|
||||||
|
return;
|
||||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
if (null == sGlobalActivity)
|
if (null == sGlobalActivity)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -160,8 +160,8 @@ public class ActivityLogic {
|
||||||
if (endTime != 0 && now > endTime) {
|
if (endTime != 0 && now > endTime) {
|
||||||
ActivityMission activityMission = activityMissionMap.get(activityId);
|
ActivityMission activityMission = activityMissionMap.get(activityId);
|
||||||
if (activityMission != null) {
|
if (activityMission != null) {
|
||||||
activityManager.removeActivity(activityId);
|
|
||||||
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user);
|
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user);
|
||||||
|
activityManager.removeActivity(activityId);
|
||||||
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
||||||
if (builder != null) {
|
if (builder != null) {
|
||||||
builder.addCloseActivityId(activityId);
|
builder.addCloseActivityId(activityId);
|
||||||
|
@ -180,8 +180,8 @@ public class ActivityLogic {
|
||||||
} else {
|
} else {
|
||||||
ActivityMission activityMission = activityMissionMap.get(activityId);
|
ActivityMission activityMission = activityMissionMap.get(activityId);
|
||||||
if (activityMission != null) {
|
if (activityMission != null) {
|
||||||
activityManager.removeActivity(activityId);
|
|
||||||
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user);
|
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user);
|
||||||
|
activityManager.removeActivity(activityId);
|
||||||
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
|
||||||
if (builder != null) {
|
if (builder != null) {
|
||||||
builder.addCloseActivityId(activityId);
|
builder.addCloseActivityId(activityId);
|
||||||
|
|
Loading…
Reference in New Issue