+ ) : null}
{enable_screen_block && (
{
u-container-align-center-xl
u-container-style
u-dialog-block
+ u-dialog-open
u-opacity
u-opacity-70
u-valign-middle-lg
diff --git a/scratch-gui/src/components/stage-cpp-unity/currentLevelChoose.jsx b/scratch-gui/src/components/stage-cpp-unity/currentLevelChoose.jsx
index ca9a4b98..767c3a3c 100644
--- a/scratch-gui/src/components/stage-cpp-unity/currentLevelChoose.jsx
+++ b/scratch-gui/src/components/stage-cpp-unity/currentLevelChoose.jsx
@@ -148,7 +148,7 @@ const CurrentLevelChoose = ({ onCancel }) => {
console.warn('window.loadCppProject 未定义或不是函数');
}
}
- const realLvId_tmp = CONFIG.getRealLvId(window.gamelvdataJson.gamelv, window.gamelvdataJson.gameid, window.gamelvdataJson.ismatch, window.gamelvdataJson.gameNumber, window.gamelvdataJson.gamemode);
+ const realLvId_tmp = CONFIG.getRealLvId(window.gamelvdataJson.gamelv, window.gamelvdataJson.gameid, window.gamelvdataJson.ismatch, window.gamelvdataJson.gameNumber);
const realLvId = realLvId_tmp + cellIndex
window.unityInstance.SendMessage("GameController", "SwitchLevel", realLvId);
CONFIG.checkGameStyle(realLvId);
diff --git a/scratch-gui/src/components/stage-cpp-unity/stage-unity.jsx b/scratch-gui/src/components/stage-cpp-unity/stage-unity.jsx
index 37e94646..96d4900b 100644
--- a/scratch-gui/src/components/stage-cpp-unity/stage-unity.jsx
+++ b/scratch-gui/src/components/stage-cpp-unity/stage-unity.jsx
@@ -12,6 +12,8 @@ import RankBadgeGenerator from '../../playground/rank-badge-generator.js';
window.RankBadgeGenerator = RankBadgeGenerator;
window.CONFIG = CONFIG;
import disableDevtool from 'disable-devtool';
+import { initDisableDevtool } from '../../playground/devtool-control.js';
+import { getUnityPlayerConfig, loadUnityLoaderScript } from '../../lib/unity-build-loader.js';
import { debug } from 'scratch-vm/src/util/log.js';
const MAX_LEVELS = 500; // 最大关卡数据数量
diff --git a/scratch-gui/src/components/stage-cpp/stage-cpp.css b/scratch-gui/src/components/stage-cpp/stage-cpp.css
index 9843b2b3..46ab6be2 100644
--- a/scratch-gui/src/components/stage-cpp/stage-cpp.css
+++ b/scratch-gui/src/components/stage-cpp/stage-cpp.css
@@ -504,9 +504,41 @@
flex-direction: column;
}
-.apiDrawer.apiDrawerOpen {
- right: 0;
- /* 滑出显示 */
+.apiDrawerLoading {
+ position: absolute;
+ inset: 0;
+ z-index: 20;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: 14px;
+ background: rgba(18, 18, 18, 0.82);
+ backdrop-filter: blur(2px);
+ cursor: not-allowed;
+}
+
+.apiDrawerLoadingSpinner {
+ width: 38px;
+ height: 38px;
+ border: 3px solid rgba(255, 255, 255, 0.18);
+ border-top-color: #ba68c8;
+ border-radius: 50%;
+ animation: apiDrawerLoadingSpin 0.9s linear infinite;
+}
+
+.apiDrawerLoadingText {
+ color: #e0e0e0;
+ font-size: 13px;
+ line-height: 1.7;
+ text-align: center;
+ padding: 0 18px;
+}
+
+@keyframes apiDrawerLoadingSpin {
+ to {
+ transform: rotate(360deg);
+ }
}
.apiDrawerHeader {
@@ -526,21 +558,6 @@
font-weight: 600;
}
-.apiDrawerClose {
- background: none;
- border: none;
- color: white;
- font-size: 20px;
- cursor: pointer;
- padding: 5px;
- border-radius: 3px;
- transition: background-color 0.2s ease;
-}
-
-.apiDrawerClose:hover {
- background-color: rgba(255, 255, 255, 0.1);
-}
-
.apiDrawerContent {
flex: 1;
overflow: hidden;
@@ -710,11 +727,6 @@
@media (max-width: 1200px) {
.apiDrawer {
width: 25vw;
- right: -25vw;
- }
-
- .apiDrawer.apiDrawerOpen {
- right: 0;
}
.apiDrawerCategoryButton {
@@ -730,11 +742,6 @@
@media (max-width: 900px) {
.apiDrawer {
width: 35vw;
- right: -35vw;
- }
-
- .apiDrawer.apiDrawerOpen {
- right: 0;
}
.apiDrawerHeader h3 {
diff --git a/scratch-gui/src/components/stage-python-unity/currentLevelChoose.jsx b/scratch-gui/src/components/stage-python-unity/currentLevelChoose.jsx
index 2dac343e..24db794f 100644
--- a/scratch-gui/src/components/stage-python-unity/currentLevelChoose.jsx
+++ b/scratch-gui/src/components/stage-python-unity/currentLevelChoose.jsx
@@ -144,7 +144,7 @@ const CurrentLevelChoose = ({ onCancel }) => {
// 清除所有代码
window.loadPythonProject(`` + `\n`.repeat(50));
}
- const realLvId_tmp = CONFIG.getRealLvId(window.gamelvdataJson.gamelv, window.gamelvdataJson.gameid, window.gamelvdataJson.ismatch, window.gamelvdataJson.gameNumber, window.gamelvdataJson.gamemode);
+ const realLvId_tmp = CONFIG.getRealLvId(window.gamelvdataJson.gamelv, window.gamelvdataJson.gameid, window.gamelvdataJson.ismatch, window.gamelvdataJson.gameNumber);
const realLvId = realLvId_tmp + cellIndex
window.unityInstance.SendMessage("GameController", "SwitchLevel", realLvId);
CONFIG.checkGameStyle(realLvId);
diff --git a/scratch-gui/src/components/stage-python-unity/stage-unity.jsx b/scratch-gui/src/components/stage-python-unity/stage-unity.jsx
index ab8754c7..ab503671 100644
--- a/scratch-gui/src/components/stage-python-unity/stage-unity.jsx
+++ b/scratch-gui/src/components/stage-python-unity/stage-unity.jsx
@@ -12,6 +12,8 @@ import RankBadgeGenerator from '../../playground/rank-badge-generator.js';
window.RankBadgeGenerator = RankBadgeGenerator;
window.CONFIG = CONFIG;
import disableDevtool from 'disable-devtool';
+import { initDisableDevtool } from '../../playground/devtool-control.js';
+import { getUnityPlayerConfig, loadUnityLoaderScript } from '../../lib/unity-build-loader.js';
import { debug } from 'scratch-vm/src/util/log.js';
const MAX_LEVELS = 500; // 最大关卡数据数量
diff --git a/scratch-gui/src/components/stage-python/stage-python.css b/scratch-gui/src/components/stage-python/stage-python.css
index 8c6ecbe9..16a65291 100644
--- a/scratch-gui/src/components/stage-python/stage-python.css
+++ b/scratch-gui/src/components/stage-python/stage-python.css
@@ -139,103 +139,71 @@
background-color: #0056b3;
}
-/* API抽屉标签样式 */
-.apiDrawerTab {
- position: fixed;
- top: 50%;
- right: 0;
- transform: translateY(-50%);
- width: 45px;
- height: 90px;
- background: hsla(215, 100%, 65%, 1);
- border: 1px solid hsla(215, 100%, 65%, 1);
- border-right: none;
- border-radius: 12px 0 0 12px;
- cursor: pointer;
- z-index: 1001;
+/* API参考 + 编辑器并排：参考在左，编辑器靠右 */
+.editorWithApi {
display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- gap: 6px;
- transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
- box-shadow: -4px 0 12px rgba(0, 0, 0, 0.25);
- color: #BDC3C7;
- backdrop-filter: blur(10px);
+ flex-direction: row;
+ height: 100%;
+ width: 54vw;
+ overflow: hidden;
}
-.apiDrawerTab:hover {
- background: hsla(215, 100%, 65%, 1);
- transform: translateY(-50%) translateX(-3px);
- box-shadow: -6px 0 18px rgba(0, 0, 0, 0.35);
- color: #FFFFFF;
+.editorPane {
+ flex: 1;
+ min-width: 0;
+ height: 100%;
+ position: relative;
+ overflow: auto;
}
-.apiDrawerTab.apiDrawerTabOpen {
- background: linear-gradient(135deg, #D35400 0%, #E67E22 100%);
- border-color: #E67E22;
- right: 20vw;
- color: #FFFFFF;
-}
-
-.apiDrawerTab.apiDrawerTabOpen:hover {
- background: linear-gradient(135deg, #E67E22 0%, #F39C12 100%);
- color: #FFFFFF;
-}
-
-.apiDrawerTabIcon {
- font-size: 14px;
- font-weight: bold;
- line-height: 1;
- color: #FFFFFF;
- opacity: 0.9;
- transition: all 0.2s ease;
-}
-
-.apiDrawerTab:hover .apiDrawerTabIcon {
- opacity: 1;
- transform: scale(1.1);
-}
-
-.apiDrawerTabText {
- font-size: 12px;
- font-weight: 700;
- text-transform: uppercase;
- letter-spacing: 1.5px;
- writing-mode: vertical-lr;
- text-orientation: mixed;
- line-height: 1;
- color: #FFFFFF;
- opacity: 0.8;
- transition: all 0.2s ease;
-}
-
-.apiDrawerTab:hover .apiDrawerTabText {
- opacity: 1;
- letter-spacing: 2px;
-}
-
-/* API抽屉样式 */
.apiDrawer {
- position: fixed;
- top: 0;
- right: -20vw;
- /* 初始隐藏在右侧 */
+ position: relative;
+ flex-shrink: 0;
width: 20vw;
- height: 100vh;
+ height: 100%;
background: linear-gradient(135deg, #1e1e1e 0%, #2d2d2d 100%);
- border-left: 2px solid #444;
- box-shadow: -5px 0 20px rgba(0, 0, 0, 0.3);
- z-index: 1000;
- transition: right 0.3s ease;
+ border-right: 2px solid #444;
+ box-shadow: 2px 0 12px rgba(0, 0, 0, 0.2);
overflow: hidden;
display: flex;
flex-direction: column;
}
-.apiDrawer.apiDrawerOpen {
- right: 0;
- /* 滑出显示 */
+.apiDrawerLoading {
+ position: absolute;
+ inset: 0;
+ z-index: 20;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: 14px;
+ background: rgba(18, 18, 18, 0.82);
+ backdrop-filter: blur(2px);
+ cursor: not-allowed;
+}
+
+.apiDrawerLoadingSpinner {
+ width: 38px;
+ height: 38px;
+ border: 3px solid rgba(255, 255, 255, 0.18);
+ border-top-color: #ba68c8;
+ border-radius: 50%;
+ animation: apiDrawerLoadingSpin 0.9s linear infinite;
+}
+
+.apiDrawerLoadingText {
+ color: #e0e0e0;
+ font-size: 13px;
+ line-height: 1.7;
+ text-align: center;
+ padding: 0 18px;
+}
+
+@keyframes apiDrawerLoadingSpin {
+ to {
+ transform: rotate(360deg);
+ }
}
.apiDrawerHeader {
@@ -255,21 +223,6 @@
font-weight: 600;
}
-.apiDrawerClose {
- background: none;
- border: none;
- color: white;
- font-size: 20px;
- cursor: pointer;
- padding: 5px;
- border-radius: 3px;
- transition: background-color 0.2s ease;
-}
-
-.apiDrawerClose:hover {
- background-color: rgba(255, 255, 255, 0.1);
-}
-
.apiDrawerContent {
flex: 1;
overflow: hidden;
@@ -440,15 +393,6 @@
@media (max-width: 1200px) {
.apiDrawer {
width: 25vw;
- right: -25vw;
- }
-
- .apiDrawer.apiDrawerOpen {
- right: 0;
- }
-
- .apiDrawerTab.apiDrawerTabOpen {
- right: 25vw;
}
.apiDrawerCategoryButton {
@@ -464,34 +408,6 @@
@media (max-width: 900px) {
.apiDrawer {
width: 35vw;
- right: -35vw;
- }
-
- .apiDrawer.apiDrawerOpen {
- right: 0;
- }
-
- .apiDrawerTab.apiDrawerTabOpen {
- right: 35vw;
- }
-
- .apiDrawerTab {
- width: 35px;
- height: 75px;
- gap: 4px;
- }
-
- .apiDrawerTabIcon {
- font-size: 12px;
- }
-
- .apiDrawerTabText {
- font-size: 8px;
- letter-spacing: 1px;
- }
-
- .apiDrawerTab:hover .apiDrawerTabText {
- letter-spacing: 1.5px;
}
.apiDrawerHeader h3 {
diff --git a/scratch-gui/src/components/stage-python/stage-python.jsx b/scratch-gui/src/components/stage-python/stage-python.jsx
index d86e1e6e..dcb7fee4 100644
--- a/scratch-gui/src/components/stage-python/stage-python.jsx
+++ b/scratch-gui/src/components/stage-python/stage-python.jsx
@@ -49,9 +49,6 @@ const StageWrapperPythonCPLT = () => {
`
);
- // ★★★ 添加抽屉状态管理
- const [apiDrawerOpen, setApiDrawerOpen] = useState(false);
-
// ★★★ 替换 workerRef，用 Pool Ref
const poolRef = useRef(null); // 用这个存 Worker Pool
// const workerRef = useRef(null); // <-- 删掉
@@ -60,6 +57,27 @@ const StageWrapperPythonCPLT = () => {
const [errorModalVisible, setErrorModalVisible] = useState(false);
const [errorMessage, setErrorMessage] = useState('');
const [overlayActive, setOverlayActive] = useState(false);
+ const [apiSelectedCategory, setApiSelectedCategory] = useState('player');
+ const [isApiPanelReady, setIsApiPanelReady] = useState(() => window.iscreate === 1);
+
+ // Unity 加载完成前，API 面板显示加载态并屏蔽点击（5 秒兜底自动解除）
+ useEffect(() => {
+ if (isApiPanelReady) return undefined;
+ const timer = setInterval(() => {
+ if (window.iscreate === 1) {
+ setIsApiPanelReady(true);
+ clearInterval(timer);
+ }
+ }, 300);
+ const fallback = setTimeout(() => {
+ setIsApiPanelReady(true);
+ clearInterval(timer);
+ }, 5000);
+ return () => {
+ clearInterval(timer);
+ clearTimeout(fallback);
+ };
+ }, [isApiPanelReady]);
// CodeMirror编辑器引用
const editorRef = useRef(null);
@@ -649,15 +667,65 @@ const StageWrapperPythonCPLT = () => {
if (t) parts.push(t);
return parts;
}
+
+ function splitOr(stmt) {
+ if (!hasFuncCall(stmt)) {
+ return [stmt];
+ }
+ const parts = [];
+ let cur = '';
+ let skipChars = 0;
+
+ parse(stmt, (ch, depth, parenDepth, i, notInStr) => {
+ if (skipChars > 0) {
+ skipChars--;
+ return;
+ }
+
+ if (notInStr && depth === 0 && ch === 'o' && stmt[i + 1] === 'r') {
+ const prevChar = i > 0 ? stmt[i - 1] : '';
+ const nextChar = i + 2 < stmt.length ? stmt[i + 2] : '';
+ const isPrevWordChar = /[a-zA-Z0-9_]/.test(prevChar);
+ const isNextWordChar = /[a-zA-Z0-9_]/.test(nextChar);
+
+ if (!isPrevWordChar && !isNextWordChar) {
+ const t = cur.trim();
+ if (t) parts.push(t);
+ cur = '';
+ skipChars = 1;
+ return;
+ }
+ }
+
+ cur += ch;
+ });
+
+ const t = cur.trim();
+ if (t) parts.push(t);
+ return parts;
+ }
let count = 0;
for (const stmt of splitStatements(s)) {
const assign = findAssign(stmt);
if (!assign) {
- count += splitComma(stmt).length;
+ let stmtCount = 0;
+ for (const orPart of splitOr(stmt)) {
+ stmtCount += splitComma(orPart).length;
+ }
+ count += stmtCount;
} else {
const lhs = stmt.slice(0, assign.index).trim();
- count += hasComma(lhs) ? 1 : Math.max(1, splitComma(stmt.slice(assign.index + assign.length)).length);
+ if (hasComma(lhs)) {
+ count += 1;
+ } else {
+ const rhs = stmt.slice(assign.index + assign.length);
+ let rhsCount = 0;
+ for (const orPart of splitOr(rhs)) {
+ rhsCount += splitComma(orPart).length;
+ }
+ count += Math.max(1, rhsCount);
+ }
}
}
return count;
@@ -1168,22 +1236,15 @@ sys.settrace(trace_func)`;
);
};
- // API参考抽屉组件
+ // API参考面板
const ApiDrawer = () => {
- const [selectedCategory, setSelectedCategory] = useState('player');
+ const selectedCategory = apiSelectedCategory;
+ const setSelectedCategory = setApiSelectedCategory;
return (
-
- {/* 抽屉头部 */}
+
🐍 Python API参考
-
{/* 抽屉内容 */}
@@ -1226,6 +1287,12 @@ sys.settrace(trace_func)`;
))}
+ {!isApiPanelReady && (
+
+ )}
);
};
@@ -1288,9 +1355,6 @@ sys.settrace(trace_func)`;
});
}
- // 关闭API参考窗口
- setApiDrawerOpen(false);
-
// 聚焦编辑器
view.focus();
}
@@ -1300,36 +1364,16 @@ sys.settrace(trace_func)`;
return (
<>
+ 
+ 