From 76b9fcf6bcc741e6364daf48fd55093e0ccb5c0f Mon Sep 17 00:00:00 2001 From: "DESKTOP-C3M45P4\\dengdan" Date: Wed, 2 Jul 2025 01:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=92=E9=BE=99=E7=A7=98?= =?UTF-8?q?=E5=AE=9D=E7=99=BB=E5=BD=95=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/TreasureActivity.java | 2 +- .../jieling/logic/dao/UserMissionManager.java | 18 ------------------ .../jieling/logic/mission/MissionLoigc.java | 4 ++-- .../logic/mission/data/LoginTimeManager.java | 5 +++++ 4 files changed, 8 insertions(+), 21 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 6c294de2d..d91554972 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 @@ -46,7 +46,7 @@ public class TreasureActivity extends AbstractActivity { SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_MONTH_REFRESH, sGlobalActivity.getId()); user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_WEEK_REFRESH, sGlobalActivity.getId()); - //戒灵秘宝改为青龙秘宝,只有周任务和月任务 2020.8.14 + //戒灵秘宝改为青龙秘宝,只有周任务和月任务,新增用具任务,整个秘宝周期内 ActivityMission activityMission = new ActivityMission(); activityMission.setActivityState(1); List levels = new ArrayList<>(STreasureSunlongConfig.levelTreasureConfigMap.get(id).keySet()); 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 94c5888f6..7eafedf26 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 @@ -67,7 +67,6 @@ public class UserMissionManager extends MongoBase { private CumulationData treasureCumulationData = new CumulationData(); private CumulationData treasureWeekCumulationData = new CumulationData(); private CumulationData treasureMonthCumulationData = new CumulationData(); - private CumulationData treasureLifeCumulationData = new CumulationData();//青龙秘宝终身任务数据 private CumulationData sevenHappyCumulationData = new CumulationData(); private CumulationData achievementMap = new CumulationData(); private CumulationData jadeDynastyCumulationData = new CumulationData();//破阵诛仙日数据 @@ -211,7 +210,6 @@ public class UserMissionManager extends MongoBase { if(sTreasureTaskConfigs!=null){ CumulationData.Result weekResult = treasureWeekCumulationData.updateData(missionType, parm); CumulationData.Result monthResult = treasureMonthCumulationData.updateData(missionType, parm); - CumulationData.Result lifeResult = treasureLifeCumulationData.updateData(missionType, parm); if(weekResult!=null){ weekResult.setMissionTimeType(2); treasureMissionIdsType.calCumulationDataResult(user,weekResult,missionTypeEnumListMap.get(GameMisionType.TREASUREMISSION),treasureWeekCumulationData); @@ -224,13 +222,6 @@ public class UserMissionManager extends MongoBase { updateString("treasureMonthCumulationData",treasureMonthCumulationData); updateString("treasureMissionIdsType",treasureMissionIdsType); } - if(lifeResult!=null){ - lifeResult.setMissionTimeType(4); - treasureMissionIdsType.calCumulationDataResult(user,lifeResult,missionTypeEnumListMap.get(GameMisionType.TREASUREMISSION),treasureLifeCumulationData); - updateString("treasureLifeCumulationData",treasureLifeCumulationData); - updateString("treasureMissionIdsType",treasureMissionIdsType); - } - } } @@ -421,11 +412,6 @@ public class UserMissionManager extends MongoBase { updateString("treasureMonthCumulationData", treasureMonthCumulationData); } - public void setTreasureLifeCumulationData(CumulationData treasureLifeCumulationData) { - this.treasureLifeCumulationData = treasureLifeCumulationData; - updateString("treasureLifeCumulationData", treasureLifeCumulationData); - } - public void setSevenHappyCumulationData(CumulationData sevenHappyCumulationData) { this.sevenHappyCumulationData = sevenHappyCumulationData; updateString("sevenHappyCumulationData", sevenHappyCumulationData); @@ -506,10 +492,6 @@ public class UserMissionManager extends MongoBase { return treasureMonthCumulationData; } - public CumulationData getTreasureLifeCumulationData() { - return treasureLifeCumulationData; - } - public void setMissingRoomMissionType(MissingRoomMissionType missingRoomMissionType) { this.missingRoomMissionType = missingRoomMissionType; updateString("missingRoomMissionType",missingRoomMissionType); 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 a9751eed9..89c644af4 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 @@ -275,8 +275,8 @@ public class MissionLoigc { case 3: progress = getDoingProgress(user,treasureMonthCumulationData,config.getTaskType(),config.getTaskValue()[0]); break; - default: - break; + default: + break; } missionList.add(CommonProto.UserMissionInfo.newBuilder().setMissionId(id).setState(0).setType(treasuremissionType).setProgress(progress).setTakeTimes(0).build()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/LoginTimeManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/LoginTimeManager.java index 617d089d0..39b20fae3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/LoginTimeManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/LoginTimeManager.java @@ -15,6 +15,11 @@ public class LoginTimeManager extends AbstractDataManager { long lastLoginTime = (long)parm[2]; //今天已经登录过了,不记录次数 if(TimeUtils.isSameDay(System.currentTimeMillis(),lastLoginTime)){ + int times = data.loginTimesDay.getOrDefault(dayTh, 0); + //之前没记录过,说明是刚注册,首次登录可定是同一天,设置登录次数 + if(times == 0){ + data.loginTimesDay.put(dayTh, data.loginTimesDay.getOrDefault(dayTh,0) + 1); + } return new CumulationData.Result(missionType); } }