提交

陆恒
1 parent 8b6b07de
Showing 3 changed files with 14 additions and 7 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/httpserver.go
src/HttpServer/logic/logic.go
@@ -723,6 +723,7 @@ type UserData struct {
 	LastTimingRewardHour int                  //上次领取整点奖励的时刻
 	FlopCardCnt          int                  //翻牌次数计数
 	FlopCardLefCnt       int                  //剩余翻拍次数
+	TodayZhaocai         float32              //当天招财猫收益
 	CatShopInfo          CatShopData          //猫咖门店数据
 	Taskinfo             TaskData             //任务数据
 	AchieveMent          AchieveMentData      //成就数据
@@ -139,7 +139,7 @@ func startServerHttpServe() {
 	http.HandleFunc("/api/gambling/removeCat", RemoveCat)                   //清除猫
  
 	/////---------------------------------------------------------------------old
-	http.HandleFunc("/happycat/exchangetwoPos", ExchangePos)  //交换位置
+	//http.HandleFunc("/happycat/exchangetwoPos", ExchangePos)  //交换位置
 	http.HandleFunc("/happycat/clickcatbox", ClickCatBox)     //请求点击猫箱子
 	http.HandleFunc("/happycat/upgradecatbox", UpgradeCatBox) //请求点击猫箱子
 	//http.HandleFunc("/happycat/acclecte", AcclecteGold)       //请求点击猫箱子
@@ -792,14 +792,19 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
  
 		poslist := uinfo.GetLimitCatList()
  
+		nowtime := int(time.Now().Unix())
 		for _, pos := range poslist {
 			if pos > 0 && pos < len(uinfo.PosInfo) {
-				var tmp LimitCatListData
-				tmp.CatId = uinfo.PosInfo[pos].Cat
-				tmp.Status = 0
-				tmp.Cash = uinfo.PosInfo[pos].RedPacket
-				tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
-				resp.Data = append(resp.Data, tmp)
+				//如果可领取了再加入列表
+				if nowtime > uinfo.PosInfo[pos].StartTime+uinfo.PosInfo[pos].Time {
+					var tmp LimitCatListData
+					tmp.CatId = uinfo.PosInfo[pos].Cat
+					tmp.Status = 0
+					tmp.Cash = uinfo.PosInfo[pos].RedPacket
+					tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
+					resp.Data = append(resp.Data, tmp)
+				}
+
 			}
 		}
  
@@ -868,6 +873,7 @@ func HandlerRecvRedCat(w http.ResponseWriter, data string, uuid int) {
 		uinfo.CleadPos(cpos)
  
 		uinfo.CalcGoldRate()
+		uinfo.TodayZhaocai += addredpack
  
 		resp.Data.Num = addredpack
 		resp.Code = 0
...	...	@@ -723,6 +723,7 @@ type UserData struct {
723	723	LastTimingRewardHour int //上次领取整点奖励的时刻
724	724	FlopCardCnt int //翻牌次数计数
725	725	FlopCardLefCnt int //剩余翻拍次数
	726	+ TodayZhaocai float32 //当天招财猫收益
726	727	CatShopInfo CatShopData //猫咖门店数据
727	728	Taskinfo TaskData //任务数据
728	729	AchieveMent AchieveMentData //成就数据
...	...
...	...	@@ -139,7 +139,7 @@ func startServerHttpServe() {
139	139	http.HandleFunc("/api/gambling/removeCat", RemoveCat) //清除猫
140	140
141	141	/////---------------------------------------------------------------------old
142		- http.HandleFunc("/happycat/exchangetwoPos", ExchangePos) //交换位置
	142	+ //http.HandleFunc("/happycat/exchangetwoPos", ExchangePos) //交换位置
143	143	http.HandleFunc("/happycat/clickcatbox", ClickCatBox) //请求点击猫箱子
144	144	http.HandleFunc("/happycat/upgradecatbox", UpgradeCatBox) //请求点击猫箱子
145	145	//http.HandleFunc("/happycat/acclecte", AcclecteGold) //请求点击猫箱子
...	...
...	...	@@ -792,14 +792,19 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
792	792
793	793	poslist := uinfo.GetLimitCatList()
794	794
	795	+ nowtime := int(time.Now().Unix())
795	796	for _, pos := range poslist {
796	797	if pos > 0 && pos < len(uinfo.PosInfo) {
797		- var tmp LimitCatListData
798		- tmp.CatId = uinfo.PosInfo[pos].Cat
799		- tmp.Status = 0
800		- tmp.Cash = uinfo.PosInfo[pos].RedPacket
801		- tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
802		- resp.Data = append(resp.Data, tmp)
	798	+ //如果可领取了再加入列表
	799	+ if nowtime > uinfo.PosInfo[pos].StartTime+uinfo.PosInfo[pos].Time {
	800	+ var tmp LimitCatListData
	801	+ tmp.CatId = uinfo.PosInfo[pos].Cat
	802	+ tmp.Status = 0
	803	+ tmp.Cash = uinfo.PosInfo[pos].RedPacket
	804	+ tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
	805	+ resp.Data = append(resp.Data, tmp)
	806	+ }
	807	+
803	808	}
804	809	}
805	810
...	...	@@ -868,6 +873,7 @@ func HandlerRecvRedCat(w http.ResponseWriter, data string, uuid int) {
868	873	uinfo.CleadPos(cpos)
869	874
870	875	uinfo.CalcGoldRate()
	876	+ uinfo.TodayZhaocai += addredpack
871	877
872	878	resp.Data.Num = addredpack
873	879	resp.Code = 0
...	...