mirror of
https://github.com/FloatTech/ZeroBot-Plugin.git
synced 2025-12-19 22:00:11 +08:00
fix: 修复注销牛牛无法进行累加收费的问题&&优化代码 (#1178)
Some checks failed
打包最新版为 Docker Image / build docker (push) Has been cancelled
最新版 / Build binary CI (386, linux) (push) Has been cancelled
最新版 / Build binary CI (386, windows) (push) Has been cancelled
最新版 / Build binary CI (amd64, linux) (push) Has been cancelled
最新版 / Build binary CI (amd64, windows) (push) Has been cancelled
最新版 / Build binary CI (arm, linux) (push) Has been cancelled
最新版 / Build binary CI (arm64, linux) (push) Has been cancelled
PushLint / lint (push) Has been cancelled
Some checks failed
打包最新版为 Docker Image / build docker (push) Has been cancelled
最新版 / Build binary CI (386, linux) (push) Has been cancelled
最新版 / Build binary CI (386, windows) (push) Has been cancelled
最新版 / Build binary CI (amd64, linux) (push) Has been cancelled
最新版 / Build binary CI (amd64, windows) (push) Has been cancelled
最新版 / Build binary CI (arm, linux) (push) Has been cancelled
最新版 / Build binary CI (arm64, linux) (push) Has been cancelled
PushLint / lint (push) Has been cancelled
* fix:修复注销牛牛无法进行累加收费的问题 * 修改牛牛商店的循环条件为商品变量的长度
This commit is contained in:
parent
1c0d91424a
commit
0615993297
@ -65,7 +65,7 @@ func init() {
|
|||||||
messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text("牛牛拍卖行有以下牛牛")))
|
messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text("牛牛拍卖行有以下牛牛")))
|
||||||
for _, info := range auction {
|
for _, info := range auction {
|
||||||
msg := fmt.Sprintf("商品序号: %d\n牛牛原所属: %d\n牛牛价格: %d%s\n牛牛大小: %.2fcm",
|
msg := fmt.Sprintf("商品序号: %d\n牛牛原所属: %d\n牛牛价格: %d%s\n牛牛大小: %.2fcm",
|
||||||
info.ID+1, info.UserID, info.Money, wallet.GetWalletName(), info.Length)
|
info.ID, info.UserID, info.Money, wallet.GetWalletName(), info.Length)
|
||||||
messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text(msg)))
|
messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text(msg)))
|
||||||
}
|
}
|
||||||
if id := ctx.Send(messages).ID(); id == 0 {
|
if id := ctx.Send(messages).ID(); id == 0 {
|
||||||
@ -90,7 +90,6 @@ func init() {
|
|||||||
ctx.SendChain(message.Text("ERROR: ", err))
|
ctx.SendChain(message.Text("ERROR: ", err))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
n--
|
|
||||||
msg, err := niu.Auction(gid, uid, n)
|
msg, err := niu.Auction(gid, uid, n)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.SendChain(message.Text("ERROR:", err))
|
ctx.SendChain(message.Text("ERROR:", err))
|
||||||
@ -151,7 +150,7 @@ func init() {
|
|||||||
|
|
||||||
var messages message.Message
|
var messages message.Message
|
||||||
messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text("牛牛商店当前售卖的物品如下")))
|
messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text("牛牛商店当前售卖的物品如下")))
|
||||||
for id := range propMap {
|
for id := 1; id <= len(propMap); id++ {
|
||||||
product := propMap[id]
|
product := propMap[id]
|
||||||
productInfo := fmt.Sprintf("商品%d\n商品名: %s\n商品价格: %dATRI币\n商品作用域: %s\n商品描述: %s\n使用次数:%d",
|
productInfo := fmt.Sprintf("商品%d\n商品名: %s\n商品价格: %dATRI币\n商品作用域: %s\n商品描述: %s\n使用次数:%d",
|
||||||
id, product.name, product.cost, product.scope, product.description, product.count)
|
id, product.name, product.cost, product.scope, product.description, product.count)
|
||||||
@ -380,6 +379,9 @@ func init() {
|
|||||||
)))
|
)))
|
||||||
|
|
||||||
if c.Count >= 4 {
|
if c.Count >= 4 {
|
||||||
|
if c.Count == 6 {
|
||||||
|
return
|
||||||
|
}
|
||||||
id := ctx.SendPrivateMessage(adduser,
|
id := ctx.SendPrivateMessage(adduser,
|
||||||
message.Text(fmt.Sprintf("你在%d群里已经被厥冒烟了,快去群里赎回你原本的牛牛!\n发送:`赎牛牛`即可!", gid)))
|
message.Text(fmt.Sprintf("你在%d群里已经被厥冒烟了,快去群里赎回你原本的牛牛!\n发送:`赎牛牛`即可!", gid)))
|
||||||
if id == 0 {
|
if id == 0 {
|
||||||
@ -394,7 +396,7 @@ func init() {
|
|||||||
key := fmt.Sprintf("%d_%d", gid, uid)
|
key := fmt.Sprintf("%d_%d", gid, uid)
|
||||||
data, ok := register.Load(key)
|
data, ok := register.Load(key)
|
||||||
switch {
|
switch {
|
||||||
case !ok || time.Since(data.TimeLimit) > time.Hour*12:
|
case !ok || time.Since(data.TimeLimit) > time.Hour*24:
|
||||||
data = &lastLength{
|
data = &lastLength{
|
||||||
TimeLimit: time.Now(),
|
TimeLimit: time.Now(),
|
||||||
Count: 1,
|
Count: 1,
|
||||||
@ -404,6 +406,7 @@ func init() {
|
|||||||
ctx.SendChain(message.Text("你的钱不够你注销牛牛了,这次注销需要", data.Count*50, wallet.GetWalletName()))
|
ctx.SendChain(message.Text("你的钱不够你注销牛牛了,这次注销需要", data.Count*50, wallet.GetWalletName()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
data.Count++
|
||||||
}
|
}
|
||||||
register.Store(key, data)
|
register.Store(key, data)
|
||||||
msg, err := niu.Cancel(gid, uid)
|
msg, err := niu.Cancel(gid, uid)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user