From 5feec114b7251f2c2f5679471c0c3be7d8358d59 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 8 Jun 2021 14:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/map/EndlessTreasureReward.java | 27 +--------------- .../ljsd/jieling/handler/map/MapLogic.java | 4 +-- .../ljsd/jieling/handler/map/MapManager.java | 31 ++++++++++++++++--- .../TakeEndlessTreasureHandler.java | 2 +- .../jieling/logic/store/BuyGoodsNewLogic.java | 2 +- 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessTreasureReward.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessTreasureReward.java index 6b64bf115..15e93a318 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessTreasureReward.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EndlessTreasureReward.java @@ -13,7 +13,6 @@ public class EndlessTreasureReward extends MongoBase { private int createTime; //取当天零点 根据其可以推算出期数。 - private int score; private int isBuy; private Map rewardStatusMap = new HashMap<>(); //领取状态 1:表示领取基础奖励 2:表示领取额外奖励。 @@ -21,39 +20,17 @@ public class EndlessTreasureReward extends MongoBase { this.setRootCollection(User._COLLECTION_NAME); } - public void reset(){ - - updataCreateTime((int)(TimeUtils.getMonthStartTime(1,1)/1000) -1); - setRewardStatusMap(new HashMap<>()); - setIsBuy(0); - } - public int getCreateTime() { return createTime; } - public int getScore() { - return score; - } - - public void setScore(int score) { - this.score = score; - } - public Map getRewardStatusMap() { return rewardStatusMap; } public void setRewardStatusMap(Map rewardStatusMap) { this.rewardStatusMap = rewardStatusMap; - updateString("rewardStatusMap",rewardStatusMap); - - } - - public void updateMissionStatus(int id, int value){ - rewardStatusMap.put(id,value); - updateString("rewardStatusMap."+id, value); } public int getIsBuy() { @@ -62,10 +39,8 @@ public class EndlessTreasureReward extends MongoBase { public void setIsBuy(int isBuy) { this.isBuy = isBuy; - updateString("isBuy",isBuy); } - public void updataCreateTime(int createTime){ + public void setCreateTime(int createTime){ this.createTime = createTime; - updateString("createTime",createTime); } } 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 d75461d82..c0c0743d5 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 @@ -6,7 +6,6 @@ import com.ljsd.jieling.core.FunctionIdEnum; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.core.VipPrivilegeType; import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType; -import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.exception.ErrorCode; @@ -3400,7 +3399,6 @@ public class MapLogic { states.add(builder.build()); }); response.addAllTreasureRewardState(states); - response.setScore(worldTreasureReward.getScore()); response.setResetTime(worldTreasureReward.getCreateTime()); response.setIsBuy(worldTreasureReward.getIsBuy()); // }else { @@ -3411,7 +3409,7 @@ public class MapLogic { } public void flushEndlessTreasure(User user) throws Exception { if(user.getMapManager().getEndlessTreasureReward().getCreateTime()0){ item.setItemNum(0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 92d5d99e8..a1d972090 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -123,7 +123,7 @@ public class MapManager extends MongoBase { private int currentJourneyId; - private EndlessTreasureReward endlessTreasureReward; + private EndlessTreasureReward endlessTreasureReward = new EndlessTreasureReward(); public MapManager() { this.setRootCollection(User._COLLECTION_NAME); @@ -910,10 +910,6 @@ public class MapManager extends MongoBase { } public EndlessTreasureReward getEndlessTreasureReward() { - if(endlessTreasureReward==null){ - endlessTreasureReward = new EndlessTreasureReward(); - endlessTreasureReward.init(getRootId(), MongoKey.mapManager+"."+"endlessTreasureReward"); - } return endlessTreasureReward; } @@ -940,6 +936,31 @@ public class MapManager extends MongoBase { removeString("endlessMapInfo.monsterHp."+position); } + public void updateTreasureCreateTime(int time){ + endlessTreasureReward.setCreateTime(time); + updateString("endlessTreasureReward.createTime",time); + } + + public void setTreasureRewardStatusMap(Map rewardStatusMap){ + endlessTreasureReward.setRewardStatusMap(rewardStatusMap); + updateString("endlessTreasureReward.rewardStatusMap",rewardStatusMap); + } + + public void setTreasureIsBuy(int isBuy){ + endlessTreasureReward.setIsBuy(isBuy); + updateString("endlessTreasureReward.isBuy",isBuy); + } + public void updateMissionStatus(int id, int value){ + endlessTreasureReward.getRewardStatusMap().put(id,value); + updateString("endlessTreasureReward.rewardStatusMap."+id,value); + } + + public void resetEndlessTreasure(){ + updateTreasureCreateTime((int)(TimeUtils.getMonthStartTime(1,1)/1000) -1); + setTreasureRewardStatusMap(new HashMap<>()); + setTreasureIsBuy(0); + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/TakeEndlessTreasureHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/TakeEndlessTreasureHandler.java index 6a2c45a84..2ffa5c7df 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/TakeEndlessTreasureHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/TakeEndlessTreasureHandler.java @@ -67,7 +67,7 @@ public class TakeEndlessTreasureHandler extends BaseHandler