提交

陆恒
1 parent b4816ad6
Showing 2 changed files with 18 additions and 0 deletions Show diff stats
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -316,6 +316,16 @@ func (u *UserData) GetLimitCatList() []int {
 	return rtlist
 }
  
+//查询是否有空位
+func (u *UserData) HasEmptyPos() bool {
+	for _, v := range u.PosInfo {
+		if v.Cat == 0 {
+			return true
+		}
+	}
+	return false
+}
+
 //根据猫等级获得位置
 func (u *UserData) GetCatPos(catlv int) int {
 	pos := -1
@@ -1499,6 +1499,14 @@ func HandlerDoFlop(w http.ResponseWriter, data string, uuid int) {
 			break
 		}
  
+		//判断下是否有位置
+		if !uinfo.HasEmptyPos() {
+			logger.Error("HandlerDoFlop flopcnt failed=%v", err)
+			resp.Code = 1
+			resp.Message = "请尽快合成或回收猫咪为分红猫腾出位置"
+			break
+		}
+
 		uinfo.DoFlopCardd(&resp)
  
 		resp.Code = 0
...	...	@@ -316,6 +316,16 @@ func (u *UserData) GetLimitCatList() []int {
316	316	return rtlist
317	317	}
318	318
	319	+//查询是否有空位
	320	+func (u *UserData) HasEmptyPos() bool {
	321	+ for _, v := range u.PosInfo {
	322	+ if v.Cat == 0 {
	323	+ return true
	324	+ }
	325	+ }
	326	+ return false
	327	+}
	328	+
319	329	//根据猫等级获得位置
320	330	func (u *UserData) GetCatPos(catlv int) int {
321	331	pos := -1
...	...
...	...	@@ -1499,6 +1499,14 @@ func HandlerDoFlop(w http.ResponseWriter, data string, uuid int) {
1499	1499	break
1500	1500	}
1501	1501
	1502	+ //判断下是否有位置
	1503	+ if !uinfo.HasEmptyPos() {
	1504	+ logger.Error("HandlerDoFlop flopcnt failed=%v", err)
	1505	+ resp.Code = 1
	1506	+ resp.Message = "请尽快合成或回收猫咪为分红猫腾出位置"
	1507	+ break
	1508	+ }
	1509	+
1502	1510	uinfo.DoFlopCardd(&resp)
1503	1511
1504	1512	resp.Code = 0
...	...