提交: 8e13706711d79cb09d2cceed0f792adfdf2895b5 - KanColleLevelManager (git)

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

Commit MetaInfo

• 修订版: 8e13706711d79cb09d2cceed0f792adfdf2895b5 (tree)
• 时间: 2013-11-10 22:26:40
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

艦娘の10000以上のダミーナンバーを表示しないようにした

更改概述

• modified: KanColleLevelManager.xcodeproj/project.pbxproj
• modified: KanColleLevelManager/KCCollectionWindowController.xib
• modified: KanColleLevelManager/KCFleetWindowController.xib
• modified: KanColleLevelManager/KanColleLevelManager.xcdatamodeld/KanColleLevelManager.xcdatamodel/contents
• add: KanColleLevelManager/Ship.h
• add: KanColleLevelManager/Ship.m

差异

--- a/KanColleLevelManager.xcodeproj/project.pbxproj
+++ b/KanColleLevelManager.xcodeproj/project.pbxproj
@@ -43,6 +43,7 @@
 		F4837E18181BEEFA003E879C /* KCFleetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4837E16181BEEFA003E879C /* KCFleetViewController.m */; };
 		F4837E19181BEEFA003E879C /* KCFleetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4837E17181BEEFA003E879C /* KCFleetViewController.xib */; };
 		F4837E1B181CF395003E879C /* BattleArea.plist in Resources */ = {isa = PBXBuildFile; fileRef = F4837E1A181CF395003E879C /* BattleArea.plist */; };
