Explosions now make fun shakes and add to fun

This commit is contained in:
Sofia 2019-08-04 21:09:52 +03:00
parent 58947a4583
commit 6cf9a21b2a
3 changed files with 25 additions and 29 deletions

View File

@ -75,6 +75,7 @@ MonoBehaviour:
Bullet: {fileID: 4482402865533696887, guid: a3bd810156720f24a9fe5e1ba27d7da8, type: 3} Bullet: {fileID: 4482402865533696887, guid: a3bd810156720f24a9fe5e1ba27d7da8, type: 3}
Sprite: {fileID: 4462327695001662280} Sprite: {fileID: 4462327695001662280}
BulletHole: {fileID: 427857587156450783} BulletHole: {fileID: 427857587156450783}
Cooldown: 0.2
--- !u!1 &4462327695001662282 --- !u!1 &4462327695001662282
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -142,7 +143,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -947994997 m_SortingLayerID: -947994997
m_SortingLayer: 3 m_SortingLayer: 4
m_SortingOrder: 1 m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 918f808d2d9fc104696617ebfe2a323e, type: 3} m_Sprite: {fileID: 21300000, guid: 918f808d2d9fc104696617ebfe2a323e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}

View File

@ -6678,7 +6678,7 @@ PrefabInstance:
- target: {fileID: 4462327695001662280, guid: 7b3529c1a7d22d143a060281857bbca5, - target: {fileID: 4462327695001662280, guid: 7b3529c1a7d22d143a060281857bbca5,
type: 3} type: 3}
propertyPath: m_SortingLayer propertyPath: m_SortingLayer
value: 3 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3}
@ -6764,20 +6764,20 @@ PrefabInstance:
propertyPath: HandRotationRetractSpeed propertyPath: HandRotationRetractSpeed
value: 200 value: 200
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8489029732599905344, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3}
propertyPath: m_SortingLayer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8489029732241002784, guid: 14a47f86f9e45da45863a81716f2378b, - target: {fileID: 8489029732241002784, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3} type: 3}
propertyPath: m_SortingLayer propertyPath: m_SortingLayer
value: 3 value: 4
objectReference: {fileID: 0}
- target: {fileID: 8489029732599905344, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6970513589971572751, guid: 14a47f86f9e45da45863a81716f2378b, - target: {fileID: 6970513589971572751, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3} type: 3}
propertyPath: m_SortingLayer propertyPath: m_SortingLayer
value: 3 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 14a47f86f9e45da45863a81716f2378b, type: 3}
@ -6787,38 +6787,24 @@ MonoBehaviour:
type: 3} type: 3}
m_PrefabInstance: {fileID: 370761184} m_PrefabInstance: {fileID: 370761184}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 370761186} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0eb42a731c31b5f49a58e1045b654e3e, type: 3} m_Script: {fileID: 11500000, guid: 0eb42a731c31b5f49a58e1045b654e3e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &370761186 stripped --- !u!114 &370761188 stripped
GameObject: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8489029732530782804, guid: 14a47f86f9e45da45863a81716f2378b, m_CorrespondingSourceObject: {fileID: 5050980832709922958, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3} type: 3}
m_PrefabInstance: {fileID: 370761184} m_PrefabInstance: {fileID: 370761184}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &370761187 m_GameObject: {fileID: 0}
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 370761186}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c0a7560055c54ab479467ce5b1c7cfcd, type: 3} m_Script: {fileID: 11500000, guid: c0a7560055c54ab479467ce5b1c7cfcd, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Player: {fileID: 370761185}
MaxFun: 100
FunDegradeSpeed: 5
StandingStillMultiplier: 1.5
WeaponFun: 20
EnemyExplosionFun: 2
FurnitureExplosionFun: 1
DebugAdd10Fun: 0
--- !u!4 &370761190 stripped --- !u!4 &370761190 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, m_CorrespondingSourceObject: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b,
@ -9610,7 +9596,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: PlayerFun propertyPath: PlayerFun
value: value:
objectReference: {fileID: 370761187} objectReference: {fileID: 370761188}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 75aac28ba4e17cc4d99ef646650a3d70, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 75aac28ba4e17cc4d99ef646650a3d70, type: 3}
--- !u!1 &1878201189 --- !u!1 &1878201189

View File

@ -7,6 +7,9 @@ namespace Saltosion.OneWeapon {
public GameObject[] BodypartPrefabs; public GameObject[] BodypartPrefabs;
public bool DebugExplode = false; public bool DebugExplode = false;
private CameraFX CameraFX;
private PlayerFun PlayerFun;
private void Start() { private void Start() {
foreach (GameObject Obj in BodypartPrefabs) { foreach (GameObject Obj in BodypartPrefabs) {
Rigidbody2D Body = Obj.GetComponent<Rigidbody2D>(); Rigidbody2D Body = Obj.GetComponent<Rigidbody2D>();
@ -16,6 +19,9 @@ namespace Saltosion.OneWeapon {
"Following is the GameObject that needs to get a Rigidbody2D."); "Following is the GameObject that needs to get a Rigidbody2D.");
} }
} }
CameraFX = Camera.main.GetComponent<CameraFX>();
PlayerFun = GameObject.FindGameObjectWithTag("Player").GetComponent<PlayerFun>();
} }
private void Update() { private void Update() {
@ -45,6 +51,9 @@ namespace Saltosion.OneWeapon {
BloodLauncher.Splatter(transform.position + (Vector3)Direction * 0.5f, Vector2.zero, 70, 50f, 360f); BloodLauncher.Splatter(transform.position + (Vector3)Direction * 0.5f, Vector2.zero, 70, 50f, 360f);
} }
PlayerFun.Explosion(false);
CameraFX.ScreenShake(10);
if (destroyGameObject) { if (destroyGameObject) {
Destroy(gameObject); Destroy(gameObject);
} }