From 2ba3f2d76f80d421b830ae55e0b219a155bff1a6 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 26 Aug 2020 05:43:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=8B=E7=82=B9=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/AbstractActivity.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java index 39030004e..06dcb14af 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java @@ -164,7 +164,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { } } // KtEventUtils.onKtEvent(user, ParamEventBean.UserActivityEvent, id, missionId); - ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_ACTIVITY.getType(),String.valueOf(id),String.valueOf(missionId),reward); + ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_ACTIVITY.getType(),String.valueOf(id),String.valueOf(missionId),reward[0]); PlayerInfoProto.TakeActivityRewardResponse build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session, 1, rewardResponseValue, build, true); 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 7e4fb8f98..b5f78f106 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 @@ -303,6 +303,9 @@ public class HeroLogic{ } List result = new ArrayList<>(resultRandom.length); for(int[] random:resultRandom){ + if(random==null){ + continue; + } SCHero scHero = SCHero.getsCHero().get(random[0]); if(scHero==null){ result.add(String.valueOf(random[0]));