Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
74d126c782
|
@ -1,4 +1,119 @@
|
|||
Id ProfessionLimit Position PropertyMin PropertyMax Pool SecondNumMin SecondNumMax SkillId IfClear
|
||||
int int int mut,int#int,1 mut,int#int,1 int int int int int
|
||||
3001 0 1 1#100 1#200 1 1 1 0 1
|
||||
3002 0 0 null null 0 0 0 0 0
|
||||
3001 1501 1 2#42 2#70 1 0 0 0 0
|
||||
3002 1501 1 2#42 2#70 1 0 0 0 0
|
||||
3003 1502 1 2#42 2#70 1 0 0 0 0
|
||||
3004 1502 1 2#42 2#70 1 0 0 0 0
|
||||
3005 1503 1 2#42 2#70 1 0 0 0 0
|
||||
3006 1503 1 2#42 2#70 1 0 0 0 0
|
||||
3007 1504 1 2#42 2#70 1 0 0 0 0
|
||||
3008 1504 1 2#42 2#70 1 0 0 0 0
|
||||
3009 1505 1 2#42 2#70 1 0 0 0 0
|
||||
3010 1505 1 2#42 2#70 1 0 0 0 0
|
||||
3011 0 2 3#43 3#72 1 0 0 0 0
|
||||
3012 0 2 3#43 3#72 1 0 0 0 0
|
||||
3013 0 2 4#40 4#67 1 0 0 0 0
|
||||
3014 0 2 4#40 4#67 1 0 0 0 0
|
||||
3015 0 4 5#24 5#28 1 0 0 0 0
|
||||
3016 0 4 5#24 5#28 1 0 0 0 0
|
||||
3017 0 3 1#460 1#767 1 0 0 0 0
|
||||
3018 0 3 1#460 1#767 1 0 0 0 0
|
||||
3101 1501 1 2#56 2#93 1 0 1 0 0
|
||||
3102 1501 1 2#56 2#93 1 0 1 0 0
|
||||
3103 1502 1 2#56 2#93 1 0 1 0 0
|
||||
3104 1502 1 2#56 2#93 1 0 1 0 0
|
||||
3105 1503 1 2#56 2#93 1 0 1 0 0
|
||||
3106 1503 1 2#56 2#93 1 0 1 0 0
|
||||
3107 1504 1 2#56 2#93 1 0 1 0 0
|
||||
3108 1504 1 2#56 2#93 1 0 1 0 0
|
||||
3109 1505 1 2#56 2#93 1 0 1 0 0
|
||||
3110 1505 1 2#56 2#93 1 0 1 0 0
|
||||
3111 0 2 3#58 3#96 2 0 1 0 0
|
||||
3112 0 2 3#58 3#96 2 0 1 0 0
|
||||
3113 0 2 4#54 4#90 2 0 1 0 0
|
||||
3114 0 2 4#54 4#90 2 0 1 0 0
|
||||
3115 0 4 5#48 5#56 3 0 1 0 0
|
||||
3116 0 4 5#48 5#56 3 0 1 0 0
|
||||
3117 0 3 1#616 1#1027 4 0 1 0 0
|
||||
3118 0 3 1#616 1#1027 4 0 1 0 0
|
||||
3201 1501 1 2#72 2#120 5 1 3 0 1
|
||||
3202 1501 1 2#72 2#120 5 1 3 0 1
|
||||
3203 1502 1 2#72 2#120 5 1 3 0 1
|
||||
3204 1502 1 2#72 2#120 5 1 3 0 1
|
||||
3205 1503 1 2#72 2#120 5 1 3 0 1
|
||||
3206 1503 1 2#72 2#120 5 1 3 0 1
|
||||
3207 1504 1 2#72 2#120 5 1 3 0 1
|
||||
3208 1504 1 2#72 2#120 5 1 3 0 1
|
||||
3209 1505 1 2#72 2#120 5 1 3 0 1
|
||||
3210 1505 1 2#72 2#120 5 1 3 0 1
|
||||
3211 0 2 3#74 3#124 6 1 3 0 1
|
||||
3212 0 2 3#74 3#124 6 1 3 0 1
|
||||
3213 0 2 4#70 4#116 6 1 3 0 1
|
||||
3214 0 2 4#70 4#116 6 1 3 0 1
|
||||
3215 0 4 5#72 5#84 7 1 3 0 1
|
||||
3216 0 4 5#72 5#84 7 1 3 0 1
|
||||
3217 0 3 1#792 1#1320 8 1 3 0 1
|
||||
3218 0 3 1#792 1#1320 8 1 3 0 1
|
||||
3301 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3302 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3303 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3304 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3305 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3306 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3307 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3308 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3309 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3310 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3311 0 2 3#396 3#659 10 2 4 0 1
|
||||
3312 0 2 3#396 3#659 10 2 4 0 1
|
||||
3313 0 2 4#370 4#617 10 2 4 0 1
|
||||
3314 0 2 4#370 4#617 10 2 4 0 1
|
||||
3315 0 4 5#96 5#113 11 2 4 0 1
|
||||
3316 0 4 5#96 5#113 11 2 4 0 1
|
||||
3317 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
3318 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
3319 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3320 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3321 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3322 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3323 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3324 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3325 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3326 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3327 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3328 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3329 0 2 3#396 3#659 10 2 4 0 1
|
||||
3330 0 2 3#396 3#659 10 2 4 0 1
|
||||
3331 0 2 4#370 4#617 10 2 4 0 1
|
||||
3332 0 2 4#370 4#617 10 2 4 0 1
|
||||
3333 0 4 5#96 5#113 11 2 4 0 1
|
||||
3334 0 4 5#96 5#113 11 2 4 0 1
|
||||
3335 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
3336 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
4001 1501 1 2#72 2#120 5 1 3 0 0
|
||||
4002 1502 1 2#72 2#120 5 1 3 0 0
|
||||
4003 1503 1 2#72 2#120 5 1 3 0 0
|
||||
4004 1504 1 2#72 2#120 5 1 3 0 0
|
||||
4005 1505 1 2#72 2#120 5 1 3 0 0
|
||||
4006 0 2 3#74 3#124 6 1 3 0 0
|
||||
4007 0 2 4#70 4#116 6 1 3 0 0
|
||||
4008 0 4 5#72 5#84 7 1 3 0 0
|
||||
4009 0 3 1#792 1#1320 8 1 3 0 0
|
||||
4101 1501 1 2#383 2#638 9 2 4 0 0
|
||||
4102 1501 1 2#383 2#638 9 2 4 0 0
|
||||
4103 1502 1 2#383 2#638 9 2 4 0 0
|
||||
4104 1502 1 2#383 2#638 9 2 4 0 0
|
||||
4105 1503 1 2#383 2#638 9 2 4 0 0
|
||||
4106 1503 1 2#383 2#638 9 2 4 0 0
|
||||
4107 1504 1 2#383 2#638 9 2 4 0 0
|
||||
4108 1504 1 2#383 2#638 9 2 4 0 0
|
||||
4109 1505 1 2#383 2#638 9 2 4 0 0
|
||||
4110 1505 1 2#383 2#638 9 2 4 0 0
|
||||
4111 0 2 3#396 3#659 10 2 4 0 0
|
||||
4112 0 2 3#396 3#659 10 2 4 0 0
|
||||
4113 0 2 4#370 4#617 10 2 4 0 0
|
||||
4114 0 2 4#370 4#617 10 2 4 0 0
|
||||
4115 0 4 5#96 5#113 11 2 4 0 0
|
||||
4116 0 4 5#96 5#113 11 2 4 0 0
|
||||
4117 0 3 1#4212 1#7020 12 2 4 0 0
|
||||
4118 0 3 1#4212 1#7020 12 2 4 0 0
|
||||
|
|
|
@ -1,3 +1,78 @@
|
|||
id PropertyId Min Max PoolNum Weight
|
||||
int int int int int int
|
||||
1 101 100 200 1 100
|
||||
1 5 11 18 1 100
|
||||
2 54 5 5 1 100
|
||||
3 53 5 5 1 100
|
||||
4 1 235 392 2 100
|
||||
5 2 19 32 2 100
|
||||
6 53 5 5 2 100
|
||||
7 54 5 5 2 100
|
||||
8 1 268 448 3 100
|
||||
9 2 17 29 3 100
|
||||
10 3 9 15 3 100
|
||||
11 4 12 20 3 100
|
||||
12 3 26 43 4 100
|
||||
13 4 27 45 4 100
|
||||
14 5 15 26 4 100
|
||||
15 5 16 19 5 100
|
||||
16 54 8 8 5 100
|
||||
17 53 8 8 5 100
|
||||
18 56 25 25 5 100
|
||||
19 55 5 5 5 100
|
||||
20 1 302 504 6 100
|
||||
21 2 25 42 6 100
|
||||
22 53 8 8 6 100
|
||||
23 54 8 8 6 100
|
||||
24 1 345 576 7 100
|
||||
25 2 22 38 7 100
|
||||
26 3 12 20 7 100
|
||||
27 4 15 26 7 100
|
||||
28 55 5 5 7 100
|
||||
29 56 10 10 7 100
|
||||
30 3 33 56 8 100
|
||||
31 4 34 58 8 100
|
||||
32 5 23 27 8 100
|
||||
33 56 10 10 8 100
|
||||
34 5 22 26 9 100
|
||||
35 54 10 10 9 100
|
||||
36 53 10 10 9 100
|
||||
37 56 40 40 9 100
|
||||
38 55 15 15 9 100
|
||||
39 101 8 15 9 100
|
||||
40 102 8 15 9 100
|
||||
41 103 8 15 9 100
|
||||
42 104 8 15 9 100
|
||||
43 105 8 15 9 100
|
||||
44 106 8 15 9 100
|
||||
45 1 1608 2680 10 100
|
||||
46 2 134 223 10 100
|
||||
47 53 10 10 10 100
|
||||
48 54 10 10 10 100
|
||||
49 107 8 15 10 100
|
||||
50 108 8 15 10 100
|
||||
51 109 8 15 10 100
|
||||
52 110 8 15 10 100
|
||||
53 111 8 15 10 100
|
||||
54 112 8 15 10 100
|
||||
55 1 1837 3063 11 100
|
||||
56 2 121 202 11 100
|
||||
57 3 63 106 11 100
|
||||
58 4 82 138 11 100
|
||||
59 55 5 5 11 100
|
||||
60 56 15 15 11 100
|
||||
61 107 5 5 11 100
|
||||
62 108 5 5 11 100
|
||||
63 109 5 5 11 100
|
||||
64 110 5 5 11 100
|
||||
65 111 5 5 11 100
|
||||
66 112 5 5 11 100
|
||||
67 3 5 5 12 100
|
||||
68 4 185 308 12 100
|
||||
69 5 31 36 12 100
|
||||
70 56 25 25 12 100
|
||||
71 101 5 10 12 100
|
||||
72 102 5 10 12 100
|
||||
73 103 5 10 12 100
|
||||
74 104 5 10 12 100
|
||||
75 105 5 10 12 100
|
||||
76 106 5 10 12 100
|
||||
|
|
|
@ -1,12 +1,24 @@
|
|||
Id Type RankupPara LimitLevel OpenLevel LimitStar OpenStar ConsumeMaterial
|
||||
int int float int int int int mut,int#int,2
|
||||
1 1 2000 30 40 3 3 14#10000|4#20
|
||||
2 1 5000 40 50 3 3 14#20000|4#40
|
||||
3 1 9000 50 60 3 3 14#30000|4#100
|
||||
4 1 14000 60 80 4 4 14#30000|4#300
|
||||
5 1 20000 80 100 5 5 14#70000|4#1000
|
||||
6 1 60000 100 140 5 6 14#120000|4#0
|
||||
7 2 2000 140 160 6 7 14#0|4#2000
|
||||
8 2 4000 160 180 7 8 14#0|4#3000
|
||||
9 2 7000 180 200 8 9 14#0|4#4000
|
||||
10 2 10000 200 250 9 10 14#0|4#10000
|
||||
Id Type RankupPara LimitLevel OpenLevel LimitStar OpenStar ConsumeMaterial Star
|
||||
int int float int int int int mut,int#int,2 int
|
||||
1 1 2000 30 40 5 5 14#10000|4#20 5
|
||||
2 1 5000 40 50 5 5 14#20000|4#40 5
|
||||
3 1 9000 50 60 5 5 14#30000|4#100 5
|
||||
4 1 14000 60 80 5 5 14#30000|4#300 5
|
||||
5 1 20000 80 100 5 5 14#70000|4#1000 5
|
||||
6 1 60000 100 140 5 6 14#120000|4#0 5
|
||||
7 2 2000 140 160 6 7 14#0|4#2000 5
|
||||
8 2 4000 160 180 7 8 14#0|4#3000 5
|
||||
9 2 7000 180 200 8 9 14#0|4#4000 5
|
||||
10 2 10000 200 250 9 10 14#0|4#10000 5
|
||||
51 1 2000 30 40 4 4 14#10000|4#20 4
|
||||
52 1 5000 40 50 4 4 14#20000|4#40 4
|
||||
53 1 9000 50 60 4 4 14#30000|4#100 4
|
||||
54 1 14000 60 80 4 4 14#30000|4#300 4
|
||||
55 1 20000 80 100 4 5 14#70000|4#1000 4
|
||||
56 1 60000 100 140 5 6 14#120000|4#0 4
|
||||
57 2 2000 140 160 6 7 14#0|4#2000 4
|
||||
58 2 4000 160 180 7 8 14#0|4#3000 4
|
||||
59 2 7000 180 200 8 9 14#0|4#4000 4
|
||||
101 1 2000 30 40 3 3 14#10000|4#20 3
|
||||
102 1 5000 40 50 3 3 14#20000|4#40 3
|
||||
103 1 9000 50 60 3 3 14#30000|4#100 3
|
||||
|
|
|
@ -1,158 +1,159 @@
|
|||
Id BackpackOrNot ItemType ItemBaseType Quantity IsStacking
|
||||
int bool int int int bool
|
||||
1 false 0 0 1 true
|
||||
2 false 0 0 2 true
|
||||
3 false 0 0 3 true
|
||||
4 true 0 4 4 true
|
||||
5 true 0 4 5 true
|
||||
6 true 0 4 1 true
|
||||
7 true 0 3 2 true
|
||||
8 true 0 3 3 true
|
||||
9 true 0 3 4 true
|
||||
10 true 0 3 5 true
|
||||
11 true 0 3 1 true
|
||||
12 true 0 3 2 true
|
||||
13 true 0 3 3 true
|
||||
14 false 0 0 4 true
|
||||
15 false 0 0 5 true
|
||||
16 false 0 0 1 true
|
||||
17 false 0 0 2 true
|
||||
18 false 0 0 3 true
|
||||
19 true 0 4 4 true
|
||||
20 true 0 4 5 true
|
||||
1001 true 0 2 1 true
|
||||
1002 true 0 2 2 true
|
||||
1003 true 0 2 3 true
|
||||
1004 true 0 2 4 true
|
||||
1005 true 0 2 5 true
|
||||
1006 true 0 2 1 true
|
||||
1007 true 0 2 2 true
|
||||
1008 true 0 2 3 true
|
||||
1009 true 0 2 4 true
|
||||
1010 true 0 4 5 true
|
||||
1011 true 0 4 1 true
|
||||
1012 true 0 4 2 true
|
||||
1013 true 0 4 3 true
|
||||
1014 true 0 4 4 true
|
||||
1015 true 0 4 5 true
|
||||
1016 true 0 4 1 true
|
||||
1017 true 0 4 2 true
|
||||
1018 true 0 4 3 true
|
||||
1019 true 0 4 4 true
|
||||
1020 true 0 4 5 true
|
||||
1021 true 0 4 1 true
|
||||
1501 true 0 2 2 true
|
||||
1502 true 0 2 3 true
|
||||
1503 true 0 2 4 true
|
||||
1504 true 0 4 5 true
|
||||
1505 true 0 4 1 true
|
||||
1506 true 0 4 2 true
|
||||
1507 true 0 4 3 true
|
||||
2001 true 0 2 4 true
|
||||
2002 true 0 2 5 true
|
||||
2003 true 0 2 1 true
|
||||
2004 true 0 2 2 true
|
||||
10001 false 1 0 5 false
|
||||
10002 false 1 0 5 false
|
||||
10003 false 1 0 5 false
|
||||
10004 false 1 0 5 false
|
||||
10005 false 1 0 5 false
|
||||
10006 false 1 0 5 false
|
||||
10007 false 1 0 5 false
|
||||
10008 false 1 0 5 false
|
||||
10009 false 1 0 5 false
|
||||
10010 false 1 0 5 false
|
||||
10011 false 1 0 5 false
|
||||
10012 false 1 0 5 false
|
||||
10013 false 1 0 5 false
|
||||
10014 false 1 0 5 false
|
||||
10015 false 1 0 5 false
|
||||
10016 false 1 0 5 false
|
||||
10017 false 1 0 5 false
|
||||
10018 false 1 0 5 false
|
||||
10019 false 1 0 5 false
|
||||
10020 false 1 0 5 false
|
||||
10021 false 1 0 5 false
|
||||
10022 false 1 0 5 false
|
||||
10023 false 1 0 5 false
|
||||
10024 false 1 0 5 false
|
||||
10025 false 1 0 5 false
|
||||
10026 false 1 0 5 false
|
||||
10027 false 1 0 5 false
|
||||
10028 false 1 0 5 false
|
||||
10029 false 1 0 5 false
|
||||
10030 false 1 0 5 false
|
||||
10031 false 1 0 5 false
|
||||
10032 false 1 0 5 false
|
||||
10033 false 1 0 5 false
|
||||
10034 false 1 0 5 false
|
||||
10035 false 1 0 5 false
|
||||
10036 false 1 0 5 false
|
||||
10037 false 1 0 5 false
|
||||
10038 false 1 0 5 false
|
||||
10039 false 1 0 5 false
|
||||
10040 false 1 0 5 false
|
||||
10041 false 1 0 5 false
|
||||
10042 false 1 0 5 false
|
||||
10043 false 1 0 5 false
|
||||
10044 false 1 0 5 false
|
||||
10045 false 1 0 5 false
|
||||
10046 false 1 0 5 false
|
||||
10047 false 1 0 5 false
|
||||
10048 false 1 0 5 false
|
||||
10049 false 1 0 5 false
|
||||
10050 false 1 0 5 false
|
||||
10051 false 1 0 5 false
|
||||
10052 false 1 0 5 false
|
||||
11001 true 2 5 5 true
|
||||
11002 true 2 5 5 true
|
||||
11003 true 2 5 5 true
|
||||
11004 true 2 5 5 true
|
||||
11005 true 2 5 5 true
|
||||
11006 true 2 5 5 true
|
||||
11007 true 2 5 5 true
|
||||
11008 true 2 5 5 true
|
||||
11009 true 2 5 5 true
|
||||
11010 true 2 5 5 true
|
||||
11011 true 2 5 5 true
|
||||
11012 true 2 5 5 true
|
||||
11013 true 2 5 5 true
|
||||
11014 true 2 5 5 true
|
||||
11015 true 2 5 5 true
|
||||
11016 true 2 5 5 true
|
||||
11017 true 2 5 5 true
|
||||
11018 true 2 5 5 true
|
||||
11019 true 2 5 5 true
|
||||
11020 true 2 5 5 true
|
||||
11021 true 2 5 5 true
|
||||
11022 true 2 5 5 true
|
||||
11023 true 2 5 5 true
|
||||
11024 true 2 5 5 true
|
||||
11025 true 2 5 5 true
|
||||
11026 true 2 5 5 true
|
||||
11027 true 2 5 5 true
|
||||
11028 true 2 5 5 true
|
||||
11029 true 2 5 5 true
|
||||
11030 true 2 5 5 true
|
||||
11031 true 2 5 5 true
|
||||
11032 true 2 5 5 true
|
||||
11033 true 2 5 5 true
|
||||
11034 true 2 5 5 true
|
||||
11035 true 2 5 5 true
|
||||
11036 true 2 5 5 true
|
||||
11037 true 2 5 5 true
|
||||
11038 true 2 5 5 true
|
||||
11039 true 2 5 5 true
|
||||
11040 true 2 5 5 true
|
||||
11041 true 2 5 5 true
|
||||
11042 true 2 5 5 true
|
||||
11043 true 2 5 5 true
|
||||
11044 true 2 5 5 true
|
||||
11045 true 2 5 5 true
|
||||
11046 true 2 5 5 true
|
||||
11047 true 2 5 5 true
|
||||
11048 true 2 5 5 true
|
||||
11049 true 2 5 5 true
|
||||
11050 true 2 5 5 true
|
||||
11051 true 2 5 5 true
|
||||
11052 true 2 5 5 true
|
||||
Id BackpackOrNot ItemType ItemBaseType Quantity Isopen Price UseType RewardGroup UsePerCount
|
||||
int bool int int int bool mut,int#int,1 int int int
|
||||
1 false 0 0 1 false null 0 0 0
|
||||
2 false 0 0 2 false null 0 0 0
|
||||
3 false 0 0 3 false null 0 0 0
|
||||
4 true 0 4 4 false null 0 0 0
|
||||
5 true 0 4 5 false null 0 0 0
|
||||
6 true 0 4 1 false null 0 0 0
|
||||
7 true 0 3 2 false null 0 0 0
|
||||
8 true 0 3 3 false null 0 0 0
|
||||
9 true 0 3 4 false null 0 0 0
|
||||
10 true 0 3 5 false null 0 0 0
|
||||
11 true 0 3 1 false null 0 0 0
|
||||
12 true 0 3 2 false null 0 0 0
|
||||
13 true 0 3 3 false null 0 0 0
|
||||
14 false 0 0 4 false null 0 0 0
|
||||
15 false 0 0 5 false null 0 0 0
|
||||
16 false 0 0 1 false null 0 0 0
|
||||
17 false 0 0 2 false null 0 0 0
|
||||
18 false 0 0 3 false null 0 0 0
|
||||
19 true 0 4 4 false null 0 0 0
|
||||
20 true 0 4 5 false null 0 0 0
|
||||
1001 true 0 2 1 false null 0 0 0
|
||||
1002 true 0 2 2 false null 0 0 0
|
||||
1003 true 0 2 3 false null 0 0 0
|
||||
1004 true 0 2 4 false null 0 0 0
|
||||
1005 true 0 2 5 false null 0 0 0
|
||||
1006 true 0 2 1 false null 0 0 0
|
||||
1007 true 0 2 2 false null 0 0 0
|
||||
1008 true 0 2 3 false null 0 0 0
|
||||
1009 true 0 2 4 false null 0 0 0
|
||||
1010 true 0 4 5 false null 0 0 0
|
||||
1011 true 0 4 1 false null 0 0 0
|
||||
1012 true 0 4 2 false null 0 0 0
|
||||
1013 true 0 4 3 false null 0 0 0
|
||||
1014 true 0 4 4 false null 0 0 0
|
||||
1015 true 0 4 5 false null 0 0 0
|
||||
1016 true 0 4 1 false null 0 0 0
|
||||
1017 true 0 4 2 false null 0 0 0
|
||||
1018 true 0 4 3 false null 0 0 0
|
||||
1019 true 0 4 4 false null 0 0 0
|
||||
1020 true 0 4 5 false null 0 0 0
|
||||
1021 true 0 4 1 false null 0 0 0
|
||||
1501 true 0 2 2 false null 0 0 0
|
||||
1502 true 0 2 3 false null 0 0 0
|
||||
1503 true 0 2 4 false null 0 0 0
|
||||
1504 true 0 4 5 false null 0 0 0
|
||||
1505 true 0 4 1 false null 0 0 0
|
||||
1506 true 0 4 2 false null 0 0 0
|
||||
1507 true 0 4 3 false null 0 0 0
|
||||
2001 true 0 2 4 false null 0 0 0
|
||||
2002 true 0 2 5 false null 0 0 0
|
||||
2003 true 0 2 1 false null 0 0 0
|
||||
2004 true 0 2 2 false null 0 0 0
|
||||
10001 false 1 0 5 false null 0 0 0
|
||||
10002 false 1 0 5 false null 0 0 0
|
||||
10003 false 1 0 5 false null 0 0 0
|
||||
10004 false 1 0 5 false null 0 0 0
|
||||
10005 false 1 0 5 false null 0 0 0
|
||||
10006 false 1 0 5 false null 0 0 0
|
||||
10007 false 1 0 5 false null 0 0 0
|
||||
10008 false 1 0 5 false null 0 0 0
|
||||
10009 false 1 0 5 false null 0 0 0
|
||||
10010 false 1 0 5 false null 0 0 0
|
||||
10011 false 1 0 5 false null 0 0 0
|
||||
10012 false 1 0 5 false null 0 0 0
|
||||
10013 false 1 0 5 false null 0 0 0
|
||||
10014 false 1 0 5 false null 0 0 0
|
||||
10015 false 1 0 5 false null 0 0 0
|
||||
10016 false 1 0 5 false null 0 0 0
|
||||
10017 false 1 0 5 false null 0 0 0
|
||||
10018 false 1 0 5 false null 0 0 0
|
||||
10019 false 1 0 5 false null 0 0 0
|
||||
10020 false 1 0 5 false null 0 0 0
|
||||
10021 false 1 0 5 false null 0 0 0
|
||||
10022 false 1 0 5 false null 0 0 0
|
||||
10023 false 1 0 5 false null 0 0 0
|
||||
10024 false 1 0 5 false null 0 0 0
|
||||
10025 false 1 0 5 false null 0 0 0
|
||||
10026 false 1 0 5 false null 0 0 0
|
||||
10027 false 1 0 5 false null 0 0 0
|
||||
10028 false 1 0 5 false null 0 0 0
|
||||
10029 false 1 0 5 false null 0 0 0
|
||||
10030 false 1 0 5 false null 0 0 0
|
||||
10031 false 1 0 5 false null 0 0 0
|
||||
10032 false 1 0 5 false null 0 0 0
|
||||
10033 false 1 0 5 false null 0 0 0
|
||||
10034 false 1 0 5 false null 0 0 0
|
||||
10035 false 1 0 5 false null 0 0 0
|
||||
10036 false 1 0 5 false null 0 0 0
|
||||
10037 false 1 0 5 false null 0 0 0
|
||||
10038 false 1 0 5 false null 0 0 0
|
||||
10039 false 1 0 5 false null 0 0 0
|
||||
10040 false 1 0 5 false null 0 0 0
|
||||
10041 false 1 0 5 false null 0 0 0
|
||||
10042 false 1 0 5 false null 0 0 0
|
||||
10043 false 1 0 5 false null 0 0 0
|
||||
10044 false 1 0 5 false null 0 0 0
|
||||
10045 false 1 0 5 false null 0 0 0
|
||||
10046 false 1 0 5 false null 0 0 0
|
||||
10047 false 1 0 5 false null 0 0 0
|
||||
10048 false 1 0 5 false null 0 0 0
|
||||
10049 false 1 0 5 false null 0 0 0
|
||||
10050 false 1 0 5 false null 0 0 0
|
||||
10051 false 1 0 5 false null 0 0 0
|
||||
10052 false 1 0 5 false null 0 0 0
|
||||
11001 true 2 5 5 false 14#1000 1 101 50
|
||||
11002 true 2 5 5 false 14#1001 1 102 50
|
||||
11003 true 2 5 5 false 14#1002 1 103 50
|
||||
11004 true 2 5 5 false 14#1003 1 104 50
|
||||
11005 true 2 5 5 false 14#1004 1 105 50
|
||||
11006 true 2 5 5 false 14#1005 1 106 50
|
||||
11007 true 2 5 5 false 14#1006 1 107 50
|
||||
11008 true 2 5 5 false 14#1007 1 108 50
|
||||
11009 true 2 5 5 false 14#1008 1 109 50
|
||||
11010 true 2 5 5 false 14#1009 1 110 50
|
||||
11011 true 2 5 5 false 14#1010 1 111 50
|
||||
11012 true 2 5 5 false 14#1011 1 112 50
|
||||
11013 true 2 5 5 false 14#1012 1 113 50
|
||||
11014 true 2 5 5 false 14#1013 1 114 50
|
||||
11015 true 2 5 5 false 14#1014 1 115 50
|
||||
11016 true 2 5 5 false 14#1015 1 116 50
|
||||
11017 true 2 5 5 false 14#1016 1 117 50
|
||||
11018 true 2 5 5 false 14#1017 1 118 50
|
||||
11019 true 2 5 5 false 14#1018 1 119 50
|
||||
11020 true 2 5 5 false 14#1019 1 120 50
|
||||
11021 true 2 5 5 false 14#1020 1 121 50
|
||||
11022 true 2 5 5 false 14#1021 1 122 50
|
||||
11023 true 2 5 5 false 14#1022 1 123 50
|
||||
11024 true 2 5 5 false 14#1023 1 124 40
|
||||
11025 true 2 5 5 false 14#1024 1 125 40
|
||||
11026 true 2 5 5 false 14#1025 1 126 40
|
||||
11027 true 2 5 5 false 14#1026 1 127 40
|
||||
11028 true 2 5 5 false 14#1027 1 128 40
|
||||
11029 true 2 5 5 false 14#1028 1 129 40
|
||||
11030 true 2 5 5 false 14#1029 1 130 40
|
||||
11031 true 2 5 5 false 14#1030 1 131 40
|
||||
11032 true 2 5 5 false 14#1031 1 132 40
|
||||
11033 true 2 5 5 false 14#1032 1 133 40
|
||||
11034 true 2 5 5 false 14#1033 1 134 40
|
||||
11035 true 2 5 5 false 14#1034 1 135 40
|
||||
11036 true 2 5 5 false 14#1035 1 136 40
|
||||
11037 true 2 5 5 false 14#1036 1 137 40
|
||||
11038 true 2 5 5 false 14#1037 1 138 40
|
||||
11039 true 2 5 5 false 14#1038 1 139 40
|
||||
11040 true 2 5 5 false 14#1039 1 140 40
|
||||
11041 true 2 5 5 false 14#1040 1 141 40
|
||||
11042 true 2 5 5 false 14#1041 1 142 40
|
||||
11043 true 2 5 5 false 14#1042 1 143 40
|
||||
11044 true 2 5 5 false 14#1043 1 144 40
|
||||
11045 true 2 5 5 false 14#1044 1 145 40
|
||||
11046 true 2 5 5 false 14#1045 1 146 40
|
||||
11047 true 2 5 5 false 14#1046 1 147 30
|
||||
11048 true 2 5 5 false 14#1047 1 148 30
|
||||
11049 true 2 5 5 false 14#1048 1 149 30
|
||||
11050 true 2 5 5 false 14#1049 1 150 30
|
||||
11051 true 2 5 5 false 14#1050 1 151 30
|
||||
11052 true 2 5 5 false 14#1051 1 152 30
|
||||
400001 true 0 3 5 false 14#1000 1 2 1
|
||||
|
|
|
@ -1,3 +1,56 @@
|
|||
Id IsUpset RewardItem RewardMaxNum Loop
|
||||
int int mut,int#int,1 int int
|
||||
1 2 1#2#3#4#5#6#7#8#9#10#11#12#13#14#15#16#17#18#19#20#21#22#23#24#25#26#27#28#29#30#31#32#33#34#35#36#37#38#39#40#41#42#43#44#45#46#47#48#49#50#51#52#53#54#55#56 1 0
|
||||
1 2 1#2#3#4#5#6#7#8#9#10#11#12#13#14#15#16#17#18#19#20#21#22#23#24#25#26#27#28#29#30#31#32#33#34#35#36#37#38#39#40#41#42#43#44#45#46#47#48#49#50#51#52 1 0
|
||||
2 2 1#2#3#4#5#6#7#8#9#10#11#12#13#14#15#16#17#18#19#20#21#22#23#24#25#26#27#28#29#30#31#32#33#34#35#36#37#38#39#40#41#42#43#44#45#46#47#48#49#50#51#52 1 0
|
||||
101 1 101 1 0
|
||||
102 1 102 1 0
|
||||
103 1 103 1 0
|
||||
104 1 104 1 0
|
||||
105 1 105 1 0
|
||||
106 1 106 1 0
|
||||
107 1 107 1 0
|
||||
108 1 108 1 0
|
||||
109 1 109 1 0
|
||||
110 1 110 1 0
|
||||
111 1 111 1 0
|
||||
112 1 112 1 0
|
||||
113 1 113 1 0
|
||||
114 1 114 1 0
|
||||
115 1 115 1 0
|
||||
116 1 116 1 0
|
||||
117 1 117 1 0
|
||||
118 1 118 1 0
|
||||
119 1 119 1 0
|
||||
120 1 120 1 0
|
||||
121 1 121 1 0
|
||||
122 1 122 1 0
|
||||
123 1 123 1 0
|
||||
124 1 124 1 0
|
||||
125 1 125 1 0
|
||||
126 1 126 1 0
|
||||
127 1 127 1 0
|
||||
128 1 128 1 0
|
||||
129 1 129 1 0
|
||||
130 1 130 1 0
|
||||
131 1 131 1 0
|
||||
132 1 132 1 0
|
||||
133 1 133 1 0
|
||||
134 1 134 1 0
|
||||
135 1 135 1 0
|
||||
136 1 136 1 0
|
||||
137 1 137 1 0
|
||||
138 1 138 1 0
|
||||
139 1 139 1 0
|
||||
140 1 140 1 0
|
||||
141 1 141 1 0
|
||||
142 1 142 1 0
|
||||
143 1 143 1 0
|
||||
144 1 144 1 0
|
||||
145 1 145 1 0
|
||||
146 1 146 1 0
|
||||
147 1 147 1 0
|
||||
148 1 148 1 0
|
||||
149 1 149 1 0
|
||||
150 1 150 1 0
|
||||
151 1 151 1 0
|
||||
152 1 152 1 0
|
||||
|
|
|
@ -1,58 +1,106 @@
|
|||
id itemId Chance GrowChance RandomMin RandomMax
|
||||
int int int int int int
|
||||
1 10001 100 0 1 1
|
||||
2 10002 100 0 1 1
|
||||
3 10003 100 0 1 1
|
||||
4 10004 100 0 1 1
|
||||
5 10005 100 0 1 1
|
||||
6 10006 100 0 1 1
|
||||
7 10007 100 0 1 1
|
||||
8 10008 100 0 1 1
|
||||
9 10009 100 0 1 1
|
||||
10 10010 100 0 1 1
|
||||
11 10011 100 0 1 1
|
||||
12 10012 100 0 1 1
|
||||
13 10013 100 0 1 1
|
||||
14 10014 100 0 1 1
|
||||
15 10015 100 0 1 1
|
||||
16 10016 100 0 1 1
|
||||
17 10017 100 0 1 1
|
||||
18 10018 100 0 1 1
|
||||
19 10019 100 0 1 1
|
||||
20 10020 100 0 1 1
|
||||
21 10021 100 0 1 1
|
||||
22 10022 100 0 1 1
|
||||
23 10023 100 0 1 1
|
||||
24 10024 100 0 1 1
|
||||
25 10025 100 0 1 1
|
||||
26 10026 100 0 1 1
|
||||
27 10027 100 0 1 1
|
||||
28 10028 100 0 1 1
|
||||
29 10029 100 0 1 1
|
||||
30 10030 100 0 1 1
|
||||
31 10031 100 0 1 1
|
||||
32 10032 100 0 1 1
|
||||
33 10033 100 0 1 1
|
||||
34 10034 100 0 1 1
|
||||
35 10035 100 0 1 1
|
||||
36 10036 100 0 1 1
|
||||
37 10037 100 0 1 1
|
||||
38 10038 100 0 1 1
|
||||
39 10039 100 0 1 1
|
||||
40 10040 100 0 1 1
|
||||
41 10041 100 0 1 1
|
||||
42 10042 100 0 1 1
|
||||
43 10043 100 0 1 1
|
||||
44 10044 100 0 1 1
|
||||
45 10045 100 0 1 1
|
||||
46 10046 100 0 1 1
|
||||
47 10047 100 0 1 1
|
||||
48 10048 100 0 1 1
|
||||
49 10049 100 0 1 1
|
||||
50 10050 100 0 1 1
|
||||
51 10051 100 0 1 1
|
||||
52 10052 100 0 1 1
|
||||
53 10053 100 0 1 1
|
||||
54 10054 100 0 1 1
|
||||
55 10055 100 0 1 1
|
||||
56 10056 100 0 1 1
|
||||
Id ItemId Chance GrowChance RandomMin RandomMax
|
||||
int int int float int int
|
||||
1 10001 100 1 1 1
|
||||
2 10002 100 1 1 1
|
||||
3 10003 100 1 1 1
|
||||
4 10004 100 1 1 1
|
||||
5 10005 100 1 1 1
|
||||
6 10006 100 1 1 1
|
||||
7 10007 100 1 1 1
|
||||
8 10008 100 1 1 1
|
||||
9 10009 100 1 1 1
|
||||
10 10010 100 1 1 1
|
||||
11 10011 100 1 1 1
|
||||
12 10012 100 1 1 1
|
||||
13 10013 100 1 1 1
|
||||
14 10014 100 1 1 1
|
||||
15 10015 100 1 1 1
|
||||
16 10016 100 1 1 1
|
||||
17 10017 100 1 1 1
|
||||
18 10018 100 1 1 1
|
||||
19 10019 100 1 1 1
|
||||
20 10020 100 1 1 1
|
||||
21 10021 100 1 1 1
|
||||
22 10022 100 1 1 1
|
||||
23 10023 100 1 1 1
|
||||
24 10024 100 1 1 1
|
||||
25 10025 100 1 1 1
|
||||
26 10026 100 1 1 1
|
||||
27 10027 100 1 1 1
|
||||
28 10028 100 1 1 1
|
||||
29 10029 100 1 1 1
|
||||
30 10030 100 1 1 1
|
||||
31 10031 100 1 1 1
|
||||
32 10032 100 1 1 1
|
||||
33 10033 100 1 1 1
|
||||
34 10034 100 1 1 1
|
||||
35 10035 100 1 1 1
|
||||
36 10036 100 1 1 1
|
||||
37 10037 100 1 1 1
|
||||
38 10038 100 1 1 1
|
||||
39 10039 100 1 1 1
|
||||
40 10040 100 1 1 1
|
||||
41 10041 100 1 1 1
|
||||
42 10042 100 1 1 1
|
||||
43 10043 100 1 1 1
|
||||
44 10044 100 1 1 1
|
||||
45 10045 100 1 1 1
|
||||
46 10046 100 1 1 1
|
||||
47 10047 100 1 1 1
|
||||
48 10048 100 1 1 1
|
||||
49 10049 100 1 1 1
|
||||
50 10050 100 1 1 1
|
||||
51 10051 100 1 1 1
|
||||
52 10052 100 1 1 1
|
||||
101 10001 100 1 1 1
|
||||
102 10002 100 1 1 1
|
||||
103 10003 100 1 1 1
|
||||
104 10004 100 1 1 1
|
||||
105 10005 100 1 1 1
|
||||
106 10006 100 1 1 1
|
||||
107 10007 100 1 1 1
|
||||
108 10008 100 1 1 1
|
||||
109 10009 100 1 1 1
|
||||
110 10010 100 1 1 1
|
||||
111 10011 100 1 1 1
|
||||
112 10012 100 1 1 1
|
||||
113 10013 100 1 1 1
|
||||
114 10014 100 1 1 1
|
||||
115 10015 100 1 1 1
|
||||
116 10016 100 1 1 1
|
||||
117 10017 100 1 1 1
|
||||
118 10018 100 1 1 1
|
||||
119 10019 100 1 1 1
|
||||
120 10020 100 1 1 1
|
||||
121 10021 100 1 1 1
|
||||
122 10022 100 1 1 1
|
||||
123 10023 100 1 1 1
|
||||
124 10024 100 1 1 1
|
||||
125 10025 100 1 1 1
|
||||
126 10026 100 1 1 1
|
||||
127 10027 100 1 1 1
|
||||
128 10028 100 1 1 1
|
||||
129 10029 100 1 1 1
|
||||
130 10030 100 1 1 1
|
||||
131 10031 100 1 1 1
|
||||
132 10032 100 1 1 1
|
||||
133 10033 100 1 1 1
|
||||
134 10034 100 1 1 1
|
||||
135 10035 100 1 1 1
|
||||
136 10036 100 1 1 1
|
||||
137 10037 100 1 1 1
|
||||
138 10038 100 1 1 1
|
||||
139 10039 100 1 1 1
|
||||
140 10040 100 1 1 1
|
||||
141 10041 100 1 1 1
|
||||
142 10042 100 1 1 1
|
||||
143 10043 100 1 1 1
|
||||
144 10044 100 1 1 1
|
||||
145 10045 100 1 1 1
|
||||
146 10046 100 1 1 1
|
||||
147 10047 100 1 1 1
|
||||
148 10048 100 1 1 1
|
||||
149 10049 100 1 1 1
|
||||
150 10050 100 1 1 1
|
||||
151 10051 100 1 1 1
|
||||
152 10052 100 1 1 1
|
||||
|
|
|
@ -1,196 +0,0 @@
|
|||
package com.ljsd.jieling.util;
|
||||
|
||||
import com.ljsd.jieling.globals.Global;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
|
||||
public class MailUtil {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(MailUtil.class);
|
||||
|
||||
private MailUtil(){}
|
||||
|
||||
public static class Instance {
|
||||
public final static MailUtil instance = new MailUtil();
|
||||
}
|
||||
|
||||
public static MailUtil getInstance() {
|
||||
return MailUtil.Instance.instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户的所有邮件
|
||||
* @param userId
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<CommonProto.Mail> getAllUserMail(int userId) throws Exception {
|
||||
List<CommonProto.Mail> mailList = new CopyOnWriteArrayList<>();
|
||||
User user = UserManager.getUser(userId);
|
||||
MailManager mailManager = user.getMailManager();
|
||||
Map<String, Mail> mailMap = mailManager.getMailMap();
|
||||
// 获取系统邮件
|
||||
List<SystemMail> systemMail = getSystemMail();
|
||||
|
||||
systemMailToUserMail(systemMail,mailMap,userId);
|
||||
if (mailMap.size() ==0){
|
||||
return mailList;
|
||||
}
|
||||
List<Mail> cMailList = new CopyOnWriteArrayList<>();
|
||||
for (Map.Entry<String,Mail> entry :mailMap.entrySet()){
|
||||
Mail cMail = entry.getValue();
|
||||
int nowTime = (int)(TimeUtils.now()/1000);
|
||||
if (cMail.getEffectiveTime() != 0 && (nowTime - cMail.getSendTime()) > cMail.getEffectiveTime()){
|
||||
mailManager.removeMail(cMail.getId());
|
||||
continue;
|
||||
}
|
||||
cMailList.add(cMail);
|
||||
}
|
||||
//超过邮件上限, 删除时间最早的一封
|
||||
if (cMailList.size() > Global.MAIL_BOX_CAPACITY){
|
||||
Collections.sort(cMailList, Comparator.comparingInt(Mail::getSendTime));
|
||||
for(int i = 0; i < (cMailList.size()-Global.MAIL_BOX_CAPACITY); i++){
|
||||
cMailList.remove(0);
|
||||
mailManager.removeMail(cMailList.get(0).getId());
|
||||
}
|
||||
}
|
||||
getAllMailProtoList(cMailList,mailList);
|
||||
return mailList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将系统邮件生成用户邮件
|
||||
* @param systemMailList
|
||||
* @param mailMap
|
||||
*/
|
||||
private void systemMailToUserMail(List<SystemMail> systemMailList, Map<String, Mail> mailMap,int userId) throws Exception {
|
||||
MailingSystem mailingSystem = MailingSystemManager.getMailingSystem();
|
||||
SysMailManager sysMailManager = mailingSystem.getSysMailManager();
|
||||
SysMail sysMail = sysMailManager.getSysMail(userId);
|
||||
User user = UserManager.getUser(userId);
|
||||
long createTime = user.getPlayerInfoManager().getCreateTime();
|
||||
String clientVersion = user.getPlayerInfoManager().getClientVersion();
|
||||
List<Integer> sysMailIds = sysMail.getSysMailIds();
|
||||
for (SystemMail systemMail:systemMailList){
|
||||
int systemId = systemMail.getId();
|
||||
if (systemMail.getUserList().size() !=0 || !systemMail.getUserList().contains(userId)){
|
||||
continue;
|
||||
}
|
||||
if (sysMailIds.contains(systemId)){
|
||||
continue;
|
||||
}
|
||||
if (createTime >= systemMail.getRegisterEndTime() && systemMail.getRegisterEndTime() != 0) {
|
||||
continue;
|
||||
}
|
||||
String[] split = systemMail.getVersion().split(",");
|
||||
Set<String> version = new HashSet<>(Arrays.asList(split));
|
||||
if (!version.contains(clientVersion) || !"0".equals(systemMail.getVersion())) {
|
||||
continue;
|
||||
}
|
||||
sysMailIds.add(systemId);
|
||||
sysMail.setSysMailIds(sysMailIds);
|
||||
sysMailManager.addSystemMail(sysMail);
|
||||
initUserMail(userId,systemMail,user.getMailManager(),mailMap);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void initUserMail(int userId, SystemMail systemMail,MailManager mailManager,Map<String, Mail> mailMap) throws Exception {
|
||||
int sendTime = (int) (TimeUtils.now()/1000);
|
||||
Mail mail = new Mail(userId,systemMail.getTitle(),systemMail.getContent(),systemMail.getReward(),sendTime,systemMail.getEffectiveTime(),systemMail.getName(),Global.MAIL_TYPE_SYS);
|
||||
mailManager.addMail(mail);
|
||||
mailMap.put(mail.getId(),mail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有系统邮件
|
||||
*
|
||||
*/
|
||||
private List<SystemMail> getSystemMail() {
|
||||
MailingSystem mailingSystem = MailingSystemManager.getMailingSystem();
|
||||
SystemMailManager systemMailManager = mailingSystem.getSystemMailManager();
|
||||
Map<Integer, SystemMail> systemMailMap = systemMailManager.getSystemMailMap();
|
||||
List<SystemMail> systemMailsList = new CopyOnWriteArrayList<>();
|
||||
int nowTime = (int)(TimeUtils.now()/1000);
|
||||
for (Map.Entry<Integer,SystemMail> entry:systemMailMap.entrySet()){
|
||||
SystemMail systemMail = entry.getValue();
|
||||
int time = nowTime + systemMail.getEffectiveTime();
|
||||
if (systemMail.getEffectiveTime() !=0 || nowTime > time){
|
||||
continue;
|
||||
}
|
||||
systemMailsList.add(systemMail);
|
||||
}
|
||||
return systemMailsList;
|
||||
}
|
||||
|
||||
private void getAllMailProtoList(List<Mail> cMailList, List<CommonProto.Mail> mailList) {
|
||||
for (Mail mail :cMailList){
|
||||
mailList.add(CBean2Proto.getMail(mail));
|
||||
}
|
||||
}
|
||||
|
||||
// 读取邮件
|
||||
public void readMail(ISession iSession, String mailId) throws Exception {
|
||||
int msgId = MessageTypeProto.MessageType.GET_ALL_MAIL_INFO_RESPONSE_VALUE;
|
||||
int uid = iSession.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
MailManager mailManager = user.getMailManager();
|
||||
Mail mail = mailManager.getMailMap().get(mailId);
|
||||
if (mail == null){
|
||||
MessageUtil.sendErrorResponse(iSession,0,msgId,"");
|
||||
}
|
||||
mail.setState(Global.MAIL_STATE_READ);
|
||||
mailManager.addMail(mail);
|
||||
MessageUtil.sendMessage(iSession, 1,msgId, null, true);
|
||||
}
|
||||
|
||||
//领取附件
|
||||
public CommonProto.Drop.Builder takeMail(List<String> mailIdsList, int userId) throws Exception {
|
||||
User user = UserManager.getUser(userId);
|
||||
MailManager mailManager = user.getMailManager();
|
||||
StringBuilder mailItem = new StringBuilder();
|
||||
for (String mailId : mailIdsList){
|
||||
Mail mail = mailManager.getMail(mailId);
|
||||
if (mail == null){
|
||||
continue;
|
||||
}
|
||||
if (mailItem.length() == 0){
|
||||
mailItem = new StringBuilder(mail.getMailItem());
|
||||
}else{
|
||||
mailItem.append("|").append(mail.getMailItem());
|
||||
}
|
||||
|
||||
}
|
||||
int[][] itemArr = StringUtil.parseFiledInt2(mailItem.toString());
|
||||
CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, itemArr);
|
||||
return dropBuilder;
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送系统邮件
|
||||
*/
|
||||
public void sendSystemMail(String title,List<Integer> userList,String content,int sendTime, String reward,
|
||||
int effectiveTime,String sendName,long registerEndTime,String version) throws Exception {
|
||||
MailingSystem mailingSystem = MailingSystemManager.getMailingSystem();
|
||||
String name = mailingSystem.getSystemMailManager().getName();
|
||||
AutoIncrementManager autoIncrementManager = mailingSystem.getcAutoIncrementManager();
|
||||
autoIncrementManager.addAutoIncrement(new AutoIncrement(name));
|
||||
SystemMailManager systemMailManager = mailingSystem.getSystemMailManager();
|
||||
int id = getSystemMailId(autoIncrementManager,name);
|
||||
systemMailManager.addSystemMail(new SystemMail(id,title,userList,content,sendTime,reward,effectiveTime,sendName,registerEndTime,version));
|
||||
MailingSystemManager.ljsdMongoTemplate.lastUpdate();
|
||||
}
|
||||
|
||||
private static int getSystemMailId(AutoIncrementManager autoIncrementManager,String name) throws Exception {
|
||||
AutoIncrement autoIncrement = autoIncrementManager.getAutoIncrement(name);
|
||||
int cnt = autoIncrement.getCnt();
|
||||
autoIncrement.setCnt(cnt+1);
|
||||
return cnt;
|
||||
}
|
||||
}
|
|
@ -18,7 +18,7 @@ public class NettyClient {
|
|||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(NettyClient.class);
|
||||
|
||||
private static int uid = 10000026;
|
||||
private static int uid = 10000061;
|
||||
private static int msgIndex = 1;
|
||||
private static int token=543242;
|
||||
|
||||
|
@ -41,15 +41,33 @@ public class NettyClient {
|
|||
LOGGER.info(gameMessage.toString());
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
|
||||
handler.sendRequest_jieling(makeFinalMessage(gameMessage, MessageTypeProto.MessageType.LOGIN_REQUEST_VALUE));
|
||||
handler.sendRequest_jieling(makeFinalMessage(gameMessage, MessageTypeProto.MessageType.LOGIN_REQUEST_VALUE));
|
||||
// handler.sendRequest_jieling(makeFinalMessage(getHero(), MessageTypeProto.MessageType.GET_HEROINFO_REQUEST_VALUE));
|
||||
// handler.sendRequest_jieling(makeFinalMessage(getRandomHero(), MessageTypeProto.MessageType.HERO_RAND_REQQUEST_VALUE));
|
||||
// for (int i = 1000; i< 1500;i++){
|
||||
handler.sendRequest_jieling(makeFinalMessage(gmRequest(0), MessageTypeProto.MessageType.GM_REQUEST_VALUE));
|
||||
// handler.sendRequest_jieling(makeFinalMessage(gmRequest(11001), MessageTypeProto.MessageType.GM_REQUEST_VALUE));
|
||||
handler.sendRequest_jieling(makeFinalMessage(useAndPriceItemRequest(0,11001,2), MessageTypeProto.MessageType.USER_AND_PRICE_ITEM_REQUEST_VALUE));
|
||||
// handler.sendRequest_jieling(makeFinalMessage(heroComperRequest(1001,10), MessageTypeProto.MessageType.HERO_COMPOSE_REQUEST_VALUE));
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
private static MessageLite heroComperRequest(int itemId, int itemNum) {
|
||||
CommonProto.Item item = CommonProto.Item.newBuilder()
|
||||
.setItemId(itemId)
|
||||
.setItemNum(itemNum)
|
||||
.build();
|
||||
return HeroInfoProto.HeroComposeRequest.newBuilder().setItem(item).build();
|
||||
}
|
||||
|
||||
private static MessageLite useAndPriceItemRequest(int type ,int itemId , int itemNum) {
|
||||
CommonProto.Item item = CommonProto.Item.newBuilder()
|
||||
.setItemId(itemId)
|
||||
.setItemNum(itemNum)
|
||||
.build();
|
||||
return PlayerInfoProto.UseAndPriceItemRequest.newBuilder().setType(type).setItem(item).build();
|
||||
|
||||
}
|
||||
|
||||
public static HeroInfoProto.GetHeroListInfoRequest getHero(){
|
||||
return HeroInfoProto.GetHeroListInfoRequest.newBuilder().setNum(1).setStr("111").build();
|
||||
}
|
||||
|
@ -73,7 +91,7 @@ public class NettyClient {
|
|||
}
|
||||
|
||||
public static CommonProto.GMCommand gmRequest(int itemId){
|
||||
return CommonProto.GMCommand.newBuilder().setCommand("3#"+1+"#10000").build();
|
||||
return CommonProto.GMCommand.newBuilder().setCommand("1#"+itemId+"#10").build();
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue