From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
index 09266fb..f6d0cb0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
@@ -34,7 +34,7 @@
System.Collections.Generic.List<Room> rooms = new System.Collections.Generic.List<Room>();
rooms.Add(new Room() { uid = "", roomName = Language.StringByID(StringId.WholeHouseScene),parentId = "" });
- rooms.AddRange(DB_ResidenceData.Rooms);
+ rooms.AddRange(DB_ResidenceData.residenceData.Rooms);
foreach (var room in rooms)
{
var roomView = new FrameLayout()
--
Gitblit v1.8.0