Merge branch 'Android' of https://github.com/szefo09/YGOPro2_Droid into Android

307a6e75 · nanahira · 4a3b1edb · ef14e19f · 307a6e75 · 307a6e75
Commit 307a6e75 authored Apr 03, 2019 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 1086 deletions

Assets/main.unity Assets/main.unity +1 -1

Assets/transUI/prefab/trans_menu.prefab Assets/transUI/prefab/trans_menu.prefab +26 -1085

No files found.
--- a/Assets/main.unity
+++ b/Assets/main.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.43667555, g: 0.48427176, b: 0.56452465, a: 1}
+  m_IndirectSpecularColor: {r: 0.4366756, g: 0.48427194, b: 0.5645252, a: 1}
 --- !u!157 &4
 LightmapSettings:
  m_ObjectHideFlags: 0

--- a/Assets/transUI/prefab/trans_menu.prefab
+++ b/Assets/transUI/prefab/trans_menu.prefab