From f32e9e9ff85ff2c056656c4ed70c4959e69f11d6 Mon Sep 17 00:00:00 2001 From: masakih Date: Mon, 24 Mar 2014 22:10:31 +0900 Subject: [PATCH] =?utf8?q?=E5=BB=BA=E9=80=A0=E9=96=8B=E5=A7=8B=E6=99=82?= =?utf8?q?=E3=81=AE=E7=A7=98=E6=9B=B8=E8=89=A6=E3=81=AE=E5=90=8D=E5=89=8D?= =?utf8?q?=E3=81=A8=E3=83=AC=E3=83=99=E3=83=AB=E3=81=8A=E3=82=88=E3=81=B3?= =?utf8?q?=E5=8F=B8=E4=BB=A4=E9=83=A8=E3=83=AC=E3=83=99=E3=83=AB=E3=82=92?= =?utf8?q?=E5=8F=AF=E8=83=BD=E3=81=AA=E9=99=90=E3=82=8A=E4=BF=9D=E5=AD=98?= =?utf8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= =?utf8?q?=20#50158?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 18 +++- .../masaki.xcuserdatad/xcschemes/KCD.xcscheme | 2 +- KCD/HMCreateShipCommand.h | 13 +++ KCD/HMCreateShipCommand.m | 108 +++++++++++++++++++++ KCD/HMGetShipCommand.m | 28 +++++- KCD/HMKenzoMark.h | 27 ++++++ KCD/HMKenzoMark.m | 26 +++++ .../LocalData.xcdatamodel/contents | 15 ++- 8 files changed, 230 insertions(+), 7 deletions(-) create mode 100644 KCD/HMCreateShipCommand.h create mode 100644 KCD/HMCreateShipCommand.m create mode 100644 KCD/HMKenzoMark.h create mode 100644 KCD/HMKenzoMark.m diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index 8b651e5a..0c89afe1 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -38,6 +38,8 @@ F4B3DC1B18DEAB5E0011B4FC /* HMKaihatuHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC1A18DEAB5E0011B4FC /* HMKaihatuHistory.m */; }; F4B3DC1E18DEB8C70011B4FC /* HMKenzoHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC1D18DEB8C70011B4FC /* HMKenzoHistory.m */; }; F4B3DC2118DECF570011B4FC /* HMTSVSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC2018DECF570011B4FC /* HMTSVSupport.m */; }; + F4B3DC2718DF2F360011B4FC /* HMKenzoMark.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC2618DF2F360011B4FC /* HMKenzoMark.m */; }; + F4B3DC2A18DF31400011B4FC /* HMCreateShipCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC2918DF31400011B4FC /* HMCreateShipCommand.m */; }; F4B414E918B09A4B00468DAF /* HMMasterMapAreaCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */; }; F4B414EC18B0A7D600468DAF /* HMMasterUseItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414EB18B0A7D600468DAF /* HMMasterUseItemCommand.m */; }; F4B414EF18B0BF1A00468DAF /* HMMasterMapInfoCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414EE18B0BF1A00468DAF /* HMMasterMapInfoCommand.m */; }; @@ -143,6 +145,10 @@ F4B3DC1D18DEB8C70011B4FC /* HMKenzoHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKenzoHistory.m; sourceTree = ""; }; F4B3DC1F18DECF570011B4FC /* HMTSVSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMTSVSupport.h; sourceTree = ""; }; F4B3DC2018DECF570011B4FC /* HMTSVSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMTSVSupport.m; sourceTree = ""; }; + F4B3DC2518DF2F360011B4FC /* HMKenzoMark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKenzoMark.h; sourceTree = ""; }; + F4B3DC2618DF2F360011B4FC /* HMKenzoMark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKenzoMark.m; sourceTree = ""; }; + F4B3DC2818DF31400011B4FC /* HMCreateShipCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCreateShipCommand.h; sourceTree = ""; }; + F4B3DC2918DF31400011B4FC /* HMCreateShipCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCreateShipCommand.m; sourceTree = ""; }; F4B414E718B09A4B00468DAF /* HMMasterMapAreaCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMapAreaCommand.h; sourceTree = ""; }; F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMapAreaCommand.m; sourceTree = ""; }; F4B414EA18B0A7D600468DAF /* HMMasterUseItemCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterUseItemCommand.h; sourceTree = ""; }; @@ -358,6 +364,8 @@ F4513EFC18BB6B0C00073552 /* HMKCShipObject.h */, F4513EFD18BB6B0C00073552 /* HMKCShipObject.m */, F4E7802C18DC3AF00011BC4C /* LocalData.xcdatamodeld */, + F4B3DC2518DF2F360011B4FC /* HMKenzoMark.h */, + F4B3DC2618DF2F360011B4FC /* HMKenzoMark.m */, F4B3DC1C18DEB8C70011B4FC /* HMKenzoHistory.h */, F4B3DC1D18DEB8C70011B4FC /* HMKenzoHistory.m */, F4B3DC1918DEAB5E0011B4FC /* HMKaihatuHistory.h */, @@ -448,6 +456,8 @@ F4E33B5718BF5F67005B8C07 /* HMMemberSlotItemCommand.m */, F4E7802618DBD2A00011BC4C /* HMGetShipCommand.h */, F4E7802718DBD2A00011BC4C /* HMGetShipCommand.m */, + F4B3DC2818DF31400011B4FC /* HMCreateShipCommand.h */, + F4B3DC2918DF31400011B4FC /* HMCreateShipCommand.m */, F4B3DBC818DDB9170011B4FC /* HMCreateSlotItemCommand.h */, F4B3DBC918DDB9170011B4FC /* HMCreateSlotItemCommand.m */, ); @@ -499,7 +509,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = HM; - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Hori,Masaki"; TargetAttributes = { F4BDEB63187252F30069D0CE = { @@ -567,6 +577,7 @@ F4D2CBC518AE2AE2000EBC59 /* HMCompositCommand.m in Sources */, F4C1190218A6FFC2005D5B25 /* HMQueue.m in Sources */, F4513EEB18B7900A00073552 /* HMMemberDeckCommand.m in Sources */, + F4B3DC2A18DF31400011B4FC /* HMCreateShipCommand.m in Sources */, F46F103618A7CE310063E503 /* HMJSONViewCommand.m in Sources */, F4B3DC1E18DEB8C70011B4FC /* HMKenzoHistory.m in Sources */, F4B414FB18B1FB6C00468DAF /* HMMasterMapCellCommand.m in Sources */, @@ -596,6 +607,7 @@ F4C1190818A746EB005D5B25 /* HMJSONTracker.m in Sources */, F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */, F4B3DBCA18DDB9170011B4FC /* HMCreateSlotItemCommand.m in Sources */, + F4B3DC2718DF2F360011B4FC /* HMKenzoMark.m in Sources */, F4B414E918B09A4B00468DAF /* HMMasterMapAreaCommand.m in Sources */, F4C3957418CDDFE500A1E918 /* HMKenzoDockStatus.m in Sources */, F4C118FB18A67B1C005D5B25 /* CanonicalRequest.m in Sources */, @@ -726,7 +738,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.8; + SDKROOT = macosx; }; name = Debug; }; @@ -757,7 +769,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.8; - SDKROOT = macosx10.8; + SDKROOT = macosx; }; name = Release; }; diff --git a/KCD.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/KCD.xcscheme b/KCD.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/KCD.xcscheme index 4c221825..94d6ec91 100644 --- a/KCD.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/KCD.xcscheme +++ b/KCD.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/KCD.xcscheme @@ -1,6 +1,6 @@ FlagShip + req = [NSFetchRequest fetchRequestWithEntityName:@"Deck"]; + predicate = [NSPredicate predicateWithFormat:@"id = 1"]; + [req setPredicate:predicate]; + + array = [context executeFetchRequest:req error:NULL]; + if([array count] == 0) { + NSLog(@"Deck data is invalid."); + return; + } + id deck = array[0]; + id flagShipID = [deck valueForKey:@"ship_0"]; + req = [NSFetchRequest fetchRequestWithEntityName:@"Ship"]; + predicate = [NSPredicate predicateWithFormat:@"id = %@", flagShipID]; + [req setPredicate:predicate]; + array = [context executeFetchRequest:req error:NULL]; + if([array count] == 0) { + NSLog(@"Ship data is invalid or ship_0 is invalid."); + return; + } + id flagShip = array[0]; + NSNumber *flagShipLv = [flagShip valueForKey:@"lv"]; + NSString *flagShipName = [flagShip valueForKeyPath:@"master_ship.name"]; + + // Basic -> level + req = [NSFetchRequest fetchRequestWithEntityName:@"Basic"]; + + array = [context executeFetchRequest:req error:NULL]; + if([array count] == 0) { + NSLog(@"Basic data is invalid."); + return; + } + id basic = array[0]; + + // + HMLocalDataStore *lds = [HMLocalDataStore oneTimeEditor]; + NSManagedObjectContext *localStoreContext = [lds managedObjectContext]; + HMKenzoMark *newObejct = nil; + req = [NSFetchRequest fetchRequestWithEntityName:@"KenzoMark"]; + predicate = [NSPredicate predicateWithFormat:@"kDockId = %@", @([[self.arguments valueForKey:@"api_kdock_id"] integerValue])]; + [req setPredicate:predicate]; + array = [localStoreContext executeFetchRequest:req error:NULL]; + if([array count] == 0) { + newObejct = [NSEntityDescription insertNewObjectForEntityForName:@"KenzoMark" + inManagedObjectContext:localStoreContext]; + } else { + newObejct = array[0]; + } + + newObejct.fuel = item1; + newObejct.bull = [kdock valueForKey:@"item2"]; + newObejct.steel = [kdock valueForKey:@"item3"]; + newObejct.bauxite = [kdock valueForKey:@"item4"]; + newObejct.kaihatusizai = [kdock valueForKey:@"item5"]; + newObejct.created_ship_id = [kdock valueForKey:@"created_ship_id"]; + newObejct.flagShipLv = flagShipLv; + newObejct.flagShipName = flagShipName; + newObejct.commanderLv = [basic valueForKey:@"level"]; + newObejct.kDockId = @([[self.arguments valueForKey:@"api_kdock_id"] integerValue]); + }); +} +@end diff --git a/KCD/HMGetShipCommand.m b/KCD/HMGetShipCommand.m index c1fed8db..55d89813 100644 --- a/KCD/HMGetShipCommand.m +++ b/KCD/HMGetShipCommand.m @@ -44,6 +44,7 @@ id kdock = array[0]; NSNumber *item1 = [kdock valueForKey:@"item1"]; + // req = [NSFetchRequest fetchRequestWithEntityName:@"MasterShip"]; predicate = [NSPredicate predicateWithFormat:@"id = %@", [kdock valueForKey:@"created_ship_id"]]; [req setPredicate:predicate]; @@ -53,18 +54,41 @@ NSLog(@"MasterShip data is invalid or ship_id is invalid."); return; } + id ship = array[0]; + + // + NSNumber *flagShipLv = nil; + NSString *flafShipName = nil; + NSNumber *commanderLv = nil; + context = [[HMLocalDataStore defaultManager] managedObjectContext]; + req = [NSFetchRequest fetchRequestWithEntityName:@"KenzoMark"]; + predicate = [NSPredicate predicateWithFormat:@"fuel = %@ AND bull = %@ AND steel = %@ AND bauxite = %@ AND kaihatusizai = %@ AND kDockId = %@ AND created_ship_id = %@", + item1, [kdock valueForKey:@"item2"], [kdock valueForKey:@"item3"], [kdock valueForKey:@"item4"], [kdock valueForKey:@"item5"], + @([[self.arguments valueForKey:@"api_kdock_id"] integerValue]), [kdock valueForKey:@"created_ship_id"] + ]; + [req setPredicate:predicate]; + + array = [context executeFetchRequest:req error:NULL]; + if([array count] != 0) { + flagShipLv = [array[0] valueForKey:@"flagShipLv"]; + flafShipName = [array[0] valueForKey:@"flagShipName"]; + commanderLv = [array[0] valueForKey:@"commanderLv"]; + } HMLocalDataStore *lds = [HMLocalDataStore oneTimeEditor]; NSManagedObjectContext *localStoreContext = [lds managedObjectContext]; HMKenzoHistory *newObejct = [NSEntityDescription insertNewObjectForEntityForName:@"KenzoHistory" inManagedObjectContext:localStoreContext]; - newObejct.name = [array[0] valueForKey:@"name"]; - newObejct.sTypeId = [array[0] valueForKeyPath:@"stype.id"]; + newObejct.name = [ship valueForKey:@"name"]; + newObejct.sTypeId = [ship valueForKeyPath:@"stype.id"]; newObejct.fuel = item1; newObejct.bull = [kdock valueForKey:@"item2"]; newObejct.steel = [kdock valueForKey:@"item3"]; newObejct.bauxite = [kdock valueForKey:@"item4"]; newObejct.kaihatusizai = [kdock valueForKey:@"item5"]; + newObejct.flagShipLv = flagShipLv; + newObejct.flagShipName = flafShipName; + newObejct.commanderLv = commanderLv; newObejct.date = [NSDate date]; } diff --git a/KCD/HMKenzoMark.h b/KCD/HMKenzoMark.h new file mode 100644 index 00000000..2db1f6bd --- /dev/null +++ b/KCD/HMKenzoMark.h @@ -0,0 +1,27 @@ +// +// HMKenzoMark.h +// KCD +// +// Created by Hori,Masaki on 2014/03/24. +// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. +// + +#import +#import + + +@interface HMKenzoMark : NSManagedObject + +@property (nonatomic, retain) NSNumber * bauxite; +@property (nonatomic, retain) NSNumber * bull; +@property (nonatomic, retain) NSNumber * commanderLv; +@property (nonatomic, retain) NSNumber * created_ship_id; +@property (nonatomic, retain) NSDate * date; +@property (nonatomic, retain) NSNumber * flagShipLv; +@property (nonatomic, retain) NSString * flagShipName; +@property (nonatomic, retain) NSNumber * fuel; +@property (nonatomic, retain) NSNumber * kaihatusizai; +@property (nonatomic, retain) NSNumber * kDockId; +@property (nonatomic, retain) NSNumber * steel; + +@end diff --git a/KCD/HMKenzoMark.m b/KCD/HMKenzoMark.m new file mode 100644 index 00000000..f428b2fe --- /dev/null +++ b/KCD/HMKenzoMark.m @@ -0,0 +1,26 @@ +// +// HMKenzoMark.m +// KCD +// +// Created by Hori,Masaki on 2014/03/24. +// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. +// + +#import "HMKenzoMark.h" + + +@implementation HMKenzoMark + +@dynamic bauxite; +@dynamic bull; +@dynamic commanderLv; +@dynamic created_ship_id; +@dynamic date; +@dynamic flagShipLv; +@dynamic flagShipName; +@dynamic fuel; +@dynamic kaihatusizai; +@dynamic kDockId; +@dynamic steel; + +@end diff --git a/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents b/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents index 52c78216..4da232e9 100644 --- a/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents +++ b/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents @@ -25,8 +25,21 @@ + + + + + + + + + + + + - + + \ No newline at end of file -- 2.11.0