acitvity
parent
f76ce9cb43
commit
1d01fcf712
|
@ -101,7 +101,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
|
||||||
|
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
List<Integer> misssIds = new LinkedList<>();
|
List<Integer> misssIds = new LinkedList<>();
|
||||||
misssIds.add(missid);
|
|
||||||
if (missid == -1) {
|
if (missid == -1) {
|
||||||
List<SActivityRewardConfig> cfgs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id);
|
List<SActivityRewardConfig> cfgs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id);
|
||||||
if (null == cfgs) {
|
if (null == cfgs) {
|
||||||
|
@ -110,6 +110,8 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
|
||||||
for (SActivityRewardConfig sActivityRewardConfig : cfgs) {
|
for (SActivityRewardConfig sActivityRewardConfig : cfgs) {
|
||||||
misssIds.add(sActivityRewardConfig.getId());
|
misssIds.add(sActivityRewardConfig.getId());
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
misssIds.add(missid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -125,7 +127,8 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
|
||||||
ActivityManager activityManager = user.getActivityManager();
|
ActivityManager activityManager = user.getActivityManager();
|
||||||
ActivityMission activityMission = activityManager.getActivityMissionMap().get(id);
|
ActivityMission activityMission = activityManager.getActivityMissionMap().get(id);
|
||||||
if (activityMission == null || activityMission.getActivityState() != ActivityType.OPEN_STATE || activityMission.getOpenType() == 0) {
|
if (activityMission == null || activityMission.getActivityState() != ActivityType.OPEN_STATE || activityMission.getOpenType() == 0) {
|
||||||
MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "activity_close");
|
if (missid != -1)
|
||||||
|
MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "activity_close");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
ActivityProgressInfo activityProgressInfo = activityMission.getActivityProgressInfoMap().get(missionId);
|
ActivityProgressInfo activityProgressInfo = activityMission.getActivityProgressInfoMap().get(missionId);
|
||||||
|
|
|
@ -19,10 +19,10 @@ class DailyRechargeActivity extends AbstractActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onResume(User user) throws Exception {
|
public void onResume(User user) throws Exception {
|
||||||
super.onResume(user);
|
|
||||||
//每日充值 补发前日未领取的奖
|
//每日充值 补发前日未领取的奖
|
||||||
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
||||||
takeReward(sessionByUid, -1);
|
takeReward(sessionByUid, -1);
|
||||||
|
super.onResume(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue