Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
c9e04ee252
|
@ -223,7 +223,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler<HeroInfoProto.C
|
|||
}
|
||||
builder.append(entry.getKey()).append("-").append(entry.getValue());
|
||||
}
|
||||
ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),builder.toString(),new ArrayList<>(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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -17,19 +17,19 @@ public class ReportUserEvent {
|
|||
private Map<Integer,Map<String,Object>> 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){
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -240,10 +240,6 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
return dailyUpdate;
|
||||
}
|
||||
|
||||
public int[] getPassiveSkill() {
|
||||
return passiveSkill;
|
||||
}
|
||||
|
||||
public static TreeMap<Double, Integer> getRecharegeHeroTime() {
|
||||
return recharegeHeroTime;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue