Commit 33c8db5c11f73a0ee760a5ce8cd1d3c07400f7dc
1 parent
f6fbf090
Exists in
master
提交
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
src/HttpServer/logic/httpserver.go
| @@ -18,7 +18,7 @@ import ( | @@ -18,7 +18,7 @@ import ( | ||
| 18 | "net/http" | 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 | func StartHttpTicker() { | 23 | func StartHttpTicker() { |
| 24 | ticker := time.NewTicker(time.Second * time.Duration(30)) | 24 | ticker := time.NewTicker(time.Second * time.Duration(30)) |
src/HttpServer/logic/logic.go
| @@ -1886,8 +1886,8 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) { | @@ -1886,8 +1886,8 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) { | ||
| 1886 | //首先判断是否是顶级猫了 | 1886 | //首先判断是否是顶级猫了 |
| 1887 | if uinfo.PosInfo[rdata.From].Cat == 36 { | 1887 | if uinfo.PosInfo[rdata.From].Cat == 36 { |
| 1888 | //todo 走红包猫的逻辑 | 1888 | //todo 走红包猫的逻辑 |
| 1889 | - MergeRedBagCat(uinfo, rdata.From) | ||
| 1890 | - uinfo.CleadPos(rdata.To) | 1889 | + MergeRedBagCat(uinfo, rdata.To) |
| 1890 | + uinfo.CleadPos(rdata.From) | ||
| 1891 | //DoAutoMergeRedCat(uinfo, uuid) | 1891 | //DoAutoMergeRedCat(uinfo, uuid) |
| 1892 | //此处处理一下红包猫的自动合成逻辑 | 1892 | //此处处理一下红包猫的自动合成逻辑 |
| 1893 | if uinfo.Highestlv < 37 { | 1893 | if uinfo.Highestlv < 37 { |