提交

陆恒
1 parent 5cb04cde
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 {
  
 //处理红包猫自动合成
 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 {
...	...	@@ -180,6 +180,7 @@ func getCatPutPos(uinfo *UserData, clv int) int {
180	180
181	181	//处理红包猫自动合成
182	182	func DoAutoMergeRedCat(uinfo *UserData, uuid int) {
	183	+ return //需要主动请求
183	184	//首先处理五方招财猫逻辑
184	185	eastsum := 0
185	186	westsum := 0
...	...	@@ -376,6 +377,9 @@ func (udata *UserData) CalcGoldRate() int64 {
376	377	return sumrate
377	378	}
378	379	for _, v := range wdata.Info {
	380	+ if v.Warelv == 0 {
	381	+ continue
	382	+ }
379	383	rcfg := jsonconf.GetRedCatConfig(v.Warelv + 100)
380	384	if rcfg != nil {
381	385	if rcfg.Is_37 != 0 {
...	...