• R/O
  • HTTP
  • SSH
  • HTTPS

AwarsIV: 提交

AwarsIVのリポジトリです


Commit MetaInfo

修订版8b7aeee4537ad0c2cdce62db66750d5b3099eac4 (tree)
时间2016-08-02 08:08:35
作者Killery <Killery@kiri...>
CommiterKillery

Log Message

細かなバグを修正

更改概述

差异

--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -717,7 +717,7 @@ typedef struct _MAPSCRIPT7B{
717717
718718 typedef struct _MAPSCRIPT7{
719719
720- bool type;
720+ int type;
721721 bool maxFlag;
722722 bool percentFlag;
723723 bool extendFlag;
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -7047,7 +7047,7 @@ ahhh:{}
70477047 }
70487048 [bplayer1 setImage:U->C.imgb];
70497049 [bplayer1 setImageScaling:NSScaleToFit];
7050- [nplayer1 setStringValue:U->C.name];
7050+ [nplayer1 setStringValue:U->C.nameNick];
70517051 [tplayer1 setStringValue:[NSString stringWithFormat:@"HP %g/%g", U->C.S_C.HP, U->C.S_M.HP]];
70527052 [lplayer1 setIntValue:U->C.S_C.HP/U->C.S_M.HP*100];
70537053 [iplayer1 setImage:MC[chipNum[U->x][U->y]].img];
@@ -7063,7 +7063,7 @@ ahhh:{}
70637063 }
70647064 [bplayer2 setImage:U->C.imgb];
70657065 [bplayer1 setImageScaling:NSScaleToFit];
7066- [nplayer2 setStringValue:U->C.name];
7066+ [nplayer2 setStringValue:U->C.nameNick];
70677067 [tplayer2 setStringValue:[NSString stringWithFormat:@"HP %g/%g", U->C.S_C.HP, U->C.S_M.HP]];
70687068 [lplayer2 setIntValue:U->C.S_C.HP/U->C.S_M.HP*100];
70697069 [iplayer2 setImage:MC[chipNum[U->x][U->y]].img];
@@ -9107,7 +9107,7 @@ ahhh:{}
91079107 || (btAttackType1 == BT_TYPE_MAGIC && btAttackMoveValue1 < 5)
91089108 || (btAttackType1 == BT_TYPE_ABILITY && btAttackMoveValue1 < 2)){
91099109
9110- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.name, U->C.A->name]];
9110+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.nameNick, U->C.A->name]];
91119111
91129112 [battleDialog setStringValue:message];
91139113 U->C.A = aTop;
@@ -9127,12 +9127,12 @@ ahhh:{}
91279127 return;
91289128 }
91299129
9130- if(!battleDef1Flag && !battleDod1Flag) message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.name, U->C.A->name]];
9130+ if(!battleDef1Flag && !battleDod1Flag) message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.nameNick, U->C.A->name]];
91319131
91329132
91339133 [bplayer2 setImage:U2->C.imgb];
91349134 [bplayer2 setImageScaling:NSScaleToFit];
9135- [nplayer2 setStringValue:U2->C.name];
9135+ [nplayer2 setStringValue:U2->C.nameNick];
91369136 [tplayer2 setStringValue:[NSString stringWithFormat:@"HP %g/%g", U2->C.S_C.HP, U2->C.S_M.HP]];
91379137 [lplayer2 setIntValue:U2->C.S_C.HP/U2->C.S_M.HP*100];
91389138 [iplayer2 setImage:MC[chipNum[U2->x][U2->y]].img];
@@ -9177,6 +9177,7 @@ ahhh:{}
91779177
91789178 if(AVpreview) {
91799179 AVPV.player = [AVpreview retain];
9180+ AVPV.videoGravity = AVLayerVideoGravityResize;
91809181 }else{
91819182 goto avAWESOME;
91829183 }
@@ -9440,17 +9441,17 @@ ahhh:{}
94409441 if(![U2A->msg isEqualToString:@""]){
94419442
94429443 message = [message stringByAppendingString:[NSString stringWithFormat:@"%@\n",
9443- [self originalMessage:U2A->msg subj:U2->C.name obje:U->C.name]]];
9444+ [self originalMessage:U2A->msg subj:U2->C.nameNick obje:U->C.nameNick]]];
94449445
94459446 }
94469447
94479448 if(grazeFlag) message = [message stringByAppendingString:[NSString stringWithFormat:@"かすりヒット!\n"]];
94489449 if(!healFlag) {
9449- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は%gのダメージを受けた!", U->C.name, dmg]];
9450+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は%gのダメージを受けた!", U->C.nameNick, dmg]];
94509451 btHitFlag1 = true;
94519452 }
94529453 else {
9453- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@はHPが%g回復した!", U->C.name, dmg]];
9454+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@はHPが%g回復した!", U->C.nameNick, dmg]];
94549455 btHitFlag1 = false;
94559456 }
94569457 }else if(battleDef1Flag){
@@ -9462,7 +9463,7 @@ ahhh:{}
94629463 }
94639464
94649465
9465- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は身構えている", U->C.name]];
9466+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は身構えている", U->C.nameNick]];
94669467
94679468 btHitFlag1 = false;
94689469
@@ -9473,12 +9474,12 @@ ahhh:{}
94739474 U = U->next;
94749475 }
94759476
9476- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は様子をうかがっている", U->C.name]];
9477+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は様子をうかがっている", U->C.nameNick]];
94779478
94789479 btHitFlag1 = false;
94799480 }else{
94809481
9481- message = [message stringByAppendingString:[NSString stringWithFormat:@"ミス!%@はダメージを受けていない!", U->C.name]];
9482+ message = [message stringByAppendingString:[NSString stringWithFormat:@"ミス!%@はダメージを受けていない!", U->C.nameNick]];
94829483 btHitFlag1 = false;
94839484
94849485 }
@@ -9721,7 +9722,7 @@ ahhh:{}
97219722 || (btAttackType2 == BT_TYPE_ABILITY && btAttackMoveValue2 < 2)){
97229723
97239724
9724- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.name, U->C.A->name]];
9725+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.nameNick, U->C.A->name]];
97259726
97269727 [battleDialog setStringValue:message];
97279728 U->C.A = aTop2;
@@ -9730,7 +9731,7 @@ ahhh:{}
97309731 return;
97319732 }
97329733
9733- if(!battleDef2Flag && !battleDod2Flag) message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.name, U->C.A->name]];
9734+ if(!battleDef2Flag && !battleDod2Flag) message = [message stringByAppendingString:[NSString stringWithFormat:@"%@の%@\n", U->C.nameNick, U->C.A->name]];
97349735
97359736 if(!battleDef1Flag && !battleDod1Flag && !avPlayerFlag2 && ![U->C.A->AN.movName isEqualToString:@""] && ![U->C.A->AN.movName isEqualToString:@"(null)"] && U->C.A->AN.movName != NULL){
97369737 [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent]];
@@ -9748,6 +9749,7 @@ ahhh:{}
97489749
97499750 if(AVpreview) {
97509751 AVPV.player = [AVpreview retain];
9752+ AVPV.videoGravity = AVLayerVideoGravityResize;
97519753 }else{
97529754 goto avAWESOME2;
97539755 }
@@ -10029,7 +10031,7 @@ ahhh:{}
1002910031
1003010032 if(![U2A->msg isEqualToString:@""]){
1003110033 message = [message stringByAppendingString:[NSString stringWithFormat:@"%@\n",
10032- [self originalMessage:U2A->msg subj:U2->C.name obje:U->C.name]]];
10034+ [self originalMessage:U2A->msg subj:U2->C.nameNick obje:U->C.nameNick]]];
1003310035 }
1003410036
1003510037
@@ -10037,7 +10039,7 @@ ahhh:{}
1003710039 if(grazeFlag)
1003810040 message = [message stringByAppendingString:[NSString stringWithFormat:@"かすりヒット!\n"]];
1003910041
10040- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は%gのダメージを受けた!", U->C.name, dmg]];
10042+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は%gのダメージを受けた!", U->C.nameNick, dmg]];
1004110043 btHitFlag2 = true;
1004210044
1004310045 }else if(battleDef2Flag){
@@ -10049,7 +10051,7 @@ ahhh:{}
1004910051 }
1005010052
1005110053
10052- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は身構えている", U->C.name]];
10054+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は身構えている", U->C.nameNick]];
1005310055 btHitFlag2 = false;
1005410056
1005510057 }else if(battleDod2Flag){
@@ -10059,12 +10061,12 @@ ahhh:{}
1005910061 U = U->next;
1006010062 }
1006110063
10062- message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は様子をうかがっている", U->C.name]];
10064+ message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は様子をうかがっている", U->C.nameNick]];
1006310065
1006410066 btHitFlag2 = false;
1006510067 }else{
1006610068
10067- message = [message stringByAppendingString:[NSString stringWithFormat:@"ミス!%@はダメージを受けていない!", U->C.name]];
10069+ message = [message stringByAppendingString:[NSString stringWithFormat:@"ミス!%@はダメージを受けていない!", U->C.nameNick]];
1006810070 btHitFlag2 = false;
1006910071 }
1007010072 SKIP1:
@@ -10233,6 +10235,7 @@ ahhh:{}
1023310235
1023410236 if(AVpreview) {
1023510237 AVPV.player = [AVpreview retain];
10238+ AVPV.videoGravity = AVLayerVideoGravityResize;
1023610239 }else{
1023710240 goto avAWESOME1A;
1023810241 }
@@ -10562,6 +10565,7 @@ avAWESOME1A:{}
1056210565
1056310566 if(AVpreview) {
1056410567 AVPV.player = [AVpreview retain];
10568+ AVPV.videoGravity = AVLayerVideoGravityResize;
1056510569 }else{
1056610570 goto avAWESOME1B;
1056710571 }
@@ -10857,6 +10861,7 @@ SKIP1:
1085710861
1085810862 if(AVpreview) {
1085910863 AVPV.player = [AVpreview retain];
10864+ AVPV.videoGravity = AVLayerVideoGravityResize;
1086010865 }else{
1086110866 goto avAWESOME2A;
1086210867 }
@@ -11201,6 +11206,7 @@ avAWESOME2A:{}
1120111206
1120211207 if(AVpreview) {
1120311208 AVPV.player = [AVpreview retain];
11209+ AVPV.videoGravity = AVLayerVideoGravityResize;
1120411210 }else{
1120511211 goto avAWESOME2B;
1120611212 }
@@ -11546,6 +11552,7 @@ SKIP1:
1154611552
1154711553 if(AVpreview) {
1154811554 AVPV.player = [AVpreview retain];
11555+ AVPV.videoGravity = AVLayerVideoGravityResize;
1154911556 }else{
1155011557 goto avAWESOME3A;
1155111558 }
@@ -11922,6 +11929,7 @@ avAWESOME3A:{}
1192211929
1192311930 if(AVpreview) {
1192411931 AVPV.player = [AVpreview retain];
11932+ AVPV.videoGravity = AVLayerVideoGravityResize;
1192511933 }else{
1192611934 goto avAWESOME3B;
1192711935 }
--- a/Awars III/MapEditor.m
+++ b/Awars III/MapEditor.m
@@ -408,7 +408,7 @@
408408 [topIV setImage:UC[SLindexU].imgb];
409409 [topIV setImageScaling:NSScaleToFit];
410410
411- [topName setStringValue:[NSString stringWithFormat:@"%@", UC[SLindexU].name]];
411+ [topName setStringValue:[NSString stringWithFormat:@"%@", UC[SLindexU].nameNick]];
412412
413413 [topHealth setStringValue:[NSString stringWithFormat:@"HP %g", UC[SLindexU].S_M.HP]];
414414 }else if(SLSx == 3){
--- a/Awars III/UnitChipList.h
+++ b/Awars III/UnitChipList.h
@@ -399,6 +399,7 @@ bool ATalphaFlag;
399399
400400 bool attackEffectPreviewBtnFlag;
401401
402+bool aniSelectedFlag;
402403
403404 @interface UnitChipList : NSObject
404405 {
@@ -811,7 +812,7 @@ bool attackEffectPreviewBtnFlag;
811812
812813
813814
814-
815+-(void)alphaFlagBtnFunc;
815816
816817 -(void)aniTFChanged;
817818 @end
@@ -831,5 +832,10 @@ UnitChipList *UnitChipListInst;
831832 int imgGy;
832833
833834 }
835+
836+-(void)EventLoopAN:(NSTimer*)timer;
837+
834838 @end
835839
840+UnitChipListEV *unitChipListEVInst;
841+
--- a/Awars III/UnitChipList.m
+++ b/Awars III/UnitChipList.m
@@ -1019,6 +1019,10 @@ bool InitialFlag;
10191019 }
10201020 }
10211021
1022+-(void)alphaFlagBtnFunc{
1023+ if([ATalphaBtn state] == YES) ATalphaFlag = true;
1024+ else ATalphaFlag = false;
1025+}
10221026 -(void)setTotalDamage:(int)index row:(int)row{
10231027
10241028 ATTACK *Atop;
@@ -2307,7 +2311,7 @@ bool eHandLFlag = false;
23072311 UC[clickIndex].imgb = [[IVimgBig image] retain];
23082312 UC[clickIndex].aura = [Baura intValue];
23092313
2310- [unitChipListAC setValue:[NSString stringWithFormat:@"%@", UC[clickIndex].name] forKeyPath:@"selection.name"];
2314+ [unitChipListAC setValue:[NSString stringWithFormat:@"%@", UC[clickIndex].nameNick] forKeyPath:@"selection.name"];
23112315 [unitChipListAC setValue:[NSString stringWithFormat:@"%@", UC[clickIndex].nameClass] forKeyPath:@"selection.nameC"];
23122316 [unitChipListAC setValue:[NSString stringWithFormat:@"%g", UC[clickIndex].S_M.HP] forKeyPath:@"selection.HP"];
23132317 [unitChipListAC setValue:[NSString stringWithFormat:@"%g", UC[clickIndex].S_M.BP] forKeyPath:@"selection.BP"];
@@ -5111,7 +5115,7 @@ bool eHandLFlag = false;
51115115
51125116 [dict setValue:UC[i].img forKey:@"img"];
51135117 [dict setValue:UC[i].imgb forKey:@"imgBig"];
5114- [dict setValue:[NSString stringWithFormat:@"%@", UC[i].name] forKey:@"name"];
5118+ [dict setValue:[NSString stringWithFormat:@"%@", UC[i].nameNick] forKey:@"name"];
51155119 [dict setValue:[NSString stringWithFormat:@"%g", UC[i].S_M.HP] forKey:@"HP"];
51165120 [dict setValue:[NSString stringWithFormat:@"%g", UC[i].S_M.BP] forKey:@"BP"];
51175121 [dict setValue:[NSString stringWithFormat:@"%@", UC[i].nameClass] forKey:@"nameC"];
@@ -7951,11 +7955,14 @@ int omfgErase() {
79517955
79527956
79537957 [ATmovFileNameTF setStringValue:A->AN.movName];
7954-
7958+ [ATmovBC setState:YES];
7959+ [ATaniBC setState:NO];
79557960
79567961
79577962 }else{
79587963 [ATmovFileNameTF setStringValue:@""];
7964+ [ATmovBC setState:NO];
7965+ [ATaniBC setState:YES];
79597966 }
79607967
79617968 A = atkTop;
@@ -8014,6 +8021,8 @@ int omfgErase() {
80148021 }
80158022 }
80168023
8024+ aniSelectedFlag = true;
8025+
80178026 [ATEffectWindow makeKeyAndOrderFront:nil];
80188027
80198028 }
@@ -8065,6 +8074,7 @@ int omfgErase() {
80658074 path = [path stringByAppendingString:A->AN.movName];
80668075
80678076 AVpreview2 = [AVPlayer playerWithURL:[NSURL fileURLWithPath:path]];
8077+
80688078
80698079
80708080 }else if(!loadChipSideFlag){
@@ -8090,6 +8100,7 @@ int omfgErase() {
80908100 }
80918101 if(AVpreview2){
80928102 AVPV2.player = [AVpreview2 retain];
8103+ AVPV2.videoGravity = AVLayerVideoGravityResize;
80938104 }else{
80948105 A = atkTop;
80958106 return;
@@ -8189,7 +8200,7 @@ int omfgErase() {
81898200
81908201 -(IBAction)attackEffectCloseBtn:(id)sender{
81918202
8192-
8203+ aniSelectedFlag = false;
81938204
81948205 ATTACK *A;
81958206
@@ -8664,6 +8675,8 @@ int omfgErase() {
86648675 frameNum = 1;
86658676 }
86668677 [ATframeCntTF setStringValue:[NSString stringWithFormat:@"%d/%d", frameNum, frameMax]];
8678+
8679+ [unitChipListEVInst EventLoopAN:nil];
86678680 }
86688681 -(IBAction)attackEffectPrev:(id)sender{
86698682
@@ -8673,6 +8686,8 @@ int omfgErase() {
86738686 frameNum = frameMax;
86748687 }
86758688 [ATframeCntTF setStringValue:[NSString stringWithFormat:@"%d/%d", frameNum, frameMax]];
8689+
8690+ [unitChipListEVInst EventLoopAN:nil];
86768691 }
86778692
86788693
@@ -8772,6 +8787,8 @@ int omfgErase() {
87728787 userInfo:nil
87738788 repeats:YES
87748789 ];
8790+
8791+ unitChipListEVInst = self;
87758792 }
87768793
87778794
@@ -8779,11 +8796,14 @@ int omfgErase() {
87798796 }
87808797
87818798 -(void)EventLoopAN:(NSTimer*)timer{
8799+
8800+ if (!aniSelectedFlag)
8801+ return;
8802+
87828803 static int frameCnt = 0;
87838804
87848805 if(!frameRunFlag){
87858806 frameCnt = 0;
8786- return;
87878807 }
87888808
87898809 ATTACK *A;
@@ -8798,12 +8818,21 @@ int omfgErase() {
87988818 }
87998819
88008820 }
8801- atkTop = A;
88028821
8822+ if(clickIndexAL < 0)
8823+ return;
8824+
8825+ [UnitChipListInst alphaFlagBtnFunc];
8826+
8827+ atkTop = A;
8828+
88038829 for(int i = 0;i < clickIndexAL;i++){
88048830 A = A->next;
88058831 }
88068832
8833+ if(!A)
8834+ return;
8835+
88078836 if(frameCnt == 0){
88088837
88098838 ani = A->AN.ANI;
@@ -8813,6 +8842,9 @@ int omfgErase() {
88138842 ani = ani->next;
88148843 }
88158844
8845+ if(!ani)
8846+ return;
8847+
88168848 if(ani->snd){
88178849 [ani->snd setCurrentTime:0];
88188850 [ani->snd play];
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -6745,7 +6745,7 @@
67456745 <action selector="addSubjMark:" target="3039" id="HBn-23-ynG"/>
67466746 </connections>
67476747 </button>
6748- <button verticalHuggingPriority="750" id="eHr-lL-qfg">
6748+ <button hidden="YES" verticalHuggingPriority="750" id="eHr-lL-qfg">
67496749 <rect key="frame" x="508" y="76" width="92" height="32"/>
67506750 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
67516751 <buttonCell key="cell" type="push" title="特殊項目" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="yQ7-Vj-wCa">
@@ -9065,7 +9065,7 @@
90659065 <autoresizingMask key="autoresizingMask"/>
90669066 </scroller>
90679067 <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="10395">
9068- <rect key="frame" x="465" y="1" width="16" height="480"/>
9068+ <rect key="frame" x="466" y="1" width="15" height="480"/>
90699069 <autoresizingMask key="autoresizingMask"/>
90709070 </scroller>
90719071 </scrollView>
Show on old repository browser