File tree 4 files changed +5
-7
lines changed
4 files changed +5
-7
lines changed Original file line number Diff line number Diff line change 1
1
# .vs, .vscode must be ignored
2
2
.vs /
3
3
.vscode /
4
+ .idea /
Original file line number Diff line number Diff line change @@ -385,7 +385,7 @@ public bool Commandable()
385
385
public Ship ( int initRadius , ShipType shipType , MoneyPool moneyPool ) :
386
386
base ( GameData . PosNotInGame , initRadius , GameObjType . Ship )
387
387
{
388
- this . CanMove . SetReturnOri ( true ) ;
388
+ this . CanMove . SetReturnOri ( false ) ;
389
389
this . Occupation = OccupationFactory . FindIOccupation ( this . ShipType = shipType ) ;
390
390
this . ViewRange = this . Occupation . ViewRange ;
391
391
this . HP = new ( this . Occupation . MaxHp ) ;
Original file line number Diff line number Diff line change @@ -39,8 +39,7 @@ public long AddPlayer(PlayerInitInfo playerInitInfo)
39
39
}
40
40
public bool ActivateShip ( long teamID , ShipType shipType , int birthPointIndex = 0 )
41
41
{
42
- Ship ? ship ;
43
- ship = teamList [ ( int ) teamID ] . GetNewShip ( shipType ) ;
42
+ Ship ? ship = teamList [ ( int ) teamID ] . GetNewShip ( shipType ) ;
44
43
if ( ship == null )
45
44
return false ;
46
45
if ( birthPointIndex < 0 )
@@ -63,7 +62,6 @@ public bool StartGame(int milliSeconds)
63
62
{
64
63
if ( ! gameMap . Timer . StartGame ( milliSeconds ) )
65
64
return ;
66
-
67
65
EndGame ( ) ; // 游戏结束时要做的事
68
66
}
69
67
)
Original file line number Diff line number Diff line change @@ -18,20 +18,19 @@ private class ShipManager(Map gameMap)
18
18
newShip . ShipID . SetReturnOri ( shipID ) ;
19
19
return newShip ;
20
20
}
21
-
22
21
public bool ActivateShip ( Ship ship , XY pos )
23
22
{
24
- if ( ship == null || ship . ShipState != ShipStateType . Deceased )
23
+ if ( ship . ShipState != ShipStateType . Deceased )
25
24
{
26
25
return false ;
27
26
}
28
27
ship . Position . x = pos . x ;
29
28
ship . Position . y = pos . y ;
30
29
long stateNum = ship . SetShipState ( RunningStateType . RunningActively , ShipStateType . Null ) ;
31
30
ship . ResetShipState ( stateNum ) ;
31
+ ship . CanMove . SetReturnOri ( true ) ;
32
32
return true ;
33
33
}
34
-
35
34
public void BeAttacked ( Ship ship , Bullet bullet )
36
35
{
37
36
if ( bullet ! . Parent ! . TeamID == ship . TeamID )
You can’t perform that action at this time.
0 commit comments