Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
9c658b6acd
|
@ -313,7 +313,14 @@ public class HeroLogic{
|
|||
result.add(random[0]+"-"+scHero.getStar());
|
||||
}
|
||||
}
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),"",String.valueOf(sLotterySetting.getPerCount()),String.valueOf(costItem[0]),String.valueOf(costItem[1]),result);
|
||||
if(costItem.length==1){
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),"",String.valueOf(sLotterySetting.getPerCount()),String.valueOf(costItem[0]),"",result);
|
||||
}else if(costItem.length>=2){
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),"",String.valueOf(sLotterySetting.getPerCount()),String.valueOf(costItem[0]),String.valueOf(costItem[1]),result);
|
||||
}else {
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),"",String.valueOf(sLotterySetting.getPerCount()),"","",result);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
|
@ -47,10 +47,10 @@ public class AchieveMissionIdsType extends AbstractMissionType{
|
|||
boolean isfinish;
|
||||
int doingProgress;
|
||||
BaseDataManager missTypeData = DataManagerDistributor.getMissTypeData(result.subType);
|
||||
if(missTypeData instanceof AbstractDataManager&&((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sAchievementConfig.getValues())){
|
||||
doingProgress = ((AbstractDataManager) missTypeData).getProcess(user,cumulationData,sAchievementConfig.getValues()[0]);
|
||||
isfinish=true;
|
||||
}else {
|
||||
if (missTypeData instanceof AbstractDataManager) {
|
||||
doingProgress = ((AbstractDataManager) missTypeData).getProcess(user, cumulationData, sAchievementConfig.getValues()[0]);
|
||||
isfinish = ((AbstractDataManager) missTypeData).isFinish(user, cumulationData, sAchievementConfig.getValues());
|
||||
} else {
|
||||
doingProgress = MissionLoigc.getDoingProgress(user, cumulationData, sAchievementConfig.getType(), sAchievementConfig.getValues()[0]);
|
||||
//完成
|
||||
isfinish = doingProgress<finishParm;
|
||||
|
|
|
@ -73,9 +73,9 @@ public class JadeDynastyMissionType extends AbstractMissionType{
|
|||
boolean isFinish;
|
||||
int doingProgress;
|
||||
BaseDataManager missTypeData = DataManagerDistributor.getMissTypeData(MissionType.findByMissionId(sThemeActivityTaskConfig.getTaskType()));
|
||||
if(missTypeData instanceof AbstractDataManager &&((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sThemeActivityTaskConfig.getTaskValue())){
|
||||
if(missTypeData instanceof AbstractDataManager ){
|
||||
doingProgress = ((AbstractDataManager) missTypeData).getProcess(user,cumulationData,sThemeActivityTaskConfig.getTaskValue()[0]);
|
||||
isFinish=true;
|
||||
isFinish=((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sThemeActivityTaskConfig.getTaskValue());
|
||||
}else {
|
||||
doingProgress = MissionLoigc.getDoingProgress(user, cumulationData, sThemeActivityTaskConfig.getTaskType(), sThemeActivityTaskConfig.getTaskValue()[0]);
|
||||
isFinish =doingProgress>=finishParm;
|
||||
|
|
|
@ -59,9 +59,9 @@ public class ServenMissionIdsType extends AbstractMissionType{
|
|||
boolean isFinish;
|
||||
int doingProgress;
|
||||
BaseDataManager missTypeData = DataManagerDistributor.getMissTypeData(MissionType.findByMissionId(sTaskConfig.getTaskType()));
|
||||
if(missTypeData instanceof AbstractDataManager &&((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sTaskConfig.getTaskValue())){
|
||||
if(missTypeData instanceof AbstractDataManager ){
|
||||
doingProgress = ((AbstractDataManager) missTypeData).getProcess(user,cumulationData,sTaskConfig.getTaskValue()[0]);
|
||||
isFinish=true;
|
||||
isFinish=((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sTaskConfig.getTaskValue());
|
||||
}else {
|
||||
doingProgress = MissionLoigc.getDoingProgress(user, cumulationData, sTaskConfig.getTaskType(), sTaskConfig.getTaskValue()[0]);
|
||||
isFinish = doingProgress >= sTaskConfig.getTaskValue()[1][0];
|
||||
|
|
|
@ -82,9 +82,9 @@ public class TreasureMissionType extends AbstractMissionType{
|
|||
boolean isFinish;
|
||||
int doingProgress;
|
||||
BaseDataManager missTypeData = DataManagerDistributor.getMissTypeData(MissionType.findByMissionId(sTreasureTaskConfig.getTaskType()));
|
||||
if(missTypeData instanceof AbstractDataManager &&((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sTreasureTaskConfig.getTaskValue())){
|
||||
if(missTypeData instanceof AbstractDataManager ){
|
||||
doingProgress = ((AbstractDataManager) missTypeData).getProcess(user,cumulationData,sTreasureTaskConfig.getTaskValue()[0]);
|
||||
isFinish=true;
|
||||
isFinish=((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sTreasureTaskConfig.getTaskValue());
|
||||
}else {
|
||||
doingProgress = MissionLoigc.getDoingProgress(user, cumulationData, sTreasureTaskConfig.getTaskType(), sTreasureTaskConfig.getTaskValue()[0]);
|
||||
isFinish =doingProgress>=finishParm;
|
||||
|
|
|
@ -63,8 +63,8 @@ public class VipMissionIdsType extends AbstractMissionType{
|
|||
|
||||
boolean isFinish;
|
||||
BaseDataManager missTypeData = DataManagerDistributor.getMissTypeData(MissionType.findByMissionId(sTaskConfig.getTaskType()));
|
||||
if(missTypeData instanceof AbstractDataManager &&((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sTaskConfig.getTaskValue())){
|
||||
isFinish=true;
|
||||
if(missTypeData instanceof AbstractDataManager){
|
||||
isFinish=((AbstractDataManager) missTypeData).isFinish(user,cumulationData, sTaskConfig.getTaskValue());
|
||||
}else {
|
||||
isFinish = MissionLoigc.getDoingProgress(user,cumulationData,sTaskConfig.getTaskType(),sTaskConfig.getTaskValue()[0])>=sTaskConfig.getTaskValue()[1][0];
|
||||
}
|
||||
|
|
|
@ -43,7 +43,9 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
|
||||
private int contiueDays;
|
||||
|
||||
private String rechargeId2;
|
||||
|
||||
private String rechargeId3;
|
||||
|
||||
private int time;
|
||||
private String startTime;
|
||||
|
@ -81,6 +83,8 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
Set<SRechargeCommodityConfig> refreshItemInfoTmp = new HashSet<>();
|
||||
for(SRechargeCommodityConfig sRechargeCommodityConfig : config.values()){
|
||||
sdkRechargeCommodityConfigMap.put(sRechargeCommodityConfig.getRechargeId(),sRechargeCommodityConfig);
|
||||
sdkRechargeCommodityConfigMap.put(sRechargeCommodityConfig.getRechargeId2(),sRechargeCommodityConfig);
|
||||
sdkRechargeCommodityConfigMap.put(sRechargeCommodityConfig.getRechargeId3(),sRechargeCommodityConfig);
|
||||
int[] discountType = sRechargeCommodityConfig.getDiscountType();
|
||||
if(discountType!=null && discountType.length>0 &&discountType[0] == 2){
|
||||
int level = discountType[1];
|
||||
|
@ -242,4 +246,12 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
public String getRechargeId() {
|
||||
return rechargeId;
|
||||
}
|
||||
|
||||
public String getRechargeId2() {
|
||||
return rechargeId2;
|
||||
}
|
||||
|
||||
public String getRechargeId3() {
|
||||
return rechargeId3;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue