diff --git a/Assets/Prefabs/Revolver.prefab b/Assets/Prefabs/Revolver.prefab index 9404178..d5fcd5a 100644 --- a/Assets/Prefabs/Revolver.prefab +++ b/Assets/Prefabs/Revolver.prefab @@ -75,6 +75,7 @@ MonoBehaviour: Bullet: {fileID: 4482402865533696887, guid: a3bd810156720f24a9fe5e1ba27d7da8, type: 3} Sprite: {fileID: 4462327695001662280} BulletHole: {fileID: 427857587156450783} + Cooldown: 0.2 --- !u!1 &4462327695001662282 GameObject: m_ObjectHideFlags: 0 @@ -142,7 +143,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -947994997 - m_SortingLayer: 3 + m_SortingLayer: 4 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 918f808d2d9fc104696617ebfe2a323e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index dd9a2c2..5878c6c 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -6678,7 +6678,7 @@ PrefabInstance: - target: {fileID: 4462327695001662280, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} propertyPath: m_SortingLayer - value: 3 + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} @@ -6764,20 +6764,20 @@ PrefabInstance: propertyPath: HandRotationRetractSpeed value: 200 objectReference: {fileID: 0} - - target: {fileID: 8489029732599905344, guid: 14a47f86f9e45da45863a81716f2378b, - type: 3} - propertyPath: m_SortingLayer - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8489029732241002784, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} 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} - target: {fileID: 6970513589971572751, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} propertyPath: m_SortingLayer - value: 3 + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} @@ -6787,38 +6787,24 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 370761184} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 370761186} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0eb42a731c31b5f49a58e1045b654e3e, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &370761186 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8489029732530782804, guid: 14a47f86f9e45da45863a81716f2378b, +--- !u!114 &370761188 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5050980832709922958, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} m_PrefabInstance: {fileID: 370761184} m_PrefabAsset: {fileID: 0} ---- !u!114 &370761187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 370761186} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c0a7560055c54ab479467ce5b1c7cfcd, type: 3} m_Name: m_EditorClassIdentifier: - Player: {fileID: 370761185} - MaxFun: 100 - FunDegradeSpeed: 5 - StandingStillMultiplier: 1.5 - WeaponFun: 20 - EnemyExplosionFun: 2 - FurnitureExplosionFun: 1 - DebugAdd10Fun: 0 --- !u!4 &370761190 stripped Transform: m_CorrespondingSourceObject: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, @@ -9610,7 +9596,7 @@ PrefabInstance: type: 3} propertyPath: PlayerFun value: - objectReference: {fileID: 370761187} + objectReference: {fileID: 370761188} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 75aac28ba4e17cc4d99ef646650a3d70, type: 3} --- !u!1 &1878201189 diff --git a/Assets/Scripts/Explodable.cs b/Assets/Scripts/Explodable.cs index 5d4df21..964fa58 100644 --- a/Assets/Scripts/Explodable.cs +++ b/Assets/Scripts/Explodable.cs @@ -7,6 +7,9 @@ namespace Saltosion.OneWeapon { public GameObject[] BodypartPrefabs; public bool DebugExplode = false; + private CameraFX CameraFX; + private PlayerFun PlayerFun; + private void Start() { foreach (GameObject Obj in BodypartPrefabs) { Rigidbody2D Body = Obj.GetComponent(); @@ -16,6 +19,9 @@ namespace Saltosion.OneWeapon { "Following is the GameObject that needs to get a Rigidbody2D."); } } + + CameraFX = Camera.main.GetComponent(); + PlayerFun = GameObject.FindGameObjectWithTag("Player").GetComponent(); } private void Update() { @@ -45,6 +51,9 @@ namespace Saltosion.OneWeapon { BloodLauncher.Splatter(transform.position + (Vector3)Direction * 0.5f, Vector2.zero, 70, 50f, 360f); } + PlayerFun.Explosion(false); + CameraFX.ScreenShake(10); + if (destroyGameObject) { Destroy(gameObject); }