Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop

data/DB_GameItem.json

@@ -19,7 +19,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],
@@ -49,7 +49,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],
@@ -79,7 +79,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],
@@ -109,7 +109,7 @@
 				1
 			],
 			"Effect": [
-				0,
+				1,
 				0,
 				1
 			],

data/DB_PropExchange.dat

@@ -1,5 +1,5 @@
 
-6

т├
у├
ж├
в├
с├
"║█ю└=
+6

ж├
в├
с├
т├
у├
"║█ю└=
-.
ш├
ь├
ы├
з├
"║█ю└=
+.
ь├
ы├
з├
ш├
"║█ю└=
-W
с├
у├
ж├
ы├
т├
в├
ь├
з├
ш├
"	║█─╜Б
+W
ы├
з├
ш├
с├
у├
в├
ь├
т├
ж├
"	║█─╜Б
-]
ш├
с├
ж├
в├
ь├
э├
т├
у├
ы├
з├
"╒█Т
+]
у├
ж├
ш├
ы├
з├
э├
с├
т├
в├
ь├
"╒█Т

public

@@ -1 +1 @@
-Subproject commit 4ccd5acb111b25d6cf440fa1e390bc4614accbca
+Subproject commit 4736a4cac4352a63eb6965336eed31b17219f83e

srvdata/gamedropmgr.go

@@ -76,9 +76,9 @@ func (this *GameDropMgr) GetDropInfoByBaseScore(gameId, baseCoin int32) []*GameD
 	i := sort.Search(len(arr), func(i int) bool {
 		return arr[i].BaseCoin > int64(baseCoin)
 	})
-	if i < len(arr) && i > 0 {
+
-		n := arr[i-1].BaseCoin
+	f := func(n int64, i int) {
-		for i := i - 1; i >= 0; i-- {
+		for ; i >= 0; i-- {
 			if arr[i].BaseCoin == n {
 				ret = append(ret, arr[i])
 			} else {
@@ -86,5 +86,21 @@ func (this *GameDropMgr) GetDropInfoByBaseScore(gameId, baseCoin int32) []*GameD
 			}
 		}
 	}
+
+	// 找到
+	if i < len(arr) && i > 0 {
+		n := arr[i-1].BaseCoin
+		f(n, i-1)
+	}
+
+	if len(ret) == 0 {
+		// 没找到，最大底注是否可用
+		i = len(arr) - 1
+		n := arr[i].BaseCoin
+		if n <= int64(baseCoin) {
+			f(n, i)
+		}
+	}
+
 	return ret
 }