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/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 8c9676e5e..58b6ce0e7 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 @@ -415,6 +415,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; }