A 2D Versus Shmup made in Unity
Bugfixes of large bugs founds at Demo
+241
-50
+15
-1
Assets/External Libraries/DanmakuUnity2D/Core/Danmaku.cs
+15
-1
Assets/External Libraries/DanmakuUnity2D/Core/Danmaku.cs
···
2
2
using UnityUtilLib;
3
3
using UnityUtilLib.Pooling;
4
4
using System.Collections.Generic;
5
-
using System;
6
5
7
6
/// <summary>
8
7
/// A development kit for quick development of 2D Danmaku games
···
16
15
public sealed partial class Danmaku : IPooledObject, IColorable, IPrefabed<DanmakuPrefab> {
17
16
18
17
internal int index;
18
+
19
+
private Stack<Component> extraComponents;
19
20
20
21
private GameObject gameObject;
21
22
private Transform transform;
···
270
271
controllerCheck = controllerUpdate != null;
271
272
}
272
273
274
+
public T AddComponent<T>() where T : Component {
275
+
T component = gameObject.AddComponent<T> ();
276
+
if (extraComponents == null)
277
+
extraComponents = new Stack<Component> ();
278
+
extraComponents.Push (component);
279
+
return component;
280
+
}
281
+
273
282
public void ClearControllers() {
274
283
controllerCheck = true;
275
284
controllerUpdate = null;
···
528
537
renderer.enabled = false;
529
538
is_active = false;
530
539
Pool.Return (this);
540
+
if (extraComponents != null) {
541
+
while(extraComponents.Count > 0) {
542
+
Object.Destroy(extraComponents.Pop());
543
+
}
544
+
}
531
545
//ProjectileManager.Return (this);
532
546
}
533
547
+8
Assets/External Libraries/DanmakuUnity2D/Core/DanmakuGroup.cs
+8
Assets/External Libraries/DanmakuUnity2D/Core/DanmakuGroup.cs
···
153
153
groupControllers = null;
154
154
}
155
155
156
+
public Dictionary<Danmaku, T> AddComponent<T>() where T : Component {
157
+
var pairs = new Dictionary<Danmaku, T> ();
158
+
foreach (Danmaku danmaku in group) {
159
+
pairs[danmaku] = danmaku.AddComponent<T>();
160
+
}
161
+
return pairs;
162
+
}
163
+
156
164
#region ICollection implementation
157
165
158
166
public void Add (Danmaku item) {
+1
-1
Assets/External Libraries/DanmakuUnity2D/Core/DanmakuPool.cs
+1
-1
Assets/External Libraries/DanmakuUnity2D/Core/DanmakuPool.cs
+20
Assets/External Libraries/DanmakuUnity2D/Core/IDanmakuNode.cs
+20
Assets/External Libraries/DanmakuUnity2D/Core/IDanmakuNode.cs
···
1
+
using UnityEngine;
2
+
using System.Collections;
3
+
using UnityUtilLib;
4
+
5
+
namespace Danmaku2D {
6
+
7
+
public interface IDanmakuNode {
8
+
9
+
string NodeName {
10
+
get;
11
+
}
12
+
13
+
Color NodeColor {
14
+
get;
15
+
}
16
+
17
+
bool Connect(IDanmakuNode node);
18
+
19
+
}
20
+
}
+12
Assets/External Libraries/DanmakuUnity2D/Core/IDanmakuNode.cs.meta
+12
Assets/External Libraries/DanmakuUnity2D/Core/IDanmakuNode.cs.meta
···
1
+
fileFormatVersion: 2
2
+
guid: 20a7d65bb73037c439628a777fed1945
3
+
timeCreated: 1428759712
4
+
licenseType: Free
5
+
MonoImporter:
6
+
serializedVersion: 2
7
+
defaultReferences: []
8
+
executionOrder: 0
9
+
icon: {instanceID: 0}
10
+
userData:
11
+
assetBundleName:
12
+
assetBundleVariant:
+14
-4
Assets/External Libraries/DanmakuUnity2D/NoScript/DanmakuEmitter.cs
+14
-4
Assets/External Libraries/DanmakuUnity2D/NoScript/DanmakuEmitter.cs
···
34
34
}
35
35
}
36
36
37
-
public override void Trigger () {
38
-
Fire ();
39
-
}
40
-
41
37
public void Fire() {
42
38
fireData.Controller = null;
43
39
for(int i = 0; i < controllers.Length; i++)
···
64
60
copy.Rotation = rotation;
65
61
field.Fire (copy);
66
62
}
63
+
64
+
#region implemented abstract members of DanmakuTriggerReciever
65
+
66
+
public override void Trigger () {
67
+
Fire ();
68
+
}
69
+
70
+
public override Color NodeColor {
71
+
get {
72
+
return Color.red;
73
+
}
74
+
}
75
+
76
+
#endregion
67
77
}
68
78
}
+25
-1
Assets/External Libraries/DanmakuUnity2D/NoScript/DanmakuSource.cs
+25
-1
Assets/External Libraries/DanmakuUnity2D/NoScript/DanmakuSource.cs
···
14
14
}
15
15
}
16
16
17
-
public abstract class DanmakuSource : CachedObject {
17
+
public abstract class DanmakuSource : CachedObject, IDanmakuNode {
18
18
19
19
public DanmakuSource subSource;
20
20
···
120
120
Gizmos.DrawLine(sourcePoints[i].Position, endRay);
121
121
}
122
122
}
123
+
124
+
#region IDanmakuNode implementation
125
+
126
+
public bool Connect (IDanmakuNode node) {
127
+
if (node is DanmakuSource) {
128
+
subSource = node as DanmakuSource;
129
+
return true;
130
+
}
131
+
return false;
132
+
}
133
+
134
+
public string NodeName {
135
+
get {
136
+
return GetType().ToString();
137
+
}
138
+
}
139
+
140
+
public Color NodeColor {
141
+
get {
142
+
return Color.green;
143
+
}
144
+
}
145
+
146
+
#endregion
123
147
}
124
148
125
149
}
+48
-6
Assets/External Libraries/DanmakuUnity2D/NoScript/DanmakuTrigger.cs
+48
-6
Assets/External Libraries/DanmakuUnity2D/NoScript/DanmakuTrigger.cs
···
1
1
using UnityEngine;
2
-
using System.Collections;
2
+
using System.Collections.Generic;
3
3
using UnityUtilLib;
4
4
5
5
namespace Danmaku2D {
6
6
7
-
public abstract class DanmakuTriggerReciever : CachedObject {
7
+
public abstract class DanmakuTriggerReciever : CachedObject, IDanmakuNode {
8
8
9
9
[SerializeField]
10
-
private DanmakuTrigger[] triggers;
10
+
private List<DanmakuTrigger> triggers;
11
11
12
12
public override void Awake () {
13
13
base.Awake ();
14
-
for(int i = 0; i < triggers.Length; i++) {
14
+
for(int i = 0; i < triggers.Count; i++) {
15
15
if(triggers[i] != null) {
16
16
triggers[i].triggerCallback += Trigger;
17
17
}
···
19
19
}
20
20
21
21
public void OnDestroy() {
22
-
for(int i = 0; i < triggers.Length; i++) {
22
+
for(int i = 0; i < triggers.Count; i++) {
23
23
if(triggers[i] != null) {
24
24
triggers[i].triggerCallback -= Trigger;
25
25
}
···
27
27
}
28
28
29
29
public abstract void Trigger ();
30
+
31
+
#region IDanmakuNode implementation
32
+
33
+
public virtual bool Connect (IDanmakuNode node) {
34
+
if (node is DanmakuTrigger) {
35
+
triggers.Add(node as DanmakuTrigger);
36
+
return true;
37
+
}
38
+
return false;
39
+
}
40
+
41
+
public virtual string NodeName {
42
+
get {
43
+
return GetType().ToString();
44
+
}
45
+
}
46
+
47
+
public abstract Color NodeColor {
48
+
get;
49
+
}
50
+
51
+
#endregion
30
52
}
31
53
32
54
[AddComponentMenu("Danmaku 2D/Danmaku Trigger")]
33
-
public class DanmakuTrigger : CachedObject {
55
+
public class DanmakuTrigger : CachedObject, IDanmakuNode {
34
56
35
57
public delegate void TriggerCallback ();
36
58
···
40
62
if(triggerCallback != null)
41
63
triggerCallback();
42
64
}
65
+
66
+
#region IDanmakuNode implementation
67
+
68
+
public string NodeName {
69
+
get {
70
+
return GetType().ToString();
71
+
}
72
+
}
73
+
74
+
public Color NodeColor {
75
+
get {
76
+
return Color.white;
77
+
}
78
+
}
79
+
80
+
public virtual bool Connect (IDanmakuNode node) {
81
+
return false;
82
+
}
83
+
84
+
#endregion
43
85
44
86
}
45
87
+46
-20
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifier.cs
+46
-20
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifier.cs
···
4
4
5
5
namespace Danmaku2D {
6
6
7
-
public abstract class Modifier : CachedObject {
7
+
public abstract class Modifier : CachedObject, IDanmakuNode {
8
+
9
+
[SerializeField]
10
+
private Modifier subModifier;
11
+
12
+
public Modifier SubModifier {
13
+
get {
14
+
return subModifier;
15
+
}
16
+
set {
17
+
subModifier = value;
18
+
if(subModifier != null)
19
+
WrappedModifier.SubModifier = subModifier.WrappedModifier;
20
+
}
21
+
}
8
22
9
23
public abstract FireModifier WrappedModifier {
10
24
get;
11
25
}
26
+
27
+
public override void Awake() {
28
+
base.Awake ();
29
+
if(subModifier != null)
30
+
WrappedModifier.SubModifier = subModifier.WrappedModifier;
31
+
}
32
+
33
+
#region IDanmakuNode implementation
34
+
public virtual bool Connect (IDanmakuNode node) {
35
+
if (node is Modifier) {
36
+
SubModifier = node as Modifier;
37
+
return true;
38
+
}
39
+
return false;
40
+
}
12
41
42
+
public virtual string NodeName {
43
+
get {
44
+
return GetType().ToString();
45
+
}
46
+
}
47
+
48
+
public Color NodeColor {
49
+
get {
50
+
return Color.green;
51
+
}
52
+
}
53
+
#endregion
13
54
}
14
55
15
-
public abstract class ModifierWrapper<T> : Modifier where T : FireModifier {
56
+
public abstract class Modifier<T> : Modifier where T : FireModifier {
16
57
17
58
[SerializeField]
18
59
private T modifier;
19
-
60
+
20
61
public override FireModifier WrappedModifier {
21
62
get {
22
63
return modifier;
23
64
}
24
65
}
25
66
26
-
[SerializeField]
27
-
private Modifier subModifier;
28
-
29
-
public Modifier SubModifier {
67
+
public override string NodeName {
30
68
get {
31
-
return subModifier;
32
-
}
33
-
set {
34
-
subModifier = value;
35
-
if(subModifier != null)
36
-
modifier.SubModifier = subModifier.WrappedModifier;
69
+
return typeof(T).ToString();
37
70
}
38
71
}
39
-
40
-
public override void Awake() {
41
-
base.Awake ();
42
-
if(subModifier != null)
43
-
modifier.SubModifier = subModifier.WrappedModifier;
44
-
}
45
-
46
72
}
47
73
}
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/BurstModifier.cs
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/BurstModifier.cs
···
1
-
using UnityEngine;
1
+
using UnityEngine;
2
2
using System.Collections;
3
3
using UnityUtilLib;
4
4
···
40
40
41
41
namespace Wrapper {
42
42
43
-
[AddComponentMenu("Danmaku 2D/Modifiers/Burst")]
44
-
public class BurstModifier : ModifierWrapper<Danmaku2D.BurstModifier> {
43
+
[AddComponentMenu("Danmaku 2D/Modifiers/Burst Modifier")]
44
+
public class BurstModifier : Modifier<Danmaku2D.BurstModifier> {
45
45
}
46
46
47
47
}
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/LineModifier.cs
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/LineModifier.cs
···
1
-
using UnityEngine;
1
+
using UnityEngine;
2
2
using UnityUtilLib;
3
3
4
4
namespace Danmaku2D {
···
27
27
28
28
namespace Wrapper {
29
29
30
-
[AddComponentMenu("Danmaku 2D/Modifiers/Line")]
31
-
internal class LineModifier : ModifierWrapper<Danmaku2D.LineModifier> {
30
+
[AddComponentMenu("Danmaku 2D/Modifiers/Line Modifier")]
31
+
internal class LineModifier : Modifier<Danmaku2D.LineModifier> {
32
32
}
33
33
34
34
}
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/RandomizeAngleModifier.cs
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/RandomizeAngleModifier.cs
···
1
-
using UnityEngine;
1
+
using UnityEngine;
2
2
using UnityUtilLib;
3
3
4
4
namespace Danmaku2D {
···
21
21
22
22
namespace Wrapper {
23
23
24
-
[AddComponentMenu("Danmaku 2D/Modifiers/Randomize Angle")]
25
-
internal class RandomizeAngleModifier : ModifierWrapper<Danmaku2D.RandomizeAngleModifier> {
24
+
[AddComponentMenu("Danmaku 2D/Modifiers/Randomize Angle Modifier")]
25
+
internal class RandomizeAngleModifier : Modifier<Danmaku2D.RandomizeAngleModifier> {
26
26
}
27
27
28
28
}
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/RandomizeAngularVelocityModifier.cs
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/RandomizeAngularVelocityModifier.cs
···
1
-
using UnityEngine;
1
+
using UnityEngine;
2
2
using UnityUtilLib;
3
3
4
4
namespace Danmaku2D {
···
23
23
24
24
namespace Wrapper {
25
25
26
-
[AddComponentMenu("Danmaku 2D/Modifiers/Randomize Angular Velocity")]
27
-
internal class RandomizeAngularVelocityModifier : ModifierWrapper<Danmaku2D.RandomizeAngularVelocityModifier> {
26
+
[AddComponentMenu("Danmaku 2D/Modifiers/Randomize Angular Velocity Modifier")]
27
+
internal class RandomizeAngularVelocityModifier : Modifier<Danmaku2D.RandomizeAngularVelocityModifier> {
28
28
}
29
29
30
30
}
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/RandomizeVelocityModifier.cs
+3
-3
Assets/External Libraries/DanmakuUnity2D/NoScript/Modifiers/RandomizeVelocityModifier.cs
···
1
-
using UnityEngine;
1
+
using UnityEngine;
2
2
using UnityUtilLib;
3
3
4
4
namespace Danmaku2D {
···
23
23
24
24
namespace Wrapper {
25
25
26
-
[AddComponentMenu("Danmaku 2D/Modifiers/Randomize Velocity")]
27
-
internal class RandomizeVelocityModifier : ModifierWrapper<Danmaku2D.RandomizeVelocityModifier> {
26
+
[AddComponentMenu("Danmaku 2D/Modifiers/Randomize Velocity Modifier")]
27
+
internal class RandomizeVelocityModifier : Modifier<Danmaku2D.RandomizeVelocityModifier> {
28
28
}
29
29
30
30
}
+2
-2
Assets/Resources/Characters/Australia/InvertOtherScreen.cs
+2
-2
Assets/Resources/Characters/Australia/InvertOtherScreen.cs
···
21
21
float rot = TargetField.Camera2DRotation;
22
22
float altRot = rot + 180f;
23
23
float t = 0;
24
-
Time.timeScale = 0f;
24
+
DanmakuGameController.PauseGame ();
25
25
while (t < 1f) {
26
26
TargetField.Camera2DRotation = Mathf.Lerp(rot, altRot, t);
27
27
yield return new WaitForEndOfFrame();
28
28
t += Time.unscaledDeltaTime / flipDuration;
29
29
}
30
30
TargetField.Camera2DRotation = altRot;
31
-
Time.timeScale = 1f;
31
+
DanmakuGameController.UnpauseGame ();
32
32
33
33
}
34
34
}
+35
Assets/Scenes/Main Menu.unity
+35
Assets/Scenes/Main Menu.unity
···
2253
2253
- 114: {fileID: 692082123}
2254
2254
- 114: {fileID: 692082122}
2255
2255
- 114: {fileID: 692082121}
2256
+
- 114: {fileID: 692082125}
2256
2257
m_Layer: 0
2257
2258
m_Name: EventSystem
2258
2259
m_TagString: Untagged
···
2315
2316
m_Children: []
2316
2317
m_Father: {fileID: 0}
2317
2318
m_RootOrder: 2
2319
+
--- !u!114 &692082125
2320
+
MonoBehaviour:
2321
+
m_ObjectHideFlags: 0
2322
+
m_PrefabParentObject: {fileID: 0}
2323
+
m_PrefabInternal: {fileID: 0}
2324
+
m_GameObject: {fileID: 692082120}
2325
+
m_Enabled: 1
2326
+
m_EditorHideFlags: 0
2327
+
m_Script: {fileID: 11500000, guid: 0c4e4f002f1792f4aa4bab53b9200ea7, type: 3}
2328
+
m_Name:
2329
+
m_EditorClassIdentifier:
2330
+
triggers: []
2331
+
sources: []
2332
+
fireData:
2333
+
Prefab: {fileID: 0}
2334
+
Position: {x: 0, y: 0}
2335
+
Rotation:
2336
+
type: 0
2337
+
centerValue: 0
2338
+
range: 0
2339
+
Velocity:
2340
+
type: 0
2341
+
centerValue: 0
2342
+
range: 0
2343
+
AngularVelocity:
2344
+
type: 0
2345
+
centerValue: 0
2346
+
range: 0
2347
+
CoordinateSystem: 0
2348
+
Damage: 0
2349
+
modifier: {fileID: 0}
2350
+
controllers: []
2351
+
fireSFX: {fileID: 0}
2352
+
fireVolume: 1
2318
2353
--- !u!1 &717385574
2319
2354
GameObject:
2320
2355
m_ObjectHideFlags: 0