chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: 由于设计不合理，移除排行榜中的 CompetitorIncrease 函数

This commit is contained in:
kercylan98 2023-07-05 14:22:28 +08:00
parent 6144dd6bf0
commit 0f125d4de5
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
game/builtin/ranking_list.go
View File

@ -34,6 +34,8 @@ type scoreItem[CompetitorID comparable, Score generic.Ordered] struct {
Score Score `json:"score,omitempty"` Score Score `json:"score,omitempty"`
} }
// Competitor 声明排行榜竞争者
// - 如果竞争者存在的情况下，会更新已有成绩，否则新增竞争者
func (slf *RankingList[CompetitorID, Score]) Competitor(competitorId CompetitorID, score Score) { func (slf *RankingList[CompetitorID, Score]) Competitor(competitorId CompetitorID, score Score) {
v, exist := slf.competitors.GetExist(competitorId) v, exist := slf.competitors.GetExist(competitorId)
if exist { if exist {
@ -62,15 +64,7 @@ func (slf *RankingList[CompetitorID, Score]) Competitor(competitorId CompetitorI
} }
} }
func (slf *RankingList[CompetitorID, Score]) CompetitorIncrease(competitorId CompetitorID, score Score) { // RemoveCompetitor 删除特定竞争者
oldScore, err := slf.GetScore(competitorId)
if err != nil {
slf.Competitor(competitorId, score)
} else {
slf.Competitor(competitorId, oldScore+score)
}
}
func (slf *RankingList[CompetitorID, Score]) RemoveCompetitor(competitorId CompetitorID) { func (slf *RankingList[CompetitorID, Score]) RemoveCompetitor(competitorId CompetitorID) {
if !slf.competitors.Exist(competitorId) { if !slf.competitors.Exist(competitorId) {
return return
@ -87,10 +81,12 @@ func (slf *RankingList[CompetitorID, Score]) RemoveCompetitor(competitorId Compe
} }
// Size 获取竞争者数量
func (slf *RankingList[CompetitorID, Score]) Size() int { func (slf *RankingList[CompetitorID, Score]) Size() int {
return slf.competitors.Size() return slf.competitors.Size()
} }
// GetRank 获取竞争者排名
func (slf *RankingList[CompetitorID, Score]) GetRank(competitorId CompetitorID) (int, error) { func (slf *RankingList[CompetitorID, Score]) GetRank(competitorId CompetitorID) (int, error) {
competitorScore, exist := slf.competitors.GetExist(competitorId) competitorScore, exist := slf.competitors.GetExist(competitorId)
if !exist { if !exist {
@ -126,6 +122,7 @@ func (slf *RankingList[CompetitorID, Score]) GetRank(competitorId CompetitorID)
return 0, ErrRankingListIndexErr return 0, ErrRankingListIndexErr
} }
// GetCompetitor 获取特定排名的竞争者
func (slf *RankingList[CompetitorID, Score]) GetCompetitor(rank int) (competitorId CompetitorID, err error) { func (slf *RankingList[CompetitorID, Score]) GetCompetitor(rank int) (competitorId CompetitorID, err error) {
if rank < 0 || rank >= len(slf.scores) { if rank < 0 || rank >= len(slf.scores) {
return competitorId, ErrRankingListNonexistentRanking return competitorId, ErrRankingListNonexistentRanking
@ -133,6 +130,7 @@ func (slf *RankingList[CompetitorID, Score]) GetCompetitor(rank int) (competitor
return slf.scores[rank].CompetitorId, nil return slf.scores[rank].CompetitorId, nil
} }
// GetCompetitorWithRange 获取第start名到第end名竞争者
func (slf *RankingList[CompetitorID, Score]) GetCompetitorWithRange(start, end int) ([]CompetitorID, error) { func (slf *RankingList[CompetitorID, Score]) GetCompetitorWithRange(start, end int) ([]CompetitorID, error) {
if start < 1 || end < start { if start < 1 || end < start {
return nil, ErrRankingListNonexistentRanking return nil, ErrRankingListNonexistentRanking
@ -151,6 +149,7 @@ func (slf *RankingList[CompetitorID, Score]) GetCompetitorWithRange(start, end i
return ids, nil return ids, nil
} }
// GetScore 获取竞争者成绩
func (slf *RankingList[CompetitorID, Score]) GetScore(competitorId CompetitorID) (score Score, err error) { func (slf *RankingList[CompetitorID, Score]) GetScore(competitorId CompetitorID) (score Score, err error) {
data, ok := slf.competitors.GetExist(competitorId) data, ok := slf.competitors.GetExist(competitorId)
if !ok { if !ok {
@ -159,6 +158,8 @@ func (slf *RankingList[CompetitorID, Score]) GetScore(competitorId CompetitorID)
return data, nil return data, nil
} }
// GetAllCompetitor 获取所有竞争者ID
// - 结果为名次有序的
func (slf *RankingList[CompetitorID, Score]) GetAllCompetitor() []CompetitorID { func (slf *RankingList[CompetitorID, Score]) GetAllCompetitor() []CompetitorID {
var result []CompetitorID var result []CompetitorID
for _, data := range slf.scores { for _, data := range slf.scores {
@ -167,6 +168,7 @@ func (slf *RankingList[CompetitorID, Score]) GetAllCompetitor() []CompetitorID {
return result return result
} }
// Clear 清空排行榜
func (slf *RankingList[CompetitorID, Score]) Clear() { func (slf *RankingList[CompetitorID, Score]) Clear() {
slf.OnRankClearBeforeEvent() slf.OnRankClearBeforeEvent()
slf.competitors.Clear() slf.competitors.Clear()

3
game/ranking_list.go
View File

@ -7,9 +7,6 @@ type RankingList[CompetitorID comparable, Score generic.Ordered] interface {
// Competitor 声明排行榜竞争者 // Competitor 声明排行榜竞争者
// - 如果竞争者存在的情况下，会更新已有成绩，否则新增竞争者 // - 如果竞争者存在的情况下，会更新已有成绩，否则新增竞争者
Competitor(competitorId CompetitorID, score Score) Competitor(competitorId CompetitorID, score Score)
// CompetitorIncrease 积分增量的形式竞争排行榜
// - 如果竞争者存在的情况下，会更新已有成绩为增加score后的成绩，否则新增竞争者
CompetitorIncrease(competitorId CompetitorID, score Score)
// RemoveCompetitor 删除特定竞争者 // RemoveCompetitor 删除特定竞争者
RemoveCompetitor(competitorId CompetitorID) RemoveCompetitor(competitorId CompetitorID)
// Size 获取竞争者数量 // Size 获取竞争者数量