Merge pull request #11 from dnutiu/fix-bombs

Fix bombs

Assets/DevMocks/Bomb.prefab

@@ -12,9 +12,9 @@ GameObject:
   - component: {fileID: 1758273947879077417}
   - component: {fileID: 8277411166637495994}
   - component: {fileID: 1412018915745597861}
-  m_Layer: 8
+  m_Layer: 0
   m_Name: Bomb
-  m_TagString: Untagged
+  m_TagString: Bomb
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -27,8 +27,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5909392949477884267}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0.0552, y: 0.0418, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.0162, y: 0.7533, z: 0}
   m_Children:
   - {fileID: 6508079771898401246}
   m_Father: {fileID: 0}
@@ -70,18 +70,18 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingOrder: 9
-  m_Sprite: {fileID: 21300000, guid: 859c7170e1479c748860f3b811d14018, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 98d73a0d91287d34ea2ede695d239f4f, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 2.27, y: 0.97}
+  m_Size: {x: 1, y: 1}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
+  m_SpriteSortPoint: 1
 --- !u!114 &8277411166637495994
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -94,13 +94,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6ab98bc57fd60074388e64d7af5de3df, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  timer: 5
-  levelMask:
-    serializedVersion: 2
-    m_Bits: 256
   explosionPrefab: {fileID: 2086996798441195857, guid: 13213ac562d960e4e8c33d53d40a516c,
     type: 3}
-  power: 3
 --- !u!50 &1412018915745597861
 Rigidbody2D:
   serializedVersion: 4
@@ -109,7 +104,7 @@ Rigidbody2D:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5909392949477884267}
-  m_BodyType: 0
+  m_BodyType: 1
   m_Simulated: 1
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 0
@@ -121,7 +116,7 @@ Rigidbody2D:
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
-  m_Constraints: 0
+  m_Constraints: 4
 --- !u!1 &8683250532155440700
 GameObject:
   m_ObjectHideFlags: 0
@@ -134,7 +129,7 @@ GameObject:
   - component: {fileID: 2175931883523803554}
   m_Layer: 8
   m_Name: 2DCollider
-  m_TagString: Untagged
+  m_TagString: Bomb
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -148,7 +143,7 @@ Transform:
   m_GameObject: {fileID: 8683250532155440700}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 0}
   m_Children: []
   m_Father: {fileID: 6884214445299032247}
   m_RootOrder: 0
@@ -166,7 +161,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0.009168625, y: 0}
+  m_Offset: {x: 0.5, y: 0.5}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -177,5 +172,5 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1.1100235, y: 1}
+  m_Size: {x: 1, y: 1}
   m_EdgeRadius: 0

Assets/DevMocks/Explosion.prefab

@@ -11,9 +11,10 @@ GameObject:
   - component: {fileID: 2219719956326328737}
   - component: {fileID: 105666002419767893}
   - component: {fileID: 2976769454423190410}
-  m_Layer: 8
+  - component: {fileID: 5317321277803550577}
+  m_Layer: 0
   m_Name: Explosion
-  m_TagString: Untagged
+  m_TagString: Explosion
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -68,7 +69,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingOrder: 9
   m_Sprite: {fileID: 21300004, guid: 07d05f8fcd727b641baa0ccf95c8c770, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -79,7 +80,7 @@ SpriteRenderer:
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
+  m_SpriteSortPoint: 1
 --- !u!114 &2976769454423190410
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -92,3 +93,29 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 00b7acc459217644283ce8202cadcded, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!61 &5317321277803550577
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2086996798441195857}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.53872055, y: 0.5387204}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: -0.005050569, y: -0.0050504208}
+    oldSize: {x: 1.0666667, y: 1.0666667}
+    newSize: {x: 1.28, y: 1.28}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.0666667, y: 1.0666667}
+  m_EdgeRadius: 0

Assets/DevMocks/ParticleSpriteAtlas.png.meta

@@ -98,7 +98,7 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -118,7 +118,7 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -134,10 +134,10 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 0
-        y: 256
+        y: 253
         width: 128
