warlock/bubble_shooter_2d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added dissolve effect and fixed bugs.

Browse Source
This commit is contained in:
amannan-123 2023-01-08 19:36:28 +05:00
parent bc9d4330a9
commit b653b65cec
17 changed files with 3778 additions and 591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Bubbles/Blue.prefab
View File

@ -55,7 +55,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- {fileID: 2100000, guid: a233552779a82f44f98aee0c9dc41310, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 4a6a7164cd93bef40b52b5206c2c09dd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -223,8 +223,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f82c0d51bb10bf4ba81fd6d4b22703f, type: 3}
m_Name:
m_EditorClassIdentifier:
raycastRange: 6
raycastOffset: 15
raycastRange: 5
raycastOffset: 10
isFixed: 1
isConnected: 1
bubbleColor: 0

8
Assets/Bubbles/Bomb.prefab
View File

@ -55,7 +55,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- {fileID: 2100000, guid: a233552779a82f44f98aee0c9dc41310, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: c30e63f5518131f4f9ab95571dfac31d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -223,8 +223,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f82c0d51bb10bf4ba81fd6d4b22703f, type: 3}
m_Name:
m_EditorClassIdentifier:
raycastRange: 6
raycastOffset: 15
raycastRange: 5
raycastOffset: 10
isFixed: 1
isConnected: 1
bubbleColor: 4

8
Assets/Bubbles/Purple.prefab
View File

@ -55,7 +55,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- {fileID: 2100000, guid: a233552779a82f44f98aee0c9dc41310, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 9b321ade59d148f4f8536cc95aa15a45, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -223,8 +223,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f82c0d51bb10bf4ba81fd6d4b22703f, type: 3}
m_Name:
m_EditorClassIdentifier:
raycastRange: 6
raycastOffset: 15
raycastRange: 5
raycastOffset: 10
isFixed: 1
isConnected: 1
bubbleColor: 3

8
Assets/Bubbles/Red.prefab
View File

@ -55,7 +55,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- {fileID: 2100000, guid: a233552779a82f44f98aee0c9dc41310, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 1383c283c59ae664188afcd793cdd0fb, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -223,8 +223,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f82c0d51bb10bf4ba81fd6d4b22703f, type: 3}
m_Name:
m_EditorClassIdentifier:
raycastRange: 6
raycastOffset: 15
raycastRange: 5
raycastOffset: 10
isFixed: 1
isConnected: 1
bubbleColor: 2

8
Assets/Bubbles/Yellow.prefab
View File

@ -55,7 +55,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- {fileID: 2100000, guid: a233552779a82f44f98aee0c9dc41310, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 4dd23c0ac6d84c649ba4890b749c8a55, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -223,8 +223,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f82c0d51bb10bf4ba81fd6d4b22703f, type: 3}
m_Name:
m_EditorClassIdentifier:
raycastRange: 6
raycastOffset: 15
raycastRange: 5
raycastOffset: 10
isFixed: 1
isConnected: 1
bubbleColor: 1

8
Assets/Effects/DissolveEffect.meta Normal file
View File

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

62
Assets/Effects/DissolveEffect/DissolveMaterial.mat Normal file
View File

