From a2ffa2fbfeed842d648e078aff792b095f0aa6fd Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Mon, 26 Aug 2019 21:14:09 +0800 Subject: [PATCH] acitvity --- .../com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 2 +- .../main/java/com/ljsd/jieling/handler/map/MapLogic.java | 3 ++- .../jieling/logic/activity/CopyExpectRankActivity.java | 2 +- .../com/ljsd/jieling/logic/activity/event/StoryEvent.java | 8 +++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index be4572538..e4e3297e5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -138,7 +138,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ try { MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true); ActivityLogic.getInstance().flushForLogin(user); - DoFix.getInstance().loginFix(user); + // DoFix.getInstance().loginFix(user); if(playerInfoManager.getIsdayFirst()==0){ playerInfoManager.setIsdayFirst(1); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 98de89e92..4d8a5a41f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -188,7 +188,7 @@ public class MapLogic { } user.setMapManager(mapManager); user.getUserMissionManager().onGameEvent(user,GameEvent.PlAY_STORY,SChallengeConfig.sChallengeConfigs.get(mapId).getType(),1); - Poster.getPoster().dispatchEvent(new StoryEvent(user.getId())); + Poster.getPoster().dispatchEvent(new StoryEvent(user.getId(),1)); } else if (mapManager.getCurMapId() != mapId) { MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "地图错误,应进入" + mapManager.getCurMapId()); @@ -1813,6 +1813,7 @@ public class MapLogic { CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, sChallengeMapConfig.getSweepingAward(), 1, 0, BIReason.MAP_SWEEP_REWARD); mapSweepResponse.addDrop(dropBuilder); } + Poster.getPoster().dispatchEvent(new StoryEvent(user.getId(),count)); user.getUserMissionManager().onGameEvent(user, GameEvent.STORY_FIGHT, mapId,1,count); user.getUserMissionManager().onGameEvent(user, GameEvent.PlAY_STORY, type,count); MessageUtil.sendMessage(session, 1, messageType.getNumber(), mapSweepResponse.build(), true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/CopyExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/CopyExpectRankActivity.java index 4127802b1..cf726ce61 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/CopyExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/CopyExpectRankActivity.java @@ -18,7 +18,7 @@ class CopyExpectRankActivity extends ExpectRankActivity { public void onEvent(IEvent event) throws Exception { if (!(event instanceof StoryEvent)) return; - update(UserManager.getUser(((StoryEvent) event).getUid()), 1); + update(UserManager.getUser(((StoryEvent) event).getUid()), ((StoryEvent) event).getCount()); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/StoryEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/StoryEvent.java index 6f32f1bc2..749156bf5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/StoryEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/StoryEvent.java @@ -6,12 +6,18 @@ package com.ljsd.jieling.logic.activity.event; public class StoryEvent implements IEvent { private int uid; + private int count; - public StoryEvent(int uid) { + public StoryEvent(int uid, int count) { this.uid = uid; + this.count = count; } public int getUid() { return uid; } + + public int getCount() { + return count; + } }