From 271015c6e90c195103cc7f34eda87966acd74dcc Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 13 十二月 2020 20:46:12 +0800
Subject: [PATCH] 2020121301

---
 HDL_ON/Entity/Room.cs |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index dcad772..dfcbf83 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -46,7 +46,7 @@
         public SpatialInfo(string spatialType)
         {
             roomType = "FLOOR";
-            parentId = UserInfo.Current.CurReginID;
+            parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
         }
 
         public string roomId = "";
@@ -420,15 +420,19 @@
             rooms = null;
         }
 
-        public void ClearRooms()
+        public void Clear()
         {
-            if (floors != null)
+            if (_currentSpatial != null)
             {
-                floors.Clear();
-            }
-            if (rooms != null)
-            {
-                rooms.Clear();
+                if (_currentSpatial.floors != null)
+                {
+                    _currentSpatial.floors.Clear();
+                }
+                if (_currentSpatial.rooms != null)
+                {
+                    _currentSpatial.rooms.Clear();
+                }
+                _currentSpatial = null;
             }
         }
 

--
Gitblit v1.8.0