From 947bfcf9e20b9a7059a24e1ff49d7202f0cdb676 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Wed, 27 Oct 2021 17:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E4=B8=89=E7=95=8C=E9=99=8D?= =?UTF-8?q?=E9=AD=94=E6=B4=BB=E5=8A=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/GameGM/GMRequestHandler.java | 3 ++ .../hero/HeroUpLikableRequestHandler.java | 3 ++ .../ljsd/jieling/handler/map/MapLogic.java | 3 ++ .../QuickStartMonsterFighter.java | 4 +- .../jieling/logic/activity/ActivityType.java | 3 +- .../logic/activity/ActivityTypeEnum.java | 1 + .../logic/activity/ThreeWorldActivity.java | 43 +++++++++++++++++++ 7 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ThreeWorldActivity.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 79f35308b..19424bcae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -13,6 +13,8 @@ import com.ljsd.jieling.globals.GlobalGm; import com.ljsd.jieling.globals.GlobalItemType; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.map.*; +import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.CombatLogic; @@ -314,6 +316,7 @@ public class GMRequestHandler extends BaseHandler{ break; case GlobalGm.MONSTER_JUMP: cUser.getMapManager().setLastMonsterAttack(prarm1); + ActivityLogic.getInstance().updateActivityMissionProgress(cUser, ActivityType.THREE_WORLD_NEW,(prarm1-1)); break; case GlobalGm.TREASURE_SCORE: treasureScore(iSession,prarm1); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java index 97537cd75..e96c1dcee 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -71,6 +71,9 @@ public class HeroUpLikableRequestHandler extends BaseHandlerallHeroPropAdd=GetAllHeroLikableAddPeop(curAllLikaLv); heroManager.putAllLikablePropAddMap(allHeroPropAdd); int[][]condition= SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(2).getCondition(); + if (curAllLikaLv>=condition.length) { + curAllLikaLv=condition.length-1; + } user.getPlayerInfoManager().updateVipPrivilage(1,condition[curAllLikaLv][1]); } int sendTime= heroManager.getLikableSendTime()+itemNum; 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 f1d04e2e3..be32db69d 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 @@ -27,6 +27,8 @@ import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.OnlineUserManager; +import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; @@ -2298,6 +2300,7 @@ public class MapLogic { fightEndResponse.setResult(resultCode); fightEndResponse.build(); user.getMapManager().setLastMonsterAttack(checkFightId + 1); + ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.THREE_WORLD_NEW,checkFightId); user.getUserMissionManager().onGameEvent(user,GameEvent.MONSTER_ATTACK_LEVEL); user.getUserMissionManager().onGameEvent(user,GameEvent.MISTY_TRIP); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java index 4e06ba697..0abe6ddf9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java @@ -8,6 +8,8 @@ import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.ktbeans.KTGameType; import com.ljsd.jieling.ktbeans.KtEventUtils; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; +import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.dao.TeamPosHeroInfo; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; @@ -114,8 +116,8 @@ public class QuickStartMonsterFighter extends BaseHandler activityProgressInfoMap = activityMission.getActivityMissionMap(); + for (Map.Entry item : activityProgressInfoMap.entrySet()) { + ActivityProgressInfo activityProgressInfo = item.getValue(); + activityProgressInfo.setProgrss(count); + activityMission.getActivityMissionMap().put(item.getKey(), activityProgressInfo); + } + //更新进度 + ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); + sendActivityProgress(sessionByUid, activityMission, null); + } +}