Commit 15587f21cb2d843d83c788d67476ec2f07cb7c21
1 parent
fc0d7773
Exists in
master
提交
Showing
2 changed files
with
149 additions
and
47 deletions
Show diff stats
src/HttpServer/jsonconf/TaskConfig.json
| @@ -3,117 +3,216 @@ | @@ -3,117 +3,216 @@ | ||
| 3 | "id": 1, | 3 | "id": 1, |
| 4 | "type": 1, | 4 | "type": 1, |
| 5 | "day_type": 1, | 5 | "day_type": 1, |
| 6 | - "aims": 5, | 6 | + "aims": 1, |
| 7 | "active": 5, | 7 | "active": 5, |
| 8 | - "coin": 3000, | ||
| 9 | - "desc": "在线5min" | 8 | + "coin": 0, |
| 9 | + "desc": "在线1分钟" | ||
| 10 | }, | 10 | }, |
| 11 | { | 11 | { |
| 12 | "id": 2, | 12 | "id": 2, |
| 13 | "type": 1, | 13 | "type": 1, |
| 14 | "day_type": 1, | 14 | "day_type": 1, |
| 15 | - "aims": 30, | ||
| 16 | - "active": 10, | ||
| 17 | - "coin": 8000, | ||
| 18 | - "desc": "在线30mins" | 15 | + "aims": 5, |
| 16 | + "active": 5, | ||
| 17 | + "coin": 0, | ||
| 18 | + "desc": "在线5分钟" | ||
| 19 | }, | 19 | }, |
| 20 | { | 20 | { |
| 21 | "id": 3, | 21 | "id": 3, |
| 22 | "type": 1, | 22 | "type": 1, |
| 23 | + "day_type": 1, | ||
| 24 | + "aims": 10, | ||
| 25 | + "active": 10, | ||
| 26 | + "coin": 0, | ||
| 27 | + "desc": "在线10分钟" | ||
| 28 | + }, | ||
| 29 | + { | ||
| 30 | + "id": 4, | ||
| 31 | + "type": 1, | ||
| 32 | + "day_type": 1, | ||
| 33 | + "aims": 15, | ||
| 34 | + "active": 10, | ||
| 35 | + "coin": 0, | ||
| 36 | + "desc": "在线15分钟" | ||
| 37 | + }, | ||
| 38 | + { | ||
| 39 | + "id": 5, | ||
| 40 | + "type": 1, | ||
| 41 | + "day_type": 1, | ||
| 42 | + "aims": 20, | ||
| 43 | + "active": 15, | ||
| 44 | + "coin": 0, | ||
| 45 | + "desc": "在线20分钟" | ||
| 46 | + }, | ||
| 47 | + { | ||
| 48 | + "id": 6, | ||
| 49 | + "type": 1, | ||
| 50 | + "day_type": 1, | ||
| 51 | + "aims": 30, | ||
| 52 | + "active": 15, | ||
| 53 | + "coin": 0, | ||
| 54 | + "desc": "在线30分钟" | ||
| 55 | + }, | ||
| 56 | + { | ||
| 57 | + "id": 7, | ||
| 58 | + "type": 1, | ||
| 59 | + "day_type": 1, | ||
| 60 | + "aims": 60, | ||
| 61 | + "active": 20, | ||
| 62 | + "coin": 0, | ||
| 63 | + "desc": "在线60分钟" | ||
| 64 | + }, | ||
| 65 | + { | ||
| 66 | + "id": 8, | ||
| 67 | + "type": 1, | ||
| 23 | "day_type": 2, | 68 | "day_type": 2, |
| 24 | - "aims": 5, | 69 | + "aims": 2, |
| 25 | "active": 5, | 70 | "active": 5, |
| 26 | - "coin": 3000, | ||
| 27 | - "desc": "游戏中消耗5次体力" | 71 | + "coin": 0, |
| 72 | + "desc": "消耗2点体力" | ||
| 28 | }, | 73 | }, |
| 29 | { | 74 | { |
| 30 | - "id": 4, | 75 | + "id": 9, |
| 76 | + "type": 1, | ||
| 77 | + "day_type": 2, | ||
| 78 | + "aims": 5, | ||
| 79 | + "active": 10, | ||
| 80 | + "coin": 0, | ||
| 81 | + "desc": "消耗5点体力" | ||
| 82 | + }, | ||
| 83 | + { | ||
| 84 | + "id": 10, | ||
| 85 | + "type": 1, | ||
| 86 | + "day_type": 2, | ||
| 87 | + "aims": 10, | ||
| 88 | + "active": 15, | ||
| 89 | + "coin": 0, | ||
| 90 | + "desc": "消耗10点体力" | ||
| 91 | + }, | ||
| 92 | + { | ||
| 93 | + "id": 11, | ||
| 31 | "type": 1, | 94 | "type": 1, |
| 32 | "day_type": 3, | 95 | "day_type": 3, |
| 33 | "aims": 1, | 96 | "aims": 1, |
| 34 | "active": 10, | 97 | "active": 10, |
| 35 | - "coin": 5000, | 98 | + "coin": 0, |
| 36 | "desc": "单局成绩超过2000分" | 99 | "desc": "单局成绩超过2000分" |
| 37 | }, | 100 | }, |
| 38 | { | 101 | { |
| 39 | - "id": 5, | 102 | + "id": 12, |
| 103 | + "type": 1, | ||
| 104 | + "day_type": 4, | ||
| 105 | + "aims": 2, | ||
| 106 | + "active": 5, | ||
| 107 | + "coin": 0, | ||
| 108 | + "desc": "观看2次视频" | ||
| 109 | + }, | ||
| 110 | + { | ||
| 111 | + "id": 13, | ||
| 40 | "type": 1, | 112 | "type": 1, |
| 41 | "day_type": 4, | 113 | "day_type": 4, |
| 42 | "aims": 5, | 114 | "aims": 5, |
| 115 | + "active": 10, | ||
| 116 | + "coin": 0, | ||
| 117 | + "desc": "观看5次视频" | ||
| 118 | + }, | ||
| 119 | + { | ||
| 120 | + "id": 14, | ||
| 121 | + "type": 1, | ||
| 122 | + "day_type": 4, | ||
| 123 | + "aims": 10, | ||
| 124 | + "active": 15, | ||
| 125 | + "coin": 0, | ||
| 126 | + "desc": "观看10次视频" | ||
| 127 | + }, | ||
| 128 | + { | ||
| 129 | + "id": 15, | ||
| 130 | + "type": 1, | ||
| 131 | + "day_type": 4, | ||
| 132 | + "aims": 20, | ||
| 43 | "active": 20, | 133 | "active": 20, |
| 44 | - "coin": 5000, | ||
| 45 | - "desc": "观看满5次视频" | 134 | + "coin": 0, |
| 135 | + "desc": "观看20次视频" | ||
| 46 | }, | 136 | }, |
| 47 | { | 137 | { |
| 48 | - "id": 6, | 138 | + "id": 16, |
| 139 | + "type": 1, | ||
| 140 | + "day_type": 4, | ||
| 141 | + "aims": 50, | ||
| 142 | + "active": 30, | ||
| 143 | + "coin": 0, | ||
| 144 | + "desc": "观看50次视频" | ||
| 145 | + }, | ||
| 146 | + { | ||
| 147 | + "id": 17, | ||
| 49 | "type": 1, | 148 | "type": 1, |
| 50 | "day_type": 5, | 149 | "day_type": 5, |
| 51 | "aims": 5, | 150 | "aims": 5, |
| 52 | "active": 20, | 151 | "active": 20, |
| 53 | - "coin": 3000, | ||
| 54 | - "desc": "进行转盘抽奖5次" | 152 | + "coin": 0, |
| 153 | + "desc": "转盘抽奖5次" | ||
| 55 | }, | 154 | }, |
| 56 | { | 155 | { |
| 57 | - "id": 7, | 156 | + "id": 18, |
| 58 | "type": 1, | 157 | "type": 1, |
| 59 | "day_type": 6, | 158 | "day_type": 6, |
| 60 | "aims": 3, | 159 | "aims": 3, |
| 61 | "active": 30, | 160 | "active": 30, |
| 62 | - "coin": 1000, | 161 | + "coin": 0, |
| 63 | "desc": "开福袋3次" | 162 | "desc": "开福袋3次" |
| 64 | }, | 163 | }, |
| 65 | { | 164 | { |
| 66 | - "id": 8, | 165 | + "id": 19, |
| 67 | "type": 1, | 166 | "type": 1, |
| 68 | "day_type": 7, | 167 | "day_type": 7, |
| 69 | "aims": 1, | 168 | "aims": 1, |
| 70 | "active": 15, | 169 | "active": 15, |
| 71 | - "coin": 3000, | 170 | + "coin": 0, |
| 72 | "desc": "放飞火箭1次" | 171 | "desc": "放飞火箭1次" |
| 73 | }, | 172 | }, |
| 74 | { | 173 | { |
| 75 | - "id": 9, | 174 | + "id": 20, |
| 76 | "type": 1, | 175 | "type": 1, |
| 77 | "day_type": 8, | 176 | "day_type": 8, |
| 78 | "aims": 2, | 177 | "aims": 2, |
| 79 | "active": 20, | 178 | "active": 20, |
| 80 | - "coin": 3000, | ||
| 81 | - "desc": "游戏内重生2次" | 179 | + "coin": 0, |
| 180 | + "desc": "重生2次" | ||
| 82 | }, | 181 | }, |
| 83 | { | 182 | { |
| 84 | - "id": 10, | 183 | + "id": 21, |
| 85 | "type": 1, | 184 | "type": 1, |
| 86 | "day_type": 9, | 185 | "day_type": 9, |
| 87 | "aims": 5, | 186 | "aims": 5, |
| 88 | "active": 15, | 187 | "active": 15, |
| 89 | - "coin": 5000, | ||
| 90 | - "desc": "游戏中使用5次道具" | 188 | + "coin": 0, |
| 189 | + "desc": "使用5次道具" | ||
| 91 | }, | 190 | }, |
| 92 | { | 191 | { |
| 93 | - "id": 11, | 192 | + "id": 22, |
| 94 | "type": 2, | 193 | "type": 2, |
| 95 | - "day_type": 0, | ||
| 96 | - "aims": 0, | ||
| 97 | - "active": 30, | ||
| 98 | - "coin": 1500, | 194 | + "day_type": 0.0, |
| 195 | + "aims": 0.0, | ||
| 196 | + "active": 80, | ||
| 197 | + "coin": 0, | ||
| 99 | "desc": "" | 198 | "desc": "" |
| 100 | }, | 199 | }, |
| 101 | { | 200 | { |
| 102 | - "id": 12, | 201 | + "id": 23, |
| 103 | "type": 2, | 202 | "type": 2, |
| 104 | - "day_type": 0, | ||
| 105 | - "aims": 0, | ||
| 106 | - "active": 80, | ||
| 107 | - "coin": 4000, | 203 | + "day_type": 0.0, |
| 204 | + "aims": 0.0, | ||
| 205 | + "active": 180, | ||
| 206 | + "coin": 0, | ||
| 108 | "desc": "" | 207 | "desc": "" |
| 109 | }, | 208 | }, |
| 110 | { | 209 | { |
| 111 | - "id": 13, | 210 | + "id": 24, |
| 112 | "type": 2, | 211 | "type": 2, |
| 113 | - "day_type": 0, | ||
| 114 | - "aims": 0, | ||
| 115 | - "active": 150, | ||
| 116 | - "coin": 4000, | 212 | + "day_type": 0.0, |
| 213 | + "aims": 0.0, | ||
| 214 | + "active": 300, | ||
| 215 | + "coin": 0, | ||
| 117 | "desc": "" | 216 | "desc": "" |
| 118 | } | 217 | } |
| 119 | ] | 218 | ] |
| 120 | \ No newline at end of file | 219 | \ No newline at end of file |
src/HttpServer/logic/function.go
| @@ -245,19 +245,22 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | @@ -245,19 +245,22 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | ||
| 245 | 245 | ||
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | + logger.Info("ss=%v", addgold) | ||
| 248 | //将状态置位已领取 | 249 | //将状态置位已领取 |
| 249 | list.Taskdata[index].Taskstatus = 0 | 250 | list.Taskdata[index].Taskstatus = 0 |
| 251 | + | ||
| 252 | + //发奖励统一领取 | ||
| 250 | //发奖励 | 253 | //发奖励 |
| 251 | - realgold, realaddgold, err := AddCoinToSdk(uuid, addgold, gameid, channel, REDBAGTYPE_102) | 254 | + /*realgold, realaddgold, err := AddCoinToSdk(uuid, addgold, gameid, channel, REDBAGTYPE_102) |
| 252 | if err != nil { | 255 | if err != nil { |
| 253 | logger.Info("GetUserInfo HandlerDrawguangold data failed:%v,for:%v", err) | 256 | logger.Info("GetUserInfo HandlerDrawguangold data failed:%v,for:%v", err) |
| 254 | resp.Message = "后台提现失败" | 257 | resp.Message = "后台提现失败" |
| 255 | resp.Code = 1 | 258 | resp.Code = 1 |
| 256 | return errors.New("后台提现失败") | 259 | return errors.New("后台提现失败") |
| 257 | - } | 260 | + }*/ |
| 258 | 261 | ||
| 259 | - uinfo.RealGold = realgold | ||
| 260 | - resp.Data.Goldnum = realaddgold | 262 | + uinfo.RealGold = 0 |
| 263 | + resp.Data.Goldnum = 0 | ||
| 261 | resp.Data.Walletgold = uinfo.RealGold | 264 | resp.Data.Walletgold = uinfo.RealGold |
| 262 | 265 | ||
| 263 | return nil | 266 | return nil |