Northern_Lights/ZeroBot-Plugin
1
0
Fork 0
mirror of https://github.com/FloatTech/ZeroBot-Plugin.git synced 2025-12-19 13:59:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 初始化错误，改善阅读体验 (#572)

Browse Source
This commit is contained in:
GenesisAN 2023-02-01 11:47:04 +08:00 committed by GitHub
parent 7bce7f28dc
commit 16ab7c08f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugin/warframeapi/main.go
View File

@ -4,6 +4,7 @@ package warframeapi
import ( import (
"fmt" "fmt"
"strconv" "strconv"
"strings"
"time" "time"
ctrl "github.com/FloatTech/zbpctrl" ctrl "github.com/FloatTech/zbpctrl"
@ -28,6 +29,11 @@ func init() {
"- wf每日特惠", "- wf每日特惠",
PrivateDataFolder: "warframeapi", PrivateDataFolder: "warframeapi",
}) })
gameWorld.w = [3]*timezone{
{Name: "地球平原", DayDesc: "白天", NightDesc: "夜晚", DayLen: 100 * 60, NightLen: 50 * 60},
{Name: "金星平原", DayDesc: "温暖", NightDesc: "寒冷", DayLen: 400, NightLen: 20 * 60},
{Name: "火卫二平原", DayDesc: "fass", NightDesc: "vome", DayLen: 100 * 60, NightLen: 50 * 60},
}
// 获取具体的平原时间, 在触发后, 会启动持续时间按5分钟的时间更新模拟, 以此处理短时间内请求时, 时间不会变化的问题 // 获取具体的平原时间, 在触发后, 会启动持续时间按5分钟的时间更新模拟, 以此处理短时间内请求时, 时间不会变化的问题
eng.OnSuffix("平原时间").SetBlock(true). eng.OnSuffix("平原时间").SetBlock(true).
@ -250,10 +256,16 @@ func init() {
default: // 如果搜搜到了多个 default: // 如果搜搜到了多个
// 遍历搜索结果, 并打印为图片展出 // 遍历搜索结果, 并打印为图片展出
msgs := make(message.Message, len(sol)+1) msgs := make(message.Message, len(sol)+1)
msgs[0] = ctxext.FakeSenderForwardNode(ctx, message.Text("包含多个结果, 请输入编号查看(15s内),输入c直接结束会话")) msgs[0] = ctxext.FakeSenderForwardNode(ctx, message.Text("包含多个结果, 请输入编号查看(30s内),输入c直接结束会话"))
for i, v := range sol { sb := strings.Builder{}
msgs[i+1] = ctxext.FakeSenderForwardNode(ctx, message.Text("[", i, "] ", v)) if len(sol) > 25 {
sb.WriteString("数量过多，只显示前25\n")
sol = sol[:25]
} }
for i, v := range sol {
sb.WriteString(fmt.Sprintln("[", i, "] ", v))
}
msgs[1] = ctxext.FakeSenderForwardNode(ctx, message.Text(sb.String()))
ctx.SendChain(msgs...) ctx.SendChain(msgs...)
itemIndex := getitemnameindex(ctx) itemIndex := getitemnameindex(ctx)
if itemIndex < 0 { if itemIndex < 0 {
@ -300,6 +312,7 @@ func init() {
if len(sells) < max { if len(sells) < max {
max = len(sells) max = len(sells)
} }
sb := strings.Builder{}
if ismod { if ismod {
if !onlymaxrank { if !onlymaxrank {
msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx, message.Text("请输入编号选择, 或输入r获取满级报价(30s内)\n输入c直接结束会话"))) msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx, message.Text("请输入编号选择, 或输入r获取满级报价(30s内)\n输入c直接结束会话")))
@ -307,15 +320,18 @@ func init() {
msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx, message.Text("请输入编号选择(30s内)\n输入c直接结束会话"))) msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx, message.Text("请输入编号选择(30s内)\n输入c直接结束会话")))
} }
for i := 0; i < max; i++ { for i := 0; i < max; i++ {
msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx, //msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx,
message.Text(fmt.Sprintf("[%d] (Rank:%d/%d) %dP - %s\n", i, sells[i].ModRank, iteminfo.ModMaxRank, sells[i].Platinum, sells[i].User.IngameName)))) // message.Text(fmt.Sprintf("[%d] (Rank:%d/%d) %dP - %s\n", i, sells[i].ModRank, iteminfo.ModMaxRank, sells[i].Platinum, sells[i].User.IngameName))))
sb.WriteString(fmt.Sprintf("[%d] (Rank:%d/%d) %dP - %s\n", i, sells[i].ModRank, iteminfo.ModMaxRank, sells[i].Platinum, sells[i].User.IngameName))
} }
} else { } else {
for i := 0; i < max; i++ { for i := 0; i < max; i++ {
msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx, //msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx,
message.Text(fmt.Sprintf("[%d] %dP -%s\n", i, sells[i].Platinum, sells[i].User.IngameName)))) // message.Text(fmt.Sprintf("[%d] %dP -%s\n", i, sells[i].Platinum, sells[i].User.IngameName))))
sb.WriteString(fmt.Sprintf("[%d] %dP -%s\n", i, sells[i].Platinum, sells[i].User.IngameName))
} }
} }
msgs = append(msgs, ctxext.FakeSenderForwardNode(ctx, message.Text(sb.String())))
ctx.SendChain(msgs...) ctx.SendChain(msgs...)
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
@ -364,7 +380,7 @@ func getitemnameindex(ctx *zero.Ctx) int {
defer cancel() defer cancel()
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
select { select {
case <-time.After(time.Second * 15): case <-time.After(time.Second * 30):
// 超时15秒处理 // 超时15秒处理
ctx.SendChain(message.Text("会话已超时!")) ctx.SendChain(message.Text("会话已超时!"))
return -1 return -1

13
plugin/warframeapi/world.go
View File

@ -66,11 +66,14 @@ func (w *world) refresh(api *wfapi) {
for _, t := range w.w { for _, t := range w.w {
t.Lock() t.Lock()
} }
w.w = [3]*timezone{ w.w[0].NextTime = api.CetusCycle.Expiry.Local()
{Name: "地球平原", NextTime: api.CetusCycle.Expiry.Local(), IsDay: api.CetusCycle.IsDay, DayDesc: "白天", NightDesc: "夜晚", DayLen: 100 * 60, NightLen: 50 * 60}, w.w[0].IsDay = api.CetusCycle.IsDay
{Name: "金星平原", NextTime: api.VallisCycle.Expiry.Local(), IsDay: api.VallisCycle.IsWarm, DayDesc: "温暖", NightDesc: "寒冷", DayLen: 400, NightLen: 20 * 60},
{Name: "火卫二平原", NextTime: api.CambionCycle.Expiry.Local(), IsDay: api.CambionCycle.Active == "fass", DayDesc: "fass", NightDesc: "vome", DayLen: 100 * 60, NightLen: 50 * 60}, w.w[1].NextTime = api.VallisCycle.Expiry.Local()
} w.w[1].IsDay = api.VallisCycle.IsWarm
w.w[2].NextTime = api.CambionCycle.Expiry.Local()
w.w[2].IsDay = api.CambionCycle.Active == "fass"
} }
// 游戏时间更新 // 游戏时间更新