Commit 4f87991c5c12e309aecade329757a035d9f25078
1 parent
5cb04cde
Exists in
master
提交
Showing
1 changed file
with
4 additions
and
0 deletions
Show diff stats
src/HttpServer/logic/function.go
| @@ -180,6 +180,7 @@ func getCatPutPos(uinfo *UserData, clv int) int { | @@ -180,6 +180,7 @@ func getCatPutPos(uinfo *UserData, clv int) int { | ||
| 180 | 180 | ||
| 181 | //处理红包猫自动合成 | 181 | //处理红包猫自动合成 |
| 182 | func DoAutoMergeRedCat(uinfo *UserData, uuid int) { | 182 | func DoAutoMergeRedCat(uinfo *UserData, uuid int) { |
| 183 | + return //需要主动请求 | ||
| 183 | //首先处理五方招财猫逻辑 | 184 | //首先处理五方招财猫逻辑 |
| 184 | eastsum := 0 | 185 | eastsum := 0 |
| 185 | westsum := 0 | 186 | westsum := 0 |
| @@ -376,6 +377,9 @@ func (udata *UserData) CalcGoldRate() int64 { | @@ -376,6 +377,9 @@ func (udata *UserData) CalcGoldRate() int64 { | ||
| 376 | return sumrate | 377 | return sumrate |
| 377 | } | 378 | } |
| 378 | for _, v := range wdata.Info { | 379 | for _, v := range wdata.Info { |
| 380 | + if v.Warelv == 0 { | ||
| 381 | + continue | ||
| 382 | + } | ||
| 379 | rcfg := jsonconf.GetRedCatConfig(v.Warelv + 100) | 383 | rcfg := jsonconf.GetRedCatConfig(v.Warelv + 100) |
| 380 | if rcfg != nil { | 384 | if rcfg != nil { |
| 381 | if rcfg.Is_37 != 0 { | 385 | if rcfg.Is_37 != 0 { |