Merge branch 'master_test_gn_xxp' of http://60.1.1.230/backend/jieling_server into master_test_gn_xxp
commit
4efe978e82
|
@ -397,7 +397,7 @@ public class MissionLoigc {
|
||||||
*/
|
*/
|
||||||
public static void getCowFlySkyMission(User user ,List<CommonProto.UserMissionInfo> missionList){
|
public static void getCowFlySkyMission(User user ,List<CommonProto.UserMissionInfo> missionList){
|
||||||
CowFlySkyMissionType missionType = user.getUserMissionManager().getCowFlySkyMissionType();
|
CowFlySkyMissionType missionType = user.getUserMissionManager().getCowFlySkyMissionType();
|
||||||
|
CumulationData cumulationData = user.getUserMissionManager().getCumulationData();
|
||||||
// 进行中
|
// 进行中
|
||||||
Set<Integer> doingMissionIds = missionType.getDoingMissionIds();
|
Set<Integer> doingMissionIds = missionType.getDoingMissionIds();
|
||||||
// 可领取
|
// 可领取
|
||||||
|
@ -406,22 +406,26 @@ public class MissionLoigc {
|
||||||
BitSet rewardedMissionIds = missionType.getRewardedMissionIds();
|
BitSet rewardedMissionIds = missionType.getRewardedMissionIds();
|
||||||
|
|
||||||
Collection<SArroGantFly> values = STableManager.getConfig(SArroGantFly.class).values();
|
Collection<SArroGantFly> values = STableManager.getConfig(SArroGantFly.class).values();
|
||||||
values.forEach(v->{
|
for (SArroGantFly v : values) {
|
||||||
int id = v.getId();
|
int id = v.getId();
|
||||||
CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder();
|
CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder();
|
||||||
info.setMissionId(id);
|
info.setMissionId(id);
|
||||||
info.setType(GameMisionType.COWFLYSKYMISSION.getType());
|
info.setType(GameMisionType.COWFLYSKYMISSION.getType());
|
||||||
if (doingMissionIds.contains(id)){
|
if (doingMissionIds.contains(id)){
|
||||||
info.setState(MissionState.DOING.getState());
|
info.setState(MissionState.DOING.getState());
|
||||||
|
int doingProgress = getDoingProgress(user, cumulationData, v.getValues(), v.getValuesII()[0]);
|
||||||
|
info.setProgress(doingProgress);
|
||||||
}
|
}
|
||||||
if (finishMissionIds.contains(id)){
|
if (finishMissionIds.contains(id)){
|
||||||
info.setState(MissionState.FINISH.getState());
|
info.setState(MissionState.FINISH.getState());
|
||||||
|
info.setProgress(v.getValuesII()[1][0]);
|
||||||
}
|
}
|
||||||
if (rewardedMissionIds.get(id)){
|
if (rewardedMissionIds.get(id)){
|
||||||
info.setState(MissionState.REWARD.getState());
|
info.setState(MissionState.REWARD.getState());
|
||||||
|
info.setProgress(v.getValuesII()[1][0]);
|
||||||
}
|
}
|
||||||
missionList.add(info.build());
|
missionList.add(info.build());
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void getEndlessMission(User user,List<CommonProto.UserMissionInfo> missionList){
|
public static void getEndlessMission(User user,List<CommonProto.UserMissionInfo> missionList){
|
||||||
|
|
|
@ -832,7 +832,7 @@ public class BuyGoodsNewLogic {
|
||||||
info.setTypePushTimeMap(conditionType,System.currentTimeMillis() + con.getPrivateCD() * TimeUtils.HOUR);
|
info.setTypePushTimeMap(conditionType,System.currentTimeMillis() + con.getPrivateCD() * TimeUtils.HOUR);
|
||||||
info.setDayPushNum(pushId,1);
|
info.setDayPushNum(pushId,1);
|
||||||
info.setAllPuthNum(pushId,1);
|
info.setAllPuthNum(pushId,1);
|
||||||
boolean tempPush = createPushBag(bagId,user,num);
|
boolean tempPush = createPushBag(bagId,user,1);
|
||||||
if(!push){
|
if(!push){
|
||||||
push = tempPush;
|
push = tempPush;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue