From 79075e82580eaaaaf249924455097dc4524e88b6 Mon Sep 17 00:00:00 2001
From: fanxuehan <fanxuehan@qq.com>
Date: Wed, 24 Mar 2021 14:27:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20getdata=E6=9B=B4=E6=96=B0app=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 play/assets/scene/scene/scene.js | 16 ++++++++++++++--
 play/assets/scene/script/util.js |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/play/assets/scene/scene/scene.js b/play/assets/scene/scene/scene.js
index c4bbeae..f95e4ed 100644
--- a/play/assets/scene/scene/scene.js
+++ b/play/assets/scene/scene/scene.js
@@ -66,8 +66,20 @@ cc.Class({
 		})
 	},
 
-	getData(cb) {
-		cb(this.getDefaultData());
+	getData(func) {
+		if (window && window.courseware) {
+			window.courseware.getData(func, 'scene');
+			return;
+		}
+
+		const middleLayer = cc.find('middleLayer');
+		if (middleLayer) {
+			const middleLayerComponent = middleLayer.getComponent('middleLayer');
+			middleLayerComponent.getData(func);
+			return;
+		}
+
+		func(this.getDefaultData());
 	},
 
 	getDefaultData() {
diff --git a/play/assets/scene/script/util.js b/play/assets/scene/script/util.js
index b3e77e6..7af7189 100644
--- a/play/assets/scene/script/util.js
+++ b/play/assets/scene/script/util.js
@@ -348,6 +348,7 @@ export function onHomeworkFinish() {
     if (middleLayerComponent.role == 'student') {
       middleLayerComponent.onHomeworkFinish(() => { });
     }
-    return;
+  } else {
+    console.log('onHomeworkFinish');
   }
 }
\ No newline at end of file
-- 
2.21.0