修复niuniu的已知问题，添加新玩法牛牛商店

README.md

@@ -1039,6 +1039,8 @@ print("run[CQ:image,file="+j["img"]+"]")
 
 - [x] 赎牛牛
 
+- [x] 牛牛商店
+
 - [x] 注册牛牛
 
 - [x] 注销牛牛

plugin/niuniu/main.go

@@ -24,26 +24,99 @@ type lastLength struct {
 	Length    float64
 }
 
+type propsCount struct {
+	Count     int
+	TimeLimit time.Time
+}
+
 var (
 	en = control.AutoRegister(&ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "牛牛大作战",
 		Help: "- 打胶\n" +
-			"- 赎牛牛 （cd：30分钟）\n" +
+			"- jj@xxx\n" +
 			"- 注册牛牛\n" +
+			"- 赎牛牛(cd:45分钟)\n" +
+			"- 牛牛商店\n" +
 			"- 注销牛牛\n" +
 			"- 查看我的牛牛\n" +
-			"- jj@xxx\n" +
 			"- 牛子长度排行\n" +
 			"- 牛子深度排行\n",
 		PrivateDataFolder: "niuniu",
 	})
 	dajiaoLimiter = rate.NewManager[string](time.Second*90, 1)
 	jjLimiter     = rate.NewManager[string](time.Second*150, 1)
 	jjCount       = syncx.Map[string, *lastLength]{}
+	prop          = syncx.Map[string, *propsCount]{}
 )
 
 func init() {
+	en.OnFullMatch("牛牛商店", zero.OnlyGroup, getdb).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		gid := ctx.Event.GroupID
+		uid := ctx.Event.GroupID
+		var messages message.Message
+		messages = append(messages, message.Text("牛牛商店当前售卖的物品如下"))
+		messages = append(messages,
+			ctxext.FakeSenderForwardNode(ctx,
+				message.Text("商品1\n商品名:伟哥\n商品价格:300ATRI币\n商品描述:可以让你打胶每次都增长，有效5次")))
+		messages = append(messages,
+			ctxext.FakeSenderForwardNode(ctx,
+				message.Text("商品2\n商品名:媚药\n商品价格:300ATRI币\n商品描述:可以让你打胶每次都减少，有效5次")))
+		messages = append(messages,
+			ctxext.FakeSenderForwardNode(ctx,
+				message.Text("商品3\n商品名:击剑神器\n商品价格:500ATRI币\n商品描述:可以让你每次击剑都立于不败之地，有效2次")))
+		messages = append(messages,
+			ctxext.FakeSenderForwardNode(ctx,
+				message.Text("商品4\n商品名:击剑神稽\n商品价格:500ATRI币\n商品描述:可以让你每次击剑都失败，有效2次")))
+		if id := ctx.Send(messages).ID(); id == 0 {
+			ctx.Send(message.Text("发送商店失败"))
+		}
+		ctx.SendChain(message.Text("输入对应序号进行购买商品"))
+		recv, cancel := zero.NewFutureEvent("message", 999, false, zero.CheckUser(uid), zero.CheckGroup(gid), zero.RegexRule(`(/d+)`)).Repeat()
+		defer cancel()
+		timer := time.NewTimer(120 * time.Second)
+		defer timer.Stop()
+		for {
+			select {
+			case <-timer.C:
+				ctx.SendChain(message.At(uid), message.Text("超时,已自动取消"))
+				return
+			case r := <-recv:
+				answer := r.Event.Message.String()
+				n, err := strconv.Atoi(answer)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				info, err := db.findniuniu(gid, uid)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				u, money, err := purchaseItem(n, info, uid)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				if wallet.GetWalletOf(uid) < money {
+					ctx.SendChain(message.Text("你还没有足够的ATRI币呢,不能购买"))
+					return
+				}
+				err = wallet.InsertWalletOf(uid, -money)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				err = db.insertniuniu(u, gid)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+
+				ctx.SendChain(message.Text("购买成功!"))
+			}
+		}
+	})
 	en.OnFullMatch("赎牛牛", zero.OnlyGroup, getdb).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		gid := ctx.Event.GroupID
 		uid := ctx.Event.UserID
@@ -52,7 +125,7 @@ func init() {
 			ctx.SendChain(message.Text("你还没有被厥呢"))
 			return
 		}
