識別子を一部修正
@@ -29,7 +29,7 @@ | ||
29 | 29 | break; |
30 | 30 | case 4: |
31 | 31 | #region ゆっくりと左に歩いてくる |
32 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
32 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
33 | 33 | e.SpriteOwner.Sprite.Body.ApplyForce( new Vector( -0.01f , 0 ) ); |
34 | 34 | } ); |
35 | 35 | #endregion |
@@ -36,7 +36,7 @@ | ||
36 | 36 | break; |
37 | 37 | case 5: |
38 | 38 | #region ゆっくりと右に歩いてくる |
39 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
39 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
40 | 40 | e.SpriteOwner.Sprite.Body.ApplyForce( new Vector( +0.01f , 0 ) ); |
41 | 41 | } ); |
42 | 42 | #endregion |
@@ -46,7 +46,7 @@ | ||
46 | 46 | |
47 | 47 | character.JumpPower = 4; |
48 | 48 | character.UpGravity = 0.05f; |
49 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
49 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
50 | 50 | e.SpriteOwner.Sprite.Body.ApplyForce( new Vector( -0.01f , 0 ) ); |
51 | 51 | ( ( Character )( e.SpriteOwner ) ).StartJump(); |
52 | 52 | } ); |
@@ -56,7 +56,7 @@ | ||
56 | 56 | #region ジャンプしながら右に向かってくる |
57 | 57 | character.JumpPower = 4; |
58 | 58 | character.UpGravity = 0.05f; |
59 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
59 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
60 | 60 | ( ( Character)( e.SpriteOwner ) ).StartJump(); |
61 | 61 | } ); |
62 | 62 | #endregion |
@@ -87,7 +87,7 @@ | ||
87 | 87 | character.Sprite.LogicParameter.Angle = 90; // 角度 |
88 | 88 | character.Sprite.LogicParameter.Speed = 1; // 速度 |
89 | 89 | character.Sprite.LogicParameter.LimitDistance = 100;// 移動距離 |
90 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
90 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
91 | 91 | } ); |
92 | 92 | #endregion |
93 | 93 | break; |
@@ -96,7 +96,7 @@ | ||
96 | 96 | character.Sprite.CanActDefault = false; // 既定の重力計算などを無効にする。 |
97 | 97 | character.Sprite.LogicParameter.Radius = 100; // 半径 |
98 | 98 | character.Sprite.LogicParameter.Speed = 8; // 回転速度 |
99 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
99 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
100 | 100 | } ); |
101 | 101 | #endregion |
102 | 102 | break; |
@@ -105,7 +105,7 @@ | ||
105 | 105 | character.Sprite.IsBlock = false; |
106 | 106 | character.Sprite.LogicParameter.Speed = 2; |
107 | 107 | character.Sprite.LogicParameter.Radius = 100; |
108 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
108 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
109 | 109 | // Sprite.HitStop( PlayerStatus.Player , e.Target ); |
110 | 110 | } ); |
111 | 111 | #endregion |
@@ -116,7 +116,7 @@ | ||
116 | 116 | character.Sprite.LogicParameter.Speed = 2; // 上下に移動するときの速度 |
117 | 117 | character.Sprite.LogicParameter.Angle = 90; // 移動する方向。90度 = 上下方向。45度 = 斜めなど。 |
118 | 118 | character.Sprite.CanActDefault = false; |
119 | - character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
119 | + character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
120 | 120 | character.Sprite.LogicParameter.Angle++; |
121 | 121 | } ); |
122 | 122 | #endregion |
@@ -1,49 +0,0 @@ | ||
1 | -using System; | |
2 | -using System.Collections.Generic; | |
3 | -using System.Linq; | |
4 | -using System.Text; | |
5 | -using Nlgp1.Parameters; | |
6 | -using Nlgp1.Stages; | |
7 | -using Nlgp1.Common; | |
8 | - | |
9 | -namespace Nlgp1.Sprites { | |
10 | - /// <summary> | |
11 | - /// スプライトの行動が発生したときのイベント引数 | |
12 | - /// </summary> | |
13 | - public class SpriteSteppedEventArgs : EventArgs { | |
14 | - /// <summary> | |
15 | - /// SpriteSteppedEventArgsクラスの新しいインスタンスを初期化します。 | |
16 | - /// </summary> | |
17 | - /// <param name="target">対象のスプライト</param> | |
18 | - public SpriteSteppedEventArgs( ISpriteOwner spriteOwner ) { | |
19 | - this.SpriteOwner = spriteOwner; | |
20 | - } | |
21 | - /// <summary> | |
22 | - /// 対象のスプライトを取得します。 | |
23 | - /// </summary> | |
24 | - public ISpriteOwner SpriteOwner { | |
25 | - get; | |
26 | - private set; | |
27 | - } | |
28 | - } | |
29 | - | |
30 | - /// <summary> | |
31 | - /// スプライトの行動が発生したときのイベント引数 | |
32 | - /// </summary> | |
33 | - public class SpriteSteppedEventArgs<T> : EventArgs where T : ISpriteOwner { | |
34 | - /// <summary> | |
35 | - /// SpriteSteppedEventArgsクラスの新しいインスタンスを初期化します。 | |
36 | - /// </summary> | |
37 | - /// <param name="target">対象のスプライト</param> | |
38 | - public SpriteSteppedEventArgs( T spriteOwner ) { | |
39 | - this.SpriteOwner = spriteOwner; | |
40 | - } | |
41 | - /// <summary> | |
42 | - /// 対象のスプライトを取得します。 | |
43 | - /// </summary> | |
44 | - public T SpriteOwner { | |
45 | - get; | |
46 | - private set; | |
47 | - } | |
48 | - } | |
49 | -} |
@@ -0,0 +1,49 @@ | ||
1 | +using System; | |
2 | +using System.Collections.Generic; | |
3 | +using System.Linq; | |
4 | +using System.Text; | |
5 | +using Nlgp1.Parameters; | |
6 | +using Nlgp1.Stages; | |
7 | +using Nlgp1.Common; | |
8 | + | |
9 | +namespace Nlgp1.Sprites { | |
10 | + /// <summary> | |
11 | + /// スプライトの行動が発生したときのイベント引数 | |
12 | + /// </summary> | |
13 | + public class SpriteSteppingEventArgs : EventArgs { | |
14 | + /// <summary> | |
15 | + /// SpriteSteppingEventArgsクラスの新しいインスタンスを初期化します。 | |
16 | + /// </summary> | |
17 | + /// <param name="target">対象のスプライト</param> | |
18 | + public SpriteSteppingEventArgs( ISpriteOwner spriteOwner ) { | |
19 | + this.SpriteOwner = spriteOwner; | |
20 | + } | |
21 | + /// <summary> | |
22 | + /// 対象のスプライトを取得します。 | |
23 | + /// </summary> | |
24 | + public ISpriteOwner SpriteOwner { | |
25 | + get; | |
26 | + private set; | |
27 | + } | |
28 | + } | |
29 | + | |
30 | + /// <summary> | |
31 | + /// スプライトの行動が発生したときのイベント引数 | |
32 | + /// </summary> | |
33 | + public class SpriteSteppingEventArgs<T> : EventArgs where T : ISpriteOwner { | |
34 | + /// <summary> | |
35 | + /// SpriteSteppingEventArgsクラスの新しいインスタンスを初期化します。 | |
36 | + /// </summary> | |
37 | + /// <param name="target">対象のスプライト</param> | |
38 | + public SpriteSteppingEventArgs( T spriteOwner ) { | |
39 | + this.SpriteOwner = spriteOwner; | |
40 | + } | |
41 | + /// <summary> | |
42 | + /// 対象のスプライトを取得します。 | |
43 | + /// </summary> | |
44 | + public T SpriteOwner { | |
45 | + get; | |
46 | + private set; | |
47 | + } | |
48 | + } | |
49 | +} |
@@ -73,7 +73,7 @@ | ||
73 | 73 | ActiveCellCount = 2; |
74 | 74 | CanActDefault = true; |
75 | 75 | startTick = StageMap.TickCount; |
76 | - steppedEventParameter = new SpriteSteppedEventArgs( this.Owner ); | |
76 | + steppedEventArgs = new SpriteSteppingEventArgs( this.Owner ); | |
77 | 77 | |
78 | 78 | this.Body = StageMap.World.CreateSpriteBody( this , position ); |
79 | 79 | if( layerType != LayerType.Character ) { |
@@ -203,7 +203,7 @@ | ||
203 | 203 | |
204 | 204 | #region ロジック |
205 | 205 | |
206 | - private SpriteSteppedEventArgs steppedEventParameter = null; | |
206 | + private SpriteSteppingEventArgs steppedEventArgs = null; | |
207 | 207 | |
208 | 208 | /// <summary> |
209 | 209 | /// キャラクタの既定の行動を行う |
@@ -218,9 +218,13 @@ | ||
218 | 218 | } |
219 | 219 | // 参考→http://d.hatena.ne.jp/Gemma/20080517/1211010942 |
220 | 220 | |
221 | - this.Body.Step(); | |
221 | + if( this.Stepping != null ) { | |
222 | + this.Stepping( this , this.steppedEventArgs ); | |
223 | + } | |
222 | 224 | |
223 | - this.OnStepped( this , this.steppedEventParameter ); | |
225 | + if( this.Body != null ) { | |
226 | + this.Body.Step(); | |
227 | + } | |
224 | 228 | } |
225 | 229 | #endregion |
226 | 230 |
@@ -235,13 +239,7 @@ | ||
235 | 239 | /// <summary> |
236 | 240 | /// 行動が発生して既定の行動が実行されたあとに発生します。 |
237 | 241 | /// </summary> |
238 | - public event EventHandler<SpriteSteppedEventArgs> Stepped; | |
239 | - | |
240 | - private void OnStepped( object sender , SpriteSteppedEventArgs e ) { | |
241 | - if( this.Stepped != null ) { | |
242 | - this.Stepped( sender , e ); | |
243 | - } | |
244 | - } | |
242 | + public event EventHandler<SpriteSteppingEventArgs> Stepping; | |
245 | 243 | #endregion |
246 | 244 | |
247 | 245 | #region IUnloadableComponent メンバー |
@@ -34,7 +34,7 @@ | ||
34 | 34 | gun.Initialize( this.GunTypeID , this , gunSize ); |
35 | 35 | |
36 | 36 | if( Initialized != null ) |
37 | - Initialized( this , new SpriteSteppedEventArgs<T>( gun ) ); | |
37 | + Initialized( this , new SpriteSteppingEventArgs<T>( gun ) ); | |
38 | 38 | |
39 | 39 | lock( gunList ) |
40 | 40 | gunList.Add( gun ); |
@@ -94,6 +94,6 @@ | ||
94 | 94 | } |
95 | 95 | #endregion |
96 | 96 | |
97 | - public event EventHandler<SpriteSteppedEventArgs<T>> Initialized; | |
97 | + public event EventHandler<SpriteSteppingEventArgs<T>> Initialized; | |
98 | 98 | } |
99 | 99 | } |
@@ -25,7 +25,7 @@ | ||
25 | 25 | this.Character.Sprite.Unloaded += new EventHandler( ( sender , e ) => Unload() ); |
26 | 26 | |
27 | 27 | #region 攻撃状態の変化 |
28 | - this.Character.Sprite.Stepped += new EventHandler<SpriteSteppedEventArgs>( ( sender , e ) => { | |
28 | + this.Character.Sprite.Stepping += new EventHandler<SpriteSteppingEventArgs>( ( sender , e ) => { | |
29 | 29 | if( ActionType == ActionType.None ) |
30 | 30 | return; |
31 | 31 | else if( ActionType == ActionType.Starting && StageMap.TickCount - attackTick >= StartingWait && canAttack ) { |