陆恒 / HappyCat

Download as
Browse Code »

Commit ee71b4a54cd8eae1a5d68a087671a8d709ca4242

Authored by 陆恒
1 parent 96514c19
Exists in master

提交

Showing 2 changed files with 78 additions and 78 deletions   Show diff stats
src/HttpServer/logic/function.go
  Diff comments   View file @ee71b4a
@@ -492,8 +492,8 @@ func (u *UserData) HandlePassDay() { @@ -492,8 +492,8 @@ func (u *UserData) HandlePassDay() {
492 logger.Info("HandlePassDay lasttime=%v,lasttimestamp=%v", lasttime, lasttimestamp) 492 logger.Info("HandlePassDay lasttime=%v,lasttimestamp=%v", lasttime, lasttimestamp)
493 logger.Info("HandlePassDay2 IsResetToday=%v,nowtimestampmin=%v", u.IsResetToday, nowtime.Minute()) 493 logger.Info("HandlePassDay2 IsResetToday=%v,nowtimestampmin=%v", u.IsResetToday, nowtime.Minute())
494 494
495 - //if u.IsResetToday == 0 && nowtimestamp.Hour() >= 12 {  
496 - if u.IsResetToday == 0 && nowtime.Minute() >= 27 { 495 + if u.IsResetToday == 0 && nowtimestamp.Hour() >= 12 {
  496 + //if u.IsResetToday == 0 && nowtime.Minute() >= 27 {
497 u.DoubleLeftTimes = ACCGOLDRATELIMIT 497 u.DoubleLeftTimes = ACCGOLDRATELIMIT
498 u.GetWatchAdsGoldTime = WATCHADSGOLDLIMIT 498 u.GetWatchAdsGoldTime = WATCHADSGOLDLIMIT
499 u.DrawTicket = DRAWTICKETNUM 499 u.DrawTicket = DRAWTICKETNUM
src/HttpServer/logic/httpserver.go
  Diff comments   View file @ee71b4a
@@ -23,101 +23,101 @@ var G_randVal = float32(rand.Intn(100))/100 + 180 @@ -23,101 +23,101 @@ var G_randVal = float32(rand.Intn(100))/100 + 180
23 func StartHttpTicker() { 23 func StartHttpTicker() {
24 ticker := time.NewTicker(time.Second * time.Duration(30)) 24 ticker := time.NewTicker(time.Second * time.Duration(30))
25 25
26 - go func() {  
27 - for range ticker.C {  
28 - if time.Now().Hour() == 0 && time.Now().Minute() < 1 {  
29 - rand.Seed(time.Now().UnixNano())  
30 - randint := rand.Intn(100)  
31 - floatval := float32(randint) / 100  
32 - G_randVal = 180 + floatval  
33 - }  
34 - if time.Now().Hour() == 12 && time.Now().Minute() < 5 {  
35 - //处理开奖  
36 - logger.Info("Handle kaijian")  
37 - waits := GetWaitCaiCatList()  
38 - if waits != nil {  
39 - for k, val := range waits {  
40 - if val.FakeNum != 0 {  
41 - waits[k].RewardUser = 0  
42 - waits[k].RewardNum = val.FakeNum  
43 - for _, vval := range val.List {  
44 - uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId))  
45 - if err != nil || uinfo == nil {  
46 - continue  
47 - } 26 + for range ticker.C {
  27 + logger.Info("StartHttpTicker ticker")
  28 + if time.Now().Hour() == 0 && time.Now().Minute() < 1 {
  29 + rand.Seed(time.Now().UnixNano())
  30 + randint := rand.Intn(100)
  31 + floatval := float32(randint) / 100
  32 + G_randVal = 180 + floatval
  33 + }
  34 + if time.Now().Hour() == 12 && time.Now().Minute() < 5 {
  35 + //处理开奖
  36 + logger.Info("Handle kaijian")
  37 + waits := GetWaitCaiCatList()
  38 + if waits != nil {
  39 + for k, val := range waits {
  40 + if val.FakeNum != 0 {
  41 + waits[k].RewardUser = 0
  42 + waits[k].RewardNum = val.FakeNum
  43 + for _, vval := range val.List {
  44 + uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId))
  45 + if err != nil || uinfo == nil {
  46 + continue
  47 + }
48 48
49 - var tmp UserCaiPiaoHistory  
50 - tmp.RewardNum = waits[k].RewardNum  
51 - cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum)  
52 - tmp.CatId, _ = strconv.Atoi(cid)  
53 - tmp.Round = waits[k].CurRound  
54 - tmp.Cnum = vval.ChooseNum  
55 - uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) 49 + var tmp UserCaiPiaoHistory
  50 + tmp.RewardNum = waits[k].RewardNum
  51 + cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum)
  52 + tmp.CatId, _ = strconv.Atoi(cid)
  53 + tmp.Round = waits[k].CurRound
  54 + tmp.Cnum = vval.ChooseNum
  55 + uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp)
56 56
57 - SaveUserInfo(uinfo, strconv.Itoa(vval.UserId)) 57 + SaveUserInfo(uinfo, strconv.Itoa(vval.UserId))
58 58
  59 + }
  60 + } else {
  61 + //否则从奖池里面选一个
  62 + randnum := rand.Intn(len(val.List))
  63 + waits[k].RewardNum = val.List[randnum].ChooseNum
  64 + waits[k].RewardUser = val.List[randnum].UserId
  65 + for _, vval := range val.List {
  66 + uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId))
  67 + if err != nil || uinfo == nil {
  68 + continue
59 } 69 }
60 - } else {  
61 - //否则从奖池里面选一个  
62 - randnum := rand.Intn(len(val.List))  
63 - waits[k].RewardNum = val.List[randnum].ChooseNum  
64 - waits[k].RewardUser = val.List[randnum].UserId  
65 - for _, vval := range val.List {  
66 - uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId))  
67 - if err != nil || uinfo == nil {  
68 - continue  
69 - }  
70 - if vval.UserId == waits[k].RewardUser {  
71 - logger.Info("StartHttpTicker addtouser =%v", vval.UserId)  
72 - //给这个玩家发奖  
73 - cfg := jsonconf.GetRedCatConfig(48)  
74 - if cfg != nil {  
75 -  
76 - uinfo.AddRedPackect(cfg.Money, 100)  
77 - } 70 + if vval.UserId == waits[k].RewardUser {
  71 + logger.Info("StartHttpTicker addtouser =%v", vval.UserId)
  72 + //给这个玩家发奖
  73 + cfg := jsonconf.GetRedCatConfig(48)
  74 + if cfg != nil {
78 75
  76 + uinfo.AddRedPackect(cfg.Money, 100)
79 } 77 }
80 - var tmp UserCaiPiaoHistory  
81 - tmp.RewardNum = waits[k].RewardNum  
82 - cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum)  
83 - tmp.CatId, _ = strconv.Atoi(cid)  
84 - tmp.Round = waits[k].CurRound  
85 - tmp.Cnum = vval.ChooseNum  
86 - uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp)  
87 -  
88 - SaveUserInfo(uinfo, strconv.Itoa(vval.UserId))  
89 78
90 } 79 }
  80 + var tmp UserCaiPiaoHistory
  81 + tmp.RewardNum = waits[k].RewardNum
  82 + cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum)
  83 + tmp.CatId, _ = strconv.Atoi(cid)
  84 + tmp.Round = waits[k].CurRound
  85 + tmp.Cnum = vval.ChooseNum
  86 + uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp)
91 87
92 - }  
93 - } 88 + SaveUserInfo(uinfo, strconv.Itoa(vval.UserId))
94 89
95 - //然后将开奖记录写入已开奖  
96 - //将已开奖加入列表  
97 -  
98 - for _, val := range waits {  
99 - var tmp AlreadyDuboCatList  
100 - tmp.CurRound = val.CurRound  
101 - tmp.RewardNum = val.RewardNum  
102 - tmp.List = append(tmp.List, val.List...)  
103 - tmp.RewardUser = val.RewardUser  
104 - tmp.TimeStr = int(time.Now().Unix())  
105 - savestr, err := json.Marshal(&tmp)  
106 - if err == nil {  
107 - redishandler.GetRedisClient().HSet(redis.CAIPIAOKAIJIANGHISTORY_KEY, strconv.Itoa(tmp.CurRound), string(savestr))  
108 } 90 }
109 91
110 } 92 }
  93 + }
