From 4e0dd14dce3116a37adfa339966befc50307f699 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 12 Aug 2020 14:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E7=BD=AE=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/common/mogodb/MongoBase.java | 18 +++++++++--- .../hero/DoHeroChangeRequestHandler.java | 16 +++++++---- .../hero/SaveHeroChangeRequestHandler.java | 28 +++++++++++-------- .../java/com/ljsd/jieling/logic/dao/Hero.java | 8 +++++- .../ljsd/jieling/logic/hero/HeroLogic.java | 2 +- .../src/main/java/config/SLotterySetting.java | 2 +- 6 files changed, 51 insertions(+), 23 deletions(-) diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java b/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java index fbdc57fbb..7bd432323 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java @@ -24,12 +24,22 @@ public abstract class MongoBase implements Serializable { } public void updateString(String fieldName, Object value) { - if("".equals(mongoKey)){ - MongoUpdateCacheThreadLocal.addUpdateRequest(this, fieldName, value); - }else{ - MongoUpdateCacheThreadLocal.addUpdateRequest(this, mongoKey + "." + fieldName, value); + if(null == value){ + if("".equals(mongoKey)){ + MongoUpdateCacheThreadLocal.removeRequest(this, fieldName); + }else{ + MongoUpdateCacheThreadLocal.removeRequest(this, mongoKey + "." + fieldName); + } + + }else { + if("".equals(mongoKey)){ + MongoUpdateCacheThreadLocal.addUpdateRequest(this, fieldName, value); + }else{ + MongoUpdateCacheThreadLocal.addUpdateRequest(this, mongoKey + "." + fieldName, value); + } } + } public void removeSubString(String key) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/DoHeroChangeRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/DoHeroChangeRequestHandler.java index 820cc7002..8f73a59a7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/DoHeroChangeRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/DoHeroChangeRequestHandler.java @@ -8,10 +8,12 @@ import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.Hero; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.expedition.ExpeditionLogic; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.HeroInfoProto; import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.ItemUtil; import config.SCHero; import config.SSpecialConfig; @@ -48,9 +50,9 @@ public class DoHeroChangeRequestHandler extends BaseHandler returnItems = new HashMap<>(); equipIdsList.forEach(e->{ - soulEquipByPositionMap.remove(e.getPosition()); + hero.removeSoulEquip(e.getPosition()); returnItems.put(e.getEquipId(),1); }); ItemUtil.dropMap(user,returnItems,BIReason.UNLOAD_SOUL_REWARD); diff --git a/tablemanager/src/main/java/config/SLotterySetting.java b/tablemanager/src/main/java/config/SLotterySetting.java index 652e008a9..f17b974d9 100644 --- a/tablemanager/src/main/java/config/SLotterySetting.java +++ b/tablemanager/src/main/java/config/SLotterySetting.java @@ -47,7 +47,7 @@ public class SLotterySetting implements BaseConfig { }else if (entry.getValue().getLotteryType()==8){ Map orDefault = integerMapMap.getOrDefault(5, new HashMap<>()); orDefault.put(entry.getValue().getPropertyType(),entry.getKey()); - integerMapMap.put(4,orDefault); + integerMapMap.put(5,orDefault); } } changeIds = integerMapMap;