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

back_recharge
dengdan 2022-09-07 14:24:40 +08:00
commit 16d9af5e3f
3 changed files with 5 additions and 5 deletions

View File

@ -381,7 +381,6 @@ public class CoreService implements RPCRequestIFace.Iface {
// jsonObject.put("activityManager", activityManager);
jsonObject.remove("activityManager");
jsonObject.remove("bloodyInfo");
jsonObject.remove("workShopController");
jsonObject.getJSONObject("itemManager").put("itemMap",new HashMap<>());
jsonObject.remove("mailManager");
jsonObject.remove("storeManager");

View File

@ -95,7 +95,8 @@ public class TransformationUpGradeHandler extends BaseHandler<HeroInfoProto.Tran
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
}
if(costMap.values().size() < num){
int sum = costMap.values().stream().mapToInt(Integer::intValue).sum();
if(sum != num){
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
if (!ItemUtil.itemCost(user, costMap, BIReason.TRANSFORMATION_CARD_STAR_COST, 1)) {

View File

@ -55,11 +55,11 @@ public class CowFlySkyMissionType extends AbstractMissionType {
public void calCumulationDataResult(User user, CumulationData.Result result, List<MissionStateChangeInfo> missionStateChangeInfos, CumulationData cumulationData) throws Exception {
// 进行中得任务
Set<Integer> doingMissionIds = getDoingMissionIds();
Collection<SArroGantFly> values = SArroGantFly.getTaskTypeMap().get(result.subType.getMissionTypeValue()).values();
if (values == null || values.isEmpty()){
Map<Integer, SArroGantFly> flyMap = SArroGantFly.getTaskTypeMap().get(result.subType.getMissionTypeValue());
if (flyMap == null || flyMap.isEmpty()){
return;
}
for (SArroGantFly fly : values) {
for (SArroGantFly fly : flyMap.values()) {
// 任务子id
int id = fly.getId();
// 不在执行中