Merge pull request #59 from LeonardoTPereira/fix/LayersAndPlayerShots

Fix player shots and sorting layers
LeonardoTPereira · Feb 25, 2023 · 9db957b · 9db957b
2 parents 247bac7 + 72177f7
commit 9db957b
Show file tree

Hide file tree

Showing 31 changed files with 1,220 additions and 822 deletions.
diff --git a/Assets/Materials/MadMantisMaterial.mat b/Assets/Materials/MadMantisMaterial.mat
@@ -53,7 +53,7 @@ Material:
     - _BUILTIN_QueueControl: -1
     - _BUILTIN_QueueOffset: 0
     - _EnableExternalAlpha: 0
-    - _FillRate: 1.0000001
+    - _FillRate: 0
     - _IsEnraging: 0
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Prefabs/Bosses/LeftHorizontalAttack.prefab b/Assets/Prefabs/Bosses/LeftHorizontalAttack.prefab
@@ -88,8 +88,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 67193d2a17493584880680e93fdbc120, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Prefabs/Bosses/LeftVerticalAttack.prefab b/Assets/Prefabs/Bosses/LeftVerticalAttack.prefab
@@ -89,8 +89,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: de64979dfdccc814f8834607df21e26a, type: 3}
   m_Color: {r: 0.6273585, g: 1, b: 0.68946546, a: 0.9019608}

diff --git a/Assets/Prefabs/Bosses/MadMantis.prefab b/Assets/Prefabs/Bosses/MadMantis.prefab
@@ -175,12 +175,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e49ad9d36e32ad444986a1437ff4549c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  <MaxHP>k__BackingField: 50
-  <EnragedHP>k__BackingField: 30
-  <FlyingHP>k__BackingField: 15
-  <InvincibilityTime>k__BackingField: 0.2
   <MinAttackCooldown>k__BackingField: 0.8
   <MaxAttackCooldown>k__BackingField: 1.2
+  <JumpHeight>k__BackingField: 0
+  <MinFlyHeight>k__BackingField: 0
+  <RoomCenterX>k__BackingField: 0
   <VerticalLeftAttackPrefab>k__BackingField: {fileID: 5632108650389549736, guid: 40783db829c8ca84cbb50dc425ea91fa, type: 3}
   <VerticalRightAttackPrefab>k__BackingField: {fileID: 5632108650389549736, guid: e98a8a6008cc2aa4b91affc1824eaa99, type: 3}
   <HorizontalLeftAttackPrefab>k__BackingField: {fileID: 5632108650389549736, guid: 1db4442118d542c429026acf02f9edaf, type: 3}
@@ -189,6 +188,9 @@ MonoBehaviour:
   <RightClawPosition>k__BackingField: {fileID: 2000874185750064022}
   <UpRightClawPosition>k__BackingField: {fileID: 2000874185807552387}
   <UpLeftClawPosition>k__BackingField: {fileID: 2000874187196739039}
+  <PlayerTransform>k__BackingField: {fileID: 0}
+  <IsEnraged>k__BackingField: 0
+  <IsFlying>k__BackingField: 0
 --- !u!212 &2000874187470131646
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -227,8 +229,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: -2039461891
+  m_SortingLayer: 2
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 8620bcf7fa769e94fa548c2fc0325ef4, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Prefabs/Bosses/RightHorizontalAttack.prefab b/Assets/Prefabs/Bosses/RightHorizontalAttack.prefab
@@ -88,8 +88,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 67193d2a17493584880680e93fdbc120, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Prefabs/Bosses/RightVerticalAttack.prefab b/Assets/Prefabs/Bosses/RightVerticalAttack.prefab
@@ -89,8 +89,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: de64979dfdccc814f8834607df21e26a, type: 3}
   m_Color: {r: 0.2783019, g: 1, b: 0.41103843, a: 0.9019608}

diff --git a/Assets/Prefabs/Bullets/StraightBullet.prefab b/Assets/Prefabs/Bullets/StraightBullet.prefab
@@ -87,9 +87,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingLayerID: 965471649
+  m_SortingLayer: 1
+  m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: d484c21196c2c0a40978cdc031fcc882, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

diff --git a/Assets/Prefabs/Enemies/Bullets/GravityAcid.prefab b/Assets/Prefabs/Enemies/Bullets/GravityAcid.prefab
@@ -74,9 +74,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
+  m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: f747f51b6e4d5814f9c06cb62aa6807f, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

diff --git a/Assets/Prefabs/Enemies/Bullets/GravityAcidOld.prefab b/Assets/Prefabs/Enemies/Bullets/GravityAcidOld.prefab
@@ -72,8 +72,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
   m_Color: {r: 0.6860238, g: 0.9150943, b: 0.40920252, a: 1}

diff --git a/Assets/Prefabs/Enemies/Bullets/NonGravityAcid.prefab b/Assets/Prefabs/Enemies/Bullets/NonGravityAcid.prefab
@@ -74,8 +74,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: f747f51b6e4d5814f9c06cb62aa6807f, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Prefabs/Enemies/Bullets/NonGravityAcidOld.prefab b/Assets/Prefabs/Enemies/Bullets/NonGravityAcidOld.prefab
@@ -72,8 +72,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
   m_Color: {r: 0, g: 0.5660378, b: 0.023932459, a: 1}

