Commit 8ce440c77da2a54581d1cc77789f34f7ba7c823d
1 parent
f84bf72e
Exists in
master
新增枪火联盟对应功能
Showing
9 changed files
with
1093 additions
and
38 deletions
Show diff stats
@@ -0,0 +1,422 @@ | @@ -0,0 +1,422 @@ | ||
1 | +[ | ||
2 | + { | ||
3 | + "id": 1, | ||
4 | + "gun_level": 1, | ||
5 | + "Luckybag": 3.53, | ||
6 | + "RewardVideo": 1 | ||
7 | + }, | ||
8 | + { | ||
9 | + "id": 2, | ||
10 | + "gun_level": 2, | ||
11 | + "Luckybag": 2.61, | ||
12 | + "RewardVideo": 1 | ||
13 | + }, | ||
14 | + { | ||
15 | + "id": 3, | ||
16 | + "gun_level": 3, | ||
17 | + "Luckybag": 3.5, | ||
18 | + "RewardVideo": 1 | ||
19 | + }, | ||
20 | + { | ||
21 | + "id": 4, | ||
22 | + "gun_level": 4, | ||
23 | + "Luckybag": 3.82, | ||
24 | + "RewardVideo": 1 | ||
25 | + }, | ||
26 | + { | ||
27 | + "id": 5, | ||
28 | + "gun_level": 5, | ||
29 | + "Luckybag": 3.78, | ||
30 | + "RewardVideo": 1 | ||
31 | + }, | ||
32 | + { | ||
33 | + "id": 6, | ||
34 | + "gun_level": 6, | ||
35 | + "Luckybag": 1.73, | ||
36 | + "RewardVideo": 1 | ||
37 | + }, | ||
38 | + { | ||
39 | + "id": 7, | ||
40 | + "gun_level": 7, | ||
41 | + "Luckybag": 1.65, | ||
42 | + "RewardVideo": 1 | ||
43 | + }, | ||
44 | + { | ||
45 | + "id": 8, | ||
46 | + "gun_level": 8, | ||
47 | + "Luckybag": 2.3, | ||
48 | + "RewardVideo": 1 | ||
49 | + }, | ||
50 | + { | ||
51 | + "id": 9, | ||
52 | + "gun_level": 9, | ||
53 | + "Luckybag": 1.78, | ||
54 | + "RewardVideo": 1 | ||
55 | + }, | ||
56 | + { | ||
57 | + "id": 10, | ||
58 | + "gun_level": 10, | ||
59 | + "Luckybag": 1.14, | ||
60 | + "RewardVideo": 1 | ||
61 | + }, | ||
62 | + { | ||
63 | + "id": 11, | ||
64 | + "gun_level": 11, | ||
65 | + "Luckybag": 1.3, | ||
66 | + "RewardVideo": 1 | ||
67 | + }, | ||
68 | + { | ||
69 | + "id": 12, | ||
70 | + "gun_level": 12, | ||
71 | + "Luckybag": 1.23, | ||
72 | + "RewardVideo": 1 | ||
73 | + }, | ||
74 | + { | ||
75 | + "id": 13, | ||
76 | + "gun_level": 13, | ||
77 | + "Luckybag": 1.67, | ||
78 | + "RewardVideo": 1 | ||
79 | + }, | ||
80 | + { | ||
81 | + "id": 14, | ||
82 | + "gun_level": 14, | ||
83 | + "Luckybag": 1.68, | ||
84 | + "RewardVideo": 1 | ||
85 | + }, | ||
86 | + { | ||
87 | + "id": 15, | ||
88 | + "gun_level": 15, | ||
89 | + "Luckybag": 1.3, | ||
90 | + "RewardVideo": 1 | ||
91 | + }, | ||
92 | + { | ||
93 | + "id": 16, | ||
94 | + "gun_level": 16, | ||
95 | + "Luckybag": 1.09, | ||
96 | + "RewardVideo": 1 | ||
97 | + }, | ||
98 | + { | ||
99 | + "id": 17, | ||
100 | + "gun_level": 17, | ||
101 | + "Luckybag": 1.31, | ||
102 | + "RewardVideo": 1 | ||
103 | + }, | ||
104 | + { | ||
105 | + "id": 18, | ||
106 | + "gun_level": 18, | ||
107 | + "Luckybag": 1.07, | ||
108 | + "RewardVideo": 1 | ||
109 | + }, | ||
110 | + { | ||
111 | + "id": 19, | ||
112 | + "gun_level": 19, | ||
113 | + "Luckybag": 1.38, | ||
114 | + "RewardVideo": 1 | ||
115 | + }, | ||
116 | + { | ||
117 | + "id": 20, | ||
118 | + "gun_level": 20, | ||
119 | + "Luckybag": 1.02, | ||
120 | + "RewardVideo": 1 | ||
121 | + }, | ||
122 | + { | ||
123 | + "id": 21, | ||
124 | + "gun_level": 21, | ||
125 | + "Luckybag": 0.93, | ||
126 | + "RewardVideo": 1 | ||
127 | + }, | ||
128 | + { | ||
129 | + "id": 22, | ||
130 | + "gun_level": 22, | ||
131 | + "Luckybag": 0.95, | ||
132 | + "RewardVideo": 1 | ||
133 | + }, | ||
134 | + { | ||
135 | + "id": 23, | ||
136 | + "gun_level": 23, | ||
137 | + "Luckybag": 1.16, | ||
138 | + "RewardVideo": 1 | ||
139 | + }, | ||
140 | + { | ||
141 | + "id": 24, | ||
142 | + "gun_level": 24, | ||
143 | + "Luckybag": 1.26, | ||
144 | + "RewardVideo": 1 | ||
145 | + }, | ||
146 | + { | ||
147 | + "id": 25, | ||
148 | + "gun_level": 25, | ||
149 | + "Luckybag": 1.05, | ||
150 | + "RewardVideo": 1 | ||
151 | + }, | ||
152 | + { | ||
153 | + "id": 26, | ||
154 | + "gun_level": 26, | ||
155 | + "Luckybag": 1.13, | ||
156 | + "RewardVideo": 1 | ||
157 | + }, | ||
158 | + { | ||
159 | + "id": 27, | ||
160 | + "gun_level": 27, | ||
161 | + "Luckybag": 0.95, | ||
162 | + "RewardVideo": 1 | ||
163 | + }, | ||
164 | + { | ||
165 | + "id": 28, | ||
166 | + "gun_level": 28, | ||
167 | + "Luckybag": 1.01, | ||
168 | + "RewardVideo": 1 | ||
169 | + }, | ||
170 | + { | ||
171 | + "id": 29, | ||
172 | + "gun_level": 29, | ||
173 | + "Luckybag": 0.71, | ||
174 | + "RewardVideo": 1 | ||
175 | + }, | ||
176 | + { | ||
177 | + "id": 30, | ||
178 | + "gun_level": 30, | ||
179 | + "Luckybag": 0.84, | ||
180 | + "RewardVideo": 1 | ||
181 | + }, | ||
182 | + { | ||
183 | + "id": 31, | ||
184 | + "gun_level": 31, | ||
185 | + "Luckybag": 0.83, | ||
186 | + "RewardVideo": 1 | ||
187 | + }, | ||
188 | + { | ||
189 | + "id": 32, | ||
190 | + "gun_level": 32, | ||
191 | + "Luckybag": 1.07, | ||
192 | + "RewardVideo": 1 | ||
193 | + }, | ||
194 | + { | ||
195 | + "id": 33, | ||
196 | + "gun_level": 33, | ||
197 | + "Luckybag": 0.76, | ||
198 | + "RewardVideo": 1 | ||
199 | + }, | ||
200 | + { | ||
201 | + "id": 34, | ||
202 | + "gun_level": 34, | ||
203 | + "Luckybag": 0.82, | ||
204 | + "RewardVideo": 1 | ||
205 | + }, | ||
206 | + { | ||
207 | + "id": 35, | ||
208 | + "gun_level": 35, | ||
209 | + "Luckybag": 0.77, | ||
210 | + "RewardVideo": 1 | ||
211 | + }, | ||
212 | + { | ||
213 | + "id": 36, | ||
214 | + "gun_level": 36, | ||
215 | + "Luckybag": 0.9, | ||
216 | + "RewardVideo": 1 | ||
217 | + }, | ||
218 | + { | ||
219 | + "id": 37, | ||
220 | + "gun_level": 37, | ||
221 | + "Luckybag": 0.63, | ||
222 | + "RewardVideo": 1 | ||
223 | + }, | ||
224 | + { | ||
225 | + "id": 38, | ||
226 | + "gun_level": 38, | ||
227 | + "Luckybag": 0.91, | ||
228 | + "RewardVideo": 1 | ||
229 | + }, | ||
230 | + { | ||
231 | + "id": 39, | ||
232 | + "gun_level": 39, | ||
233 | + "Luckybag": 0.72, | ||
234 | + "RewardVideo": 1 | ||
235 | + }, | ||
236 | + { | ||
237 | + "id": 40, | ||
238 | + "gun_level": 40, | ||
239 | + "Luckybag": 0.79, | ||
240 | + "RewardVideo": 1 | ||
241 | + }, | ||
242 | + { | ||
243 | + "id": 41, | ||
244 | + "gun_level": 41, | ||
245 | + "Luckybag": 0.92, | ||
246 | + "RewardVideo": 1 | ||
247 | + }, | ||
248 | + { | ||
249 | + "id": 42, | ||
250 | + "gun_level": 42, | ||
251 | + "Luckybag": 0.78, | ||
252 | + "RewardVideo": 1 | ||
253 | + }, | ||
254 | + { | ||
255 | + "id": 43, | ||
256 | + "gun_level": 43, | ||
257 | + "Luckybag": 0.89, | ||
258 | + "RewardVideo": 1 | ||
259 | + }, | ||
260 | + { | ||
261 | + "id": 44, | ||
262 | + "gun_level": 44, | ||
263 | + "Luckybag": 0.8, | ||
264 | + "RewardVideo": 1 | ||
265 | + }, | ||
266 | + { | ||
267 | + "id": 45, | ||
268 | + "gun_level": 45, | ||
269 | + "Luckybag": 0.64, | ||
270 | + "RewardVideo": 1 | ||
271 | + }, | ||
272 | + { | ||
273 | + "id": 46, | ||
274 | + "gun_level": 46, | ||
275 | + "Luckybag": 0.56, | ||
276 | + "RewardVideo": 1 | ||
277 | + }, | ||
278 | + { | ||
279 | + "id": 47, | ||
280 | + "gun_level": 47, | ||
281 | + "Luckybag": 0.6, | ||
282 | + "RewardVideo": 1 | ||
283 | + }, | ||
284 | + { | ||
285 | + "id": 48, | ||
286 | + "gun_level": 48, | ||
287 | + "Luckybag": 0.63, | ||
288 | + "RewardVideo": 1 | ||
289 | + }, | ||
290 | + { | ||
291 | + "id": 49, | ||
292 | + "gun_level": 49, | ||
293 | + "Luckybag": 0.67, | ||
294 | + "RewardVideo": 1 | ||
295 | + }, | ||
296 | + { | ||
297 | + "id": 50, | ||
298 | + "gun_level": 50, | ||
299 | + "Luckybag": 0.67, | ||
300 | + "RewardVideo": 1 | ||
301 | + }, | ||
302 | + { | ||
303 | + "id": 51, | ||
304 | + "gun_level": 51, | ||
305 | + "Luckybag": 0.72, | ||
306 | + "RewardVideo": 1 | ||
307 | + }, | ||
308 | + { | ||
309 | + "id": 52, | ||
310 | + "gun_level": 52, | ||
311 | + "Luckybag": 0.78, | ||
312 | + "RewardVideo": 1 | ||
313 | + }, | ||
314 | + { | ||
315 | + "id": 53, | ||
316 | + "gun_level": 53, | ||
317 | + "Luckybag": 0.74, | ||
318 | + "RewardVideo": 1 | ||
319 | + }, | ||
320 | + { | ||
321 | + "id": 54, | ||
322 | + "gun_level": 54, | ||
323 | + "Luckybag": 0.63, | ||
324 | + "RewardVideo": 1 | ||
325 | + }, | ||
326 | + { | ||
327 | + "id": 55, | ||
328 | + "gun_level": 55, | ||
329 | + "Luckybag": 0.64, | ||
330 | + "RewardVideo": 1 | ||
331 | + }, | ||
332 | + { | ||
333 | + "id": 56, | ||
334 | + "gun_level": 56, | ||
335 | + "Luckybag": 0.51, | ||
336 | + "RewardVideo": 1 | ||
337 | + }, | ||
338 | + { | ||
339 | + "id": 57, | ||
340 | + "gun_level": 57, | ||
341 | + "Luckybag": 0.58, | ||
342 | + "RewardVideo": 1 | ||
343 | + }, | ||
344 | + { | ||
345 | + "id": 58, | ||
346 | + "gun_level": 58, | ||
347 | + "Luckybag": 0.61, | ||
348 | + "RewardVideo": 1 | ||
349 | + }, | ||
350 | + { | ||
351 | + "id": 59, | ||
352 | + "gun_level": 59, | ||
353 | + "Luckybag": 0.7, | ||
354 | + "RewardVideo": 1 | ||
355 | + }, | ||
356 | + { | ||
357 | + "id": 60, | ||
358 | + "gun_level": 60, | ||
359 | + "Luckybag": 0.7, | ||
360 | + "RewardVideo": 1 | ||
361 | + }, | ||
362 | + { | ||
363 | + "id": 61, | ||
364 | + "gun_level": 61, | ||
365 | + "Luckybag": 0.64, | ||
366 | + "RewardVideo": 1 | ||
367 | + }, | ||
368 | + { | ||
369 | + "id": 62, | ||
370 | + "gun_level": 62, | ||
371 | + "Luckybag": 0.61, | ||
372 | + "RewardVideo": 1 | ||
373 | + }, | ||
374 | + { | ||
375 | + "id": 63, | ||
376 | + "gun_level": 63, | ||
377 | + "Luckybag": 0.7, | ||
378 | + "RewardVideo": 1 | ||
379 | + }, | ||
380 | + { | ||
381 | + "id": 64, | ||
382 | + "gun_level": 64, | ||
383 | + "Luckybag": 0.86, | ||
384 | + "RewardVideo": 1 | ||
385 | + }, | ||
386 | + { | ||
387 | + "id": 65, | ||
388 | + "gun_level": 65, | ||
389 | + "Luckybag": 0.53, | ||
390 | + "RewardVideo": 1 | ||
391 | + }, | ||
392 | + { | ||
393 | + "id": 66, | ||
394 | + "gun_level": 66, | ||
395 | + "Luckybag": 0.64, | ||
396 | + "RewardVideo": 1 | ||
397 | + }, | ||
398 | + { | ||
399 | + "id": 67, | ||
400 | + "gun_level": 67, | ||
401 | + "Luckybag": 0.52, | ||
402 | + "RewardVideo": 1 | ||
403 | + }, | ||
404 | + { | ||
405 | + "id": 68, | ||
406 | + "gun_level": 68, | ||
407 | + "Luckybag": 0.51, | ||
408 | + "RewardVideo": 1 | ||
409 | + }, | ||
410 | + { | ||
411 | + "id": 69, | ||
412 | + "gun_level": 69, | ||
413 | + "Luckybag": 0.45, | ||
414 | + "RewardVideo": 1 | ||
415 | + }, | ||
416 | + { | ||
417 | + "id": 70, | ||
418 | + "gun_level": 70, | ||
419 | + "Luckybag": 0.56, | ||
420 | + "RewardVideo": 1 | ||
421 | + } | ||
422 | +] | ||
0 | \ No newline at end of file | 423 | \ No newline at end of file |
@@ -0,0 +1,50 @@ | @@ -0,0 +1,50 @@ | ||
1 | +[ | ||
2 | + { | ||
3 | + "id": 1, | ||
4 | + "time": 120, | ||
5 | + "Luckybag": 0.43, | ||
6 | + "RewardVideo": 0 | ||
7 | + }, | ||
8 | + { | ||
9 | + "id": 2, | ||
10 | + "time": 120, | ||
11 | + "Luckybag": 0.31, | ||
12 | + "RewardVideo": 0 | ||
13 | + }, | ||
14 | + { | ||
15 | + "id": 3, | ||
16 | + "time": 180, | ||
17 | + "Luckybag": 0.44, | ||
18 | + "RewardVideo": 1 | ||
19 | + }, | ||
20 | + { | ||
21 | + "id": 4, | ||
22 | + "time": 180, | ||
23 | + "Luckybag": 0.27, | ||
24 | + "RewardVideo": 1 | ||
25 | + }, | ||
26 | + { | ||
27 | + "id": 5, | ||
28 | + "time": 180, | ||
29 | + "Luckybag": 0.41, | ||
30 | + "RewardVideo": 1 | ||
31 | + }, | ||
32 | + { | ||
33 | + "id": 6, | ||
34 | + "time": 240, | ||
35 | + "Luckybag": 0.47, | ||
36 | + "RewardVideo": 1 | ||
37 | + }, | ||
38 | + { | ||
39 | + "id": 7, | ||
40 | + "time": 240, | ||
41 | + "Luckybag": 0.41, | ||
42 | + "RewardVideo": 1 | ||
43 | + }, | ||
44 | + { | ||
45 | + "id": 8, | ||
46 | + "time": 240, | ||
47 | + "Luckybag": 0.36, | ||
48 | + "RewardVideo": 1 | ||
49 | + } | ||
50 | +] | ||
0 | \ No newline at end of file | 51 | \ No newline at end of file |
@@ -0,0 +1,524 @@ | @@ -0,0 +1,524 @@ | ||
1 | +[ | ||
2 | + { | ||
3 | + "id": 1, | ||
4 | + "Win_Level": 3, | ||
5 | + "LuckyBag": 1.94, | ||
6 | + "RewardVideo": 1 | ||
7 | + }, | ||
8 | + { | ||
9 | + "id": 2, | ||
10 | + "Win_Level": 6, | ||
11 | + "LuckyBag": 1.47, | ||
12 | + "RewardVideo": 1 | ||
13 | + }, | ||
14 | + { | ||
15 | + "id": 3, | ||
16 | + "Win_Level": 9, | ||
17 | + "LuckyBag": 1.71, | ||
18 | + "RewardVideo": 1 | ||
19 | + }, | ||
20 | + { | ||
21 | + "id": 4, | ||
22 | + "Win_Level": 12, | ||
23 | + "LuckyBag": 1.75, | ||
24 | + "RewardVideo": 1 | ||
25 | + }, | ||
26 | + { | ||
27 | + "id": 5, | ||
28 | + "Win_Level": 15, | ||
29 | + "LuckyBag": 1.92, | ||
30 | + "RewardVideo": 1 | ||
31 | + }, | ||
32 | + { | ||
33 | + "id": 6, | ||
34 | + "Win_Level": 18, | ||
35 | + "LuckyBag": 1.24, | ||
36 | + "RewardVideo": 1 | ||
37 | + }, | ||
38 | + { | ||
39 | + "id": 7, | ||
40 | + "Win_Level": 21, | ||
41 | + "LuckyBag": 1.24, | ||
42 | + "RewardVideo": 1 | ||
43 | + }, | ||
44 | + { | ||
45 | + "id": 8, | ||
46 | + "Win_Level": 24, | ||
47 | + "LuckyBag": 1.41, | ||
48 | + "RewardVideo": 1 | ||
49 | + }, | ||
50 | + { | ||
51 | + "id": 9, | ||
52 | + "Win_Level": 27, | ||
53 | + "LuckyBag": 0.98, | ||
54 | + "RewardVideo": 1 | ||
55 | + }, | ||
56 | + { | ||
57 | + "id": 10, | ||
58 | + "Win_Level": 30, | ||
59 | + "LuckyBag": 1.36, | ||
60 | + "RewardVideo": 1 | ||
61 | + }, | ||
62 | + { | ||
63 | + "id": 11, | ||
64 | + "Win_Level": 33, | ||
65 | + "LuckyBag": 1.41, | ||
66 | + "RewardVideo": 1 | ||
67 | + }, | ||
68 | + { | ||
69 | + "id": 12, | ||
70 | + "Win_Level": 36, | ||
71 | + "LuckyBag": 1.08, | ||
72 | + "RewardVideo": 1 | ||
73 | + }, | ||
74 | + { | ||
75 | + "id": 13, | ||
76 | + "Win_Level": 39, | ||
77 | + "LuckyBag": 1.03, | ||
78 | + "RewardVideo": 1 | ||
79 | + }, | ||
80 | + { | ||
81 | + "id": 14, | ||
82 | + "Win_Level": 42, | ||
83 | + "LuckyBag": 1.2, | ||
84 | + "RewardVideo": 1 | ||
85 | + }, | ||
86 | + { | ||
87 | + "id": 15, | ||
88 | + "Win_Level": 45, | ||
89 | + "LuckyBag": 1.24, | ||
90 | + "RewardVideo": 1 | ||
91 | + }, | ||
92 | + { | ||
93 | + "id": 16, | ||
94 | + "Win_Level": 48, | ||
95 | + "LuckyBag": 1.19, | ||
96 | + "RewardVideo": 1 | ||
97 | + }, | ||
98 | + { | ||
99 | + "id": 17, | ||
100 | + "Win_Level": 51, | ||
101 | + "LuckyBag": 1.18, | ||
102 | + "RewardVideo": 1 | ||
103 | + }, | ||
104 | + { | ||
105 | + "id": 18, | ||
106 | + "Win_Level": 54, | ||
107 | + "LuckyBag": 1.32, | ||
108 | + "RewardVideo": 1 | ||
109 | + }, | ||
110 | + { | ||
111 | + "id": 19, | ||
112 | + "Win_Level": 57, | ||
113 | + "LuckyBag": 0.66, | ||
114 | + "RewardVideo": 1 | ||
115 | + }, | ||
116 | + { | ||
117 | + "id": 20, | ||
118 | + "Win_Level": 60, | ||
119 | + "LuckyBag": 0.68, | ||
120 | + "RewardVideo": 1 | ||
121 | + }, | ||
122 | + { | ||
123 | + "id": 21, | ||
124 | + "Win_Level": 63, | ||
125 | + "LuckyBag": 0.69, | ||
126 | + "RewardVideo": 1 | ||
127 | + }, | ||
128 | + { | ||
129 | + "id": 22, | ||
130 | + "Win_Level": 66, | ||
131 | + "LuckyBag": 1.27, | ||
132 | + "RewardVideo": 1 | ||
133 | + }, | ||
134 | + { | ||
135 | + "id": 23, | ||
136 | + "Win_Level": 69, | ||
137 | + "LuckyBag": 0.68, | ||
138 | + "RewardVideo": 1 | ||
139 | + }, | ||
140 | + { | ||
141 | + "id": 24, | ||
142 | + "Win_Level": 72, | ||
143 | + "LuckyBag": 1.22, | ||
144 | + "RewardVideo": 1 | ||
145 | + }, | ||
146 | + { | ||
147 | + "id": 25, | ||
148 | + "Win_Level": 75, | ||
149 | + "LuckyBag": 0.93, | ||
150 | + "RewardVideo": 1 | ||
151 | + }, | ||
152 | + { | ||
153 | + "id": 26, | ||
154 | + "Win_Level": 78, | ||
155 | + "LuckyBag": 0.81, | ||
156 | + "RewardVideo": 1 | ||
157 | + }, | ||
158 | + { | ||
159 | + "id": 27, | ||
160 | + "Win_Level": 81, | ||
161 | + "LuckyBag": 0.59, | ||
162 | + "RewardVideo": 1 | ||
163 | + }, | ||
164 | + { | ||
165 | + "id": 28, | ||
166 | + "Win_Level": 84, | ||
167 | + "LuckyBag": 0.94, | ||
168 | + "RewardVideo": 1 | ||
169 | + }, | ||
170 | + { | ||
171 | + "id": 29, | ||
172 | + "Win_Level": 87, | ||
173 | + "LuckyBag": 0.79, | ||
174 | + "RewardVideo": 1 | ||
175 | + }, | ||
176 | + { | ||
177 | + "id": 30, | ||
178 | + "Win_Level": 90, | ||
179 | + "LuckyBag": 0.65, | ||
180 | + "RewardVideo": 1 | ||
181 | + }, | ||
182 | + { | ||
183 | + "id": 31, | ||
184 | + "Win_Level": 93, | ||
185 | + "LuckyBag": 0.81, | ||
186 | + "RewardVideo": 1 | ||
187 | + }, | ||
188 | + { | ||
189 | + "id": 32, | ||
190 | + "Win_Level": 96, | ||
191 | + "LuckyBag": 0.72, | ||
192 | + "RewardVideo": 1 | ||
193 | + }, | ||
194 | + { | ||
195 | + "id": 33, | ||
196 | + "Win_Level": 99, | ||
197 | + "LuckyBag": 0.91, | ||
198 | + "RewardVideo": 1 | ||
199 | + }, | ||
200 | + { | ||
201 | + "id": 34, | ||
202 | + "Win_Level": 102, | ||
203 | + "LuckyBag": 0.85, | ||
204 | + "RewardVideo": 1 | ||
205 | + }, | ||
206 | + { | ||
207 | + "id": 35, | ||
208 | + "Win_Level": 105, | ||
209 | + "LuckyBag": 0.53, | ||
210 | + "RewardVideo": 1 | ||
211 | + }, | ||
212 | + { | ||
213 | + "id": 36, | ||
214 | + "Win_Level": 108, | ||
215 | + "LuckyBag": 0.6, | ||
216 | + "RewardVideo": 1 | ||
217 | + }, | ||
218 | + { | ||
219 | + "id": 37, | ||
220 | + "Win_Level": 111, | ||
221 | + "LuckyBag": 0.59, | ||
222 | + "RewardVideo": 1 | ||
223 | + }, | ||
224 | + { | ||
225 | + "id": 38, | ||
226 | + "Win_Level": 114, | ||
227 | + "LuckyBag": 0.51, | ||
228 | + "RewardVideo": 1 | ||
229 | + }, | ||
230 | + { | ||
231 | + "id": 39, | ||
232 | + "Win_Level": 117, | ||
233 | + "LuckyBag": 0.6, | ||
234 | + "RewardVideo": 1 | ||
235 | + }, | ||
236 | + { | ||
237 | + "id": 40, | ||
238 | + "Win_Level": 120, | ||
239 | + "LuckyBag": 0.63, | ||
240 | + "RewardVideo": 1 | ||
241 | + }, | ||
242 | + { | ||
243 | + "id": 41, | ||
244 | + "Win_Level": 123, | ||
245 | + "LuckyBag": 0.65, | ||
246 | + "RewardVideo": 1 | ||
247 | + }, | ||
248 | + { | ||
249 | + "id": 42, | ||
250 | + "Win_Level": 126, | ||
251 | + "LuckyBag": 0.52, | ||
252 | + "RewardVideo": 1 | ||
253 | + }, | ||
254 | + { | ||
255 | + "id": 43, | ||
256 | + "Win_Level": 129, | ||
257 | + "LuckyBag": 0.51, | ||
258 | + "RewardVideo": 1 | ||
259 | + }, | ||
260 | + { | ||
261 | + "id": 44, | ||
262 | + "Win_Level": 132, | ||
263 | + "LuckyBag": 0.53, | ||
264 | + "RewardVideo": 1 | ||
265 | + }, | ||
266 | + { | ||
267 | + "id": 45, | ||
268 | + "Win_Level": 135, | ||
269 | + "LuckyBag": 0.59, | ||
270 | + "RewardVideo": 1 | ||
271 | + }, | ||
272 | + { | ||
273 | + "id": 46, | ||
274 | + "Win_Level": 138, | ||
275 | + "LuckyBag": 0.51, | ||
276 | + "RewardVideo": 1 | ||
277 | + }, | ||
278 | + { | ||
279 | + "id": 47, | ||
280 | + "Win_Level": 141, | ||
281 | + "LuckyBag": 0.39, | ||
282 | + "RewardVideo": 1 | ||
283 | + }, | ||
284 | + { | ||
285 | + "id": 48, | ||
286 | + "Win_Level": 144, | ||
287 | + "LuckyBag": 0.41, | ||
288 | + "RewardVideo": 1 | ||
289 | + }, | ||
290 | + { | ||
291 | + "id": 49, | ||
292 | + "Win_Level": 147, | ||
293 | + "LuckyBag": 0.59, | ||
294 | + "RewardVideo": 1 | ||
295 | + }, | ||
296 | + { | ||
297 | + "id": 50, | ||
298 | + "Win_Level": 150, | ||
299 | + "LuckyBag": 0.59, | ||
300 | + "RewardVideo": 1 | ||
301 | + }, | ||
302 | + { | ||
303 | + "id": 51, | ||
304 | + "Win_Level": 153, | ||
305 | + "LuckyBag": 0.41, | ||
306 | + "RewardVideo": 1 | ||
307 | + }, | ||
308 | + { | ||
309 | + "id": 52, | ||
310 | + "Win_Level": 156, | ||
311 | + "LuckyBag": 0.74, | ||
312 | + "RewardVideo": 1 | ||
313 | + }, | ||
314 | + { | ||
315 | + "id": 53, | ||
316 | + "Win_Level": 159, | ||
317 | + "LuckyBag": 0.56, | ||
318 | + "RewardVideo": 1 | ||
319 | + }, | ||
320 | + { | ||
321 | + "id": 54, | ||
322 | + "Win_Level": 162, | ||
323 | + "LuckyBag": 0.58, | ||
324 | + "RewardVideo": 1 | ||
325 | + }, | ||
326 | + { | ||
327 | + "id": 55, | ||
328 | + "Win_Level": 165, | ||
329 | + "LuckyBag": 0.56, | ||
330 | + "RewardVideo": 1 | ||
331 | + }, | ||
332 | + { | ||
333 | + "id": 56, | ||
334 | + "Win_Level": 168, | ||
335 | + "LuckyBag": 0.55, | ||
336 | + "RewardVideo": 1 | ||
337 | + }, | ||
338 | + { | ||
339 | + "id": 57, | ||
340 | + "Win_Level": 171, | ||
341 | + "LuckyBag": 0.73, | ||
342 | + "RewardVideo": 1 | ||
343 | + }, | ||
344 | + { | ||
345 | + "id": 58, | ||
346 | + "Win_Level": 174, | ||
347 | + "LuckyBag": 0.46, | ||
348 | + "RewardVideo": 1 | ||
349 | + }, | ||
350 | + { | ||
351 | + "id": 59, | ||
352 | + "Win_Level": 177, | ||
353 | + "LuckyBag": 0.5, | ||
354 | + "RewardVideo": 1 | ||
355 | + }, | ||
356 | + { | ||
357 | + "id": 60, | ||
358 | + "Win_Level": 180, | ||
359 | + "LuckyBag": 0.6, | ||
360 | + "RewardVideo": 1 | ||
361 | + }, | ||
362 | + { | ||
363 | + "id": 61, | ||
364 | + "Win_Level": 183, | ||
365 | + "LuckyBag": 0.45, | ||
366 | + "RewardVideo": 1 | ||
367 | + }, | ||
368 | + { | ||
369 | + "id": 62, | ||
370 | + "Win_Level": 186, | ||
371 | + "LuckyBag": 0.5, | ||
372 | + "RewardVideo": 1 | ||
373 | + }, | ||
374 | + { | ||
375 | + "id": 63, | ||
376 | + "Win_Level": 189, | ||
377 | + "LuckyBag": 0.57, | ||
378 | + "RewardVideo": 1 | ||
379 | + }, | ||
380 | + { | ||
381 | + "id": 64, | ||
382 | + "Win_Level": 192, | ||
383 | + "LuckyBag": 0.4, | ||
384 | + "RewardVideo": 1 | ||
385 | + }, | ||
386 | + { | ||
387 | + "id": 65, | ||
388 | + "Win_Level": 195, | ||
389 | + "LuckyBag": 0.43, | ||
390 | + "RewardVideo": 1 | ||
391 | + }, | ||
392 | + { | ||
393 | + "id": 66, | ||
394 | + "Win_Level": 198, | ||
395 | + "LuckyBag": 0.43, | ||
396 | + "RewardVideo": 1 | ||
397 | + }, | ||
398 | + { | ||
399 | + "id": 67, | ||
400 | + "Win_Level": 201, | ||
401 | + "LuckyBag": 0.56, | ||
402 | + "RewardVideo": 1 | ||
403 | + }, | ||
404 | + { | ||
405 | + "id": 68, | ||
406 | + "Win_Level": 204, | ||
407 | + "LuckyBag": 0.57, | ||
408 | + "RewardVideo": 1 | ||
409 | + }, | ||
410 | + { | ||
411 | + "id": 69, | ||
412 | + "Win_Level": 207, | ||
413 | + "LuckyBag": 0.54, | ||
414 | + "RewardVideo": 1 | ||
415 | + }, | ||
416 | + { | ||
417 | + "id": 70, | ||
418 | + "Win_Level": 210, | ||
419 | + "LuckyBag": 0.53, | ||
420 | + "RewardVideo": 1 | ||
421 | + }, | ||
422 | + { | ||
423 | + "id": 71, | ||
424 | + "Win_Level": 213, | ||
425 | + "LuckyBag": 0.31, | ||
426 | + "RewardVideo": 1 | ||
427 | + }, | ||
428 | + { | ||
429 | + "id": 72, | ||
430 | + "Win_Level": 216, | ||
431 | + "LuckyBag": 0.47, | ||
432 | + "RewardVideo": 1 | ||
433 | + }, | ||
434 | + { | ||
435 | + "id": 73, | ||
436 | + "Win_Level": 219, | ||
437 | + "LuckyBag": 0.34, | ||
438 | + "RewardVideo": 1 | ||
439 | + }, | ||
440 | + { | ||
441 | + "id": 74, | ||
442 | + "Win_Level": 222, | ||
443 | + "LuckyBag": 0.44, | ||
444 | + "RewardVideo": 1 | ||
445 | + }, | ||
446 | + { | ||
447 | + "id": 75, | ||
448 | + "Win_Level": 225, | ||
449 | + "LuckyBag": 0.49, | ||
450 | + "RewardVideo": 1 | ||
451 | + }, | ||
452 | + { | ||
453 | + "id": 76, | ||
454 | + "Win_Level": 228, | ||
455 | + "LuckyBag": 0.51, | ||
456 | + "RewardVideo": 1 | ||
457 | + }, | ||
458 | + { | ||
459 | + "id": 77, | ||
460 | + "Win_Level": 231, | ||
461 | + "LuckyBag": 0.34, | ||
462 | + "RewardVideo": 1 | ||
463 | + }, | ||
464 | + { | ||
465 | + "id": 78, | ||
466 | + "Win_Level": 234, | ||
467 | + "LuckyBag": 0.41, | ||
468 | + "RewardVideo": 1 | ||
469 | + }, | ||
470 | + { | ||
471 | + "id": 79, | ||
472 | + "Win_Level": 237, | ||
473 | + "LuckyBag": 0.57, | ||
474 | + "RewardVideo": 1 | ||
475 | + }, | ||
476 | + { | ||
477 | + "id": 80, | ||
478 | + "Win_Level": 240, | ||
479 | + "LuckyBag": 0.42, | ||
480 | + "RewardVideo": 1 | ||
481 | + }, | ||
482 | + { | ||
483 | + "id": 81, | ||
484 | + "Win_Level": 243, | ||
485 | + "LuckyBag": 0.47, | ||
486 | + "RewardVideo": 1 | ||
487 | + }, | ||
488 | + { | ||
489 | + "id": 82, | ||
490 | + "Win_Level": 246, | ||
491 | + "LuckyBag": 0.52, | ||
492 | + "RewardVideo": 1 | ||
493 | + }, | ||
494 | + { | ||
495 | + "id": 83, | ||
496 | + "Win_Level": 249, | ||
497 | + "LuckyBag": 0.41, | ||
498 | + "RewardVideo": 1 | ||
499 | + }, | ||
500 | + { | ||
501 | + "id": 84, | ||
502 | + "Win_Level": 252, | ||
503 | + "LuckyBag": 0.48, | ||
504 | + "RewardVideo": 1 | ||
505 | + }, | ||
506 | + { | ||
507 | + "id": 85, | ||
508 | + "Win_Level": 255, | ||
509 | + "LuckyBag": 0.52, | ||
510 | + "RewardVideo": 1 | ||
511 | + }, | ||
512 | + { | ||
513 | + "id": 86, | ||
514 | + "Win_Level": 258, | ||
515 | + "LuckyBag": 0.32, | ||
516 | + "RewardVideo": 1 | ||
517 | + }, | ||
518 | + { | ||
519 | + "id": 87, | ||
520 | + "Win_Level": 261, | ||
521 | + "LuckyBag": 0.57, | ||
522 | + "RewardVideo": 1 | ||
523 | + } | ||
524 | +] | ||
0 | \ No newline at end of file | 525 | \ No newline at end of file |
src/HttpServer/jsonconf/jsonconf.go
@@ -44,11 +44,35 @@ type JiRedBagDesc struct { | @@ -44,11 +44,35 @@ type JiRedBagDesc struct { | ||
44 | Cash int `json:"cash"` | 44 | Cash int `json:"cash"` |
45 | } | 45 | } |
46 | 46 | ||
47 | +type GunLevelConfigDesc struct { | ||
48 | + Id int `json:"id"` | ||
49 | + Gun_level int `json:"gun_level"` | ||
50 | + Luckybag float32 `json:"Luckybag"` | ||
51 | + RewardVideo int `json:"RewardVideo"` | ||
52 | +} | ||
53 | + | ||
54 | +type WinLevelConfigDesc struct { | ||
55 | + Id int `json:"id"` | ||
56 | + Win_Level int `json:"Win_Level"` | ||
57 | + LuckyBag float32 `json:"LuckyBag"` | ||
58 | + RewardVideo int `json:"RewardVideo"` | ||
59 | +} | ||
60 | + | ||
61 | +type OnlineRewardConfigDesc struct { | ||
62 | + Id int `json:"id"` | ||
63 | + Time int `json:"time"` | ||
64 | + Luckybag float32 `json:"Luckybag"` | ||
65 | + RewardVideo int `json:"RewardVideo"` | ||
66 | +} | ||
67 | + | ||
47 | type GameConfig struct { | 68 | type GameConfig struct { |
48 | WithDrawConfig []WithDrawDesc | 69 | WithDrawConfig []WithDrawDesc |
49 | ActiveWithdrawConfig []ActiveWithdrawConfigDesc | 70 | ActiveWithdrawConfig []ActiveWithdrawConfigDesc |
50 | GuanRedBag []GuanRedBagDesc | 71 | GuanRedBag []GuanRedBagDesc |
51 | JiRedBag []JiRedBagDesc | 72 | JiRedBag []JiRedBagDesc |
73 | + GunLevelConfig []GunLevelConfigDesc | ||
74 | + WinLevelConfig []WinLevelConfigDesc | ||
75 | + OnlineRewardConfig []OnlineRewardConfigDesc | ||
52 | 76 | ||
53 | } | 77 | } |
54 | 78 | ||
@@ -56,6 +80,32 @@ func GetJsonConf() *GameConfig { | @@ -56,6 +80,32 @@ func GetJsonConf() *GameConfig { | ||
56 | return g_jsonconf | 80 | return g_jsonconf |
57 | } | 81 | } |
58 | 82 | ||
83 | +func GetOnlieRdNum(id int) *OnlineRewardConfigDesc { | ||
84 | + for _,v := range g_jsonconf.OnlineRewardConfig { | ||
85 | + if v.Id == id { | ||
86 | + return &v | ||
87 | + } | ||
88 | + } | ||
89 | + return nil | ||
90 | +} | ||
91 | + | ||
92 | +func GetWinLvRdNum(id int) *WinLevelConfigDesc { | ||
93 | + for _,v := range g_jsonconf.WinLevelConfig { | ||
94 | + if v.Id == id { | ||
95 | + return &v | ||
96 | + } | ||
97 | + } | ||
98 | + return nil | ||
99 | +} | ||
100 | + | ||
101 | +func GetGunLvRdNum(lv int) *GunLevelConfigDesc { | ||
102 | + for _,v := range g_jsonconf.GunLevelConfig { | ||
103 | + if v.Id == lv { | ||
104 | + return &v | ||
105 | + } | ||
106 | + } | ||
107 | + return nil | ||
108 | +} | ||
59 | 109 | ||
60 | func GetJiConf(id int) *JiRedBagDesc { | 110 | func GetJiConf(id int) *JiRedBagDesc { |
61 | for _,val := range g_jsonconf.JiRedBag { | 111 | for _,val := range g_jsonconf.JiRedBag { |
src/HttpServer/logic/constdef.go
@@ -56,7 +56,7 @@ const ( | @@ -56,7 +56,7 @@ const ( | ||
56 | const ( | 56 | const ( |
57 | WATCH_ADD_DAY_LIMIT = 50 //当天获取红包次数限制 | 57 | WATCH_ADD_DAY_LIMIT = 50 //当天获取红包次数限制 |
58 | FREE_REDBAG_NUM = 3 //玩家免费红包次数 | 58 | FREE_REDBAG_NUM = 3 //玩家免费红包次数 |
59 | - RANDNUMLIMIT = 10 //每日随机红包此树 | 59 | + RANDNUMLIMIT = 8 //每日随机红包此树 |
60 | READGOLDMULTI = 700 //阅读量到金币转化倍数 | 60 | READGOLDMULTI = 700 //阅读量到金币转化倍数 |
61 | SDKOPGOLD_TYPEWE = 302 //微转发金币类型 | 61 | SDKOPGOLD_TYPEWE = 302 //微转发金币类型 |
62 | ) | 62 | ) |
src/HttpServer/logic/datadef.go
@@ -124,13 +124,12 @@ type FetchredbagReq struct { | @@ -124,13 +124,12 @@ type FetchredbagReq struct { | ||
124 | Rtype int `json:"rtype"` | 124 | Rtype int `json:"rtype"` |
125 | Gameid string `json:"gameid"` | 125 | Gameid string `json:"gameid"` |
126 | Channel string `json:"channel"` | 126 | Channel string `json:"channel"` |
127 | + Param int `json:"param"` | ||
127 | } | 128 | } |
128 | 129 | ||
129 | type FetchredbagData struct { | 130 | type FetchredbagData struct { |
130 | Guanrednum int `json:"guanrednum"` | 131 | Guanrednum int `json:"guanrednum"` |
131 | - Jirednum int `json:"jirednum"` | ||
132 | - Randnum int `json:"randnum"` | ||
133 | - Specialguannum int `json:"specialguannum"` | 132 | + Timeredbagleft int `json:"timeredbagleft"` |
134 | Getgold int `json:"getgold"` | 133 | Getgold int `json:"getgold"` |
135 | Walletgold int `json:"walletgold"` | 134 | Walletgold int `json:"walletgold"` |
136 | } | 135 | } |
src/HttpServer/logic/function.go
@@ -145,7 +145,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | @@ -145,7 +145,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | ||
145 | initdata.WatchAddsTime = WATCH_ADD_DAY_LIMIT | 145 | initdata.WatchAddsTime = WATCH_ADD_DAY_LIMIT |
146 | initdata.LeftFreeRB = FREE_REDBAG_NUM | 146 | initdata.LeftFreeRB = FREE_REDBAG_NUM |
147 | initdata.UpLvCostTime = 0 | 147 | initdata.UpLvCostTime = 0 |
148 | - initdata.PassLevel = 0 | 148 | + initdata.PassLevel = 1 |
149 | initdata.BigLevel = 1 | 149 | initdata.BigLevel = 1 |
150 | initdata.SpecialLevel = 0 | 150 | initdata.SpecialLevel = 0 |
151 | initdata.GuanRedNum = 0 | 151 | initdata.GuanRedNum = 0 |
src/HttpServer/logic/httpserver.go
@@ -37,16 +37,16 @@ func startServerHttpServe() { | @@ -37,16 +37,16 @@ func startServerHttpServe() { | ||
37 | 37 | ||
38 | http.HandleFunc("/brainhole/test", TestDDT) //测试节后 | 38 | http.HandleFunc("/brainhole/test", TestDDT) //测试节后 |
39 | //---------------------------------------------------------------------------------------- | 39 | //---------------------------------------------------------------------------------------- |
40 | - http.HandleFunc("/brainhole/userlogin", UserLogin) //登录 | ||
41 | - http.HandleFunc("/brainhole/syncuserdata", Syncuserdata) //同步完结数据 | ||
42 | - http.HandleFunc("/brainhole/querygetcashinfo", Querdrawinfo) //获取提现档位信息接口 | ||
43 | - http.HandleFunc("/brainhole/getcash", Getcash) //提现 | ||
44 | - http.HandleFunc("/brainhole/getcashrecord", Getcashrecord) //提现记录列表 | ||
45 | - http.HandleFunc("/brainhole/uploadlevel", Uploadlevel) //上报当前关卡 | ||
46 | - http.HandleFunc("/brainhole/uploadbiglevel", Uploadbiglevel) //上报当前等级 | ||
47 | - http.HandleFunc("/brainhole/uploadspeciallevel", Uploadspeciallevel) //上报当前等级 | ||
48 | - http.HandleFunc("/brainhole/uploadtili", Uploadtili) //上报当前体力 | ||
49 | - http.HandleFunc("/brainhole/fetchredbag", Fetchredbag) //领取红包 | 40 | + http.HandleFunc("/gunshot/userlogin", UserLogin) //登录 |
41 | + http.HandleFunc("/gunshot/syncuserdata", Syncuserdata) //同步完结数据 | ||
42 | + http.HandleFunc("/gunshot/querygetcashinfo", Querdrawinfo) //获取提现档位信息接口 | ||
43 | + http.HandleFunc("/gunshot/getcash", Getcash) //提现 | ||
44 | + http.HandleFunc("/gunshot/getcashrecord", Getcashrecord) //提现记录列表 | ||
45 | + http.HandleFunc("/gunshot/uploadlevel", Uploadlevel) //上报当前关卡 | ||
46 | + http.HandleFunc("/gunshot/uploadbiglevel", Uploadbiglevel) //上报当前等级 | ||
47 | + http.HandleFunc("/gunshot/uploadspeciallevel", Uploadspeciallevel) //上报当前等级 | ||
48 | + http.HandleFunc("/gunshot/uploadtili", Uploadtili) //上报当前体力 | ||
49 | + http.HandleFunc("/gunshot/fetchredbag", Fetchredbag) //领取红包 | ||
50 | 50 | ||
51 | 51 | ||
52 | 52 |
src/HttpServer/logic/logic.go
@@ -7,7 +7,6 @@ import ( | @@ -7,7 +7,6 @@ import ( | ||
7 | "common/redis" | 7 | "common/redis" |
8 | "encoding/json" | 8 | "encoding/json" |
9 | "fmt" | 9 | "fmt" |
10 | - "math/rand" | ||
11 | "net/http" | 10 | "net/http" |
12 | "strconv" | 11 | "strconv" |
13 | "sync" | 12 | "sync" |
@@ -277,15 +276,9 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -277,15 +276,9 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
277 | 276 | ||
278 | 277 | ||
279 | if rdata.Rtype == 1 { | 278 | if rdata.Rtype == 1 { |
280 | - //先判断一下是否可以领取 | ||
281 | - if uinfo.GuanRedNum >= uinfo.PassLevel { | ||
282 | - logger.Error("HandlerFetchredbag failed err=%v", err) | ||
283 | - resp.Message = "没有可以领取的关卡红包" | ||
284 | - resp.Code = 1 | ||
285 | - break | ||
286 | - } | 279 | + //等级红包 |
287 | 280 | ||
288 | - cfg := jsonconf.GetGuanConf(uinfo.GuanRedNum+1) | 281 | + cfg := jsonconf.GetGunLvRdNum(rdata.Param) |
289 | if cfg == nil { | 282 | if cfg == nil { |
290 | logger.Error("HandlerFetchredbag failed err=%v", err) | 283 | logger.Error("HandlerFetchredbag failed err=%v", err) |
291 | resp.Message = "获取配置失败!" | 284 | resp.Message = "获取配置失败!" |
@@ -293,7 +286,8 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -293,7 +286,8 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
293 | break | 286 | break |
294 | } | 287 | } |
295 | 288 | ||
296 | - realgold, err := AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 108) | 289 | + addgold := int(cfg.Luckybag * 10000) |
290 | + realgold, err := AddCoinToSdk(uuid, addgold, rdata.Gameid, rdata.Channel, 108) | ||
297 | if err !=nil { | 291 | if err !=nil { |
298 | logger.Error("HandlerFetchredbag failed err=%v", err) | 292 | logger.Error("HandlerFetchredbag failed err=%v", err) |
299 | resp.Message = "服务器错误!" | 293 | resp.Message = "服务器错误!" |
@@ -301,19 +295,20 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -301,19 +295,20 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
301 | break | 295 | break |
302 | } | 296 | } |
303 | 297 | ||
304 | - resp.Data.Getgold = cfg.Cash | 298 | + resp.Data.Getgold = addgold |
305 | resp.Data.Walletgold = realgold | 299 | resp.Data.Walletgold = realgold |
306 | 300 | ||
307 | - uinfo.GuanRedNum ++ | ||
308 | }else if rdata.Rtype == 2 { | 301 | }else if rdata.Rtype == 2 { |
309 | - if uinfo.JiRedNum+1 >= uinfo.BigLevel { | 302 | + //关卡红包 |
303 | + curprocess := (uinfo.PassLevel-1) / 3 | ||
304 | + if uinfo.GuanRedNum >= curprocess { | ||
310 | logger.Error("HandlerFetchredbag failed err=%v", err) | 305 | logger.Error("HandlerFetchredbag failed err=%v", err) |
311 | resp.Message = "没有可以领取的等级红包" | 306 | resp.Message = "没有可以领取的等级红包" |
312 | resp.Code = 1 | 307 | resp.Code = 1 |
313 | break | 308 | break |
314 | } | 309 | } |
315 | 310 | ||
316 | - cfg := jsonconf.GetGuanConf(uinfo.JiRedNum+1) | 311 | + cfg := jsonconf.GetWinLvRdNum(uinfo.GuanRedNum+1) |
317 | if cfg == nil { | 312 | if cfg == nil { |
318 | logger.Error("HandlerFetchredbag failed err=%v", err) | 313 | logger.Error("HandlerFetchredbag failed err=%v", err) |
319 | resp.Message = "获取配置失败!" | 314 | resp.Message = "获取配置失败!" |
@@ -321,7 +316,8 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -321,7 +316,8 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
321 | break | 316 | break |
322 | } | 317 | } |
323 | 318 | ||
324 | - realgold, err := AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 108) | 319 | + addgold := int(cfg.LuckyBag * 10000) |
320 | + realgold, err := AddCoinToSdk(uuid, addgold, rdata.Gameid, rdata.Channel, 108) | ||
325 | if err !=nil { | 321 | if err !=nil { |
326 | logger.Error("HandlerFetchredbag failed err=%v", err) | 322 | logger.Error("HandlerFetchredbag failed err=%v", err) |
327 | resp.Message = "服务器错误!" | 323 | resp.Message = "服务器错误!" |
@@ -329,11 +325,12 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -329,11 +325,12 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
329 | break | 325 | break |
330 | } | 326 | } |
331 | 327 | ||
332 | - resp.Data.Getgold = cfg.Cash | 328 | + resp.Data.Getgold = addgold |
333 | resp.Data.Walletgold = realgold | 329 | resp.Data.Walletgold = realgold |
334 | 330 | ||
335 | - uinfo.JiRedNum ++ | 331 | + uinfo.GuanRedNum ++ |
336 | }else if rdata.Rtype == 3{ | 332 | }else if rdata.Rtype == 3{ |
333 | + //时长红包 | ||
337 | if uinfo.RandNum <= 0 { | 334 | if uinfo.RandNum <= 0 { |
338 | logger.Error("HandlerFetchredbag failed err=%v", err) | 335 | logger.Error("HandlerFetchredbag failed err=%v", err) |
339 | resp.Message = "没有可以领取的随机红包次数了!" | 336 | resp.Message = "没有可以领取的随机红包次数了!" |
@@ -341,7 +338,17 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -341,7 +338,17 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
341 | break | 338 | break |
342 | } | 339 | } |
343 | 340 | ||
344 | - getnum := rand.Intn(200) + 100 | 341 | + |
342 | + cnt := RANDNUMLIMIT +1 - uinfo.RandNum | ||
343 | + cfg := jsonconf.GetOnlieRdNum(cnt) | ||
344 | + if cfg == nil { | ||
345 | + logger.Error("HandlerFetchredbag failed err=%v", err) | ||
346 | + resp.Message = "获取配置失败!" | ||
347 | + resp.Code = 1 | ||
348 | + break | ||
349 | + } | ||
350 | + | ||
351 | + getnum := int(cfg.Luckybag*10000) | ||
345 | realgold, err := AddCoinToSdk(uuid, getnum, rdata.Gameid, rdata.Channel, 108) | 352 | realgold, err := AddCoinToSdk(uuid, getnum, rdata.Gameid, rdata.Channel, 108) |
346 | if err !=nil { | 353 | if err !=nil { |
347 | logger.Error("HandlerFetchredbag failed err=%v", err) | 354 | logger.Error("HandlerFetchredbag failed err=%v", err) |
@@ -355,7 +362,7 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -355,7 +362,7 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
355 | 362 | ||
356 | uinfo.RandNum-- | 363 | uinfo.RandNum-- |
357 | }else { | 364 | }else { |
358 | - if uinfo.SpecialLevel <= uinfo.SpecialNum { | 365 | + /*if uinfo.SpecialLevel <= uinfo.SpecialNum { |
359 | logger.Error("HandlerFetchredbag failed err=%v", err) | 366 | logger.Error("HandlerFetchredbag failed err=%v", err) |
360 | resp.Message = "没有可以领取的随机红包次数了!" | 367 | resp.Message = "没有可以领取的随机红包次数了!" |
361 | resp.Code = 1 | 368 | resp.Code = 1 |
@@ -374,17 +381,20 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | @@ -374,17 +381,20 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uuid int) { | ||
374 | resp.Data.Getgold = getnum | 381 | resp.Data.Getgold = getnum |
375 | resp.Data.Walletgold = realgold | 382 | resp.Data.Walletgold = realgold |
376 | 383 | ||
377 | - uinfo.SpecialNum++ | 384 | + uinfo.SpecialNum++*/ |
385 | + logger.Error("HandlerFetchredbag not right") | ||
386 | + resp.Message = "类型不正确" | ||
387 | + resp.Code = 1 | ||
388 | + break | ||
378 | } | 389 | } |
379 | 390 | ||
380 | 391 | ||
381 | 392 | ||
382 | SaveUserInfo(uinfo,uniqueuuid) | 393 | SaveUserInfo(uinfo,uniqueuuid) |
383 | 394 | ||
384 | - resp.Data.Randnum = uinfo.RandNum | 395 | + resp.Data.Timeredbagleft = uinfo.RandNum |
385 | resp.Data.Guanrednum = uinfo.GuanRedNum | 396 | resp.Data.Guanrednum = uinfo.GuanRedNum |
386 | - resp.Data.Jirednum = uinfo.JiRedNum | ||
387 | - resp.Data.Specialguannum = uinfo.SpecialNum | 397 | + |
388 | resp.Code = 0 | 398 | resp.Code = 0 |
389 | break | 399 | break |
390 | } | 400 | } |