Skip to content
This repository was archived by the owner on Nov 22, 2021. It is now read-only.

Commit 0478c07

Browse files
shengyuanshengyuan
committed
Check the results that don't work
1 parent 307847d commit 0478c07

File tree

19 files changed

+467
-204
lines changed

19 files changed

+467
-204
lines changed

‎js/stageCheck.js

Lines changed: 310 additions & 65 deletions
Large diffs are not rendered by default.

‎js/stages.js

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,38 @@
88
// 當點選關卡而非解答時，清空內容
99
restoreSimulator();
1010

11+
// 計算闖關時間
12+
window.stage = {
13+
startTime: Date.now(),
14+
getGameTime: function () {
15+
return Date.now() - this.startTime;
16+
},
17+
getCode: function () {
18+
var obj = {
19+
blockly: getBlocklyCode(),
20+
simulator: getSimulatorConfig()
21+
};
22+
return JSON.stringify(obj);
23+
},
24+
getSectionValues: function () {
25+
var wk = Code.workspace;
26+
var xml = Blockly.Xml.workspaceToDom(wk);
27+
var config = getSimulatorConfig();
28+
return {
29+
block: xml.querySelectorAll('block').length,
30+
simulator: {
31+
line: config.data.components.length,
32+
component: config.data.paths.length
33+
}
34+
};
35+
},
36+
getBlockXml: function () {
37+
var wk = Code.workspace;
38+
var xml = Blockly.Xml.workspaceToDom(wk);
39+
return xml;
40+
}
41+
};
42+
1143
});
1244

1345
function restoreBlocks() {
@@ -34,4 +66,16 @@
3466
}
3567
}
3668

69+
function getBlocklyCode() {
70+
var wk = Code.workspace;
71+
var xml = Blockly.Xml.workspaceToDom(wk);
72+
var text = Blockly.Xml.domToText(xml);
73+
return text;
74+
}
75+
76+
function getSimulatorConfig() {
77+
var frame = document.querySelector('#simulator-frame');
78+
return frame.contentWindow.blockly.getConfig();
79+
}
80+
3781
})();

‎msg/stages/04/zh-hans.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MSG.title = "Webduino Blockly 关卡 4：按钮控制 Youtube";
22
MSG.subTitle = "关卡 4：按钮控制 Youtube";
3-
MSG.demoDescription = "点击按钮开关控制 Youtube 的播放、暂停和停止";
3+
MSG.demoDescription = "利用按钮的行为，控制 Youtube 的播放、暂停和停止。";
44
MSG.stageHelp = "使用积木及模拟器，当点击模拟器中的按钮时，会控制测试区中的 youtube 播放。";
55
MSG.demoTitle = "网页互动区";

‎msg/stages/04/zh-hant.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MSG.title = "Webduino Blockly 關卡 4：按鈕控制 Youtube";
22
MSG.subTitle = "關卡 4：按鈕控制 Youtube";
3-
MSG.demoDescription = "點擊按鈕開關控制 Youtube 的播放、暫停和停止";
3+
MSG.demoDescription = "利用按鈕的行為，控制 Youtube 的播放、暫停和停止。";
44
MSG.stageHelp = "使用積木及模擬器，當點擊模擬器中的按鈕時，會控制測試區中的 youtube 播放。";
55
MSG.demoTitle = "網頁互動區";

‎simulator

Submodule simulator updated from 175f58e to ba83a89

