From c09cb66fe08648565fbfb42bad3ed49bbe50668b Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 27 Jan 2021 15:53:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E5=AF=86=E4=BF=9D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9C=AA=E5=88=B0=E8=AE=A1=E7=AE=97=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/Expedition/TakeLayRewardHandler.java | 9 ++++++++- .../java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeLayRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeLayRewardHandler.java index c2c1077b7..f6f3d8b97 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeLayRewardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeLayRewardHandler.java @@ -20,6 +20,7 @@ import com.ljsd.jieling.util.MessageUtil; import config.SExpeditionNodeConfig; import config.SExpeditionSetting; import manager.STableManager; +import util.TimeUtils; import java.util.*; @@ -118,9 +119,15 @@ public class TakeLayRewardHandler extends BaseHandler= firstStartTime){ + user.getExpeditionManager().addScore(score); + } + Map rewardStatusMap = user.getExpeditionManager().getWorldTreasureReward().getRewardStatusMap(); ExpeditionLogic.sendTreasureRewardUpdate(iSession,user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),expeditionManager.getWorldTreasureReward().getIsBuy()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index c92f149a6..a80804812 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -424,7 +424,7 @@ public class BuyGoodsLogic { } if(type==GiftGoodsType.SKY_TREASURE){ - user.getExpeditionManager().getWorldTreasureReward().setScore(user.getExpeditionManager().getWorldTreasureReward().getScore()+SSpecialConfig.getIntegerValue(SSpecialConfig.SKY_TREASURE_SCORE_INGIFT)); + user.getExpeditionManager().addScore(SSpecialConfig.getIntegerValue(SSpecialConfig.SKY_TREASURE_SCORE_INGIFT)); user.getExpeditionManager().getWorldTreasureReward().setIsBuy(1); Map rewardStatusMap = user.getExpeditionManager().getWorldTreasureReward().getRewardStatusMap(); ExpeditionLogic.sendTreasureRewardUpdate(OnlineUserManager.getSessionByUid(user.getId()),user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),1); From 7cb10721268d0d7b86ce657ee027be83f40aadd4 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 27 Jan 2021 16:00:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=AA=E4=BF=9D?= =?UTF-8?q?=E7=95=991=E5=92=8C2=EF=BC=8C1=EF=BC=9A=E6=88=90=E5=8A=9F?= =?UTF-8?q?=EF=BC=8C2=EF=BC=9A=E8=83=8C=E5=8C=85=E5=B7=B2=E6=BB=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/mail/MailLogic.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java index 2d936e542..f5322022d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java @@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory; import util.StringUtil; import util.TimeUtils; +import javax.swing.plaf.nimbus.State; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; @@ -249,18 +250,20 @@ public class MailLogic { int[][] itemArr = StringUtil.parseFiledInt2(mailItem.toString()); // 检测卡牌和装备背包 int limit = ItemUtil.checkCardAndEquipLimit(user,itemArr); + int state = 1; if (limit == 0){ // 领取道具 - result = ItemUtil.dropByMail(user, itemArr, dropBuilder, BIReason.TAKE_MAIL_REWARD); + state = ItemUtil.dropByMail(user, itemArr, dropBuilder, BIReason.TAKE_MAIL_REWARD); - if (result == 1){ + if (state == 1){ // 改变邮件状态 mail.setState(Global.MAIL_DRAW_ST_GOT); mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME); mailManager.addMail(mail); } - }else { - result =2; + } + if (state != 1) { + result = 2; } }