From 88636f881f8ae786d7d840954d6df914bd461fbc Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sun, 29 Dec 2019 10:43:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=B5=8B=E8=AF=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/LuckWheelExpectRankActivity.java | 3 +-- .../eventhandler/HeroFiveStarGetEventHandler.java | 4 ++-- .../java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelExpectRankActivity.java index d92d4c450..4efaaf782 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckWheelExpectRankActivity.java @@ -14,7 +14,6 @@ class LuckWheelExpectRankActivity extends ExpectRankActivity { public LuckWheelExpectRankActivity(int id) { super(id); - Poster.getPoster().listenEvent(this, LuckWheelAdvanceEvent.class); Poster.getPoster().listenEvent(this, LuckWheelEvent.class); } @@ -22,7 +21,7 @@ class LuckWheelExpectRankActivity extends ExpectRankActivity { public void onEvent(IEvent event) throws Exception { if (!(event instanceof LuckWheelEvent)) return; - update(UserManager.getUser(((LuckWheelEvent) event).getUid()), 1); + update(UserManager.getUser(((LuckWheelEvent) event).getUid()), ((LuckWheelEvent) event).getTime()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java index d21d70f53..76c5d0428 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java @@ -46,8 +46,8 @@ public class HeroFiveStarGetEventHandler implements IEventHandler { if(typeBagMap.containsKey(((HeroFiveStarGetEvent) event).getStar())){ long lasttime = rechargeInfo.getTypeBagMap().get(((HeroFiveStarGetEvent) event).getStar()); - long diffHourTemp =(now - lasttime) / 60 ; - if (diffHourTemp < 1000) { + int diffHourTemp = (int) ((now - lasttime) / 3600 / 1000); + if (diffHourTemp < 2) { rechargeInfo.addDyGoodsCanBuyTimes(goodsId); }else { rechargeInfo.putDyGoodsCanBuyTimes(goodsId,1); 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 f50f3f87d..fa2de31bf 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 @@ -390,20 +390,20 @@ public class BuyGoodsLogic { } startTime = typeBagMap.get(value); - int addtime = 1000; - int diffHour = (int) ((now - startTime) / 60 ); + int addtime = discountType[2]; + int diffHour = (int) ((now - startTime) / 3600 / 1000); if (diffHour >= addtime) { rechargeInfo.removeDyGoodsCanBuyTimes(goodsId); continue; } - endTime = startTime + addtime * 60; + endTime = startTime + addtime * 3600 * 1000; if (rechargeInfo.getCacheSendedTypes().containsKey(value)) { long lasttime = rechargeInfo.getCacheSendedTypes().get(value); if(lasttime != startTime){ needChange = true; rechargeInfo.getCacheSendedTypes().put(value, startTime); - int diffHourTemp = (int) ((now - lasttime) / 60 ); + int diffHourTemp = (int) ((now - lasttime) / 3600 / 1000); if (diffHourTemp < addtime) { startTime =0; }