Merge branch 'dev' of https://github.com/GeekyMoose/wip_surprise into…

… dev Lines starting with '#' will be ignored, and an empty message aborts
geekymoose · Dec 13, 2019 · ffabfa1 · ffabfa1
2 parents 7ea97af + e54ae15
commit ffabfa1
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 2 deletions.
diff --git a/Assets/Prefabs/Game/Pref_Environment.prefab b/Assets/Prefabs/Game/Pref_Environment.prefab
@@ -2895,8 +2895,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 404b9032b5223c843b3759ffaf9e4384, type: 3}
-  m_Color: {r: 0.73333335, g: 0, b: 0.40392157, a: 1}
+  m_Sprite: {fileID: 21300000, guid: 992684f6bba09614ea5e6b3bd89d0691, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0

diff --git a/Assets/Sprites/Grid/Sprite_GridStrokeLarge.png b/Assets/Sprites/Grid/Sprite_GridStrokeLarge.png
diff --git a/Assets/Sprites/Grid/Sprite_GridStrokeLarge.png.meta b/Assets/Sprites/Grid/Sprite_GridStrokeLarge.png.meta