Skip to content

修复niu包部分问题 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fumiama merged 5 commits into from
Jan 20, 2025
Merged

修复niu包部分问题 #68

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
081bff2
Add files via upload
xyy0411 Jan 11, 2025
16da847
修改jj函数
xyy0411 Jan 12, 2025
a857579
修复部分问题
xyy0411 Jan 12, 2025
bdf29b5
Merge branch 'main' into pr5
xyy0411 Jan 19, 2025
e88b500
修改一个小问题
xyy0411 Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 44 additions & 23 deletions niu/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,20 @@ func GetRankingInfo(gid int64, t bool) (BaseInfos, error) {
list users
err error
)

niuOfGroup, err := db.getAllNiuNiuOfGroup(gid)
if err != nil {
return nil, err
}

list = niuOfGroup.filter(t)
list.sort(t)
if len(list) == 0 {
if t {
return nil, ErrNoBoys
}
return nil, ErrNoGirls
}
list = niuOfGroup.filter(t)
f := make(BaseInfos, len(list))
for i, info := range list {
f[i] = BaseInfo{
Expand All @@ -140,10 +146,10 @@ func GetGroupUserRank(gid, uid int64) (int, error) {
}

// View 查看牛牛
func View(gid, uid int64, name string) (*strings.Builder, error) {
func View(gid, uid int64, name string) (string, error) {
i, err := db.getWordNiuNiu(gid, uid)
if err != nil {
return nil, ErrNoNiuNiu
return "", ErrNoNiuNiu
}
niuniu := i.Length
var result strings.Builder
Expand All @@ -155,12 +161,12 @@ func View(gid, uid int64, name string) (*strings.Builder, error) {
}
niuniuList, err := db.getAllNiuNiuOfGroup(gid)
if err != nil {
return nil, err
return "", err
}
result.WriteString(fmt.Sprintf("\n📛%s<%s>的牛牛信息\n⭕性别:%s\n⭕%s度:%.2fcm\n⭕排行:%d\n⭕%s ",
name, strconv.FormatInt(uid, 10),
sex, sexLong, niuniu, niuniuList.ranking(niuniu, uid), generateRandomString(niuniu)))
return &result, nil
return result.String(), nil
}

// HitGlue 打胶
Expand All @@ -170,7 +176,7 @@ func HitGlue(gid, uid int64, prop string) (string, error) {
return "", ErrNoNiuNiuTwo
}

messages, err := niuniu.processNiuNiuAction(prop)
messages, err := niuniu.processDaJiao(prop)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -213,7 +219,7 @@ func JJ(gid, uid, adduser int64, prop string) (message string, adduserLength flo
return "", 0, ErrCannotFight
}

message, err = myniuniu.processJJuAction(adduserniuniu, prop)
message, err = myniuniu.processJJ(adduserniuniu, prop)
if err != nil {
return "", 0, err
}
Expand All @@ -227,6 +233,11 @@ func JJ(gid, uid, adduser int64, prop string) (message string, adduserLength flo
}

adduserLength = adduserniuniu.Length

if err = db.setWordNiuNiu(gid, adduserniuniu); err != nil {
return "", 0, err
}

return
}

Expand Down Expand Up @@ -305,15 +316,25 @@ func Sell(gid, uid int64) (string, error) {
if !t {
return "", errors.New(message)
}

if err := db.deleteWordNiuNiu(gid, uid); err != nil {
return "", err
}

err = wallet.InsertWalletOf(uid, money)
if err != nil {
return message, err
}

infos, _ := db.getAllNiuNiuAuction(gid)

u := AuctionInfo{
ID: len(infos),
UserID: niu.UID,
Length: niu.Length,
Money: money * 2,
}

err = db.setNiuNiuAuction(gid, &u)
return message, err
}
Expand All @@ -326,40 +347,40 @@ func ShowAuction(gid int64) ([]AuctionInfo, error) {
}

// Auction 购买牛牛
func Auction(gid, uid int64, i int) (string, error) {
auction, err := db.getAllNiuNiuAuction(gid)
func Auction(gid, uid int64, index int) (string, error) {
infos, err := db.getAllNiuNiuAuction(gid)
if err != nil {
return "", ErrNoNiuNiuINAuction
}
err = wallet.InsertWalletOf(uid, -auction[i].Money)
if err != nil {
if err := wallet.InsertWalletOf(uid, -infos[index].Money); err != nil {
return "", ErrNoMoney
}

niu, err := db.getWordNiuNiu(gid, uid)

if err != nil {
niu = &userInfo{
UID: uid,
}
niu.UID = uid
}
niu.Length = auction[i].Length

if auction[i].Money > 500 {
niu.Length = infos[index].Length

if infos[index].Money >= 500 {
niu.WeiGe += 2
niu.Artifact += 2
niu.Philter += 2
}

if err = db.setWordNiuNiu(gid, niu); err != nil {
if err = db.deleteNiuNiuAuction(gid, uint(index)); err != nil {
return "", err
}
err = db.deleteNiuNiuAuction(gid, auction[i].ID)
if err != nil {

if err = db.setWordNiuNiu(gid, niu); err != nil {
return "", err
}
if auction[i].Money > 500 {
return fmt.Sprintf("恭喜你购买成功,当前长度为%.2fcm,此次购买将赠送你2个伟哥,2个媚药",
niu.Length), nil

if infos[index].Money >= 500 {
return fmt.Sprintf("恭喜你购买成功,当前长度为%.2fcm,此次购买将赠送你2个伟哥,2个媚药", niu.Length), nil
}

return fmt.Sprintf("恭喜你购买成功,当前长度为%.2fcm", niu.Length), nil
}

Expand Down
26 changes: 11 additions & 15 deletions niu/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ type userInfo struct {

// AuctionInfo 拍卖信息
type AuctionInfo struct {
ID uint
UserID int64
Length float64
Money int
ID int `db:"id"`
UserID int64 `db:"user_id"`
Length float64 `db:"length"`
Money int `db:"money"`
}

// BaseInfo ...
Expand Down Expand Up @@ -268,7 +268,7 @@ func (u *userInfo) purchaseItem(n int) (int, error) {
return money, err
}

func (u *userInfo) processNiuNiuAction(props string) (string, error) {
func (u *userInfo) processDaJiao(props string) (string, error) {
var (
messages string
info userInfo
Expand Down Expand Up @@ -301,7 +301,7 @@ func (u *userInfo) processNiuNiuAction(props string) (string, error) {
return messages, err
}

func (u *userInfo) processJJuAction(adduserniuniu *userInfo, props string) (string, error) {
func (u *userInfo) processJJ(adduserniuniu *userInfo, props string) (string, error) {
var (
fencingResult string
f float64
Expand Down Expand Up @@ -378,7 +378,8 @@ func (db *model) getAllNiuNiuOfGroup(gid int64) (users, error) {
var useras users
err := db.sql.FindFor(fmt.Sprintf("%d", gid), &user, "",
func() error {
useras = append(useras, &user)
newUser := user
useras = append(useras, &newUser)
return nil
})
return useras, err
Expand All @@ -387,14 +388,9 @@ func (db *model) getAllNiuNiuOfGroup(gid int64) (users, error) {
func (db *model) setNiuNiuAuction(gid int64, u *AuctionInfo) error {
db.Lock()
defer db.Unlock()
num, err := db.sql.Count(fmt.Sprintf("auction_%d", gid))
if err != nil {
num = 1
}
u.ID = uint(num)
err = db.sql.Insert(fmt.Sprintf("auction_%d", gid), u)
err := db.sql.Insert(fmt.Sprintf("auction_%d", gid), u)
if err != nil {
err = db.sql.Create(fmt.Sprintf("auction_%d", gid), &AuctionInfo{})
err = db.sql.Create(fmt.Sprintf("auction_%d", gid), &userInfo{})
if err != nil {
return err
}
Expand All @@ -406,7 +402,7 @@ func (db *model) setNiuNiuAuction(gid int64, u *AuctionInfo) error {
func (db *model) deleteNiuNiuAuction(gid int64, id uint) error {
db.Lock()
defer db.Unlock()
return db.sql.Del(strconv.FormatInt(gid, 10), "WHERE ID = ?", id)
return db.sql.Del(fmt.Sprintf("auction_%d", gid), "WHERE id = ?", id)
}

func (db *model) getAllNiuNiuAuction(gid int64) ([]AuctionInfo, error) {
Expand Down