diff --git a/Assets/Prefabs/Enemies/Enemy1.prefab b/Assets/Prefabs/Enemies/Enemy1.prefab
@@ -150,9 +150,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingLayerID: -2039461891
+  m_SortingLayer: 2
+  m_SortingOrder: 0
   m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
   m_Color: {r: 1, g: 0, b: 0, a: 1}
   m_FlipX: 0

diff --git a/Assets/Prefabs/Enemies/Enemy2.prefab b/Assets/Prefabs/Enemies/Enemy2.prefab
@@ -77,9 +77,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingLayerID: -2039461891
+  m_SortingLayer: 2
+  m_SortingOrder: 0
   m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
   m_Color: {r: 0.4433962, g: 0, b: 0, a: 1}
   m_FlipX: 0

diff --git a/Assets/Prefabs/Enemies/Enemy3.prefab b/Assets/Prefabs/Enemies/Enemy3.prefab
@@ -78,9 +78,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingLayerID: -2039461891
+  m_SortingLayer: 2
+  m_SortingOrder: 0
   m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
   m_Color: {r: 0.44313726, g: 0.3140794, b: 0, a: 1}
   m_FlipX: 0

diff --git a/Assets/Prefabs/Enemies/Enemy4.prefab b/Assets/Prefabs/Enemies/Enemy4.prefab
@@ -181,9 +181,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingLayerID: -2039461891
+  m_SortingLayer: 2
+  m_SortingOrder: 0
   m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
   m_Color: {r: 0.44313726, g: 0.3140794, b: 0, a: 1}
   m_FlipX: 0
@@ -271,7 +271,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   gravity: 100
-  target: {fileID: 0}
   bullet: {fileID: 7059540043610800535, guid: 6b9bcfd26629aea4385b51067580be86, type: 3}
   fireRate: 2
   animator: {fileID: 1404826970614223229}

diff --git a/Assets/Prefabs/Particles/Damage/BossDamageParticle.prefab b/Assets/Prefabs/Particles/Damage/BossDamageParticle.prefab
@@ -4839,8 +4839,8 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: -2039461891
+  m_SortingLayer: 2
   m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0

diff --git a/Assets/Prefabs/Particles/Damage/DamageParticle.prefab b/Assets/Prefabs/Particles/Damage/DamageParticle.prefab
@@ -4839,8 +4839,8 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: -1854126109
+  m_SortingLayer: 3
   m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0

diff --git a/Assets/Prefabs/Particles/Death/BossDeathParticle.prefab b/Assets/Prefabs/Particles/Death/BossDeathParticle.prefab
@@ -4848,8 +4848,8 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: -2039461891
+  m_SortingLayer: 2
   m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0

diff --git a/Assets/Prefabs/Particles/Death/DeathParticle.prefab b/Assets/Prefabs/Particles/Death/DeathParticle.prefab
@@ -4847,9 +4847,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingLayerID: -1854126109
+  m_SortingLayer: 3
+  m_SortingOrder: 10
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0

diff --git a/Assets/Prefabs/Particles/FirstGun/MuzzleEffectParticle.prefab b/Assets/Prefabs/Particles/FirstGun/MuzzleEffectParticle.prefab
@@ -4847,9 +4847,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1854126109
+  m_SortingLayer: 3
+  m_SortingOrder: -1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

diff --git a/Assets/Prefabs/Particles/FirstGun/SmokeParticle.prefab b/Assets/Prefabs/Particles/FirstGun/SmokeParticle.prefab
@@ -4837,9 +4837,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1854126109
+  m_SortingLayer: 3
+  m_SortingOrder: -1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

diff --git a/Assets/Prefabs/Particles/FirstGun/UsedBulletsParticle.prefab b/Assets/Prefabs/Particles/FirstGun/UsedBulletsParticle.prefab
@@ -4779,9 +4779,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1854126109
+  m_SortingLayer: 3
+  m_SortingOrder: -1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab
@@ -71,8 +71,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1686972967
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 9ec0ca269ec0b4f4fa12877c83d9dd88, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -224,6 +224,7 @@ MonoBehaviour:
   usedBulletsParticle: {fileID: 8272143017390993848}
   muzzleEffectParticle: {fileID: 360293449610646909}
   smokeParticle: {fileID: 6689593771250070437}
+  _anim: {fileID: 0}
   cooldownBonus: 1
 --- !u!114 &5033319859813230717
 MonoBehaviour:
@@ -374,6 +375,10 @@ MonoBehaviour:
         m_CallState: 2
     m_ActionId: 84d15dd6-4613-4de8-8c0e-b3606201bcc9
     m_ActionName: Player/ReleaseJump[/XInputControllerWindows/buttonSouth,/Keyboard/space]
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: 828184f6-33a3-418f-afd4-21c20b1aac3c
+    m_ActionName: Player/PauseMenu[/Keyboard/escape,/Keyboard/p]
   m_NeverAutoSwitchControlSchemes: 0
   m_DefaultControlScheme: 
   m_DefaultActionMap: Player