1.23 版本完成_准备下一步做快速再来下一把

3648c936 · lidongxu · 0d9e4950 · 3648c936 · 3648c936 · 3648c936
--- a/.cursor/plans/泡泡龙三端项目搭建_340cd980.plan.md
+++ b/.cursor/plans/泡泡龙三端项目搭建_340cd980.plan.md
 ---
-name: 泡泡龙三端项目搭建
+name: 伙伴泡泡三端项目搭建
 overview: 在 paopao 目录下新建 server（Node.js 后台）、big-screen（大屏展示页）、admin（后台管理系统）三个项目，与现有 minigame-1 并列，实现小游戏画面实时投屏到大屏、游戏数据持久化存储、后台管理控制等完整功能链路。
 todos:
  - id: server-init
@@ -56,7 +56,7 @@ todos:
 isProject: false
 ---
-# 泡泡龙三端项目搭建规划
+# 伙伴泡泡三端项目搭建规划
 ## 整体目录结构

--- a/admin/index.html
+++ b/admin/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>泡泡龙 - 管理后台</title>
+    <title>伙伴泡泡 - 管理后台</title>
  </head>
  <body>
    <div id="app"></div>

--- a/admin/src/components/layout/AppHeader.vue
+++ b/admin/src/components/layout/AppHeader.vue
@@ -11,7 +11,7 @@
      </el-breadcrumb>
    </div>
    <div class="header-right">
-      <span class="header-title">{{ currentTitle || '泡泡龙管理后台' }}</span>
+      <span class="header-title">{{ currentTitle || '伙伴泡泡管理后台' }}</span>
    </div>
  </el-header>
 </template>

--- a/admin/src/components/layout/Sidebar.vue
+++ b/admin/src/components/layout/Sidebar.vue
 <template>
  <el-aside :width="asideWidth" class="sidebar" :class="{ 'sidebar--collapsed': collapsed }">
    <div class="logo">
-      <span v-show="!collapsed">泡泡龙管理</span>
+      <span v-show="!collapsed">伙伴泡泡管理</span>
      <span v-show="collapsed" class="logo-icon">泡</span>
    </div>
    <el-menu

--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -47,7 +47,7 @@ const router = createRouter({
 })
 router.beforeEach((to, _from, next) => {
-  document.title = to.meta.title ? `${to.meta.title} - 泡泡龙管理后台` : '泡泡龙管理后台'
+  document.title = to.meta.title ? `${to.meta.title} - 伙伴泡泡管理后台` : '伙伴泡泡管理后台'
  next()
 })

