diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index e30c1b5..325654a 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.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)) diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index d924459..a7bd62e 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -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 { -- libgit2 0.21.0