From d8ef37bb29a6edb8c2a543a91436ceb2ea3eb6f3 Mon Sep 17 00:00:00 2001 From: masakih Date: Mon, 27 Mar 2017 21:34:38 +0900 Subject: [PATCH] =?utf8?q?=E6=94=B9=E4=BF=AE=E5=B7=A5=E5=BB=A0=E3=83=A1?= =?utf8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E3=82=AB=E3=83=86=E3=82=B4?= =?utf8?q?=E3=83=AA=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD/Base.lproj/StrengthenListViewController.xib | 8 ++++---- KCD/StrengthenListViewController.swift | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/KCD/Base.lproj/StrengthenListViewController.xib b/KCD/Base.lproj/StrengthenListViewController.xib index 4c637a6d..5d25c65e 100644 --- a/KCD/Base.lproj/StrengthenListViewController.xib +++ b/KCD/Base.lproj/StrengthenListViewController.xib @@ -373,11 +373,11 @@ - - - + + + - + diff --git a/KCD/StrengthenListViewController.swift b/KCD/StrengthenListViewController.swift index 25231203..b63dd16a 100644 --- a/KCD/StrengthenListViewController.swift +++ b/KCD/StrengthenListViewController.swift @@ -16,7 +16,7 @@ fileprivate struct FilterCategories { static let allType: [EquipmentType] = (1...100).flatMap { EquipmentType(rawValue: $0) } static let canonType: [EquipmentType] = [.smallCaliberMainGun, .mediumCaliberMainGun, .largeCaliberMainGun, .largeCaliberMainGunII] - static let torpedoType: [EquipmentType] = [.secondaryGun, .torpedo, .depthCharge, + static let torpedoType: [EquipmentType] = [.secondaryGun, .torpedo, .antiAircraftGun, .antiSunmrinerSercher, .submarinTorpedo, .largeSonar] static let airplaneType: [EquipmentType] = [.fighter, .bomber, .attacker, .searcher, @@ -26,7 +26,9 @@ fileprivate struct FilterCategories { .jetFighter, .jetBomber, .jetAttacker, .jetSearcher, .searcherII] - static let radarType: [EquipmentType] = [.smallRadar, .largeRadar, .sonar] + static let radarType: [EquipmentType] = [.smallRadar, .largeRadar, + .sonar, .depthCharge, + .SubmarineEquipment] static let otherType: [EquipmentType] = { return allType .filter { !canonType.contains($0) } -- 2.11.0