From 09efdc1b7a1863c597a252b1549f8bd61aad36ec Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 10 Feb 2022 01:00:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E9=80=80=E5=87=BA=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E9=87=8D=E7=BD=AE=E4=B8=AA=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/family/GuildLogic.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 677b32dbc..b8b0c6665 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -391,15 +391,6 @@ public class GuildLogic { Family.FamilyJoinIndicaion build = Family.FamilyJoinIndicaion.newBuilder().setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo)).setFamilyUserInfo(CBean2Proto.getFamilyUserInfo(user, GlobalsDef.MEMBER)).build(); Family.FamilyJoinResponse response = Family.FamilyJoinResponse.newBuilder().setFamilyJoinIndicaion(build).build(); MessageUtil.sendMessage(session,1,msgId,response,true); - //探索活动个人计数重置 - Set openActivityIdsByType = ActivityLogic.getInstance().getOpenActivityIdsByType(user, ActivityTypeEnum.EXPLORE_EXPECT_ACTIVITY.getType(), false); - if(openActivityIdsByType.size()!= 0){ - ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(openActivityIdsByType.toArray()[0]); - if(guildInfo!=null){ - activityMission.setV(0); - ActivityLogic.getInstance().sendActivityInfo(user, ActivityType.EXPLORE_EXPECT_ACTIVITY); - } - } } @@ -978,6 +969,8 @@ public class GuildLogic { user.getGuildMyInfo().clearOfLevelGuild(); addGuildLog(guildInfo.getId(),GuildDef.Log.LEVEL,user.getPlayerInfoManager().getNickName()); MessageUtil.sendMessage(session,1,msgId,null,true); + //探索活动个人计数重置 + exploreActivity(user,guildInfo); } public static void sendPositionChange(int uid,int position) throws Exception { @@ -1793,4 +1786,15 @@ public class GuildLogic { return map; } + private static void exploreActivity(User user,GuildInfo guildInfo){ + Set openActivityIdsByType = ActivityLogic.getInstance().getOpenActivityIdsByType(user, ActivityTypeEnum.EXPLORE_EXPECT_ACTIVITY.getType(), false); + if(openActivityIdsByType.size()!= 0){ + ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(openActivityIdsByType.toArray()[0]); + if(guildInfo!=null){ + activityMission.setV(0); + ActivityLogic.getInstance().sendActivityInfo(user, ActivityType.EXPLORE_EXPECT_ACTIVITY); + } + } + } + }