From ad91afe61a93cdb962fc583a5b869efce090b092 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 12 五月 2021 14:29:03 +0800
Subject: [PATCH] 1.成员场景功能
---
HDL_ON/Common/ApiUtlis.cs | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index bfe0f9e..f01a100 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -187,34 +187,37 @@
{
sceneList = new List<Scene>();
}
- for (int i = 0; i < FunctionList.List.scenes.Count;)
- {
- var localScene = FunctionList.List.scenes[i];
- if (localScene == null)
- {
- FunctionList.List.scenes.Remove(localScene);
- continue;
- }
- var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
- if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
- {
- FunctionList.List.DeleteScene(localScene, false);
- }
- else
- {
- i++;
- if (localScene.modifyTime != newScene.modifyTime)
- {
- localScene.name = newScene.name;
- localScene.collect = newScene.collect;
- localScene.modifyTime = newScene.modifyTime;
- localScene.roomIds = newScene.roomIds;
- localScene.image = newScene.image;
- localScene.SaveSceneFile();
- }
- sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
- }
- }
+ //for (int i = 0; i < FunctionList.List.scenes.Count;)
+ //{
+ // var localScene = FunctionList.List.scenes[i];
+ // if (localScene == null)
+ // {
+ // FunctionList.List.scenes.Remove(localScene);
+ // continue;
+ // }
+ // var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
+ // if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ // {
+ // FunctionList.List.DeleteScene(localScene, false);
+ // }
+ // else
+ // {
+ // i++;
+ // if (localScene.modifyTime != newScene.modifyTime)
+ // {
+ // localScene.name = newScene.name;
+ // localScene.collect = newScene.collect;
+ // localScene.modifyTime = newScene.modifyTime;
+ // localScene.roomIds = newScene.roomIds;
+ // localScene.image = newScene.image;
+ // localScene.SaveSceneFile();
+ // }
+ // sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ // }
+ //}
+
+ FunctionList.List.scenes.Clear();
+
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
foreach (var tempScene in sceneList)
{
--
Gitblit v1.8.0