From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001 From: Davin <591807572@qq.com> Date: 星期三, 26 七月 2023 15:55:30 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch --- HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs index 5ae667f..a161414 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs @@ -545,6 +545,26 @@ sceneFunctionInfo += " "+ perState.value + "掳"; } + var perColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful); + if(perColorful != null) + { + if (perColorful.value == "on") + { + sceneFunctionInfo += " " + Language.StringByID(StringId.HorseRaceLamp); + } + else + { + if (sceneFunction.localFunction.spk == SPK.GroupControl) + { + sceneFunctionInfo += " " + Language.StringByID(StringId.Close) + " " + Language.StringByID(StringId.HorseRaceLamp); + } + else + { + sceneFunctionInfo = Language.StringByID(StringId.Close) + " " + Language.StringByID(StringId.HorseRaceLamp); + } + } + } + return sceneFunctionInfo; } -- Gitblit v1.8.0