--- a/big-screen/index.html
+++ b/big-screen/index.html
@@ -3,7 +3,7 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>泡泡龙 - 大屏展示</title>
+    <title>伙伴泡泡 - 大屏展示</title>
    <style>
      * { margin: 0; padding: 0; box-sizing: border-box; }
      html, body {

--- a/big-screen/package.json
+++ b/big-screen/package.json
 {
  "name": "paopao-big-screen",
  "version": "1.0.0",
-  "description": "泡泡龙大屏展示页 - Vite + Canvas 2D",
+  "description": "伙伴泡泡大屏展示页 - Vite + Canvas 2D",
  "type": "module",
  "scripts": {
    "dev": "vite",

--- a/big-screen/src/renderer/bubbleGrid.js
+++ b/big-screen/src/renderer/bubbleGrid.js
@@ -3,6 +3,7 @@
 * 根据 state 中的 grid 二维数组和 pushAnimOffsetY 绘制网格泡泡
 */
 import { getBubbleRadius, gridToScreen, drawBubble3D } from './bubble.js'
+import { SCREEN_WIDTH, SCREEN_HEIGHT, SAFE_AREA_BOTTOM } from '../constants.js'
 /**
 * 绘制泡泡网格
@@ -23,4 +24,18 @@ export function drawBubbleGrid(ctx, grid, pushAnimOffsetY = 0) {
      drawBubble3D(ctx, x, y + offsetY, getBubbleRadius(), color)
    }
  }
+  // 绘制危险线（与小游戏端判定逻辑一致）
+  const R = getBubbleRadius()
+  const dangerY = SCREEN_HEIGHT - SAFE_AREA_BOTTOM - R * 11.2
+  ctx.save()
+  ctx.strokeStyle = 'rgba(255, 0, 0, 0.7)'
+  ctx.lineWidth = 2
+  ctx.setLineDash([8, 4])
+  ctx.beginPath()
+  ctx.moveTo(0, dangerY)
+  ctx.lineTo(SCREEN_WIDTH, dangerY)
+  ctx.stroke()
+  ctx.setLineDash([])
+  ctx.restore()
 }
--- a/big-screen/src/renderer/idleScreen.js
+++ b/big-screen/src/renderer/idleScreen.js
@@ -67,7 +67,7 @@ function drawTitle(ctx, cx, y) {
  // 主标题阴影
  ctx.font = `bold ${SCREEN_WIDTH * 0.145}px Arial`
  ctx.fillStyle = 'rgba(0,0,0,0.45)'
-  ctx.fillText('泡泡龙', cx + 3, y + 3)
+  ctx.fillText('伙伴泡泡', cx + 3, y + 3)
  // 主标题渐变
  const tg = ctx.createLinearGradient(cx - 90, y - 30, cx + 90, y + 30)
@@ -77,7 +77,7 @@ function drawTitle(ctx, cx, y) {
  ctx.shadowColor = 'rgba(168,85,247,0.8)'
  ctx.shadowBlur = 28
  ctx.fillStyle = tg
-  ctx.fillText('泡泡龙', cx, y)
+  ctx.fillText('伙伴泡泡', cx, y)
  ctx.shadowBlur = 0
  // 副标题

--- a/big-screen/src/renderer/shooter.js
+++ b/big-screen/src/renderer/shooter.js
@@ -101,10 +101,6 @@ export function drawShooter(ctx, shooterState) {
  if (_bobPhase > Math.PI * 2) _bobPhase -= Math.PI * 2
  const bobOffset = Math.sin(_bobPhase) * R * 0.15
-  // 瞄准线
-  const aimPoints = shooterState.aimPoints ?? (isAiming ? calcAimPoints(x, bubbleBaseY, aimAngle) : [])
-  drawAimLine(ctx, aimPoints)
  // 绘制鸡（以底部中心为旋转轴，跟随瞄准方向倾斜）
  const bottomY = chickenBottom + bounceOffsetY + bobOffset
@@ -120,6 +116,12 @@ export function drawShooter(ctx, shooterState) {
  const headY = bottomY - Math.cos(_currentLean) * CHICKEN_HEIGHT * bounceScaleY - BUBBLE_TOP_OFFSET
  drawBubble3D(ctx, headX, headY, R, currentColor)
+  // 瞄准线从泡泡中心（headX/headY）出发
+  if (isAiming) {
+    const aimPts = calcAimPoints(headX, headY, aimAngle)
+    drawAimLine(ctx, aimPts)
+  }
  // 下一颗预览泡泡
  const nextR = R * NEXT_SCALE
  const nextX = x + NEXT_X_OFFSET

--- a/server/init.sql
+++ b/server/init.sql
 -- =============================================================
-- 泡泡龙项目数据库初始化脚本
+-- 伙伴泡泡项目数据库初始化脚本
 -- 数据库：MySQL 5.7+
 -- 生成时间：2026-03-17
 -- =============================================================

--- a/server/package.json
+++ b/server/package.json
 {
  "name": "paopao-server",
  "version": "1.0.0",
-  "description": "泡泡龙游戏后台服务 - Express + Socket.io + Prisma + MySQL",
+  "description": "伙伴泡泡游戏后台服务 - Express + Socket.io + Prisma + MySQL",
  "main": "src/app.js",
  "scripts": {
    "start": "node src/app.js",