From e99ad72a8e263871085b884ea3b168eb29aeb7c6 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 25 Aug 2020 19:22:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/fight/CheckFight.java | 6 ++++++ .../handler/champion/ChampionBetInfoHandler.java | 2 -- .../eventhandler/ActivityStateChangeHandler.java | 2 -- .../jieling/logic/championship/ChampionshipLogic.java | 1 - .../ljsd/jieling/logic/dao/UserMissionManager.java | 1 - .../com/ljsd/jieling/logic/fight/CombatLogic.java | 3 +++ .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 11 ++++++++--- .../com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 6 ++++++ 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java b/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java index aa62cc711..4fadbf029 100644 --- a/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java +++ b/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java @@ -108,6 +108,12 @@ public class CheckFight { resultCache[1]=duration; // LOGGER.info(" lua check test fight result : "+ status); for (int i = 1; i <= result.length(); i++) { + long tolong = result.rawget(i).tolong(); + if(tolong>0){ + resultCache[i+1]= (int)Math.min((long) Integer.MAX_VALUE,tolong); + }else { + resultCache[i+1]= (int)Math.max((long) Integer.MIN_VALUE,tolong); + } resultCache[i+1] = result.rawget(i).toint(); // LOGGER.info(i+" --> 单位剩余血量 : "+ resultCache[i+1]); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java index 645e7fad1..21d47ce63 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java @@ -76,8 +76,6 @@ public class ChampionBetInfoHandler extends BaseHandler sGlobalActivities = SGlobalActivity.sGlobalActivityMapByOpenRules.getOrDefault(3, new ArrayList<>(0)); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index c4b7ca2fb..eec8f5869 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -799,7 +799,6 @@ public class ChampionshipLogic { @Override public void work(User user) throws Exception { int mineWinCoins = (int) (winRate * coins); - System.out.println("coins winRate = " + coins+":"+winRate+":mineWinCoins" +mineWinCoins); int[][] drop = new int[1][]; drop[0] = new int[2]; drop[0][0] = arenaItem[0]; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index da7fb4605..efc27bfd6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -106,7 +106,6 @@ public class UserMissionManager extends MongoBase { if(weekRefreshIds!=null){ treasureWeekCumulationData = new CumulationData(); int weekRefreshTime = (int)(TimeUtils.getNextWeekendStartTime(1,5)/1000); - System.out.println(weekRefreshTime); CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekRefreshIds).setRefreshTime(weekRefreshTime); PlayerInfoProto.TreasureRefreshIndication indication2 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task2.build()).build(); MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication2,true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 9c47b3cb1..6e39a38e0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -824,6 +824,9 @@ public class CombatLogic { Map propertiesMap = new HashMap<>(); for(Integer heroId:heroFind){ + if(null==SCHero.sCHero.get(heroId)){ + LOGGER.error("Exception ::::"+heroId); + } int propertyName = SCHero.sCHero.get(heroId).getPropertyName(); propertiesMap.put(propertyName,propertiesMap.getOrDefault(propertyName,0)+1); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 0be56f1a9..03719973d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1493,10 +1493,15 @@ public class HeroLogic{ //阵营光环加成 if(teamId!=0){ - int[][] elementEffect = CombatLogic.getInstance().elementEffect(user,teamId); - if (elementEffect!=null&&elementEffect.length>0){ - combinedAttribute(elementEffect,heroAllAttribute); + try { + int[][] elementEffect = CombatLogic.getInstance().elementEffect(user,teamId); + if (elementEffect!=null&&elementEffect.length>0){ + combinedAttribute(elementEffect,heroAllAttribute); + } + }catch (Exception e){ + e.printStackTrace(); } + } //被动技能加成 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 9fd52f1ea..a465f9a2a 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 @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.store; +import com.google.gson.Gson; import com.ljsd.GameApplication; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.config.reportData.DataMessageUtils; @@ -562,6 +563,11 @@ public class BuyGoodsLogic { }else{ if(sRechargeCommodityConfig.getDailyUpdate()>=1){ + if(!refreshBagMap.containsKey(sRechargeCommodityConfig.getId())){ + Gson gson = new Gson(); + LOGGER.error(sRechargeCommodityConfig.getId()+"Exception= " + gson.toJson(refreshBagMap.keySet())); + continue; + } endTime = refreshBagMap.get(sRechargeCommodityConfig.getId()); startTime = endTime - sRechargeCommodityConfig.getDailyUpdate()*TimeUtils.ONE_DAY; }else{