From cb6e11c5067ecaba4d8f9907989154167c1e8943 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:15:05 +0800
Subject: [PATCH] Merge branch 'wxr4' into dev-tzy
---
HDL_ON/Entity/Function/Scene.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index cc4379a..f4bdd83 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -352,7 +352,14 @@
{
return Language.StringByID(StringId.NoDelay);
}
- string text = (delayInt / 60)+Language.StringByID(StringId.m)+(delayInt % 60)+Language.StringByID(StringId.s);
+ string text = "";
+ if (delayInt > 60)
+ {
+ text = (delayInt / 60) + Language.StringByID(StringId.m) + (delayInt % 60) + Language.StringByID(StringId.s);
+ }else
+ {
+ text = delayInt + Language.StringByID(StringId.s);
+ }
return text;
switch (delay)
{
--
Gitblit v1.8.0