Commit ca9e45c510b63e8cb0664d59f731e5b1f4ce07e8
1 parent
8e22b2bf
Exists in
ver2.3.6
大额提现改版
Showing
9 changed files
with
1829 additions
and
107 deletions
Show diff stats
src/HttpServer/jsonconf/DailyTask.json
| 1 | [ | 1 | [ |
| 2 | { | 2 | { |
| 3 | "id": 1, | 3 | "id": 1, |
| 4 | - "task": "每日登录", | ||
| 5 | - "num": 1, | ||
| 6 | - "reward": [1,50], | ||
| 7 | - "type": 1 | 4 | + "task": "观看%d%条广告", |
| 5 | + "num": 2, | ||
| 6 | + "reward": "[8,1]", | ||
| 7 | + "type": 5, | ||
| 8 | + "Column5": "", | ||
| 9 | + "Column6": "" | ||
| 8 | }, | 10 | }, |
| 9 | { | 11 | { |
| 10 | "id": 2, | 12 | "id": 2, |
| 11 | - "task": "试玩15s小游戏", | ||
| 12 | - "num": 1, | ||
| 13 | - "reward": [1,50], | ||
| 14 | - "type": 2 | 13 | + "task": "观看%d%条广告", |
| 14 | + "num": 5, | ||
| 15 | + "reward": "[8,1]", | ||
| 16 | + "type": 5, | ||
| 17 | + "Column5": "", | ||
| 18 | + "Column6": "" | ||
| 15 | }, | 19 | }, |
| 16 | { | 20 | { |
| 17 | "id": 3, | 21 | "id": 3, |
| 18 | - "task": "今日通过%d%关", | ||
| 19 | - "num": 3, | ||
| 20 | - "reward": [5,30], | ||
| 21 | - "type": 3 | 22 | + "task": "观看%d%条广告", |
| 23 | + "num": 7, | ||
| 24 | + "reward": "[8,1]", | ||
| 25 | + "type": 5, | ||
| 26 | + "Column5": "", | ||
| 27 | + "Column6": "" | ||
| 22 | }, | 28 | }, |
| 23 | { | 29 | { |
| 24 | "id": 4, | 30 | "id": 4, |
| 25 | - "task": "使用%d%次道具", | ||
| 26 | - "num": 3, | ||
| 27 | - "reward": [5,20], | ||
| 28 | - "type": 4 | 31 | + "task": "观看%d%条广告", |
| 32 | + "num": 10, | ||
| 33 | + "reward": "[8,1]", | ||
| 34 | + "type": 5, | ||
| 35 | + "Column5": "", | ||
| 36 | + "Column6": "" | ||
| 29 | }, | 37 | }, |
| 30 | { | 38 | { |
| 31 | "id": 5, | 39 | "id": 5, |
| 32 | "task": "观看%d%条广告", | 40 | "task": "观看%d%条广告", |
| 33 | - "num": 5, | ||
| 34 | - "reward": [5,50], | ||
| 35 | - "type": 5 | 41 | + "num": 15, |
| 42 | + "reward": "[8,1]", | ||
| 43 | + "type": 5, | ||
| 44 | + "Column5": "", | ||
| 45 | + "Column6": "" | ||
| 36 | }, | 46 | }, |
| 37 | { | 47 | { |
| 38 | "id": 6, | 48 | "id": 6, |
| 39 | "task": "观看%d%条广告", | 49 | "task": "观看%d%条广告", |
| 40 | - "num": 10, | ||
| 41 | - "reward": [5,100], | ||
| 42 | - "type": 5 | 50 | + "num": 20, |
| 51 | + "reward": "[8,1]", | ||
| 52 | + "type": 5, | ||
| 53 | + "Column5": "", | ||
| 54 | + "Column6": "" | ||
| 43 | }, | 55 | }, |
| 44 | { | 56 | { |
| 45 | "id": 7, | 57 | "id": 7, |
| 46 | "task": "观看%d%条广告", | 58 | "task": "观看%d%条广告", |
| 47 | - "num": 20, | ||
| 48 | - "reward": [5,150], | ||
| 49 | - "type": 5 | 59 | + "num": 25, |
| 60 | + "reward": "[8,1]", | ||
| 61 | + "type": 5, | ||
| 62 | + "Column5": "", | ||
| 63 | + "Column6": "" | ||
| 50 | }, | 64 | }, |
| 51 | { | 65 | { |
| 52 | "id": 8, | 66 | "id": 8, |
| 67 | + "task": "观看%d%条广告", | ||
| 68 | + "num": 30, | ||
| 69 | + "reward": "[8,1]", | ||
| 70 | + "type": 5, | ||
| 71 | + "Column5": "", | ||
| 72 | + "Column6": "" | ||
| 73 | + }, | ||
| 74 | + { | ||
| 75 | + "id": 9, | ||
| 76 | + "task": "观看%d%条广告", | ||
| 77 | + "num": 35, | ||
| 78 | + "reward": "[8,1]", | ||
| 79 | + "type": 5, | ||
| 80 | + "Column5": "", | ||
| 81 | + "Column6": "" | ||
| 82 | + }, | ||
| 83 | + { | ||
| 84 | + "id": 10, | ||
| 85 | + "task": "观看%d%条广告", | ||
| 86 | + "num": 40, | ||
| 87 | + "reward": "[8,1]", | ||
| 88 | + "type": 5, | ||
| 89 | + "Column5": "", | ||
| 90 | + "Column6": "" | ||
| 91 | + }, | ||
| 92 | + { | ||
| 93 | + "id": 11, | ||
| 94 | + "task": "观看%d%条广告", | ||
| 95 | + "num": 45, | ||
| 96 | + "reward": "[8,1]", | ||
| 97 | + "type": 5, | ||
| 98 | + "Column5": "", | ||
| 99 | + "Column6": "" | ||
| 100 | + }, | ||
| 101 | + { | ||
| 102 | + "id": 12, | ||
| 103 | + "task": "观看%d%条广告", | ||
| 104 | + "num": 50, | ||
| 105 | + "reward": "[8,1]", | ||
| 106 | + "type": 5, | ||
| 107 | + "Column5": "", | ||
| 108 | + "Column6": "" | ||
| 109 | + }, | ||
| 110 | + { | ||
| 111 | + "id": 13, | ||
| 112 | + "task": "今日通过%d%关", | ||
| 113 | + "num": 2, | ||
| 114 | + "reward": "[8,1]", | ||
| 115 | + "type": 3, | ||
| 116 | + "Column5": "", | ||
| 117 | + "Column6": "" | ||
| 118 | + }, | ||
| 119 | + { | ||
| 120 | + "id": 14, | ||
| 121 | + "task": "今日通过%d%关", | ||
| 122 | + "num": 4, | ||
| 123 | + "reward": "[8,1]", | ||
| 124 | + "type": 3, | ||
| 125 | + "Column5": "", | ||
| 126 | + "Column6": "" | ||
| 127 | + }, | ||
| 128 | + { | ||
| 129 | + "id": 15, | ||
| 130 | + "task": "今日通过%d%关", | ||
| 131 | + "num": 6, | ||
| 132 | + "reward": "[8,1]", | ||
| 133 | + "type": 3, | ||
| 134 | + "Column5": "", | ||
| 135 | + "Column6": "" | ||
| 136 | + }, | ||
| 137 | + { | ||
| 138 | + "id": 16, | ||
| 139 | + "task": "今日通过%d%关", | ||
| 140 | + "num": 8, | ||
| 141 | + "reward": "[8,1]", | ||
| 142 | + "type": 3, | ||
| 143 | + "Column5": "", | ||
| 144 | + "Column6": "" | ||
| 145 | + }, | ||
| 146 | + { | ||
| 147 | + "id": 17, | ||
| 148 | + "task": "今日通过%d%关", | ||
| 149 | + "num": 10, | ||
| 150 | + "reward": "[8,1]", | ||
| 151 | + "type": 3, | ||
| 152 | + "Column5": "", | ||
| 153 | + "Column6": "" | ||
| 154 | + }, | ||
| 155 | + { | ||
| 156 | + "id": 18, | ||
| 157 | + "task": "今日通过%d%关", | ||
| 158 | + "num": 15, | ||
| 159 | + "reward": "[8,1]", | ||
| 160 | + "type": 3, | ||
| 161 | + "Column5": "", | ||
| 162 | + "Column6": "" | ||
| 163 | + }, | ||
| 164 | + { | ||
| 165 | + "id": 19, | ||
| 166 | + "task": "今日通过%d%关", | ||
| 167 | + "num": 20, | ||
| 168 | + "reward": "[8,1]", | ||
| 169 | + "type": 3, | ||
| 170 | + "Column5": "", | ||
| 171 | + "Column6": "" | ||
| 172 | + }, | ||
| 173 | + { | ||
| 174 | + "id": 20, | ||
| 175 | + "task": "今日通过%d%关", | ||
| 176 | + "num": 25, | ||
| 177 | + "reward": "[8,1]", | ||
| 178 | + "type": 3, | ||
| 179 | + "Column5": "", | ||
| 180 | + "Column6": "" | ||
| 181 | + }, | ||
| 182 | + { | ||
| 183 | + "id": 21, | ||
| 184 | + "task": "今日通过%d%关", | ||
| 185 | + "num": 30, | ||
| 186 | + "reward": "[8,1]", | ||
| 187 | + "type": 3, | ||
| 188 | + "Column5": "", | ||
| 189 | + "Column6": "" | ||
| 190 | + }, | ||
| 191 | + { | ||
| 192 | + "id": 22, | ||
| 193 | + "task": "今日通过%d%关", | ||
| 194 | + "num": 40, | ||
| 195 | + "reward": "[8,1]", | ||
| 196 | + "type": 3, | ||
| 197 | + "Column5": "", | ||
| 198 | + "Column6": "" | ||
| 199 | + }, | ||
| 200 | + { | ||
| 201 | + "id": 23, | ||
| 202 | + "task": "今日通过%d%关", | ||
| 203 | + "num": 50, | ||
| 204 | + "reward": "[8,1]", | ||
| 205 | + "type": 3, | ||
| 206 | + "Column5": "", | ||
| 207 | + "Column6": "" | ||
| 208 | + }, | ||
| 209 | + { | ||
| 210 | + "id": 24, | ||
| 211 | + "task": "使用%d%次道具", | ||
| 212 | + "num": 2, | ||
| 213 | + "reward": "[8,1]", | ||
| 214 | + "type": 4, | ||
| 215 | + "Column5": "", | ||
| 216 | + "Column6": "" | ||
| 217 | + }, | ||
| 218 | + { | ||
| 219 | + "id": 25, | ||
| 220 | + "task": "使用%d%次道具", | ||
| 221 | + "num": 4, | ||
| 222 | + "reward": "[8,1]", | ||
| 223 | + "type": 4, | ||
| 224 | + "Column5": "", | ||
| 225 | + "Column6": "" | ||
| 226 | + }, | ||
| 227 | + { | ||
| 228 | + "id": 26, | ||
| 229 | + "task": "使用%d%次道具", | ||
| 230 | + "num": 6, | ||
| 231 | + "reward": "[8,1]", | ||
| 232 | + "type": 4, | ||
| 233 | + "Column5": "", | ||
| 234 | + "Column6": "" | ||
| 235 | + }, | ||
| 236 | + { | ||
| 237 | + "id": 27, | ||
| 238 | + "task": "使用%d%次道具", | ||
| 239 | + "num": 8, | ||
| 240 | + "reward": "[8,1]", | ||
| 241 | + "type": 4, | ||
| 242 | + "Column5": "", | ||
| 243 | + "Column6": "" | ||
| 244 | + }, | ||
| 245 | + { | ||
| 246 | + "id": 28, | ||
| 247 | + "task": "使用%d%次道具", | ||
| 248 | + "num": 10, | ||
| 249 | + "reward": "[8,1]", | ||
| 250 | + "type": 4, | ||
| 251 | + "Column5": "", | ||
| 252 | + "Column6": "" | ||
| 253 | + }, | ||
| 254 | + { | ||
| 255 | + "id": 29, | ||
| 256 | + "task": "使用%d%次道具", | ||
| 257 | + "num": 15, | ||
| 258 | + "reward": "[8,1]", | ||
| 259 | + "type": 4, | ||
| 260 | + "Column5": "", | ||
| 261 | + "Column6": "" | ||
| 262 | + }, | ||
| 263 | + { | ||
| 264 | + "id": 30, | ||
| 265 | + "task": "使用%d%次道具", | ||
| 266 | + "num": 20, | ||
| 267 | + "reward": "[8,1]", | ||
| 268 | + "type": 4, | ||
| 269 | + "Column5": "", | ||
| 270 | + "Column6": "" | ||
| 271 | + }, | ||
| 272 | + { | ||
| 273 | + "id": 31, | ||
| 274 | + "task": "使用%d%次道具", | ||
| 275 | + "num": 25, | ||
| 276 | + "reward": "[8,1]", | ||
| 277 | + "type": 4, | ||
| 278 | + "Column5": "", | ||
| 279 | + "Column6": "" | ||
| 280 | + }, | ||
| 281 | + { | ||
| 282 | + "id": 32, | ||
| 283 | + "task": "使用%d%次道具", | ||
| 284 | + "num": 30, | ||
| 285 | + "reward": "[8,1]", | ||
| 286 | + "type": 4, | ||
| 287 | + "Column5": "", | ||
| 288 | + "Column6": "" | ||
| 289 | + }, | ||
| 290 | + { | ||
| 291 | + "id": 33, | ||
| 292 | + "task": "使用%d%次道具", | ||
| 293 | + "num": 40, | ||
| 294 | + "reward": "[8,1]", | ||
| 295 | + "type": 4, | ||
| 296 | + "Column5": "", | ||
| 297 | + "Column6": "" | ||
| 298 | + }, | ||
| 299 | + { | ||
| 300 | + "id": 34, | ||
| 301 | + "task": "使用%d%次道具", | ||
| 302 | + "num": 50, | ||
| 303 | + "reward": "[8,1]", | ||
| 304 | + "type": 4, | ||
| 305 | + "Column5": "", | ||
| 306 | + "Column6": "" | ||
| 307 | + }, | ||
| 308 | + { | ||
| 309 | + "id": 35, | ||
| 53 | "task": "累计在线%d%分钟", | 310 | "task": "累计在线%d%分钟", |
| 54 | "num": 5, | 311 | "num": 5, |
| 55 | - "reward": [2,1], | ||
| 56 | - "type": 6 | 312 | + "reward": "[8,1]", |
| 313 | + "type": 6, | ||
| 314 | + "Column5": "", | ||
| 315 | + "Column6": "" | ||
| 57 | }, | 316 | }, |
| 58 | { | 317 | { |
| 59 | - "id": 9, | 318 | + "id": 36, |
| 60 | "task": "累计在线%d%分钟", | 319 | "task": "累计在线%d%分钟", |
| 61 | "num": 10, | 320 | "num": 10, |
| 62 | - "reward": [3,1], | ||
| 63 | - "type": 6 | 321 | + "reward": "[8,1]", |
| 322 | + "type": 6, | ||
| 323 | + "Column5": "", | ||
| 324 | + "Column6": "" | ||
| 64 | }, | 325 | }, |
| 65 | { | 326 | { |
| 66 | - "id": 10, | 327 | + "id": 37, |
| 67 | "task": "累计在线%d%分钟", | 328 | "task": "累计在线%d%分钟", |
| 68 | "num": 15, | 329 | "num": 15, |
| 69 | - "reward": [4,1], | ||
| 70 | - "type": 6 | 330 | + "reward": "[8,1]", |
| 331 | + "type": 6, | ||
| 332 | + "Column5": "", | ||
| 333 | + "Column6": "" | ||
| 71 | }, | 334 | }, |
| 72 | { | 335 | { |
| 73 | - "id": 11, | 336 | + "id": 38, |
| 74 | "task": "累计在线%d%分钟", | 337 | "task": "累计在线%d%分钟", |
| 75 | "num": 20, | 338 | "num": 20, |
| 76 | - "reward": [1,100], | ||
| 77 | - "type": 6 | 339 | + "reward": "[8,1]", |
| 340 | + "type": 6, | ||
| 341 | + "Column5": "", | ||
| 342 | + "Column6": "" | ||
| 343 | + }, | ||
| 344 | + { | ||
| 345 | + "id": 39, | ||
| 346 | + "task": "累计在线%d%分钟", | ||
| 347 | + "num": 25, | ||
| 348 | + "reward": "[8,1]", | ||
| 349 | + "type": 6, | ||
| 350 | + "Column5": "", | ||
| 351 | + "Column6": "" | ||
| 352 | + }, | ||
| 353 | + { | ||
| 354 | + "id": 40, | ||
| 355 | + "task": "累计在线%d%分钟", | ||
| 356 | + "num": 30, | ||
| 357 | + "reward": "[8,1]", | ||
| 358 | + "type": 6, | ||
| 359 | + "Column5": "", | ||
| 360 | + "Column6": "" | ||
| 361 | + }, | ||
| 362 | + { | ||
| 363 | + "id": 41, | ||
| 364 | + "task": "累计在线%d%分钟", | ||
| 365 | + "num": 35, | ||
| 366 | + "reward": "[8,1]", | ||
| 367 | + "type": 6, | ||
| 368 | + "Column5": "", | ||
| 369 | + "Column6": "" | ||
| 370 | + }, | ||
| 371 | + { | ||
| 372 | + "id": 42, | ||
| 373 | + "task": "累计在线%d%分钟", | ||
| 374 | + "num": 40, | ||
| 375 | + "reward": "[8,1]", | ||
| 376 | + "type": 6, | ||
| 377 | + "Column5": "", | ||
| 378 | + "Column6": "" | ||
| 379 | + }, | ||
| 380 | + { | ||
| 381 | + "id": 43, | ||
| 382 | + "task": "累计在线%d%分钟", | ||
| 383 | + "num": 45, | ||
| 384 | + "reward": "[8,1]", | ||
| 385 | + "type": 6, | ||
| 386 | + "Column5": "", | ||
| 387 | + "Column6": "" | ||
| 388 | + }, | ||
| 389 | + { | ||
| 390 | + "id": 44, | ||
| 391 | + "task": "累计在线%d%分钟", | ||
| 392 | + "num": 50, | ||
| 393 | + "reward": "[8,1]", | ||
| 394 | + "type": 6, | ||
| 395 | + "Column5": "", | ||
| 396 | + "Column6": "" | ||
| 397 | + }, | ||
| 398 | + { | ||
| 399 | + "id": 45, | ||
| 400 | + "task": "累计在线%d%分钟", | ||
| 401 | + "num": 55, | ||
| 402 | + "reward": "[8,1]", | ||
| 403 | + "type": 6, | ||
| 404 | + "Column5": "", | ||
| 405 | + "Column6": "" | ||
| 406 | + }, | ||
| 407 | + { | ||
| 408 | + "id": 46, | ||
| 409 | + "task": "累计在线%d%分钟", | ||
| 410 | + "num": 60, | ||
| 411 | + "reward": "[8,1]", | ||
| 412 | + "type": 6, | ||
| 413 | + "Column5": "", | ||
| 414 | + "Column6": "" | ||
| 415 | + }, | ||
| 416 | + { | ||
| 417 | + "id": 47, | ||
| 418 | + "task": "累计在线%d%分钟", | ||
| 419 | + "num": 70, | ||
| 420 | + "reward": "[8,1]", | ||
| 421 | + "type": 6, | ||
| 422 | + "Column5": "", | ||
| 423 | + "Column6": "" | ||
| 424 | + }, | ||
| 425 | + { | ||
| 426 | + "id": 48, | ||
| 427 | + "task": "累计在线%d%分钟", | ||
| 428 | + "num": 80, | ||
| 429 | + "reward": "[8,1]", | ||
| 430 | + "type": 6, | ||
| 431 | + "Column5": "", | ||
| 432 | + "Column6": "" | ||
| 433 | + }, | ||
| 434 | + { | ||
| 435 | + "id": 49, | ||
| 436 | + "task": "累计在线%d%分钟", | ||
| 437 | + "num": 90, | ||
| 438 | + "reward": "[8,1]", | ||
| 439 | + "type": 6, | ||
| 440 | + "Column5": "", | ||
| 441 | + "Column6": "" | ||
| 442 | + }, | ||
| 443 | + { | ||
| 444 | + "id": 50, | ||
| 445 | + "task": "每日登录", | ||
| 446 | + "num": 1, | ||
| 447 | + "reward": "[8,1]", | ||
| 448 | + "type": 1, | ||
| 449 | + "Column5": "", | ||
| 450 | + "Column6": "" | ||
| 78 | } | 451 | } |
| 79 | ] | 452 | ] |
| 80 | \ No newline at end of file | 453 | \ No newline at end of file |
| @@ -0,0 +1,1202 @@ | @@ -0,0 +1,1202 @@ | ||
| 1 | +[ | ||
| 2 | + { | ||
| 3 | + "id": 1, | ||
| 4 | + "cash": 500 | ||
| 5 | + }, | ||
| 6 | + { | ||
| 7 | + "id": 2, | ||
| 8 | + "cash": 113288 | ||
| 9 | + }, | ||
| 10 | + { | ||
| 11 | + "id": 3, | ||
| 12 | + "cash": 86032 | ||
| 13 | + }, | ||
| 14 | + { | ||
| 15 | + "id": 4, | ||
| 16 | + "cash": 67216 | ||
| 17 | + }, | ||
| 18 | + { | ||
| 19 | + "id": 5, | ||
| 20 | + "cash": 54329 | ||
| 21 | + }, | ||
| 22 | + { | ||
| 23 | + "id": 6, | ||
| 24 | + "cash": 64538 | ||
| 25 | + }, | ||
| 26 | + { | ||
| 27 | + "id": 7, | ||
| 28 | + "cash": 44198 | ||
| 29 | + }, | ||
| 30 | + { | ||
| 31 | + "id": 8, | ||
| 32 | + "cash": 60738 | ||
| 33 | + }, | ||
| 34 | + { | ||
| 35 | + "id": 9, | ||
| 36 | + "cash": 76891 | ||
| 37 | + }, | ||
| 38 | + { | ||
| 39 | + "id": 10, | ||
| 40 | + "cash": 41328 | ||
| 41 | + }, | ||
| 42 | + { | ||
| 43 | + "id": 11, | ||
| 44 | + "cash": 32807 | ||
| 45 | + }, | ||
| 46 | + { | ||
| 47 | + "id": 12, | ||
| 48 | + "cash": 21068 | ||
| 49 | + }, | ||
| 50 | + { | ||
| 51 | + "id": 13, | ||
| 52 | + "cash": 13288 | ||
| 53 | + }, | ||
| 54 | + { | ||
| 55 | + "id": 14, | ||
| 56 | + "cash": 9808 | ||
| 57 | + }, | ||
| 58 | + { | ||
| 59 | + "id": 15, | ||
| 60 | + "cash": 6798 | ||
| 61 | + }, | ||
| 62 | + { | ||
| 63 | + "id": 16, | ||
| 64 | + "cash": 7423 | ||
| 65 | + }, | ||
| 66 | + { | ||
| 67 | + "id": 17, | ||
| 68 | + "cash": 8617 | ||
| 69 | + }, | ||
| 70 | + { | ||
| 71 | + "id": 18, | ||
| 72 | + "cash": 6890 | ||
| 73 | + }, | ||
| 74 | + { | ||
| 75 | + "id": 19, | ||
| 76 | + "cash": 7127 | ||
| 77 | + }, | ||
| 78 | + { | ||
| 79 | + "id": 20, | ||
| 80 | + "cash": 5391 | ||
| 81 | + }, | ||
| 82 | + { | ||
| 83 | + "id": 21, | ||
| 84 | + "cash": 4748 | ||
| 85 | + }, | ||
| 86 | + { | ||
| 87 | + "id": 22, | ||
| 88 | + "cash": 3367 | ||
| 89 | + }, | ||
| 90 | + { | ||
| 91 | + "id": 23, | ||
| 92 | + "cash": 2576 | ||
| 93 | + }, | ||
| 94 | + { | ||
| 95 | + "id": 24, | ||
| 96 | + "cash": 3161 | ||
| 97 | + }, | ||
| 98 | + { | ||
| 99 | + "id": 25, | ||
| 100 | + "cash": 2842 | ||
| 101 | + }, | ||
| 102 | + { | ||
| 103 | + "id": 26, | ||
| 104 | + "cash": 2973 | ||
| 105 | + }, | ||
| 106 | + { | ||
| 107 | + "id": 27, | ||
| 108 | + "cash": 3104 | ||
| 109 | + }, | ||
| 110 | + { | ||
| 111 | + "id": 28, | ||
| 112 | + "cash": 2551 | ||
| 113 | + }, | ||
| 114 | + { | ||
| 115 | + "id": 29, | ||
| 116 | + "cash": 2591 | ||
| 117 | + }, | ||
| 118 | + { | ||
| 119 | + "id": 30, | ||
| 120 | + "cash": 2583 | ||
| 121 | + }, | ||
| 122 | + { | ||
| 123 | + "id": 31, | ||
| 124 | + "cash": 2140 | ||
| 125 | + }, | ||
| 126 | + { | ||
| 127 | + "id": 32, | ||
| 128 | + "cash": 2356 | ||
| 129 | + }, | ||
| 130 | + { | ||
| 131 | + "id": 33, | ||
| 132 | + "cash": 1966 | ||
| 133 | + }, | ||
| 134 | + { | ||
| 135 | + "id": 34, | ||
| 136 | + "cash": 2202 | ||
| 137 | + }, | ||
| 138 | + { | ||
| 139 | + "id": 35, | ||
| 140 | + "cash": 1807 | ||
| 141 | + }, | ||
| 142 | + { | ||
| 143 | + "id": 36, | ||
| 144 | + "cash": 1637 | ||
| 145 | + }, | ||
| 146 | + { | ||
| 147 | + "id": 37, | ||
| 148 | + "cash": 1683 | ||
| 149 | + }, | ||
| 150 | + { | ||
| 151 | + "id": 38, | ||
| 152 | + "cash": 1822 | ||
| 153 | + }, | ||
| 154 | + { | ||
| 155 | + "id": 39, | ||
| 156 | + "cash": 1667 | ||
| 157 | + }, | ||
| 158 | + { | ||
| 159 | + "id": 40, | ||
| 160 | + "cash": 1655 | ||
| 161 | + }, | ||
| 162 | + { | ||
| 163 | + "id": 41, | ||
| 164 | + "cash": 907 | ||
| 165 | + }, | ||
| 166 | + { | ||
| 167 | + "id": 42, | ||
| 168 | + "cash": 958 | ||
| 169 | + }, | ||
| 170 | + { | ||
| 171 | + "id": 43, | ||
| 172 | + "cash": 501 | ||
| 173 | + }, | ||
| 174 | + { | ||
| 175 | + "id": 44, | ||
| 176 | + "cash": 553 | ||
| 177 | + }, | ||
| 178 | + { | ||
| 179 | + "id": 45, | ||
| 180 | + "cash": 930 | ||
| 181 | + }, | ||
| 182 | + { | ||
| 183 | + "id": 46, | ||
| 184 | + "cash": 906 | ||
| 185 | + }, | ||
| 186 | + { | ||
| 187 | + "id": 47, | ||
| 188 | + "cash": 822 | ||
| 189 | + }, | ||
| 190 | + { | ||
| 191 | + "id": 48, | ||
| 192 | + "cash": 846 | ||
| 193 | + }, | ||
| 194 | + { | ||
| 195 | + "id": 49, | ||
| 196 | + "cash": 868 | ||
| 197 | + }, | ||
| 198 | + { | ||
| 199 | + "id": 50, | ||
| 200 | + "cash": 919 | ||
| 201 | + }, | ||
| 202 | + { | ||
| 203 | + "id": 51, | ||
| 204 | + "cash": 839 | ||
| 205 | + }, | ||
| 206 | + { | ||
| 207 | + "id": 52, | ||
| 208 | + "cash": 912 | ||
| 209 | + }, | ||
| 210 | + { | ||
| 211 | + "id": 53, | ||
| 212 | + "cash": 968 | ||
| 213 | + }, | ||
| 214 | + { | ||
| 215 | + "id": 54, | ||
| 216 | + "cash": 940 | ||
| 217 | + }, | ||
| 218 | + { | ||
| 219 | + "id": 55, | ||
| 220 | + "cash": 857 | ||
| 221 | + }, | ||
| 222 | + { | ||
| 223 | + "id": 56, | ||
| 224 | + "cash": 936 | ||
| 225 | + }, | ||
| 226 | + { | ||
| 227 | + "id": 57, | ||
| 228 | + "cash": 972 | ||
| 229 | + }, | ||
| 230 | + { | ||
| 231 | + "id": 58, | ||
| 232 | + "cash": 814 | ||
| 233 | + }, | ||
| 234 | + { | ||
| 235 | + "id": 59, | ||
| 236 | + "cash": 862 | ||
| 237 | + }, | ||
| 238 | + { | ||
| 239 | + "id": 60, | ||
| 240 | + "cash": 921 | ||
| 241 | + }, | ||
| 242 | + { | ||
| 243 | + "id": 61, | ||
| 244 | + "cash": 890 | ||
| 245 | + }, | ||
| 246 | + { | ||
| 247 | + "id": 62, | ||
| 248 | + "cash": 938 | ||
| 249 | + }, | ||
| 250 | + { | ||
| 251 | + "id": 63, | ||
| 252 | + "cash": 857 | ||
| 253 | + }, | ||
| 254 | + { | ||
| 255 | + "id": 64, | ||
| 256 | + "cash": 991 | ||
| 257 | + }, | ||
| 258 | + { | ||
| 259 | + "id": 65, | ||
| 260 | + "cash": 985 | ||
| 261 | + }, | ||
| 262 | + { | ||
| 263 | + "id": 66, | ||
| 264 | + "cash": 843 | ||
| 265 | + }, | ||
| 266 | + { | ||
| 267 | + "id": 67, | ||
| 268 | + "cash": 923 | ||
| 269 | + }, | ||
| 270 | + { | ||
| 271 | + "id": 68, | ||
| 272 | + "cash": 809 | ||
| 273 | + }, | ||
| 274 | + { | ||
| 275 | + "id": 69, | ||
| 276 | + "cash": 1005 | ||
| 277 | + }, | ||
| 278 | + { | ||
| 279 | + "id": 70, | ||
| 280 | + "cash": 858 | ||
| 281 | + }, | ||
| 282 | + { | ||
| 283 | + "id": 71, | ||
| 284 | + "cash": 1023 | ||
| 285 | + }, | ||
| 286 | + { | ||
| 287 | + "id": 72, | ||
| 288 | + "cash": 1003 | ||
| 289 | + }, | ||
| 290 | + { | ||
| 291 | + "id": 73, | ||
| 292 | + "cash": 937 | ||
| 293 | + }, | ||
| 294 | + { | ||
| 295 | + "id": 74, | ||
| 296 | + "cash": 898 | ||
| 297 | + }, | ||
| 298 | + { | ||
| 299 | + "id": 75, | ||
| 300 | + "cash": 985 | ||
| 301 | + }, | ||
| 302 | + { | ||
| 303 | + "id": 76, | ||
| 304 | + "cash": 1025 | ||
| 305 | + }, | ||
| 306 | + { | ||
| 307 | + "id": 77, | ||
| 308 | + "cash": 978 | ||
| 309 | + }, | ||
| 310 | + { | ||
| 311 | + "id": 78, | ||
| 312 | + "cash": 993 | ||
| 313 | + }, | ||
| 314 | + { | ||
| 315 | + "id": 79, | ||
| 316 | + "cash": 980 | ||
| 317 | + }, | ||
| 318 | + { | ||
| 319 | + "id": 80, | ||
| 320 | + "cash": 1034 | ||
| 321 | + }, | ||
| 322 | + { | ||
| 323 | + "id": 81, | ||
| 324 | + "cash": 939 | ||
| 325 | + }, | ||
| 326 | + { | ||
| 327 | + "id": 82, | ||
| 328 | + "cash": 972 | ||
| 329 | + }, | ||
| 330 | + { | ||
| 331 | + "id": 83, | ||
| 332 | + "cash": 886 | ||
| 333 | + }, | ||
| 334 | + { | ||
| 335 | + "id": 84, | ||
| 336 | + "cash": 856 | ||
| 337 | + }, | ||
| 338 | + { | ||
| 339 | + "id": 85, | ||
| 340 | + "cash": 879 | ||
| 341 | + }, | ||
| 342 | + { | ||
| 343 | + "id": 86, | ||
| 344 | + "cash": 999 | ||
| 345 | + }, | ||
| 346 | + { | ||
| 347 | + "id": 87, | ||
| 348 | + "cash": 877 | ||
| 349 | + }, | ||
| 350 | + { | ||
| 351 | + "id": 88, | ||
| 352 | + "cash": 1021 | ||
| 353 | + }, | ||
| 354 | + { | ||
| 355 | + "id": 89, | ||
| 356 | + "cash": 912 | ||
| 357 | + }, | ||
| 358 | + { | ||
| 359 | + "id": 90, | ||
| 360 | + "cash": 1028 | ||
| 361 | + }, | ||
| 362 | + { | ||
| 363 | + "id": 91, | ||
| 364 | + "cash": 878 | ||
| 365 | + }, | ||
| 366 | + { | ||
| 367 | + "id": 92, | ||
| 368 | + "cash": 874 | ||
| 369 | + }, | ||
| 370 | + { | ||
| 371 | + "id": 93, | ||
| 372 | + "cash": 1032 | ||
| 373 | + }, | ||
| 374 | + { | ||
| 375 | + "id": 94, | ||
| 376 | + "cash": 987 | ||
| 377 | + }, | ||
| 378 | + { | ||
| 379 | + "id": 95, | ||
| 380 | + "cash": 917 | ||
| 381 | + }, | ||
| 382 | + { | ||
| 383 | + "id": 96, | ||
| 384 | + "cash": 1008 | ||
| 385 | + }, | ||
| 386 | + { | ||
| 387 | + "id": 97, | ||
| 388 | + "cash": 916 | ||
| 389 | + }, | ||
| 390 | + { | ||
| 391 | + "id": 98, | ||
| 392 | + "cash": 837 | ||
| 393 | + }, | ||
| 394 | + { | ||
| 395 | + "id": 99, | ||
| 396 | + "cash": 896 | ||
| 397 | + }, | ||
| 398 | + { | ||
| 399 | + "id": 100, | ||
| 400 | + "cash": 840 | ||
| 401 | + }, | ||
| 402 | + { | ||
| 403 | + "id": 101, | ||
| 404 | + "cash": 572 | ||
| 405 | + }, | ||
| 406 | + { | ||
| 407 | + "id": 102, | ||
| 408 | + "cash": 595 | ||
| 409 | + }, | ||
| 410 | + { | ||
| 411 | + "id": 103, | ||
| 412 | + "cash": 547 | ||
| 413 | + }, | ||
| 414 | + { | ||
| 415 | + "id": 104, | ||
| 416 | + "cash": 520 | ||
| 417 | + }, | ||
| 418 | + { | ||
| 419 | + "id": 105, | ||
| 420 | + "cash": 526 | ||
| 421 | + }, | ||
| 422 | + { | ||
| 423 | + "id": 106, | ||
| 424 | + "cash": 602 | ||
| 425 | + }, | ||
| 426 | + { | ||
| 427 | + "id": 107, | ||
| 428 | + "cash": 599 | ||
| 429 | + }, | ||
| 430 | + { | ||
| 431 | + "id": 108, | ||
| 432 | + "cash": 577 | ||
| 433 | + }, | ||
| 434 | + { | ||
| 435 | + "id": 109, | ||
| 436 | + "cash": 539 | ||
| 437 | + }, | ||
| 438 | + { | ||
| 439 | + "id": 110, | ||
| 440 | + "cash": 569 | ||
| 441 | + }, | ||
| 442 | + { | ||
| 443 | + "id": 111, | ||
| 444 | + "cash": 558 | ||
| 445 | + }, | ||
| 446 | + { | ||
| 447 | + "id": 112, | ||
| 448 | + "cash": 535 | ||
| 449 | + }, | ||
| 450 | + { | ||
| 451 | + "id": 113, | ||
| 452 | + "cash": 565 | ||
| 453 | + }, | ||
| 454 | + { | ||
| 455 | + "id": 114, | ||
| 456 | + "cash": 566 | ||
| 457 | + }, | ||
| 458 | + { | ||
| 459 | + "id": 115, | ||
| 460 | + "cash": 567 | ||
| 461 | + }, | ||
| 462 | + { | ||
| 463 | + "id": 116, | ||
| 464 | + "cash": 543 | ||
| 465 | + }, | ||
| 466 | + { | ||
| 467 | + "id": 117, | ||
| 468 | + "cash": 616 | ||
| 469 | + }, | ||
| 470 | + { | ||
| 471 | + "id": 118, | ||
| 472 | + "cash": 576 | ||
| 473 | + }, | ||
| 474 | + { | ||
| 475 | + "id": 119, | ||
| 476 | + "cash": 633 | ||
| 477 | + }, | ||
| 478 | + { | ||
| 479 | + "id": 120, | ||
| 480 | + "cash": 573 | ||
| 481 | + }, | ||
| 482 | + { | ||
| 483 | + "id": 121, | ||
| 484 | + "cash": 629 | ||
| 485 | + }, | ||
| 486 | + { | ||
| 487 | + "id": 122, | ||
| 488 | + "cash": 628 | ||
| 489 | + }, | ||
| 490 | + { | ||
| 491 | + "id": 123, | ||
| 492 | + "cash": 626 | ||
| 493 | + }, | ||
| 494 | + { | ||
| 495 | + "id": 124, | ||
| 496 | + "cash": 528 | ||
| 497 | + }, | ||
| 498 | + { | ||
| 499 | + "id": 125, | ||
| 500 | + "cash": 538 | ||
| 501 | + }, | ||
| 502 | + { | ||
| 503 | + "id": 126, | ||
| 504 | + "cash": 616 | ||
| 505 | + }, | ||
| 506 | + { | ||
| 507 | + "id": 127, | ||
| 508 | + "cash": 562 | ||
| 509 | + }, | ||
| 510 | + { | ||
| 511 | + "id": 128, | ||
| 512 | + "cash": 521 | ||
| 513 | + }, | ||
| 514 | + { | ||
| 515 | + "id": 129, | ||
| 516 | + "cash": 522 | ||
| 517 | + }, | ||
| 518 | + { | ||
| 519 | + "id": 130, | ||
| 520 | + "cash": 633 | ||
| 521 | + }, | ||
| 522 | + { | ||
| 523 | + "id": 131, | ||
| 524 | + "cash": 569 | ||
| 525 | + }, | ||
| 526 | + { | ||
| 527 | + "id": 132, | ||
| 528 | + "cash": 527 | ||
| 529 | + }, | ||
| 530 | + { | ||
| 531 | + "id": 133, | ||
| 532 | + "cash": 526 | ||
| 533 | + }, | ||
| 534 | + { | ||
| 535 | + "id": 134, | ||
| 536 | + "cash": 607 | ||
| 537 | + }, | ||
| 538 | + { | ||
| 539 | + "id": 135, | ||
| 540 | + "cash": 528 | ||
| 541 | + }, | ||
| 542 | + { | ||
| 543 | + "id": 136, | ||
| 544 | + "cash": 547 | ||
| 545 | + }, | ||
| 546 | + { | ||
| 547 | + "id": 137, | ||
| 548 | + "cash": 622 | ||
| 549 | + }, | ||
| 550 | + { | ||
| 551 | + "id": 138, | ||
| 552 | + "cash": 527 | ||
| 553 | + }, | ||
| 554 | + { | ||
| 555 | + "id": 139, | ||
| 556 | + "cash": 530 | ||
| 557 | + }, | ||
| 558 | + { | ||
| 559 | + "id": 140, | ||
| 560 | + "cash": 553 | ||
| 561 | + }, | ||
| 562 | + { | ||
| 563 | + "id": 141, | ||
| 564 | + "cash": 631 | ||
| 565 | + }, | ||
| 566 | + { | ||
| 567 | + "id": 142, | ||
| 568 | + "cash": 605 | ||
| 569 | + }, | ||
| 570 | + { | ||
| 571 | + "id": 143, | ||
| 572 | + "cash": 576 | ||
| 573 | + }, | ||
| 574 | + { | ||
| 575 | + "id": 144, | ||
| 576 | + "cash": 524 | ||
| 577 | + }, | ||
| 578 | + { | ||
| 579 | + "id": 145, | ||
| 580 | + "cash": 611 | ||
| 581 | + }, | ||
| 582 | + { | ||
| 583 | + "id": 146, | ||
| 584 | + "cash": 581 | ||
| 585 | + }, | ||
| 586 | + { | ||
| 587 | + "id": 147, | ||
| 588 | + "cash": 558 | ||
| 589 | + }, | ||
| 590 | + { | ||
| 591 | + "id": 148, | ||
| 592 | + "cash": 537 | ||
| 593 | + }, | ||
| 594 | + { | ||
| 595 | + "id": 149, | ||
| 596 | + "cash": 568 | ||
| 597 | + }, | ||
| 598 | + { | ||
| 599 | + "id": 150, | ||
| 600 | + "cash": 625 | ||
| 601 | + }, | ||
| 602 | + { | ||
| 603 | + "id": 151, | ||
| 604 | + "cash": 625 | ||
| 605 | + }, | ||
| 606 | + { | ||
| 607 | + "id": 152, | ||
| 608 | + "cash": 581 | ||
| 609 | + }, | ||
| 610 | + { | ||
| 611 | + "id": 153, | ||
| 612 | + "cash": 562 | ||
| 613 | + }, | ||
| 614 | + { | ||
| 615 | + "id": 154, | ||
| 616 | + "cash": 541 | ||
| 617 | + }, | ||
| 618 | + { | ||
| 619 | + "id": 155, | ||
| 620 | + "cash": 531 | ||
| 621 | + }, | ||
| 622 | + { | ||
| 623 | + "id": 156, | ||
| 624 | + "cash": 576 | ||
| 625 | + }, | ||
| 626 | + { | ||
| 627 | + "id": 157, | ||
| 628 | + "cash": 610 | ||
| 629 | + }, | ||
| 630 | + { | ||
| 631 | + "id": 158, | ||
| 632 | + "cash": 539 | ||
| 633 | + }, | ||
| 634 | + { | ||
| 635 | + "id": 159, | ||
| 636 | + "cash": 528 | ||
| 637 | + }, | ||
| 638 | + { | ||
| 639 | + "id": 160, | ||
| 640 | + "cash": 530 | ||
| 641 | + }, | ||
| 642 | + { | ||
| 643 | + "id": 161, | ||
| 644 | + "cash": 542 | ||
| 645 | + }, | ||
| 646 | + { | ||
| 647 | + "id": 162, | ||
| 648 | + "cash": 525 | ||
| 649 | + }, | ||
| 650 | + { | ||
| 651 | + "id": 163, | ||
| 652 | + "cash": 579 | ||
| 653 | + }, | ||
| 654 | + { | ||
| 655 | + "id": 164, | ||
| 656 | + "cash": 533 | ||
| 657 | + }, | ||
| 658 | + { | ||
| 659 | + "id": 165, | ||
| 660 | + "cash": 577 | ||
| 661 | + }, | ||
| 662 | + { | ||
| 663 | + "id": 166, | ||
| 664 | + "cash": 573 | ||
| 665 | + }, | ||
| 666 | + { | ||
| 667 | + "id": 167, | ||
| 668 | + "cash": 619 | ||
| 669 | + }, | ||
| 670 | + { | ||
| 671 | + "id": 168, | ||
| 672 | + "cash": 535 | ||
| 673 | + }, | ||
| 674 | + { | ||
| 675 | + "id": 169, | ||
| 676 | + "cash": 560 | ||
| 677 | + }, | ||
| 678 | + { | ||
| 679 | + "id": 170, | ||
| 680 | + "cash": 626 | ||
| 681 | + }, | ||
| 682 | + { | ||
| 683 | + "id": 171, | ||
| 684 | + "cash": 521 | ||
| 685 | + }, | ||
| 686 | + { | ||
| 687 | + "id": 172, | ||
| 688 | + "cash": 583 | ||
| 689 | + }, | ||
| 690 | + { | ||
| 691 | + "id": 173, | ||
| 692 | + "cash": 601 | ||
| 693 | + }, | ||
| 694 | + { | ||
| 695 | + "id": 174, | ||
| 696 | + "cash": 549 | ||
| 697 | + }, | ||
| 698 | + { | ||
| 699 | + "id": 175, | ||
| 700 | + "cash": 574 | ||
| 701 | + }, | ||
| 702 | + { | ||
| 703 | + "id": 176, | ||
| 704 | + "cash": 632 | ||
| 705 | + }, | ||
| 706 | + { | ||
| 707 | + "id": 177, | ||
| 708 | + "cash": 614 | ||
| 709 | + }, | ||
| 710 | + { | ||
| 711 | + "id": 178, | ||
| 712 | + "cash": 598 | ||
| 713 | + }, | ||
| 714 | + { | ||
| 715 | + "id": 179, | ||
| 716 | + "cash": 538 | ||
| 717 | + }, | ||
| 718 | + { | ||
| 719 | + "id": 180, | ||
| 720 | + "cash": 529 | ||
| 721 | + }, | ||
| 722 | + { | ||
| 723 | + "id": 181, | ||
| 724 | + "cash": 559 | ||
| 725 | + }, | ||
| 726 | + { | ||
| 727 | + "id": 182, | ||
| 728 | + "cash": 626 | ||
| 729 | + }, | ||
| 730 | + { | ||
| 731 | + "id": 183, | ||
| 732 | + "cash": 581 | ||
| 733 | + }, | ||
| 734 | + { | ||
| 735 | + "id": 184, | ||
| 736 | + "cash": 522 | ||
| 737 | + }, | ||
| 738 | + { | ||
| 739 | + "id": 185, | ||
| 740 | + "cash": 565 | ||
| 741 | + }, | ||
| 742 | + { | ||
| 743 | + "id": 186, | ||
| 744 | + "cash": 535 | ||
| 745 | + }, | ||
| 746 | + { | ||
| 747 | + "id": 187, | ||
| 748 | + "cash": 598 | ||
| 749 | + }, | ||
| 750 | + { | ||
| 751 | + "id": 188, | ||
| 752 | + "cash": 628 | ||
| 753 | + }, | ||
| 754 | + { | ||
| 755 | + "id": 189, | ||
| 756 | + "cash": 617 | ||
| 757 | + }, | ||
| 758 | + { | ||
| 759 | + "id": 190, | ||
| 760 | + "cash": 615 | ||
| 761 | + }, | ||
| 762 | + { | ||
| 763 | + "id": 191, | ||
| 764 | + "cash": 604 | ||
| 765 | + }, | ||
| 766 | + { | ||
| 767 | + "id": 192, | ||
| 768 | + "cash": 537 | ||
| 769 | + }, | ||
| 770 | + { | ||
| 771 | + "id": 193, | ||
| 772 | + "cash": 564 | ||
| 773 | + }, | ||
| 774 | + { | ||
| 775 | + "id": 194, | ||
| 776 | + "cash": 582 | ||
| 777 | + }, | ||
| 778 | + { | ||
| 779 | + "id": 195, | ||
| 780 | + "cash": 551 | ||
| 781 | + }, | ||
| 782 | + { | ||
| 783 | + "id": 196, | ||
| 784 | + "cash": 618 | ||
| 785 | + }, | ||
| 786 | + { | ||
| 787 | + "id": 197, | ||
| 788 | + "cash": 614 | ||
| 789 | + }, | ||
| 790 | + { | ||
| 791 | + "id": 198, | ||
| 792 | + "cash": 594 | ||
| 793 | + }, | ||
| 794 | + { | ||
| 795 | + "id": 199, | ||
| 796 | + "cash": 566 | ||
| 797 | + }, | ||
| 798 | + { | ||
| 799 | + "id": 200, | ||
| 800 | + "cash": 527 | ||
| 801 | + }, | ||
| 802 | + { | ||
| 803 | + "id": 201, | ||
| 804 | + "cash": 616 | ||
| 805 | + }, | ||
| 806 | + { | ||
| 807 | + "id": 202, | ||
| 808 | + "cash": 588 | ||
| 809 | + }, | ||
| 810 | + { | ||
| 811 | + "id": 203, | ||
| 812 | + "cash": 530 | ||
| 813 | + }, | ||
| 814 | + { | ||
| 815 | + "id": 204, | ||
| 816 | + "cash": 628 | ||
| 817 | + }, | ||
| 818 | + { | ||
| 819 | + "id": 205, | ||
| 820 | + "cash": 597 | ||
| 821 | + }, | ||
| 822 | + { | ||
| 823 | + "id": 206, | ||
| 824 | + "cash": 587 | ||
| 825 | + }, | ||
| 826 | + { | ||
| 827 | + "id": 207, | ||
| 828 | + "cash": 550 | ||
| 829 | + }, | ||
| 830 | + { | ||
| 831 | + "id": 208, | ||
| 832 | + "cash": 627 | ||
| 833 | + }, | ||
| 834 | + { | ||
| 835 | + "id": 209, | ||
| 836 | + "cash": 587 | ||
| 837 | + }, | ||
| 838 | + { | ||
| 839 | + "id": 210, | ||
| 840 | + "cash": 622 | ||
| 841 | + }, | ||
| 842 | + { | ||
| 843 | + "id": 211, | ||
| 844 | + "cash": 613 | ||
| 845 | + }, | ||
| 846 | + { | ||
| 847 | + "id": 212, | ||
| 848 | + "cash": 587 | ||
| 849 | + }, | ||
| 850 | + { | ||
| 851 | + "id": 213, | ||
| 852 | + "cash": 557 | ||
| 853 | + }, | ||
| 854 | + { | ||
| 855 | + "id": 214, | ||
| 856 | + "cash": 538 | ||
| 857 | + }, | ||
| 858 | + { | ||
| 859 | + "id": 215, | ||
| 860 | + "cash": 557 | ||
| 861 | + }, | ||
| 862 | + { | ||
| 863 | + "id": 216, | ||
| 864 | + "cash": 623 | ||
| 865 | + }, | ||
| 866 | + { | ||
| 867 | + "id": 217, | ||
| 868 | + "cash": 565 | ||
| 869 | + }, | ||
| 870 | + { | ||
| 871 | + "id": 218, | ||
| 872 | + "cash": 528 | ||
| 873 | + }, | ||
| 874 | + { | ||
| 875 | + "id": 219, | ||
| 876 | + "cash": 621 | ||
| 877 | + }, | ||
| 878 | + { | ||
| 879 | + "id": 220, | ||
| 880 | + "cash": 545 | ||
| 881 | + }, | ||
| 882 | + { | ||
| 883 | + "id": 221, | ||
| 884 | + "cash": 534 | ||
| 885 | + }, | ||
| 886 | + { | ||
| 887 | + "id": 222, | ||
| 888 | + "cash": 546 | ||
| 889 | + }, | ||
| 890 | + { | ||
| 891 | + "id": 223, | ||
| 892 | + "cash": 539 | ||
| 893 | + }, | ||
| 894 | + { | ||
| 895 | + "id": 224, | ||
| 896 | + "cash": 526 | ||
| 897 | + }, | ||
| 898 | + { | ||
| 899 | + "id": 225, | ||
| 900 | + "cash": 603 | ||
| 901 | + }, | ||
| 902 | + { | ||
| 903 | + "id": 226, | ||
| 904 | + "cash": 527 | ||
| 905 | + }, | ||
| 906 | + { | ||
| 907 | + "id": 227, | ||
| 908 | + "cash": 545 | ||
| 909 | + }, | ||
| 910 | + { | ||
| 911 | + "id": 228, | ||
| 912 | + "cash": 583 | ||
| 913 | + }, | ||
| 914 | + { | ||
| 915 | + "id": 229, | ||
| 916 | + "cash": 607 | ||
| 917 | + }, | ||
| 918 | + { | ||
| 919 | + "id": 230, | ||
| 920 | + "cash": 569 | ||
| 921 | + }, | ||
| 922 | + { | ||
| 923 | + "id": 231, | ||
| 924 | + "cash": 526 | ||
| 925 | + }, | ||
| 926 | + { | ||
| 927 | + "id": 232, | ||
| 928 | + "cash": 620 | ||
| 929 | + }, | ||
| 930 | + { | ||
| 931 | + "id": 233, | ||
| 932 | + "cash": 588 | ||
| 933 | + }, | ||
| 934 | + { | ||
| 935 | + "id": 234, | ||
| 936 | + "cash": 586 | ||
| 937 | + }, | ||
| 938 | + { | ||
| 939 | + "id": 235, | ||
| 940 | + "cash": 600 | ||
| 941 | + }, | ||
| 942 | + { | ||
| 943 | + "id": 236, | ||
| 944 | + "cash": 632 | ||
| 945 | + }, | ||
| 946 | + { | ||
| 947 | + "id": 237, | ||
| 948 | + "cash": 581 | ||
| 949 | + }, | ||
| 950 | + { | ||
| 951 | + "id": 238, | ||
| 952 | + "cash": 550 | ||
| 953 | + }, | ||
| 954 | + { | ||
| 955 | + "id": 239, | ||
| 956 | + "cash": 579 | ||
| 957 | + }, | ||
| 958 | + { | ||
| 959 | + "id": 240, | ||
| 960 | + "cash": 559 | ||
| 961 | + }, | ||
| 962 | + { | ||
| 963 | + "id": 241, | ||
| 964 | + "cash": 539 | ||
| 965 | + }, | ||
| 966 | + { | ||
| 967 | + "id": 242, | ||
| 968 | + "cash": 608 | ||
| 969 | + }, | ||
| 970 | + { | ||
| 971 | + "id": 243, | ||
| 972 | + "cash": 534 | ||
| 973 | + }, | ||
| 974 | + { | ||
| 975 | + "id": 244, | ||
| 976 | + "cash": 570 | ||
| 977 | + }, | ||
| 978 | + { | ||
| 979 | + "id": 245, | ||
| 980 | + "cash": 583 | ||
| 981 | + }, | ||
| 982 | + { | ||
| 983 | + "id": 246, | ||
| 984 | + "cash": 600 | ||
| 985 | + }, | ||
| 986 | + { | ||
| 987 | + "id": 247, | ||
| 988 | + "cash": 559 | ||
| 989 | + }, | ||
| 990 | + { | ||
| 991 | + "id": 248, | ||
| 992 | + "cash": 625 | ||
| 993 | + }, | ||
| 994 | + { | ||
| 995 | + "id": 249, | ||
| 996 | + "cash": 568 | ||
| 997 | + }, | ||
| 998 | + { | ||
| 999 | + "id": 250, | ||
| 1000 | + "cash": 592 | ||
| 1001 | + }, | ||
| 1002 | + { | ||
| 1003 | + "id": 251, | ||
| 1004 | + "cash": 533 | ||
| 1005 | + }, | ||
| 1006 | + { | ||
| 1007 | + "id": 252, | ||
| 1008 | + "cash": 596 | ||
| 1009 | + }, | ||
| 1010 | + { | ||
| 1011 | + "id": 253, | ||
| 1012 | + "cash": 595 | ||
| 1013 | + }, | ||
| 1014 | + { | ||
| 1015 | + "id": 254, | ||
| 1016 | + "cash": 621 | ||
| 1017 | + }, | ||
| 1018 | + { | ||
| 1019 | + "id": 255, | ||
| 1020 | + "cash": 575 | ||
| 1021 | + }, | ||
| 1022 | + { | ||
| 1023 | + "id": 256, | ||
| 1024 | + "cash": 526 | ||
| 1025 | + }, | ||
| 1026 | + { | ||
| 1027 | + "id": 257, | ||
| 1028 | + "cash": 622 | ||
| 1029 | + }, | ||
| 1030 | + { | ||
| 1031 | + "id": 258, | ||
| 1032 | + "cash": 630 | ||
| 1033 | + }, | ||
| 1034 | + { | ||
| 1035 | + "id": 259, | ||
| 1036 | + "cash": 585 | ||
| 1037 | + }, | ||
| 1038 | + { | ||
| 1039 | + "id": 260, | ||
| 1040 | + "cash": 543 | ||
| 1041 | + }, | ||
| 1042 | + { | ||
| 1043 | + "id": 261, | ||
| 1044 | + "cash": 550 | ||
| 1045 | + }, | ||
| 1046 | + { | ||
| 1047 | + "id": 262, | ||
| 1048 | + "cash": 519 | ||
| 1049 | + }, | ||
| 1050 | + { | ||
| 1051 | + "id": 263, | ||
| 1052 | + "cash": 522 | ||
| 1053 | + }, | ||
| 1054 | + { | ||
| 1055 | + "id": 264, | ||
| 1056 | + "cash": 563 | ||
| 1057 | + }, | ||
| 1058 | + { | ||
| 1059 | + "id": 265, | ||
| 1060 | + "cash": 544 | ||
| 1061 | + }, | ||
| 1062 | + { | ||
| 1063 | + "id": 266, | ||
| 1064 | + "cash": 630 | ||
| 1065 | + }, | ||
| 1066 | + { | ||
| 1067 | + "id": 267, | ||
| 1068 | + "cash": 544 | ||
| 1069 | + }, | ||
| 1070 | + { | ||
| 1071 | + "id": 268, | ||
| 1072 | + "cash": 607 | ||
| 1073 | + }, | ||
| 1074 | + { | ||
| 1075 | + "id": 269, | ||
| 1076 | + "cash": 592 | ||
| 1077 | + }, | ||
| 1078 | + { | ||
| 1079 | + "id": 270, | ||
| 1080 | + "cash": 558 | ||
| 1081 | + }, | ||
| 1082 | + { | ||
| 1083 | + "id": 271, | ||
| 1084 | + "cash": 593 | ||
| 1085 | + }, | ||
| 1086 | + { | ||
| 1087 | + "id": 272, | ||
| 1088 | + "cash": 608 | ||
| 1089 | + }, | ||
| 1090 | + { | ||
| 1091 | + "id": 273, | ||
| 1092 | + "cash": 520 | ||
| 1093 | + }, | ||
| 1094 | + { | ||
| 1095 | + "id": 274, | ||
| 1096 | + "cash": 578 | ||
| 1097 | + }, | ||
| 1098 | + { | ||
| 1099 | + "id": 275, | ||
| 1100 | + "cash": 613 | ||
| 1101 | + }, | ||
| 1102 | + { | ||
| 1103 | + "id": 276, | ||
| 1104 | + "cash": 614 | ||
| 1105 | + }, | ||
| 1106 | + { | ||
| 1107 | + "id": 277, | ||
| 1108 | + "cash": 580 | ||
| 1109 | + }, | ||
| 1110 | + { | ||
| 1111 | + "id": 278, | ||
| 1112 | + "cash": 552 | ||
| 1113 | + }, | ||
| 1114 | + { | ||
| 1115 | + "id": 279, | ||
| 1116 | + "cash": 590 | ||
| 1117 | + }, | ||
| 1118 | + { | ||
| 1119 | + "id": 280, | ||
| 1120 | + "cash": 567 | ||
| 1121 | + }, | ||
| 1122 | + { | ||
| 1123 | + "id": 281, | ||
| 1124 | + "cash": 561 | ||
| 1125 | + }, | ||
| 1126 | + { | ||
| 1127 | + "id": 282, | ||
| 1128 | + "cash": 631 | ||
| 1129 | + }, | ||
| 1130 | + { | ||
| 1131 | + "id": 283, | ||
| 1132 | + "cash": 599 | ||
| 1133 | + }, | ||
| 1134 | + { | ||
| 1135 | + "id": 284, | ||
| 1136 | + "cash": 519 | ||
| 1137 | + }, | ||
| 1138 | + { | ||
| 1139 | + "id": 285, | ||
| 1140 | + "cash": 549 | ||
| 1141 | + }, | ||
| 1142 | + { | ||
| 1143 | + "id": 286, | ||
| 1144 | + "cash": 588 | ||
| 1145 | + }, | ||
| 1146 | + { | ||
| 1147 | + "id": 287, | ||
| 1148 | + "cash": 607 | ||
| 1149 | + }, | ||
| 1150 | + { | ||
| 1151 | + "id": 288, | ||
| 1152 | + "cash": 611 | ||
| 1153 | + }, | ||
| 1154 | + { | ||
| 1155 | + "id": 289, | ||
| 1156 | + "cash": 629 | ||
| 1157 | + }, | ||
| 1158 | + { | ||
| 1159 | + "id": 290, | ||
| 1160 | + "cash": 570 | ||
| 1161 | + }, | ||
| 1162 | + { | ||
| 1163 | + "id": 291, | ||
| 1164 | + "cash": 579 | ||
| 1165 | + }, | ||
| 1166 | + { | ||
| 1167 | + "id": 292, | ||
| 1168 | + "cash": 602 | ||
| 1169 | + }, | ||
| 1170 | + { | ||
| 1171 | + "id": 293, | ||
| 1172 | + "cash": 534 | ||
| 1173 | + }, | ||
| 1174 | + { | ||
| 1175 | + "id": 294, | ||
| 1176 | + "cash": 521 | ||
| 1177 | + }, | ||
| 1178 | + { | ||
| 1179 | + "id": 295, | ||
| 1180 | + "cash": 586 | ||
| 1181 | + }, | ||
| 1182 | + { | ||
| 1183 | + "id": 296, | ||
| 1184 | + "cash": 604 | ||
| 1185 | + }, | ||
| 1186 | + { | ||
| 1187 | + "id": 297, | ||
| 1188 | + "cash": 561 | ||
| 1189 | + }, | ||
| 1190 | + { | ||
| 1191 | + "id": 298, | ||
| 1192 | + "cash": 550 | ||
| 1193 | + }, | ||
| 1194 | + { | ||
| 1195 | + "id": 299, | ||
| 1196 | + "cash": 522 | ||
| 1197 | + }, | ||
| 1198 | + { | ||
| 1199 | + "id": 300, | ||
| 1200 | + "cash": 518 | ||
| 1201 | + } | ||
| 1202 | +] | ||
| 0 | \ No newline at end of file | 1203 | \ No newline at end of file |
src/HttpServer/jsonconf/WithdrawConfig.json
| 1 | [ | 1 | [ |
| 2 | { | 2 | { |
| 3 | - "id": 1, | ||
| 4 | - "money": 0.3, | ||
| 5 | - "coin": 3000, | ||
| 6 | - "task": 0, | ||
| 7 | - "level": 2, | ||
| 8 | - "new": 0, | ||
| 9 | - "day": 1 | ||
| 10 | - }, | ||
| 11 | - { | ||
| 12 | - "id": 2, | ||
| 13 | - "money": 0.5, | ||
| 14 | - "coin": 5000, | ||
| 15 | - "task": 1, | ||
| 16 | - "level": 4, | ||
| 17 | - "new": 0, | ||
| 18 | - "day": 2 | ||
| 19 | - }, | ||
| 20 | - { | ||
| 21 | "id": 3, | 3 | "id": 3, |
| 22 | - "money": 1, | ||
| 23 | - "coin": 10000, | 4 | + "money": 200, |
| 5 | + "coin": 2000000, | ||
| 24 | "task": 2, | 6 | "task": 2, |
| 25 | - "level": 7, | 7 | + "level": 0, |
| 26 | "new": 0, | 8 | "new": 0, |
| 27 | - "day": 5 | 9 | + "day": 0 |
| 28 | }, | 10 | }, |
| 29 | { | 11 | { |
| 30 | "id": 4, | 12 | "id": 4, |
| 31 | - "money": 1.5, | ||
| 32 | - "coin": 15000, | 13 | + "money": 300, |
| 14 | + "coin": 3000000, | ||
| 33 | "task": 3, | 15 | "task": 3, |
| 34 | - "level": 9, | 16 | + "level": 0, |
| 35 | "new": 0, | 17 | "new": 0, |
| 36 | - "day": 8 | 18 | + "day": 0 |
| 37 | }, | 19 | }, |
| 38 | { | 20 | { |
| 39 | "id": 5, | 21 | "id": 5, |
| 40 | - "money": 2, | ||
| 41 | - "coin": 20000, | 22 | + "money": 400, |
| 23 | + "coin": 4000000, | ||
| 42 | "task": 4, | 24 | "task": 4, |
| 43 | - "level": 12, | 25 | + "level": 0, |
| 44 | "new": 0, | 26 | "new": 0, |
| 45 | - "day": 15 | 27 | + "day": 0 |
| 46 | }, | 28 | }, |
| 47 | { | 29 | { |
| 48 | "id": 6, | 30 | "id": 6, |
| 49 | - "money": 3, | ||
| 50 | - "coin": 30000, | 31 | + "money": 500, |
| 32 | + "coin": 5000000, | ||
| 51 | "task": 5, | 33 | "task": 5, |
| 52 | - "level": 15, | ||
| 53 | - "new": 0, | ||
| 54 | - "day": 20 | ||
| 55 | - }, | ||
| 56 | - { | ||
| 57 | - "id": 7, | ||
| 58 | - "money": 100, | ||
| 59 | - "coin": 10000000, | ||
| 60 | - "task": 6, | ||
| 61 | - "level": 25, | 34 | + "level": 0, |
| 62 | "new": 0, | 35 | "new": 0, |
| 63 | "day": 0 | 36 | "day": 0 |
| 64 | } | 37 | } |
src/HttpServer/jsonconf/jsonconf.go
| @@ -77,6 +77,11 @@ type ActiveWithdrawConfigDesc struct { | @@ -77,6 +77,11 @@ type ActiveWithdrawConfigDesc struct { | ||
| 77 | Day int `json:"day"` | 77 | Day int `json:"day"` |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | +type RedpacketConfigDesc struct { | ||
| 81 | + Id int `json:"id"` | ||
| 82 | + Cash int `json:"cash"` | ||
| 83 | +} | ||
| 84 | + | ||
| 80 | type GameConfig struct { | 85 | type GameConfig struct { |
| 81 | AchieventConfig []AchieveDesc | 86 | AchieventConfig []AchieveDesc |
| 82 | TaskConfig []AchieveDesc | 87 | TaskConfig []AchieveDesc |
| @@ -86,6 +91,7 @@ type GameConfig struct { | @@ -86,6 +91,7 @@ type GameConfig struct { | ||
| 86 | WithDrawConfig []WithDrawDesc | 91 | WithDrawConfig []WithDrawDesc |
| 87 | SignConfig SignConfigDesc | 92 | SignConfig SignConfigDesc |
| 88 | ActiveWithdrawConfig []ActiveWithdrawConfigDesc | 93 | ActiveWithdrawConfig []ActiveWithdrawConfigDesc |
| 94 | + RedpacketConfig []RedpacketConfigDesc | ||
| 89 | } | 95 | } |
| 90 | 96 | ||
| 91 | func GetJsonConf() *GameConfig { | 97 | func GetJsonConf() *GameConfig { |
| @@ -241,6 +247,34 @@ func LoadJsonConf() error { | @@ -241,6 +247,34 @@ func LoadJsonConf() error { | ||
| 241 | return err | 247 | return err |
| 242 | } | 248 | } |
| 243 | 249 | ||
| 250 | + path = "../jsonconf/RedConfig.json" | ||
| 251 | + content, err = file_get_contents(path) | ||
| 252 | + if err != nil { | ||
| 253 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 254 | + return err | ||
| 255 | + } | ||
| 256 | + | ||
| 257 | + err = json.Unmarshal([]byte(content), &g_jsonconf.RedpacketConfig) | ||
| 258 | + if err != nil { | ||
| 259 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 260 | + return err | ||
| 261 | + } | ||
| 262 | + | ||
| 244 | logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) | 263 | logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) |
| 245 | return err | 264 | return err |
| 246 | } | 265 | } |
| 266 | + | ||
| 267 | + | ||
| 268 | +func GetRedpacketNum(id int) int { | ||
| 269 | + if len(g_jsonconf.RedpacketConfig) == 0 { | ||
| 270 | + logger.Error("GetRedpacketNum error") | ||
| 271 | + return 0 | ||
| 272 | + } | ||
| 273 | + for _, val := range g_jsonconf.RedpacketConfig { | ||
| 274 | + if val.Id == id { | ||
| 275 | + return val.Cash | ||
| 276 | + } | ||
| 277 | + } | ||
| 278 | + | ||
| 279 | + return g_jsonconf.RedpacketConfig[len(g_jsonconf.RedpacketConfig)-1].Cash | ||
| 280 | +} | ||
| 247 | \ No newline at end of file | 281 | \ No newline at end of file |
src/HttpServer/logic/constdef.go
src/HttpServer/logic/datadef.go
| @@ -25,6 +25,7 @@ type UserLoginData struct { | @@ -25,6 +25,7 @@ type UserLoginData struct { | ||
| 25 | Userexp int `json:"userexp"` | 25 | Userexp int `json:"userexp"` |
| 26 | Sumloginday int `json:"sumloginday"` | 26 | Sumloginday int `json:"sumloginday"` |
| 27 | Shakeleftcnt int `json:"shakeleftcnt"` | 27 | Shakeleftcnt int `json:"shakeleftcnt"` |
| 28 | + IsNew int `json:"isnew"` | ||
| 28 | } | 29 | } |
| 29 | 30 | ||
| 30 | type UserLoginResp struct { | 31 | type UserLoginResp struct { |
| @@ -109,6 +110,7 @@ type DrawguangoldData struct { | @@ -109,6 +110,7 @@ type DrawguangoldData struct { | ||
| 109 | Guangold int `json:"guangold"` | 110 | Guangold int `json:"guangold"` |
| 110 | Wallgold int `json:"wallgold"` | 111 | Wallgold int `json:"wallgold"` |
| 111 | Totalfetchcnt int `json:"totalfetchcnt"` | 112 | Totalfetchcnt int `json:"totalfetchcnt"` |
| 113 | + Getgoldnum int `json:"getgoldnum"` | ||
| 112 | } | 114 | } |
| 113 | 115 | ||
| 114 | type DrawguangoldResp struct { | 116 | type DrawguangoldResp struct { |
| @@ -204,6 +206,7 @@ type GettaskrewardData struct { | @@ -204,6 +206,7 @@ type GettaskrewardData struct { | ||
| 204 | Swapitem int `json:"swapitem"` | 206 | Swapitem int `json:"swapitem"` |
| 205 | Eliminitem int `json:"eliminitem"` | 207 | Eliminitem int `json:"eliminitem"` |
| 206 | Goldnum int `json:"goldnum"` | 208 | Goldnum int `json:"goldnum"` |
| 209 | + Addgold int `json:"addgold"` | ||
| 207 | } | 210 | } |
| 208 | type GettaskrewardResp struct { | 211 | type GettaskrewardResp struct { |
| 209 | Code int `json:"code"` | 212 | Code int `json:"code"` |
| @@ -286,6 +289,21 @@ type ReadNumUploadResp struct { | @@ -286,6 +289,21 @@ type ReadNumUploadResp struct { | ||
| 286 | Timestamp int `json:"timestamp"` | 289 | Timestamp int `json:"timestamp"` |
| 287 | } | 290 | } |
| 288 | 291 | ||
| 292 | +type FetchredbagReq struct { | ||
| 293 | + Gameid string `json:"gameid"` | ||
| 294 | + Channel string `json:"channel"` | ||
| 295 | +} | ||
| 296 | + | ||
| 297 | +type FetchredbagData struct { | ||
| 298 | + Getgoldnum int `json:"getgoldnum"` | ||
| 299 | + Walletgold int `json:"walletgold"` | ||
| 300 | +} | ||
| 301 | +type FetchredbagResp struct { | ||
| 302 | + Code int `json:"code"` | ||
| 303 | + Message string `json:"message"` | ||
| 304 | + Data FetchredbagData `json:"data"` | ||
| 305 | +} | ||
| 306 | + | ||
| 289 | //********************************************************************************************************** | 307 | //********************************************************************************************************** |
| 290 | 308 | ||
| 291 | type TaskListDesc struct { | 309 | type TaskListDesc struct { |
| @@ -296,6 +314,7 @@ type TaskListDesc struct { | @@ -296,6 +314,7 @@ type TaskListDesc struct { | ||
| 296 | 314 | ||
| 297 | type TaskList struct { | 315 | type TaskList struct { |
| 298 | Taskdata []TaskListDesc `json:"taskdata"` | 316 | Taskdata []TaskListDesc `json:"taskdata"` |
| 317 | + Fetchrdnum int `json:"fetchrdnum"` | ||
| 299 | } | 318 | } |
| 300 | 319 | ||
| 301 | //其中提取次数和当日登陆在userdata中记录 | 320 | //其中提取次数和当日登陆在userdata中记录 |
| @@ -382,7 +401,10 @@ type UserData struct { | @@ -382,7 +401,10 @@ type UserData struct { | ||
| 382 | UpLvCostTime int //上一个等级升级时间 | 401 | UpLvCostTime int //上一个等级升级时间 |
| 383 | UpLvCostTimeSec int //上一个等级升级的时间点时刻 | 402 | UpLvCostTimeSec int //上一个等级升级的时间点时刻 |
| 384 | ReadNum int //玩家微转发阅读量 | 403 | ReadNum int //玩家微转发阅读量 |
| 385 | - GetCashCnt int //当天提现次数 | 404 | + GetCashCnt int //当天提 |
| 405 | + FetchRedCnt int //领取红包次数计数 | ||
| 406 | + IsNew int //新手状态// 现次数 | ||
| 407 | + FetchRdBagNum int //当天已领的红包 | ||
| 386 | ShakeTime int //摇一摇 | 408 | ShakeTime int //摇一摇 |
| 387 | WithDraw WithDrawInfo //提现记录信息 | 409 | WithDraw WithDrawInfo //提现记录信息 |
| 388 | //SpecialWithDraw WithDrawInfo //活跃提现记录信息 | 410 | //SpecialWithDraw WithDrawInfo //活跃提现记录信息 |
src/HttpServer/logic/function.go
| @@ -419,7 +419,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | @@ -419,7 +419,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | ||
| 419 | for i := 0; i < sub; i++ { | 419 | for i := 0; i < sub; i++ { |
| 420 | rtype := cfg.Reward[i*2] | 420 | rtype := cfg.Reward[i*2] |
| 421 | rnum := cfg.Reward[i*2+1] | 421 | rnum := cfg.Reward[i*2+1] |
| 422 | - r1, r2, r3, r4, r5, r6, r7 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel, uuid) | 422 | + r1, r2, r3, r4, r5, r6, r7,r8 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel, uuid) |
| 423 | if resp.Data.Lv != r1 { | 423 | if resp.Data.Lv != r1 { |
| 424 | resp.Data.Lv = r1 | 424 | resp.Data.Lv = r1 |
| 425 | resp.Data.Costtime = uinfo.UpLvCostTime / 3600 | 425 | resp.Data.Costtime = uinfo.UpLvCostTime / 3600 |
| @@ -430,20 +430,41 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | @@ -430,20 +430,41 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | ||
| 430 | resp.Data.Swapitem += r5 | 430 | resp.Data.Swapitem += r5 |
| 431 | resp.Data.Eliminitem += r6 | 431 | resp.Data.Eliminitem += r6 |
| 432 | resp.Data.Goldnum = r7 | 432 | resp.Data.Goldnum = r7 |
| 433 | + resp.Data.Goldnum = r8 | ||
| 433 | } | 434 | } |
| 434 | 435 | ||
| 435 | return nil | 436 | return nil |
| 436 | } | 437 | } |
| 437 | 438 | ||
| 438 | -func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel string, uuid int) (int, int, int, int, int, int, int) { | 439 | +//领取红包 按次数计算 |
| 440 | +func (uinfo *UserData) FetchRedPacket(gameid string, channel string, uuid int) int { | ||
| 441 | + uinfo.FetchRedCnt++ | ||
| 442 | + addgold := jsonconf.GetRedpacketNum(uinfo.FetchRedCnt) | ||
| 443 | + if addgold == 0 { | ||
| 444 | + logger.Error("FetchRedPacket failed addgold=0") | ||
| 445 | + return 0 | ||
| 446 | + } | ||
| 447 | + | ||
| 448 | + goldnum, realaddnum, err := AddCoinToSdk(uuid, addgold, gameid, channel, 102) | ||
| 449 | + if err != nil { | ||
| 450 | + logger.Error("RewardUser failer err=%v", err) | ||
| 451 | + } | ||
| 452 | + uinfo.RealGold = goldnum | ||
| 453 | + | ||
| 454 | + uniqueid := strconv.Itoa(uuid) + channel | ||
| 455 | + SaveUserInfo(uinfo, uniqueid) | ||
| 456 | + return realaddnum | ||
| 457 | +} | ||
| 458 | + | ||
| 459 | +func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel string, uuid int) (int, int, int, int, int, int, int,int) { | ||
| 439 | logger.Info("RewardUser rtype=%v,num=%v", rtype, num) | 460 | logger.Info("RewardUser rtype=%v,num=%v", rtype, num) |
| 440 | switch rtype { | 461 | switch rtype { |
| 441 | case REWARDTYPE_STAR: | 462 | case REWARDTYPE_STAR: |
| 442 | - return 0, num, 0, 0, 0, 0, 0 | 463 | + return 0, num, 0, 0, 0, 0, 0,0 |
| 443 | case REWARDTYPE_CHUI: | 464 | case REWARDTYPE_CHUI: |
| 444 | - return 0, 0, num, 0, 0, 0, 0 | 465 | + return 0, 0, num, 0, 0, 0, 0,0 |
| 445 | case REWARDTYPE_SHUA: | 466 | case REWARDTYPE_SHUA: |
| 446 | - return 0, 0, 0, num, 0, 0, 0 | 467 | + return 0, 0, 0, num, 0, 0, 0,0 |
| 447 | /*case REWARDTYPE_SWAP: | 468 | /*case REWARDTYPE_SWAP: |
| 448 | return 0, 0, 0, 0, num, 0, 0 | 469 | return 0, 0, 0, 0, num, 0, 0 |
| 449 | case REWARDTYPE_ELIMITE: | 470 | case REWARDTYPE_ELIMITE: |
| @@ -451,22 +472,24 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str | @@ -451,22 +472,24 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str | ||
| 451 | case REWARDTYPE_EXP: | 472 | case REWARDTYPE_EXP: |
| 452 | isup := uinfo.AddUserExp(num) | 473 | isup := uinfo.AddUserExp(num) |
| 453 | if isup { | 474 | if isup { |
| 454 | - return uinfo.Lv, 0, 0, 0, 0, 0, 0 | 475 | + return uinfo.Lv, 0, 0, 0, 0, 0, 0,0 |
| 455 | } else { | 476 | } else { |
| 456 | - return 0, 0, 0, 0, 0, 0, 0 | 477 | + return 0, 0, 0, 0, 0, 0, 0,0 |
| 457 | } | 478 | } |
| 458 | case REWARDTYPE_GOLD: | 479 | case REWARDTYPE_GOLD: |
| 459 | - goldnum, err := AddCoinToSdk(uuid, num, gameid, channel, 102) | 480 | + goldnum,readadd, err := AddCoinToSdk(uuid, num, gameid, channel, 102) |
| 460 | if err != nil { | 481 | if err != nil { |
| 461 | logger.Error("RewardUser failer err=%v", err) | 482 | logger.Error("RewardUser failer err=%v", err) |
| 462 | } | 483 | } |
| 463 | uinfo.RealGold = goldnum | 484 | uinfo.RealGold = goldnum |
| 464 | //uinfo.RealGold += num | 485 | //uinfo.RealGold += num |
| 465 | - return 0, 0, 0, 0, 0, 0, uinfo.RealGold | 486 | + return 0, 0, 0, 0, 0, 0, uinfo.RealGold,readadd |
| 487 | + case REWARDTYPE_REDBAG: | ||
| 488 | + return 0, 0, 0, 0, 0, 0, 0, 0 | ||
| 466 | default: | 489 | default: |
| 467 | - return 0, 0, 0, 0, 0, 0, 0 | 490 | + return 0, 0, 0, 0, 0, 0, 0,0 |
| 468 | } | 491 | } |
| 469 | - return 0, 0, 0, 0, 0, 0, 0 | 492 | + return 0, 0, 0, 0, 0, 0, 0,0 |
| 470 | } | 493 | } |
| 471 | 494 | ||
| 472 | func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid string) error { | 495 | func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid string) error { |
| @@ -490,6 +513,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | @@ -490,6 +513,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | ||
| 490 | initdata.UpLvCostTime = 0 | 513 | initdata.UpLvCostTime = 0 |
| 491 | initdata.UpLvCostTimeSec = int(time.Now().Unix()) | 514 | initdata.UpLvCostTimeSec = int(time.Now().Unix()) |
| 492 | initdata.ShakeTime = SHAKELIMIT | 515 | initdata.ShakeTime = SHAKELIMIT |
| 516 | + initdata.IsNew = 1 | ||
| 493 | 517 | ||
| 494 | for _, val := range jsonconf.GetJsonConf().WithDrawConfig { | 518 | for _, val := range jsonconf.GetJsonConf().WithDrawConfig { |
| 495 | var tmp WithDrawDesc | 519 | var tmp WithDrawDesc |
| @@ -534,6 +558,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | @@ -534,6 +558,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | ||
| 534 | resp.Data.Userexp = initdata.Exp | 558 | resp.Data.Userexp = initdata.Exp |
| 535 | resp.Data.Sumloginday = initdata.SumLoginDay | 559 | resp.Data.Sumloginday = initdata.SumLoginDay |
| 536 | resp.Data.Shakeleftcnt = initdata.ShakeTime | 560 | resp.Data.Shakeleftcnt = initdata.ShakeTime |
| 561 | + resp.Data.IsNew = initdata.IsNew | ||
| 537 | 562 | ||
| 538 | err := SaveUserInfo(&initdata, uniqueuid) | 563 | err := SaveUserInfo(&initdata, uniqueuid) |
| 539 | if err != nil { | 564 | if err != nil { |
| @@ -705,6 +730,8 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | @@ -705,6 +730,8 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | ||
| 705 | u.Task.PassLevel = 0 | 730 | u.Task.PassLevel = 0 |
| 706 | u.Task.UseItemCnt = 0 | 731 | u.Task.UseItemCnt = 0 |
| 707 | u.Task.PlaySmall = 0 | 732 | u.Task.PlaySmall = 0 |
| 733 | + u.FetchRdBagNum = 0 | ||
| 734 | + u.ShakeTime = SHAKELIMIT | ||
| 708 | 735 | ||
| 709 | //任务也需要处理 | 736 | //任务也需要处理 |
| 710 | /*tasklist, err := GetTaskInfo(u.Userid, 1) | 737 | /*tasklist, err := GetTaskInfo(u.Userid, 1) |
| @@ -894,7 +921,8 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | @@ -894,7 +921,8 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | ||
| 894 | 921 | ||
| 895 | //处理一下领取等级奖励金币 | 922 | //处理一下领取等级奖励金币 |
| 896 | if data.LvRewardGet == 1 { | 923 | if data.LvRewardGet == 1 { |
| 897 | - cfg := GetUserLvConfig(data.Lv) | 924 | + //等级红包作废 |
| 925 | + /*cfg := GetUserLvConfig(data.Lv) | ||
| 898 | if cfg != nil { | 926 | if cfg != nil { |
| 899 | gold, err := AddCoinToSdk(uuid, cfg.Cash, req.Gameid, req.Channel, 101) | 927 | gold, err := AddCoinToSdk(uuid, cfg.Cash, req.Gameid, req.Channel, 101) |
| 900 | if err != nil { | 928 | if err != nil { |
| @@ -904,7 +932,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | @@ -904,7 +932,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | ||
| 904 | } | 932 | } |
| 905 | } | 933 | } |
| 906 | data.LvRewardGet = 2 | 934 | data.LvRewardGet = 2 |
| 907 | - | 935 | + */ |
| 908 | } | 936 | } |
| 909 | 937 | ||
| 910 | SaveUserInfo(data, uniqueuid) | 938 | SaveUserInfo(data, uniqueuid) |
| @@ -918,6 +946,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | @@ -918,6 +946,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | ||
| 918 | resp.Data.Userexp = data.Exp | 946 | resp.Data.Userexp = data.Exp |
| 919 | resp.Data.Sumloginday = data.SumLoginDay | 947 | resp.Data.Sumloginday = data.SumLoginDay |
| 920 | resp.Data.Shakeleftcnt = data.ShakeTime | 948 | resp.Data.Shakeleftcnt = data.ShakeTime |
| 949 | + resp.Data.IsNew = data.IsNew | ||
| 921 | return nil | 950 | return nil |
| 922 | } | 951 | } |
| 923 | 952 | ||
| @@ -1155,7 +1184,19 @@ func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) { | @@ -1155,7 +1184,19 @@ func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) { | ||
| 1155 | return resp.Data.Mycoin, nil | 1184 | return resp.Data.Mycoin, nil |
| 1156 | } | 1185 | } |
| 1157 | 1186 | ||
| 1158 | -func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype int) (int, error) { | 1187 | +func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype int) (int,int, error) { |
| 1188 | + //处理一下实际增加值 | ||
| 1189 | + realaddgoldnum := goldnum | ||
| 1190 | + newnum, err := GetCoinFromSdk(uuid, gameid, channel) | ||
| 1191 | + if err != nil { | ||
| 1192 | + logger.Error("AddCoinToSdk failed=%v", err) | ||
| 1193 | + return 0, 0, err | ||
| 1194 | + } | ||
| 1195 | + | ||
| 1196 | + if newnum >= 950000 { | ||
| 1197 | + realaddgoldnum = 1 | ||
| 1198 | + } | ||
| 1199 | + | ||
| 1159 | SERVERKEY := XIAOXINGXING_SERVERKEYTEST | 1200 | SERVERKEY := XIAOXINGXING_SERVERKEYTEST |
| 1160 | if gameid == "1015" { | 1201 | if gameid == "1015" { |
| 1161 | SERVERKEY = XIAOXINGXING_SERVERKEYTEST_1015 | 1202 | SERVERKEY = XIAOXINGXING_SERVERKEYTEST_1015 |
| @@ -1177,7 +1218,7 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | @@ -1177,7 +1218,7 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | ||
| 1177 | paramlist = append(paramlist, pchannel) | 1218 | paramlist = append(paramlist, pchannel) |
| 1178 | puid := "uid=" + strconv.Itoa(uuid) | 1219 | puid := "uid=" + strconv.Itoa(uuid) |
| 1179 | paramlist = append(paramlist, puid) | 1220 | paramlist = append(paramlist, puid) |
| 1180 | - pcoin := "coin=" + strconv.Itoa(goldnum) | 1221 | + pcoin := "coin=" + strconv.Itoa(realaddgoldnum) |
| 1181 | paramlist = append(paramlist, pcoin) | 1222 | paramlist = append(paramlist, pcoin) |
| 1182 | ptyp := "typ=" + strconv.Itoa(atype) | 1223 | ptyp := "typ=" + strconv.Itoa(atype) |
| 1183 | paramlist = append(paramlist, ptyp) | 1224 | paramlist = append(paramlist, ptyp) |
| @@ -1193,7 +1234,7 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | @@ -1193,7 +1234,7 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | ||
| 1193 | var req AddCoinDesc | 1234 | var req AddCoinDesc |
| 1194 | req.Channel = channel | 1235 | req.Channel = channel |
| 1195 | req.Gameid = gameid | 1236 | req.Gameid = gameid |
| 1196 | - req.Coin = goldnum | 1237 | + req.Coin = realaddgoldnum |
| 1197 | req.Sign = sign | 1238 | req.Sign = sign |
| 1198 | req.Sign_type = "md5" | 1239 | req.Sign_type = "md5" |
| 1199 | req.Time_stamp = strconv.Itoa(int(time.Now().Unix())) | 1240 | req.Time_stamp = strconv.Itoa(int(time.Now().Unix())) |
| @@ -1203,12 +1244,12 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | @@ -1203,12 +1244,12 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | ||
| 1203 | bys, err := json.Marshal(&req) | 1244 | bys, err := json.Marshal(&req) |
| 1204 | if err != nil { | 1245 | if err != nil { |
| 1205 | logger.Error("AddCoinToSdk failed=%v", err) | 1246 | logger.Error("AddCoinToSdk failed=%v", err) |
| 1206 | - return 0, err | 1247 | + return 0,realaddgoldnum, err |
| 1207 | } | 1248 | } |
| 1208 | res, err := DoHttpPost(bys, "api/server/addcoin") | 1249 | res, err := DoHttpPost(bys, "api/server/addcoin") |
| 1209 | if err != nil { | 1250 | if err != nil { |
| 1210 | logger.Error("AddCoinToSdk failed=%v", err) | 1251 | logger.Error("AddCoinToSdk failed=%v", err) |
| 1211 | - return 0, err | 1252 | + return 0,realaddgoldnum, err |
| 1212 | } | 1253 | } |
| 1213 | 1254 | ||
| 1214 | logger.Info("AddCoinToSdk res=%v", res) | 1255 | logger.Info("AddCoinToSdk res=%v", res) |
| @@ -1216,15 +1257,15 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | @@ -1216,15 +1257,15 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in | ||
| 1216 | err = json.Unmarshal([]byte(res), &resp) | 1257 | err = json.Unmarshal([]byte(res), &resp) |
| 1217 | if err != nil { | 1258 | if err != nil { |
| 1218 | logger.Error("AddCoinToSdk failed=%v", err) | 1259 | logger.Error("AddCoinToSdk failed=%v", err) |
| 1219 | - return 0, err | 1260 | + return 0,realaddgoldnum, err |
| 1220 | } | 1261 | } |
| 1221 | 1262 | ||
| 1222 | if resp.Code != "0" { | 1263 | if resp.Code != "0" { |
| 1223 | gold, _ := GetCoinFromSdk(uuid, gameid, channel) | 1264 | gold, _ := GetCoinFromSdk(uuid, gameid, channel) |
| 1224 | logger.Error("AddCoinToSdk failed=%v", resp.Msg) | 1265 | logger.Error("AddCoinToSdk failed=%v", resp.Msg) |
| 1225 | - return gold, err | 1266 | + return gold, realaddgoldnum,err |
| 1226 | } | 1267 | } |
| 1227 | - return resp.Data.Mycoin, nil | 1268 | + return resp.Data.Mycoin,realaddgoldnum, nil |
| 1228 | } | 1269 | } |
| 1229 | 1270 | ||
| 1230 | func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, headurl, ver string, checkcoin int) (int, error) { | 1271 | func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, headurl, ver string, checkcoin int) (int, error) { |
src/HttpServer/logic/httpserver.go
| @@ -61,6 +61,7 @@ func startServerHttpServe() { | @@ -61,6 +61,7 @@ func startServerHttpServe() { | ||
| 61 | http.HandleFunc("/eliminatestar/getnewlevelreward", Getnewlevelreward) //领取任务或者成就奖励 | 61 | http.HandleFunc("/eliminatestar/getnewlevelreward", Getnewlevelreward) //领取任务或者成就奖励 |
| 62 | http.HandleFunc("/eliminatestar/querysigndata", Querysigndata) //获取签到数据 | 62 | http.HandleFunc("/eliminatestar/querysigndata", Querysigndata) //获取签到数据 |
| 63 | http.HandleFunc("/eliminatestar/usersign", Usersign) //玩家签到 | 63 | http.HandleFunc("/eliminatestar/usersign", Usersign) //玩家签到 |
| 64 | + http.HandleFunc("/eliminatestar/fetchredbag", Fetchredbag) //领取红包 | ||
| 64 | // | 65 | // |
| 65 | http.HandleFunc("/eliminatestar/readNumUpload", ReadNumUpload) //阅读量上报 | 66 | http.HandleFunc("/eliminatestar/readNumUpload", ReadNumUpload) //阅读量上报 |
| 66 | http.HandleFunc("/eliminatestar/queryreadgold", QueryReadGold) //获取微转发金币数 | 67 | http.HandleFunc("/eliminatestar/queryreadgold", QueryReadGold) //获取微转发金币数 |
| @@ -120,6 +121,27 @@ func ReadNumUpload(w http.ResponseWriter, r *http.Request) { | @@ -120,6 +121,27 @@ func ReadNumUpload(w http.ResponseWriter, r *http.Request) { | ||
| 120 | HandlerReadNumUpload(w, s) | 121 | HandlerReadNumUpload(w, s) |
| 121 | } | 122 | } |
| 122 | 123 | ||
| 124 | +func Fetchredbag(w http.ResponseWriter, r *http.Request) { | ||
| 125 | + | ||
| 126 | + Uuid := 0 | ||
| 127 | + if len(r.Header) > 0 { | ||
| 128 | + Uuid, _ = strconv.Atoi(r.Header.Get("Uuid")) | ||
| 129 | + } | ||
| 130 | + | ||
| 131 | + if Uuid == 0 { | ||
| 132 | + SetHeader(w) | ||
| 133 | + //logger.Error("Uuid is nil!") | ||
| 134 | + return | ||
| 135 | + } | ||
| 136 | + result, _ := ioutil.ReadAll(r.Body) | ||
| 137 | + r.Body.Close() | ||
| 138 | + | ||
| 139 | + s := string(result) | ||
| 140 | + logger.Info("Fetchredbag , body:%v,uuid=%v", s, Uuid) | ||
| 141 | + | ||
| 142 | + HandlerFetchredbag(w, s, Uuid) | ||
| 143 | +} | ||
| 144 | + | ||
| 123 | func Usersign(w http.ResponseWriter, r *http.Request) { | 145 | func Usersign(w http.ResponseWriter, r *http.Request) { |
| 124 | 146 | ||
| 125 | Uuid := 0 | 147 | Uuid := 0 |
| @@ -260,7 +282,7 @@ func Addcoin(w http.ResponseWriter, r *http.Request) { | @@ -260,7 +282,7 @@ func Addcoin(w http.ResponseWriter, r *http.Request) { | ||
| 260 | addgold = 10000 | 282 | addgold = 10000 |
| 261 | } | 283 | } |
| 262 | //调用sdk | 284 | //调用sdk |
| 263 | - gold, err := AddCoinToSdk(Uuid, addgold, rdata.Gameid, rdata.Channel, 108) | 285 | + gold,_, err := AddCoinToSdk(Uuid, addgold, rdata.Gameid, rdata.Channel, 108) |
| 264 | if err != nil { | 286 | if err != nil { |
| 265 | logger.Error("Addcoin test ddt! err=%v", err) | 287 | logger.Error("Addcoin test ddt! err=%v", err) |
| 266 | } | 288 | } |
| @@ -328,7 +350,7 @@ func Testapi(w http.ResponseWriter, r *http.Request) { | @@ -328,7 +350,7 @@ func Testapi(w http.ResponseWriter, r *http.Request) { | ||
| 328 | } | 350 | } |
| 329 | //uinfo.RealGold += addgold | 351 | //uinfo.RealGold += addgold |
| 330 | //调用sdk | 352 | //调用sdk |
| 331 | - gold, err := AddCoinToSdk(Uuid, addgold, rdata.Gameid, rdata.Channel, 108) | 353 | + gold,_, err := AddCoinToSdk(Uuid, addgold, rdata.Gameid, rdata.Channel, 108) |
| 332 | if err != nil { | 354 | if err != nil { |
| 333 | logger.Error("test ddt! err=%v", err) | 355 | logger.Error("test ddt! err=%v", err) |
| 334 | } | 356 | } |
src/HttpServer/logic/logic.go
| @@ -10,8 +10,11 @@ import ( | @@ -10,8 +10,11 @@ import ( | ||
| 10 | "net/http" | 10 | "net/http" |
| 11 | "strconv" | 11 | "strconv" |
| 12 | "strings" | 12 | "strings" |
| 13 | + "sync" | ||
| 13 | ) | 14 | ) |
| 14 | 15 | ||
| 16 | +var llock sync.Mutex | ||
| 17 | + | ||
| 15 | func HandlerQueryguaninfo(w http.ResponseWriter, data string, uuid int) { | 18 | func HandlerQueryguaninfo(w http.ResponseWriter, data string, uuid int) { |
| 16 | SetHeader(w) | 19 | SetHeader(w) |
| 17 | var resp QueryguaninfoResp | 20 | var resp QueryguaninfoResp |
| @@ -293,7 +296,7 @@ func HandlerFetchreadgold(w http.ResponseWriter, data string, uuid int) { | @@ -293,7 +296,7 @@ func HandlerFetchreadgold(w http.ResponseWriter, data string, uuid int) { | ||
| 293 | resp.Code = ERROR_SRV_ERROR | 296 | resp.Code = ERROR_SRV_ERROR |
| 294 | break | 297 | break |
| 295 | } | 298 | } |
| 296 | - realgiold, err := AddCoinToSdk(uuid, addgold, rdata.Gameid, rdata.Channel, SDKOPGOLD_TYPEWE) | 299 | + realgiold,_, err := AddCoinToSdk(uuid, addgold, rdata.Gameid, rdata.Channel, SDKOPGOLD_TYPEWE) |
| 297 | if err != nil { | 300 | if err != nil { |
| 298 | logger.Error("HandlerFetchreadgold failed err=%v", err) | 301 | logger.Error("HandlerFetchreadgold failed err=%v", err) |
| 299 | resp.Message = "后台加金币失败" | 302 | resp.Message = "后台加金币失败" |
| @@ -403,6 +406,8 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | @@ -403,6 +406,8 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | ||
| 403 | var rdata GetnewlevelrewardReq | 406 | var rdata GetnewlevelrewardReq |
| 404 | err := json.Unmarshal([]byte(data), &rdata) | 407 | err := json.Unmarshal([]byte(data), &rdata) |
| 405 | for { | 408 | for { |
| 409 | + //取消等级红包 | ||
| 410 | + break | ||
| 406 | if err != nil { | 411 | if err != nil { |
| 407 | logger.Info("json decode HandlerGetnewlevelreward data failed:%v,for:%v", err, data) | 412 | logger.Info("json decode HandlerGetnewlevelreward data failed:%v,for:%v", err, data) |
| 408 | resp.Message = "网络错误" | 413 | resp.Message = "网络错误" |
| @@ -435,7 +440,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | @@ -435,7 +440,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | ||
| 435 | break | 440 | break |
| 436 | } | 441 | } |
| 437 | 442 | ||
| 438 | - goldnum, err := AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 101) | 443 | + goldnum,_, err := AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 101) |
| 439 | if err != nil { | 444 | if err != nil { |
| 440 | logger.Error("AddCoinToSdk failed err=%v", err) | 445 | logger.Error("AddCoinToSdk failed err=%v", err) |
| 441 | resp.Message = "网络错误" | 446 | resp.Message = "网络错误" |
| @@ -446,7 +451,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | @@ -446,7 +451,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | ||
| 446 | //uinfo.RealGold += cfg.Cash | 451 | //uinfo.RealGold += cfg.Cash |
| 447 | 452 | ||
| 448 | if rdata.Rewardtype == 2 { | 453 | if rdata.Rewardtype == 2 { |
| 449 | - goldnum, err = AddCoinToSdk(uuid, cfg.Extracash, rdata.Gameid, rdata.Channel, 104) | 454 | + goldnum,_, err = AddCoinToSdk(uuid, cfg.Extracash, rdata.Gameid, rdata.Channel, 104) |
| 450 | if err != nil { | 455 | if err != nil { |
| 451 | logger.Error("AddCoinToSdk failed err=%v", err) | 456 | logger.Error("AddCoinToSdk failed err=%v", err) |
| 452 | resp.Message = "网络错误" | 457 | resp.Message = "网络错误" |
| @@ -521,6 +526,53 @@ func HandlerReadNumUpload(w http.ResponseWriter, data string) { | @@ -521,6 +526,53 @@ func HandlerReadNumUpload(w http.ResponseWriter, data string) { | ||
| 521 | fmt.Fprint(w, string(respstr)) | 526 | fmt.Fprint(w, string(respstr)) |
| 522 | } | 527 | } |
| 523 | 528 | ||
| 529 | +func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
| 530 | + SetHeader(w) | ||
| 531 | + llock.Lock() | ||
| 532 | + defer llock.Unlock() | ||
| 533 | + var resp FetchredbagResp | ||
| 534 | + resp.Code = 0 | ||
| 535 | + var rdata FetchredbagReq | ||
| 536 | + err := json.Unmarshal([]byte(data), &rdata) | ||
| 537 | + for { | ||
| 538 | + if err != nil { | ||
| 539 | + logger.Info("json decode HandlerFetchredbag data failed:%v,for:%v", err, data) | ||
| 540 | + resp.Message = "网络错误" | ||
| 541 | + resp.Code = ERROR_JSONUNMASH_ERROR | ||
| 542 | + break | ||
| 543 | + } | ||
| 544 | + | ||
| 545 | + //需要加上渠道才是唯一的玩家id，不同渠道视为不同数据 | ||
| 546 | + uniqueuuid := strconv.Itoa(uuid) + rdata.Channel | ||
| 547 | + uinfo, err := GetUserInfo(uniqueuuid) | ||
| 548 | + if err != nil || uinfo == nil { | ||
| 549 | + logger.Error("redis failed err=%v", err) | ||
| 550 | + resp.Message = "服务器错误" | ||
| 551 | + resp.Code = ERROR_SRV_ERROR | ||
| 552 | + break | ||
| 553 | + } | ||
| 554 | + | ||
| 555 | + readaddgold := uinfo.FetchRedPacket(rdata.Gameid, rdata.Channel, uuid) | ||
| 556 | + | ||
| 557 | + resp.Data.Walletgold = uinfo.RealGold | ||
| 558 | + resp.Data.Getgoldnum = readaddgold | ||
| 559 | + | ||
| 560 | + uinfo.IsNew = 0 | ||
| 561 | + uinfo.FetchRdBagNum++ | ||
| 562 | + | ||
| 563 | + //保存数据 | ||
| 564 | + err = SaveUserInfo(uinfo, uniqueuuid) | ||
| 565 | + | ||
| 566 | + resp.Code = ERROR_OK | ||
| 567 | + break | ||
| 568 | + } | ||
| 569 | + | ||
| 570 | + //回包 | ||
| 571 | + respstr, _ := json.Marshal(&resp) | ||
| 572 | + fmt.Fprint(w, string(respstr)) | ||
| 573 | + | ||
| 574 | +} | ||
| 575 | + | ||
| 524 | func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | 576 | func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { |
| 525 | SetHeader(w) | 577 | SetHeader(w) |
| 526 | var resp UsersignResp | 578 | var resp UsersignResp |
| @@ -572,7 +624,7 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | @@ -572,7 +624,7 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | ||
| 572 | } | 624 | } |
| 573 | 625 | ||
| 574 | //uinfo.RealGold = | 626 | //uinfo.RealGold = |
| 575 | - goldnum, err := AddCoinToSdk(uuid, cfg.Num, rdata.Gameid, rdata.Channel, 107) | 627 | + goldnum,_, err := AddCoinToSdk(uuid, cfg.Num, rdata.Gameid, rdata.Channel, 107) |
| 576 | if err != nil { | 628 | if err != nil { |
| 577 | uinfo.SignSum-- | 629 | uinfo.SignSum-- |
| 578 | logger.Error("AddCoinToSdk failed err=%v", err) | 630 | logger.Error("AddCoinToSdk failed err=%v", err) |
| @@ -711,6 +763,7 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { | @@ -711,6 +763,7 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { | ||
| 711 | } | 763 | } |
| 712 | 764 | ||
| 713 | resp.Data.Taskdata = append(resp.Data.Taskdata, tasklist.Taskdata...) | 765 | resp.Data.Taskdata = append(resp.Data.Taskdata, tasklist.Taskdata...) |
| 766 | + resp.Data.Fetchrdnum = uinfo.FetchRdBagNum | ||
| 714 | 767 | ||
| 715 | resp.Code = ERROR_OK | 768 | resp.Code = ERROR_OK |
| 716 | break | 769 | break |
| @@ -972,7 +1025,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | @@ -972,7 +1025,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | ||
| 972 | } | 1025 | } |
| 973 | 1026 | ||
| 974 | //todo 此处需要调佣SDK接口通知金币变化 | 1027 | //todo 此处需要调佣SDK接口通知金币变化 |
| 975 | - goldnum, err := AddCoinToSdk(uuid, rdata.Goldnum, rdata.Gameid, rdata.Channel, 105) | 1028 | + goldnum,realgold, err := AddCoinToSdk(uuid, rdata.Goldnum, rdata.Gameid, rdata.Channel, 105) |
| 976 | if err != nil { | 1029 | if err != nil { |
| 977 | logger.Error("Drawgold failed err=%v", err) | 1030 | logger.Error("Drawgold failed err=%v", err) |
| 978 | resp.Message = "从存钱罐提取金币失败了" | 1031 | resp.Message = "从存钱罐提取金币失败了" |
| @@ -989,6 +1042,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | @@ -989,6 +1042,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | ||
| 989 | resp.Data.Guangold = uinfo.GuanGold | 1042 | resp.Data.Guangold = uinfo.GuanGold |
| 990 | resp.Data.Wallgold = uinfo.RealGold | 1043 | resp.Data.Wallgold = uinfo.RealGold |
| 991 | resp.Data.Totalfetchcnt = uinfo.Achieve.SumGetGuan | 1044 | resp.Data.Totalfetchcnt = uinfo.Achieve.SumGetGuan |
| 1045 | + resp.Data.Getgoldnum = realgold | ||
| 992 | 1046 | ||
| 993 | SaveUserInfo(uinfo, uniqueuuid) | 1047 | SaveUserInfo(uinfo, uniqueuuid) |
| 994 | 1048 |