int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度

back_recharge
jiahuiwen 2021-12-21 17:48:01 +08:00 committed by duhui
parent 30111415c0
commit 64f4f644de
2 changed files with 34 additions and 2 deletions

View File

@ -779,8 +779,10 @@ public class ActivityLogic implements IEventHandler{
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
for (Map.Entry<Integer, ActivityMission> item : activityMissionMap.entrySet()) {
ActivityMission activityMission = item.getValue();
if (withState && activityMission.getActivityState() != ActivityType.OPEN_STATE) {
continue;
if (activityType != ActivityType.NEW_WELFARE) { // 这个活动未开启也需要记录进度
if (withState && activityMission.getActivityState() != ActivityType.OPEN_STATE) {
continue;
}
}
Integer activityId = item.getKey();
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(activityId);

View File

@ -14,6 +14,7 @@ import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.network.session.ISession;
import rpc.protocols.CommonProto;
import rpc.protocols.MessageTypeProto;
import rpc.protocols.PlayerInfoProto;
import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.MessageUtil;
@ -22,6 +23,7 @@ import config.SGlobalActivity;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class NewWelfareActivity extends AbstractActivity {
@ -35,6 +37,34 @@ public class NewWelfareActivity extends AbstractActivity {
super.initActivity(user);
}
/**
*
*
* @param filterMissId miss
*/
@Override
public void sendActivityProgress(ISession session, ActivityMission activityMission, Set<Integer> filterMissId) {
if (session == null) {
return;
}
PlayerInfoProto.ActivityUpateProgressIndication.Builder builder = PlayerInfoProto.ActivityUpateProgressIndication.newBuilder();
User user = UserManager.getUserInMem(session.getUid());
if (user != null && activityMission != null) {
if (activityMission.getActivityState() != ActivityType.OPEN_STATE) {
return;
}
List<CommonProto.ActivityInfo.MissionInfo> missInfo = getAllMissInfo(user, activityMission, filterMissId);
CommonProto.ActivityInfo.Builder builder1 = CommonProto.ActivityInfo.newBuilder()
.setValue(activityMission.getV())
.addAllMission(missInfo)
.setActivityId(id);
builder.setActivityInfo(builder1);
MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.ACTIVITY_UPDATE_PROGRESS_INDICATION_VALUE, builder.build(), true);
}
}
@Override
public void onEvent(IEvent event) throws Exception {
if (!(event instanceof NewWelfareEvent)) {