OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

艦これの経験値を管理するツール


Commit MetaInfo

Revision33aa74edc39038727239d4313de92323954615e9 (tree)
Time2014-02-02 15:11:14
Authormasakih <masakih@user...>
Commitermasakih

Log Message

近代化改修用にステータスを記録できるようにした

Change Summary

Incremental Difference

--- a/KanColleLevelManager.xcodeproj/project.pbxproj
+++ b/KanColleLevelManager.xcodeproj/project.pbxproj
@@ -44,6 +44,8 @@
4444 F4837E19181BEEFA003E879C /* KCFleetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4837E17181BEEFA003E879C /* KCFleetViewController.xib */; };
4545 F4837E1B181CF395003E879C /* BattleArea.plist in Resources */ = {isa = PBXBuildFile; fileRef = F4837E1A181CF395003E879C /* BattleArea.plist */; };
4646 F4BA7F18182FB8C500B37348 /* Ship.m in Sources */ = {isa = PBXBuildFile; fileRef = F4BA7F17182FB8C500B37348 /* Ship.m */; };
47+ F4C118ED189DF7E6005D5B25 /* KCStatusCheckWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C118EB189DF7E6005D5B25 /* KCStatusCheckWindowController.m */; };
48+ F4C118EE189DF7E6005D5B25 /* KCStatusCheckWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4C118EC189DF7E6005D5B25 /* KCStatusCheckWindowController.xib */; };
4749 /* End PBXBuildFile section */
4850
4951 /* Begin PBXContainerItemProxy section */
@@ -113,6 +115,10 @@
113115 F4837E1A181CF395003E879C /* BattleArea.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = BattleArea.plist; sourceTree = "<group>"; };
114116 F4BA7F16182FB8C500B37348 /* Ship.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ship.h; sourceTree = "<group>"; };
115117 F4BA7F17182FB8C500B37348 /* Ship.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Ship.m; sourceTree = "<group>"; };
118+ F4C118EA189DF7E6005D5B25 /* KCStatusCheckWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KCStatusCheckWindowController.h; sourceTree = "<group>"; };
119+ F4C118EB189DF7E6005D5B25 /* KCStatusCheckWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCStatusCheckWindowController.m; sourceTree = "<group>"; };
120+ F4C118EC189DF7E6005D5B25 /* KCStatusCheckWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KCStatusCheckWindowController.xib; sourceTree = "<group>"; };
121+ F4C118EF189DFFB3005D5B25 /* KanColleLevelManager2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = file; path = KanColleLevelManager2.xcdatamodel; sourceTree = "<group>"; };
116122 /* End PBXFileReference section */
117123
118124 /* Begin PBXFrameworksBuildPhase section */
@@ -205,6 +211,9 @@
205211 F4837DFA18117C20003E879C /* KCFleetWindowController.m */,
206212 F4837DFB18117C20003E879C /* KCFleetWindowController.xib */,
207213 F448270E182916A1000F1CC2 /* Category.plist */,
214+ F4C118EA189DF7E6005D5B25 /* KCStatusCheckWindowController.h */,
215+ F4C118EB189DF7E6005D5B25 /* KCStatusCheckWindowController.m */,
216+ F4C118EC189DF7E6005D5B25 /* KCStatusCheckWindowController.xib */,
208217 F4837E10181BEBBB003E879C /* KCBattleWindowController.h */,
209218 F4837E11181BEBBB003E879C /* KCBattleWindowController.m */,
210219 F4837E12181BEBBB003E879C /* KCBattleWindowController.xib */,
@@ -343,6 +352,7 @@
343352 F457DDB8180BB1C500885A7F /* Images.xcassets in Resources */,
344353 F457DDAD180BB1C500885A7F /* Credits.rtf in Resources */,
345354 F4837E1B181CF395003E879C /* BattleArea.plist in Resources */,
355+ F4C118EE189DF7E6005D5B25 /* KCStatusCheckWindowController.xib in Resources */,
346356 F4837E0A18169955003E879C /* KCShipViewController.xib in Resources */,
347357 F4837DF818101C31003E879C /* shipFetchPredicate.plist in Resources */,
348358 F4837DF6180D9454003E879C /* KCCollectionWindowController.xib in Resources */,
@@ -375,6 +385,7 @@
375385 F457DDA9180BB1C500885A7F /* main.m in Sources */,
376386 F457DDB0180BB1C500885A7F /* HMAppDelegate.m in Sources */,
377387 F457DDB6180BB1C500885A7F /* KanColleLevelManager.xcdatamodeld in Sources */,
388+ F4C118ED189DF7E6005D5B25 /* KCStatusCheckWindowController.m in Sources */,
378389 F4837DFC18117C20003E879C /* KCFleetWindowController.m in Sources */,
379390 F448271218292C01000F1CC2 /* KCDataImporter.m in Sources */,
380391 F4837DEF180C33B6003E879C /* CollectedShip.m in Sources */,
@@ -610,9 +621,10 @@
610621 F457DDB4180BB1C500885A7F /* KanColleLevelManager.xcdatamodeld */ = {
611622 isa = XCVersionGroup;
612623 children = (
624+ F4C118EF189DFFB3005D5B25 /* KanColleLevelManager2.xcdatamodel */,
613625 F457DDB5180BB1C500885A7F /* KanColleLevelManager.xcdatamodel */,
614626 );
615- currentVersion = F457DDB5180BB1C500885A7F /* KanColleLevelManager.xcdatamodel */;
627+ currentVersion = F4C118EF189DFFB3005D5B25 /* KanColleLevelManager2.xcdatamodel */;
616628 path = KanColleLevelManager.xcdatamodeld;
617629 sourceTree = "<group>";
618630 versionGroupType = wrapper.xcdatamodel;
--- a/KanColleLevelManager/HMAppDelegate.m
+++ b/KanColleLevelManager/HMAppDelegate.m
@@ -14,6 +14,7 @@
1414 #import "KCCollectionWindowController.h"
1515 #import "KCFleetWindowController.h"
1616 #import "KCBattleWindowController.h"
17+#import "KCStatusCheckWindowController.h"
1718
1819
1920
@@ -24,6 +25,7 @@
2425 @property (retain) KCCollectionWindowController *collectionWindowController;
2526 @property (retain) KCFleetWindowController *fleetWindowController;
2627 @property (retain) KCBattleWindowController *battleWindowController;
28+@property (retain) KCStatusCheckWindowController *statusCheckWindowController;
2729
2830 @end
2931
@@ -54,6 +56,9 @@
5456
5557 self.battleWindowController = [KCBattleWindowController new];
5658 [self.battleWindowController showWindow:self];
59+
60+ self.statusCheckWindowController = [KCStatusCheckWindowController new];
61+ [self.statusCheckWindowController showWindow:self];
5762 }
5863
5964 // Returns the directory the application uses to store the Core Data store file. This code uses a directory named "com.masakih.KanColleLevelManager" in the user's Application Support directory.
@@ -119,8 +124,12 @@
119124 }
120125
121126 NSURL *url = [applicationFilesDirectory URLByAppendingPathComponent:@"KanColleLevelManager.storedata"];
127+ NSDictionary *options = @{
128+ NSMigratePersistentStoresAutomaticallyOption : @YES,
129+ NSInferMappingModelAutomaticallyOption : @YES
130+ };
122131 NSPersistentStoreCoordinator *coordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:mom];
123- if (![coordinator addPersistentStoreWithType:NSXMLStoreType configuration:nil URL:url options:nil error:&error]) {
132+ if (![coordinator addPersistentStoreWithType:NSXMLStoreType configuration:nil URL:url options:options error:&error]) {
124133 [[NSApplication sharedApplication] presentError:error];
125134 return nil;
126135 }
--- a/KanColleLevelManager/KCFleetWindowController.xib
+++ b/KanColleLevelManager/KCFleetWindowController.xib
@@ -140,7 +140,7 @@
140140 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
141141 </clipView>
142142 <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="gJE-Ri-b5Q">
143- <rect key="frame" x="1" y="400" width="356" height="16"/>
143+ <rect key="frame" x="1" y="286" width="356" height="16"/>
144144 <autoresizingMask key="autoresizingMask"/>
145145 </scroller>
146146 <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="HeK-8K-tT8">
--- /dev/null
+++ b/KanColleLevelManager/KCStatusCheckWindowController.h
@@ -0,0 +1,19 @@
1+//
2+// KCStatusCheckWindowController.h
3+// KanColleLevelManager
4+//
5+// Created by Hori,Masaki on 2014/02/02.
6+// Copyright (c) 2014年 Hori,Masaki. All rights reserved.
7+//
8+
9+#import <Cocoa/Cocoa.h>
10+
11+@interface KCStatusCheckWindowController : NSWindowController
12+
13+@property (nonatomic, readonly) NSManagedObjectContext *managedObjectContext;
14+@property (nonatomic, retain) IBOutlet NSArrayController *collectionShip;
15+
16+
17+- (IBAction)selectCategory:(id)sender;
18+
19+@end
--- /dev/null
+++ b/KanColleLevelManager/KCStatusCheckWindowController.m
@@ -0,0 +1,60 @@
1+//
2+// KCStatusCheckWindowController.m
3+// KanColleLevelManager
4+//
5+// Created by Hori,Masaki on 2014/02/02.
6+// Copyright (c) 2014年 Hori,Masaki. All rights reserved.
7+//
8+
9+#import "KCStatusCheckWindowController.h"
10+
11+#import "HMAppDelegate.h"
12+
13+
14+@interface KCStatusCheckWindowController ()
15+
16+
17+@property (retain) NSDictionary *categoryList;
18+
19+@end
20+
21+@implementation KCStatusCheckWindowController
22+
23+- (id)init
24+{
25+ self = [super initWithWindowNibName:NSStringFromClass([self class])];
26+ if (self) {
27+ // Initialization code here.
28+
29+ NSString *path = [[NSBundle mainBundle] pathForResource:@"Category" ofType:@"plist"];
30+ _categoryList = [NSDictionary dictionaryWithContentsOfFile:path];
31+
32+ }
33+ return self;
34+}
35+
36+- (NSUndoManager *)windowWillReturnUndoManager:(NSWindow *)window
37+{
38+ return self.managedObjectContext.undoManager;
39+}
40+
41+- (NSManagedObjectContext *)managedObjectContext
42+{
43+ return ((HMAppDelegate *)[NSApp delegate]).managedObjectContext;
44+}
45+
46+- (IBAction)selectCategory:(id)sender
47+{
48+ NSPredicate *predicate = nil;
49+ NSInteger segment = [sender selectedSegment];
50+ NSString *label = [sender labelForSegment:segment];
51+
52+ NSDictionary *types = [self.categoryList objectForKey:label];
53+ if(types) {
54+ predicate = [NSPredicate predicateWithFormat:@"ship.type.name IN %@", types];
55+ }
56+
57+ [self.collectionShip setFetchPredicate:predicate];
58+}
59+
60+@end
--- /dev/null
+++ b/KanColleLevelManager/KCStatusCheckWindowController.xib
@@ -0,0 +1,236 @@
1+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
3+ <dependencies>
4+ <deployment defaultVersion="1070" identifier="macosx"/>
5+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
6+ </dependencies>
7+ <objects>
8+ <customObject id="-2" userLabel="File's Owner" customClass="KCStatusCheckWindowController">
9+ <connections>
10+ <outlet property="collectionShip" destination="b5h-Jc-6Om" id="sS5-7K-uIT"/>
11+ <outlet property="window" destination="1" id="3"/>
12+ </connections>
13+ </customObject>
14+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
15+ <customObject id="-3" userLabel="Application"/>
16+ <window title="Status Check" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" frameAutosaveName="StatusCheckWindow" animationBehavior="default" id="1">
17+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
18+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
19+ <rect key="contentRect" x="196" y="240" width="442" height="396"/>
20+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
21+ <view key="contentView" id="2">
22+ <rect key="frame" x="0.0" y="0.0" width="442" height="396"/>
23+ <autoresizingMask key="autoresizingMask"/>
24+ <subviews>
25+ <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YYD-QZ-qFG">
26+ <rect key="frame" x="18" y="329" width="359" height="24"/>
27+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
28+ <segmentedCell key="cell" alignment="left" style="rounded" trackingMode="selectOne" id="oVg-hy-vPm">
29+ <font key="font" metaFont="system"/>
30+ <segments>
31+ <segment label="All" selected="YES"/>
32+ <segment label="駆逐" tag="1"/>
33+ <segment label="軽巡"/>
34+ <segment label="重巡"/>
35+ <segment label="空母"/>
36+ <segment label="戦艦"/>
37+ <segment label="潜水"/>
38+ <segment label="他"/>
39+ </segments>
40+ </segmentedCell>
41+ <connections>
42+ <action selector="selectCategory:" target="-2" id="pdD-RT-7p2"/>
43+ </connections>
44+ </segmentedControl>
45+ <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QLy-gq-1iF">
46+ <rect key="frame" x="20" y="20" width="402" height="303"/>
47+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
48+ <clipView key="contentView" ambiguous="YES" misplaced="YES" id="BB6-OM-QHx">
49+ <rect key="frame" x="1" y="17" width="400" height="285"/>
50+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
51+ <subviews>
52+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveName="StatusCheckTable" headerView="Ac5-Ea-7UD" id="qTb-2Z-akc">
53+ <rect key="frame" x="0.0" y="0.0" width="400" height="285"/>
54+ <autoresizingMask key="autoresizingMask"/>
55+ <size key="intercellSpacing" width="3" height="2"/>
56+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
57+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
58+ <tableColumns>
59+ <tableColumn identifier="number" width="53.22265625" minWidth="40" maxWidth="1000" id="9kM-S7-PG4">
60+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="No.">
61+ <font key="font" metaFont="smallSystem"/>
62+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
63+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
64+ </tableHeaderCell>
65+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="gsV-E9-ZzX">
66+ <font key="font" metaFont="system"/>
67+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
68+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
69+ </textFieldCell>
70+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
71+ <connections>
72+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.ship.tranceformedNumber" id="1H0-co-VPd"/>
73+ </connections>
74+ </tableColumn>
75+ <tableColumn identifier="name" width="70.22265625" minWidth="40" maxWidth="1000" id="H0o-71-Eyn">
76+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
77+ <font key="font" metaFont="smallSystem"/>
78+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
79+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
80+ </tableHeaderCell>
81+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="ypW-kj-jGE">
82+ <font key="font" metaFont="system"/>
83+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
84+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
85+ </textFieldCell>
86+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
87+ <connections>
88+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.ship.name" id="fsa-Z3-EIY"/>
89+ </connections>
90+ </tableColumn>
91+ <tableColumn identifier="type" width="57.1796875" minWidth="10" maxWidth="3.4028234663852886e+38" id="bz2-RZ-VQV">
92+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Type">
93+ <font key="font" metaFont="smallSystem"/>
94+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
95+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
96+ </tableHeaderCell>
97+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="rCV-qz-NI2">
98+ <font key="font" metaFont="system"/>
99+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
100+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
101+ </textFieldCell>
102+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
103+ <connections>
104+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.ship.type.shortName" id="bSR-uw-sgK"/>
105+ </connections>
106+ </tableColumn>
107+ <tableColumn identifier="level" width="50.7890625" minWidth="10" maxWidth="3.4028234663852886e+38" id="wAU-Ce-6S6">
108+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Lv.">
109+ <font key="font" metaFont="smallSystem"/>
110+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
111+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
112+ </tableHeaderCell>
113+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="zBt-iy-iAw">
114+ <font key="font" metaFont="system"/>
115+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
116+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
117+ </textFieldCell>
118+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
119+ <connections>
120+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.level" id="Qar-q2-vmr"/>
121+ </connections>
122+ </tableColumn>
123+ <tableColumn identifier="fire" width="27.4375" minWidth="10" maxWidth="3.4028234663852886e+38" id="x4h-CV-N5b">
124+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Fire">
125+ <font key="font" metaFont="smallSystem"/>
126+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
127+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
128+ </tableHeaderCell>
129+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" controlSize="small" inset="2" id="Xds-64-k7n">
130+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
131+ <font key="font" metaFont="smallSystem"/>
132+ </buttonCell>
133+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
134+ <connections>
135+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.isMaxFire" id="N83-XU-9pe"/>
136+ </connections>
137+ </tableColumn>
138+ <tableColumn identifier="torpedo" width="29.62890625" minWidth="10" maxWidth="3.4028234663852886e+38" id="eRK-gb-dmn">
139+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Torpedo">
140+ <font key="font" metaFont="smallSystem"/>
141+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
142+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
143+ </tableHeaderCell>
144+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" controlSize="small" inset="2" id="3WV-w9-dnq">
145+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
146+ <font key="font" metaFont="smallSystem"/>
147+ </buttonCell>
148+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
149+ <connections>
150+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.isMaxTorpedo" id="S2O-Ww-tWn"/>
151+ </connections>
152+ </tableColumn>
153+ <tableColumn identifier="AA" width="25.19140625" minWidth="10" maxWidth="3.4028234663852886e+38" id="fen-R4-ehW">
154+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="AA">
155+ <font key="font" metaFont="smallSystem"/>
156+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
157+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
158+ </tableHeaderCell>
159+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" controlSize="small" inset="2" id="Nwc-Os-DCS">
160+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
161+ <font key="font" metaFont="smallSystem"/>
162+ </buttonCell>
163+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
164+ <connections>
165+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.isMaxAA" id="6jI-jS-Xx4"/>
166+ </connections>
167+ </tableColumn>
168+ <tableColumn identifier="Armor" width="31.21875" minWidth="10" maxWidth="3.4028234663852886e+38" id="gGd-5v-A5a">
169+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Armor">
170+ <font key="font" metaFont="smallSystem"/>
171+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
172+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
173+ </tableHeaderCell>
174+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" controlSize="small" inset="2" id="Hyk-tu-m6u">
175+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
176+ <font key="font" metaFont="smallSystem"/>
177+ </buttonCell>
178+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
179+ <connections>
180+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.isMaxArmor" id="b9S-lw-aiK"/>
181+ </connections>
182+ </tableColumn>
183+ <tableColumn identifier="Luck" width="28.87109375" minWidth="10" maxWidth="3.4028234663852886e+38" id="61F-bz-r7K">
184+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Luck">
185+ <font key="font" metaFont="smallSystem"/>
186+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
187+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
188+ </tableHeaderCell>
189+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" controlSize="small" inset="2" id="63r-9b-UwT">
190+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
191+ <font key="font" metaFont="smallSystem"/>
192+ </buttonCell>
193+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
194+ <connections>
195+ <binding destination="b5h-Jc-6Om" name="value" keyPath="arrangedObjects.isMaxLuck" id="uNS-av-a3f"/>
196+ </connections>
197+ </tableColumn>
198+ </tableColumns>
199+ </tableView>
200+ </subviews>
201+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
202+ </clipView>
203+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="T4y-Jm-CRM">
204+ <rect key="frame" x="1" y="1" width="0.0" height="16"/>
205+ <autoresizingMask key="autoresizingMask"/>
206+ </scroller>
207+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="JJo-O0-By2">
208+ <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
209+ <autoresizingMask key="autoresizingMask"/>
210+ </scroller>
211+ <tableHeaderView key="headerView" id="Ac5-Ea-7UD">
212+ <rect key="frame" x="0.0" y="0.0" width="400" height="17"/>
213+ <autoresizingMask key="autoresizingMask"/>
214+ </tableHeaderView>
215+ </scrollView>
216+ <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="175-sD-FkB">
217+ <rect key="frame" x="18" y="360" width="126" height="18"/>
218+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
219+ <buttonCell key="cell" type="check" title="最大の艦娘は隠す" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="NRl-Ed-dfv">
220+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
221+ <font key="font" size="13" name="AquaKana"/>
222+ </buttonCell>
223+ </button>
224+ </subviews>
225+ </view>
226+ <connections>
227+ <outlet property="delegate" destination="-2" id="4"/>
228+ </connections>
229+ </window>
230+ <arrayController mode="entity" entityName="CollectedShip" automaticallyPreparesContent="YES" id="b5h-Jc-6Om">
231+ <connections>
232+ <binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="2A8-bK-70W"/>
233+ </connections>
234+ </arrayController>
235+ </objects>
236+</document>
\ No newline at end of file
--- a/KanColleLevelManager/KanColleLevelManager.xcdatamodeld/.xccurrentversion
+++ b/KanColleLevelManager/KanColleLevelManager.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
33 <plist version="1.0">
44 <dict>
55 <key>_XCCurrentVersionName</key>
6- <string>KanColleLevelManager.xcdatamodel</string>
6+ <string>KanColleLevelManager2.xcdatamodel</string>
77 </dict>
88 </plist>
--- /dev/null
+++ b/KanColleLevelManager/KanColleLevelManager.xcdatamodeld/KanColleLevelManager2.xcdatamodel/contents
@@ -0,0 +1,52 @@
1+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="3401" systemVersion="13B42" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
3+ <entity name="Area" syncable="YES">
4+ <attribute name="id" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
5+ <attribute name="name" attributeType="String" indexed="YES" syncable="YES"/>
6+ <relationship name="plans" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Plan" inverseName="area" inverseEntity="Plan" syncable="YES"/>
7+ </entity>
8+ <entity name="CollectedShip" representedClassName="CollectedShip" syncable="YES">
9+ <attribute name="exp" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
10+ <attribute name="fleetNumber" optional="YES" attributeType="Integer 16" maxValueString="4" syncable="YES"/>
11+ <attribute name="fleetOrder" optional="YES" attributeType="Integer 16" maxValueString="6" syncable="YES"/>
12+ <attribute name="isMaxAA" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
13+ <attribute name="isMaxArmor" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
14+ <attribute name="isMaxFire" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
15+ <attribute name="isMaxLuck" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
16+ <attribute name="isMaxTorpedo" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
17+ <attribute name="level" optional="YES" transient="YES" attributeType="Integer 16" minValueString="1" syncable="YES"/>
18+ <attribute name="nextLevelExp" optional="YES" transient="YES" attributeType="Integer 16" minValueString="0" syncable="YES"/>
19+ <relationship name="ship" maxCount="1" deletionRule="Nullify" destinationEntity="Ship" inverseName="collection" inverseEntity="Ship" syncable="YES"/>
20+ </entity>
21+ <entity name="Plan" syncable="YES">
22+ <attribute name="account" optional="YES" attributeType="String" syncable="YES"/>
23+ <attribute name="areaExp" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
24+ <attribute name="level" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
25+ <attribute name="planName" attributeType="String" indexed="YES" syncable="YES"/>
26+ <attribute name="subAreaName" attributeType="String" syncable="YES"/>
27+ <relationship name="area" maxCount="1" deletionRule="Nullify" destinationEntity="Area" inverseName="plans" inverseEntity="Area" syncable="YES"/>
28+ </entity>
29+ <entity name="Ship" representedClassName="Ship" syncable="YES">
30+ <attribute name="imageURL" optional="YES" attributeType="Transformable" syncable="YES"/>
31+ <attribute name="name" attributeType="String" indexed="YES" syncable="YES"/>
32+ <attribute name="number" attributeType="Integer 16" syncable="YES"/>
33+ <attribute name="smallImageURL" optional="YES" attributeType="Transformable" syncable="YES"/>
34+ <attribute name="tranceformedNumber" optional="YES" transient="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
35+ <attribute name="updateLevel" optional="YES" attributeType="Integer 16" syncable="YES"/>
36+ <attribute name="updateNumber" optional="YES" attributeType="Integer 16" syncable="YES"/>
37+ <relationship name="collection" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="CollectedShip" inverseName="ship" inverseEntity="CollectedShip" syncable="YES"/>
38+ <relationship name="type" maxCount="1" deletionRule="Nullify" destinationEntity="ShipType" inverseName="ships" inverseEntity="ShipType" syncable="YES"/>
39+ </entity>
40+ <entity name="ShipType" syncable="YES">
41+ <attribute name="name" attributeType="String" syncable="YES"/>
42+ <attribute name="shortName" attributeType="String" syncable="YES"/>
43+ <relationship name="ships" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Ship" inverseName="type" inverseEntity="Ship" syncable="YES"/>
44+ </entity>
45+ <elements>
46+ <element name="Area" positionX="0" positionY="0" width="0" height="0"/>
47+ <element name="CollectedShip" positionX="0" positionY="0" width="0" height="0"/>
48+ <element name="Plan" positionX="0" positionY="0" width="0" height="0"/>
49+ <element name="Ship" positionX="0" positionY="0" width="0" height="0"/>
50+ <element name="ShipType" positionX="0" positionY="0" width="0" height="0"/>
51+ </elements>
52+</model>
\ No newline at end of file