提交

陆恒
1 parent f6fbf090
Showing 2 changed files with 3 additions and 3 deletions Show diff stats
src/HttpServer/logic/httpserver.go
src/HttpServer/logic/logic.go
@@ -18,7 +18,7 @@ import (
 	"net/http"
 )
  
-var G_randVal = float32(188.11)
+var G_randVal = float32(rand.Intn(100))/100 + 180
  
 func StartHttpTicker() {
 	ticker := time.NewTicker(time.Second * time.Duration(30))
@@ -1886,8 +1886,8 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
 			//首先判断是否是顶级猫了
 			if uinfo.PosInfo[rdata.From].Cat == 36 {
 				//todo  走红包猫的逻辑
-				MergeRedBagCat(uinfo, rdata.From)
-				uinfo.CleadPos(rdata.To)
+				MergeRedBagCat(uinfo, rdata.To)
+				uinfo.CleadPos(rdata.From)
 				//DoAutoMergeRedCat(uinfo, uuid)
 				//此处处理一下红包猫的自动合成逻辑
 				if uinfo.Highestlv < 37 {
...	...	@@ -18,7 +18,7 @@ import (
18	18	"net/http"
19	19	)
20	20
21		-var G_randVal = float32(188.11)
	21	+var G_randVal = float32(rand.Intn(100))/100 + 180
22	22
23	23	func StartHttpTicker() {
24	24	ticker := time.NewTicker(time.Second * time.Duration(30))
...	...
...	...	@@ -1886,8 +1886,8 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
1886	1886	//首先判断是否是顶级猫了
1887	1887	if uinfo.PosInfo[rdata.From].Cat == 36 {
1888	1888	//todo 走红包猫的逻辑
1889		- MergeRedBagCat(uinfo, rdata.From)
1890		- uinfo.CleadPos(rdata.To)
	1889	+ MergeRedBagCat(uinfo, rdata.To)
	1890	+ uinfo.CleadPos(rdata.From)
1891	1891	//DoAutoMergeRedCat(uinfo, uuid)
1892	1892	//此处处理一下红包猫的自动合成逻辑
1893	1893	if uinfo.Highestlv < 37 {
...	...