AwarsIVのリポジトリです
修订版 | da900e15981d1bcec2435fe2d298f4de333c0487 (tree) |
---|---|
时间 | 2016-08-02 14:24:58 |
作者 | Killery <Killery@kiri...> |
Commiter | Killery |
サモンやクリエイトのボタンズレと、サモンバグ改善
@@ -4726,9 +4726,6 @@ ahhh:{} | ||
4726 | 4726 | U = UTop; |
4727 | 4727 | |
4728 | 4728 | |
4729 | - U = UTop; | |
4730 | - [self addSummonStatus]; | |
4731 | - | |
4732 | 4729 | U = CSLU; |
4733 | 4730 | |
4734 | 4731 | if(U->team == 0){ |
@@ -4752,10 +4749,15 @@ ahhh:{} | ||
4752 | 4749 | unitNum[possionX][possionY] = U->C.S->list[crCSL]-1; |
4753 | 4750 | unitTeam[possionX][possionY] = 0; |
4754 | 4751 | |
4752 | + | |
4753 | + | |
4755 | 4754 | U->C.S = sTop; |
4755 | + | |
4756 | + U = UTop; | |
4757 | + [self addSummonStatus]; | |
4756 | 4758 | unitColorInitFlag = true; |
4757 | - } | |
4758 | - if(U->team == 2){ | |
4759 | + | |
4760 | + }else if(U->team == 2){ | |
4759 | 4761 | |
4760 | 4762 | SKILL *sTop = U->C.S; |
4761 | 4763 |
@@ -4777,6 +4779,10 @@ ahhh:{} | ||
4777 | 4779 | |
4778 | 4780 | U->C.S = sTop; |
4779 | 4781 | unitColorInitFlag = true; |
4782 | + | |
4783 | + U = UTop; | |
4784 | + [self addSummonStatus]; | |
4785 | + unitColorInitFlag = true; | |
4780 | 4786 | } |
4781 | 4787 | |
4782 | 4788 | summonRdyFlag = false; |
@@ -6142,6 +6148,8 @@ ahhh:{} | ||
6142 | 6148 | windowPoint.y = [mapWindow frame].origin.y; |
6143 | 6149 | [createPanel setFrameOrigin:windowPoint]; |
6144 | 6150 | |
6151 | + wtAttackedFlag = true; | |
6152 | + | |
6145 | 6153 | [self initBCreateList]; |
6146 | 6154 | [createPanel makeKeyAndOrderFront:nil]; |
6147 | 6155 | } |
@@ -6155,6 +6163,8 @@ ahhh:{} | ||
6155 | 6163 | windowPoint.y = [mapWindow frame].origin.y; |
6156 | 6164 | [summonPanel setFrameOrigin:windowPoint]; |
6157 | 6165 | |
6166 | + wtAttackedFlag = true; | |
6167 | + | |
6158 | 6168 | [self initCSummonList]; |
6159 | 6169 | [summonPanel makeKeyAndOrderFront:nil]; |
6160 | 6170 | } |
@@ -6271,16 +6281,19 @@ ahhh:{} | ||
6271 | 6281 | } |
6272 | 6282 | -(IBAction)pushCancelCAL:(id)sender{ |
6273 | 6283 | attackFlag = false; |
6284 | + wtAttackedFlag = false; | |
6274 | 6285 | [atkPanel close]; |
6275 | 6286 | } |
6276 | 6287 | |
6277 | 6288 | -(IBAction)pushCancelBCL:(id)sender{ |
6278 | 6289 | createFlag = false; |
6290 | + wtAttackedFlag = false; | |
6279 | 6291 | [createPanel close]; |
6280 | 6292 | } |
6281 | 6293 | |
6282 | 6294 | -(IBAction)pushCancelCSL:(id)sender{ |
6283 | 6295 | summonFlag = false; |
6296 | + wtAttackedFlag = false; | |
6284 | 6297 | [summonPanel close]; |
6285 | 6298 | } |
6286 | 6299 |
@@ -6421,9 +6434,12 @@ ahhh:{} | ||
6421 | 6434 | U->next = NULL; |
6422 | 6435 | if(omgCnt == 0) U = UTop; |
6423 | 6436 | |
6437 | + U->chipNumber = unitNum[possionX][possionY]; | |
6438 | + U->chipNumberL = -1; | |
6424 | 6439 | |
6425 | 6440 | U->x = possionX; |
6426 | 6441 | U->y = possionY; |
6442 | + U->number = registerNum; | |
6427 | 6443 | |
6428 | 6444 | U->C = CSLUC; |
6429 | 6445 | if(unitTeam[CSLU->x][CSLU->y] == 0 || unitTeam[CSLU->x][CSLU->y] == 1){ |
@@ -12475,31 +12491,63 @@ SKIP1: | ||
12475 | 12491 | [attackBtn setEnabled:NO]; |
12476 | 12492 | } |
12477 | 12493 | |
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){ | |
12485 | 12495 | plusBtnValue -= stanbyBtn.frame.size.height + 2; |
12486 | 12496 | [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
12487 | 12497 | [[commandPanel contentView] addSubview:stanbyBtn]; |
12488 | 12498 | [stanbyBtn setTransparent: NO]; |
12489 | 12499 | [stanbyBtn setEnabled: YES]; |
12500 | + } | |
12490 | 12501 | |
12491 | - | |
12502 | + if(!wtAttackedFlag){ | |
12492 | 12503 | [createBtn setTransparent: NO]; |
12493 | 12504 | [createBtn setEnabled: YES]; |
12494 | 12505 | plusBtnValue -= createBtn.frame.size.height + 2; |
12495 | 12506 | [createBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
12496 | 12507 | [[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 | + } | |
12497 | 12515 | |
12516 | + if(!wtAttackedFlag){ | |
12498 | 12517 | [summonBtn setTransparent: NO]; |
12499 | 12518 | [summonBtn setEnabled: YES]; |
12500 | 12519 | plusBtnValue -= summonBtn.frame.size.height + 2; |
12501 | 12520 | [summonBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
12502 | 12521 | [[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 | + | |
12503 | 12551 | |
12504 | 12552 | plusBtnValue -= statusBtn.frame.size.height + 2; |
12505 | 12553 | [statusBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
@@ -12545,26 +12593,48 @@ SKIP1: | ||
12545 | 12593 | [attackBtn setTransparent: YES]; |
12546 | 12594 | [attackBtn setEnabled:NO]; |
12547 | 12595 | } |
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 | + } | |
12548 | 12618 | |
12549 | 12619 | if(!wtMovedFlag && wtAttackedFlag){ |
12550 | 12620 | [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
12551 | 12621 | [[commandPanel contentView] addSubview:moveBtn]; |
12552 | 12622 | [moveBtn setTransparent: NO]; |
12553 | 12623 | [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]; | |
12554 | 12629 | } |
12555 | 12630 | |
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 | + } | |
12568 | 12638 | |
12569 | 12639 | [summonBtn setTransparent: YES]; |
12570 | 12640 | [summonBtn setEnabled: NO]; |
@@ -12617,28 +12687,50 @@ SKIP1: | ||
12617 | 12687 | [attackBtn setEnabled:NO]; |
12618 | 12688 | } |
12619 | 12689 | |
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){ | |
12627 | 12691 | plusBtnValue -= stanbyBtn.frame.size.height + 2; |
12628 | 12692 | [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
12629 | 12693 | [[commandPanel contentView] addSubview:stanbyBtn]; |
12630 | 12694 | [stanbyBtn setTransparent: NO]; |
12631 | 12695 | [stanbyBtn setEnabled: YES]; |
12632 | - | |
12696 | + } | |
12633 | 12697 | |
12634 | 12698 | [createBtn setTransparent: YES]; |
12635 | 12699 | [createBtn setEnabled: NO]; |
12636 | 12700 | |
12701 | + if(!wtAttackedFlag){ | |
12637 | 12702 | [summonBtn setTransparent: NO]; |
12638 | 12703 | [summonBtn setEnabled: YES]; |
12639 | 12704 | plusBtnValue -= summonBtn.frame.size.height + 2; |
12640 | 12705 | [summonBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
12641 | 12706 | [[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 | + } | |
12642 | 12734 | |
12643 | 12735 | plusBtnValue -= statusBtn.frame.size.height + 2; |
12644 | 12736 | [statusBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)]; |
@@ -12698,7 +12790,6 @@ SKIP1: | ||
12698 | 12790 | [stanbyBtn setTransparent: NO]; |
12699 | 12791 | [stanbyBtn setEnabled: YES]; |
12700 | 12792 | |
12701 | - | |
12702 | 12793 | [createBtn setTransparent: YES]; |
12703 | 12794 | [createBtn setEnabled: NO]; |
12704 | 12795 |
@@ -16956,7 +17047,7 @@ SKIP1: | ||
16956 | 17047 | }else{ |
16957 | 17048 | unitTeam[x][y] = MS0->S3->team; |
16958 | 17049 | unitNum[x][y] = u.chipNumb; |
16959 | - loadNum[x][y] = u.chipNumb; | |
17050 | + //loadNum[x][y] = u.chipNumb; | |
16960 | 17051 | [self addAppearanceStatus:u x:x y:y]; |
16961 | 17052 | } |
16962 | 17053 | }else{ |
@@ -16994,7 +17085,7 @@ SKIP1: | ||
16994 | 17085 | y = *o; |
16995 | 17086 | unitTeam[x][y] = MS0->S3->team; |
16996 | 17087 | unitNum[x][y] = u.chipNumb; |
16997 | - loadNum[x][y] = u.chipNumb; | |
17088 | + //loadNum[x][y] = u.chipNumb; | |
16998 | 17089 | [self addAppearanceStatus:u x:x y:y]; |
16999 | 17090 | }else{ |
17000 | 17091 | MS0->succeessfulFlag = false; |
@@ -9065,7 +9065,7 @@ | ||
9065 | 9065 | <autoresizingMask key="autoresizingMask"/> |
9066 | 9066 | </scroller> |
9067 | 9067 | <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"/> | |
9069 | 9069 | <autoresizingMask key="autoresizingMask"/> |
9070 | 9070 | </scroller> |
9071 | 9071 | </scrollView> |