+		F4BA7F18182FB8C500B37348 /* Ship.m in Sources */ = {isa = PBXBuildFile; fileRef = F4BA7F17182FB8C500B37348 /* Ship.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -110,6 +111,8 @@
 		F4837E16181BEEFA003E879C /* KCFleetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCFleetViewController.m; sourceTree = "<group>"; };
 		F4837E17181BEEFA003E879C /* KCFleetViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KCFleetViewController.xib; sourceTree = "<group>"; };
 		F4837E1A181CF395003E879C /* BattleArea.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = BattleArea.plist; sourceTree = "<group>"; };
+		F4BA7F16182FB8C500B37348 /* Ship.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ship.h; sourceTree = "<group>"; };
+		F4BA7F17182FB8C500B37348 /* Ship.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Ship.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -182,6 +185,8 @@
 				F448271118292C01000F1CC2 /* KCDataImporter.m */,
 				F457DDB7180BB1C500885A7F /* Images.xcassets */,
 				F457DDB4180BB1C500885A7F /* KanColleLevelManager.xcdatamodeld */,
+				F4BA7F16182FB8C500B37348 /* Ship.h */,
+				F4BA7F17182FB8C500B37348 /* Ship.m */,
 				F4837DED180C33B6003E879C /* CollectedShip.h */,
 				F4837DEE180C33B6003E879C /* CollectedShip.m */,
 				F4837DFE181362C0003E879C /* KCFleet.h */,
@@ -366,6 +371,7 @@
 				F4837DF5180D9454003E879C /* KCCollectionWindowController.m in Sources */,
 				F4837E13181BEBBB003E879C /* KCBattleWindowController.m in Sources */,
 				F4837E0918169955003E879C /* KCShipViewController.m in Sources */,
+				F4BA7F18182FB8C500B37348 /* Ship.m in Sources */,
 				F457DDA9180BB1C500885A7F /* main.m in Sources */,
 				F457DDB0180BB1C500885A7F /* HMAppDelegate.m in Sources */,
 				F457DDB6180BB1C500885A7F /* KanColleLevelManager.xcdatamodeld in Sources */,

--- a/KanColleLevelManager/KCCollectionWindowController.xib
+++ b/KanColleLevelManager/KCCollectionWindowController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KCCollectionWindowController">
@@ -60,7 +60,11 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="TYb-36-xds" name="value" keyPath="arrangedObjects.ship.number" id="jDS-N6-J8T"/>
+                                                <binding destination="TYb-36-xds" name="value" keyPath="arrangedObjects.ship.tranceformedNumber" id="k1J-v0-1fi">
+                                                    <dictionary key="options">
+                                                        <bool key="NSConditionallySetsEditable" value="YES"/>
+                                                    </dictionary>
+                                                </binding>
                                             </connections>
                                         </tableColumn>
                                         <tableColumn width="40" minWidth="40" maxWidth="1000" id="C4m-LV-Pev">
@@ -152,11 +156,11 @@
                             </subviews>
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="22X-QW-GfI">
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="22X-QW-GfI">
                             <rect key="frame" x="1" y="458" width="413" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" id="8sN-BA-7hO">
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="8sN-BA-7hO">
                             <rect key="frame" x="398" y="17" width="16" height="457"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
@@ -192,7 +196,11 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="lhJ-Yl-dOi" name="value" keyPath="arrangedObjects.number" id="lyG-ne-F02"/>
+                                                <binding destination="lhJ-Yl-dOi" name="value" keyPath="arrangedObjects.number" id="OjG-PY-3lB">
+                                                    <dictionary key="options">
+                                                        <bool key="NSConditionallySetsEditable" value="YES"/>
+                                                    </dictionary>
+                                                </binding>
                                             </connections>
                                         </tableColumn>
                                         <tableColumn editable="NO" width="83.04296875" minWidth="40" maxWidth="1000" id="Wxc-AK-VCT">
@@ -232,11 +240,11 @@
                             </subviews>
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="kEq-U1-hrW">
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="kEq-U1-hrW">
                             <rect key="frame" x="1" y="458" width="252" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" id="lUx-nW-wCM">
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="lUx-nW-wCM">
                             <rect key="frame" x="237" y="17" width="16" height="457"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>

--- a/KanColleLevelManager/KCFleetWindowController.xib
+++ b/KanColleLevelManager/KCFleetWindowController.xib
@@ -51,7 +51,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="XkY-x3-PYP" name="value" keyPath="arrangedObjects.ship.number" id="kV3-aV-Ird"/>
+                                                <binding destination="XkY-x3-PYP" name="value" keyPath="arrangedObjects.ship.tranceformedNumber" id="rv8-0r-tzw"/>
                                             </connections>
                                         </tableColumn>
                                         <tableColumn width="70.22265625" minWidth="40" maxWidth="1000" id="sqg-Ah-fkU">

--- a/KanColleLevelManager/KanColleLevelManager.xcdatamodeld/KanColleLevelManager.xcdatamodel/contents
+++ b/KanColleLevelManager/KanColleLevelManager.xcdatamodeld/KanColleLevelManager.xcdatamodel/contents
@@ -21,11 +21,12 @@
         <attribute name="subAreaName" attributeType="String" syncable="YES"/>
         <relationship name="area" maxCount="1" deletionRule="Nullify" destinationEntity="Area" inverseName="plans" inverseEntity="Area" syncable="YES"/>
     </entity>
-    <entity name="Ship" syncable="YES">
+    <entity name="Ship" representedClassName="Ship" syncable="YES">
         <attribute name="imageURL" optional="YES" attributeType="Transformable" syncable="YES"/>
         <attribute name="name" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="number" attributeType="Integer 16" syncable="YES"/>
         <attribute name="smallImageURL" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="tranceformedNumber" optional="YES" transient="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
         <attribute name="updateLevel" optional="YES" attributeType="Integer 16" syncable="YES"/>
         <attribute name="updateNumber" optional="YES" attributeType="Integer 16" syncable="YES"/>
         <relationship name="collection" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="CollectedShip" inverseName="ship" inverseEntity="CollectedShip" syncable="YES"/>

--- /dev/null
+++ b/KanColleLevelManager/Ship.h
@@ -0,0 +1,34 @@
+//
+//  Ship.h
+//  KanColleLevelManager
+//
+//  Created by Hori,Masaki on 2013/11/10.
+//  Copyright (c) 2013年 Hori,Masaki. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@class CollectedShip;
+
+@interface Ship : NSManagedObject
+
+@property (nonatomic, retain) id imageURL;
+@property (nonatomic, retain) NSString * name;
+@property (nonatomic, retain) NSNumber * number;
+@property (nonatomic, retain) id smallImageURL;
+@property (nonatomic, retain) NSNumber * updateLevel;
+@property (nonatomic, retain) NSNumber * updateNumber;
+@property (readonly) NSNumber * tranceformedNumber;
+@property (nonatomic, retain) NSSet *collection;
+@property (nonatomic, retain) NSManagedObject *type;
+@end
+
+@interface Ship (CoreDataGeneratedAccessors)
+
+- (void)addCollectionObject:(CollectedShip *)value;
+- (void)removeCollectionObject:(CollectedShip *)value;
+- (void)addCollection:(NSSet *)values;
+- (void)removeCollection:(NSSet *)values;
+
+@end

--- /dev/null
+++ b/KanColleLevelManager/Ship.m
@@ -0,0 +1,34 @@
+//
+//  Ship.m
+//  KanColleLevelManager
+//
+//  Created by Hori,Masaki on 2013/11/10.
+//  Copyright (c) 2013年 Hori,Masaki. All rights reserved.
+//
+
+#import "Ship.h"
+#import "CollectedShip.h"
+
+
+@implementation Ship
+
+@dynamic imageURL;
+@dynamic name;
+@dynamic number;
+@dynamic smallImageURL;
+@dynamic updateLevel;
+@dynamic updateNumber;
+@dynamic collection;
+@dynamic type;
+
+
+- (NSNumber *)tranceformedNumber
+{
+	NSNumber *number = self.number;
+	if(NSOrderedDescending == [number compare:@(10000)]) {
+		return @([number integerValue] - 10000);
+	}
+	return number;
+}
+
+@end