Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
b70c41e9ef
|
@ -1,7 +1,7 @@
|
||||||
id MapId Logic Values Score
|
id MapId Logic Values Score
|
||||||
int int int mut,int#int,1 int
|
int int int mut,int#int,1 int
|
||||||
1 101 1 101009#1 20
|
1 101 1 101009#1 11
|
||||||
2 101 1 101016#1 25
|
2 101 1 101016#1 20
|
||||||
3 101 3 0#1 5
|
3 101 3 0#1 5
|
||||||
4 101 3 0#2 5
|
4 101 3 0#2 5
|
||||||
5 101 3 0#3 5
|
5 101 3 0#3 5
|
||||||
|
@ -13,3 +13,33 @@ int int int mut,int#int,1 int
|
||||||
11 101 3 0#9 5
|
11 101 3 0#9 5
|
||||||
12 101 3 0#10 5
|
12 101 3 0#10 5
|
||||||
13 101 3 0#11 5
|
13 101 3 0#11 5
|
||||||
|
14 101 5 0#1 1
|
||||||
|
15 101 5 0#2 1
|
||||||
|
16 101 5 0#3 1
|
||||||
|
17 101 5 0#4 1
|
||||||
|
18 101 5 0#5 1
|
||||||
|
19 101 6 0#50 3
|
||||||
|
20 101 6 0#75 3
|
||||||
|
21 101 6 0#100 3
|
||||||
|
22 102 1 102015#1 6
|
||||||
|
23 102 1 102017#1 6
|
||||||
|
24 102 1 102018#1 6
|
||||||
|
25 102 1 102019#1 2
|
||||||
|
26 102 1 102020#1 2
|
||||||
|
27 102 1 102021#1 2
|
||||||
|
28 102 1 102022#1 6
|
||||||
|
29 102 1 102023#1 6
|
||||||
|
30 102 1 102024#1 6
|
||||||
|
31 102 1 102025#1 6
|
||||||
|
32 102 1 102026#1 6
|
||||||
|
33 102 1 102028#1 6
|
||||||
|
34 102 2 0#1 6
|
||||||
|
35 102 1 102032#1 4
|
||||||
|
36 102 1 102033#1 4
|
||||||
|
37 102 7 0#1 8
|
||||||
|
38 102 5 0#5 3
|
||||||
|
39 102 5 0#10 3
|
||||||
|
40 102 5 0#15 3
|
||||||
|
41 102 3 0#20 3
|
||||||
|
42 102 3 0#30 3
|
||||||
|
43 102 3 0#50 3
|
||||||
|
|
|
@ -15,123 +15,123 @@ int int int int int int int int int int int float float float float mut,int#int,
|
||||||
13 5 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20013 null
|
13 5 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20013 null
|
||||||
14 5 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20014 null
|
14 5 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20014 null
|
||||||
15 5 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20015 null
|
15 5 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20015 null
|
||||||
16 6 2 0 1 0 2948 113 50 50 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20016 null
|
16 6 2 0 1 0 2005 90 50 50 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20016 null
|
||||||
17 6 2 0 1 0 2948 113 50 50 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20017 null
|
17 6 2 0 1 0 2005 90 50 50 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20017 null
|
||||||
18 6 2 0 1 0 2948 113 50 50 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20018 null
|
18 6 2 0 1 0 2005 90 50 50 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20018 null
|
||||||
19 7 1 0 1 0 9952 339 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20019 null
|
19 7 1 0 1 0 6767 271 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20019 null
|
||||||
20 7 1 0 1 0 9952 339 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20020 null
|
20 7 1 0 1 0 6767 271 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20020 null
|
||||||
21 7 1 0 1 0 9952 339 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20021 null
|
21 7 1 0 1 0 6767 271 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20021 null
|
||||||
22 8 2 0 2 0 13270 346 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20022 null
|
22 8 2 0 2 0 9023 277 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20022 null
|
||||||
23 8 2 0 2 0 13270 346 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20023 null
|
23 8 2 0 2 0 9023 277 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20023 null
|
||||||
24 8 2 0 2 0 13270 346 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20024 null
|
24 8 2 0 2 0 9023 277 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20024 null
|
||||||
25 9 3 0 1 5 14744 566 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20025 null
|
25 9 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20025 null
|
||||||
26 9 3 0 1 5 14744 566 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20026 null
|
26 9 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20026 null
|
||||||
27 9 3 0 1 5 14744 566 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20027 null
|
27 9 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20027 null
|
||||||
28 10 3 0 1 5 14744 566 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20028 null
|
28 10 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20028 null
|
||||||
29 10 3 0 1 5 14744 566 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20029 null
|
29 10 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20029 null
|
||||||
30 10 3 0 1 5 14744 566 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20030 null
|
30 10 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20030 null
|
||||||
31 11 3 0 2 5 44234 1155 508 508 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20031 null
|
31 11 3 0 2 5 30078 924 508 508 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20031 null
|
||||||
32 11 3 0 2 5 44234 1155 508 508 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20032 null
|
32 11 3 0 2 5 30078 924 508 508 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20032 null
|
||||||
33 11 3 0 2 5 44234 1155 508 508 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20033 null
|
33 11 3 0 2 5 30078 924 508 508 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20033 null
|
||||||
34 9 3 0 1 5 23591 906 406 406 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20034 null
|
34 9 3 0 1 5 16041 725 406 406 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20034 null
|
||||||
35 9 3 0 1 5 23591 906 406 406 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20035 null
|
35 9 3 0 1 5 16041 725 406 406 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20035 null
|
||||||
36 9 3 0 1 5 23591 906 406 406 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20036 null
|
36 9 3 0 1 5 16041 725 406 406 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20036 null
|
||||||
37 13 3 0 1 88 29489 1132 508 508 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20037 null
|
37 13 3 0 1 88 20052 906 508 508 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20037 null
|
||||||
38 13 3 0 1 88 29489 1132 508 508 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20038 null
|
38 13 3 0 1 88 20052 906 508 508 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20038 null
|
||||||
39 13 3 0 1 88 29489 1132 508 508 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20039 null
|
39 13 3 0 1 88 20052 906 508 508 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20039 null
|
||||||
40 7 1 0 1 88 34164 1184 528 528 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20040 null
|
40 7 1 0 1 88 23225 947 528 528 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20040 null
|
||||||
41 7 1 0 1 88 34164 1184 528 528 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20041 null
|
41 7 1 0 1 88 23225 947 528 528 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20041 null
|
||||||
42 7 1 0 1 88 34164 1184 528 528 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20042 null
|
42 7 1 0 1 88 23225 947 528 528 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20042 null
|
||||||
43 11 3 0 2 96 49186 1340 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20043 null
|
43 11 3 0 2 96 33427 1072 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20043 null
|
||||||
44 11 3 0 2 96 49186 1340 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20044 null
|
44 11 3 0 2 96 33427 1072 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20044 null
|
||||||
45 11 3 0 2 96 49186 1340 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20045 null
|
45 11 3 0 2 96 33427 1072 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20045 null
|
||||||
46 15 1 0 1 96 36889 1309 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20046 null
|
46 15 1 0 1 96 25070 1047 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20046 null
|
||||||
47 15 1 0 1 96 36889 1309 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20047 null
|
47 15 1 0 1 96 25070 1047 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20047 null
|
||||||
48 15 1 0 1 96 36889 1309 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20048 null
|
48 15 1 0 1 96 25070 1047 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20048 null
|
||||||
49 16 1 0 2 100 49836 1385 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20049 null
|
49 16 1 0 2 100 33870 1108 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20049 null
|
||||||
50 16 1 0 2 100 49836 1385 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20050 null
|
50 16 1 0 2 100 33870 1108 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20050 null
|
||||||
51 16 1 0 2 100 49836 1385 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20051 null
|
51 16 1 0 2 100 33870 1108 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20051 null
|
||||||
52 17 4 0 1 100 37377 1348 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20052 null
|
52 17 4 0 1 100 25403 1079 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20052 null
|
||||||
53 17 4 0 1 100 37377 1348 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20053 null
|
53 17 4 0 1 100 25403 1079 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20053 null
|
||||||
54 17 4 0 1 100 37377 1348 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20054 null
|
54 17 4 0 1 100 25403 1079 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20054 null
|
||||||
55 18 4 0 1 100 34333 1383 603 603 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20055 null
|
55 18 4 0 1 100 23332 1107 603 603 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20055 null
|
||||||
56 18 4 0 1 100 34333 1383 603 603 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20056 null
|
56 18 4 0 1 100 23332 1107 603 603 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20056 null
|
||||||
57 18 4 0 1 100 34333 1383 603 603 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20057 null
|
57 18 4 0 1 100 23332 1107 603 603 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20057 null
|
||||||
58 19 4 0 2 100 49129 1374 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20058 null
|
58 19 4 0 2 100 33394 1099 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20058 null
|
||||||
59 19 4 0 2 100 49129 1374 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20059 null
|
59 19 4 0 2 100 33394 1099 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20059 null
|
||||||
60 19 4 0 2 100 49129 1374 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20060 null
|
60 19 4 0 2 100 33394 1099 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20060 null
|
||||||
61 20 2 0 1 100 36847 1336 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
61 20 2 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
62 20 2 0 1 100 36847 1336 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
62 20 2 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
63 20 2 0 1 100 36847 1336 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
63 20 2 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
64 21 3 0 1 100 36847 1336 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
64 21 3 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
65 21 3 0 1 100 36847 1336 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
65 21 3 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
66 21 3 0 1 100 36847 1336 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
66 21 3 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
67 22 4 0 1 108 57662 1727 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
67 22 4 0 1 108 39273 1382 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
68 22 4 0 1 108 57662 1727 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
68 22 4 0 1 108 39273 1382 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
69 22 4 0 1 108 57662 1727 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
69 22 4 0 1 108 39273 1382 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
70 23 3 0 1 100 32114 1313 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
70 23 3 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
71 23 3 0 1 100 32114 1313 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
71 23 3 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
72 23 3 0 1 100 32114 1313 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
72 23 3 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
73 24 2 0 2 108 86494 1860 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
73 24 2 0 2 108 58909 1488 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
74 24 2 0 2 108 86494 1860 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
74 24 2 0 2 108 58909 1488 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
75 24 2 0 2 108 86494 1860 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
75 24 2 0 2 108 58909 1488 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
76 25 4 0 2 108 59641 1584 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
76 25 4 0 2 108 40586 1267 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
77 25 4 0 2 108 59641 1584 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
77 25 4 0 2 108 40586 1267 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
78 25 4 0 2 108 59641 1584 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
78 25 4 0 2 108 40586 1267 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
79 26 2 0 1 100 32114 1313 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
79 26 2 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
80 26 2 0 1 100 32114 1313 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
80 26 2 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
81 26 2 0 1 100 32114 1313 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
81 26 2 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
82 27 2 0 1 108 33391 1358 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
82 27 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
83 27 2 0 1 108 33391 1358 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
83 27 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
84 27 2 0 1 108 33391 1358 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
84 27 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
85 28 4 0 1 108 44730 1543 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
85 28 4 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
86 28 4 0 1 108 44730 1543 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
86 28 4 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
87 28 4 0 1 108 44730 1543 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
87 28 4 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
88 29 3 0 1 108 33391 1358 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
88 29 3 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
89 29 3 0 1 108 33391 1358 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
89 29 3 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
90 29 3 0 1 108 33391 1358 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
90 29 3 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
91 30 4 0 2 108 70153 1794 764 764 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
91 30 4 0 2 108 47779 1435 764 764 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
92 30 4 0 2 108 70153 1794 764 764 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
92 30 4 0 2 108 47779 1435 764 764 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
93 30 4 0 2 108 70153 1794 764 764 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
93 30 4 0 2 108 47779 1435 764 764 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
94 31 2 0 1 108 33391 1358 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
94 31 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
95 31 2 0 1 108 33391 1358 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
95 31 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
96 31 2 0 1 108 33391 1358 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
96 31 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
97 32 1 0 1 108 44730 1543 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
97 32 1 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
98 32 1 0 1 108 44730 1543 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
98 32 1 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
99 32 1 0 1 108 44730 1543 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
99 32 1 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
100 33 2 0 1 120 66744 2124 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
100 33 2 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
101 33 2 0 1 120 66744 2124 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
101 33 2 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
102 33 2 0 1 120 66744 2124 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
102 33 2 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
103 34 4 0 1 120 66744 2124 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
103 34 4 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
104 34 4 0 1 120 66744 2124 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
104 34 4 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
105 34 4 0 1 120 66744 2124 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
105 34 4 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
106 35 2 0 1 120 47407 1772 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
106 35 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
107 35 2 0 1 120 47407 1772 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
107 35 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
108 35 2 0 1 120 47407 1772 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
108 35 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
109 36 2 0 1 120 47407 1772 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
109 36 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
110 36 2 0 1 120 47407 1772 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
110 36 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
111 36 2 0 1 120 47407 1772 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
111 36 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
112 37 3 0 2 122 109479 2598 1126 1126 3168 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
112 37 3 0 2 122 74681 2078 1126 1126 3168 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
113 37 3 0 2 122 109479 2598 1126 1126 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
113 37 3 0 2 122 74681 2078 1126 1126 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
114 37 3 0 2 122 109479 2598 1126 1126 105 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
114 37 3 0 2 122 74681 2078 1126 1126 105 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
115 38 2 0 2 124 140105 2782 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
115 38 2 0 2 124 95567 2225 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
116 38 2 0 2 124 140105 2782 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
116 38 2 0 2 124 95567 2225 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
117 38 2 0 2 124 140105 2782 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
117 38 2 0 2 124 95567 2225 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
118 39 2 0 1 124 81674 2536 1120 1120 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
118 39 2 0 1 124 55715 2028 1120 1120 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
119 39 2 0 1 124 81674 2536 1120 1120 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
119 39 2 0 1 124 55715 2028 1120 1120 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
120 39 2 0 1 124 81674 2536 1120 1120 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
120 39 2 0 1 124 55715 2028 1120 1120 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
121 40 4 0 2 126 108623 2599 1117 1117 3264 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
121 40 4 0 2 126 74098 2079 1117 1117 3264 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
122 40 4 0 2 126 108623 2599 1117 1117 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
122 40 4 0 2 126 74098 2079 1117 1117 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
123 40 4 0 2 126 108623 2599 1117 1117 108 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
123 40 4 0 2 126 74098 2079 1117 1117 108 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
124 41 2 0 1 124 74722 2605 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
124 41 2 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
125 41 2 0 1 124 74722 2605 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
125 41 2 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
126 41 2 0 1 124 74722 2605 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
126 41 2 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
127 42 3 0 1 124 74722 2605 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
127 42 3 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
128 42 3 0 1 124 74722 2605 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
128 42 3 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
129 42 3 0 1 124 74722 2605 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
129 42 3 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
130 43 0 0 2 128 139417 2796 1150 1150 3312 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
130 43 0 0 2 128 95097 2237 1150 1150 3312 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
131 43 0 0 2 128 139417 2796 1150 1150 1104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
131 43 0 0 2 128 95097 2237 1150 1150 1104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
132 43 0 0 2 128 139417 2796 1150 1150 110 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
132 43 0 0 2 128 95097 2237 1150 1150 110 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
133 1 2 0 1 0 2500 180 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
133 1 2 0 1 0 2500 180 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
134 1 2 0 1 0 2500 180 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20002 null
|
134 1 2 0 1 0 2500 180 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20002 null
|
||||||
135 1 2 0 1 0 2500 180 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20003 null
|
135 1 2 0 1 0 2500 180 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20003 null
|
||||||
|
|
|
@ -15,15 +15,15 @@ int int mut,int#int,2
|
||||||
13 4 3#1
|
13 4 3#1
|
||||||
14 4 6#1
|
14 4 6#1
|
||||||
15 4 9#1
|
15 4 9#1
|
||||||
10101 6 0#2#5
|
10101 3 1#5#100
|
||||||
10102 6 1#2#5
|
10102 3 1#2#100
|
||||||
10103 0 null
|
10103 3 1#2#200
|
||||||
10104 0 null
|
10104 0 null
|
||||||
10105 0 null
|
10105 0 null
|
||||||
10106 0 null
|
10106 0 null
|
||||||
10107 0 null
|
10107 0 null
|
||||||
10108 0 null
|
10108 6 0#2#5
|
||||||
10109 0 null
|
10109 6 1#2#5
|
||||||
10201 6 0#3#6
|
10201 6 0#3#6
|
||||||
10202 6 1#3#6
|
10202 6 1#3#6
|
||||||
10301 6 0#4#3
|
10301 6 0#4#3
|
||||||
|
|
|
@ -38,7 +38,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
101002 0 0 null null 4 null
|
101002 0 0 null null 4 null
|
||||||
101003 0 5 0 null 4 null
|
101003 0 5 0 null 4 null
|
||||||
101004 0 0 null null 4 null
|
101004 0 0 null null 4 null
|
||||||
101005 0 27 101 null 5 101007
|
101005 0 0 null null 5 101007
|
||||||
101006 0 0 null null 4 null
|
101006 0 0 null null 4 null
|
||||||
101007 0 0 null null 5 101008
|
101007 0 0 null null 5 101008
|
||||||
101008 0 1 10101 null 1 101009
|
101008 0 1 10101 null 1 101009
|
||||||
|
@ -82,10 +82,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
101046 0 0 null null 4 null
|
101046 0 0 null null 4 null
|
||||||
101047 0 0 null null 0 null
|
101047 0 0 null null 0 null
|
||||||
101048 0 0 null null 0 null
|
101048 0 0 null null 0 null
|
||||||
101049 2 6 2 null 1 101040
|
101049 0 6 2 null 3 101038#101039|1#10101
|
||||||
101050 0 0 null null 4 null
|
101050 0 0 null null 4 null
|
||||||
101051 0 0 null null 0 null
|
101051 0 0 null null 1 101040
|
||||||
101052 0 0 null null 0 null
|
101052 0 0 null null 1 101040
|
||||||
101053 0 0 null null 0 null
|
101053 0 0 null null 0 null
|
||||||
101054 0 6 2 20101 1 101041
|
101054 0 6 2 20101 1 101041
|
||||||
101055 0 0 null null 4 null
|
101055 0 0 null null 4 null
|
||||||
|
@ -104,17 +104,17 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
101068 0 0 null null 0 null
|
101068 0 0 null null 0 null
|
||||||
101069 0 0 null null 1 101051
|
101069 0 0 null null 1 101051
|
||||||
101070 0 0 null null 4 null
|
101070 0 0 null null 4 null
|
||||||
101071 0 1 10101 null 1 101052
|
101071 0 1 10101 null 1 101053
|
||||||
101072 0 0 null null 4 null
|
101072 0 0 null null 4 null
|
||||||
101073 0 0 null null 0 null
|
101073 0 0 null null 0 null
|
||||||
101074 0 0 null null 0 null
|
101074 0 0 null null 0 null
|
||||||
101075 3 6 2 null 1 101054
|
101075 10102 6 2 20101 1 101055
|
||||||
101076 0 0 null null 1 101054
|
101076 0 0 null 20101 1 101055
|
||||||
101077 0 0 null null 4 null
|
101077 0 0 null null 4 null
|
||||||
101078 0 0 null null 0 null
|
101078 0 0 null null 0 null
|
||||||
101079 0 1 10101 null 1 101056
|
101079 0 1 10101 null 1 101056
|
||||||
101080 0 0 null null 4 null
|
101080 0 0 null null 4 null
|
||||||
101081 0 1 10103 null 1 101057
|
101081 0 1 10103 null 1 101059
|
||||||
101082 0 0 null null 4 null
|
101082 0 0 null null 4 null
|
||||||
101083 0 0 null null 0 null
|
101083 0 0 null null 0 null
|
||||||
101084 0 0 null null 0 null
|
101084 0 0 null null 0 null
|
||||||
|
@ -161,9 +161,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
101125 0 0 null null 0 null
|
101125 0 0 null null 0 null
|
||||||
101126 0 1 1010006 null 1 101090
|
101126 0 1 1010006 null 1 101090
|
||||||
101127 0 0 null null 1 101093
|
101127 0 0 null null 1 101093
|
||||||
101128 3 6 2 null 1 101093
|
101128 0 6 2 null 3 101091#101092|1#10103
|
||||||
101129 0 0 null null 0 null
|
101129 0 0 null null 1 101093
|
||||||
101130 0 0 null null 0 null
|
101130 0 0 null null 1 101093
|
||||||
101131 0 1 1010007 null 5 101095
|
101131 0 1 1010007 null 5 101095
|
||||||
0 0 0 null null 0 null
|
0 0 0 null null 0 null
|
||||||
101133 0 0 null null 1 101098
|
101133 0 0 null null 1 101098
|
||||||
|
@ -198,7 +198,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
101162 0 0 null null 1 101120
|
101162 0 0 null null 1 101120
|
||||||
101163 0 1 10101 null 1 101121
|
101163 0 1 10101 null 1 101121
|
||||||
101164 0 0 null null 4 null
|
101164 0 0 null null 4 null
|
||||||
101165 0 0 null null 1 101122
|
101165 0 6 2 null 1 101122
|
||||||
101166 0 0 null null 4 null
|
101166 0 0 null null 4 null
|
||||||
101167 0 1 10101 null 1 101123
|
101167 0 1 10101 null 1 101123
|
||||||
101168 0 0 null null 4 null
|
101168 0 0 null null 4 null
|
||||||
|
@ -422,13 +422,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
102072 0 0 null null 1 102053
|
102072 0 0 null null 1 102053
|
||||||
102073 0 0 null null 1 102053
|
102073 0 0 null null 1 102053
|
||||||
102074 0 0 null null 4 null
|
102074 0 0 null null 4 null
|
||||||
102075 7 0 null null 1 102056
|
102075 0 0 null null 1 102054#102055|1#7
|
||||||
102076 8 0 null null 1 102056
|
102076 0 0 null null 1 102054#102055|1#8
|
||||||
102077 0 0 null null 0 null
|
102077 0 0 null null 1 102056
|
||||||
102078 0 0 null null 0 null
|
102078 0 0 null null 1 102056
|
||||||
102079 0 1 1020004 null 1 102057
|
102079 0 1 1020004 null 1 102057
|
||||||
102080 0 0 null null 4 null
|
102080 0 0 null null 4 null
|
||||||
102081 9 0 null null 5 102058
|
102081 9 6 2 null 5 102058
|
||||||
102082 0 0 null null 4 null
|
102082 0 0 null null 4 null
|
||||||
102083 0 0 null null 1 102059
|
102083 0 0 null null 1 102059
|
||||||
102084 0 0 null null 5 102060
|
102084 0 0 null null 5 102060
|
||||||
|
@ -448,11 +448,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
102098 0 0 null null 4 null
|
102098 0 0 null null 4 null
|
||||||
102099 0 1 1020005 null 1 102070
|
102099 0 1 1020005 null 1 102070
|
||||||
102100 0 0 null null 4 null
|
102100 0 0 null null 4 null
|
||||||
102101 0 1 1020005 10102 1 102073
|
102101 0 6 2 null 1 102071
|
||||||
102102 0 0 null 10102 1 102073
|
102102 0 6 2 null 1 102072
|
||||||
102103 0 0 null null 4 null
|
102103 0 0 null null 4 null
|
||||||
102104 0 0 null null 0 null
|
102104 0 1 1020005 10102 1 102073
|
||||||
102105 0 0 null null 0 null
|
102105 0 0 null 10102 1 102073
|
||||||
102106 0 1 1020006 null 3 102074#102081|1#5
|
102106 0 1 1020006 null 3 102074#102081|1#5
|
||||||
102107 0 0 null null 4 null
|
102107 0 0 null null 4 null
|
||||||
102108 0 1 1020005 null 1 102075
|
102108 0 1 1020005 null 1 102075
|
||||||
|
@ -556,7 +556,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
102206 0 1 10101 null 5 102143
|
102206 0 1 10101 null 5 102143
|
||||||
102207 0 0 null null 4 null
|
102207 0 0 null null 4 null
|
||||||
102208 0 0 null null 5 102144
|
102208 0 0 null null 5 102144
|
||||||
102209 0 0 null null 3 102145#102168|1#3
|
102209 0 6 2 null 3 102145#102168|1#3
|
||||||
102210 0 0 null null 4 null
|
102210 0 0 null null 4 null
|
||||||
102211 0 0 null null 1 102146
|
102211 0 0 null null 1 102146
|
||||||
102212 0 0 null null 1 102147
|
102212 0 0 null null 1 102147
|
||||||
|
@ -565,7 +565,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
||||||
102215 0 1 10101 null 1 102149
|
102215 0 1 10101 null 1 102149
|
||||||
102216 0 0 null null 1 102150
|
102216 0 0 null null 1 102150
|
||||||
102217 0 1 10101 null 1 102151
|
102217 0 1 10101 null 1 102151
|
||||||
102218 0 0 null null 1 102152
|
102218 0 6 2 null 1 102152
|
||||||
102219 0 1 10102 null 1 102153
|
102219 0 1 10102 null 1 102153
|
||||||
102220 0 0 null null 5 102169
|
102220 0 0 null null 5 102169
|
||||||
102221 0 0 null null 0 null
|
102221 0 0 null null 0 null
|
||||||
|
|
|
@ -662,93 +662,93 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float
|
||||||
500108 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
500108 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||||
500109 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
500109 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||||
500110 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
500110 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||||
500201 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500201 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500202 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500202 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500203 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500203 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500204 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500204 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500205 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500205 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500206 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500206 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500207 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500207 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500208 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500208 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500209 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500209 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500210 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
500210 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||||
500301 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500301 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500302 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500302 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500303 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500303 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500304 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500304 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500305 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500305 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500306 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500306 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500307 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500307 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500308 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500308 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500309 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500309 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500310 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
500310 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||||
500401 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500401 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500402 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500402 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500403 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500403 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500404 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500404 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500405 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500405 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500406 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500406 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500407 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500407 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500408 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500408 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500409 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500409 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500410 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
500410 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||||
500501 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500501 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500502 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500502 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500503 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500503 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500504 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500504 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500505 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500505 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500506 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500506 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500507 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500507 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500508 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500508 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500509 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500509 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500510 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
500510 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||||
500601 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500601 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500602 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500602 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500603 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500603 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500604 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500604 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500605 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500605 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500606 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500606 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500607 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500607 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500608 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500608 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500609 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500609 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500610 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
500610 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||||
500701 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500701 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500702 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500702 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500703 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500703 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500704 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500704 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500705 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500705 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500706 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500706 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500707 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500707 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500708 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500708 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500709 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500709 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500710 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
500710 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||||
500801 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500801 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500802 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500802 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500803 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500803 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500804 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500804 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500805 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500805 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500806 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500806 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500807 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500807 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500808 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500808 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500809 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500809 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500810 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
500810 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||||
500901 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500901 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500902 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500902 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500903 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500903 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500904 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500904 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500905 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500905 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500906 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500906 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500907 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500907 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500908 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500908 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500909 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500909 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
500910 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
500910 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||||
501001 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501001 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501002 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501002 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501003 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501003 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501004 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501004 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501005 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501005 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501006 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501006 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501007 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501007 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501008 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501008 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501009 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501009 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
501010 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
501010 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||||
|
|
|
@ -49,6 +49,18 @@ public class RedisKey {
|
||||||
*/
|
*/
|
||||||
public static final String FIGHT_GROUPID = "GROUPID";
|
public static final String FIGHT_GROUPID = "GROUPID";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 需要推进的任务id
|
||||||
|
* sub_key
|
||||||
|
*/
|
||||||
|
public static final String NEED_MISSION_ID = "NEED_MISSION_ID";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 需要销毁的事件点id
|
||||||
|
* sub_key
|
||||||
|
*/
|
||||||
|
public static final String NEED_DESORY_ID = "NEED_DESORY_ID";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 过期事件
|
* 过期事件
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -243,9 +243,45 @@ public class MapLogic {
|
||||||
initMapMission(mapManager);
|
initMapMission(mapManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean updateMapByOnlyConsumeActionPower(ISession session, int curXY,int triggerXY, List<Integer> cells,MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
|
if(triggerXY == -1){
|
||||||
|
int uid = session.getUid();
|
||||||
|
User user = UserManager.getUser(uid);
|
||||||
|
MapManager mapManager = user.getMapManager();
|
||||||
|
SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(mapManager.getCurMapId());
|
||||||
|
int moveConfused = scMapConfig.getMoveConfused();
|
||||||
|
if (moveConfused > 0) {
|
||||||
|
int leftStep = mapManager.getTotalStep() - cells.size() * moveConfused;
|
||||||
|
if (leftStep <0) {
|
||||||
|
leftStep = 0;
|
||||||
|
resetMapInfo(user, false);
|
||||||
|
LOGGER.info("updateMap() uid=>{}, leftStep=>{}", uid, leftStep);
|
||||||
|
mapManager.setTotalStep(leftStep);
|
||||||
|
MapInfoProto.MapUpdateResponse mapUpdateResponse = MapInfoProto.MapUpdateResponse.newBuilder().build();
|
||||||
|
MessageUtil.sendMessage(session, 0, messageType.getNumber(), mapUpdateResponse, true);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
updateMapMission(mapManager,EventType.updateEvent,MapMissionType.CONSUME_ACTION_POWER_EVENT.getMissionTypeValue(),cells.size() * moveConfused);
|
||||||
|
mapManager.setTotalStep(leftStep);
|
||||||
|
mapManager.addWalkCells(new HashSet<>(cells));
|
||||||
|
mapManager.setCurXY(curXY);
|
||||||
|
MapInfoProto.MapUpdateResponse mapUpdateResponse = MapInfoProto.MapUpdateResponse.newBuilder()
|
||||||
|
.setLeftStep(mapManager.getTotalStep())
|
||||||
|
.build();
|
||||||
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), mapUpdateResponse, true);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void updateMap(ISession session, int curXY, int triggerXY, List<Integer> cells, MessageTypeProto.MessageType messageType) throws Exception {
|
public void updateMap(ISession session, int curXY, int triggerXY, List<Integer> cells, MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
// LOGGER.info("updateMap() curXY=>{},triggerXY=>{}", curXY, triggerXY);
|
// LOGGER.info("updateMap() curXY=>{},triggerXY=>{}", curXY, triggerXY);
|
||||||
|
if(updateMapByOnlyConsumeActionPower(session,curXY,triggerXY,cells,messageType)){
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (triggerXY != curXY) {
|
if (triggerXY != curXY) {
|
||||||
boolean isConnect = CellUtil.checkIsNextCell(curXY, triggerXY);
|
boolean isConnect = CellUtil.checkIsNextCell(curXY, triggerXY);
|
||||||
if (!isConnect) {
|
if (!isConnect) {
|
||||||
|
@ -278,6 +314,7 @@ public class MapLogic {
|
||||||
int leftStep = mapManager.getTotalStep() - cells.size() * moveConfused;
|
int leftStep = mapManager.getTotalStep() - cells.size() * moveConfused;
|
||||||
if (leftStep <= 0) {
|
if (leftStep <= 0) {
|
||||||
leftStep = 0;
|
leftStep = 0;
|
||||||
|
updateMapMission(mapManager,EventType.updateEvent,MapMissionType.CONSUME_ACTION_POWER_EVENT.getMissionTypeValue(),cells.size() * moveConfused);
|
||||||
resetMapInfo(user, false);
|
resetMapInfo(user, false);
|
||||||
LOGGER.info("updateMap() uid=>{}, leftStep=>{}", uid, leftStep);
|
LOGGER.info("updateMap() uid=>{}, leftStep=>{}", uid, leftStep);
|
||||||
MapInfoProto.MapUpdateResponse mapUpdateResponse = MapInfoProto.MapUpdateResponse.newBuilder().build();
|
MapInfoProto.MapUpdateResponse mapUpdateResponse = MapInfoProto.MapUpdateResponse.newBuilder().build();
|
||||||
|
@ -485,7 +522,7 @@ public class MapLogic {
|
||||||
// LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
|
// LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
|
||||||
// cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon);
|
// cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon);
|
||||||
saveRefreshInfo(pointId, mapManager, mapPointConfig, nextEventId);
|
saveRefreshInfo(pointId, mapManager, mapPointConfig, nextEventId);
|
||||||
updateMapMission(mapManager,EventType.updateEvent,eventId,0);
|
updateMapMission(mapManager,EventType.updateEvent,pointId,0);
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -689,15 +726,11 @@ public class MapLogic {
|
||||||
mapManager.setCurXY(0);
|
mapManager.setCurXY(0);
|
||||||
mapManager.setCurMapId(0);
|
mapManager.setCurMapId(0);
|
||||||
mapManager.setTotalStep(0);
|
mapManager.setTotalStep(0);
|
||||||
if (needTemporaryItem) {
|
TemporaryItems temporaryItems = mapManager.getTemporaryItems();
|
||||||
TemporaryItems temporaryItems = mapManager.getTemporaryItems();
|
if (temporaryItems != null) {
|
||||||
if (temporaryItems != null) {
|
ItemUtil.addTemporaryItemToBag(user, temporaryItems, needTemporaryItem);
|
||||||
ItemUtil.addTemporaryItemToBag(user, temporaryItems);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
mapManager.setTemporaryItems(null);
|
mapManager.setTemporaryItems(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -733,9 +766,17 @@ public class MapLogic {
|
||||||
String fightReadyKey = RedisKey.getKey(RedisKey.FIGHT_READY, Integer.toString(uid), false);
|
String fightReadyKey = RedisKey.getKey(RedisKey.FIGHT_READY, Integer.toString(uid), false);
|
||||||
String fightReady = (String) RedisUtil.getInstence().get(fightReadyKey);
|
String fightReady = (String) RedisUtil.getInstence().get(fightReadyKey);
|
||||||
int groupId;
|
int groupId;
|
||||||
|
String missionId = "0", destroyId = "0";
|
||||||
if (fightReady != null) {
|
if (fightReady != null) {
|
||||||
|
String[] split = fightReady.split("#");
|
||||||
RedisUtil.getInstence().del(fightReadyKey);
|
RedisUtil.getInstence().del(fightReadyKey);
|
||||||
groupId = Integer.parseInt(fightReady);
|
groupId = Integer.parseInt(split[0]);
|
||||||
|
if (split.length > 1) {
|
||||||
|
missionId = split[1];
|
||||||
|
}
|
||||||
|
if (split.length > 2) {
|
||||||
|
destroyId = split[2];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
int[] option = sEventPointConfig.getOption();
|
int[] option = sEventPointConfig.getOption();
|
||||||
if (option == null) {
|
if (option == null) {
|
||||||
|
@ -746,7 +787,7 @@ public class MapLogic {
|
||||||
groupId = option[0];
|
groupId = option[0];
|
||||||
}
|
}
|
||||||
FightInfoProto.FightStartResponse.Builder fightStartResponse = FightInfoProto.FightStartResponse.newBuilder();
|
FightInfoProto.FightStartResponse.Builder fightStartResponse = FightInfoProto.FightStartResponse.newBuilder();
|
||||||
BehaviorUtil.getFightInfo(user, groupId, fightStartResponse);
|
BehaviorUtil.getFightInfo(user, groupId, fightStartResponse, missionId, destroyId);
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightStartResponse.build(), true);
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightStartResponse.build(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -826,14 +867,23 @@ public class MapLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1);
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1);
|
||||||
FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse
|
FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse.newBuilder();
|
||||||
.newBuilder()
|
fightEndResponse.setDrop(drop);
|
||||||
.setDrop(drop)
|
fightEndResponse.setResult(resultCode);
|
||||||
.setResult(resultCode)
|
fightEndResponse.addAllRemainHpList(remainHp);
|
||||||
.addAllRemainHpList(remainHp)
|
fightEndResponse.build();
|
||||||
.build();
|
int missionId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_MISSION_ID));
|
||||||
|
int destoryId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_DESORY_ID));
|
||||||
|
if (missionId != 0) {
|
||||||
|
MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse = MapInfoProto.EventUpdateResponse.newBuilder();
|
||||||
|
BehaviorUtil.updateMission(user, missionId, eventUpdateResponse);
|
||||||
|
fightEndResponse.addAllMission(eventUpdateResponse.getMissionList());
|
||||||
|
}
|
||||||
|
if (destoryId != 0) {
|
||||||
|
BehaviorUtil.distoryPoint(user, destoryId);
|
||||||
|
}
|
||||||
updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId);
|
updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId);
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true);
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -907,9 +957,11 @@ public class MapLogic {
|
||||||
if(eventType == EventType.updateEvent){
|
if(eventType == EventType.updateEvent){
|
||||||
if(logic == eventId){
|
if(logic == eventId){
|
||||||
if(missionValue<targetEventValue){
|
if(missionValue<targetEventValue){
|
||||||
allMissionProgress.put(missionId,missionValue+bossIdOrItemId);
|
int source = missionValue + bossIdOrItemId;
|
||||||
|
int result = MathUtils.setBetweenWithMax(source, 0, targetEventValue);
|
||||||
|
allMissionProgress.put(missionId,result);
|
||||||
needUpdate = true;
|
needUpdate = true;
|
||||||
if(missionValue+bossIdOrItemId == targetEventValue){
|
if(result== targetEventValue){
|
||||||
addScore+=score;
|
addScore+=score;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,10 +6,10 @@ public enum MapMissionType {
|
||||||
VICTORY_EVENT(3), //本次地图获得战斗胜利次数
|
VICTORY_EVENT(3), //本次地图获得战斗胜利次数
|
||||||
BUY_GOODS_ID_EVENT(4), //在本图行脚商人购买某物
|
BUY_GOODS_ID_EVENT(4), //在本图行脚商人购买某物
|
||||||
DIGGER_EVENT(5), //本地图采矿都少次
|
DIGGER_EVENT(5), //本地图采矿都少次
|
||||||
COLLECT_GOODS_ID_EVENT(6), //在收集商人那边兑换出来物品
|
// COLLECT_GOODS_ID_EVENT(6), //在收集商人那边兑换出来物品
|
||||||
CONSUME_ACTION_POWER_EVENT(7), //在本次地图内消耗多少行动力
|
CONSUME_ACTION_POWER_EVENT(6), //在本次地图内消耗多少行动力
|
||||||
OPEN_BOX(8), //在本次地图内消耗多少行动力
|
OPEN_BOX(7), //在本次地图内消耗多少行动力
|
||||||
BUY_GOODS_TYPE_EVENT(9); //在本图行脚商人购买某类物品
|
BUY_GOODS_TYPE_EVENT(8); //在本图行脚商人购买某类物品
|
||||||
|
|
||||||
private int missionType;
|
private int missionType;
|
||||||
|
|
||||||
|
|
|
@ -4,12 +4,14 @@ import com.ljsd.jieling.logic.dao.Equip;
|
||||||
import com.ljsd.jieling.logic.dao.Item;
|
import com.ljsd.jieling.logic.dao.Item;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public class TemporaryItems {
|
public class TemporaryItems {
|
||||||
|
|
||||||
public Map<Integer, Item> items = new HashMap<>();
|
public Map<Integer, Item> items = new HashMap<>();
|
||||||
|
|
||||||
public Map<Integer, Equip> equips = new HashMap<>();
|
public Set<Equip> equips = new HashSet<>();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,9 +69,9 @@ public class BehaviorUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void fightReady(String uid, int groupId) {
|
public static void fightReady(String uid, String readyInfo) {
|
||||||
String key = RedisKey.getKey(RedisKey.FIGHT_READY, uid, false);
|
String key = RedisKey.getKey(RedisKey.FIGHT_READY, uid, false);
|
||||||
RedisUtil.getInstence().set(key, Integer.toString(groupId), RedisKey.EXPIRE_TIME);
|
RedisUtil.getInstence().set(key, readyInfo, RedisKey.EXPIRE_TIME);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -81,7 +81,7 @@ public class BehaviorUtil {
|
||||||
* @param fightStartRespons
|
* @param fightStartRespons
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public static void getFightInfo(User user, int groupId, FightInfoProto.FightStartResponse.Builder fightStartRespons) throws Exception {
|
public static void getFightInfo(User user, int groupId, FightInfoProto.FightStartResponse.Builder fightStartRespons, String missionId, String destoryId) throws Exception {
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
|
|
||||||
int teamId = mapManager.getTeamId();
|
int teamId = mapManager.getTeamId();
|
||||||
|
@ -137,6 +137,8 @@ public class BehaviorUtil {
|
||||||
fightInfo.put(RedisKey.FIGHT_MONSTERS, JsonFormat.printToString(monsterGroupList.get(0)));//暂时没考虑多拨怪
|
fightInfo.put(RedisKey.FIGHT_MONSTERS, JsonFormat.printToString(monsterGroupList.get(0)));//暂时没考虑多拨怪
|
||||||
fightInfo.put(RedisKey.FIGHT_SEED,Integer.toString(seed));
|
fightInfo.put(RedisKey.FIGHT_SEED,Integer.toString(seed));
|
||||||
fightInfo.put(RedisKey.FIGHT_GROUPID, Integer.toString(groupId));
|
fightInfo.put(RedisKey.FIGHT_GROUPID, Integer.toString(groupId));
|
||||||
|
fightInfo.put(RedisKey.NEED_MISSION_ID, missionId);
|
||||||
|
fightInfo.put(RedisKey.NEED_DESORY_ID, destoryId);
|
||||||
RedisUtil.getInstence().hmset(key, fightInfo, RedisKey.EXPIRE_TIME);
|
RedisUtil.getInstence().hmset(key, fightInfo, RedisKey.EXPIRE_TIME);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,10 @@ public class FightAndDestroyPointBehavior extends BaseBehavior {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
BehaviorUtil.updateMission(user, behaviorTypeValues[0][0], eventUpdateResponse);
|
String readyInfo = Integer.toString(behaviorTypeValues[0][1]) + "#" + Integer.toString(behaviorTypeValues[0][0]) + "#" + behaviorTypeValues[0][2];
|
||||||
BehaviorUtil.fightReady(user.getId(), behaviorTypeValues[0][1]);
|
BehaviorUtil.fightReady(user.getId(), readyInfo);
|
||||||
|
// 放在战斗胜利后
|
||||||
|
// BehaviorUtil.updateMission(user, behaviorTypeValues[0][0], eventUpdateResponse);
|
||||||
// BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][2]);
|
// BehaviorUtil.distoryPoint(user, behaviorTypeValues[0][2]);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ public class FightBehavior extends BaseBehavior {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
BehaviorUtil.fightReady(user.getId(), behaviorTypeValues[0][0]);
|
BehaviorUtil.fightReady(user.getId(), Integer.toString(behaviorTypeValues[0][0]));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -408,7 +408,7 @@ public class HeroLogic {
|
||||||
}else{
|
}else{
|
||||||
hero.setBreakId(breakId);
|
hero.setBreakId(breakId);
|
||||||
}
|
}
|
||||||
Map<Integer, Integer> heroAllAttribute = calHeroAllAttribute(hero);
|
Map<Integer, Integer> heroAllAttribute = calHeroFinalAttribute(user,hero);
|
||||||
for(Map.Entry<Integer,Integer> item : heroAllAttribute.entrySet() ){
|
for(Map.Entry<Integer,Integer> item : heroAllAttribute.entrySet() ){
|
||||||
LOGGER.info("the heroTdd={},the heroLevel={},the attID is={},attValue={}",hero.getTemplateId(),hero.getLevel(),item.getKey(),item.getValue() );
|
LOGGER.info("the heroTdd={},the heroLevel={},the attID is={},attValue={}",hero.getTemplateId(),hero.getLevel(),item.getKey(),item.getValue() );
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,7 +115,7 @@ public class CBean2Proto {
|
||||||
for (Item item : temporaryItems.items.values()) {
|
for (Item item : temporaryItems.items.values()) {
|
||||||
drop.addItemlist(getItem(item));
|
drop.addItemlist(getItem(item));
|
||||||
}
|
}
|
||||||
for (Equip equip : temporaryItems.equips.values()) {
|
for (Equip equip : temporaryItems.equips) {
|
||||||
drop.addEquipId(getEquipProto(equip));
|
drop.addEquipId(getEquipProto(equip));
|
||||||
}
|
}
|
||||||
return drop.build();
|
return drop.build();
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.ljsd.jieling.util;
|
package com.ljsd.jieling.util;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.config.SEquipConfig;
|
||||||
import com.ljsd.jieling.config.SItem;
|
import com.ljsd.jieling.config.SItem;
|
||||||
import com.ljsd.jieling.config.SRewardGroup;
|
import com.ljsd.jieling.config.SRewardGroup;
|
||||||
import com.ljsd.jieling.config.SRewardItem;
|
import com.ljsd.jieling.config.SRewardItem;
|
||||||
|
@ -13,10 +14,7 @@ import com.ljsd.jieling.protocols.CommonProto;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
|
@ -91,12 +89,12 @@ public class ItemUtil {
|
||||||
}
|
}
|
||||||
useRandomItem(user,randomMap);
|
useRandomItem(user,randomMap);
|
||||||
if (isMapping == 1) {
|
if (isMapping == 1) {
|
||||||
addItemToTemporaryBag(user,itemMap,dropBuilder);
|
addItemToTemporaryBag(user, itemMap, equipMap, dropBuilder);
|
||||||
} else {
|
} else {
|
||||||
addItem(user,itemMap,dropBuilder);
|
addItem(user,itemMap,dropBuilder);
|
||||||
|
addEquip(user,equipMap,dropBuilder);
|
||||||
}
|
}
|
||||||
addCard(user,cardMap,dropBuilder);
|
addCard(user,cardMap,dropBuilder);
|
||||||
addEquip(user,equipMap,dropBuilder);
|
|
||||||
return dropBuilder;
|
return dropBuilder;
|
||||||
}
|
}
|
||||||
private static void selectItemArr(int[][] itemArr, Map<Integer, Integer> cardMap, Map<Integer, Integer>
|
private static void selectItemArr(int[][] itemArr, Map<Integer, Integer> cardMap, Map<Integer, Integer>
|
||||||
|
@ -272,8 +270,9 @@ public class ItemUtil {
|
||||||
* @param itemMap
|
* @param itemMap
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public static void addItemToTemporaryBag(User user, Map<Integer, Integer> itemMap,CommonProto.Drop.Builder dropBuilder) throws Exception {
|
public static void addItemToTemporaryBag(User user, Map<Integer, Integer> itemMap, Map<Integer, Integer> equipMap, CommonProto.Drop.Builder dropBuilder) throws Exception {
|
||||||
List<CommonProto.Item> itemProtoList = new CopyOnWriteArrayList<>();
|
List<CommonProto.Item> itemProtoList = new ArrayList<>();
|
||||||
|
List<CommonProto.Equip> equipProtoList = new ArrayList<>();
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
TemporaryItems temporaryItems = mapManager.getTemporaryItems();
|
TemporaryItems temporaryItems = mapManager.getTemporaryItems();
|
||||||
if (temporaryItems == null) {
|
if (temporaryItems == null) {
|
||||||
|
@ -281,8 +280,8 @@ public class ItemUtil {
|
||||||
}
|
}
|
||||||
Map<Integer, Item> items = temporaryItems.items;
|
Map<Integer, Item> items = temporaryItems.items;
|
||||||
for (Map.Entry<Integer, Integer> entry : itemMap.entrySet()) {
|
for (Map.Entry<Integer, Integer> entry : itemMap.entrySet()) {
|
||||||
SItem sItem = SItem.getsItemMap().get (entry.getKey());
|
SItem sItem = SItem.getsItemMap().get(entry.getKey());
|
||||||
if (sItem == null){
|
if (sItem == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Item item = items.get(entry.getKey());
|
Item item = items.get(entry.getKey());
|
||||||
|
@ -294,9 +293,20 @@ public class ItemUtil {
|
||||||
}
|
}
|
||||||
itemProtoList.add(CBean2Proto.getItem(item));
|
itemProtoList.add(CBean2Proto.getItem(item));
|
||||||
}
|
}
|
||||||
|
Set<Equip> equips = temporaryItems.equips;
|
||||||
|
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()) {
|
||||||
|
SEquipConfig sEquipConfig = SEquipConfig.getsEquipConfigById(entry.getKey());
|
||||||
|
if (sEquipConfig == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Equip equip = new Equip(user.getId(), entry.getKey());
|
||||||
|
equips.add(equip);
|
||||||
|
equipProtoList.add(CBean2Proto.getEquipProto(equip));
|
||||||
|
}
|
||||||
mapManager.setTemporaryItems(temporaryItems);
|
mapManager.setTemporaryItems(temporaryItems);
|
||||||
if (dropBuilder != null) {
|
if (dropBuilder != null) {
|
||||||
dropBuilder.addAllItemlist(itemProtoList);
|
dropBuilder.addAllItemlist(itemProtoList);
|
||||||
|
dropBuilder.addAllEquipId(equipProtoList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -306,9 +316,9 @@ public class ItemUtil {
|
||||||
* @param temporaryItems
|
* @param temporaryItems
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public static void addTemporaryItemToBag(User user, TemporaryItems temporaryItems) throws Exception {
|
public static void addTemporaryItemToBag(User user, TemporaryItems temporaryItems, boolean isVictory) throws Exception {
|
||||||
Map<Integer, Item> items = temporaryItems.items;
|
Map<Integer, Item> items = temporaryItems.items;
|
||||||
Map<Integer, Equip> equips = temporaryItems.equips;
|
Set<Equip> equips = temporaryItems.equips;
|
||||||
if (items.isEmpty() && equips.isEmpty()) {
|
if (items.isEmpty() && equips.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -318,7 +328,7 @@ public class ItemUtil {
|
||||||
if (sItem == null){
|
if (sItem == null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (sItem.getIsSave() != 1) {
|
if (!isVictory && sItem.getIsSave() != 1) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Item item = itemMap.get(entry.getKey());
|
Item item = itemMap.get(entry.getKey());
|
||||||
|
@ -331,6 +341,16 @@ public class ItemUtil {
|
||||||
itemMap.put(entry.getKey(), item) ;
|
itemMap.put(entry.getKey(), item) ;
|
||||||
}
|
}
|
||||||
user.getItemManager().setItemMap(itemMap);
|
user.getItemManager().setItemMap(itemMap);
|
||||||
|
for (Equip equip : equips) {
|
||||||
|
SItem sItem = SItem.getsItemMap().get (equip.getEquipId());
|
||||||
|
if (sItem == null){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!isVictory && sItem.getIsSave() != 1) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
user.getEquipManager().addEquip(equip);
|
||||||
|
}
|
||||||
user.getMapManager().setTemporaryItems(null);
|
user.getMapManager().setTemporaryItems(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue