From 9b643f43529a485a1b8ddd610fb7319e268b2cca Mon Sep 17 00:00:00 2001 From: mapleafgo Date: Wed, 13 Nov 2024 11:25:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=82=B9=E4=BD=8D=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.md | 12 ++++++------ internal/middleware/bgm.go | 4 ++-- internal/routes/play.go | 2 +- internal/routes/wait.go | 4 ++-- internal/server.go | 2 +- pkg/video/paly.go | 1 + 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/game.md b/game.md index d7c1ece..9c33918 100644 --- a/game.md +++ b/game.md @@ -1,6 +1,6 @@ # 特殊游戏节点报文 -## 入口 +## 入口(0) 入口处不需要任何额外的处理 @@ -8,7 +8,7 @@ {} ``` -## 召唤神女 +## 召唤神女(1) ```json lines { @@ -17,7 +17,7 @@ } ``` -## 镇水神力 +## 镇水神力(2) ```json lines { @@ -26,7 +26,7 @@ } ``` -## 神女除妖 +## 神女除妖(3) 除妖处不需要任何额外的处理,待游戏自然完成即可 @@ -34,7 +34,7 @@ {} ``` -## 神女授书 +## 神女授书(4) 待定 @@ -43,7 +43,7 @@ } ``` -## 青云龙台 +## 青云龙台(5) 待定 diff --git a/internal/middleware/bgm.go b/internal/middleware/bgm.go index 3947904..a0caea2 100644 --- a/internal/middleware/bgm.go +++ b/internal/middleware/bgm.go @@ -17,7 +17,7 @@ func PlayBgm() leaf.HandlerFunc { bgm, err := utils.LinkAudio(pm.BGM) if err != nil { - logger.Errorln("背景音乐解析异常", err) + logger.Errorln("背景音乐数据解析异常:", err) } if bgm != nil { logger.Infoln("背景音乐解析成功") @@ -40,7 +40,7 @@ func PlayBgm() leaf.HandlerFunc { ctrl, closer, e := audio.PlayBgmMP3(bgm) defer closer() if e != nil { - logger.Errorln("播放背景音乐异常", e) + logger.Errorln("播放背景音乐异常:", e) return } diff --git a/internal/routes/play.go b/internal/routes/play.go index bee846d..1d1da8a 100644 --- a/internal/routes/play.go +++ b/internal/routes/play.go @@ -16,7 +16,7 @@ func PlayRouter(location string, point int) leaf.HandlerFunc { func switchPoint(point int) leaf.HandlerFunc { switch point { - case 3: + case 2: // 镇水塔点位 return play.OnlyVideo default: return play.Default diff --git a/internal/routes/wait.go b/internal/routes/wait.go index 824c44d..3fdd11b 100644 --- a/internal/routes/wait.go +++ b/internal/routes/wait.go @@ -100,7 +100,7 @@ func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod data, err := utils.LinkAudio(item.Data) if err != nil { - logger.Errorln("音频文件获取异常: ", err) + logger.Errorln("音频数据获取异常: ", err) return } @@ -228,7 +228,7 @@ func videoAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod for { err := video.Play(c, local) if err != nil { - logger.Errorln("视频播放异常: ", err) + logger.Infof("视频播放异常: %s", err) return } select { diff --git a/internal/server.go b/internal/server.go index dd86a79..28f7f03 100644 --- a/internal/server.go +++ b/internal/server.go @@ -131,7 +131,7 @@ func Run() { middleware.PlayBgm(), routes.PlayRouter(config.C.Location, config.C.Point), ) - // 处理待机线程报文 + // 处理待机报文 router.RegisterHandler(topicPrefix+"wait", middleware.RunLog(), middleware.PayloadJSON[schema.WaitModel](), diff --git a/pkg/video/paly.go b/pkg/video/paly.go index a80e78e..ff1fbc4 100644 --- a/pkg/video/paly.go +++ b/pkg/video/paly.go @@ -25,6 +25,7 @@ func Play(ctx context.Context, file string) error { a := make(chan struct{}) defer close(a) + wait.Add(1) go func() { defer wait.Done()