From: masakih Date: Wed, 3 Sep 2014 11:39:53 +0000 (+0900) Subject: 高速修復材を使用した際にすぐに艦娘の耐久値を抗す新するようにした X-Git-Tag: 1.0beta23~11 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5024aaf3320818b90b4c021bbb574f720ca4181e;p=kcd%2FKCD.git 高速修復材を使用した際にすぐに艦娘の耐久値を抗す新するようにした #50325 close --- diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index 049cd6ec..45905aff 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -50,6 +50,7 @@ F49828FC1902A226000D6BBE /* HMStrokeTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F49828FB1902A226000D6BBE /* HMStrokeTextFieldCell.m */; }; F4A3AD82199F529700FDBF80 /* HMCombinedBattleCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A3AD81199F529700FDBF80 /* HMCombinedBattleCommand.m */; }; F4A3AD8519B0CAB700FDBF80 /* HMPlanToShowsBoldFontTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A3AD8419B0CAB700FDBF80 /* HMPlanToShowsBoldFontTransformer.m */; }; + F4A3AD8819B6149D00FDBF80 /* HMNyukyoStartCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A3AD8719B6149D00FDBF80 /* HMNyukyoStartCommand.m */; }; F4AA05FB192B92C800844688 /* Temporary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F4AA05F9192B92C700844688 /* Temporary.xcdatamodeld */; }; F4AA05FE192B932E00844688 /* HMTemporaryDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA05FD192B932E00844688 /* HMTemporaryDataStore.m */; }; F4AA0601192E1FE900844688 /* HMBattleCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA0600192E1FE900844688 /* HMBattleCommand.m */; }; @@ -212,6 +213,8 @@ F4A3AD81199F529700FDBF80 /* HMCombinedBattleCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCombinedBattleCommand.m; sourceTree = ""; }; F4A3AD8319B0CAB700FDBF80 /* HMPlanToShowsBoldFontTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMPlanToShowsBoldFontTransformer.h; sourceTree = ""; }; F4A3AD8419B0CAB700FDBF80 /* HMPlanToShowsBoldFontTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMPlanToShowsBoldFontTransformer.m; sourceTree = ""; }; + F4A3AD8619B6149D00FDBF80 /* HMNyukyoStartCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMNyukyoStartCommand.h; sourceTree = ""; }; + F4A3AD8719B6149D00FDBF80 /* HMNyukyoStartCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMNyukyoStartCommand.m; sourceTree = ""; }; F4AA05FA192B92C800844688 /* Temporary.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Temporary.xcdatamodel; sourceTree = ""; }; F4AA05FC192B932E00844688 /* HMTemporaryDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMTemporaryDataStore.h; sourceTree = ""; }; F4AA05FD192B932E00844688 /* HMTemporaryDataStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMTemporaryDataStore.m; sourceTree = ""; }; @@ -643,6 +646,8 @@ F4268033195332A000B2C27F /* HMPowerUpCommand.m */, F43BA4A5197CD59400CFF788 /* HMNyukyoSpeedChangeCommand.h */, F43BA4A6197CD59400CFF788 /* HMNyukyoSpeedChangeCommand.m */, + F4A3AD8619B6149D00FDBF80 /* HMNyukyoStartCommand.h */, + F4A3AD8719B6149D00FDBF80 /* HMNyukyoStartCommand.m */, ); name = Command; sourceTree = ""; @@ -830,6 +835,7 @@ F4E7802B18DC3A820011BC4C /* HMLocalDataStore.m in Sources */, F494DC6718C8BA6400AE97E4 /* HMPowerUpSupportViewController.m in Sources */, F43BA4A7197CD59400CFF788 /* HMNyukyoSpeedChangeCommand.m in Sources */, + F4A3AD8819B6149D00FDBF80 /* HMNyukyoStartCommand.m in Sources */, F494DC6318C608C100AE97E4 /* HMShipViewController.m in Sources */, F46F104918ABAC910063E503 /* KCD.xcdatamodeld in Sources */, F4B414FE18B3A66200468DAF /* HMMemberNDockCommand.m in Sources */, diff --git a/KCD/HMNyukyoSpeedChangeCommand.m b/KCD/HMNyukyoSpeedChangeCommand.m index d1b034a9..37b5cfd3 100644 --- a/KCD/HMNyukyoSpeedChangeCommand.m +++ b/KCD/HMNyukyoSpeedChangeCommand.m @@ -44,7 +44,26 @@ } id dock = array[0]; + + NSString *shipId = [dock valueForKey:@"ship_id"]; + [dock setValue:nil forKey:@"ship_id"]; [dock setValue:@(0) forKey:@"state"]; + + + // 艦隊リスト更新用 + error = nil; + array = [store objectsWithEntityName:@"Ship" + error:&error + predicateFormat:@"id = %@", @([shipId integerValue])]; + if(array.count == 0) { + if(error) { + NSLog(@"Error: at %@ : %@", NSStringFromClass([self class]), error); + } + return; + } + + id ship = array[0]; + [ship setValue:[ship valueForKey:@"maxhp"] forKey:@"nowhp"]; } @end diff --git a/KCD/HMNyukyoStartCommand.h b/KCD/HMNyukyoStartCommand.h new file mode 100644 index 00000000..f3a3a847 --- /dev/null +++ b/KCD/HMNyukyoStartCommand.h @@ -0,0 +1,13 @@ +// +// HMNyukyoStartCommand.h +// KCD +// +// Created by Hori,Masaki on 2014/09/03. +// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. +// + +#import "HMJSONCommand.h" + +@interface HMNyukyoStartCommand : HMJSONCommand + +@end diff --git a/KCD/HMNyukyoStartCommand.m b/KCD/HMNyukyoStartCommand.m new file mode 100644 index 00000000..268670b6 --- /dev/null +++ b/KCD/HMNyukyoStartCommand.m @@ -0,0 +1,54 @@ +// +// HMNyukyoStartCommand.m +// KCD +// +// Created by Hori,Masaki on 2014/09/03. +// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. +// + +#import "HMNyukyoStartCommand.h" + +#import "HMServerDataStore.h" + + +@implementation HMNyukyoStartCommand ++ (void)load +{ + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + [HMJSONCommand registerClass:self]; + }); +} + ++ (BOOL)canExcuteAPI:(NSString *)api +{ + if([api isEqualToString:@"/kcsapi/api_req_nyukyo/start"]) return YES; + + return NO; +} +- (void)execute +{ + id obj = self.arguments[@"api_highspeed"]; + if(!obj) return; + if(![obj boolValue]) return; + + + HMServerDataStore *store = [HMServerDataStore oneTimeEditor]; + + NSString *shipId = self.arguments[@"api_ship_id"]; + + NSError *error = nil; + NSArray *array = [store objectsWithEntityName:@"Ship" + error:&error + predicateFormat:@"id = %@", @([shipId integerValue])]; + if(array.count == 0) { + if(error) { + NSLog(@"Error: at %@ : %@", NSStringFromClass([self class]), error); + } + return; + } + + id ship = array[0]; + [ship setValue:[ship valueForKey:@"maxhp"] forKey:@"nowhp"]; +} +@end