Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ffdeae1a43e1539f9533f93d64089994db6c742b

 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)
            {