@ -0,0 +1,62 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DissolveMaterial
m_Shader: {fileID: -6465566751694194690, guid: 422da57ecc1b1ac40a39279f77eb5cc1,
type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BorderThickness: 0.03
- _DissolveAmount: 0
- _DissolveIntensity: 50
- _QueueControl: 0
- _QueueOffset: 0
m_Colors:
- _BorderColor: {r: 8, g: 0, b: 8, a: 1}
m_BuildTextureStacks: []
--- !u!114 &5628767240034088511
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5

8
Assets/Effects/DissolveEffect/DissolveMaterial.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a233552779a82f44f98aee0c9dc41310
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

3080
Assets/Effects/DissolveEffect/SpriteDissolveShader.shadergraph Normal file
View File

File diff suppressed because it is too large Load Diff

10
Assets/Effects/DissolveEffect/SpriteDissolveShader.shadergraph.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 422da57ecc1b1ac40a39279f77eb5cc1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

918
Assets/Levels/Bubbles.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/Global Volume Profile.asset
View File

@ -32,7 +32,7 @@ MonoBehaviour:
m_Value: 0.9
intensity:
m_OverrideState: 1
m_Value: 1
m_Value: 0.1
scatter:
m_OverrideState: 1
m_Value: 0.5

59
Assets/Scenes/Scene.unity
View File

@ -662,37 +662,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 207927620}
m_CullTransparentMesh: 1
--- !u!1 &238612147
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 238612148}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &238612148
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 238612147}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -28.591122, y: -106.69143, z: -1.623271}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &246933647
GameObject:
m_ObjectHideFlags: 0
@ -1265,7 +1234,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 272638327}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -36.593464, y: 9.781217, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -1915,7 +1884,7 @@ MonoBehaviour:
- name: background
audioSource: {fileID: 0}
clip: {fileID: 8300000, guid: 38a1dbb3984138d43ac49e940ce4f553, type: 3}
volume: 0.6
volume: 0.4
pitch: 1
loop: 1
- name: shoot
@ -1944,9 +1913,9 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 614367931}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.015660524, y: -0.04740715, z: 0}
m_LocalScale: {x: 15, y: 20, z: 1}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
@ -1965,7 +1934,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -0.0663915}
m_Offset: {x: 0, y: -0.0069546923}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
@ -1976,7 +1945,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 6.03, y: 0.40278304}
m_Size: {x: 6.03, y: 0.28390944}
m_EdgeRadius: 0
--- !u!1 &771882207
GameObject:
@ -4562,7 +4531,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1772301369}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 86.52633, y: 113.8891, z: 1.8352821}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -6127,7 +6096,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4b54f801eb73ddd4288a4042d4598a96, type: 3}
m_Name:
m_EditorClassIdentifier:
RayDistance: 200
shootScript: {fileID: 6678577465819248627}
explosionPrefab: {fileID: 1828176872806910, guid: 64891a0eb28db934898420d80ca07cb3,
type: 3}
@ -6142,8 +6110,11 @@ MonoBehaviour:
levelsUI: {fileID: 558042660}
LightObj: {fileID: 272638327}
bottomLimit: {fileID: 96063829}
gravityScale: 50
dropSpeed: 50
gameState: play
isDissolving: 0
dissolveSpeed: 2
RayDistance: 200
--- !u!4 &6678577467272666029
Transform:
m_ObjectHideFlags: 0
@ -6152,7 +6123,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6678577467272666031}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -87.15, y: 150.8, z: -0.14430904}
m_LocalPosition: {x: -87.15, y: 147.2, z: -0.14430904}
m_LocalScale: {x: 15, y: 20, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -6211,7 +6182,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -18.5, y: -1.15}
m_AnchoredPosition: {x: -18.41, y: -3.17}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6678577467275817598
@ -6258,7 +6229,7 @@ Grid:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6678577467275817569}
m_Enabled: 1
m_CellSize: {x: 0.92, y: 1, z: 1}
m_CellSize: {x: 0.9, y: 1, z: 1}
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 1
m_CellSwizzle: 0

22
Assets/Scripts/Bubble.cs
View File

