diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index f1970448e..467fce676 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -1308,4 +1308,16 @@ public class RedisUtil { } + public void remove(String key){ + + for (int i = 0; i < MAX_TRY_TIMES; i++) { + try { + redisTemplate.delete(key); + return; + } catch (Exception e) { + + } + } + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index c6736134c..a3e0fa2c3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -159,6 +159,9 @@ public interface BIReason { int SKIN_USE_REWARD = 90;//激活皮肤获得头像 int SUB_ACTIVITY_FINISH = 91;//易经宝库活动结束补发 + int ARENA_WIN_REWARD = 92;//竞技场胜利奖励 + int ARENA_LOSE_REWARD = 93;//竞技场失败奖励 + int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级 int SECRETBOX_CONSUME = 1001;//秘盒抽卡 int DECOMPOSE_ITEM_CONSUME = 1002;//分解道具消耗 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java index be68f7c6e..b2bd67b11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java @@ -90,8 +90,11 @@ public class ArenaChallengeHandler extends BaseHandler0) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java index 08f2c466f..65d3e343d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java @@ -223,7 +223,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler(consumeMap.values()),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); + ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),builder.toString(),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); ItemUtil.itemCost(user, consumeMap, BIReason.COMPLEX_EQUIP_CONSUME, 0); } 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 24e298bfa..5330dee06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java @@ -86,11 +86,14 @@ public enum ReportEventEnum { BEAST_LEVEL(59,"beast_level",new CommonEventHandler(),new String[]{"beast_id","old_level","new_level","cost_item_list_info"}), BEAST_STAR(60,"beast_star",new CommonEventHandler(),new String[]{"beast_id","old_star","new_star","cost_item_list","cost_beast_list"}), BEAST_SUMMON(61,"beast_summon",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}), + BEAST_CABINET(62,"beast_cabinet",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}), + VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""}); + private int type; private String eventName; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java index 36bfaf75a..ce1b85741 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java @@ -17,19 +17,19 @@ public class ReportUserEvent { private Map> userProperties; public ReportUserEvent setAccount_id(String accountId){ - baseInfo.put("#account_id",accountId); + baseInfo.put("#account_id",accountId==null?"unknown":accountId); return this; } public ReportUserEvent setDistinct_id(String distinct_id){ - baseInfo.put("#distinct_id",distinct_id); + baseInfo.put("#distinct_id",distinct_id==null?"unknown":distinct_id); return this; } public ReportUserEvent setDevice_id(String device_id){ - baseInfo.put("#device_id",device_id); + baseInfo.put("#device_id",device_id==null?"unknown":device_id); return this; } public ReportUserEvent setIp(String ip){ - baseInfo.put("#ip",ip); + baseInfo.put("#ip",ip==null?"unknown":ip); return this; } public ReportUserEvent setCountry_code(int country_code){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index c55ffa330..68746d945 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -176,6 +176,8 @@ public class ActivityLogic implements IEventHandler{ if (null == abstractActivity) { continue; } + if(openActivityIds.contains(sGlobalActivity.getId())) + continue; abstractActivity.onActivityStart(); openActivityIds.add(sGlobalActivity.getId()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java index 66987f54d..06e214ffb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java @@ -71,21 +71,27 @@ class SheJiActivity extends AbstractActivity { } } + + //删除本榜单 + String key = RedisUtil.getInstence().getKey(RedisKey.EXPERT_RANK, Integer.toString(id)); + String key2 = RedisUtil.getInstence().getKey(RedisKey.GUILD_SHEJI_SCORE_RANK, Integer.toString(id)); + RedisUtil.getInstence().remove(key); + RedisUtil.getInstence().remove(key2); } @Override public void initActivity(User user) throws Exception { super.initActivity(user); //初始化移除道具 - SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1); - if (null != sGodSacrificeSetting) { - if (sGodSacrificeSetting.getItemDelete() == 1) { - int[] activityItems = sGodSacrificeSetting.getActivityItems(); - for (int item : activityItems) { - user.getItemManager().removeItem(item); - } - } - } +// SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1); +// if (null != sGodSacrificeSetting) { +// if (sGodSacrificeSetting.getItemDelete() == 1) { +// int[] activityItems = sGodSacrificeSetting.getActivityItems(); +// for (int item : activityItems) { +// user.getItemManager().removeItem(item); +// } +// } +// } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 2058d1f19..f858210b8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -552,6 +552,24 @@ public class ArenaLogic { } - + /** + * 竞技场战斗胜利/失败奖励掉落 + * @param user + * @param fightResult + * @return + * @throws Exception + */ + public CommonProto.Drop.Builder getArenaReward(User user, int fightResult) throws Exception { + // 获取配置文件 + SArenaSetting sArenaSetting = SArenaSetting.getSArenaSetting(); + // 三元 赢家奖励:输家奖励 + int rewardGroupId = fightResult == 1?sArenaSetting.getBattleWinReward():sArenaSetting.getBattleLoseReward(); + // 三元 赢家标记:输家标记 + int reason = fightResult == 1?BIReason.ARENA_WIN_REWARD:BIReason.ARENA_LOSE_REWARD; + int[] dropList = new int[1]; + dropList[0]=rewardGroupId; + CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList,1,0, reason); + return drop; + } } 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 ac430c5af..6fac5975b 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 @@ -409,6 +409,10 @@ public class HeroLogic{ case 9: eventEnum = ReportEventEnum.BEAST_SUMMON; break; + case 10: + eventEnum = ReportEventEnum.BEAST_CABINET; + activityId = sLotterySetting.getActivityId(); + break; default: break; diff --git a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java index 3549586b2..7b9842b68 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java @@ -240,10 +240,6 @@ public class SRechargeCommodityConfig implements BaseConfig { return dailyUpdate; } - public int[] getPassiveSkill() { - return passiveSkill; - } - public static TreeMap getRecharegeHeroTime() { return recharegeHeroTime; }