Merge pull request #2800 from planetarium/application_version_view_ex…

…ception_handling fix application version view exception handling
planetarium · Jul 19, 2023 · 5ccbf31 · 5ccbf31
2 parents 60fa097 + a2e223b
commit 5ccbf31
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_VersionSystem.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_VersionSystem.prefab
@@ -27,6 +27,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1689287913065897726}
   m_Father: {fileID: 0}
@@ -79,6 +80,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3668335696587624744}
   m_Father: {fileID: 8915863027991008125}
@@ -144,6 +146,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1689287913065897726}
   m_RootOrder: 0
@@ -225,7 +228,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}

diff --git a/nekoyume/Assets/_Scripts/UI/Widget/System/VersionSystem.cs b/nekoyume/Assets/_Scripts/UI/Widget/System/VersionSystem.cs
@@ -50,11 +50,23 @@ private void UpdateText()
             var hash = _hash.ToString();
             hash = hash.Length >= 4 ? hash.Substring(0, 4) : "...";
 
+            string versionText = string.Empty;
+            string commitHashText = string.Empty;
+            if (!string.IsNullOrEmpty(_clientCommitHash))
+            {
+                commitHashText = $"({_clientCommitHash})";
+            }
+
 #if UNITY_ANDROID || UNITY_IOS
-            informationText.text = $"APV: {_version} / #{_blockIndex} / Hash: {hash} / ver: {UnityEngine.Application.version}({_clientCommitHash})";
+            versionText = $"/ Ver: {UnityEngine.Application.version}{commitHashText}";
 #else
-            informationText.text = $"APV: {_version} / #{_blockIndex} / Hash: {hash} / ver: {_clientCommitHash}";
+            if (!string.IsNullOrEmpty(_clientCommitHash))
+            {
+                versionText = $"/ Ver: {commitHashText}";
+            }
 #endif
+
+            informationText.text = $"APV: {_version} / #{_blockIndex} / Hash: {hash} {versionText}";
         }
     }
 }