‎toolbox/stages/01.xml

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
<xml id="toolbox" style="display: none">
2-
<category id="catVariables" custom="VARIABLE"></category>
3-
<sep></sep>
4-
<category id="catBoard">
5-
<block type="board_server">
2+
<category id="catVariables" custom="VARIABLE"></category>
3+
<sep></sep>
4+
<category id="catBoard">
5+
<block type="board_server">
66
<value name="server_">
77
<block type="text"></block>
88
</value>
99
</block>
10-
<block type="board_ready">
11-
<value name="device_">
12-
<block type="text">
13-
<field name="TEXT">1234</field>
14-
</block>
15-
</value>
16-
<field name="type_">5</field>
17-
<field name="rate_">250</field>
18-
</block>
19-
</category>
20-
<category id="catLed">
21-
<block type="variables_set">
22-
<field name="VAR">led</field>
23-
<value name="VALUE">
24-
<block type="led_new">
25-
<field name="pin_">10</field>
26-
</block>
27-
</value>
28-
</block>
29-
<block type="led_state">
30-
<field name="led_">led</field>
31-
</block>
32-
</category>
33-
<category id="catTutorials">
34-
<block type="light"></block>
35-
</category>
36-
<sep></sep>
10+
<block type="board_ready">
11+
<value name="device_">
12+
<block type="text">
13+
<field name="TEXT">1234</field>
14+
</block>
15+
</value>
16+
<field name="type_">5</field>
17+
<field name="rate_">250</field>
18+
</block>
19+
</category>
20+
<category id="catLed">
21+
<block type="variables_set">
22+
<field name="VAR">led</field>
23+
<value name="VALUE">
24+
<block type="led_new">
25+
<field name="pin_">10</field>
26+
</block>
27+
</value>
28+
</block>
29+
<block type="led_state">
30+
<field name="led_">led</field>
31+
</block>
32+
</category>
33+
<category id="catTutorials">
34+
<block type="light"></block>
35+
</category>
3736
</xml>

‎toolbox/stages/02.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<xml id="toolbox" style="display: none">
22
<category id="catVariables" custom="VARIABLE"></category>
3-
<sep></sep>
43
<category id="catColour">
54
<block type="colour_picker"></block>
65
</category>
@@ -40,5 +39,4 @@
4039
<block type="rgb_led_area_color"></block>
4140
<block type="rgb_led_btn_click"></block>
4241
</category>
43-
<sep></sep>
4442
</xml>

‎toolbox/stages/03.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<xml id="toolbox" style="display: none">
22
<category id="catVariables" custom="VARIABLE"></category>
3-
<sep></sep>
43
<category id="catLogic">
54
<block type="controls_if"></block>
65
</category>
@@ -67,5 +66,4 @@
6766
</block>
6867
<block type="rgb_led_dancing_status"></block>
6968
</category>
70-
<sep></sep>
7169
</xml>

‎toolbox/stages/04.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<xml id="toolbox" style="display: none">
22
<category id="catVariables" custom="VARIABLE"></category>
3-
<sep></sep>
4-
<sep></sep>
53
<category id="catText">
64
<block type="text"></block>
75
</category>
86
<category id="catLogic">
97
<block type="controls_if"></block>
108
</category>
119
<sep></sep>
12-
<sep></sep>
1310
<category id="catBoard">
1411
<block type="board_server">
1512
<value name="server_">
@@ -37,8 +34,6 @@
3734
</block>
3835
<block type="button_event"></block>
3936
</category>
40-
<sep></sep>
41-
<sep></sep>
4237
<category id="catTutorials">
4338
<block type="show_text"></block>
4439
<block type="tutorial_youtube">
@@ -51,5 +46,4 @@
5146
<block type="tutorial_youtube_control"></block>
5247
<block type="tutorial_youtube_status"></block>
5348
</category>
54-
<sep></sep>
5549
</xml>

‎toolbox/stages/05.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<xml id="toolbox" style="display: none">
22
<category id="catVariables" custom="VARIABLE"></category>
33
<sep></sep>
4-
<sep></sep>
54
<category id="catMath">
65
<block type="math_number">
76
</block>
@@ -37,5 +36,4 @@
3736
<block type="button_game"></block>
3837
<block type="button_game_user"></block>
3938
</category>
40-
<sep></sep>
4139
</xml>

0 commit comments

Comments
 (0)