From b6f4eb1b2452a10a2d5e8536ecf2a8861f4b670d Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Tue, 14 Sep 2021 14:53:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A9=E8=BE=95=E5=AE=9D=E9=95=9C?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E5=A2=9E=E5=8A=A0=20=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=89=AB=E8=8D=A1=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/SituationLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java index 678ab137c..b6e42a696 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java @@ -279,7 +279,6 @@ public class SituationLogic { int score = Double.valueOf(rankEnum.getScoreById(user.getId(), "")).intValue(); rankEnum.addRank(user.getId(),"",score==-1?1:score+1); consumeCount = true; - BuyGoodsNewLogic.openPush(session, user, PushRechargeType.XIANYUAN_BAOJING.getType(), sRaceTowerConfig.getQuality(), 1); } }else{ throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); @@ -290,6 +289,7 @@ public class SituationLogic { if(!consume){ throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } + BuyGoodsNewLogic.openPush(session, user, PushRechargeType.XIANYUAN_BAOJING.getType(), sRaceTowerConfig.getQuality(), 1); } // 埋点报送 ReportUtil.onReportEvent(user, ReportEventEnum.START_SKY_REALM.getType(), sRaceTowerConfig.getType(),id,combat_results,dropResult); From 713dda777fe9a01ce0702b92321ac68c828be3ee Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Tue, 14 Sep 2021 15:49:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A4=BC=E5=8C=85=E6=8E=A8=E9=80=81=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 9961371d2..dffcf1efe 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -798,8 +798,10 @@ public class BuyGoodsNewLogic { MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true); } }else{ - PlayerInfoProto.PushWelfareResponse pushWelfareResponse = PlayerInfoProto.PushWelfareResponse.newBuilder().addId(popup).build(); - MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true); + if(push) { + PlayerInfoProto.PushWelfareResponse pushWelfareResponse = PlayerInfoProto.PushWelfareResponse.newBuilder().addId(popup).build(); + MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true); + } } } }