111 94
112 - //最后清空待开奖类别  
113 - redishandler.GetRedisClient().Delete(redis.CAIPIAOKAIJIANGWAIT_KEY) 95 + //然后将开奖记录写入已开奖
  96 + //将已开奖加入列表
  97 +
  98 + for _, val := range waits {
  99 + var tmp AlreadyDuboCatList
  100 + tmp.CurRound = val.CurRound
  101 + tmp.RewardNum = val.RewardNum
  102 + tmp.List = append(tmp.List, val.List...)
  103 + tmp.RewardUser = val.RewardUser
  104 + tmp.TimeStr = int(time.Now().Unix())
  105 + savestr, err := json.Marshal(&tmp)
  106 + if err == nil {
  107 + redishandler.GetRedisClient().HSet(redis.CAIPIAOKAIJIANGHISTORY_KEY, strconv.Itoa(tmp.CurRound), string(savestr))
  108 + }
114 109
115 } 110 }
116 111
  112 + //最后清空待开奖类别
  113 + redishandler.GetRedisClient().Delete(redis.CAIPIAOKAIJIANGWAIT_KEY)
  114 +
117 } 115 }
118 - time.Sleep(time.Second * 20) 116 +
119 } 117 }
120 - }() 118 + time.Sleep(time.Second * 20)
  119 + }
  120 +
121 } 121 }
122 122
123 func StartHttpServe() { 123 func StartHttpServe() {