Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

 HDL_ON/Entity/Function/Scene.cs

@@ -157,7 +157,7 @@
            string roomNameList = "";
            foreach (var roomId in roomIds)
            {
                var findRoom = DB_ResidenceData.rooms.Find(obj => obj.sid == roomId);
                var findRoom = DB_ResidenceData.Rooms.Find(obj => obj.uid == roomId);
                if (findRoom == null)
                {
                    continue;
@@ -166,7 +166,7 @@
                {
                    roomNameList += ",";
                }
                roomNameList += findRoom.floorName + findRoom.name;
                roomNameList += findRoom.floorName + findRoom.roomName;
            }
            if (roomNameList == "" )
            {