Merge branch 'master_prb_gn' into master_test_gn

back_recharge
jiahuiwen 2021-09-22 10:58:22 +08:00
commit f5c52e7bd7
5 changed files with 30 additions and 9 deletions

View File

@ -78,8 +78,6 @@ public class GuildHelpHelpOtherRequestHandler extends BaseHandler<Family.GuildHe
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
}
user.getGuildMyInfo().setGuildHelpTime(guildHelpTime+1);
User target = UserManager.getUser(proto.getUid());
int b = target.getGuildMyInfo().getGuidHelpInfo().getOrDefault(proto.getType(),-2);
@ -87,6 +85,8 @@ public class GuildHelpHelpOtherRequestHandler extends BaseHandler<Family.GuildHe
throw new ErrorCodeException("援助失败");
}
user.getGuildMyInfo().setGuildHelpTime(guildHelpTime+1);
user.getUserMissionManager().onGameEvent(user, GameEvent.GUID_HELP,1);
//notify all change

View File

@ -91,7 +91,7 @@ public class ReportUserEvent {
}
public ReportUserEvent setPlatform(String platform){
baseInfo.put("platform",platform);
baseInfo.put("platfrom",platform);
return this;
}

View File

@ -279,7 +279,6 @@ public class SituationLogic {
int score = Double.valueOf(rankEnum.getScoreById(user.getId(), "")).intValue();
rankEnum.addRank(user.getId(),"",score==-1?1:score+1);
consumeCount = true;
BuyGoodsNewLogic.openPush(session, user, PushRechargeType.XIANYUAN_BAOJING.getType(), sRaceTowerConfig.getQuality(), 1);
}
}else{
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
@ -290,6 +289,7 @@ public class SituationLogic {
if(!consume){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
BuyGoodsNewLogic.openPush(session, user, PushRechargeType.XIANYUAN_BAOJING.getType(), sRaceTowerConfig.getQuality(), 1);
}
// 埋点报送
ReportUtil.onReportEvent(user, ReportEventEnum.START_SKY_REALM.getType(), sRaceTowerConfig.getType(),id,combat_results,dropResult);

View File

@ -798,8 +798,10 @@ public class BuyGoodsNewLogic {
MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true);
}
}else{
PlayerInfoProto.PushWelfareResponse pushWelfareResponse = PlayerInfoProto.PushWelfareResponse.newBuilder().addId(popup).build();
MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true);
if(push) {
PlayerInfoProto.PushWelfareResponse pushWelfareResponse = PlayerInfoProto.PushWelfareResponse.newBuilder().addId(popup).build();
MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true);
}
}
}
}

View File

@ -17,7 +17,9 @@ public class SBlessingConfigNew implements BaseConfig {
private int floorCount;
private int[] basicPoolId;
private String basicPoolId;
private int[] basicPoolIdArr;
private int finalPoolId;
@ -26,8 +28,16 @@ public class SBlessingConfigNew implements BaseConfig {
@Override
public void init() throws Exception {
Map<Integer, SBlessingConfigNew> config = STableManager.getConfig(SBlessingConfigNew.class);
config.forEach((integer, sBlessingConfigNew) -> sBlessingConfigNewHashMap.put(sBlessingConfigNew.getActivityId(),sBlessingConfigNew));
for (SBlessingConfigNew sBlessingConfigNew : config.values()) {
String[] split = sBlessingConfigNew.getBasicPoolIdstr().split("#");
int[] basicPoolIdArr = new int[split.length];
for (int i = 0; i < split.length; i++) {
basicPoolIdArr[i] = Integer.parseInt(split[i]);
}
sBlessingConfigNew.setBasicPoolIdArr(basicPoolIdArr);
sBlessingConfigNewHashMap.put(sBlessingConfigNew.getActivityId(),sBlessingConfigNew);
}
// config.forEach((integer, sBlessingConfigNew) -> sBlessingConfigNewHashMap.put(sBlessingConfigNew.getActivityId(),sBlessingConfigNew));
}
@ -53,9 +63,18 @@ public class SBlessingConfigNew implements BaseConfig {
}
public int[] getBasicPoolId() {
return basicPoolIdArr;
}
public String getBasicPoolIdstr() {
return basicPoolId;
}
public void setBasicPoolIdArr(int[] basicPoolIdArr) {
this.basicPoolIdArr = basicPoolIdArr;
}
public int getFinalPoolId() {
return finalPoolId;
}