-        height: 128
+        height: 131
-      alignment: 0
+      alignment: 6
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
@@ -158,7 +158,7 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -178,7 +178,7 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -198,7 +198,7 @@ TextureImporter:
         width: 128
         height: 128
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []

Assets/DevMocks/bman_destructible_wall.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 4177940729222266823}
   - component: {fileID: 4177940729222266822}
   - component: {fileID: 2823577682722293689}
-  m_Layer: 0
+  m_Layer: 8
   m_Name: bman_destructible_wall
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/DevMocks/bman_wall.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 5959564480851182333}
   - component: {fileID: 5959564480851182332}
   - component: {fileID: 5959564480851182331}
-  m_Layer: 0
+  m_Layer: 8
   m_Name: bman_wall
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -69,7 +69,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 9
   m_Sprite: {fileID: 21300000, guid: 96d3693302b284c92ba9c394bb4f72c1, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/DevMocks/bomb1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 859c7170e1479c748860f3b811d14018
+guid: 98d73a0d91287d34ea2ede695d239f4f
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -43,9 +43,9 @@ TextureImporter:
   spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
-  alignment: 0
+  alignment: 6
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 200
+  spritePixelsToUnits: 32
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: d37d114aa63973e449f69ffd1429b8ae
+    spriteID: 62b1ac1cb6a320140ac9bd5e9b091023
     vertices: []
     indices: 
     edges: []

Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 74a491a3f49a745eab0ec1f9e031b533
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/src/Ammo/BombController.cs

@@ -2,13 +2,11 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class BombController : MonoBehaviour
+public class BombController : MonoBehaviour, IExplosable
 {
- 
-    public LayerMask levelMask;
     public GameObject explosionPrefab;
 
-    BombStatsUtil bombStatsUtil = BombStatsUtil.Instance;
+    BombStatsManager bombStatsUtil = BombStatsManager.Instance;
     bool exploded = false;
 
     // Start is called before the first frame update
@@ -21,52 +19,23 @@ public class BombController : MonoBehaviour
     {
         Instantiate(explosionPrefab, transform.position, Quaternion.identity);
 
+        GetComponent<SpriteRenderer>().enabled = false;
         transform.Find("2DCollider").gameObject.SetActive(false);
 
-        //StartCoroutine(CreateExplosions(Vector3.up));
+        StartCoroutine(CreateExplosions(Vector3.down));
-        //StartCoroutine(CreateExplosions(Vector3.down));
+        StartCoroutine(CreateExplosions(Vector3.left));
-        //StartCoroutine(CreateExplosions(Vector3.left));
+        StartCoroutine(CreateExplosions(Vector3.up));
-        //StartCoroutine(CreateExplosions(Vector3.right));
+        StartCoroutine(CreateExplosions(Vector3.right));
-
+      
-        CreateExplosions(Vector3.up);
-        CreateExplosions(Vector3.down);
-        CreateExplosions(Vector3.left);
-        CreateExplosions(Vector3.right);
-
-        GetComponent<SpriteRenderer>().enabled = false;
         exploded = true;
-
+        Destroy(gameObject, 0.3f);
-        //Destroy(gameObject, 0.3f);
-        Destroy(gameObject);
     }
 
-    //private IEnumerator CreateExplosions(Vector3 direction)
+    private IEnumerator CreateExplosions(Vector3 direction)
-    //{
-    //    for (int i = 1; i < bombStatsUtil.Power; i++)
-    //    {
-    //        RaycastHit2D hit = Physics2D.Raycast(transform.position + new Vector3(0, .5f, 0), direction, i, levelMask);
-
-    //        if (!hit.collider)
-    //        {
-    //            Instantiate(explosionPrefab, transform.position + (i * direction), explosionPrefab.transform.rotation);
-    //        }
-    //        else
-    //        {
-    //            break;
-    //        }
-
-    //    }
-
-    //    yield return new WaitForSeconds(0.05f);
-
-    //}
-
-    private void CreateExplosions(Vector3 direction)
     {
         for (int i = 1; i < bombStatsUtil.Power; i++)
         {
-            RaycastHit2D hit = Physics2D.Raycast(transform.position + new Vector3(0, .5f, 0), direction, i, levelMask);
+            RaycastHit2D hit = Physics2D.Raycast(new Vector2(transform.position.x, transform.position.y), direction, i, 1 << 8);
-
             if (!hit.collider)
             {
                 Instantiate(explosionPrefab, transform.position + (i * direction), explosionPrefab.transform.rotation);
@@ -78,15 +47,22 @@ public class BombController : MonoBehaviour
 
         }
 
+        yield return new WaitForSeconds(0.05f);
+
     }
 
     public void OnTriggerEnter2D(Collider2D other)
     {
         if (!exploded && other.CompareTag("Explosion"))
         {
-            //In caz ca o bomba loveste bomba, dam cancel la explozie sa nu explodeze twice si o explodam automagic
+            onExplosion();
-            CancelInvoke("Explode");
-            Explode();
         }
     }
+
+    public void onExplosion()
+    {
+        //In caz ca o bomba loveste bomba, dam cancel la explozie sa nu explodeze twice si o explodam automagic
+        CancelInvoke("Explode");
+        Explode();
+    }
 }

Assets/Scripts/src/Ammo/Explosion.cs

@@ -4,10 +4,10 @@ using UnityEngine;
 
 public class Explosion : MonoBehaviour
 {
+    BombStatsManager bombUtil = BombStatsManager.Instance;
 
     public void Start()
     {
-        Destroy(gameObject, 1);
+        Destroy(gameObject, bombUtil.ExplosionDuration);
     }
-
 }

Assets/Scripts/src/Base/PlayerBase.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 
 namespace src.Base
 {
-    public abstract class PlayerBase : GameplayComponent
+    public abstract class PlayerBase : GameplayComponent, IExplosable
     {
         public float movementSpeed = 4f;
         
@@ -14,5 +14,18 @@ namespace src.Base
         {
             Rigidbody2d = GetComponent<Rigidbody2D>();
         }
+
+        public void OnTriggerEnter2D(Collider2D other)
+        {
+            if (other.CompareTag("Explosion"))
+            {
+                onExplosion();
+            }
+        }
+
+        public void onExplosion()
+        {
+            Debug.Log("Player hit by explosion");
+        }
     }
 }

Assets/Scripts/src/Interfaces.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 55804228f3fc40ad8c5e0992ea925b1c
+guid: 4da2cb208323e1547b451a8f9e66f76f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/src/Interfaces/IExplosable.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public interface IExplosable
+{ 
+    void onExplosion();
+}

Assets/Scripts/src/Interfaces/IExplosable.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1732dec3e9b48e545bba3c9910f6a1a0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/src/Managers/BombStatsManager.cs

@@ -1,27 +1,23 @@
 using System.Collections;
 using System.Collections.Generic;
 
-public sealed class BombStatsUtil
+public sealed class BombStatsManager
 {
     
-    private static readonly BombStatsUtil instance = new BombStatsUtil();
+    private static readonly BombStatsManager instance = new BombStatsManager();
     const int MAX_POWER = 7;
 
     public int Power { get; private set; } = 3;
 
     public float Timer { get; } = 3.0f;
 
-    // Explicit static constructor to tell C# compiler
+    public float ExplosionDuration { get; } = 0.55f;
-    // not to mark type as beforefieldinit
+
-    static BombStatsUtil()
+    private BombStatsManager()
     {
     }
 
-    private BombStatsUtil()
+    public static BombStatsManager Instance
-    {
-    }
-
-    public static BombStatsUtil Instance
     {
         get
         {

Assets/Scripts/src/Player/PlayerController.cs

@@ -1,6 +1,7 @@
 using System;
 using src.Base;
 using UnityEngine;
+using UnityEngine.Tilemaps;
 
 namespace src.Player
 {
@@ -8,7 +9,6 @@ namespace src.Player
     {
         public Transform respawnPosition;
 
-
         public GameObject bombPrefab;
 
         protected new void Start()
@@ -56,10 +56,10 @@ namespace src.Player
         }
 
         private void PlaceBomb()
-        {
+        {           
-            Instantiate(bombPrefab, new Vector3(Mathf.RoundToInt(transform.position.x),
+            var absX = Mathf.RoundToInt(transform.position.x);
-                    bombPrefab.transform.position.y, 0f),
+            var absY = Mathf.RoundToInt(transform.position.y);
-                bombPrefab.transform.rotation);
+            Instantiate(bombPrefab, new Vector3(absX, absY, 0), Quaternion.identity);
         }
 
         private void HandleBomb()
@@ -80,5 +80,14 @@ namespace src.Player
         {
             transform.position = respawnPosition.position;
         }
+
+        public void OnTriggerExit2D(Collider2D other)
+        {
+            if (other.CompareTag("Bomb"))
+            {
+                
+                other.isTrigger = false;
+            }
+        }
     }
 }

Assets/Scripts/src/Util.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 089561e493132fe4f936dd59f4e6d357
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ProjectSettings/Physics2DSettings.asset

@@ -39,11 +39,11 @@ Physics2DSettings:
     m_IslandSolverBodiesPerJob: 50
     m_IslandSolverContactsPerJob: 50
   m_AutoSimulation: 1
-  m_QueriesHitTriggers: 1
+  m_QueriesHitTriggers: 0
   m_QueriesStartInColliders: 0
   m_CallbacksOnDisable: 1
-  m_ReuseCollisionCallbacks: 1
+  m_ReuseCollisionCallbacks: 0
-  m_AutoSyncTransforms: 0
+  m_AutoSyncTransforms: 1
   m_AlwaysShowColliders: 0
   m_ShowColliderSleep: 1
   m_ShowColliderContacts: 0
@@ -53,4 +53,4 @@ Physics2DSettings:
   m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
   m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
   m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
-  m_LayerCollisionMatrix: fffbfffffffbfffffbfbfffffffffffffffbfffffffbffffffffffffffffffffffffffffffffffffc8fbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: fffbfffffffbfffffffbfffffffffffffffbfffffffbfffffffffffffffffffffffbffffffffffffc8faffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

ProjectSettings/QualitySettings.asset

@@ -1,191 +1,219 @@
-%YAML 1.1
+%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:unity3d.com,2011:
---- !u!47 &1
+--- !u!47 &1
-QualitySettings:
+QualitySettings:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 0
-  serializedVersion: 5
+  serializedVersion: 5
-  m_CurrentQuality: 3
+  m_CurrentQuality: 3
-  m_QualitySettings:
+  m_QualitySettings:
-  - serializedVersion: 2
+  - serializedVersion: 2
-    name: Very Low
+    name: Very Low
-    pixelLightCount: 0
+    pixelLightCount: 0
-    shadows: 0
+    shadows: 0
-    shadowResolution: 0
+    shadowResolution: 0
-    shadowProjection: 1
+    shadowProjection: 1
-    shadowCascades: 1
+    shadowCascades: 1
-    shadowDistance: 15
+    shadowDistance: 15
-    shadowNearPlaneOffset: 3
+    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
+    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 0
+    shadowmaskMode: 0
-    blendWeights: 1
+    blendWeights: 1
-    textureQuality: 1
+    textureQuality: 1
-    anisotropicTextures: 0
+    anisotropicTextures: 0
-    antiAliasing: 0
+    antiAliasing: 0
-    softParticles: 0
+    softParticles: 0
-    softVegetation: 0
+    softVegetation: 0
-    realtimeReflectionProbes: 0
+    realtimeReflectionProbes: 0
-    billboardsFaceCameraPosition: 0
+    billboardsFaceCameraPosition: 0
-    vSyncCount: 0
+    vSyncCount: 0
-    lodBias: 0.3
+    lodBias: 0.3
-    maximumLODLevel: 0
+    maximumLODLevel: 0
-    particleRaycastBudget: 4
+    streamingMipmapsActive: 0
-    asyncUploadTimeSlice: 2
+    streamingMipmapsAddAllCameras: 1
-    asyncUploadBufferSize: 16
+    streamingMipmapsMemoryBudget: 512
-    resolutionScalingFixedDPIFactor: 1
+    streamingMipmapsRenderersPerFrame: 512
-    excludedTargetPlatforms: []
+    streamingMipmapsMaxLevelReduction: 2
-  - serializedVersion: 2
+    streamingMipmapsMaxFileIORequests: 1024
-    name: Low
+    particleRaycastBudget: 4
-    pixelLightCount: 0
+    asyncUploadTimeSlice: 2
-    shadows: 0
+    asyncUploadBufferSize: 16
-    shadowResolution: 0
+    asyncUploadPersistentBuffer: 1
-    shadowProjection: 1
+    resolutionScalingFixedDPIFactor: 1
-    shadowCascades: 1
+    excludedTargetPlatforms: []
-    shadowDistance: 20
+  - serializedVersion: 2
-    shadowNearPlaneOffset: 3
+    name: Low
-    shadowCascade2Split: 0.33333334
+    pixelLightCount: 0
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadows: 0
-    shadowmaskMode: 0
+    shadowResolution: 0
-    blendWeights: 2
+    shadowProjection: 1
-    textureQuality: 0
+    shadowCascades: 1
-    anisotropicTextures: 0
+    shadowDistance: 20
-    antiAliasing: 0
+    shadowNearPlaneOffset: 3
-    softParticles: 0
+    shadowCascade2Split: 0.33333334
-    softVegetation: 0
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    realtimeReflectionProbes: 0
+    shadowmaskMode: 0
-    billboardsFaceCameraPosition: 0
+    blendWeights: 2
-    vSyncCount: 0
+    textureQuality: 0
-    lodBias: 0.4
+    anisotropicTextures: 0
-    maximumLODLevel: 0
+    antiAliasing: 0
-    particleRaycastBudget: 16
+    softParticles: 0
-    asyncUploadTimeSlice: 2
+    softVegetation: 0
-    asyncUploadBufferSize: 16
+    realtimeReflectionProbes: 0
-    resolutionScalingFixedDPIFactor: 1
+    billboardsFaceCameraPosition: 0
-    excludedTargetPlatforms: []
+    vSyncCount: 0
-  - serializedVersion: 2
+    lodBias: 0.4
-    name: Medium
+    maximumLODLevel: 0
-    pixelLightCount: 1
+    streamingMipmapsActive: 0
-    shadows: 0
+    streamingMipmapsAddAllCameras: 1
-    shadowResolution: 0
+    streamingMipmapsMemoryBudget: 512
-    shadowProjection: 1
+    streamingMipmapsRenderersPerFrame: 512
-    shadowCascades: 1
+    streamingMipmapsMaxLevelReduction: 2
-    shadowDistance: 20
+    streamingMipmapsMaxFileIORequests: 1024
-    shadowNearPlaneOffset: 3
+    particleRaycastBudget: 16
-    shadowCascade2Split: 0.33333334
+    asyncUploadTimeSlice: 2
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    asyncUploadBufferSize: 16
-    shadowmaskMode: 0
+    asyncUploadPersistentBuffer: 1
-    blendWeights: 2
+    resolutionScalingFixedDPIFactor: 1
-    textureQuality: 0
+    excludedTargetPlatforms: []
-    anisotropicTextures: 0
+  - serializedVersion: 2
-    antiAliasing: 0
+    name: Medium
-    softParticles: 0
+    pixelLightCount: 1
-    softVegetation: 0
+    shadows: 0
-    realtimeReflectionProbes: 0
+    shadowResolution: 0
-    billboardsFaceCameraPosition: 0
+    shadowProjection: 1
-    vSyncCount: 1
+    shadowCascades: 1
-    lodBias: 0.7
+    shadowDistance: 20
-    maximumLODLevel: 0
+    shadowNearPlaneOffset: 3
-    particleRaycastBudget: 64
+    shadowCascade2Split: 0.33333334
-    asyncUploadTimeSlice: 2
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    asyncUploadBufferSize: 16
+    shadowmaskMode: 0
-    resolutionScalingFixedDPIFactor: 1
+    blendWeights: 2
-    excludedTargetPlatforms: []
+    textureQuality: 0
-  - serializedVersion: 2
+    anisotropicTextures: 0
-    name: High
+    antiAliasing: 0
-    pixelLightCount: 2
+    softParticles: 0
-    shadows: 0
+    softVegetation: 0
-    shadowResolution: 1
+    realtimeReflectionProbes: 0
-    shadowProjection: 1
+    billboardsFaceCameraPosition: 0
-    shadowCascades: 2
+    vSyncCount: 1
-    shadowDistance: 40
+    lodBias: 0.7
-    shadowNearPlaneOffset: 3
+    maximumLODLevel: 0
-    shadowCascade2Split: 0.33333334
+    streamingMipmapsActive: 0
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    streamingMipmapsAddAllCameras: 1
-    shadowmaskMode: 1
+    streamingMipmapsMemoryBudget: 512
-    blendWeights: 2
+    streamingMipmapsRenderersPerFrame: 512
-    textureQuality: 0
+    streamingMipmapsMaxLevelReduction: 2
-    anisotropicTextures: 0
+    streamingMipmapsMaxFileIORequests: 1024
-    antiAliasing: 0
+    particleRaycastBudget: 64
-    softParticles: 0
+    asyncUploadTimeSlice: 2
-    softVegetation: 1
+    asyncUploadBufferSize: 16
-    realtimeReflectionProbes: 0
+    asyncUploadPersistentBuffer: 1
-    billboardsFaceCameraPosition: 0
+    resolutionScalingFixedDPIFactor: 1
-    vSyncCount: 1
+    excludedTargetPlatforms: []
-    lodBias: 1
+  - serializedVersion: 2
-    maximumLODLevel: 0
+    name: High
-    particleRaycastBudget: 256
+    pixelLightCount: 2
-    asyncUploadTimeSlice: 2
+    shadows: 0
-    asyncUploadBufferSize: 16
+    shadowResolution: 1
-    resolutionScalingFixedDPIFactor: 1
+    shadowProjection: 1
-    excludedTargetPlatforms: []
+    shadowCascades: 2
-  - serializedVersion: 2
+    shadowDistance: 40
-    name: Very High
+    shadowNearPlaneOffset: 3
-    pixelLightCount: 3
+    shadowCascade2Split: 0.33333334
-    shadows: 0
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowResolution: 2
+    shadowmaskMode: 1
-    shadowProjection: 1
+    blendWeights: 2
-    shadowCascades: 2
+    textureQuality: 0
-    shadowDistance: 70
+    anisotropicTextures: 0
-    shadowNearPlaneOffset: 3
+    antiAliasing: 0
-    shadowCascade2Split: 0.33333334
+    softParticles: 0
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    softVegetation: 1
-    shadowmaskMode: 1
+    realtimeReflectionProbes: 0
-    blendWeights: 4
+    billboardsFaceCameraPosition: 0
-    textureQuality: 0
+    vSyncCount: 1
-    anisotropicTextures: 0
+    lodBias: 1
-    antiAliasing: 0
+    maximumLODLevel: 0
-    softParticles: 0
+    streamingMipmapsActive: 0
-    softVegetation: 1
+    streamingMipmapsAddAllCameras: 1
-    realtimeReflectionProbes: 0
+    streamingMipmapsMemoryBudget: 512
-    billboardsFaceCameraPosition: 0
+    streamingMipmapsRenderersPerFrame: 512
-    vSyncCount: 1
+    streamingMipmapsMaxLevelReduction: 2
-    lodBias: 1.5
+    streamingMipmapsMaxFileIORequests: 1024
-    maximumLODLevel: 0
+    particleRaycastBudget: 256
-    particleRaycastBudget: 1024
+    asyncUploadTimeSlice: 2
-    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
-    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
+    resolutionScalingFixedDPIFactor: 1
-    excludedTargetPlatforms: []
+    excludedTargetPlatforms: []
-  - serializedVersion: 2
+  - serializedVersion: 2
-    name: Ultra
+    name: Very High
-    pixelLightCount: 4
+    pixelLightCount: 3
-    shadows: 0
+    shadows: 0
-    shadowResolution: 0
+    shadowResolution: 2
-    shadowProjection: 1
+    shadowProjection: 1
-    shadowCascades: 4
+    shadowCascades: 2
-    shadowDistance: 150
+    shadowDistance: 70
-    shadowNearPlaneOffset: 3
+    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
+    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 1
+    shadowmaskMode: 1
-    blendWeights: 4
+    blendWeights: 4
-    textureQuality: 0
+    textureQuality: 0
-    anisotropicTextures: 0
+    anisotropicTextures: 0
-    antiAliasing: 0
+    antiAliasing: 0
-    softParticles: 0
+    softParticles: 0
-    softVegetation: 1
+    softVegetation: 1
-    realtimeReflectionProbes: 0
+    realtimeReflectionProbes: 0
-    billboardsFaceCameraPosition: 0
+    billboardsFaceCameraPosition: 0
-    vSyncCount: 1
+    vSyncCount: 1
-    lodBias: 2
+    lodBias: 1.5
-    maximumLODLevel: 0
+    maximumLODLevel: 0
-    particleRaycastBudget: 4096
+    streamingMipmapsActive: 0
-    asyncUploadTimeSlice: 2
+    streamingMipmapsAddAllCameras: 1
-    asyncUploadBufferSize: 16
+    streamingMipmapsMemoryBudget: 512
-    resolutionScalingFixedDPIFactor: 1
+    streamingMipmapsRenderersPerFrame: 512
-    excludedTargetPlatforms: []
+    streamingMipmapsMaxLevelReduction: 2
-  m_PerPlatformDefaultQuality:
+    streamingMipmapsMaxFileIORequests: 1024
-    Android: 2
+    particleRaycastBudget: 1024
-    Nintendo 3DS: 5
+    asyncUploadTimeSlice: 2
-    Nintendo Switch: 5
+    asyncUploadBufferSize: 16
-    PS4: 5
+    asyncUploadPersistentBuffer: 1
-    PSM: 5
+    resolutionScalingFixedDPIFactor: 1
-    PSP2: 2
+    excludedTargetPlatforms: []
-    Standalone: 5
+  - serializedVersion: 2
-    Tizen: 2
+    name: Ultra
-    WebGL: 3
+    pixelLightCount: 4
-    WiiU: 5
+    shadows: 0
-    Windows Store Apps: 5
+    shadowResolution: 0
-    XboxOne: 5
+    shadowProjection: 1
-    iPhone: 2
+    shadowCascades: 4
-    tvOS: 2
+    shadowDistance: 150
+    shadowNearPlaneOffset: 3
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowmaskMode: 1
+    blendWeights: 4
+    textureQuality: 0
+    anisotropicTextures: 0
+    antiAliasing: 0
+    softParticles: 0
+    softVegetation: 1
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
+    vSyncCount: 1
+    lodBias: 2
+    maximumLODLevel: 0
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
+    particleRaycastBudget: 4096
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
+    resolutionScalingFixedDPIFactor: 1
+    excludedTargetPlatforms: []
+  m_PerPlatformDefaultQuality: {}

ProjectSettings/TagManager.asset

@@ -5,6 +5,7 @@ TagManager:
   serializedVersion: 2
   tags:
   - Explosion
+  - Bomb
   layers:
   - Default
   - TransparentFX

ProjectSettings/UnityConnectSettings.asset

@@ -4,7 +4,7 @@
 UnityConnectSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events