From dc895e523caea90c69b08a96dc750cd6a750fa67 Mon Sep 17 00:00:00 2001 From: masakih Date: Sat, 14 Jan 2017 14:01:05 +0900 Subject: [PATCH] =?utf8?q?HMMasterSlotItemEquipTypeCommand=E3=82=92Swift?= =?utf8?q?=E3=81=AB=E5=A4=89=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 | 10 ++++------ KCD/HMMasterSlotItemEquipTypeCommand.h | 13 ------------- KCD/HMMasterSlotItemEquipTypeCommand.m | 20 -------------------- KCD/HMMasterSlotItemEquipTypeCommand.swift | 19 +++++++++++++++++++ KCD/HMStart2Command.m | 3 ++- 5 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 KCD/HMMasterSlotItemEquipTypeCommand.h delete mode 100644 KCD/HMMasterSlotItemEquipTypeCommand.m create mode 100644 KCD/HMMasterSlotItemEquipTypeCommand.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index fcae29cc..3ac4a64e 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ F4048AA11E1951BB008ACFD6 /* HMSuppliesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4048AA01E1951BB008ACFD6 /* HMSuppliesCell.swift */; }; F40ADA021CE6317500AE29B0 /* HMIgnoreCommand.plist in Resources */ = {isa = PBXBuildFile; fileRef = F40ADA011CE6317500AE29B0 /* HMIgnoreCommand.plist */; }; F4131EDE190FEBDB004F7F9A /* HMSlotItemWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4131EE0190FEBDB004F7F9A /* HMSlotItemWindowController.xib */; }; - F4131EE61910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131EE51910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m */; }; F41465681DAB852E00D68C97 /* HMScreenshotCollectionViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = F41465671DAB852E00D68C97 /* HMScreenshotCollectionViewItem.xib */; }; F41465741DB4F1A700D68C97 /* HMScreenshotListWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F41465761DB4F1A700D68C97 /* HMScreenshotListWindowController.xib */; }; F421850A1DF44AA900256590 /* HMAirBaseWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F421850C1DF44AA900256590 /* HMAirBaseWindowController.xib */; }; @@ -80,6 +79,7 @@ F44BC7191E29D9DC004644E3 /* HMMemberDeckCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7181E29D9DC004644E3 /* HMMemberDeckCommand.swift */; }; F44BC71B1E29DCB4004644E3 /* HMMemberKDockCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71A1E29DCB4004644E3 /* HMMemberKDockCommand.swift */; }; F44BC71D1E29DF32004644E3 /* HMMemberNDockCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71C1E29DF32004644E3 /* HMMemberNDockCommand.swift */; }; + F44BC71F1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */; }; F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EDC18B619B600073552 /* HMCoreDataManager.m */; }; F45771231E1BCC7C008A9215 /* HMPeriodicNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = F45771221E1BCC7C008A9215 /* HMPeriodicNotifier.swift */; }; F45F3BE11E067A870009434E /* HMHistoryItemCleaner.swift in Sources */ = {isa = PBXBuildFile; fileRef = F45F3BE01E067A870009434E /* HMHistoryItemCleaner.swift */; }; @@ -329,8 +329,6 @@ F4048A9E1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMStrokeTextFieldCell.swift; sourceTree = ""; }; F4048AA01E1951BB008ACFD6 /* HMSuppliesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSuppliesCell.swift; sourceTree = ""; }; F40ADA011CE6317500AE29B0 /* HMIgnoreCommand.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = HMIgnoreCommand.plist; sourceTree = ""; }; - F4131EE41910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterSlotItemEquipTypeCommand.h; sourceTree = ""; }; - F4131EE51910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSlotItemEquipTypeCommand.m; sourceTree = ""; }; F41465671DAB852E00D68C97 /* HMScreenshotCollectionViewItem.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HMScreenshotCollectionViewItem.xib; sourceTree = ""; }; F421850D1DF44AEA00256590 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HMAirBaseWindowController.xib; sourceTree = ""; }; F421850E1DF4518000256590 /* BroswerTouchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BroswerTouchBar.xib; sourceTree = ""; }; @@ -414,6 +412,7 @@ F44BC7181E29D9DC004644E3 /* HMMemberDeckCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberDeckCommand.swift; sourceTree = ""; }; F44BC71A1E29DCB4004644E3 /* HMMemberKDockCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberKDockCommand.swift; sourceTree = ""; }; F44BC71C1E29DF32004644E3 /* HMMemberNDockCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberNDockCommand.swift; sourceTree = ""; }; + F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterSlotItemEquipTypeCommand.swift; sourceTree = ""; }; F4513EDB18B619B600073552 /* HMCoreDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCoreDataManager.h; sourceTree = ""; }; F4513EDC18B619B600073552 /* HMCoreDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCoreDataManager.m; sourceTree = ""; }; F45771221E1BCC7C008A9215 /* HMPeriodicNotifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMPeriodicNotifier.swift; sourceTree = ""; }; @@ -821,8 +820,7 @@ F4B414F418B1888800468DAF /* HMMasterFurnitureCommand.m */, F4B414F618B1D35800468DAF /* HMMasterMissionCommand.h */, F4B414F718B1D35800468DAF /* HMMasterMissionCommand.m */, - F4131EE41910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.h */, - F4131EE51910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m */, + F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */, ); name = MasterUpdateCommand; sourceTree = ""; @@ -1791,6 +1789,7 @@ F46F104918ABAC910063E503 /* KCD.xcdatamodeld in Sources */, F44BC7111E27C61A004644E3 /* HMMemberSlotItemCommand.swift in Sources */, F44BC6FD1E250B2A004644E3 /* HMGetShipCommand.swift in Sources */, + F44BC71F1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift in Sources */, F4C2ACA51D7167C2007BFE90 /* HMTimeSignalNotifier.m in Sources */, F4F9F8781C6B5BA900D0EE76 /* HMKCKenzoDock.m in Sources */, F48A704D1DE326F0005DFC0B /* HMAirBaseCommand.m in Sources */, @@ -1809,7 +1808,6 @@ F44BC70F1E27BE55004644E3 /* HMMemberShip2Command.swift in Sources */, F49097811E19F2C70085A45D /* HMBorderTextField.swift in Sources */, F4AA594E1E1E4A7C001667AF /* HMUITestWindowController.swift in Sources */, - F4131EE61910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m in Sources */, F49097851E1A15AF0085A45D /* HMSlotItemLevelView.swift in Sources */, F4F9F8721C6A306A00D0EE76 /* HMKCBattle.m in Sources */, F44BC6C31E221865004644E3 /* HMAirCorpsSupplyCommand.swift in Sources */, diff --git a/KCD/HMMasterSlotItemEquipTypeCommand.h b/KCD/HMMasterSlotItemEquipTypeCommand.h deleted file mode 100644 index f9d6284b..00000000 --- a/KCD/HMMasterSlotItemEquipTypeCommand.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// HMMasterSlotItemEquipTypeCommand.h -// KCD -// -// Created by Hori,Masaki on 2014/04/30. -// Copyright (c) 2014年 Hori,Masaki. All rights reserved. -// - -#import "HMJSONCommand.h" - -@interface HMMasterSlotItemEquipTypeCommand : HMJSONCommand - -@end diff --git a/KCD/HMMasterSlotItemEquipTypeCommand.m b/KCD/HMMasterSlotItemEquipTypeCommand.m deleted file mode 100644 index b8fb0112..00000000 --- a/KCD/HMMasterSlotItemEquipTypeCommand.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// HMMasterSlotItemEquipTypeCommand.m -// KCD -// -// Created by Hori,Masaki on 2014/04/30. -// Copyright (c) 2014年 Hori,Masaki. All rights reserved. -// - -#import "HMMasterSlotItemEquipTypeCommand.h" - -@implementation HMMasterSlotItemEquipTypeCommand -- (NSString *)dataKey -{ - return @"api_data.api_mst_slotitem_equiptype"; -} -- (void)execute -{ - [self commitJSONToEntityNamed:@"MasterSlotItemEquipType"]; -} -@end diff --git a/KCD/HMMasterSlotItemEquipTypeCommand.swift b/KCD/HMMasterSlotItemEquipTypeCommand.swift new file mode 100644 index 00000000..ef58d728 --- /dev/null +++ b/KCD/HMMasterSlotItemEquipTypeCommand.swift @@ -0,0 +1,19 @@ +// +// HMMasterSlotItemEquipTypeCommand.swift +// KCD +// +// Created by Hori,Masaki on 2017/01/14. +// Copyright © 2017年 Hori,Masaki. All rights reserved. +// + +import Cocoa + +class HMMasterSlotItemEquipTypeCommand: HMJSONCommand { + override var dataKey: String { + return "api_data.api_mst_slotitem_equiptype" + } + + override func execute() { + commitJSON(toEntityNamed: "MasterSlotItemEquipType") + } +} diff --git a/KCD/HMStart2Command.m b/KCD/HMStart2Command.m index 85827e7a..113f7fc4 100644 --- a/KCD/HMStart2Command.m +++ b/KCD/HMStart2Command.m @@ -8,6 +8,8 @@ #import "HMStart2Command.h" +#import "KCD-Swift.h" + #import "HMMasterMapAreaCommand.h" #import "HMMasterMapInfoCommand.h" #import "HMMasterSTypeCommand.h" @@ -16,7 +18,6 @@ #import "HMMasterFurnitureCommand.h" #import "HMMasterSlotItemCommand.h" #import "HMMasterUseItemCommand.h" -#import "HMMasterSlotItemEquipTypeCommand.h" @implementation HMStart2Command -- 2.11.0