Skip to content

Commit f1e49dc

Browse files
committed
remove 拟声鸟, add TTSCN
1 parent 573c942 commit f1e49dc

File tree

5 files changed

+44
-27
lines changed

5 files changed

+44
-27
lines changed

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ go 1.20
44

55
require (
66
github.com/Baidu-AIP/golang-sdk v1.1.1
7-
github.com/FloatTech/AnimeAPI v1.6.1-0.20230331074616-e33f890df71e
7+
github.com/FloatTech/AnimeAPI v1.6.1-0.20230407094656-35c90555daf6
88
github.com/FloatTech/floatbox v0.0.0-20230331064925-9af336a84944
99
github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08
1010
github.com/FloatTech/imgfactory v0.2.2-0.20230322091809-b0ddbe44b94b
1111
github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9
12-
github.com/FloatTech/sqlite v1.5.7
12+
github.com/FloatTech/sqlite v1.6.2
1313
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
14-
github.com/FloatTech/zbpctrl v1.5.3-0.20230316111343-dd078fa43fe3
15-
github.com/FloatTech/zbputils v1.6.2-0.20230331074541-89a5b4840e92
14+
github.com/FloatTech/zbpctrl v1.5.3-0.20230406055807-cb5f5edad2c7
15+
github.com/FloatTech/zbputils v1.6.2-0.20230407083549-931d7968df13
1616
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
1717
github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
1818
github.com/antchfx/htmlquery v1.2.5
@@ -24,6 +24,7 @@ require (
2424
github.com/fumiama/go-base16384 v1.6.4
2525
github.com/fumiama/go-registry v0.2.6
2626
github.com/fumiama/gotracemoe v0.0.3
27+
github.com/fumiama/imgsz v0.0.2
2728
github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565
2829
github.com/fumiama/unibase2n v0.0.0-20221020155353-02876e777430
2930
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
@@ -51,7 +52,6 @@ require (
5152
github.com/faiface/beep v1.1.0 // indirect
5253
github.com/fumiama/go-simple-protobuf v0.1.0 // indirect
5354
github.com/fumiama/gofastTEA v0.0.10 // indirect
54-
github.com/fumiama/imgsz v0.0.2 // indirect
5555
github.com/gabriel-vasile/mimetype v1.0.4 // indirect
5656
github.com/go-ole/go-ole v1.2.6 // indirect
5757
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/Baidu-AIP/golang-sdk v1.1.1 h1:RQsAmgDSAkiq22I6n7XJ2t3afgzFeqjY46FGhv
22
github.com/Baidu-AIP/golang-sdk v1.1.1/go.mod h1:bXnGw7xPeKt8aF7UCELKrV6UZ/46spItONK1RQBQj1Y=
33
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
44
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
5-
github.com/FloatTech/AnimeAPI v1.6.1-0.20230331074616-e33f890df71e h1:4V7UZyLZKmjXUDtmYFK5+EWIrrkSuN+jHjKXkWsqQ/A=
6-
github.com/FloatTech/AnimeAPI v1.6.1-0.20230331074616-e33f890df71e/go.mod h1:LSJN8VkJXBhyAdOolVNeUptJz6l1TZ+/CfXN1OafyEY=
5+
github.com/FloatTech/AnimeAPI v1.6.1-0.20230407094656-35c90555daf6 h1:hS5U1Xz6JtVyGdXOl50j9ubQxP446+TjIAhaGapGUpU=
6+
github.com/FloatTech/AnimeAPI v1.6.1-0.20230407094656-35c90555daf6/go.mod h1:UnCPjtpIzpNBZ02yeGYp+oYVxgoi5aF2yAK2bkOVxtI=
77
github.com/FloatTech/floatbox v0.0.0-20230331064925-9af336a84944 h1:/eQoMa6Aj3coF5F7yhzZe1+SzX6SItul7MW8//pl18o=
88
github.com/FloatTech/floatbox v0.0.0-20230331064925-9af336a84944/go.mod h1:FwQm6wk+b4wuW54KCKn3zccMX47Q5apnHD/Yakzv0fI=
99
github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08 h1:dPLeoiTVSBlgls+66EB/UJ2e38BaASmBN5nANaycSBU=
@@ -12,14 +12,14 @@ github.com/FloatTech/imgfactory v0.2.2-0.20230322091809-b0ddbe44b94b h1:VMNci4SW
1212
github.com/FloatTech/imgfactory v0.2.2-0.20230322091809-b0ddbe44b94b/go.mod h1:el5hGpj1C1bDRxcTXYRwEivDCr40zZeJpcrLrB1fajs=
1313
github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9 h1:hffajvmQFfP68U6wUwHemPuuwCUoss+SEFfoLYwbGwE=
1414
github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9/go.mod h1:NBFPhWae4hqVMeG8ELBBnUQkKce3nDjkljVn6PdiUNs=
15-
github.com/FloatTech/sqlite v1.5.7 h1:Bvo4LSojcZ6dVtbHrkqvt6z4v8e+sj0G5PSUIvdawsk=
16-
github.com/FloatTech/sqlite v1.5.7/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
15+
github.com/FloatTech/sqlite v1.6.2 h1:FytbExjpvYalZxxITtmSenHiPGLPUvlz47LY/P0SCCw=
16+
github.com/FloatTech/sqlite v1.6.2/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
1717
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
1818
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
19-
github.com/FloatTech/zbpctrl v1.5.3-0.20230316111343-dd078fa43fe3 h1:mCVrTvS2LMNaI2bNA1Gu/B4F5MnfGaTaJClgR6+rhdA=
20-
github.com/FloatTech/zbpctrl v1.5.3-0.20230316111343-dd078fa43fe3/go.mod h1:IagyEhY38VcbbQgVRzAM9f9mhaUn90rM5BTPfudtl1g=
21-
github.com/FloatTech/zbputils v1.6.2-0.20230331074541-89a5b4840e92 h1:yp2hYvK+FaaozRG9+KPgoknbdvp5ZbrNHOjMfES0lEM=
22-
github.com/FloatTech/zbputils v1.6.2-0.20230331074541-89a5b4840e92/go.mod h1:3bpENp0t2puKC4Kwp+ksEcMPkuw/8pWI4G6/+/e3jCA=
19+
github.com/FloatTech/zbpctrl v1.5.3-0.20230406055807-cb5f5edad2c7 h1:ii/HjRAAH1Ot1mwg4r+kabiI0H8EZ/PwTZryEbN4Jvg=
20+
github.com/FloatTech/zbpctrl v1.5.3-0.20230406055807-cb5f5edad2c7/go.mod h1:IagyEhY38VcbbQgVRzAM9f9mhaUn90rM5BTPfudtl1g=
21+
github.com/FloatTech/zbputils v1.6.2-0.20230407083549-931d7968df13 h1:7HX4TP7/ihnoCvD/XyM2nxi4EI0wClQB7SSDCSgfx8I=
22+
github.com/FloatTech/zbputils v1.6.2-0.20230407083549-931d7968df13/go.mod h1:iPlPghAE6SSDBZPHA6ZiPyspfeVDNQqtfLDkftHlD4I=
2323
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
2424
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
2525
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=

plugin/ai_reply/ai_tts.go

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ import (
1212
"github.com/FloatTech/AnimeAPI/tts"
1313
"github.com/FloatTech/AnimeAPI/tts/baidutts"
1414
"github.com/FloatTech/AnimeAPI/tts/genshin"
15-
"github.com/FloatTech/AnimeAPI/tts/mockingbird"
15+
"github.com/FloatTech/AnimeAPI/tts/ttscn"
1616
ctrl "github.com/FloatTech/zbpctrl"
1717
"github.com/FloatTech/zbputils/control"
1818
)
1919

2020
// 数据结构: [4 bits] [4 bits] [8 bits] [8 bits]
21-
// [拟声鸟模式] [百度模式] [tts模式] [回复模式]
21+
// [ttscn模式] [百度模式] [tts模式] [回复模式]
2222

2323
// defaultttsindexkey
2424
// 数据结构: [4 bits] [4 bits] [8 bits]
25-
// [拟声鸟模式] [百度模式] [tts模式]
25+
// [ttscn模式] [百度模式] [tts模式]
2626

27-
// [tts模式]: 0~63 genshin 64 baidu 65 mockingbird
27+
// [tts模式]: 0~63 genshin 64 baidu 65 ttscn
2828

2929
const (
3030
lastgsttsindex = 63 + iota
3131
baiduttsindex
32-
mockingbirdttsindex
32+
ttscnttsindex
3333
)
3434

3535
// extrattsname is the tts other than genshin vits
36-
var extrattsname = []string{"百度", "拟声鸟"}
36+
var extrattsname = []string{"百度", "TTSCN"}
3737

3838
const (
3939
defaultttsindexkey = -2905
@@ -148,7 +148,7 @@ func newttsmode() *ttsmode {
148148
if ok {
149149
index := m.GetData(defaultttsindexkey)
150150
msk := index & 0xff
151-
if msk >= 0 && (msk < int64(len(genshin.SoundList)) || msk == baiduttsindex || msk == mockingbirdttsindex) {
151+
if msk >= 0 && (msk < int64(len(genshin.SoundList)) || msk == baiduttsindex || msk == ttscnttsindex) {
152152
t.mode.Store(defaultttsindexkey, index)
153153
}
154154
}
@@ -191,7 +191,7 @@ func (t *ttsmode) setSoundMode(ctx *zero.Ctx, name string, baiduper, mockingsynt
191191
case extrattsname[0]:
192192
index = baiduttsindex
193193
case extrattsname[1]:
194-
index = mockingbirdttsindex
194+
index = ttscnttsindex
195195
default:
196196
return errors.New("语音人物" + name + "未注册index")
197197
}
@@ -212,7 +212,7 @@ func (t *ttsmode) getSoundMode(ctx *zero.Ctx) (tts.TTS, error) {
212212
i = m.GetData(gid) >> 8
213213
}
214214
m := i & 0xff
215-
if m < 0 || (m >= int64(len(genshin.SoundList)) && m != baiduttsindex && m != mockingbirdttsindex) {
215+
if m < 0 || (m >= int64(len(genshin.SoundList)) && m != baiduttsindex && m != ttscnttsindex) {
216216
i, _ = t.mode.Load(defaultttsindexkey)
217217
m = i & 0xff
218218
}
@@ -224,7 +224,24 @@ func (t *ttsmode) getSoundMode(ctx *zero.Ctx) (tts.TTS, error) {
224224
ins = baidutts.NewBaiduTTS(int(i&0x0f00) >> 8)
225225
case extrattsname[1]:
226226
var err error
227-
ins, err = mockingbird.NewMockingBirdTTS(int(i&0xf000) >> 12)
227+
ins, err = ttscn.NewTTSCN("中文(普通话,简体)", [...]string{
228+
"晓晓(女 - 年轻人)",
229+
"云扬(男 - 年轻人)",
230+
"晓辰(女 - 年轻人 - 抖音热门)",
231+
"晓涵(女 - 年轻人)",
232+
"晓墨(女 - 年轻人)",
233+
"晓秋(女 - 中年人)",
234+
"晓睿(女 - 老年)",
235+
"晓双(女 - 儿童)",
236+
"晓萱(女 - 年轻人)",
237+
"晓颜(女 - 年轻人)",
238+
"晓悠(女 - 儿童)",
239+
"云希(男 - 年轻人 - 抖音热门)",
240+
"云野(男 - 中年人)",
241+
"晓梦(女 - 年轻人)",
242+
"晓伊(女 - 儿童)",
243+
"晓甄(女 - 年轻人)",
244+
}[int(i&0xf000)>>12], ttscn.KBRates[0])
228245
if err != nil {
229246
return nil, err
230247
}
@@ -268,7 +285,7 @@ func (t *ttsmode) setDefaultSoundMode(name string, baiduper, mockingsynt int) er
268285
case extrattsname[0]:
269286
index = baiduttsindex
270287
case extrattsname[1]:
271-
index = mockingbirdttsindex
288+
index = ttscnttsindex
272289
default:
273290
return errors.New("语音人物" + name + "未注册index")
274291
}

plugin/ai_reply/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ func init() { // 插件主体
2626
DisableOnDefault: true,
2727
Brief: "人工智能语音回复",
2828
Help: "- @Bot 任意文本(任意一句话回复)\n" +
29-
"- 设置语音模式[原神人物/百度/拟声鸟] 数字(百度/拟声鸟模式)\n" +
30-
"- 设置默认语音模式[原神人物/百度/拟声鸟] 数字(百度/拟声鸟模式)\n" +
29+
"- 设置语音模式[原神人物/百度/ttscn] 数字(百度/ttscn模式)\n" +
30+
"- 设置默认语音模式[原神人物/百度/ttscn] 数字(百度/ttscn模式)\n" +
3131
"- 恢复成默认语音模式\n" +
3232
"- 设置原神语音 api key xxxxxx (key请加开发群获得)\n" +
3333
"当前适用的原神人物含有以下:\n" + list(genshin.SoundList[:], 5),

0 commit comments

Comments
 (0)