Merge branch 'refs/heads/dev-ll'

extend/slice/slice_test.go

@@ -14,7 +14,7 @@ import (
 //	fmt.Println(list)
 //}
 
-var currentTime = int64(1727683200)
+var currentTime = int64(1727686800)
 
 func TestUniques(t *testing.T) {
 	//s1 := []string{"1", "2", "3"}
@@ -24,7 +24,7 @@ func TestUniques(t *testing.T) {
 	//fmt.Println(list)
 
 	// 上次恢复时间
-	var roolDay = int64(1727593200)
+	var roolDay = int64(0)
 
 	for i := 0; i < 10; i++ {
 		RefreshRoll(&roolDay)
@@ -40,13 +40,24 @@ func RefreshRoll(roolDay *int64) bool {
 		slice = append(slice, hour)
 	}
 
+	rollHour := time.Unix(*roolDay, 0).Hour()
+
 	// 小时数，24小时制
 	//curHour := time.Now().Hour()
-	curHour := 16
-	rollHour := time.Unix(*roolDay, 0).Hour()
+	curHour := 17
+	if curHour == 0 {
+		curHour = 24
+	}
+
+	if rollHour == 0 {
+		rollHour = 24
+	}
 
 	isToday := mhayaTime.CreateFromTimestamp(*roolDay).IsToday()
-	if isToday {
+	isTomorrow := mhayaTime.CreateFromTimestamp(*roolDay).IsTomorrow()
+
+	// 昨天的24点isToday为true，所以24点必须单独处理
+	if (rollHour == 24 && isTomorrow) || (rollHour != 24 && isToday) {
 		slice = slices.DeleteFunc(slice, func(x int) bool {
 			return x <= rollHour
 		})

game/game_cluster/internal/mdb/models/item.go

@@ -131,8 +131,8 @@ func (i *Item) AddSame() int {
 }
 
 func (i *Item) AddSameTwo(denominator int) int {
-	if i.Num < i.MaxNum/denominator {
-		i.Num = i.MaxNum/denominator + 1
+	if i.Num < i.MaxNum {
+		i.Num += i.MaxNum/denominator + 1
 		i.Total += i.MaxNum/denominator + 1
 		return i.MaxNum / denominator
 	}

game/game_cluster/internal/mdb/models/player.go

@@ -245,9 +245,14 @@ func (p *Player) RefreshRoll() bool {
 		curHour = 24
 	}
 	rollHour := time.Unix(p.RollDay, 0).Hour()
+	if rollHour == 0 {
+		rollHour = 24
+	}
 
+	// 昨天的24点isToday为true，所以24点必须单独处理
 	isToday := mhayaTime.CreateFromTimestamp(p.RollDay).IsToday()
-	if isToday {
+	isTomorrow := mhayaTime.CreateFromTimestamp(p.RollDay).IsTomorrow()
+	if (rollHour == 24 && isTomorrow) || (rollHour != 24 && isToday) {
 		slice = slices.DeleteFunc(slice, func(x int) bool {
 			return x <= rollHour
 		})