From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Entity/FunctionList.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
old mode 100755
new mode 100644
index 0be3c7f..bc2eddc
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -630,7 +630,7 @@
/// <summary>
/// 娣诲姞鍦烘櫙
/// </summary>
- public Scene AddScene(Scene scene,out string result)
+ public string AddScene(Scene scene,out Scene result)
{
Scene tempScene = null;
var pm = new HttpServerRequest();
@@ -638,12 +638,12 @@
if (revPack.Code == StateCode.SUCCESS)
{
var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
- tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
+ tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
Common.FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
}
- result = revPack.Code;
- return tempScene;
+ result = tempScene;
+ return revPack.Code;
}
#endregion
--
Gitblit v1.8.0