🔧Update: Change unlit to lit material for enemies, player, grid and b…

…ullets.
LeonardoTPereira · Feb 25, 2023 · 7a0fb6e · 7a0fb6e
1 parent 9db957b
commit 7a0fb6e
Show file tree

Hide file tree

Showing 69 changed files with 17,181 additions and 395 deletions.
diff --git a/Assets/Editor/PlayMenus/PlayMenus.uxml b/Assets/Editor/PlayMenus/PlayMenus.uxml
@@ -19,7 +19,7 @@
             </ui:VisualElement>
         </ui:VisualElement>
     </ui:VisualElement>
-    <ui:VisualElement name="win-menu-container" style="width: 100%; height: 100%; position: absolute; left: 0; top: 0;">
+    <ui:VisualElement name="win-menu-container" style="width: 100%; height: 100%; position: absolute; left: 0; top: 0; opacity: 0;">
         <ui:VisualElement name="main-container" style="width: 100%; height: 100%;">
             <ui:VisualElement name="menu-container" style="height: 100%; width: 50%; left: 25%; right: 25%; min-width: auto; min-height: auto; align-items: center; justify-content: space-between;">
                 <ui:VisualElement name="button-container" style="height: 100%; top: 0; padding-left: 5%; padding-right: 5%; padding-top: 5%; padding-bottom: 5%; justify-content: flex-start; align-items: center; width: 70%;">

diff --git a/Assets/Materials/FixGaps.mat b/Assets/Materials/FixGaps.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: FixGaps
-  m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3}
   m_ValidKeywords:
   - PIXELSNAP_ON
   m_InvalidKeywords: []

diff --git a/Assets/Materials/SpriteLit.mat b/Assets/Materials/SpriteLit.mat
@@ -0,0 +1,46 @@
+%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: SpriteLit
+  m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, 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:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _EnableExternalAlpha: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Materials/SpriteLit.mat.meta b/Assets/Materials/SpriteLit.mat.meta
diff --git a/Assets/Prefabs/Area1.meta b/Assets/Prefabs/Area1.meta
diff --git a/Assets/Prefabs/Bosses/LeftHorizontalAttack.prefab b/Assets/Prefabs/Bosses/LeftHorizontalAttack.prefab
@@ -70,7 +70,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Bosses/LeftVerticalAttack.prefab b/Assets/Prefabs/Bosses/LeftVerticalAttack.prefab
@@ -71,7 +71,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Bosses/MadMantis.prefab b/Assets/Prefabs/Bosses/MadMantis.prefab
@@ -211,7 +211,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Bosses/RightHorizontalAttack.prefab b/Assets/Prefabs/Bosses/RightHorizontalAttack.prefab
@@ -70,7 +70,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Bosses/RightVerticalAttack.prefab b/Assets/Prefabs/Bosses/RightVerticalAttack.prefab
@@ -71,7 +71,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Bullets/StraightBullet.prefab b/Assets/Prefabs/Bullets/StraightBullet.prefab
@@ -69,7 +69,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Enemies/Bullets/GravityAcid.prefab b/Assets/Prefabs/Enemies/Bullets/GravityAcid.prefab
@@ -56,7 +56,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Enemies/Bullets/GravityAcidOld.prefab b/Assets/Prefabs/Enemies/Bullets/GravityAcidOld.prefab
@@ -54,7 +54,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Enemies/Bullets/NonGravityAcid.prefab b/Assets/Prefabs/Enemies/Bullets/NonGravityAcid.prefab
@@ -56,7 +56,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Enemies/Bullets/NonGravityAcidOld.prefab b/Assets/Prefabs/Enemies/Bullets/NonGravityAcidOld.prefab
@@ -54,7 +54,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

diff --git a/Assets/Prefabs/Enemies/Enemy1.prefab b/Assets/Prefabs/Enemies/Enemy1.prefab
@@ -81,7 +81,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6905126659104358002}
-  - component: {fileID: 6905126659104358005}
   - component: {fileID: 482280917192914911}
   - component: {fileID: 6905126659104358007}
   - component: {fileID: 6905126659104358003}
@@ -112,58 +111,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
---- !u!212 &6905126659104358005
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6905126659104358006}
-  m_Enabled: 0
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  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
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!61 &482280917192914911
 BoxCollider2D:
   m_ObjectHideFlags: 0
@@ -273,6 +220,114 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6905126659104358002}
     m_Modifications:
+    - target: {fileID: 776792048080842286, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 776792048080842286, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 776792048080842286, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 1151731071629364395, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151731071629364395, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151731071629364395, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 2017963276703590634, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2017963276703590634, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 2017963276703590634, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 2582718050793094387, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2582718050793094387, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 2582718050793094387, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 2804184363967047002, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2804184363967047002, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 2804184363967047002, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 4023577500385864288, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4023577500385864288, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 4023577500385864288, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 4439852023490580906, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4439852023490580906, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 4439852023490580906, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 4586856639613329581, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4586856639613329581, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 4586856639613329581, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
+    - target: {fileID: 4982527969406575215, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4982527969406575215, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 4982527969406575215, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
     - target: {fileID: 6153784913881994049, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
       propertyPath: m_Name
       value: Visual
@@ -329,6 +384,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8903806125128838817, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8903806125128838817, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -2039461891
+      objectReference: {fileID: 0}
+    - target: {fileID: 8903806125128838817, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 533ffe5d1fc1a5840b749d5b771aa76c, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 350931742d4b04b4b9a781f85f1c3e68, type: 3}
 --- !u!4 &8147956129972388396 stripped