-		if time.Since(last.TimeLimit) > time.Minute*30 {
+		if time.Since(last.TimeLimit) > time.Minute*45 {
 			ctx.SendChain(message.Text("时间已经过期了,牛牛已被收回!"))
 			jjCount.Delete(fmt.Sprintf("%d_%d", gid, uid))
 			return
@@ -62,11 +135,11 @@ func init() {
 			return
 		}
 		money := wallet.GetWalletOf(uid)
-		if money < 100 {
-			ctx.SendChain(message.Text("赎牛牛需要100ATRI币，快去赚钱吧"))
+		if money < 150 {
+			ctx.SendChain(message.Text("赎牛牛需要150ATRI币，快去赚钱吧"))
 			return
 		}
-		err := wallet.InsertWalletOf(uid, -100)
+		err := wallet.InsertWalletOf(uid, -150)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
@@ -133,11 +206,12 @@ func init() {
 	en.OnFullMatch("查看我的牛牛", getdb, zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		uid := ctx.Event.UserID
 		gid := ctx.Event.GroupID
-		niuniu, err := db.findniuniu(gid, uid)
+		i, err := db.findniuniu(gid, uid)
 		if err != nil {
 			ctx.SendChain(message.Text("你还没有牛牛呢不能查看!"))
 			return
 		}
+		niuniu := i.Length
 		var result strings.Builder
 		sexLong := "长"
 		sex := "♂️"
@@ -172,17 +246,15 @@ func init() {
 		// 获取群号和用户ID
 		gid := ctx.Event.GroupID
 		uid := ctx.Event.UserID
+		t := fmt.Sprintf("%d_%d", gid, uid)
+		updateMap(t, false)
 		niuniu, err := db.findniuniu(gid, uid)
 		if err != nil {
 			ctx.SendChain(message.Text("请先注册牛牛！"))
 			dajiaoLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
 			return
 		}
-		messages, f := generateRandomStingTwo(niuniu)
-		u := userInfo{
-			UID:    uid,
-			Length: f,
-		}
+		messages, u := processNiuniuAction(t, &niuniu, ctx, uid)
 		ctx.SendChain(message.Text(messages))
 		if err = db.insertniuniu(&u, gid); err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
@@ -243,30 +315,32 @@ func init() {
 		}
 		uid := ctx.Event.UserID
 		gid := ctx.Event.GroupID
+		t := fmt.Sprintf("%d_%d", gid, uid)
+		updateMap(t, false)
 		myniuniu, err := db.findniuniu(gid, uid)
 		if err != nil {
 			ctx.SendChain(message.Text("你还没有牛牛快去注册一个吧!"))
-			jjLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
+			jjLimiter.Delete(t)
 			return
 		}
 		adduserniuniu, err := db.findniuniu(gid, adduser)
 		if err != nil {
 			ctx.SendChain(message.At(uid), message.Text("对方还没有牛牛呢，不能🤺"))
-			jjLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
+			jjLimiter.Delete(t)
 			return
 		}
 		if uid == adduser {
 			ctx.SendChain(message.Text("你要和谁🤺？你自己吗？"))
-			jjLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
+			jjLimiter.Delete(t)
 			return
 		}
-		fencingResult, f, f1 := fencing(myniuniu, adduserniuniu)
-		err = db.insertniuniu(&userInfo{UID: uid, Length: f, UserCount: 0}, gid)
+		fencingResult, f1, u := processJJuAction(&myniuniu, &adduserniuniu, t, ctx)
+		err = db.insertniuniu(&u, gid)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
 		}
-		err = db.insertniuniu(&userInfo{UID: adduser, Length: f1, UserCount: 0}, gid)
+		err = db.insertniuniu(&userInfo{UID: adduser, Length: f1}, gid)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
@@ -279,15 +353,23 @@ func init() {
 			c = lastLength{
 				TimeLimit: time.Now(),
 				Count:     1,
-				Length:    adduserniuniu,
+				Length:    adduserniuniu.Length,
 			}
 		} else {
 			c = lastLength{
 				TimeLimit: c.TimeLimit,
 				Count:     count.Count + 1,
 				Length:    count.Length,
 			}
+			if time.Since(c.TimeLimit) > time.Minute*45 {
+				c = lastLength{
+					TimeLimit: time.Now(),
+					Count:     1,
+					Length:    adduserniuniu.Length,
+				}
+			}
 		}
+
 		jjCount.Store(j, &c)
 		if c.Count > 5 {
 			ctx.SendChain(message.Text(randomChoice([]string{fmt.Sprintf("你们太厉害了，对方已经被你们打了%d次了，你们可以继续找他🤺", c.Count),
@@ -300,6 +382,7 @@ func init() {
 				}
 			}
 		}
+
 	})
 	en.OnFullMatch("注销牛牛", getdb, zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		uid := ctx.Event.UserID
@@ -321,3 +404,27 @@ func init() {
 func randomChoice(options []string) string {
 	return options[rand.Intn(len(options))]
 }
+
+func updateMap(t string, d bool) {
+	value, ok := prop.Load(t)
+	if !d {
+		if time.Since(value.TimeLimit) > time.Minute*8 {
+			prop.Delete(t)
+		}
+		return
+	}
+	if ok {
+		prop.Store(t, &propsCount{
+			Count:     value.Count + 1,
+			TimeLimit: value.TimeLimit,
+		})
+	} else {
+		prop.Store(t, &propsCount{
+			Count:     1,
+			TimeLimit: time.Now(),
+		})
+	}
+	if time.Since(value.TimeLimit) > time.Minute*8 {
+		prop.Delete(t)
+	}
+}

plugin/niuniu/model.go

@@ -23,6 +23,10 @@ type userInfo struct {
 	UID       int64
 	Length    float64
 	UserCount int
+	WeiGe     int // 伟哥
+	Philter   int // 媚药
+	Artifact  int // 击剑神器
+	ShenJi    int // 击剑神稽
 }
 
 type users []*userInfo
@@ -93,12 +97,12 @@ func (db *model) createGIDTable(gid int64) error {
 	return db.sql.Create(strconv.FormatInt(gid, 10), &userInfo{})
 }
 
-func (db *model) findniuniu(gid, uid int64) (float64, error) {
+func (db *model) findniuniu(gid, uid int64) (userInfo, error) {
 	db.RLock()
 	defer db.RUnlock()
 	u := userInfo{}
 	err := db.sql.Find(strconv.FormatInt(gid, 10), &u, "where UID = "+strconv.FormatInt(uid, 10))
-	return u.Length, err
+	return u, err
 }
 
 func (db *model) insertniuniu(u *userInfo, gid int64) error {