Skip to content

Commit fb45c73

Browse files
committedSep 13, 2017
Fixes?
1 parent b1eb2c8 commit fb45c73

File tree

3 files changed

+43
-42
lines changed

3 files changed

+43
-42
lines changed
 

‎Assets/Resources/Data/SpecialData.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MonoBehaviour:
1919
_spawnRateMs: 250
2020
_damage: 10
2121
_cooldownSeconds: 60
22-
_ammoPrefab: {fileID: 114382286587870314, guid: 3db9adea8af677d41931b79dbeee2654,
22+
_ammoPrefab: {fileID: 114059217750620034, guid: 80f3093d09a963f4cb45053ef3bba80f,
2323
type: 2}
2424
_poolSize: 6
2525
- _id: 2

‎Assets/Resources/Prefabs/Fighter/Fighter.prefab

+37-37
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ GameObject:
4949
serializedVersion: 5
5050
m_Component:
5151
- component: {fileID: 4294630108665762}
52-
- component: {fileID: 114858733412773806}
52+
- component: {fileID: 114395335381332398}
5353
m_Layer: 0
5454
m_Name: LeftWeapon
5555
m_TagString: Untagged
@@ -171,7 +171,7 @@ GameObject:
171171
serializedVersion: 5
172172
m_Component:
173173
- component: {fileID: 4827738835848772}
174-
- component: {fileID: 114772541747988610}
174+
- component: {fileID: 114517423482778228}
175175
m_Layer: 0
176176
m_Name: RightWeapon
177177
m_TagString: Untagged
@@ -1264,8 +1264,8 @@ MonoBehaviour:
12641264
_stats:
12651265
_currentHealth: 0
12661266
_loadoutSlots:
1267-
- {fileID: 114858733412773806}
1268-
- {fileID: 114772541747988610}
1267+
- {fileID: 114395335381332398}
1268+
- {fileID: 114517423482778228}
12691269
_targetingMissiles: 0
12701270
_aiFSM: {fileID: 114813334755554340}
12711271
--- !u!114 &114076896847433008
@@ -1279,7 +1279,7 @@ MonoBehaviour:
12791279
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
12801280
m_Name:
12811281
m_EditorClassIdentifier:
1282-
skeletonDataAsset: {fileID: 11400000, guid: 9c169756a6eacd54aac5656b6f895195, type: 2}
1282+
skeletonDataAsset: {fileID: 0}
12831283
initialSkinName: default
12841284
initialFlipX: 0
12851285
initialFlipY: 0
@@ -4762,7 +4762,7 @@ MonoBehaviour:
47624762
locked: 0
47634763
manualUpdate: 0
47644764
keepDelayedEventsOnStateExit: 0
4765-
preprocessed: 0
4765+
preprocessed: 1
47664766
ExposedEvents: []
47674767
RestartOnEnable: 1
47684768
EnableDebugFlow: 0
@@ -5483,6 +5483,18 @@ MonoBehaviour:
54835483
m_Script: {fileID: -664232604, guid: e743331561ef77147ae48cda9bcb8209, type: 3}
54845484
m_Name:
54855485
m_EditorClassIdentifier:
5486+
--- !u!114 &114395335381332398
5487+
MonoBehaviour:
5488+
m_ObjectHideFlags: 1
5489+
m_PrefabParentObject: {fileID: 0}
5490+
m_PrefabInternal: {fileID: 100100000}
5491+
m_GameObject: {fileID: 1173720285071194}
5492+
m_Enabled: 1
5493+
m_EditorHideFlags: 0
5494+
m_Script: {fileID: 11500000, guid: 7cd646503279ba1429652090ee888e5a, type: 3}
5495+
m_Name:
5496+
m_EditorClassIdentifier:
5497+
_slotId: 2
54865498
--- !u!114 &114427481708488456
54875499
MonoBehaviour:
54885500
m_ObjectHideFlags: 1
@@ -5494,7 +5506,7 @@ MonoBehaviour:
54945506
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
54955507
m_Name:
54965508
m_EditorClassIdentifier:
5497-
skeletonDataAsset: {fileID: 11400000, guid: 910df7705828b1e469cad3e84f5de15d, type: 2}
5509+
skeletonDataAsset: {fileID: 0}
54985510
initialSkinName: default
54995511
initialFlipX: 0
55005512
initialFlipY: 0
@@ -5524,7 +5536,7 @@ MonoBehaviour:
55245536
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
55255537
m_Name:
55265538
m_EditorClassIdentifier:
5527-
skeletonDataAsset: {fileID: 11400000, guid: 2e1cdc0af8580c84c8d1ffb48f1c36b0, type: 2}
5539+
skeletonDataAsset: {fileID: 0}
55285540
initialSkinName: default
55295541
initialFlipX: 0
55305542
initialFlipY: 0
@@ -5543,6 +5555,18 @@ MonoBehaviour:
55435555
translator:
55445556
autoReset: 1
55455557
layerMixModes: 00000000
5558+
--- !u!114 &114517423482778228
5559+
MonoBehaviour:
5560+
m_ObjectHideFlags: 1
5561+
m_PrefabParentObject: {fileID: 0}
5562+
m_PrefabInternal: {fileID: 100100000}
5563+
m_GameObject: {fileID: 1467801909039560}
5564+
m_Enabled: 1
5565+
m_EditorHideFlags: 0
5566+
m_Script: {fileID: 11500000, guid: 7cd646503279ba1429652090ee888e5a, type: 3}
5567+
m_Name:
5568+
m_EditorClassIdentifier:
5569+
_slotId: 3
55465570
--- !u!114 &114585493738604782
55475571
MonoBehaviour:
55485572
m_ObjectHideFlags: 1
@@ -5554,7 +5578,7 @@ MonoBehaviour:
55545578
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
55555579
m_Name:
55565580
m_EditorClassIdentifier:
5557-
skeletonDataAsset: {fileID: 11400000, guid: 9c169756a6eacd54aac5656b6f895195, type: 2}
5581+
skeletonDataAsset: {fileID: 0}
55585582
initialSkinName: default
55595583
initialFlipX: 0
55605584
initialFlipY: 0
@@ -5584,7 +5608,7 @@ MonoBehaviour:
55845608
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
55855609
m_Name:
55865610
m_EditorClassIdentifier:
5587-
skeletonDataAsset: {fileID: 11400000, guid: 47db1b6fd4130574c9ebe4edf1d554ed, type: 2}
5611+
skeletonDataAsset: {fileID: 0}
55885612
initialSkinName: default
55895613
initialFlipX: 0
55905614
initialFlipY: 0
@@ -5614,7 +5638,7 @@ MonoBehaviour:
56145638
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
56155639
m_Name:
56165640
m_EditorClassIdentifier:
5617-
skeletonDataAsset: {fileID: 11400000, guid: 47db1b6fd4130574c9ebe4edf1d554ed, type: 2}
5641+
skeletonDataAsset: {fileID: 0}
56185642
initialSkinName: default
56195643
initialFlipX: 0
56205644
initialFlipY: 0
@@ -5644,7 +5668,7 @@ MonoBehaviour:
56445668
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
56455669
m_Name:
56465670
m_EditorClassIdentifier:
5647-
skeletonDataAsset: {fileID: 11400000, guid: 52a4459df0b112f44a4d9cec7841906d, type: 2}
5671+
skeletonDataAsset: {fileID: 0}
56485672
initialSkinName: default
56495673
initialFlipX: 0
56505674
initialFlipY: 0
@@ -5663,18 +5687,6 @@ MonoBehaviour:
56635687
translator:
56645688
autoReset: 1
56655689
layerMixModes: 00000000
5666-
--- !u!114 &114772541747988610
5667-
MonoBehaviour:
5668-
m_ObjectHideFlags: 1
5669-
m_PrefabParentObject: {fileID: 0}
5670-
m_PrefabInternal: {fileID: 100100000}
5671-
m_GameObject: {fileID: 1467801909039560}
5672-
m_Enabled: 1
5673-
m_EditorHideFlags: 0
5674-
m_Script: {fileID: 11500000, guid: 60ce7d8e102c75a488a0da8599910de1, type: 3}
5675-
m_Name:
5676-
m_EditorClassIdentifier:
5677-
_slotId: 3
56785690
--- !u!114 &114813334755554340
56795691
MonoBehaviour:
56805692
m_ObjectHideFlags: 1
@@ -5901,7 +5913,7 @@ MonoBehaviour:
59015913
m_Script: {fileID: 11500000, guid: f9db98c60740638449864eb028fbe7ad, type: 3}
59025914
m_Name:
59035915
m_EditorClassIdentifier:
5904-
skeletonDataAsset: {fileID: 11400000, guid: 52a4459df0b112f44a4d9cec7841906d, type: 2}
5916+
skeletonDataAsset: {fileID: 0}
59055917
initialSkinName: default
59065918
initialFlipX: 0
59075919
initialFlipY: 0
@@ -5920,18 +5932,6 @@ MonoBehaviour:
59205932
translator:
59215933
autoReset: 1
59225934
layerMixModes: 00000000
5923-
--- !u!114 &114858733412773806
5924-
MonoBehaviour:
5925-
m_ObjectHideFlags: 1
5926-
m_PrefabParentObject: {fileID: 0}
5927-
m_PrefabInternal: {fileID: 100100000}
5928-
m_GameObject: {fileID: 1173720285071194}
5929-
m_Enabled: 1
5930-
m_EditorHideFlags: 0
5931-
m_Script: {fileID: 11500000, guid: 60ce7d8e102c75a488a0da8599910de1, type: 3}
5932-
m_Name:
5933-
m_EditorClassIdentifier:
5934-
_slotId: 2
59355935
--- !u!114 &114918469421026086
59365936
MonoBehaviour:
59375937
m_ObjectHideFlags: 1

‎Assets/Resources/Prefabs/Specials/Missile.prefab

+5-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GameObject:
3838
- component: {fileID: 114688124730888604}
3939
- component: {fileID: 61069985701172094}
4040
- component: {fileID: 50131847656868900}
41-
- component: {fileID: 114382286587870314}
41+
- component: {fileID: 114059217750620034}
4242
m_Layer: 12
4343
m_Name: Missile
4444
m_TagString: Untagged
@@ -148,20 +148,21 @@ BoxCollider2D:
148148
serializedVersion: 2
149149
m_Size: {x: 1.3, y: 0.5}
150150
m_EdgeRadius: 0
151-
--- !u!114 &114382286587870314
151+
--- !u!114 &114059217750620034
152152
MonoBehaviour:
153153
m_ObjectHideFlags: 1
154154
m_PrefabParentObject: {fileID: 0}
155155
m_PrefabInternal: {fileID: 100100000}
156156
m_GameObject: {fileID: 1748166558079754}
157157
m_Enabled: 1
158158
m_EditorHideFlags: 0
159-
m_Script: {fileID: 11500000, guid: 6c3fb8db10a67804fb25c044ab88a935, type: 3}
159+
m_Script: {fileID: 11500000, guid: 2ab0e08fb8ce7ff4ca7ed535d419d6f6, type: 3}
160160
m_Name:
161161
m_EditorClassIdentifier:
162-
_impactPrefab: {fileID: 114257822177534370, guid: 1d8cc07cfe9fb454abacf9e94f478751,
162+
_impactPrefab: {fileID: 114257822177534370, guid: 63ac292f49c94ef49941ab2a868b6b5d,
163163
type: 2}
164164
_velocity: 25
165+
_launchAudioId: missile
165166
_fighterTarget: {fileID: 0}
166167
_chaffTarget: {fileID: 0}
167168
--- !u!114 &114688124730888604

0 commit comments

Comments
 (0)
Please sign in to comment.