Merge pull request #113 from tsekenrick/tsekenrick

Minor tweaks to layering for card state transitions in mul phase
tsekenrick · May 8, 2019 · 1ff3ce1 · 1ff3ce1
2 parents 86a76d1 + 1a87db0
commit 1ff3ce1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Assets/Prefabs/Card.prefab b/Assets/Prefabs/Card.prefab
@@ -144,9 +144,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -84788881
-  m_SortingLayer: 3
-  m_SortingOrder: 0
+  m_SortingLayerID: 1973838493
+  m_SortingLayer: 5
+  m_SortingOrder: 5
   m_Sprite: {fileID: 21300000, guid: b3f166529d9f7d44895035252839e548, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity
@@ -5027,8 +5027,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -84788881
-  m_SortingLayer: 3
+  m_SortingLayerID: 1973838493
+  m_SortingLayer: 5
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: ad687274ac8e6864cbf19c1a7300188a, type: 3}
   m_Color: {r: 0.5801887, g: 0.9840577, b: 1, a: 1}
@@ -5050,7 +5050,7 @@ Transform:
   m_GameObject: {fileID: 184089025}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: -0.78, z: -0.1}
-  m_LocalScale: {x: 1.0536176, y: 1.0536176, z: 1.0536176}
+  m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_Children: []
   m_Father: {fileID: 1603316816}
   m_RootOrder: 2

diff --git a/Assets/Scripts/Card.cs b/Assets/Scripts/Card.cs
@@ -270,9 +270,9 @@ public class Card : MonoBehaviour
         if(board.overlayActive) return;
 
         if(curState == CardState.InHand) {
-            cardParts[5].sortingOrder = 0;
+            cardParts[5].sortingOrder = 5;
             foreach(SpriteRenderer sr in cardParts) sr.sortingLayerName = "UI Low";
-            foreach(TextMeshPro tmp in textParts) tmp.sortingOrder = 3;
+            foreach(TextMeshPro tmp in textParts) tmp.sortingOrder = 0;
             DOTween.Pause("zoomIn");
             tweenSequence.Append(tr.DOScale(Vector3.one, .1f));
         }
@@ -297,7 +297,6 @@ public class Card : MonoBehaviour
                     cardParts[5].enabled = true;
                     cardParts[5].sortingOrder = 15;
                     // FMOD Card Select Event
-
                     sm.PlaySound(sm.selectSound);
                 }
                 else if(board.toMul.Contains(this.gameObject) && !board.lockedHand.Contains(this.gameObject)) {