OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

AwarsIV: 提交

AwarsIVのリポジトリです


Commit MetaInfo

修订版da900e15981d1bcec2435fe2d298f4de333c0487 (tree)
时间2016-08-02 14:24:58
作者Killery <Killery@kiri...>
CommiterKillery

Log Message

サモンやクリエイトのボタンズレと、サモンバグ改善

更改概述

差异

--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -4726,9 +4726,6 @@ ahhh:{}
47264726 U = UTop;
47274727
47284728
4729- U = UTop;
4730- [self addSummonStatus];
4731-
47324729 U = CSLU;
47334730
47344731 if(U->team == 0){
@@ -4752,10 +4749,15 @@ ahhh:{}
47524749 unitNum[possionX][possionY] = U->C.S->list[crCSL]-1;
47534750 unitTeam[possionX][possionY] = 0;
47544751
4752+
4753+
47554754 U->C.S = sTop;
4755+
4756+ U = UTop;
4757+ [self addSummonStatus];
47564758 unitColorInitFlag = true;
4757- }
4758- if(U->team == 2){
4759+
4760+ }else if(U->team == 2){
47594761
47604762 SKILL *sTop = U->C.S;
47614763
@@ -4777,6 +4779,10 @@ ahhh:{}
47774779
47784780 U->C.S = sTop;
47794781 unitColorInitFlag = true;
4782+
4783+ U = UTop;
4784+ [self addSummonStatus];
4785+ unitColorInitFlag = true;
47804786 }
47814787
47824788 summonRdyFlag = false;
@@ -6142,6 +6148,8 @@ ahhh:{}
61426148 windowPoint.y = [mapWindow frame].origin.y;
61436149 [createPanel setFrameOrigin:windowPoint];
61446150
6151+ wtAttackedFlag = true;
6152+
61456153 [self initBCreateList];
61466154 [createPanel makeKeyAndOrderFront:nil];
61476155 }
@@ -6155,6 +6163,8 @@ ahhh:{}
61556163 windowPoint.y = [mapWindow frame].origin.y;
61566164 [summonPanel setFrameOrigin:windowPoint];
61576165
6166+ wtAttackedFlag = true;
6167+
61586168 [self initCSummonList];
61596169 [summonPanel makeKeyAndOrderFront:nil];
61606170 }
@@ -6271,16 +6281,19 @@ ahhh:{}
62716281 }
62726282 -(IBAction)pushCancelCAL:(id)sender{
62736283 attackFlag = false;
6284+ wtAttackedFlag = false;
62746285 [atkPanel close];
62756286 }
62766287
62776288 -(IBAction)pushCancelBCL:(id)sender{
62786289 createFlag = false;
6290+ wtAttackedFlag = false;
62796291 [createPanel close];
62806292 }
62816293
62826294 -(IBAction)pushCancelCSL:(id)sender{
62836295 summonFlag = false;
6296+ wtAttackedFlag = false;
62846297 [summonPanel close];
62856298 }
62866299
@@ -6421,9 +6434,12 @@ ahhh:{}
64216434 U->next = NULL;
64226435 if(omgCnt == 0) U = UTop;
64236436
6437+ U->chipNumber = unitNum[possionX][possionY];
6438+ U->chipNumberL = -1;
64246439
64256440 U->x = possionX;
64266441 U->y = possionY;
6442+ U->number = registerNum;
64276443
64286444 U->C = CSLUC;
64296445 if(unitTeam[CSLU->x][CSLU->y] == 0 || unitTeam[CSLU->x][CSLU->y] == 1){
@@ -12475,31 +12491,63 @@ SKIP1:
1247512491 [attackBtn setEnabled:NO];
1247612492 }
1247712493
12478- if(!wtMovedFlag && wtAttackedFlag){
12479- [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12480- [[commandPanel contentView] addSubview:moveBtn];
12481- [moveBtn setTransparent: NO];
12482- [moveBtn setEnabled: YES];
12483- }
12484-
12494+ if(!wtAttackedFlag){
1248512495 plusBtnValue -= stanbyBtn.frame.size.height + 2;
1248612496 [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
1248712497 [[commandPanel contentView] addSubview:stanbyBtn];
1248812498 [stanbyBtn setTransparent: NO];
1248912499 [stanbyBtn setEnabled: YES];
12500+ }
1249012501
12491-
12502+ if(!wtAttackedFlag){
1249212503 [createBtn setTransparent: NO];
1249312504 [createBtn setEnabled: YES];
1249412505 plusBtnValue -= createBtn.frame.size.height + 2;
1249512506 [createBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
1249612507 [[commandPanel contentView] addSubview:createBtn];
12508+ }else{
12509+ plusBtnValue -= createBtn.frame.size.height + 2;
12510+ plusBtnValue2 -= createBtn.frame.size.height + 2;
12511+ plusBtnValue3 -= createBtn.frame.size.height + 2;
12512+ [createBtn setTransparent: YES];
12513+ [createBtn setEnabled: NO];
12514+ }
1249712515
12516+ if(!wtAttackedFlag){
1249812517 [summonBtn setTransparent: NO];
1249912518 [summonBtn setEnabled: YES];
1250012519 plusBtnValue -= summonBtn.frame.size.height + 2;
1250112520 [summonBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
1250212521 [[commandPanel contentView] addSubview:summonBtn];
12522+ }else{
12523+ plusBtnValue -= summonBtn.frame.size.height + 2;
12524+ plusBtnValue2 -= summonBtn.frame.size.height + 2;
12525+ plusBtnValue3 -= summonBtn.frame.size.height + 2;
12526+ [summonBtn setTransparent: YES];
12527+ [summonBtn setEnabled: NO];
12528+ }
12529+
12530+ if(!wtMovedFlag && wtAttackedFlag){
12531+ [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12532+ [[commandPanel contentView] addSubview:moveBtn];
12533+ [moveBtn setTransparent: NO];
12534+ [moveBtn setEnabled: YES];
12535+ plusBtnValue -= stanbyBtn.frame.size.height + 2;
12536+ [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12537+ [[commandPanel contentView] addSubview:stanbyBtn];
12538+ [stanbyBtn setTransparent: NO];
12539+ [stanbyBtn setEnabled: YES];
12540+ }
12541+
12542+ if(wtMovedFlag && wtAttackedFlag){
12543+ plusBtnValue -= stanbyBtn.frame.size.height + 2;
12544+ [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12545+ [[commandPanel contentView] addSubview:stanbyBtn];
12546+ [stanbyBtn setTransparent: NO];
12547+ [stanbyBtn setEnabled: YES];
12548+ }
12549+
12550+
1250312551
1250412552 plusBtnValue -= statusBtn.frame.size.height + 2;
1250512553 [statusBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
@@ -12545,26 +12593,48 @@ SKIP1:
1254512593 [attackBtn setTransparent: YES];
1254612594 [attackBtn setEnabled:NO];
1254712595 }
12596+
12597+ if(!wtAttackedFlag){
12598+ plusBtnValue -= stanbyBtn.frame.size.height + 2;
12599+ [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12600+ [[commandPanel contentView] addSubview:stanbyBtn];
12601+ [stanbyBtn setTransparent: NO];
12602+ [stanbyBtn setEnabled: YES];
12603+ }
12604+
12605+ if(!wtAttackedFlag){
12606+ [createBtn setTransparent: NO];
12607+ [createBtn setEnabled: YES];
12608+ plusBtnValue -= createBtn.frame.size.height + 2;
12609+ [createBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12610+ [[commandPanel contentView] addSubview:createBtn];
12611+ }else{
12612+ plusBtnValue -= createBtn.frame.size.height + 2;
12613+ plusBtnValue2 -= createBtn.frame.size.height + 2;
12614+ plusBtnValue3 -= createBtn.frame.size.height + 2;
12615+ [createBtn setTransparent: YES];
12616+ [createBtn setEnabled:NO];
12617+ }
1254812618
1254912619 if(!wtMovedFlag && wtAttackedFlag){
1255012620 [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
1255112621 [[commandPanel contentView] addSubview:moveBtn];
1255212622 [moveBtn setTransparent: NO];
1255312623 [moveBtn setEnabled: YES];
12624+ plusBtnValue -= stanbyBtn.frame.size.height + 2;
12625+ [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12626+ [[commandPanel contentView] addSubview:stanbyBtn];
12627+ [stanbyBtn setTransparent: NO];
12628+ [stanbyBtn setEnabled: YES];
1255412629 }
1255512630
12556- plusBtnValue -= stanbyBtn.frame.size.height + 2;
12557- [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12558- [[commandPanel contentView] addSubview:stanbyBtn];
12559- [stanbyBtn setTransparent: NO];
12560- [stanbyBtn setEnabled: YES];
12561-
12562-
12563- [createBtn setTransparent: NO];
12564- [createBtn setEnabled: YES];
12565- plusBtnValue -= createBtn.frame.size.height + 2;
12566- [createBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12567- [[commandPanel contentView] addSubview:createBtn];
12631+ if(wtMovedFlag && wtAttackedFlag){
12632+ plusBtnValue -= stanbyBtn.frame.size.height + 2;
12633+ [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12634+ [[commandPanel contentView] addSubview:stanbyBtn];
12635+ [stanbyBtn setTransparent: NO];
12636+ [stanbyBtn setEnabled: YES];
12637+ }
1256812638
1256912639 [summonBtn setTransparent: YES];
1257012640 [summonBtn setEnabled: NO];
@@ -12617,28 +12687,50 @@ SKIP1:
1261712687 [attackBtn setEnabled:NO];
1261812688 }
1261912689
12620- if(!wtMovedFlag && wtAttackedFlag){
12621- [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12622- [[commandPanel contentView] addSubview:moveBtn];
12623- [moveBtn setTransparent: NO];
12624- [moveBtn setEnabled: YES];
12625- }
12626-
12690+ if(!wtAttackedFlag){
1262712691 plusBtnValue -= stanbyBtn.frame.size.height + 2;
1262812692 [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
1262912693 [[commandPanel contentView] addSubview:stanbyBtn];
1263012694 [stanbyBtn setTransparent: NO];
1263112695 [stanbyBtn setEnabled: YES];
12632-
12696+ }
1263312697
1263412698 [createBtn setTransparent: YES];
1263512699 [createBtn setEnabled: NO];
1263612700
12701+ if(!wtAttackedFlag){
1263712702 [summonBtn setTransparent: NO];
1263812703 [summonBtn setEnabled: YES];
1263912704 plusBtnValue -= summonBtn.frame.size.height + 2;
1264012705 [summonBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
1264112706 [[commandPanel contentView] addSubview:summonBtn];
12707+ }else{
12708+ plusBtnValue2 -= summonBtn.frame.size.height + 2;
12709+ plusBtnValue -= summonBtn.frame.size.height + 2;
12710+ plusBtnValue3 -= summonBtn.frame.size.height + 2;
12711+ [summonBtn setTransparent: YES];
12712+ [summonBtn setEnabled:NO];
12713+ }
12714+
12715+ if(!wtMovedFlag && wtAttackedFlag){
12716+ [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12717+ [[commandPanel contentView] addSubview:moveBtn];
12718+ [moveBtn setTransparent: NO];
12719+ [moveBtn setEnabled: YES];
12720+ plusBtnValue -= stanbyBtn.frame.size.height + 2;
12721+ [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12722+ [[commandPanel contentView] addSubview:stanbyBtn];
12723+ [stanbyBtn setTransparent: NO];
12724+ [stanbyBtn setEnabled: YES];
12725+ }
12726+
12727+ if(wtMovedFlag && wtAttackedFlag){
12728+ plusBtnValue -= stanbyBtn.frame.size.height + 2;
12729+ [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
12730+ [[commandPanel contentView] addSubview:stanbyBtn];
12731+ [stanbyBtn setTransparent: NO];
12732+ [stanbyBtn setEnabled: YES];
12733+ }
1264212734
1264312735 plusBtnValue -= statusBtn.frame.size.height + 2;
1264412736 [statusBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
@@ -12698,7 +12790,6 @@ SKIP1:
1269812790 [stanbyBtn setTransparent: NO];
1269912791 [stanbyBtn setEnabled: YES];
1270012792
12701-
1270212793 [createBtn setTransparent: YES];
1270312794 [createBtn setEnabled: NO];
1270412795
@@ -16956,7 +17047,7 @@ SKIP1:
1695617047 }else{
1695717048 unitTeam[x][y] = MS0->S3->team;
1695817049 unitNum[x][y] = u.chipNumb;
16959- loadNum[x][y] = u.chipNumb;
17050+ //loadNum[x][y] = u.chipNumb;
1696017051 [self addAppearanceStatus:u x:x y:y];
1696117052 }
1696217053 }else{
@@ -16994,7 +17085,7 @@ SKIP1:
1699417085 y = *o;
1699517086 unitTeam[x][y] = MS0->S3->team;
1699617087 unitNum[x][y] = u.chipNumb;
16997- loadNum[x][y] = u.chipNumb;
17088+ //loadNum[x][y] = u.chipNumb;
1699817089 [self addAppearanceStatus:u x:x y:y];
1699917090 }else{
1700017091 MS0->succeessfulFlag = false;
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -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