From b838d8b25b346cd3f3cd9ea8e2715a58e301eb13 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Mon, 17 Feb 2020 13:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=94=E6=98=9F=E6=88=90=E9=95=BF=E7=A4=BC?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Expedition/EndExpeditionBattleRequest.java | 2 -- .../com/ljsd/jieling/logic/GlobalDataManaager.java | 4 ---- .../eventhandler/HeroFiveStarGetEventHandler.java | 1 + .../com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 12 ++++++------ 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index 544dbcdfb..874942467 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -13,8 +13,6 @@ import com.ljsd.jieling.logic.expedition.ExpeditionLogic; import com.ljsd.jieling.logic.fight.DefFightSnapData; import com.ljsd.jieling.logic.fight.FightUtil; import com.ljsd.jieling.logic.fight.GameFightType; -import com.ljsd.jieling.logic.fight.PVPFightEvent; -import com.ljsd.jieling.logic.fight.result.FightResult; import com.ljsd.jieling.logic.hero.HeroAttributeEnum; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.network.session.ISession; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 07dc87fc9..353dca09a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -13,13 +13,9 @@ import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.FightMainEventHandler; import com.ljsd.jieling.logic.activity.RemoveEventHeroHandler; import com.ljsd.jieling.logic.activity.UserLevelEventHandler; -import com.ljsd.jieling.logic.activity.event.HeroFiveStarGetEvent; -import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.activity.eventhandler.BuyGoodsDirectHandler; -import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler; import com.ljsd.jieling.logic.arena.ArenaLogic; import com.ljsd.jieling.logic.championship.ChampionshipLogic; -import com.ljsd.jieling.logic.dao.ExpeditionManager; import com.ljsd.jieling.logic.dao.ServerConfig; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; 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 41ba555a1..8cd86fd48 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 @@ -35,6 +35,7 @@ public class HeroFiveStarGetEventHandler implements IEventHandler { if (!(event instanceof HeroFiveStarGetEvent)) return; + //动态控制购买数量 User user = UserManager.getUser(((HeroFiveStarGetEvent) event).getUid()); RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); long now = System.currentTimeMillis(); 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 9b4907829..e1bc7614a 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 @@ -381,8 +381,6 @@ public class BuyGoodsLogic { continue; } - - int[] discountType = sRechargeCommodityConfig.getDiscountType(); int time = sRechargeCommodityConfig.getTime(); long startTime=0; @@ -404,25 +402,27 @@ public class BuyGoodsLogic { } if(type == 4){ + //4#妖灵师星级#持续时间 if(!typeBagMap.containsKey(value)){ continue; } startTime = typeBagMap.get(value); - int addtime = discountType[2]; - int diffHour = (int) ((now - startTime) / 3600 / 1000); + int addtime = discountType[2]*3600;//minute + int diffHour = (int) ((now - startTime) / 1000); if (diffHour >= addtime) { + //超过2小时重置动态购买次数 rechargeInfo.removeDyGoodsCanBuyTimes(goodsId); continue; } - endTime = startTime + addtime * 3600 * 1000; + endTime = startTime + addtime * 1000;//minute 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) / 3600 / 1000); + int diffHourTemp = (int) ((now - lasttime) / 1000);//minute if (diffHourTemp < addtime) { startTime =0; }