HMKCMasterSlotItemEquipTypeObjectを追加

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index a3fc107..0faecf6 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -146,6 +146,8 @@
                F4AA06101931869E00844688 /* HMBattleResultCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA060F1931869E00844688 /* HMBattleResultCommand.m */; };
                F4AA59141E1C951F001667AF /* HMTimerCountFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59131E1C951F001667AF /* HMTimerCountFormatter.swift */; };
                F4AA59161E1C9C5D001667AF /* ValueTransformerRegister.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59151E1C9C5D001667AF /* ValueTransformerRegister.swift */; };
+               F4AA59251E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59221E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m */; };
+               F4AA59261E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59241E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m */; };
                F4AC136D1E0802C000851147 /* HMPreferencePanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC136C1E0802C000851147 /* HMPreferencePanelController.swift */; };
                F4AC136F1E0963DB00851147 /* HMProgressPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC136E1E0963DB00851147 /* HMProgressPanel.swift */; };
                F4AC13711E096A7B00851147 /* HMHistoryWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC13701E096A7B00851147 /* HMHistoryWindowController.swift */; };
@@ -566,6 +568,10 @@
                F4AA060F1931869E00844688 /* HMBattleResultCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBattleResultCommand.m; sourceTree = "<group>"; };
                F4AA59131E1C951F001667AF /* HMTimerCountFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMTimerCountFormatter.swift; sourceTree = "<group>"; };
                F4AA59151E1C9C5D001667AF /* ValueTransformerRegister.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValueTransformerRegister.swift; sourceTree = "<group>"; };
+               F4AA59211E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCMasterSlotItemEquipTypeObject.h; sourceTree = "<group>"; };
+               F4AA59221E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m"; sourceTree = "<group>"; };
+               F4AA59231E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h"; sourceTree = "<group>"; };
+               F4AA59241E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m"; sourceTree = "<group>"; };
                F4AC136C1E0802C000851147 /* HMPreferencePanelController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMPreferencePanelController.swift; sourceTree = "<group>"; };
                F4AC136E1E0963DB00851147 /* HMProgressPanel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMProgressPanel.swift; sourceTree = "<group>"; };
                F4AC13701E096A7B00851147 /* HMHistoryWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMHistoryWindowController.swift; sourceTree = "<group>"; };
@@ -1450,6 +1456,10 @@
                                F4F9F87A1C6B5E4A00D0EE76 /* HMKCMasterSType+CoreDataProperties.m */,
                                F4F9F87B1C6B5E4A00D0EE76 /* HMKCMasterSType.h */,
                                F4F9F87C1C6B5E4A00D0EE76 /* HMKCMasterSType.m */,
+                               F4AA59211E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject.h */,
+                               F4AA59221E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m */,
+                               F4AA59231E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h */,
+                               F4AA59241E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m */,
                                F448F9931B70E9BE004901AD /* HMKCMaterial.h */,
                                F448F9941B70E9BE004901AD /* HMKCMaterial.m */,
                                F4F9F88B1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.h */,
@@ -1797,6 +1807,7 @@
                                F48A705F1DE58A38005DFC0B /* HMKCAirBasePlaneInfo+CoreDataProperties.m in Sources */,
                                F426802E194D0FFD00B2C27F /* HMMemberShip3Command.m in Sources */,
                                F431E97C1DF3D2E100FB56AE /* HMAreaNameTransformer.m in Sources */,
+                               F4AA59261E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m in Sources */,
                                F49097831E19F7760085A45D /* HMStrengthenListItemCellView.swift in Sources */,
                                F4B37EF319FBBBED002F371A /* HMRemodelSlotCommand.m in Sources */,
                                F495462E1B1894DD00E0D8D0 /* Bookmark.xcdatamodeld in Sources */,
@@ -1929,6 +1940,7 @@
                                F471784D1B6FA18800F5E59D /* HMKCResource.m in Sources */,
                                F4F9F87D1C6B5E4A00D0EE76 /* HMKCMasterSType+CoreDataProperties.m in Sources */,
                                F4E5FF0A1E15CE3D0026868C /* HMBridgeViewController.swift in Sources */,
+                               F4AA59251E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m in Sources */,
                                F4C6687D1C545E3800601AFB /* HMMapWindowController.m in Sources */,
                                F4AA060D1930E69200844688 /* HMMidnightBattleCommand.m in Sources */,
                                F4D6BC551A93903E00742FEB /* HMDropShipHistory.m in Sources */,

diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m
new file mode 100644 (file)
index 0000000..6494f56
--- /dev/null
+++ b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m
@@ -0,0 +1,14 @@
+//
+//  HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/04.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//  This file was automatically generated and should not be edited.
+//
+
+#import "HMKCMasterSlotItemEquipTypeObject.h"
+
+@implementation HMKCMasterSlotItemEquipTypeObject
+
+@end

diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h
new file mode 100644 (file)
index 0000000..32e61f4
--- /dev/null
+++ b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h
@@ -0,0 +1,25 @@
+//
+//  HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/04.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//  This file was automatically generated and should not be edited.
+//
+
+#import "HMKCMasterSlotItemEquipTypeObject.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HMKCMasterSlotItemEquipTypeObject (CoreDataProperties)
+
++ (NSFetchRequest<HMKCMasterSlotItemEquipTypeObject *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSNumber *id;
+@property (nullable, nonatomic, copy) NSString *name;
+@property (nullable, nonatomic, copy) NSNumber *show_flg;
+
+@end
+
+NS_ASSUME_NONNULL_END

diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m
new file mode 100644 (file)
index 0000000..12e57d4
--- /dev/null
+++ b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m
@@ -0,0 +1,22 @@
+//
+//  HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/04.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//  This file was automatically generated and should not be edited.
+//
+
+#import "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h"
+
+@implementation HMKCMasterSlotItemEquipTypeObject (CoreDataProperties)
+
++ (NSFetchRequest<HMKCMasterSlotItemEquipTypeObject *> *)fetchRequest {
+       return [[NSFetchRequest alloc] initWithEntityName:@"MasterSlotItemEquipType"];
+}
+
+@dynamic id;
+@dynamic name;
+@dynamic show_flg;
+
+@end

diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject.h b/KCD/HMKCMasterSlotItemEquipTypeObject.h
new file mode 100644 (file)
index 0000000..4bfe7a4
--- /dev/null
+++ b/KCD/HMKCMasterSlotItemEquipTypeObject.h
@@ -0,0 +1,21 @@
+//
+//  HMKCMasterSlotItemEquipTypeObject+CoreDataClass.h
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/04.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//  This file was automatically generated and should not be edited.
+//
+
+#import "HMKCManagedObject.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HMKCMasterSlotItemEquipTypeObject : HMKCManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h"

diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
index c890dbc..9532e18 100644 (file)
--- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
+++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11232" systemVersion="15G1108" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11759" systemVersion="16C67" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="AirBase" representedClassName="HMKCAirBase" syncable="YES">
         <attribute name="action_kind" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="area_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -229,7 +229,7 @@
         <attribute name="usebull" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <relationship name="slotItems" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SlotItem" inverseName="master_slotItem" inverseEntity="SlotItem" syncable="YES"/>
     </entity>
-    <entity name="MasterSlotItemEquipType" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterSlotItemEquipType" representedClassName="HMKCMasterSlotItemEquipTypeObject" syncable="YES" codeGenerationType="category">
         <attribute name="id" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="show_flg" optional="YES" attributeType="Boolean" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -353,6 +353,8 @@
         <relationship name="master_slotItem" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MasterSlotItem" inverseName="slotItems" inverseEntity="MasterSlotItem" syncable="YES"/>
     </entity>
     <elements>
+        <element name="AirBase" positionX="9" positionY="153" width="128" height="135"/>
+        <element name="AirBasePlaneInfo" positionX="18" positionY="162" width="128" height="150"/>
         <element name="Basic" positionX="0" positionY="0" width="128" height="645"/>
         <element name="Deck" positionX="0" positionY="0" width="128" height="270"/>
         <element name="KenzoDock" positionX="0" positionY="0" width="128" height="210"/>
@@ -371,7 +373,5 @@
         <element name="Quest" positionX="0" positionY="0" width="128" height="240"/>
         <element name="Ship" positionX="0" positionY="0" width="128" height="825"/>
         <element name="SlotItem" positionX="0" positionY="0" width="128" height="165"/>
-        <element name="AirBase" positionX="9" positionY="153" width="128" height="135"/>
-        <element name="AirBasePlaneInfo" positionX="18" positionY="162" width="128" height="150"/>
     </elements>
 </model>
\ No newline at end of file