From 52b175c79c21c93f909130696a9d89f49fbd6e3e Mon Sep 17 00:00:00 2001 From: masakih Date: Sun, 29 Jan 2017 18:39:10 +0900 Subject: [PATCH] =?utf8?q?HMKCNyukyoDock=E3=82=92Swift=E3=81=AB=E5=A4=89?= =?utf8?q?=E6=8F=9B=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 16 ++++---------- KCD/HMKCNyukyoDock+CoreDataProperties.h | 31 --------------------------- KCD/HMKCNyukyoDock+CoreDataProperties.m | 27 ----------------------- KCD/HMKCNyukyoDock.h | 21 ------------------ KCD/HMKCNyukyoDock.m | 15 ------------- KCD/HMKCNyukyoDock.swift | 22 +++++++++++++++++++ KCD/HMNyukyoSpeedChangeCommand.swift | 14 ++++++------ KCD/KCD-Bridging-Header.h | 1 - KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents | 8 +++---- 9 files changed, 37 insertions(+), 118 deletions(-) delete mode 100644 KCD/HMKCNyukyoDock+CoreDataProperties.h delete mode 100644 KCD/HMKCNyukyoDock+CoreDataProperties.m delete mode 100644 KCD/HMKCNyukyoDock.h delete mode 100644 KCD/HMKCNyukyoDock.m create mode 100644 KCD/HMKCNyukyoDock.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index 30c4e354..2285ab2c 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ F42A8FD21E3DC56C0099DC1D /* HMKCMasterSType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FD11E3DC56C0099DC1D /* HMKCMasterSType.swift */; }; F42A8FD41E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FD31E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift */; }; F42A8FD61E3DE2C60099DC1D /* HMKCMaterial.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FD51E3DE2C60099DC1D /* HMKCMaterial.swift */; }; + F42A8FD81E3DEAA00099DC1D /* HMKCNyukyoDock.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FD71E3DEAA00099DC1D /* HMKCNyukyoDock.swift */; }; F42CFE161E3BA1E1000B4F9B /* HMEnhancementListItem2.plist in Resources */ = {isa = PBXBuildFile; fileRef = F42CFE151E3BA1E1000B4F9B /* HMEnhancementListItem2.plist */; }; F42CFE181E3C12AA000B4F9B /* HMScreenshotInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42CFE171E3C12AA000B4F9B /* HMScreenshotInformation.swift */; }; F42CFE1A1E3C726D000B4F9B /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42CFE191E3C726D000B4F9B /* UserDefaultsExtension.swift */; }; @@ -292,8 +293,6 @@ F4F9F8701C6A306A00D0EE76 /* HMKCGuardEscaped.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F9F8681C6A306A00D0EE76 /* HMKCGuardEscaped.m */; }; F4F9F8711C6A306A00D0EE76 /* HMKCBattle+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F9F86A1C6A306A00D0EE76 /* HMKCBattle+CoreDataProperties.m */; }; F4F9F8721C6A306A00D0EE76 /* HMKCBattle.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F9F86C1C6A306A00D0EE76 /* HMKCBattle.m */; }; - F4F9F88F1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F9F88C1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.m */; }; - F4F9F8901C6B6ACA00D0EE76 /* HMKCNyukyoDock.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F9F88E1C6B6ACA00D0EE76 /* HMKCNyukyoDock.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -336,6 +335,7 @@ F42A8FD11E3DC56C0099DC1D /* HMKCMasterSType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterSType.swift; sourceTree = ""; }; F42A8FD31E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterSlotItemEquipTypeObject.swift; sourceTree = ""; }; F42A8FD51E3DE2C60099DC1D /* HMKCMaterial.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMaterial.swift; sourceTree = ""; }; + F42A8FD71E3DEAA00099DC1D /* HMKCNyukyoDock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCNyukyoDock.swift; sourceTree = ""; }; F42CBB201D1ED41D004C2AE2 /* LocalData 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "LocalData 3.xcdatamodel"; sourceTree = ""; }; F42CFE151E3BA1E1000B4F9B /* HMEnhancementListItem2.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = HMEnhancementListItem2.plist; sourceTree = ""; }; F42CFE171E3C12AA000B4F9B /* HMScreenshotInformation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMScreenshotInformation.swift; sourceTree = ""; }; @@ -665,10 +665,6 @@ F4F9F86A1C6A306A00D0EE76 /* HMKCBattle+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCBattle+CoreDataProperties.m"; sourceTree = ""; }; F4F9F86B1C6A306A00D0EE76 /* HMKCBattle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCBattle.h; sourceTree = ""; }; F4F9F86C1C6A306A00D0EE76 /* HMKCBattle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCBattle.m; sourceTree = ""; }; - F4F9F88B1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCNyukyoDock+CoreDataProperties.h"; sourceTree = ""; }; - F4F9F88C1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCNyukyoDock+CoreDataProperties.m"; sourceTree = ""; }; - F4F9F88D1C6B6ACA00D0EE76 /* HMKCNyukyoDock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCNyukyoDock.h; sourceTree = ""; }; - F4F9F88E1C6B6ACA00D0EE76 /* HMKCNyukyoDock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCNyukyoDock.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1183,10 +1179,7 @@ F42A8FD11E3DC56C0099DC1D /* HMKCMasterSType.swift */, F42A8FD31E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift */, F42A8FD51E3DE2C60099DC1D /* HMKCMaterial.swift */, - F4F9F88B1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.h */, - F4F9F88C1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.m */, - F4F9F88D1C6B6ACA00D0EE76 /* HMKCNyukyoDock.h */, - F4F9F88E1C6B6ACA00D0EE76 /* HMKCNyukyoDock.m */, + F42A8FD71E3DEAA00099DC1D /* HMKCNyukyoDock.swift */, F43F3D4D1A34ACCD00D6DAF7 /* HMKCShipObject.h */, F43F3D4E1A34ACCD00D6DAF7 /* HMKCShipObject.m */, F42680101943E92D00B2C27F /* HMKCShipObject+Extensions.h */, @@ -1535,7 +1528,6 @@ F4AA59481E1E3CBA001667AF /* HMAirbasePlaneStateTransformer.swift in Sources */, F4E7802E18DC3AF00011BC4C /* LocalData.xcdatamodeld in Sources */, F42CFE1C1E3CB495000B4F9B /* HMBookmarkItem.swift in Sources */, - F4F9F88F1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.m in Sources */, F44BC7151E2914FE004644E3 /* HMMemberBasicCommand.swift in Sources */, F47215AC1E1FA2460083D3BC /* HMTemporaryDataStore.swift in Sources */, F4D05BC81E0C0DA100688D66 /* HMAirBaseWindowController.swift in Sources */, @@ -1543,7 +1535,6 @@ F44BC70D1E27B601004644E3 /* HMMemberShip3Command.swift in Sources */, F4C1190518A71AEA005D5B25 /* HMJSONReciever.m in Sources */, F44BC7251E29EC26004644E3 /* HMMasterSlotItemCommand.swift in Sources */, - F4F9F8901C6B6ACA00D0EE76 /* HMKCNyukyoDock.m in Sources */, F44AB24119E8252600F217AF /* HMKCSlotItemObject+Extensions.m in Sources */, F4D05BE11E0FAB8E00688D66 /* HMShipViewController.swift in Sources */, F44BC6EB1E234531004644E3 /* HMChangeHenseiCommand.swift in Sources */, @@ -1558,6 +1549,7 @@ F44BC6D31E22581D004644E3 /* HMApplySuppliesCommand.swift in Sources */, F4D05BDB1E0F76A800688D66 /* HMResourceViewController.swift in Sources */, F4CF25AC1E33AB4400C02A66 /* HMTimeSignalNotifier.swift in Sources */, + F42A8FD81E3DEAA00099DC1D /* HMKCNyukyoDock.swift in Sources */, F4AA591A1E1CE2EA001667AF /* HMSlotItemEquipTypeTransformer.swift in Sources */, F44BC6C11E221293004644E3 /* HMAirCorpsChangeNameCommand.swift in Sources */, F4CF25BE1E361F4600C02A66 /* HMNyukyoDockStatus.swift in Sources */, diff --git a/KCD/HMKCNyukyoDock+CoreDataProperties.h b/KCD/HMKCNyukyoDock+CoreDataProperties.h deleted file mode 100644 index c66dc995..00000000 --- a/KCD/HMKCNyukyoDock+CoreDataProperties.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// HMKCNyukyoDock+CoreDataProperties.h -// KCD -// -// Created by Hori,Masaki on 2016/02/10. -// Copyright © 2016年 Hori,Masaki. All rights reserved. -// -// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu -// to delete and recreate this implementation file for your updated model. -// - -#import "HMKCNyukyoDock.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface HMKCNyukyoDock (CoreDataProperties) - -@property (nullable, nonatomic, retain) NSNumber *complete_time; -@property (nullable, nonatomic, retain) NSString *complete_time_str; -@property (nullable, nonatomic, retain) NSNumber *id; -@property (nullable, nonatomic, retain) NSNumber *item1; -@property (nullable, nonatomic, retain) NSNumber *item2; -@property (nullable, nonatomic, retain) NSNumber *item3; -@property (nullable, nonatomic, retain) NSNumber *item4; -@property (nullable, nonatomic, retain) NSNumber *member_id; -@property (nullable, nonatomic, retain) NSNumber *ship_id; -@property (nullable, nonatomic, retain) NSNumber *state; - -@end - -NS_ASSUME_NONNULL_END diff --git a/KCD/HMKCNyukyoDock+CoreDataProperties.m b/KCD/HMKCNyukyoDock+CoreDataProperties.m deleted file mode 100644 index a1bd1359..00000000 --- a/KCD/HMKCNyukyoDock+CoreDataProperties.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// HMKCNyukyoDock+CoreDataProperties.m -// KCD -// -// Created by Hori,Masaki on 2016/02/10. -// Copyright © 2016年 Hori,Masaki. All rights reserved. -// -// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu -// to delete and recreate this implementation file for your updated model. -// - -#import "HMKCNyukyoDock+CoreDataProperties.h" - -@implementation HMKCNyukyoDock (CoreDataProperties) - -@dynamic complete_time; -@dynamic complete_time_str; -@dynamic id; -@dynamic item1; -@dynamic item2; -@dynamic item3; -@dynamic item4; -@dynamic member_id; -@dynamic ship_id; -@dynamic state; - -@end diff --git a/KCD/HMKCNyukyoDock.h b/KCD/HMKCNyukyoDock.h deleted file mode 100644 index 638b2185..00000000 --- a/KCD/HMKCNyukyoDock.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// HMKCNyukyoDock.h -// KCD -// -// Created by Hori,Masaki on 2016/02/10. -// Copyright © 2016年 Hori,Masaki. All rights reserved. -// - -#import "HMKCManagedObject.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface HMKCNyukyoDock : HMKCManagedObject - -// Insert code here to declare functionality of your managed object subclass - -@end - -NS_ASSUME_NONNULL_END - -#import "HMKCNyukyoDock+CoreDataProperties.h" diff --git a/KCD/HMKCNyukyoDock.m b/KCD/HMKCNyukyoDock.m deleted file mode 100644 index 9ee456d4..00000000 --- a/KCD/HMKCNyukyoDock.m +++ /dev/null @@ -1,15 +0,0 @@ -// -// HMKCNyukyoDock.m -// KCD -// -// Created by Hori,Masaki on 2016/02/10. -// Copyright © 2016年 Hori,Masaki. All rights reserved. -// - -#import "HMKCNyukyoDock.h" - -@implementation HMKCNyukyoDock - -// Insert code here to add functionality to your managed object subclass - -@end diff --git a/KCD/HMKCNyukyoDock.swift b/KCD/HMKCNyukyoDock.swift new file mode 100644 index 00000000..28ad4761 --- /dev/null +++ b/KCD/HMKCNyukyoDock.swift @@ -0,0 +1,22 @@ +// +// HMKCNyukyoDock.swift +// KCD +// +// Created by Hori,Masaki on 2017/01/29. +// Copyright © 2017年 Hori,Masaki. All rights reserved. +// + +import Foundation + +class HMKCNyukyoDock: HMKCManagedObject { + @NSManaged var complete_time: Int + @NSManaged var complete_time_str: String? + @NSManaged var id: Int + @NSManaged var item1: NSNumber? + @NSManaged var item2: NSNumber? + @NSManaged var item3: NSNumber? + @NSManaged var item4: NSNumber? + @NSManaged var member_id: NSNumber? + @NSManaged var ship_id: Int + @NSManaged var state: Int +} diff --git a/KCD/HMNyukyoSpeedChangeCommand.swift b/KCD/HMNyukyoSpeedChangeCommand.swift index 35ae5997..3ea6bbc1 100644 --- a/KCD/HMNyukyoSpeedChangeCommand.swift +++ b/KCD/HMNyukyoSpeedChangeCommand.swift @@ -19,25 +19,25 @@ class HMNyukyoSpeedChangeCommand: HMJSONCommand { let p = NSPredicate(format: "id = %@", argumentArray: [ndockId]) guard let d = try? store?.objects(withEntityName: "NyukyoDock", predicate: p), let ndocks = d as? [HMKCNyukyoDock], - let ndock = ndocks.first, - let shipId = ndock.ship_id - else { return print("Not found ndock") } - ndock.ship_id = nil + let ndock = ndocks.first + else { return print("HMNyukyoSpeedChangeCommand: Not found ndock") } + let shipId = ndock.ship_id + ndock.ship_id = 0 ndock.state = 0 // 艦隊リスト更新 - let pp = NSPredicate(format: "id = %@", argumentArray: [shipId]) + let pp = NSPredicate(format: "id = %ld", shipId) guard let s = try? store?.objects(withEntityName: "Ship", predicate: pp), let ships = s as? [HMKCShipObject], let ship = ships.first - else { return print("Not found Ship") } + else { return print("HMNyukyoSpeedChangeCommand: Not found Ship") } ship.nowhp = ship.maxhp // guard let m = try? store?.objects(withEntityName: "Material", predicate: nil), let materials = m as? [HMKCMaterial], let material = materials.first - else { return print("Not found Material") } + else { return print("HMNyukyoSpeedChangeCommand: Not found Material") } material.kousokushuhuku = material.kousokushuhuku - 1 } } diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h index ab45caad..442af65f 100644 --- a/KCD/KCD-Bridging-Header.h +++ b/KCD/KCD-Bridging-Header.h @@ -15,7 +15,6 @@ #import "HMKCShipObject+Extensions.h" #import "HMKCSlotItemObject+Extensions.h" -#import "HMKCNyukyoDock.h" #import "HMKCQuest.h" #import "HMKaihatuHistory.h" #import "HMKenzoMark.h" diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents index 0c07c5e6..41f6dac1 100644 --- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents +++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents @@ -261,8 +261,8 @@ - - + + @@ -271,7 +271,7 @@ - + @@ -370,7 +370,7 @@ - + -- 2.11.0