From 9f342f242b335c1875478f79c0c07d81c409121b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 18:02:49 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/Entity/Function/Function.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index ddafe50..3696447 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -173,8 +173,8 @@
max = 1,
min = 0,
};
+ _trait_on_off.curValue = "on";
}
- _trait_on_off.curValue = "on";
}
return _trait_on_off;
}
@@ -235,7 +235,7 @@
}
if (roomNameList == "" && functionType == FunctionType.Scene)
{
- roomNameList = Language.StringByID(StringId.WholeHouseScene);
+ roomNameList = Language.StringByID(StringId.WholeZone);
}
return roomNameList;
}
--
Gitblit v1.8.0