Merge branch 'master' of http://59.110.91.129:3000/zhangmengying/AIClass into wanzi

src/components/blockly/MapGame.vue

@@ -111,7 +111,7 @@
 
       <div class="workspace-section">
         <div class="controls">
-          <button id="runCode" @click="runCode" >运行代码</button>
+          <button id="runCode" @click="runCode" :disabled="isRunning">运行代码</button>
           <button @click="resetPlayer" >重置玩家</button>
           <button @click="clearWorkspace">清空工作区</button>
         </div>
@@ -753,8 +753,7 @@ function registerJavaScriptGenerators() {
     })()`;
 
     // 获取循环体代码
-    // const branch = javascriptGenerator.statementToCode(blockly, 'DO');
-    const branch = ""
+    const branch = javascriptGenerator.statementToCode(block, 'DO');
 
     // 生成支持异步的循环代码
     let code = `for (let i = 0; i < ${safeRepeats}; i++) {\n`;
@@ -1358,10 +1357,28 @@ window.pause = async function(seconds) {
   showCountdown.value = true;
   countdownValue.value = seconds;
 
-  // 倒计时循环
-  while (countdownValue.value > 0 && !shouldStopExecution) {
-    await new Promise(resolve => setTimeout(resolve, 1000));
-    countdownValue.value--;
+  // 使用更细粒度的时间间隔，确保能快速响应重置操作
+  const interval = 100; // 100毫秒检查一次
+  const totalIterations = seconds * 10; // 总迭代次数
+  
+  for (let i = 0; i < totalIterations; i++) {
+    // 检查是否应该停止执行
+    if (shouldStopExecution) {
+      break;
+    }
+    
+    // 等待一小段时间
+    await new Promise(resolve => setTimeout(resolve, interval));
+    
+    // 检查是否应该停止执行
+    if (shouldStopExecution) {
+      break;
+    }
+    
+    // 每10次迭代（即1秒）减少倒计时值
+    if ((i + 1) % 10 === 0) {
+      countdownValue.value--;
+    }
   }
 
   // 隐藏倒计时
@@ -1565,23 +1582,38 @@ window.isFinish = async function() {
 
   if (gameState.player.position.x === endPoint.value.x && gameState.player.position.y === endPoint.value.y) {
 
-    //检查是否有未完成的任务点
-    const pointIndex = gameState.mapData.walkablePoints.findIndex(
-        p => p.type === BLOCKLY_MAP_TYPE_DICT.TASK && p.status !== true
-    );
-    if (pointIndex !== -1) {
-      showGameMessage(CONFIG.TIPS.UNFINISHED, 'error');
+    // 统计所有类型为TASK的任务点总数
+    const totalTasks = gameState.mapData.walkablePoints.filter(
+        p => p.type === BLOCKLY_MAP_TYPE_DICT.TASK
+    ).length;
+
+    // 统计其中status为true的完成任务数
+    const completedTasks = gameState.mapData.walkablePoints.filter(
+        p => p.type === BLOCKLY_MAP_TYPE_DICT.TASK && p.status === true
+    ).length;
+
+    //blockly总星星数量
+    const starCount = 3;
+
+    //无任务情况下直接完成
+    if (totalTasks === 0 || completedTasks === totalTasks) {
+      gameState.player.hasReachedEnd = true;
+      emits('saveProgress', starCount * 100)
+      showGameMessage(CONFIG.TIPS.FINISH, 'success' );
       return;
     }
 
-    gameState.player.hasReachedEnd = true;
-    showGameMessage(CONFIG.TIPS.FINISH, 'success' );
-    emits('saveProgress')
+    //任务失败
+    // 计算完成百分比
+    const completionPercentage = totalTasks > 0 ? Math.round(completedTasks / totalTasks * starCount) : starCount;
+    showGameMessage(CONFIG.TIPS.UNFINISHED, 'error');
+    emits('saveProgress', completionPercentage * 100)
   }
 };
 
 // 运行代码
 const runCode = async () => {
+  await resetPlayer();
   isRunning.value = true;
   try {
     await new Promise(resolve => setTimeout(resolve, CONFIG.DELAY.RESET_DELAY));
@@ -1651,6 +1683,8 @@ const runCode = async () => {
   } catch (error) {
     showGameMessage(`运行时错误: ${error.message || '未知错误'}`, 'error');
     console.error('运行时错误:', error);
+  } finally {
+    isRunning.value = false;
   }
 };
 
@@ -1660,6 +1694,10 @@ const resetPlayer = async () => {
   // 设置标志强制停止所有执行
   shouldStopExecution = true;
 
+  // 清除倒计时显示和重置倒计时值
+  showCountdown.value = false;
+  countdownValue.value = 0;
+
   // 取消任何正在执行的代码
   if (executionAbortController) {
     executionAbortController.abort();

src/views/programming/ProgrammingCourset.vue

@@ -57,12 +57,12 @@
             </div>
             <!-- 星星图标组 -->
             <div class="star-group">
-              <div 
-                v-for="i in getStarCount(item.contentType)" 
+              <div
+                v-for="i in getStarCount(item.contentType)"
                 :key="i"
                 class="star-icon"
-                :style="{ 
-                  backgroundImage: `url(${item.progress ? star01Image : star02Image})`
+                :style="{
+                  backgroundImage: `url(${i <= item.progress ? star01Image : star02Image})`,
                 }"
               ></div>
             </div>

src/views/programming/ProgrammingList.vue

@@ -47,7 +47,9 @@
               >
                 <div class="new-white-box"
                      :class="{ 'active': activeButton === index, 'disabled': courseType.isDisabled }"
-                     @click.stop="handleItemClick(courseType, index)">
+                     @click.stop="handleItemClick(courseType, index)"
+                     :style="{ '--lock-image': `url(${lockImage})` }"
+                     >
                     <!-- 列表封面图 -->
                   <div class="bg-image-container" :style="{ backgroundImage: `url(${courseType.bgImage})` }">
                     <!-- 星星图标 -->
@@ -85,9 +87,9 @@
         <div class="bottom-box">
           <div class="line-container">
             <div class="bold-line"></div>
-            <div 
-              v-for="(button, index) in circleButtons" 
-              :key="index" 
+            <div
+              v-for="(button, index) in circleButtons"
+              :key="index"
               class="circle-button"
               :class="{ 'active': activeButton === index }"
               @click="activeButton = index"
@@ -342,7 +344,7 @@ onMounted(() => {
   if (title) {
     pageTitle.value = title
   }
-  
+
   const id = route.query.categoryId
   if (id) {
     categoryId.value = id
@@ -442,7 +444,7 @@ const disableBlockly = (blocklyId = categoryId.value) => {
   height: 100%;
 }
 .top-center-inner-box{
-    background-size: 70%; 
+    background-size: 70%;
     background-position: 50% 80%;
     background-repeat: no-repeat;
     display: flex; /* 使用flex布局 */
@@ -469,7 +471,7 @@ const disableBlockly = (blocklyId = categoryId.value) => {
     cursor: pointer;
   }
 }
-  
+
 .middle-wrapper {
   height: 60%;
   overflow: hidden; /* 溢出隐藏 */
@@ -527,7 +529,7 @@ const disableBlockly = (blocklyId = categoryId.value) => {
 
 
 .new-white-box {
-  width: 100%; 
+  width: 100%;
   height: 65%;
   margin-top: rpx(20);
   background-color: white;
@@ -543,7 +545,7 @@ const disableBlockly = (blocklyId = categoryId.value) => {
   content: '';
   position: absolute;
   bottom: -rpx(8);
-  left: 50%;
+  left: 50.5%;
   transform: translateX(-50%);
   width: 0;
   height: 0;
@@ -564,20 +566,42 @@ const disableBlockly = (blocklyId = categoryId.value) => {
 /* 禁用状态样式 */
 .new-white-box.disabled {
   cursor: not-allowed;
-  filter: grayscale(80%);
+  filter: grayscale(0%); /* 改为100%黑白色 */
   pointer-events: none;
+  position: relative;
 }
 
 /* 禁用状态下的文字颜色 */
 .new-white-box.disabled .box-title {
-  color: #999;
+  color: #676666;
 }
 
+/* 禁用状态下的遮挡层 */
+.new-white-box.disabled::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.3);
+  background-image: var(--lock-image);
+  background-size: 40%;
+  background-position: center;
+  background-repeat: no-repeat;
+  border-radius: rpx(15);
+  z-index: 2;
+}
+/* 小三角效果 */
+.new-white-box.disabled::after {
+  top: rpx(150);
+  opacity: 0.5;
+}
 
 /* 背景图容器 */
 .bg-image-container {
   width: 100%;
-  height: 85%; 
+  height: 85%;
   background-size: 105%; 
   background-position: center;
   background-repeat: no-repeat;