• R/O
  • HTTP
  • SSH
  • HTTPS

KCD: Commit

main code repository.


Commit MetaInfo

Revisione1e7b6a81045a53ffc7081ef4e5f471d99a788bc (tree)
Time2018-08-12 20:35:24
Authormasakih <masakih@user...>
Commitermasakih

Log Message

CoreDataの不要なプロパティを削除

Change Summary

Incremental Difference

--- a/KCD/Basic.swift
+++ b/KCD/Basic.swift
@@ -13,7 +13,6 @@ final class Basic: KCManagedObject {
1313
1414 @NSManaged var active_flag: NSNumber?
1515 @NSManaged var comment: String?
16- @NSManaged var comment_id: NSNumber?
1716 @NSManaged var count_deck: Int
1817 @NSManaged var count_kdock: Int
1918 @NSManaged var count_ndock: Int
@@ -34,11 +33,9 @@ final class Basic: KCManagedObject {
3433 @NSManaged var max_kagu: Int
3534 @NSManaged var max_slotitem: Int
3635 @NSManaged var medals: Int
37- @NSManaged var member_id: NSNumber?
3836 @NSManaged var ms_count: NSNumber?
3937 @NSManaged var ms_success: NSNumber?
4038 @NSManaged var nickname: String
41- @NSManaged var nickname_id: NSNumber?
4239 @NSManaged var playtime: Int
4340 @NSManaged var pt_challenged: NSNumber?
4441 @NSManaged var pt_challenged_win: NSNumber?
--- a/KCD/BasicMapper.swift
+++ b/KCD/BasicMapper.swift
@@ -18,7 +18,8 @@ final class BasicMapper: JSONMapper {
1818 self.apiResponse = apiResponse
1919 self.configuration = MappingConfiguration(entity: Basic.self,
2020 dataKeys: BasicMapper.dataKeys(apiResponse),
21- editorStore: ServerDataStore.oneTimeEditor())
21+ editorStore: ServerDataStore.oneTimeEditor(),
22+ ignoreKeys: ["api_comment_id", "api_member_id", "api_nickname_id"])
2223 }
2324
2425 private class func dataKeys(_ apiResponse: APIResponse) -> [String] {
--- a/KCD/Deck.swift
+++ b/KCD/Deck.swift
@@ -11,15 +11,12 @@ import Cocoa
1111 // swiftlint:disable identifier_name
1212 final class Deck: KCManagedObject {
1313
14- @NSManaged var flagship: NSNumber?
1514 @NSManaged var id: Int
16- @NSManaged var member_id: NSNumber?
1715 @NSManaged var mission_0: Int
1816 @NSManaged var mission_1: Int
1917 @NSManaged var mission_2: Int
2018 @NSManaged var mission_3: Int
2119 @NSManaged var name: String
22- @NSManaged var name_id: NSNumber?
2320 @NSManaged var ship_0: Int
2421 @NSManaged var ship_1: Int
2522 @NSManaged var ship_2: Int
--- a/KCD/DeckMapper.swift
+++ b/KCD/DeckMapper.swift
@@ -18,7 +18,8 @@ final class DeckMapper: JSONMapper {
1818 self.apiResponse = apiResponse
1919 self.configuration = MappingConfiguration(entity: Deck.self,
2020 dataKeys: DeckMapper.dataKeys(apiResponse),
21- editorStore: ServerDataStore.oneTimeEditor())
21+ editorStore: ServerDataStore.oneTimeEditor(),
22+ ignoreKeys: ["api_flagship", "api_member_id", "api_name_id"])
2223 }
2324
2425 private class func dataKeys(_ apiResponse: APIResponse) -> [String] {
--- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
+++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13533" systemVersion="17B48" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
2+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14135" systemVersion="17G65" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
33 <entity name="AirBase" representedClassName="KCD.AirBase" syncable="YES">
44 <attribute name="action_kind" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
55 <attribute name="area_id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -20,7 +20,6 @@
2020 <entity name="Basic" representedClassName="KCD.Basic" syncable="YES">
2121 <attribute name="active_flag" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
2222 <attribute name="comment" optional="YES" attributeType="String" syncable="YES"/>
23- <attribute name="comment_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
2423 <attribute name="count_deck" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
2524 <attribute name="count_kdock" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
2625 <attribute name="count_ndock" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -40,11 +39,9 @@
4039 <attribute name="max_kagu" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
4140 <attribute name="max_slotitem" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
4241 <attribute name="medals" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
43- <attribute name="member_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
4442 <attribute name="ms_count" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
4543 <attribute name="ms_success" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
4644 <attribute name="nickname" optional="YES" attributeType="String" syncable="YES"/>
47- <attribute name="nickname_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
4845 <attribute name="playtime" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
4946 <attribute name="pt_challenged" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
5047 <attribute name="pt_challenged_win" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -60,15 +57,12 @@
6057 <attribute name="tutorial_progress" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
6158 </entity>
6259 <entity name="Deck" representedClassName="KCD.Deck" syncable="YES">
63- <attribute name="flagship" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
6460 <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
65- <attribute name="member_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
6661 <attribute name="mission_0" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
6762 <attribute name="mission_1" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
6863 <attribute name="mission_2" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
6964 <attribute name="mission_3" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
7065 <attribute name="name" attributeType="String" syncable="YES"/>
71- <attribute name="name_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
7266 <attribute name="ship_0" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
7367 <attribute name="ship_1" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
7468 <attribute name="ship_2" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -87,7 +81,6 @@
8781 <attribute name="item3" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
8882 <attribute name="item4" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
8983 <attribute name="item5" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
90- <attribute name="member_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
9184 <attribute name="state" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
9285 </entity>
9386 <entity name="MasterFurniture" representedClassName="KCD.MasterFurniture" syncable="YES">
@@ -229,7 +222,6 @@
229222 <attribute name="type_2" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
230223 <attribute name="type_3" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
231224 <attribute name="type_4" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
232- <attribute name="usebull" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
233225 <relationship name="slotItems" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SlotItem" inverseName="master_slotItem" inverseEntity="SlotItem" syncable="YES"/>
234226 </entity>
235227 <entity name="MasterSlotItemEquipType" representedClassName="KCD.MasterSlotItemEquipType" syncable="YES">
@@ -272,7 +264,6 @@
272264 <attribute name="item2" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
273265 <attribute name="item3" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
274266 <attribute name="item4" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
275- <attribute name="member_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
276267 <attribute name="ship_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
277268 <attribute name="state" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
278269 </entity>
@@ -361,21 +352,21 @@
361352 <elements>
362353 <element name="AirBase" positionX="9" positionY="153" width="128" height="135"/>
363354 <element name="AirBasePlaneInfo" positionX="18" positionY="162" width="128" height="150"/>
364- <element name="Basic" positionX="0" positionY="0" width="128" height="645"/>
365- <element name="Deck" positionX="0" positionY="0" width="128" height="285"/>
366- <element name="KenzoDock" positionX="0" positionY="0" width="128" height="210"/>
355+ <element name="Basic" positionX="0" positionY="0" width="128" height="600"/>
356+ <element name="Deck" positionX="0" positionY="0" width="128" height="240"/>
357+ <element name="KenzoDock" positionX="0" positionY="0" width="128" height="195"/>
367358 <element name="MasterFurniture" positionX="0" positionY="0" width="128" height="30"/>
368359 <element name="MasterMapArea" positionX="0" positionY="0" width="128" height="90"/>
369360 <element name="MasterMapCell" positionX="0" positionY="0" width="128" height="135"/>
370361 <element name="MasterMapInfo" positionX="0" positionY="0" width="128" height="285"/>
371362 <element name="MasterMission" positionX="0" positionY="0" width="128" height="240"/>
372363 <element name="MasterShip" positionX="0" positionY="0" width="128" height="30"/>
373- <element name="MasterSlotItem" positionX="0" positionY="0" width="128" height="585"/>
364+ <element name="MasterSlotItem" positionX="0" positionY="0" width="128" height="570"/>
374365 <element name="MasterSlotItemEquipType" positionX="0" positionY="0" width="128" height="90"/>
375366 <element name="MasterSType" positionX="0" positionY="0" width="128" height="135"/>
376367 <element name="MasterUseItem" positionX="0" positionY="0" width="128" height="30"/>
377368 <element name="Material" positionX="0" positionY="0" width="128" height="165"/>
378- <element name="NyukyoDock" positionX="0" positionY="0" width="128" height="195"/>
369+ <element name="NyukyoDock" positionX="0" positionY="0" width="128" height="180"/>
379370 <element name="Quest" positionX="0" positionY="0" width="128" height="240"/>
380371 <element name="Ship" positionX="0" positionY="0" width="128" height="870"/>
381372 <element name="SlotItem" positionX="0" positionY="0" width="128" height="165"/>
--- a/KCD/KenzoDock.swift
+++ b/KCD/KenzoDock.swift
@@ -20,6 +20,5 @@ final class KenzoDock: KCManagedObject {
2020 @NSManaged var item3: Int
2121 @NSManaged var item4: Int
2222 @NSManaged var item5: Int
23- @NSManaged var member_id: NSNumber?
2423 @NSManaged var state: Int
2524 }
--- a/KCD/KenzoDockMapper.swift
+++ b/KCD/KenzoDockMapper.swift
@@ -18,7 +18,8 @@ final class KenzoDockMapper: JSONMapper {
1818 self.apiResponse = apiResponse
1919 self.configuration = MappingConfiguration(entity: KenzoDock.self,
2020 dataKeys: KenzoDockMapper.dataKeys(apiResponse),
21- editorStore: ServerDataStore.oneTimeEditor())
21+ editorStore: ServerDataStore.oneTimeEditor(),
22+ ignoreKeys: ["api_member_id"])
2223 }
2324
2425 private class func dataKeys(_ apiResponse: APIResponse) -> [String] {
--- a/KCD/MasterSlotItem.swift
+++ b/KCD/MasterSlotItem.swift
@@ -42,6 +42,5 @@ final class MasterSlotItem: KCManagedObject {
4242 @NSManaged var type_1: Int
4343 @NSManaged var type_2: Int
4444 @NSManaged var type_3: Int
45- @NSManaged var usebull: NSNumber?
4645 @NSManaged var slotItems: Set<SlotItem>
4746 }
--- a/KCD/MasterSlotItemMapper.swift
+++ b/KCD/MasterSlotItemMapper.swift
@@ -14,7 +14,7 @@ final class MasterSlotItemMapper: JSONMapper {
1414 let configuration = MappingConfiguration(entity: MasterSlotItem.self,
1515 dataKeys: ["api_data", "api_mst_slotitem"],
1616 editorStore: ServerDataStore.oneTimeEditor(),
17- ignoreKeys: ["api_version"])
17+ ignoreKeys: ["api_version", "api_usebull"])
1818
1919 required init(_ apiResponse: APIResponse) {
2020
--- a/KCD/NyukyoDock.swift
+++ b/KCD/NyukyoDock.swift
@@ -18,7 +18,6 @@ final class NyukyoDock: KCManagedObject {
1818 @NSManaged var item2: NSNumber?
1919 @NSManaged var item3: NSNumber?
2020 @NSManaged var item4: NSNumber?
21- @NSManaged var member_id: NSNumber?
2221 @NSManaged var ship_id: Int
2322 @NSManaged var state: Int
2423 }
--- a/KCD/NyukyoDockMapper.swift
+++ b/KCD/NyukyoDockMapper.swift
@@ -18,7 +18,8 @@ final class NyukyoDockMapper: JSONMapper {
1818 self.apiResponse = apiResponse
1919 self.configuration = MappingConfiguration(entity: NyukyoDock.self,
2020 dataKeys: NyukyoDockMapper.dataKeys(apiResponse),
21- editorStore: ServerDataStore.oneTimeEditor())
21+ editorStore: ServerDataStore.oneTimeEditor(),
22+ ignoreKeys: ["api_member_id"])
2223 }
2324
2425 private class func dataKeys(_ apiResponse: APIResponse) -> [String] {
Show on old repository browser