From 14ba7c15994531a46a6686ff3ed346b208394ec7 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 15 Jan 2021 18:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=A4=B4=E5=83=8F=E6=A1=86?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/player/UseHeadFrameHandler.java | 3 +-- .../java/com/ljsd/jieling/logic/dao/PlayerManager.java | 9 +-------- .../java/com/ljsd/jieling/logic/dao/UserManager.java | 1 + .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/UseHeadFrameHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/UseHeadFrameHandler.java index 9364f917d..457781f8d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/UseHeadFrameHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/UseHeadFrameHandler.java @@ -44,8 +44,7 @@ public class UseHeadFrameHandler extends BaseHandler headFrameValidTime; + private Map headFrameValidTime = new HashMap<>(); // 限时头像旧版本兼容 private int oldHeadFrame; @@ -509,11 +509,6 @@ public class PlayerManager extends MongoBase { } public Map getHeadFrameValidTime() { - // 为空,初始化 - if (headFrameValidTime == null){ - setHeadFrameValidTime(new HashMap<>()); - return new HashMap<>(); - } return headFrameValidTime; } @@ -523,13 +518,11 @@ public class PlayerManager extends MongoBase { } public void putHeadFrameValidTime(int headFrameId,Long time) { - getHeadFrameValidTime(); headFrameValidTime.put(headFrameId,time); updateString("headFrameValidTime", headFrameValidTime); } public void removeHeadFrameValidTime(int headFrameId) { - getHeadFrameValidTime(); headFrameValidTime.remove(headFrameId); updateString("headFrameValidTime", headFrameValidTime); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index a21823931..e3ef7da2c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -126,6 +126,7 @@ public class UserManager { int headFrameId = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getDefaultPicture(); playerManager.setHeadFrame(headFrameId); playerManager.putHeadFrameValidTime(headFrameId,0L); + ItemUtil.itemCost(user, new int[][]{{headFrameId, 1}}, 1, BIReason.USE_HEADFRAME,1); SPlayerLevelConfig sPlayerLevelConfig = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(1); playerManager.setMaxStamina(sPlayerLevelConfig.getMaxEnergy()); playerManager.setRideLevel(1); 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 40af91e86..0d617caeb 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 @@ -435,7 +435,7 @@ public class PlayerLogic { LOGGER.info("外观物品Id{}",decorationId); User user = UserManager.getUser(session.getUid()); ItemManager itemManager = user.getItemManager(); - if(decorationId!=0){ + if(decorationId != 0 && type != 0){ if(itemManager.getItem(decorationId)==null||itemManager.getItem(decorationId).getItemNum()<1){ throw new ErrorCodeException(ErrorCode.newDefineCode("无此物品")); }