From 649238d6782d3664b47f3e346f69d3a5752562bd Mon Sep 17 00:00:00 2001 From: masakih Date: Sat, 17 Dec 2016 21:36:18 +0900 Subject: [PATCH] =?utf8?q?NSArray=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6?= =?utf8?q?=E3=82=B8=E3=82=A7=E3=83=8D=E3=83=AA=E3=82=AF=E3=82=B9=E3=82=92?= =?utf8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?utf8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD/HMAirCorpsChangeNameCommand.m | 11 +++++------ KCD/HMAirCorpsSupplyCommand.m | 24 +++++++++++------------- KCD/HMGuardShelterCommand.m | 2 +- KCD/HMSetActionCommand.m | 5 ++--- KCD/HMSetPlaneCommand.m | 18 ++++++++---------- KCD/HMStart2Command.m | 3 +-- KCD/HMUpdateQuestListCommand.m | 10 +++------- 7 files changed, 31 insertions(+), 42 deletions(-) diff --git a/KCD/HMAirCorpsChangeNameCommand.m b/KCD/HMAirCorpsChangeNameCommand.m index 1164182a..847896f2 100644 --- a/KCD/HMAirCorpsChangeNameCommand.m +++ b/KCD/HMAirCorpsChangeNameCommand.m @@ -36,13 +36,12 @@ NSString *areaId = self.arguments[@"api_area_id"]; NSString *rId = self.arguments[@"api_base_id"]; - NSArray *airBases = [store objectsWithEntityName:@"AirBase" - sortDescriptors:nil - error:&error - predicateFormat:@"area_id == %@ AND rid == %@", @(areaId.integerValue), @(rId.integerValue)]; + NSArray *airBases = [store objectsWithEntityName:@"AirBase" + sortDescriptors:nil + error:&error + predicateFormat:@"area_id == %@ AND rid == %@", @(areaId.integerValue), @(rId.integerValue)]; if(airBases.count == 0) { return; } - HMKCAirBase *airBase = airBases[0]; - airBase.name = self.arguments[@"api_name"]; + airBases[0].name = self.arguments[@"api_name"]; } @end diff --git a/KCD/HMAirCorpsSupplyCommand.m b/KCD/HMAirCorpsSupplyCommand.m index 77980263..85248f7c 100644 --- a/KCD/HMAirCorpsSupplyCommand.m +++ b/KCD/HMAirCorpsSupplyCommand.m @@ -38,14 +38,13 @@ NSString *areaId = self.arguments[@"api_area_id"]; NSString *rId = self.arguments[@"api_base_id"]; NSString *squadronIdsString = self.arguments[@"api_squadron_id"]; - NSArray *airBases = [store objectsWithEntityName:@"AirBase" - sortDescriptors:nil - error:&error - predicateFormat:@"area_id == %@ AND rid == %@", @(areaId.integerValue), @(rId.integerValue)]; + NSArray *airBases = [store objectsWithEntityName:@"AirBase" + sortDescriptors:nil + error:&error + predicateFormat:@"area_id == %@ AND rid == %@", @(areaId.integerValue), @(rId.integerValue)]; if(airBases.count == 0) { return; } - HMKCAirBase *airBase = airBases[0]; - NSOrderedSet *planes = airBase.planeInfo; + NSOrderedSet *planes = airBases[0].planeInfo; NSDictionary *json = self.json; NSDictionary *data = json[@"api_data"]; @@ -68,16 +67,15 @@ plane.max_count = planeInfo[@"api_max_count"]; }]; - airBase.distance = data[@"api_distance"]; + airBases[0].distance = data[@"api_distance"]; - NSArray *materials = [store objectsWithEntityName:@"Material" - predicate:nil - error:&error]; + NSArray *materials = [store objectsWithEntityName:@"Material" + predicate:nil + error:&error]; if(materials.count == 0) { return; } - HMKCMaterial *material = materials[0]; - material.bauxite = data[@"api_after_bauxite"]; - material.fuel = data[@"api_after_fuel"]; + materials[0].bauxite = data[@"api_after_bauxite"]; + materials[0].fuel = data[@"api_after_fuel"]; } @end diff --git a/KCD/HMGuardShelterCommand.m b/KCD/HMGuardShelterCommand.m index 5de3a40f..16cb9838 100644 --- a/KCD/HMGuardShelterCommand.m +++ b/KCD/HMGuardShelterCommand.m @@ -94,7 +94,7 @@ NSString *HMGuardShelterCommandDidUpdateGuardExcapeNotification = @"HMGuardShelt NSNumber *guardianID = secondFleet[guardianPosition.integerValue - 6 - 1]; - NSNumber *damagedShipPosition = [escape objectForKey:@"api_escape_idx"]; + NSNumber *damagedShipPosition = [escape objectForKey:@"api_escape_idx"]; if([damagedShipPosition isKindOfClass:[NSArray class]]) { damagedShipPosition = [(NSArray *)damagedShipPosition objectAtIndex:0]; } diff --git a/KCD/HMSetActionCommand.m b/KCD/HMSetActionCommand.m index c8d2d76d..64e6f953 100644 --- a/KCD/HMSetActionCommand.m +++ b/KCD/HMSetActionCommand.m @@ -43,13 +43,12 @@ [rIds enumerateObjectsUsingBlock:^(NSString * _Nonnull rId, NSUInteger idx, BOOL * _Nonnull stop) { NSError *error = nil; - NSArray *airBases = [store objectsWithEntityName:@"AirBase" + NSArray *airBases = [store objectsWithEntityName:@"AirBase" sortDescriptors:nil error:&error predicateFormat:@"area_id == %@ AND rid == %@", @(areaId.integerValue), @(rId.integerValue)]; if(airBases.count == 0) { return; } - HMKCAirBase *airBase = airBases[0]; - airBase.action_kind = @(actionKinds[idx].integerValue); + airBases[0].action_kind = @(actionKinds[idx].integerValue); }]; } @end diff --git a/KCD/HMSetPlaneCommand.m b/KCD/HMSetPlaneCommand.m index fd34a8c3..1314ab9f 100644 --- a/KCD/HMSetPlaneCommand.m +++ b/KCD/HMSetPlaneCommand.m @@ -38,14 +38,13 @@ NSString *areaId = self.arguments[@"api_area_id"]; NSString *rId = self.arguments[@"api_base_id"]; NSString *squadronId = self.arguments[@"api_squadron_id"]; - NSArray *airBases = [store objectsWithEntityName:@"AirBase" - sortDescriptors:nil - error:&error - predicateFormat:@"area_id == %@ AND rid == %@", @(areaId.integerValue), @(rId.integerValue)]; + NSArray *airBases = [store objectsWithEntityName:@"AirBase" + sortDescriptors:nil + error:&error + predicateFormat:@"area_id == %@ AND rid == %@", @(areaId.integerValue), @(rId.integerValue)]; if(airBases.count == 0) { return; } - HMKCAirBase *airBase = airBases[0]; - NSOrderedSet *planes = airBase.planeInfo; + NSOrderedSet *planes = airBases[0].planeInfo; if(planes.count < squadronId.integerValue) { return; } HMKCAirBasePlaneInfo *plane = planes[squadronId.integerValue - 1]; @@ -61,15 +60,14 @@ plane.count = planeInfo0[@"api_count"]; plane.max_count = planeInfo0[@"api_max_count"]; - airBase.distance = data[@"api_distance"]; + airBases[0].distance = data[@"api_distance"]; - NSArray *materials = [store objectsWithEntityName:@"Material" + NSArray *materials = [store objectsWithEntityName:@"Material" predicate:nil error:&error]; if(materials.count == 0) { return; } - HMKCMaterial *material = materials[0]; - material.bauxite = data[@"api_after_bauxite"]; + materials[0].bauxite = data[@"api_after_bauxite"]; } @end diff --git a/KCD/HMStart2Command.m b/KCD/HMStart2Command.m index 96a3d13a..6af70685 100644 --- a/KCD/HMStart2Command.m +++ b/KCD/HMStart2Command.m @@ -10,7 +10,6 @@ #import "HMMasterMapAreaCommand.h" #import "HMMasterMapInfoCommand.h" -// #import "HMMasterMapCellCommand.h" #import "HMMasterSTypeCommand.h" #import "HMMaserShipCommand.h" #import "HMMasterMissionCommand.h" @@ -37,7 +36,7 @@ - (id)init { self = [super initWithCommands: - [HMMasterMapAreaCommand new], [HMMasterMapInfoCommand new], //[HMMasterMapCellCommand new], + [HMMasterMapAreaCommand new], [HMMasterMapInfoCommand new], [HMMasterSTypeCommand new], [HMMaserShipCommand new], [HMMasterMissionCommand new], [HMMasterFurnitureCommand new], diff --git a/KCD/HMUpdateQuestListCommand.m b/KCD/HMUpdateQuestListCommand.m index b7df598c..a870cea6 100644 --- a/KCD/HMUpdateQuestListCommand.m +++ b/KCD/HMUpdateQuestListCommand.m @@ -17,12 +17,9 @@ NSString *questNo = self.arguments[@"api_quest_id"]; if(!questNo || [questNo isKindOfClass:[NSNull class]]) return; - - NSString *entityName = @"Quest"; - HMServerDataStore *serverDataStore = [HMServerDataStore oneTimeEditor]; NSError *error = nil; - NSArray *objects = [serverDataStore objectsWithEntityName:entityName + NSArray *objects = [serverDataStore objectsWithEntityName:@"Quest" error:&error predicateFormat:@"%K = %@", @"no", @([questNo integerValue])]; @@ -35,8 +32,7 @@ return; } - HMKCQuest *quest = objects[0]; - quest.progress_flag = @NO; - quest.state = @1; + objects[0].progress_flag = @NO; + objects[0].state = @1; } @end -- 2.11.0