Merge branch 'master' into dev-wjw

王家文
2 parents c7e75a14 8f6bb12a
Showing 2 changed files with 1 additions and 23 deletions Show diff stats
service/cardholder/logic.go
util/utslice/slice.go
@@ -86,7 +86,7 @@ func GetNewCard(player *DataCardHolder, conf *confcardholder.ActivityConfig) int
 		list = append(list, index)
 	}
  
-	indexMin := utslice.Min(list)
+	indexMin := lo.Min(list)
 	return int(indexMin % rate)
 }
  
@@ -59,28 +59,6 @@ func Sum[T uttype.UtNumber](list []T) T {
 	return result
 }
  
-// Min 最小值
-func Min[T uttype.UtNumber](list []T) T {
-	var result T = 0
-	for _, v := range list {
-		if v < result {
-			result = v
-		}
-	}
-	return result
-}
-
-// Max 最大值
-func Max[T uttype.UtNumber](list []T) T {
-	var result T = 0
-	for _, v := range list {
-		if v > result {
-			result = v
-		}
-	}
-	return result
-}
-
 // Any 其中有一个元素符合就返回true
 func Any[T uttype.UtNumber](list []T, value T) bool {
 	for _, v := range list {
...	...	@@ -86,7 +86,7 @@ func GetNewCard(player DataCardHolder, conf confcardholder.ActivityConfig) int
86	86	list = append(list, index)
87	87	}
88	88
89		- indexMin := utslice.Min(list)
	89	+ indexMin := lo.Min(list)
90	90	return int(indexMin % rate)
91	91	}
92	92
...	...
...	...	@@ -59,28 +59,6 @@ func Sum[T uttype.UtNumber](list []T) T {
59	59	return result
60	60	}
61	61
62		-// Min 最小值
63		-func Min[T uttype.UtNumber](list []T) T {
64		- var result T = 0
65		- for _, v := range list {
66		- if v < result {
67		- result = v
68		- }
69		- }
70		- return result
71		-}
72		-
73		-// Max 最大值
74		-func Max[T uttype.UtNumber](list []T) T {
75		- var result T = 0
76		- for _, v := range list {
77		- if v > result {
78		- result = v
79		- }
80		- }
81		- return result
82		-}
83		-
84	62	// Any 其中有一个元素符合就返回true
85	63	func Any[T uttype.UtNumber](list []T, value T) bool {
86	64	for _, v := range list {
...	...