@ -14,20 +14,10 @@ public class Bubble : MonoBehaviour
private void OnCollisionEnter2D(Collision2D collision)
{
if (collision.gameObject.tag == "Bubble" && collision.gameObject.GetComponent<Bubble>().isFixed)
if ((collision.gameObject.tag == "Bubble" && collision.gameObject.GetComponent<Bubble>().isFixed) || collision.gameObject.tag == "Limit")
{
if (!isFixed)
{
HasCollided();
}
}
if (collision.gameObject.tag == "Limit")
{
if (!isFixed)
{
HasCollided();
}
}
}
@ -40,10 +30,10 @@ public class Bubble : MonoBehaviour
GameManager.instance.ProcessTurn(transform);
}
public List<Transform> GetNeighbors()
public List<Transform> GetNeighbours()
{
List<RaycastHit2D> hits = new List<RaycastHit2D>();
List<Transform> neighbors = new List<Transform>();
List<Transform> neighbours = new List<Transform>();
hits.Add(Physics2D.Raycast(new Vector2(transform.position.x - raycastOffset, transform.position.y), Vector3.left, raycastRange));
hits.Add(Physics2D.Raycast(new Vector2(transform.position.x + raycastOffset, transform.position.y), Vector3.right, raycastRange));
@ -56,11 +46,11 @@ public class Bubble : MonoBehaviour
{
if (hit.collider != null && hit.transform.tag.Equals("Bubble"))
{
neighbors.Add(hit.transform);
neighbours.Add(hit.transform);
}
}
return neighbors;
return neighbours;
}
void OnBecameInvisible()
@ -76,7 +66,7 @@ public class Bubble : MonoBehaviour
public void OnDrawGizmosSelected()
{
Gizmos.color = Color.white;
foreach (Transform tr in GetNeighbors())
foreach (Transform tr in GetNeighbours())
{
Gizmos.DrawLine(transform.position, tr.position);
}

148
Assets/Scripts/GameManager.cs
View File

@ -11,15 +11,15 @@ public class GameManager : MonoBehaviour
private void Awake()
{
if (instance == null)
{
instance = this;
}
WinMenu.SetActive(false);
LoseMenu.SetActive(false);
levelsUI.SetActive(false);
sequenceBubbles = new List<Transform>();
connectedBubbles = new List<Transform>();
bubblesToDestroy = new List<Transform>();
bubblesToDrop = new List<Transform>();
bubblesToDissolve = new List<Transform>();
DontDestroyOnLoad(gameObject);
}
#endregion
@ -28,8 +28,8 @@ public class GameManager : MonoBehaviour
private List<Transform> sequenceBubbles;
private List<Transform> connectedBubbles;
private List<Transform> bubblesToDestroy;
public float RayDistance = 200f;
private List<Transform> bubblesToDrop;
private List<Transform> bubblesToDissolve;
public Shooter shootScript;
public GameObject explosionPrefab;
public GameObject WinMenu;
@ -43,9 +43,57 @@ public class GameManager : MonoBehaviour
public GameObject levelsUI;
public GameObject LightObj;
public Transform bottomLimit;
public float gravityScale = 1f;
public float dropSpeed = 50f;
public string gameState = "play";
private bool hitABomb = false;
public bool isDissolving = false;
public float dissolveSpeed = 2f;
public float RayDistance = 200f;
private void Update()
{
if (isDissolving)
{
foreach (Transform bubble in bubblesToDissolve)
{
if (bubble == null)
{
//make sure every bubble disappeared before ending the dissolve
if (bubblesToDissolve.IndexOf(bubble) == bubblesToDissolve.Count - 1)
{
isDissolving = false;
EmptyDissolveList();
break;
}
else continue;
}
SpriteRenderer spriteRenderer = bubble.GetComponent<SpriteRenderer>();
float dissolveAmount = spriteRenderer.material.GetFloat("_DissolveAmount");
if (dissolveAmount >= 0.99f)
{
isDissolving = false;
EmptyDissolveList();
break;
}
else
{
float newDissolve = dissolveAmount + dissolveSpeed * Time.deltaTime;
spriteRenderer.material.SetFloat("_DissolveAmount", newDissolve);
}
}
}
}
private void EmptyDissolveList()
{
foreach (Transform bubble in bubblesToDissolve)
if (bubble != null) Destroy(bubble.gameObject);
bubblesToDissolve.Clear();
}
public void ToggleGameState()
{
@ -152,42 +200,14 @@ public class GameManager : MonoBehaviour
}
}
private void ProcessSpecialBubbles(Transform currentBubble)
{
Bubble bubbleScript = currentBubble.GetComponent<Bubble>();
List<Transform> neighbors = bubbleScript.GetNeighbors();
foreach (Transform t in neighbors)
{
Bubble bScript = t.GetComponent<Bubble>();
if (bScript.bubbleColor == Bubble.BubbleColor.Bomb)
{
hitABomb = true;
GameObject explosion = Instantiate(explosionPrefab, t.position, Quaternion.identity);
explosion.transform.localScale = new Vector3(25f, 25f, 1f);
Destroy(explosion, 0.5f);
Destroy(t.gameObject);
foreach (Transform t2 in bScript.GetNeighbors())
{
if (sequenceBubbles.Contains(t2)) sequenceBubbles.Remove(t2);
Destroy(t2.gameObject);
}
}
}
}
private void CheckBubbleSequence(Transform currentBubble)
{
sequenceBubbles.Add(currentBubble);
Bubble bubbleScript = currentBubble.GetComponent<Bubble>();
List<Transform> neighbors = bubbleScript.GetNeighbors();
List<Transform> neighbours = bubbleScript.GetNeighbours();
foreach (Transform t in neighbors)
foreach (Transform t in neighbours)
{
if (!sequenceBubbles.Contains(t))
{
@ -201,6 +221,42 @@ public class GameManager : MonoBehaviour
}
}
private void ProcessSpecialBubbles(Transform currentBubble)
{
Bubble bubbleScript = currentBubble.GetComponent<Bubble>();
List<Transform> neighbours = bubbleScript.GetNeighbours();
foreach (Transform t in neighbours)
{
Bubble bScript = t.GetComponent<Bubble>();
if (bScript.bubbleColor == Bubble.BubbleColor.Bomb)
{
hitABomb = true;
//create explosion effect
GameObject explosion = Instantiate(explosionPrefab, t.position, Quaternion.identity);
explosion.transform.localScale = new Vector3(25f, 25f, 1f);
Destroy(explosion, 0.5f);
//destroy the bomb
Destroy(t.gameObject);
//destroy the neighbours of bomb
foreach (Transform t2 in bScript.GetNeighbours())
{
if (sequenceBubbles.Contains(t2))
sequenceBubbles.Remove(t2);
Destroy(t2.gameObject);
}
ScoreManager.GetInstance().AddScore(10);
}
}
}
private void ProcessBubblesInSequence()
{
if (hitABomb)
@ -210,13 +266,16 @@ public class GameManager : MonoBehaviour
foreach (Transform t in sequenceBubbles)
{
if (!bubblesToDestroy.Contains(t))
if (!bubblesToDissolve.Contains(t))
{
ScoreManager.GetInstance().AddScore(1);
t.tag = "Untagged";
bubblesToDestroy.Add(t);
t.SetParent(null);
t.GetComponent<CircleCollider2D>().enabled = false;
bubblesToDissolve.Add(t);
}
}
isDissolving = true;
}
#region Drop Disconected Bubbles
@ -257,7 +316,7 @@ public class GameManager : MonoBehaviour
Bubble bubbleScript = bubble.GetComponent<Bubble>();
bubbleScript.isConnected = true;
foreach (Transform t in bubbleScript.GetNeighbors())
foreach (Transform t in bubbleScript.GetNeighbours())
{
if (!connectedBubbles.Contains(t))
{
@ -273,11 +332,11 @@ public class GameManager : MonoBehaviour
Bubble bubbleScript = bubble.GetComponent<Bubble>();
if (!bubbleScript.isConnected)
{
if (!bubblesToDestroy.Contains(bubble))
if (!bubblesToDrop.Contains(bubble))
{
ScoreManager.GetInstance().AddScore(2);
bubble.tag = "Untagged";
bubblesToDestroy.Add(bubble);
bubblesToDrop.Add(bubble);
}
}
}
@ -285,7 +344,7 @@ public class GameManager : MonoBehaviour
private void DropAll()
{
foreach (Transform bubble in bubblesToDestroy)
foreach (Transform bubble in bubblesToDrop)
{
bubble.SetParent(null);
//Destroy(bubble.gameObject);
@ -293,14 +352,13 @@ public class GameManager : MonoBehaviour
if (!bubble.GetComponent<Rigidbody2D>())
{
Rigidbody2D rig = (Rigidbody2D)bubble.gameObject.AddComponent(typeof(Rigidbody2D));
rig.gravityScale = gravityScale;
rig.gravityScale = dropSpeed;
}
}
bubblesToDestroy.Clear();
bubblesToDrop.Clear();
}
#endregion
public void OnDrawGizmosSelected()
{
Gizmos.color = Color.red;

10
Bubble Shooter 2D_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt
View File

@ -163,9 +163,9 @@ Library: lib_burst_generated
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Scheduler.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Postprocessing.Runtime.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.2D.PixelPerfect.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Assembly-CSharp.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Device.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Analytics.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Assembly-CSharp.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.2D.IK.Runtime.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.2D.Tilemap.Extras.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Threading.dll
@ -180,14 +180,14 @@ Library: lib_burst_generated
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Universal.Shaders.dll
--assembly-folder=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\
--pdb-search-paths=Temp/ManagedSymbols/
--method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--aa309157da5950aa53ed6075709e6e40
--method=UnityEngine.Jobs.IJobParallelForTransformExtensions+TransformParallelForLoopStruct`1[[UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--670478f3fb3f285eeace534fbe61a03e
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.LightExtractionJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.LightExtractionJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--34e8fec66b799db60cf2f2f751c3bdd9
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.MinMaxZJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.MinMaxZJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--d23a07cb3c3f217121d5bf94e76674f0
--method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.Rendering.Universal.RadixSortJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.RadixSortJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--26c6d10914da2fc98755b3533c59141e
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.SliceCombineJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.SliceCombineJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--e046a1595d0148509657ed4dbcb52a86
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.SliceCullingJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.SliceCullingJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--1998da082e6413092f0e7bcd5a0e9331
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ZBinningJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ZBinningJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--77fc393cb521ac129b1392d4eb94d29a
--method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--aa309157da5950aa53ed6075709e6e40
--method=UnityEngine.Jobs.IJobParallelForTransformExtensions+TransformParallelForLoopStruct`1[[UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--670478f3fb3f285eeace534fbe61a03e
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.LightExtractionJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.LightExtractionJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--34e8fec66b799db60cf2f2f751c3bdd9
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.MinMaxZJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.MinMaxZJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--d23a07cb3c3f217121d5bf94e76674f0
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.VisibleLight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.VisibleLight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--b04c75a68edf1d166f6547f2ea0e8928
--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.Universal.LightMinMaxZ, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.Universal.LightMinMaxZ, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--e943843acfb78f5f2f3716a6553740d9
--method=Unity.Burst.BurstCompiler+BurstCompilerHelper, Unity.Burst, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::IsBurstEnabled()--8c2be93e18276203cbd918daa2748a10

2
Bubble Shooter 2D_BurstDebugInformation_DoNotShip/tempburstlibs/x86/lib_burst_generated.txt
View File

@ -163,9 +163,9 @@ Library: lib_burst_generated
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Scheduler.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Postprocessing.Runtime.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.2D.PixelPerfect.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Assembly-CSharp.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Device.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Analytics.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Assembly-CSharp.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.2D.IK.Runtime.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.2D.Tilemap.Extras.dll
--root-assembly=D:\Unity\Bubble Shooter 2D\Temp\StagingArea\Data\Managed\Unity.Services.Core.Threading.dll