Merge branch 'main' into dev

# Conflicts: # src/views/ChengduGamePage.vue # vite.config.ts
Merge remote-tracking branch 'origin/dev'
2026-03-24 13:45:30 +08:00 · 2026-03-24 09:13:16 +08:00 · 2026-03-24 09:03:11 +08:00 · 2026-03-20 17:27:13 +08:00 · 2026-03-18 17:26:20 +08:00
5 changed files with 0 additions and 0 deletions
--- a/pictures/微信图片_20260318170012_3_20.png
+++ b/pictures/微信图片_20260318170012_3_20.png
--- a/pictures/微信图片_20260318170013_4_20.png
+++ b/pictures/微信图片_20260318170013_4_20.png
--- a/pictures/微信图片_20260318170016_5_20.png
+++ b/pictures/微信图片_20260318170016_5_20.png
--- a/pictures/微信图片_20260318170019_6_20.png
+++ b/pictures/微信图片_20260318170019_6_20.png
--- a/pictures/微信图片_20260318170025_7_20.png
+++ b/pictures/微信图片_20260318170025_7_20.png
Author	SHA1	Message	Date
wsy182	d4e217b11b	Merge branch 'main' into dev # Conflicts: # src/views/ChengduGamePage.vue # vite.config.ts	2026-03-24 13:45:30 +08:00
wsy182	ee797ebb14	Merge remote-tracking branch 'origin/dev' # Conflicts: # src/views/ChengduGamePage.vue	2026-03-24 09:13:16 +08:00
wsy182	1308ca5a2c	Update vite.config.ts	2026-03-24 09:03:11 +08:00
wsy182	fba407c1bf	chore(config): 更新开发服务器代理配置 - 将 API 代理目标端口从 8080 更改为 18080 - 将 WebSocket 代理目标端口从 8080 更改为 18080 - 保持了原有的 changeOrigin 和 ws 配置选项	2026-03-20 17:27:13 +08:00
wsy182	0fa14ca407	feat(game): 实现成都麻将游戏界面和核心功能 - 添加麻将桌面背景和完整的UI布局设计 - 实现玩家座位渲染、牌面显示和游戏状态管理 - 集成定缺选择、碰牌操作和结算功能 - 添加计时器、网络状态和实时消息显示 - 创建麻将牌面图片资源和动态加载机制 - 实现游戏流程控制和玩家交互逻辑	2026-03-18 17:26:20 +08:00