feat✨:排行榜功能报名条件分数计算

王家文
1 parent 2a6cfa38
Showing 3 changed files with 44 additions and 15 deletions Show diff stats
service/code-msg/code-msg.go
service/roomrank/handle.go
service/roomrank/room.go
@@ -53,6 +53,7 @@ const (
 	RECODE_MERGE_ROOMRANK_LEVEL_ERROR        = "2201"
 	RECODE_MERGE_ROOMRANK_HASSETTLE_ERROR    = "2202"
 	RECODE_MERGE_ROOMRANK_NOTHASSETTLE_ERROR = "2203"
+	RECODE_MERGE_ROOMRANK_CANTSIGN_ERROR     = "2204"
 )
 var recodeText = map[string]string{
@@ -106,6 +107,7 @@ var recodeText = map[string]string{
 	RECODE_MERGE_ROOMRANK_LEVEL_ERROR:        "参与等级不足",
 	RECODE_MERGE_ROOMRANK_HASSETTLE_ERROR:    "还有未领取的结算奖励",
 	RECODE_MERGE_ROOMRANK_NOTHASSETTLE_ERROR: "没有未领取的结算奖励",
+	RECODE_MERGE_ROOMRANK_CANTSIGN_ERROR:     "活动倒计时不允许报名",
 }
 func RecodeText(code string) string {
@@ -4,6 +4,7 @@ import (
 	"apigame/configs/confroomrank"
 	"apigame/models"
 	"apigame/service/code-msg"
+	"apigame/util/util-lx/lxtime"
 	"apigame/util/zredislock"
 )
@@ -70,6 +71,13 @@ func HandleInfo(req *models.ReqRoomRankInfo) (code string, rsp models.RspRoomRan
 		code = code_msg.RECODE_MERGE_ROOMRANK_LEVEL_ERROR
 		return
 	}
+	// 于此同时，如果活动倒计时 < 关门时间 * 2，则不再允许报名
+	secNow := lxtime.NowUninx()
+	dtEnd := GetTimeEnd(activityTime, config.ReleaseTime).Unix()
+	if secNow > dtEnd-RoomCloseSecond*2 {
+		code = code_msg.RECODE_MERGE_ROOMRANK_CANTSIGN_ERROR
+		return
+	}
 	needSavePlayer := false
 	defer func() {
@@ -218,6 +226,13 @@ func HandleAddScore(req *models.ReqRoomRankAddScore) (code string, rsp models.Rs
 		code = code_msg.RECODE_MERGE_ROOMRANK_LEVEL_ERROR
 		return
 	}
+	// 于此同时，如果活动倒计时 < 关门时间 * 2，则不再允许报名
+	secNow := lxtime.NowUninx()
+	dtEnd := GetTimeEnd(activityTime, config.ReleaseTime).Unix()
+	if secNow > dtEnd-RoomCloseSecond*2 {
+		code = code_msg.RECODE_MERGE_ROOMRANK_CANTSIGN_ERROR
+		return
+	}
 	needSavePlayer := false
 	defer func() {
@@ -169,8 +169,7 @@ func TryCloseRoom(gameId string, room *Room, config *confroomrank.ActivityConfig
 		return
 	}
 	secNow := lxtime.NowUninx()
-	dateEnd := GetTimeEnd(room.ActivityTime, config.ReleaseTime)
-	if secNow > dateEnd.Unix()-RoomCloseSecond {
+	if secNow > room.CreateTime+RoomCloseSecond {
 		room.Closed = true
 		// 根据缺口自动填充机器人
 		for i := 0; i < len(roomConfig.PlayerTypeCount); i++ {
@@ -183,6 +182,9 @@ func TryCloseRoom(gameId string, room *Room, config *confroomrank.ActivityConfig
 				room.Details.Players = append(room.Details.Players, roomPlayer)
 			}
 		}
+		// 填充完之后要排序计算
+		TryReSort(room, config)
+
 		SaveRoom(gameId, room)
 	}
 }
@@ -214,17 +216,17 @@ func JoinInitRobot(gameId string, room *Room, roomConfig confroomrank.RoomConfig
 }
 // TrySettleRoom 尝试结算房间
-func TrySettleRoom(gameId string, room *Room, confActivity *confroomrank.ActivityConfig) {
+func TrySettleRoom(gameId string, room *Room, config *confroomrank.ActivityConfig) {
 	// 已经结算过的不结算
 	if room.HasSettle {
 		return
 	}
 	// 活动切换或者时间到 触发结算
 	needSettle := false
-	if room.ActivityId != confActivity.Id {
+	if room.ActivityId != config.Id {
 		needSettle = true
 	} else {
-		dateEnd := GetTimeEnd(room.ActivityTime, confActivity.ReleaseTime)
+		dateEnd := GetTimeEnd(room.ActivityTime, config.ReleaseTime)
 		dtNow := lxtime.NowUninx()
 		if dtNow >= dateEnd.Unix() {
 			needSettle = true
@@ -235,15 +237,28 @@ func TrySettleRoom(gameId string, room *Room, confActivity *confroomrank.Activit
 		return
 	}
+	percent := float64(0)
+	dateEnd := GetTimeEnd(room.ActivityTime, config.ReleaseTime)
+	secTotal := 24 * 60 * 60
+	dtEnd := dateEnd.Unix()
+	if dtEnd > config.EndTime {
+		dtEnd = config.EndTime
+	}
+	dtCreate := room.CreateTime
+	if dtEnd <= dtCreate {
+		percent = 0
+	} else {
+		percent = float64(dtEnd-dtCreate) * 100 / float64(secTotal)
+	}
 	// 机器人最终算分
 	for i := 0; i < len(room.Details.Players); i++ {
 		roomPlayer := room.Details.Players[i]
 		if roomPlayer.RobotConfigId == 0 {
 			continue
 		}
-		confRobot, hasConfRobot := confActivity.Robot[roomPlayer.RobotConfigId]
+		confRobot, hasConfRobot := config.Robot[roomPlayer.RobotConfigId]
 		if hasConfRobot {
-			roomPlayer.Score = GetRobotScoreMax(&confRobot)
+			roomPlayer.Score = GetRobotScoreCurrent(&confRobot, percent)
 		}
 	}
@@ -262,23 +277,20 @@ func TryResetRobot(room *Room, config *confroomrank.ActivityConfig) {
 	percent := float64(0)
 	dateEnd := GetTimeEnd(room.ActivityTime, config.ReleaseTime)
-	dateStart := dateEnd.AddDate(0, 0, -1)
-	dtStart := dateStart.Unix()
+	secTotal := 24 * 60 * 60
 	dtEnd := dateEnd.Unix()
-	if dtStart < config.StartTime {
-		dtStart = config.StartTime
-	}
 	if dtEnd > config.EndTime {
 		dtEnd = config.EndTime
 	}
-	if dtEnd <= dtStart {
+	dtCreate := room.CreateTime
+	if dtEnd <= dtCreate {
 		percent = 0
-	} else if secNow <= dtStart {
+	} else if secNow <= dtCreate {
 		percent = 0
 	} else if secNow >= dtEnd {
 		percent = 100
 	} else {
-		percent = float64(secNow-dtStart) * 100 / float64(dtEnd-dtStart)
+		percent = float64(secNow-dtCreate) * 100 / float64(secTotal)
 	}
 	// 机器人即时算分
	@@ -4,6 +4,7 @@ import (		@@ -4,6 +4,7 @@ import (
4	"apigame/configs/confroomrank"	4	"apigame/configs/confroomrank"
5	"apigame/models"	5	"apigame/models"
6	"apigame/service/code-msg"	6	"apigame/service/code-msg"
		7	+ "apigame/util/util-lx/lxtime"
7	"apigame/util/zredislock"	8	"apigame/util/zredislock"
8	)	9	)
9		10
	@@ -70,6 +71,13 @@ func HandleInfo(req *models.ReqRoomRankInfo) (code string, rsp models.RspRoomRan		@@ -70,6 +71,13 @@ func HandleInfo(req *models.ReqRoomRankInfo) (code string, rsp models.RspRoomRan
70	code = code_msg.RECODE_MERGE_ROOMRANK_LEVEL_ERROR	71	code = code_msg.RECODE_MERGE_ROOMRANK_LEVEL_ERROR
71	return	72	return
72	}	73	}
		74	+ // 于此同时，如果活动倒计时 < 关门时间 * 2，则不再允许报名
		75	+ secNow := lxtime.NowUninx()
		76	+ dtEnd := GetTimeEnd(activityTime, config.ReleaseTime).Unix()
		77	+ if secNow > dtEnd-RoomCloseSecond*2 {
		78	+ code = code_msg.RECODE_MERGE_ROOMRANK_CANTSIGN_ERROR
		79	+ return
		80	+ }
73		81
74	needSavePlayer := false	82	needSavePlayer := false
75	defer func() {	83	defer func() {
	@@ -218,6 +226,13 @@ func HandleAddScore(req *models.ReqRoomRankAddScore) (code string, rsp models.Rs		@@ -218,6 +226,13 @@ func HandleAddScore(req *models.ReqRoomRankAddScore) (code string, rsp models.Rs
218	code = code_msg.RECODE_MERGE_ROOMRANK_LEVEL_ERROR	226	code = code_msg.RECODE_MERGE_ROOMRANK_LEVEL_ERROR
219	return	227	return
220	}	228	}
		229	+ // 于此同时，如果活动倒计时 < 关门时间 * 2，则不再允许报名
		230	+ secNow := lxtime.NowUninx()
		231	+ dtEnd := GetTimeEnd(activityTime, config.ReleaseTime).Unix()
		232	+ if secNow > dtEnd-RoomCloseSecond*2 {
		233	+ code = code_msg.RECODE_MERGE_ROOMRANK_CANTSIGN_ERROR
		234	+ return
		235	+ }
221		236
222	needSavePlayer := false	237	needSavePlayer := false
223	defer func() {	238	defer func() {