From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy

---
 HDL_ON/Entity/Function/Scene.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 2f73b07..ded2b0c 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -346,7 +346,10 @@
         /// </summary>
         public string GetDelayText()
         {
-            string text = "";
+            var delayInt = 0;
+            int.TryParse(delay,out delayInt);
+            string text = (delayInt / 60)+Language.StringByID(StringId.m)+(delayInt % 60)+Language.StringByID(StringId.s);
+            return text;
             switch (delay)
             {
                 case "0":

--
Gitblit v1.8.0