From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/Entity/Function/Scene.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 75742dc..2f2d49c 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -585,6 +585,9 @@
case FunctionAttributeKey.FadeTime:
text = Language.StringByID(StringId.FadeSpeed);
break;
+ case "angle":
+ text = Language.StringByID(StringId.Angle);
+ break;
}
return text;
}
--
Gitblit v1.8.0