From ed7d883cce30fb328b636afca3e0c3ef76f9fd1a Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 2 Dec 2020 10:29:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/globals/BIReason.java | 2 + .../activity/NewGeneralAttackHandler.java | 74 +++++++++++++++++-- .../jieling/logic/activity/ActivityType.java | 4 +- .../logic/activity/ActivityTypeEnum.java | 2 +- 4 files changed, 72 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index c9c843df9..52bd3613d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -298,4 +298,6 @@ public interface BIReason { int SKIN_USE_CONSUME = 1073;//激活皮肤消耗 int SUB_ACTIVITY_CONSUME = 1074;//易经宝库 int SUB_ACTIVITY_CONSUME_FINISH = 1075;//易经宝库活动结束补发消耗 + + int NEW_GENERAL_ATTACK = 1076;//新将来袭 } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/NewGeneralAttackHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/NewGeneralAttackHandler.java index 89f246ca2..1ec5ee6fe 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/NewGeneralAttackHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/NewGeneralAttackHandler.java @@ -1,16 +1,32 @@ package com.ljsd.jieling.handler.activity; import com.google.protobuf.GeneratedMessage; +import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.UserManager; -import com.ljsd.jieling.logic.dao.VipInfo; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.fight.FightDispatcher; +import com.ljsd.jieling.logic.fight.GameFightType; +import com.ljsd.jieling.logic.fight.PVEFightEvent; +import com.ljsd.jieling.logic.fight.result.FightResult; +import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.protocols.ActivityProto; +import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; -import config.SPrivilegeTypeConfig; +import com.ljsd.jieling.util.ItemUtil; +import config.SMonsterConfig; +import config.SMonsterGroup; +import config.SNewHeroConfig; +import manager.STableManager; +/*** + * @author hj + * @date 2020-11-27 + * 新将来袭 + */ public class NewGeneralAttackHandler extends BaseHandler { @Override public MessageTypeProto.MessageType getMessageCode() { @@ -20,18 +36,62 @@ public class NewGeneralAttackHandler extends BaseHandler hurt[i][0]/100){ + dropList[i] = hurt[i][1]; + } + } + // 道具逻辑,封装好的 + CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList,1,0, BIReason.NEW_GENERAL_ATTACK); + // 消耗道具 + PlayerLogic.getInstance().checkAndUpdate(user, proto.getPrivilageTypeId(),1); + + return ActivityProto.NewGeneralAttackResponse.newBuilder().setFightData(fightData).setDrop(drop).build(); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 5b2a0168b..a37763ae3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -82,6 +82,6 @@ public interface ActivityType { int SKIN_RECHARGE_ACTIVITY = 71; int SPECIAL_MONSTER_RANDOM_ACTIVITY = 100;//灵兽限时抽卡 int SPECIAL_MONSTER_GIFT_ACTIVITY = 101;//灵兽礼包 - int NEW_GENERAL_RECRUITING = 102;//新将招募 - int NEW_GENERAL_ATTACK = 103;//新将来袭 +// int NEW_GENERAL_RECRUITING = 102;//新将招募 + int NEW_GENERAL_ATTACK = 200;//新将来袭 } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 86a94b89f..579831485 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -63,7 +63,7 @@ public enum ActivityTypeEnum { SKIN_RECHARGE_ACTIVITY(ActivityType.SKIN_RECHARGE_ACTIVITY, DefaultEmptyActivity::new), SPECIAL_MONSTER_RANDOM_ACTIVITY(ActivityType.SPECIAL_MONSTER_RANDOM_ACTIVITY,LimitRandomSpecialMonsterActivity::new), SPECIAL_MONSTER_GIFT_ACTIVITY(ActivityType.SPECIAL_MONSTER_GIFT_ACTIVITY,DefaultEmptyActivity::new), - NEW_GENERAL_RECRUITING(ActivityType.NEW_GENERAL_RECRUITING,LimitRandomCardActivity::new), +// NEW_GENERAL_RECRUITING(ActivityType.NEW_GENERAL_RECRUITING,LimitRandomCardActivity::new), NEW_GENERAL_ATTACK(ActivityType.NEW_GENERAL_ATTACK,DefaultEmptyActivity::new), ; private int type;