From 4f87991c5c12e309aecade329757a035d9f25078 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Wed, 10 Jun 2020 17:55:54 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/function.go | 4 ++++
 1 file changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 4f0bddc..e335744 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -180,6 +180,7 @@ func getCatPutPos(uinfo *UserData, clv int) int {
 
 //处理红包猫自动合成
 func DoAutoMergeRedCat(uinfo *UserData, uuid int) {
+	return //需要主动请求
 	//首先处理五方招财猫逻辑
 	eastsum := 0
 	westsum := 0
@@ -376,6 +377,9 @@ func (udata *UserData) CalcGoldRate() int64 {
 		return sumrate
 	}
 	for _, v := range wdata.Info {
+		if v.Warelv == 0 {
+			continue
+		}
 		rcfg := jsonconf.GetRedCatConfig(v.Warelv + 100)
 		if rcfg != nil {
 			if rcfg.Is_37 != 0 {
--
libgit2 0.21.0