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

DESKTOP-98AVA47\Administrator 2021-10-23 03:51:54 +08:00
commit 4efe978e82
2 changed files with 8 additions and 4 deletions

View File

@ -397,7 +397,7 @@ public class MissionLoigc {
*/
public static void getCowFlySkyMission(User user ,List<CommonProto.UserMissionInfo> missionList){
CowFlySkyMissionType missionType = user.getUserMissionManager().getCowFlySkyMissionType();
CumulationData cumulationData = user.getUserMissionManager().getCumulationData();
// 进行中
Set<Integer> doingMissionIds = missionType.getDoingMissionIds();
// 可领取
@ -406,22 +406,26 @@ public class MissionLoigc {
BitSet rewardedMissionIds = missionType.getRewardedMissionIds();
Collection<SArroGantFly> values = STableManager.getConfig(SArroGantFly.class).values();
values.forEach(v->{
for (SArroGantFly v : values) {
int id = v.getId();
CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder();
info.setMissionId(id);
info.setType(GameMisionType.COWFLYSKYMISSION.getType());
if (doingMissionIds.contains(id)){
info.setState(MissionState.DOING.getState());
int doingProgress = getDoingProgress(user, cumulationData, v.getValues(), v.getValuesII()[0]);
info.setProgress(doingProgress);
}
if (finishMissionIds.contains(id)){
info.setState(MissionState.FINISH.getState());
info.setProgress(v.getValuesII()[1][0]);
}
if (rewardedMissionIds.get(id)){
info.setState(MissionState.REWARD.getState());
info.setProgress(v.getValuesII()[1][0]);
}
missionList.add(info.build());
});
}
}
public static void getEndlessMission(User user,List<CommonProto.UserMissionInfo> missionList){

View File

@ -832,7 +832,7 @@ public class BuyGoodsNewLogic {
info.setTypePushTimeMap(conditionType,System.currentTimeMillis() + con.getPrivateCD() * TimeUtils.HOUR);
info.setDayPushNum(pushId,1);
info.setAllPuthNum(pushId,1);
boolean tempPush = createPushBag(bagId,user,num);
boolean tempPush = createPushBag(bagId,user,1);
if(!push){
push = tempPush;
}