From 3c3d44aa90e52b92c157602c520b98fc254ff4b2 Mon Sep 17 00:00:00 2001 From: Killery Date: Tue, 12 May 2015 06:53:49 +0900 Subject: [PATCH] =?utf8?q?=E3=81=A1=E3=82=87=E3=81=93=E3=81=A3=E3=81=A8?= =?utf8?q?=E8=B6=B3=E3=82=8A=E3=81=AA=E3=81=84=E3=81=A8=E3=81=93=E3=82=8D?= =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Awars III/MapView.m | 82 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/Awars III/MapView.m b/Awars III/MapView.m index 02c933e..b2dcafe 100755 --- a/Awars III/MapView.m +++ b/Awars III/MapView.m @@ -606,7 +606,7 @@ NSArray *array3 = [[fileDataArray objectAtIndex:i] componentsSeparatedByString:@"◆"]; NSString *string2 = [NSString stringWithFormat:@"%@◆", [array3 objectAtIndex:0]]; NSRange rangeSearch2 = [[fileDataArray objectAtIndex:i] rangeOfString:string2]; - + int pussyCnt = 0; if (rangeSearch.location == !NSNotFound) { @@ -679,6 +679,8 @@ } if (rangeSearch2.location == !NSNotFound) { + pussyCnt = 0; + if(asdflag){ MS.D->SCRPT = [NSMutableArray new]; @@ -758,6 +760,33 @@ [MS.D->SCRPT addObject:[NSString stringWithFormat:@"◆スイッチの操作%@", string]]; } + if(MS.D->P->type == 6){ + MS.D->P->indent = indent; + + NSArray *items10 = [[items9 objectAtIndex:0] componentsSeparatedByString:@","]; + + MS.D->P->timerFlag = true; + MS.D->P->timerMin = [[items10 objectAtIndex:0] intValue]; + MS.D->P->timerSec = [[items10 objectAtIndex:1] intValue]; + MS.D->P->timerRun = [[items10 objectAtIndex:2] intValue]; + MS.D->P->timerMode = [[items10 objectAtIndex:3] intValue]; + MS.D->P->timerVisible = [[items10 objectAtIndex:4] intValue]; + + [MS.D->SCRPT addObject:[NSString stringWithFormat:@"◆タイマーの操作"]]; + + NSString *timerRun; + if(MS.D->P->timerRun) timerRun = [@"始動" retain]; + else timerRun = [@"停止" retain]; + NSString *timerMode; + if(MS.D->P->timerMode) timerMode = [@"足す" retain]; + else timerMode = [@"引く" retain]; + NSString *timerVisible; + if(MS.D->P->timerVisible) timerVisible = [@"表示" retain]; + else timerVisible = [@"非表示" retain]; + + if(![MS.D->P->label isEqualToString:@""]) + [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%d分%d秒　%@　%@　%@",MS.D->P->timerMin, MS.D->P->timerSec, timerRun, timerMode, timerVisible]]; + } if(MS.D->P->type == 7){ MS.D->P->indent = indent; @@ -778,28 +807,27 @@ MS.D->P->memo = [[items9 objectAtIndex:0] retain]; [MS.D->SCRPT addObject:[NSString stringWithFormat:@"◆注釈"]]; - if(![MS.D->P->memo isEqualToString:@""]) - [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", MS.D->P->memo]]; } scriptIndex++; //continue; }else{ - + if(MS.D){ {if(MS.D->P) - {if(MS.D->P->type == 0){ - { if(!MS.D->P->S1.str) { - MS.D->P->S1.str = @""; + { + if(MS.D->P->type == 0){ + + { + if(!MS.D->P->S1.str) {MS.D->P->S1.str = @""; } NSString *string = @""; string = [[string stringByAppendingFormat:@"%@", [fileDataArray objectAtIndex:i]] retain]; if([string isEqualToString:@""]) continue; MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingString:string] retain]; - MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingFormat:@"\n"] retain]; + if(pussyCnt > 0) MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingFormat:@"\n"] retain]; if(![string isEqualToString:@""]) - [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]]; - + [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]];pussyCnt++; } }if(MS.D->P->type == 3){ NSString *string = @""; @@ -823,7 +851,23 @@ } } [MS.D->SCRPT addObject:[NSString stringWithString:string]]; + + }if(MS.D->P->type == 9){ + + { + if(!MS.D->P->memo) {MS.D->P->memo = @""; + } + NSString *string = @""; + string = [[string stringByAppendingFormat:@"%@", [fileDataArray objectAtIndex:i]] retain]; + if([string isEqualToString:@""]) continue; + MS.D->P->memo = [[MS.D->P->memo stringByAppendingString:string] retain]; + if(pussyCnt > 0) MS.D->P->memo = [[MS.D->P->memo stringByAppendingFormat:@"\n"] retain]; + if(![string isEqualToString:@""]) + [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]]; + pussyCnt++; + } } + } } }scriptIndex++; @@ -1033,18 +1077,24 @@ if(*(MS.D->P->switch2 + i + 1) > 0) fileData = [fileData stringByAppendingFormat:@","]; } fileData = [fileData stringByAppendingFormat:@"\n"]; + }if(MS.D->P->type == 6){ + fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent]; + fileData = [fileData stringByAppendingFormat:@"◆6\n"]; + fileData = [fileData stringByAppendingFormat:@"%d, %d,", MS.D->P->timerMin, MS.D->P->timerSec]; + fileData = [fileData stringByAppendingFormat:@"%d, %d, %d\n", MS.D->P->timerRun, MS.D->P->timerMode, MS.D->P->timerVisible]; + }if(MS.D->P->type == 7){ fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent]; - fileData = [fileData stringByAppendingFormat:@"◆7/n"]; - fileData = [fileData stringByAppendingFormat:@"%@/n", MS.D->P->label]; + fileData = [fileData stringByAppendingFormat:@"◆7\n"]; + fileData = [fileData stringByAppendingFormat:@"%@\n", MS.D->P->label]; }if(MS.D->P->type == 8){ fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent]; - fileData = [fileData stringByAppendingFormat:@"◆8/n"]; - fileData = [fileData stringByAppendingFormat:@"%@/n", MS.D->P->labelJump]; + fileData = [fileData stringByAppendingFormat:@"◆8\n"]; + fileData = [fileData stringByAppendingFormat:@"%@\n", MS.D->P->labelJump]; }if(MS.D->P->type == 9){ fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent]; - fileData = [fileData stringByAppendingFormat:@"◆9/n"]; - fileData = [fileData stringByAppendingFormat:@"%@/n", MS.D->P->memo]; + fileData = [fileData stringByAppendingFormat:@"◆9\n"]; + fileData = [fileData stringByAppendingFormat:@"%@\n", MS.D->P->memo]; } MS.D->P = MS.D->P->next; } -- 2.11.0