From 663680048bc6bceec55e3bfd897c3482ad081d61 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 30 Oct 2019 15:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=92=E7=81=B5=E7=A7=98=E5=AE=9D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/activity/TreasureActivity.java | 1 - .../com/ljsd/jieling/logic/dao/ActivityManager.java | 10 ---------- .../com/ljsd/jieling/logic/dao/UserMissionManager.java | 10 +++++----- .../com/ljsd/jieling/logic/mission/MissionLoigc.java | 2 +- .../com/ljsd/jieling/logic/player/PlayerLogic.java | 9 ++++++++- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java index 09a1bd72c..87cf4575f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java @@ -49,7 +49,6 @@ public class TreasureActivity extends AbstractActivity { } activityMission.initOtherMission(levels); long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 2) - 24 * 3600 * 1000; - user.getActivityManager().setTrsendTime(endTime); user.getActivityManager().addActivity(sGlobalActivity.getId(), activityMission); // PlayerInfoProto.TreasureLevelUpIndication indication = PlayerInfoProto.TreasureLevelUpIndication.newBuilder().setLevel(user.getPlayerInfoManager().getTreasureLevel()).build(); // MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1,MessageTypeProto.MessageType.TREASURE_LEVELUP_INDICATION_VALUE,indication,true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java index c624d685d..d64b7e2f9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java @@ -9,7 +9,6 @@ import java.util.concurrent.ConcurrentHashMap; public class ActivityManager extends MongoBase { private Map activityMissionMap = new HashMap<>(); - private long trsendTime; // 孙龙结束时间 private long senvenTime; //七日狂欢结束时间 private LuckWheelMission luckWheel;//幸运探宝奖池 private LuckWheelMission luckWheelAdvance;//高级幸运探宝奖池 @@ -52,15 +51,6 @@ public class ActivityManager extends MongoBase { this.senvenTime = senvenTime; } - public long getTrsendTime() { - return trsendTime; - } - - public void setTrsendTime(long trsendTime) { - updateString("trsendTime", trsendTime); - this.trsendTime = trsendTime; - } - public Map getActivityMissionMap() { return activityMissionMap; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index 79572ba81..c366b5c06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -88,6 +88,7 @@ public class UserMissionManager extends MongoBase { // updateString("treasureCumulationData",treasureCumulationData); int[] refreshIds =resetTreasureTaskInfo(1,missionTypeEnumListMap,treasureCumulationData); + treasureCumulationData = new CumulationData(); CommonProto.RefreshTask.Builder task = treasureIndicationBuild(1, refreshIds); PlayerInfoProto.TreasureRefreshIndication indication1 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task.build()).build(); MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication1,true); @@ -95,6 +96,7 @@ public class UserMissionManager extends MongoBase { case TREASH_WEEK_REFRESH: int[] weekRefreshIds = resetTreasureTaskInfo(2,missionTypeEnumListMap,treasureWeekCumulationData); if(weekRefreshIds!=null){ + treasureWeekCumulationData = new CumulationData(); CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekRefreshIds); PlayerInfoProto.TreasureRefreshIndication indication2 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task2.build()).build(); MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication2,true); @@ -114,9 +116,7 @@ public class UserMissionManager extends MongoBase { } } } - System.out.println("戒灵秘宝月任务初始化"); -// int[] dailyRefreshIds1 = resetTreasureTaskInfo(1,missionTypeEnumListMap,treasureCumulationData); -// int[] weekRefreshIds1 = resetTreasureTaskInfo(2,missionTypeEnumListMap,treasureWeekCumulationData); + treasureMonthCumulationData = new CumulationData(); int[] monthRefreshIds1 = resetTreasureTaskInfo(3,missionTypeEnumListMap,treasureMonthCumulationData); // CommonProto.RefreshTask.Builder task3 = treasureIndicationBuild(1, dailyRefreshIds1); @@ -245,7 +245,7 @@ public class UserMissionManager extends MongoBase { } if(!treasureMissionIdsType.getDoingMissionIds().isEmpty() ){ List sTreasureTaskConfigs = STreasureSunlongTaskConfig.sTreasureTaskConfigListByTypeMapTmp.get(missionType.getMissionTypeValue()); - if(sTreasureTaskConfigs!=null && user.getActivityManager().getTrsendTime()>System.currentTimeMillis()){ + if(sTreasureTaskConfigs!=null){ CumulationData.Result result = treasureCumulationData.updateData(missionType, parm); CumulationData.Result weekResult = treasureWeekCumulationData.updateData(missionType, parm); CumulationData.Result monthResult = treasureMonthCumulationData.updateData(missionType, parm); @@ -327,7 +327,7 @@ public class UserMissionManager extends MongoBase { treasureMissionIdsType.getDoingMissionIds().add(task); missionStateChangeInfos.add(new MissionStateChangeInfo(task, MissionState.DOING,0)); } - treasureCumulationData.reset(); + treasureCumulationData = new CumulationData(); updateString("treasureMissionIdsType",treasureMissionIdsType); if(type==1){ updateString("treasureCumulationData",treasureCumulationData); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 67a0a042b..18a46072c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -347,7 +347,7 @@ public class MissionLoigc { return; } - if(type == GameMisionType.TREASUREMISSION.getType() && user.getActivityManager().getTrsendTime()>System.currentTimeMillis()){ + if(type == GameMisionType.TREASUREMISSION.getType()){ Map> gameMisionTypeListMap = userMissionManager.onGameEvent(user, GameEvent.TREASURE_MISSION_REWARD, missionId); missionStateChangeInfos = gameMisionTypeListMap.get(GameMisionType.TREASUREMISSION); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 123c0b41d..df048cbd7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -13,7 +13,9 @@ import com.ljsd.jieling.globals.Global; 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.GuildInfo; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.GuildLogic; import com.ljsd.jieling.logic.fight.CombatLogic; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.mail.MailLogic; @@ -594,7 +596,12 @@ public class PlayerLogic { cache.setName(playerInfoManager.getNickName()); cache.setLevel(playerInfoManager.getLevel()); cache.setServerId(GameApplication.serverId); - cache.setGuildPosition(0); + if(user.getPlayerInfoManager().getGuildId()==0){ + cache.setGuildPosition(0); + }else{ + int memberType = GuildLogic.getMemberType(user.getId(), GuilidManager.guildInfoMap.get(user.getPlayerInfoManager().getGuildId()).getMembers()); + cache.setGuildPosition(memberType); + } RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(user.getId()),cache); } }