root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

back_recharge
DESKTOP-98AVA47\Administrator 2020-10-01 00:23:35 +08:00
parent 5b660609f4 b5b616016a
commit c9e04ee252
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java
View File

@ -223,7 +223,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler<HeroInfoProto.C
} }
builder.append(entry.getKey()).append("-").append(entry.getValue()); 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); ItemUtil.itemCost(user, consumeMap, BIReason.COMPLEX_EQUIP_CONSUME, 0);
} }

3
serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java
View File

@ -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_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_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_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[]{""}); VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""});
private int type; private int type;
private String eventName; private String eventName;

8
serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java
View File

@ -17,19 +17,19 @@ public class ReportUserEvent {
private Map<Integer,Map<String,Object>> userProperties; private Map<Integer,Map<String,Object>> userProperties;
public ReportUserEvent setAccount_id(String accountId){ public ReportUserEvent setAccount_id(String accountId){
baseInfo.put("#account_id",accountId); baseInfo.put("#account_id",accountId==null?"unknown":accountId);
return this; return this;
} }
public ReportUserEvent setDistinct_id(String distinct_id){ 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; return this;
} }
public ReportUserEvent setDevice_id(String device_id){ 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; return this;
} }
public ReportUserEvent setIp(String ip){ public ReportUserEvent setIp(String ip){
baseInfo.put("#ip",ip); baseInfo.put("#ip",ip==null?"unknown":ip);
return this; return this;
} }
public ReportUserEvent setCountry_code(int country_code){ public ReportUserEvent setCountry_code(int country_code){

4
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -415,6 +415,10 @@ public class HeroLogic{
case 9: case 9:
eventEnum = ReportEventEnum.BEAST_SUMMON; eventEnum = ReportEventEnum.BEAST_SUMMON;
break; break;
case 10:
eventEnum = ReportEventEnum.BEAST_CABINET;
activityId = sLotterySetting.getActivityId();
break;
default: default:
break; break;

4
tablemanager/src/main/java/config/SRechargeCommodityConfig.java
View File

@ -240,10 +240,6 @@ public class SRechargeCommodityConfig implements BaseConfig {
return dailyUpdate; return dailyUpdate;
} }
public int[] getPassiveSkill() {
return passiveSkill;
}
public static TreeMap<Double, Integer> getRecharegeHeroTime() { public static TreeMap<Double, Integer> getRecharegeHeroTime() {
return recharegeHeroTime; return recharegeHeroTime;
} }