From 8548c4f9c2da564adf0fabb965983825a80ea7fc Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Wed, 15 May 2019 15:55:46 +0800 Subject: [PATCH] =?UTF-8?q?35=20=E6=8E=A8=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=87=E5=AE=9A=E5=9C=B0=E5=9B=BE=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E6=88=90=E6=96=B0=E7=9A=84=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=82=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/map/EventType.java | 1 + .../ljsd/jieling/handler/map/MapLogic.java | 1 - .../map/behavior/ThirtyFiveBehavior.java | 24 +++++++++++++++++++ .../ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ThirtyFiveBehavior.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java index 20302ce7a..8f1e6372d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java @@ -92,6 +92,7 @@ public class EventType { public static final int thirtyTwo = 32; public static final int thirtyThree = 33; public static final int thirtyFour = 34; + public static final int thirtyFive = 35; public static final int updatePonintEvent = 1; public static final int fightEvent = 2; 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 3cc5e17ba..6e534789a 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 @@ -24,7 +24,6 @@ import org.luaj.vm2.LuaValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; -import redis.clients.jedis.Jedis; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ThirtyFiveBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ThirtyFiveBehavior.java new file mode 100644 index 000000000..387a817a3 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ThirtyFiveBehavior.java @@ -0,0 +1,24 @@ +package com.ljsd.jieling.handler.map.behavior; + +import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.protocols.MapInfoProto; +import org.springframework.stereotype.Component; + +@Component +public class ThirtyFiveBehavior extends BaseBehavior { + @Override + public int getBehaviorType() { + return EventType.thirtyFive; + } + + @Override + public boolean process(int optionId, User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { + BehaviorUtil.updateMission(user, eventUpdateResponse); + BehaviorUtil.destoryPoint(user, 0, behaviorTypeValues[0][0]); + for (int i = 1; i < behaviorTypeValues.length; i++) { + BehaviorUtil.addBehaviorInfo(behaviorTypeValues[i][3], user.getMapManager(), behaviorTypeValues[i][0], behaviorTypeValues[i][1], behaviorTypeValues[i][2]); + } + return true; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 90a8e41a7..099fa2b7e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1262,7 +1262,7 @@ public class HeroLogic { sArenaRobotConfig.setBreakId(heroBreakId); sArenaRobotConfig.setStarOfHeroMap(starHeroMap); } - sArenaRobotConfig.setTotalForce(HeroLogic.getInstance().calRobotTotalForce(sArenaRobotConfig)); + sArenaRobotConfig.setTotalForce(calRobotTotalForce(sArenaRobotConfig)); } }