From 2e240b33d07ef3cd6261ed37ee6619a5369c4514 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 14 Dec 2020 11:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E7=82=B9=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/ktbeans/ReportBaseBean.java | 5 +++++ .../com/ljsd/jieling/ktbeans/ReportEventEnum.java | 4 ++++ .../jieling/logic/championship/ChampionshipLogic.java | 11 ++++++++++- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 3 ++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java index 3e8eb24a0..534071096 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportBaseBean.java @@ -65,6 +65,11 @@ public class ReportBaseBean { } public ReportBaseBean() { + account_id = "DEFAULT-ACCOUNT"; + distinct_id = "DEFAULT-DISTINCT"; + device_id = "DEFAULT-DEVICE_ID"; + ip = "DEFAULT-IP"; + country_code = 0; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java index c0124cdf5..aefe94b0a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java @@ -89,6 +89,10 @@ public enum ReportEventEnum { BEAST_CABINET(62,"beast_cabinet",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}), GUESSING(63,"guessing",new CommonEventHandler(),new String[]{"season_id","guessing_type","stake_type","stake_num"}), + GUESS_OVER(64,"guess_over",new CommonEventHandler(),new String[]{"season_id","guessing_type","stake_type","rewards_num"}), + + GET_TREASURE(65,"get_treasure",new CommonEventHandler(),new String[]{"treasure_id","get_entrance"}), + VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""}); 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 d81a6660c..8350932e2 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 @@ -12,6 +12,8 @@ import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.Global; +import com.ljsd.jieling.ktbeans.ReportEventEnum; +import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.arena.ArenaLogic; @@ -43,6 +45,7 @@ import util.TimeUtils; import java.lang.reflect.Type; import java.util.*; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicBoolean; ; @@ -834,16 +837,20 @@ public class ChampionshipLogic { // } int winnerUid = arenaRecord.getAttackId(); + AtomicBoolean winner = new AtomicBoolean(true); if (schedule == 2) { Map states = RedisUtil.getInstence().getMapValues(RedisKey.CHAMPION_ARENA_RECORD_THREE, "", String.class, Integer.class); String key = String.valueOf(arenaRecord.getAttackId() * 2222 + String.valueOf(arenaRecord.getDefUid())); Integer state = states.get(key); if (null != state && state == 0) { winnerUid = arenaRecord.getDefUid(); + winner.set(false); } } else { if (arenaRecord.getFightResult() == 0) { winnerUid = arenaRecord.getDefUid(); + winner.set(false); + } } @@ -853,6 +860,7 @@ public class ChampionshipLogic { double winRate = STableManager.getFigureConfig(CommonStaticConfig.class).getsChampionshipSetting().getGuessRatio() / 10000d; Map betPersonInfoMap = RedisUtil.getInstence().getMapValues(RedisKey.CHAMPION_BET_DETAIL, selectUid + ":" + winnerUid, Integer.class, Integer.class); + TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.TopBattle); betPersonInfoMap.forEach((betUid, coins) -> { try { User user = UserManager.getUser(betUid); @@ -871,9 +879,10 @@ public class ChampionshipLogic { ArenaInfoProto.ChampionGuessSuccessIndication build = ArenaInfoProto.ChampionGuessSuccessIndication.newBuilder().setItemId(arenaItem[0]).setItemNum(mineWinCoins).setRoundTimes(roundTimes).build(); MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.CHAMPION_GUESS_SUCCESS_INDICATION_VALUE, build, true); } - + ReportUtil.onReportEvent(user, ReportEventEnum.GUESS_OVER.getType(),openTimeOfFuntionCacheByType.getTimes(),getSchedule()==1?getRealTimes():getRealTimes()+7,winner.get()?1:2,mineWinCoins); } }); + ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); } catch (Exception e) { e.printStackTrace(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 12305f54c..a6fa78850 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1145,7 +1145,8 @@ public class ItemUtil { continue; } addEquip(user, entry.getKey(), equipList,jewelList); - KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent,reason,GlobalsDef.addReason,entry.getKey(),1,-1); + ReportUtil.onReportEvent(user,ReportEventEnum.GET_TREASURE.getType(),entry.getKey(),reason); +// KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent,reason,GlobalsDef.addReason,entry.getKey(),1,-1); } }