From 4c47d1c36e67896dd9141ab772a692a8ccf38523 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 25 Apr 2019 15:40:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BB=8E=E5=B0=8F?= =?UTF-8?q?=E5=88=B0=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index 8e39c8db7..87ea4e14f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -708,7 +708,7 @@ public class RedisUtil { public Set getZset(String key,long min,long max){ for (int i = 0; i < MAX_TRY_TIMES; i++) { try { - return redisTemplate.opsForZSet().reverseRange(key, min, max); + return redisTemplate.opsForZSet().range(key, min, max); } catch (Exception e) { TimeUtils.sleep(FAILED_SLEEP); } From a699b4e4dd6b004d920ae1ed3812411418d9c096 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 25 Apr 2019 17:04:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8C=82=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/ChallengeMapConfig.txt | 20 +- conf/server/FoodsConfig.txt | 2 + conf/server/GlobalSystemConfig.txt | 1 + conf/server/GuideConfig.txt | 1 + conf/server/MonsterConfig.txt | 455 +++++++++--------- conf/server/MonsterGroup.txt | 138 +++--- conf/server/OptionConfig.txt | 8 +- conf/server/WorkShopRebuildConfig.txt | 14 +- .../com/ljsd/jieling/db/redis/RedisUtil.java | 4 +- .../ljsd/jieling/handler/map/MapLogic.java | 18 +- .../ljsd/jieling/handler/map/MapManager.java | 2 +- .../ljsd/jieling/logic/fight/CombatLogic.java | 81 ++-- .../ljsd/jieling/thread/task/MinuteTask.java | 3 + 13 files changed, 405 insertions(+), 342 deletions(-) diff --git a/conf/server/ChallengeMapConfig.txt b/conf/server/ChallengeMapConfig.txt index d923803a9..740fe0450 100644 --- a/conf/server/ChallengeMapConfig.txt +++ b/conf/server/ChallengeMapConfig.txt @@ -1,13 +1,13 @@ MapId MissionId Size Refresh IfRank SweepingAward Position int int mut,int#int,1 int int mut,int#int,1 mut,int#int,1 100 1 15#20 0 0 2001 8#19 -101 2 15#20 0 0 2001 15#15 -102 3 15#20 0 0 2001 4#20 -103 4 15#20 0 0 2001 15#20 -104 5 20#15 0 0 2001 7#15 -105 6 15#20 0 0 2001 13#17 -106 7 20#30 0 0 2001 11#17 -107 8 15#20 0 0 2001 5#2 -108 9 20#15 0 0 2001 19#6 -109 10 10#20 0 0 2001 5#20 -110 11 15#20 0 0 2001 13#17 +101 2 15#20 0 0 3001#3001#3001#3001#3001#3001#3001#3001#3001#10110#2305#700002#700001#700001#700002#700001 15#15 +102 3 15#20 0 0 700001#700002#700001#700002#700001#700002#3006#3006#3006#3006#3006#3006#3006#3006#3006#3006#3006#10211#3006#10212#3006#10213#10110#2305 4#20 +103 4 15#20 0 0 3011#3011#3011#55001#10110#10305#2305#2304#2304 15#20 +104 5 20#15 0 0 2304#700001#2304#700002#3018#3018#3018#3018#3018#3018#3018#10410#3018#10410#10110#10409#2305 7#15 +105 6 15#20 0 0 3020#3020#3020#3020#3020#55003#10110#10411#10110#10411#2305#700003#700004#700003 13#17 +106 7 20#30 0 0 700003#700004#700003#700004#3026#10412#3026#10412#3026#10412#10110#10411#10110#10411#2305 11#17 +107 8 15#20 0 0 700003#700003#700003#700003#700003#700003#700003#700004#3031#3031#3031#3031#3031#3031#3031#10412#3031#10412#10110#10411#10110#10411#10110#10411#10110#10411#10110#10411#2305 5#2 +108 9 20#15 0 0 3036#3036#3036#3036#3036#3036#3036#3036#3036#3036#10110#10413#3036#10412#3036#10412#3036#10412#10110#10413#10412#10412#700004#10412#700003#700004#700003#700003 19#6 +109 10 10#20 0 0 700003#700004#10412#10412#700003#3038#3038#3038#3038#3038#3038#10906#20906#10906#20906#10907#20907 5#20 +110 11 15#20 0 0 700003#700004#10412#3041#3041#3041#3041#3041#3041#10906#20906#10907#20907 13#17 diff --git a/conf/server/FoodsConfig.txt b/conf/server/FoodsConfig.txt index 353b94ce4..eb4304f40 100644 --- a/conf/server/FoodsConfig.txt +++ b/conf/server/FoodsConfig.txt @@ -31,6 +31,8 @@ int int int int mut,int#int,2 int 9229 15 0 0 null 1 9230 15 0 0 null 1 9231 15 0 0 null 1 +1001 0 2 2 6#100002 2 +1002 10 2 2 2#2 2 1 0 1 1 6#400 2 2 0 1 1 6#600 2 3 0 1 1 6#-1200 2 diff --git a/conf/server/GlobalSystemConfig.txt b/conf/server/GlobalSystemConfig.txt index 3310b8e82..c20b7d6f8 100644 --- a/conf/server/GlobalSystemConfig.txt +++ b/conf/server/GlobalSystemConfig.txt @@ -15,3 +15,4 @@ int mut,int#int,1 13 2#30 14 2#30 15 2#12 +0 null diff --git a/conf/server/GuideConfig.txt b/conf/server/GuideConfig.txt index ec42db016..a76a8b0c2 100644 --- a/conf/server/GuideConfig.txt +++ b/conf/server/GuideConfig.txt @@ -11,6 +11,7 @@ int int 9 1 10 1 11 1 +12 1 15 1 16 1 17 1 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index fcb1fe5bd..752cb16fe 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -152,53 +152,53 @@ int int int int int int int int int int int float float float float int float mu 1015 3 2 0 2 16 3726 231 101 101 208 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null 1016 3 2 0 2 16 3726 231 101 101 20 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null 1017 5 1 0 3 40 12422 739 254 254 400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20013 null -1018 10040 1 0 1 32 13236 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1019 10040 1 0 1 32 13236 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1020 10040 1 0 1 32 13236 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1018 10040 1 3 1 32 13236 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1019 10040 1 3 1 32 13236 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1020 10040 1 3 1 32 13236 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null 1021 6 2 0 1 32 8824 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null 1022 6 2 0 1 32 8824 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null 1023 6 2 0 1 32 8824 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null 1024 7 1 0 1 32 8824 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20019 null 1025 7 1 0 1 32 8824 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20019 null 1026 7 1 0 1 32 8824 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20019 null -1027 10040 1 0 1 32 8824 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1028 10040 1 0 1 32 8824 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1029 10040 1 0 1 32 8824 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1027 10040 1 3 1 32 8824 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1028 10040 1 3 1 32 8824 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1029 10040 1 3 1 32 8824 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null 1030 1 2 0 1 32 8824 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1031 1 2 0 1 32 8824 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1032 1 2 0 1 32 8824 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1033 3 2 0 2 48 19854 693 305 305 1392 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null 1034 3 2 0 2 48 19854 693 305 305 464 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null 1035 3 2 0 2 48 19854 693 305 305 46 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -1036 10040 1 0 1 32 8824 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1037 10040 1 0 1 32 8824 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1038 10040 1 0 1 32 8824 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1039 10031 1 0 2 48 19854 693 305 305 1392 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -1040 10031 1 0 2 48 19854 693 305 305 464 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -1041 10031 1 0 2 48 19854 693 305 305 46 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -1042 10035 1 0 3 88 66180 1479 508 508 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +1036 10040 1 3 1 32 8824 453 203 203 1008 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1037 10040 1 3 1 32 8824 453 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1038 10040 1 3 1 32 8824 453 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1039 10031 1 3 2 48 19854 693 305 305 1392 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +1040 10031 1 3 2 48 19854 693 305 305 464 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +1041 10031 1 3 2 48 19854 693 305 305 46 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +1042 10035 1 1 3 88 66180 1479 508 508 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null 1043 10 3 0 1 88 22321 1153 516 516 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 1044 10 3 0 1 88 22321 1153 516 516 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 1045 10 3 0 1 88 22321 1153 516 516 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -1046 10040 1 0 1 88 22321 1153 516 516 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1047 10040 1 0 1 88 22321 1153 516 516 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1048 10040 1 0 1 88 22321 1153 516 516 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1049 10031 1 0 2 88 34070 1209 528 528 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -1050 10031 1 0 2 88 34070 1209 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -1051 10031 1 0 2 88 34070 1209 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -1052 10035 1 0 3 88 69316 1617 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -1053 10044 1 0 3 88 69316 1617 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null +1046 10040 1 3 1 88 22321 1153 516 516 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1047 10040 1 3 1 88 22321 1153 516 516 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1048 10040 1 3 1 88 22321 1153 516 516 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1049 10031 1 3 2 88 34070 1209 528 528 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +1050 10031 1 3 2 88 34070 1209 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +1051 10031 1 3 2 88 34070 1209 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +1052 10035 1 1 3 88 69316 1617 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +1053 10044 1 2 3 88 69316 1617 540 540 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null 1054 43 3 0 1 88 22713 1184 528 528 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1055 43 3 0 1 88 22713 1184 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1056 43 3 0 1 88 22713 1184 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1057 9 3 0 1 88 22713 1184 528 528 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 1058 9 3 0 1 88 22713 1184 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 1059 9 3 0 1 88 22713 1184 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -1060 10040 1 0 1 88 22713 1184 528 528 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1061 10040 1 0 1 88 22713 1184 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -1062 10039 1 0 1 88 22713 1184 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -1063 10039 1 0 3 100 77019 1911 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -1064 10030 1 0 3 100 77019 1911 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null +1060 10040 1 3 1 88 22713 1184 528 528 2352 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1061 10040 1 3 1 88 22713 1184 528 528 784 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +1062 10039 1 2 1 88 22713 1184 528 528 78 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +1063 10039 1 2 3 100 77019 1911 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +1064 10030 1 5 3 100 77019 1911 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null 1065 41 4 0 2 96 36434 1325 570 570 2544 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1066 41 4 0 2 96 36434 1325 570 570 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1067 41 4 0 2 96 36434 1325 570 570 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null @@ -208,9 +208,9 @@ int int int int int int int int int int int float float float float int float mu 1071 42 1 0 1 96 24520 1309 576 576 2544 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1072 42 1 0 1 96 24520 1309 576 576 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1073 42 1 0 1 96 24520 1309 576 576 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -1074 10033 1 0 2 100 37267 1385 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003311#1003321 null -1075 10033 1 0 2 100 37267 1385 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003311#1003321 null -1076 10033 1 0 2 100 37267 1385 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003311#1003321 null +1074 10033 1 4 2 100 37267 1385 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003311#1003321 null +1075 10033 1 4 2 100 37267 1385 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003311#1003321 null +1076 10033 1 4 2 100 37267 1385 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003311#1003321 null 1077 42 1 0 1 96 24520 1309 576 576 2544 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1078 42 1 0 1 96 24520 1309 576 576 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1079 42 1 0 1 96 24520 1309 576 576 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null @@ -226,47 +226,47 @@ int int int int int int int int int int int float float float float int float mu 1089 44 3 0 1 100 24845 1348 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1090 44 3 0 1 100 24845 1348 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 1091 44 3 0 1 100 24845 1348 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -1092 10016 1 0 3 108 74917 1937 582 582 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001611#1001621 null +1092 10016 1 4 3 108 74917 1937 582 582 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001611#1001621 null 1093 16 4 0 1 100 24845 1348 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 1094 16 4 0 1 100 24845 1348 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 1095 16 4 0 1 100 24845 1348 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -1096 10037 1 0 2 100 36742 1374 571 571 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1097 10037 1 0 2 100 36742 1374 571 571 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1098 10037 1 0 2 100 36742 1374 571 571 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1099 10034 1 0 1 100 24845 1348 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -1100 10034 1 0 1 100 24845 1348 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -1101 10034 1 0 1 100 24845 1348 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -1102 10037 1 0 1 100 24845 1348 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1103 10037 1 0 1 100 24845 1348 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1104 10037 1 0 1 100 24845 1348 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1105 10037 1 0 1 100 24494 1336 571 571 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1106 10037 1 0 1 100 24494 1336 571 571 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1107 10037 1 0 1 100 24494 1336 571 571 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -1108 10040 1 0 1 100 24494 1336 571 571 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011#1004021 null -1109 10040 1 0 1 100 24494 1336 571 571 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011#1004021 null -1110 10040 1 0 1 100 24494 1336 571 571 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011#1004021 null +1096 10037 1 2 2 100 36742 1374 571 571 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1097 10037 1 2 2 100 36742 1374 571 571 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1098 10037 1 2 2 100 36742 1374 571 571 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1099 10034 1 4 1 100 24845 1348 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +1100 10034 1 4 1 100 24845 1348 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +1101 10034 1 4 1 100 24845 1348 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +1102 10037 1 2 1 100 24845 1348 582 582 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1103 10037 1 2 1 100 24845 1348 582 582 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1104 10037 1 2 1 100 24845 1348 582 582 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1105 10037 1 2 1 100 24494 1336 571 571 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1106 10037 1 2 1 100 24494 1336 571 571 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1107 10037 1 2 1 100 24494 1336 571 571 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +1108 10040 1 3 1 100 24494 1336 571 571 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011#1004021 null +1109 10040 1 3 1 100 24494 1336 571 571 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011#1004021 null +1110 10040 1 3 1 100 24494 1336 571 571 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011#1004021 null 1111 17 4 0 3 108 103646 2390 753 753 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -1112 10050 3 0 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -1113 10050 3 0 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -1114 10050 3 0 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -1115 10048 3 0 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -1116 10048 3 0 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -1117 10048 3 0 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -1118 10047 3 0 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -1119 10047 3 0 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -1120 10047 3 0 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -1121 10049 3 0 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -1122 10049 3 0 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -1123 10049 3 0 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -1124 10051 2 0 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -1125 10051 2 0 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -1126 10051 2 0 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -1127 10052 2 0 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -1128 10052 2 0 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -1129 10052 2 0 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -1130 10051 2 0 2 120 53256 1816 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -1131 10052 2 0 2 120 53256 1816 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -1132 10044 1 0 3 122 160273 3322 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null +1112 10050 3 1 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +1113 10050 3 1 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +1114 10050 3 1 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +1115 10048 3 2 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +1116 10048 3 2 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +1117 10048 3 2 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +1118 10047 3 1 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +1119 10047 3 1 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +1120 10047 3 1 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +1121 10049 3 4 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +1122 10049 3 4 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +1123 10049 3 4 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +1124 10051 2 2 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +1125 10051 2 2 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +1126 10051 2 2 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +1127 10052 2 4 1 108 29760 1543 668 668 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +1128 10052 2 4 1 108 29760 1543 668 668 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +1129 10052 2 4 1 108 29760 1543 668 668 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +1130 10051 2 2 2 120 53256 1816 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +1131 10052 2 4 2 120 53256 1816 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +1132 10044 1 2 3 122 160273 3322 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null 1133 17 4 0 3 108 103646 2390 753 753 2832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 1134 15 4 0 1 120 35504 1772 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 1135 15 4 0 1 120 35504 1772 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null @@ -363,15 +363,15 @@ int int int int int int int int int int int float float float float int float mu 50079 1 2 0 1 32 813 1561 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null 50080 1 2 0 1 32 813 1561 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null 50081 1 2 0 1 32 813 1561 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102511 null -50082 10040 1 0 1 32 1220 2716 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50083 10040 1 0 1 32 1220 2716 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50084 10040 1 0 1 32 1220 2716 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null -50085 10031 1 0 2 32 1342 3178 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null -50086 10031 1 0 2 32 1342 3178 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null -50087 10031 1 0 2 32 1342 3178 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null -50088 10035 1 0 3 32 1465 3871 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50089 10035 1 0 3 32 1465 3871 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50090 10035 1 0 3 32 1465 3871 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50082 10040 1 3 1 32 1220 2716 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50083 10040 1 3 1 32 1220 2716 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50084 10040 1 3 1 32 1220 2716 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102521 null +50085 10031 1 3 2 32 1342 3178 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null +50086 10031 1 3 2 32 1342 3178 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null +50087 10031 1 3 2 32 1342 3178 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1102531#1102532 null +50088 10035 1 1 3 32 1465 3871 203 203 840 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50089 10035 1 1 3 32 1465 3871 203 203 336 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50090 10035 1 1 3 32 1465 3871 203 203 33 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null 50091 9 3 0 1 44 1119 2147 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50092 9 3 0 1 44 1119 2147 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50093 9 3 0 1 44 1119 2147 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null @@ -387,45 +387,45 @@ int int int int int int int int int int int float float float float int float mu 50103 11 3 0 2 44 1846 2465 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20032 null 50104 11 3 0 2 44 1846 2465 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20032 null 50105 11 3 0 2 44 1846 2465 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20032 null -50106 10040 1 0 1 44 2797 3735 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50107 10040 1 0 1 44 2797 3735 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50108 10040 1 0 1 44 2797 3735 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50106 10040 1 3 1 44 2797 3735 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50107 10040 1 3 1 44 2797 3735 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50108 10040 1 3 1 44 2797 3735 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null 50109 9 3 0 1 44 1119 2147 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103311 null 50110 9 3 0 1 44 1119 2147 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103311 null 50111 9 3 0 1 44 1119 2147 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103311 null 50112 10 3 0 1 44 1398 1512 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103321 null 50113 10 3 0 1 44 1398 1512 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103321 null 50114 10 3 0 1 44 1398 1512 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103321 null -50115 10051 2 0 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103331#1103332 null -50116 10051 2 0 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103331#1103332 null -50117 10051 2 0 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103331#1103332 null -50118 10052 2 0 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103341#1103342 null -50119 10052 2 0 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103341#1103342 null -50120 10052 2 0 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103341#1103342 null -50121 10031 1 0 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50122 10031 1 0 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50123 10031 1 0 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50115 10051 2 2 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103331#1103332 null +50116 10051 2 2 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103331#1103332 null +50117 10051 2 2 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103331#1103332 null +50118 10052 2 4 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103341#1103342 null +50119 10052 2 4 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103341#1103342 null +50120 10052 2 4 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1103341#1103342 null +50121 10031 1 3 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50122 10031 1 3 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50123 10031 1 3 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null 50124 9 3 0 1 44 1119 2147 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50125 9 3 0 1 44 1119 2147 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50126 9 3 0 1 44 1119 2147 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null -50127 10040 1 0 1 44 2797 3735 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50128 10040 1 0 1 44 2797 3735 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50129 10040 1 0 1 44 2797 3735 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null -50130 10031 1 0 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50131 10031 1 0 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50132 10031 1 0 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null -50133 10035 1 0 3 44 3357 5323 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50134 10035 1 0 3 44 3357 5323 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50135 10035 1 0 3 44 3357 5323 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null -50136 10051 2 0 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -50137 10051 2 0 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -50138 10051 2 0 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -50139 10052 2 0 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -50140 10052 2 0 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -50141 10052 2 0 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -50142 10044 1 0 3 44 3357 5323 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null -50143 10044 1 0 3 44 3357 5323 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null -50144 10044 1 0 3 44 3357 5323 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null +50127 10040 1 3 1 44 2797 3735 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50128 10040 1 3 1 44 2797 3735 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50129 10040 1 3 1 44 2797 3735 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004011 null +50130 10031 1 3 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50131 10031 1 3 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50132 10031 1 3 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003111 null +50133 10035 1 1 3 44 3357 5323 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50134 10035 1 1 3 44 3357 5323 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50135 10035 1 1 3 44 3357 5323 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003511#1003521 null +50136 10051 2 2 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +50137 10051 2 2 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +50138 10051 2 2 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +50139 10052 2 4 2 44 3077 4370 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +50140 10052 2 4 2 44 3077 4370 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +50141 10052 2 4 2 44 3077 4370 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +50142 10044 1 2 3 44 3357 5323 279 279 1080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null +50143 10044 1 2 3 44 3357 5323 279 279 432 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null +50144 10044 1 2 3 44 3357 5323 279 279 43 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004411#1004421 null 50145 9 3 0 1 56 1424 2733 356 356 1320 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50146 9 3 0 1 56 1424 2733 356 356 528 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50147 9 3 0 1 56 1424 2733 356 356 52 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null @@ -450,15 +450,15 @@ int int int int int int int int int int int float float float float int float mu 50166 43 3 0 1 64 2034 2199 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null 50167 43 3 0 1 64 2034 2199 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null 50168 43 3 0 1 64 2034 2199 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104311 null -50169 10040 1 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null -50170 10040 1 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null -50171 10040 1 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null -50172 10039 1 0 3 64 2930 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -50173 10039 1 0 3 64 2930 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -50174 10039 1 0 3 64 2930 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null -50175 10030 1 0 3 64 2930 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null -50176 10030 1 0 3 64 2930 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null -50177 10030 1 0 3 64 2930 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null +50169 10040 1 3 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null +50170 10040 1 3 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null +50171 10040 1 3 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104331 null +50172 10039 1 2 3 64 2930 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +50173 10039 1 2 3 64 2930 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +50174 10039 1 2 3 64 2930 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003911#1003921 null +50175 10030 1 5 3 64 2930 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null +50176 10030 1 5 3 64 2930 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null +50177 10030 1 5 3 64 2930 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003011#1003021 null 50178 9 3 0 1 72 1831 3514 457 457 1640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50179 9 3 0 1 72 1831 3514 457 457 656 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50180 9 3 0 1 72 1831 3514 457 457 65 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null @@ -474,18 +474,18 @@ int int int int int int int int int int int float float float float int float mu 50190 21 3 0 3 64 1953 7742 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null 50191 21 3 0 3 64 1953 7742 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null 50192 21 3 0 3 64 1953 7742 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104561#1104562 null -50193 10047 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null -50194 10047 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null -50195 10047 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null -50196 10048 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null -50197 10048 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null -50198 10048 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null -50199 10049 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null -50200 10049 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null -50201 10049 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null -50202 10050 3 0 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null -50203 10050 3 0 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null -50204 10050 3 0 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null +50193 10047 3 1 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null +50194 10047 3 1 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null +50195 10047 3 1 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711 null +50196 10048 3 2 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null +50197 10048 3 2 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null +50198 10048 3 2 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811 null +50199 10049 3 4 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null +50200 10049 3 4 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null +50201 10049 3 4 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911 null +50202 10050 3 1 1 64 2441 5433 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null +50203 10050 3 1 1 64 2441 5433 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null +50204 10050 3 1 1 64 2441 5433 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011 null 50205 6 2 0 2 64 1790 1922 406 406 1480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50206 6 2 0 2 64 1790 1922 406 406 592 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50207 6 2 0 2 64 1790 1922 406 406 59 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null @@ -510,21 +510,21 @@ int int int int int int int int int int int float float float float int float mu 50226 43 3 0 1 91 2622 2921 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50227 43 3 0 1 91 2622 2921 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50228 43 3 0 1 91 2622 2921 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50229 10025 1 0 3 91 6293 10414 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null -50230 10025 1 0 3 91 6293 10414 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null -50231 10025 1 0 3 91 6293 10414 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null -50232 42 1 0 1 92 3193 2360 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50229 10025 1 1 3 91 6293 10414 524 524 2020 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null +50230 10025 1 1 3 91 6293 10414 524 524 808 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null +50231 10025 1 1 3 91 6293 10414 524 524 80 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002511#1002521 null +50232 42 1 0 1 92 3193 2360 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104562 null 50233 42 1 0 1 92 3193 2360 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50234 42 1 0 1 92 3193 2360 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50234 42 1 0 1 92 3193 2360 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104563 null 50235 23 1 0 2 92 3513 4951 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50236 23 1 0 2 92 3513 4951 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50237 23 1 0 2 92 3513 4951 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50238 10002 1 0 3 92 6387 10781 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50239 10002 1 0 3 92 6387 10781 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50240 10002 1 0 3 92 6387 10781 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50241 10026 1 0 3 92 6387 10781 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null -50242 10026 1 0 3 92 6387 10781 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null -50243 10026 1 0 3 92 6387 10781 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null +50238 10002 1 3 3 92 6387 10781 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50239 10002 1 3 3 92 6387 10781 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50240 10002 1 3 3 92 6387 10781 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50241 10026 1 3 3 92 6387 10781 532 532 2040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null +50242 10026 1 3 3 92 6387 10781 532 532 816 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null +50243 10026 1 3 3 92 6387 10781 532 532 81 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002611#1002621 null 50244 42 1 0 1 94 3241 2422 540 540 2080 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50245 42 1 0 1 94 3241 2422 540 540 832 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50246 42 1 0 1 94 3241 2422 540 540 83 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null @@ -543,12 +543,12 @@ int int int int int int int int int int int float float float float int float mu 50259 23 1 0 2 96 3617 5264 548 548 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50260 23 1 0 2 96 3617 5264 548 548 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50261 23 1 0 2 96 3617 5264 548 548 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50262 10033 1 0 2 96 6028 9433 548 548 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50263 10033 1 0 2 96 6028 9433 548 548 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50264 10033 1 0 2 96 6028 9433 548 548 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50265 5 1 0 3 96 3946 6306 548 548 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50266 5 1 0 3 96 3946 6306 548 548 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null -50267 5 1 0 3 96 3946 6306 548 548 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50262 10033 1 4 2 96 6028 9433 548 548 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50263 10033 1 4 2 96 6028 9433 548 548 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50264 10033 1 4 2 96 6028 9433 548 548 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50265 5 1 0 3 96 3946 6306 548 548 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104565 null +50266 5 1 0 3 96 3946 6306 548 548 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104565 null +50267 5 1 0 3 96 3946 6306 548 548 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104565 null 50268 1 2 0 1 96 2237 4776 559 559 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50269 1 2 0 1 96 2237 4776 559 559 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null 50270 1 2 0 1 96 2237 4776 559 559 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null @@ -561,12 +561,12 @@ int int int int int int int int int int int float float float float int float mu 50277 2 3 0 1 97 3422 2677 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null 50278 2 3 0 1 97 3422 2677 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null 50279 2 3 0 1 97 3422 2677 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null -50280 10034 1 0 1 97 5704 8825 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -50281 10034 1 0 1 97 5704 8825 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -50282 10034 1 0 1 97 5704 8825 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null -50283 10037 1 0 1 97 5704 8825 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -50284 10037 1 0 1 97 5704 8825 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null -50285 10037 1 0 1 97 5704 8825 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +50280 10034 1 4 1 97 5704 8825 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +50281 10034 1 4 1 97 5704 8825 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +50282 10034 1 4 1 97 5704 8825 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003411#1003421 null +50283 10037 1 2 1 97 5704 8825 570 570 2140 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +50284 10037 1 2 1 97 5704 8825 570 570 856 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null +50285 10037 1 2 1 97 5704 8825 570 570 85 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1003711#1003721 null 50286 9 3 0 1 98 2326 5189 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50287 9 3 0 1 98 2326 5189 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null 50288 9 3 0 1 98 2326 5189 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20025 null @@ -576,9 +576,9 @@ int int int int int int int int int int int float float float float int float mu 50292 6 2 0 1 98 3489 2773 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null 50293 6 2 0 1 98 3489 2773 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null 50294 6 2 0 1 98 3489 2773 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20016 null -50295 3 2 0 1 98 3489 5189 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50296 3 2 0 1 98 3489 5189 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null -50297 3 2 0 1 98 3489 5189 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20007 null +50295 3 2 0 1 98 3489 5189 581 581 2160 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104564 null +50296 3 2 0 1 98 3489 5189 581 581 864 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104564 null +50297 3 2 0 1 98 3489 5189 581 581 86 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104564 null 50298 2 3 0 1 99 3556 2869 592 592 2180 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null 50299 2 3 0 1 99 3556 2869 592 592 872 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null 50300 2 3 0 1 99 3556 2869 592 592 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20002 null @@ -600,9 +600,9 @@ int int int int int int int int int int int float float float float int float mu 50316 3 2 0 1 100 3623 5602 603 603 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50317 3 2 0 1 100 3623 5602 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50318 3 2 0 1 100 3623 5602 603 603 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50319 10016 1 0 3 100 7247 14392 603 603 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50320 10016 1 0 3 100 7247 14392 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null -50321 10016 1 0 3 100 7247 14392 603 603 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +50319 10016 1 4 3 100 7247 14392 603 603 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001611#1001621 null +50320 10016 1 4 3 100 7247 14392 603 603 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001611#1001621 null +50321 10016 1 4 3 100 7247 14392 603 603 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001611#1001621 null 50322 1 2 0 1 100 2364 5694 591 591 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50323 1 2 0 1 100 2364 5694 591 591 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50324 1 2 0 1 100 2364 5694 591 591 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null @@ -657,60 +657,60 @@ int int int int int int int int int int int float float float float int float mu 50373 15 4 0 2 108 3846 6950 582 582 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 50374 15 4 0 2 108 3846 6950 582 582 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 50375 15 4 0 2 108 3846 6950 582 582 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null -50376 22 2 0 3 108 6993 15628 582 582 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50377 22 2 0 3 108 6993 15628 582 582 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50378 22 2 0 3 108 6993 15628 582 582 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +50376 22 2 0 3 108 6993 15628 582 582 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104566 null +50377 22 2 0 3 108 6993 15628 582 582 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104567 null +50378 22 2 0 3 108 6993 15628 582 582 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104566 null 50379 23 1 0 2 108 3803 6300 633 633 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50380 23 1 0 2 108 3803 6300 633 633 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50381 23 1 0 2 108 3803 6300 633 633 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50382 10050 3 0 1 108 6339 11332 633 633 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -50383 10050 3 0 1 108 6339 11332 633 633 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -50384 10050 3 0 1 108 6339 11332 633 633 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -50385 10013 1 0 3 108 7607 16365 633 633 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001311#1001321 null -50386 10013 1 0 3 108 7607 16365 633 633 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001311#1001321 null -50387 10013 1 0 3 108 7607 16365 633 633 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001311#1001321 null +50382 10050 3 1 1 108 6339 11332 633 633 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50383 10050 3 1 1 108 6339 11332 633 633 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50384 10050 3 1 1 108 6339 11332 633 633 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50385 10013 1 2 3 108 7607 16365 633 633 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001311#1001321 null +50386 10013 1 2 3 108 7607 16365 633 633 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001311#1001321 null +50387 10013 1 2 3 108 7607 16365 633 633 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001311#1001321 null 50388 23 1 0 2 108 4110 6614 685 685 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50389 23 1 0 2 108 4110 6614 685 685 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50390 23 1 0 2 108 4110 6614 685 685 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50391 10048 3 0 1 108 6851 11858 685 685 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -50392 10048 3 0 1 108 6851 11858 685 685 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -50393 10048 3 0 1 108 6851 11858 685 685 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -50394 10004 1 0 3 108 8221 17101 685 685 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null -50395 10004 1 0 3 108 8221 17101 685 685 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null -50396 10004 1 0 3 108 8221 17101 685 685 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null +50391 10048 3 2 1 108 6851 11858 685 685 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50392 10048 3 2 1 108 6851 11858 685 685 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50393 10048 3 2 1 108 6851 11858 685 685 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50394 10004 1 5 3 108 8221 17101 685 685 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null +50395 10004 1 5 3 108 8221 17101 685 685 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null +50396 10004 1 5 3 108 8221 17101 685 685 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null 50397 23 1 0 2 108 4520 7032 753 753 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50398 23 1 0 2 108 4520 7032 753 753 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50399 23 1 0 2 108 4520 7032 753 753 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50400 10047 3 0 1 108 7533 12558 753 753 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50401 10047 3 0 1 108 7533 12558 753 753 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50402 10047 3 0 1 108 7533 12558 753 753 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50403 10012 1 0 3 108 9040 18084 753 753 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null -50404 10012 1 0 3 108 9040 18084 753 753 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null -50405 10012 1 0 3 108 9040 18084 753 753 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null +50400 10047 3 1 1 108 7533 12558 753 753 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50401 10047 3 1 1 108 7533 12558 753 753 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50402 10047 3 1 1 108 7533 12558 753 753 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +50403 10012 1 2 3 108 9040 18084 753 753 2360 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null +50404 10012 1 2 3 108 9040 18084 753 753 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null +50405 10012 1 2 3 108 9040 18084 753 753 94 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null 50406 23 1 0 2 114 4585 7070 764 764 2480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50407 23 1 0 2 114 4585 7070 764 764 992 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50408 23 1 0 2 114 4585 7070 764 764 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50409 10049 3 0 1 114 7641 12613 764 764 2480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50410 10049 3 0 1 114 7641 12613 764 764 992 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50411 10049 3 0 1 114 7641 12613 764 764 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50412 10007 1 0 3 114 9170 18155 764 764 2480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null -50413 10007 1 0 3 114 9170 18155 764 764 992 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null -50414 10007 1 0 3 114 9170 18155 764 764 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null -50415 10051 2 0 1 120 7750 12667 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -50416 10051 2 0 1 120 7750 12667 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -50417 10051 2 0 1 120 7750 12667 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null -50418 10052 2 0 1 120 7750 12667 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -50419 10052 2 0 1 120 7750 12667 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -50420 10052 2 0 1 120 7750 12667 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null -50421 10023 1 0 3 120 9300 18226 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null -50422 10023 1 0 3 120 9300 18226 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null -50423 10023 1 0 3 120 9300 18226 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null -50424 10015 1 0 3 120 9300 18226 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001511#1001521 null -50425 10015 1 0 3 120 9300 18226 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001511#1001521 null -50426 10015 1 0 3 120 9300 18226 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001511#1001521 null -50427 10023 1 0 3 120 9300 18226 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null -50428 10023 1 0 3 120 9300 18226 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null -50429 10023 1 0 3 120 9300 18226 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +50409 10049 3 4 1 114 7641 12613 764 764 2480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50410 10049 3 4 1 114 7641 12613 764 764 992 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50411 10049 3 4 1 114 7641 12613 764 764 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50412 10007 1 5 3 114 9170 18155 764 764 2480 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null +50413 10007 1 5 3 114 9170 18155 764 764 992 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null +50414 10007 1 5 3 114 9170 18155 764 764 99 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null +50415 10051 2 2 1 120 7750 12667 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +50416 10051 2 2 1 120 7750 12667 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +50417 10051 2 2 1 120 7750 12667 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005111#1005121 null +50418 10052 2 4 1 120 7750 12667 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +50419 10052 2 4 1 120 7750 12667 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +50420 10052 2 4 1 120 7750 12667 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005211#1005221 null +50421 10023 1 4 3 120 9300 18226 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +50422 10023 1 4 3 120 9300 18226 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +50423 10023 1 4 3 120 9300 18226 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +50424 10015 1 2 3 120 9300 18226 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001511#1001521 null +50425 10015 1 2 3 120 9300 18226 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001511#1001521 null +50426 10015 1 2 3 120 9300 18226 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001511#1001521 null +50427 10023 1 4 3 120 9300 18226 775 775 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +50428 10023 1 4 3 120 9300 18226 775 775 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +50429 10023 1 4 3 120 9300 18226 775 775 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null 50430 8 2 0 1 120 5229 7751 871 871 2600 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null 50431 8 2 0 1 120 5229 7751 871 871 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null 50432 8 2 0 1 120 5229 7751 871 871 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null @@ -729,18 +729,18 @@ int int int int int int int int int int int float float float float int float mu 50445 15 4 0 1 121 5808 8394 968 968 2620 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50446 15 4 0 1 121 5808 8394 968 968 1048 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50447 15 4 0 1 121 5808 8394 968 968 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50448 24 2 0 1 121 5808 4519 968 968 2620 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50449 24 2 0 1 121 5808 4519 968 968 1048 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50450 24 2 0 1 121 5808 4519 968 968 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50448 24 2 0 1 121 5808 4519 968 968 2620 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104565 null +50449 24 2 0 1 121 5808 4519 968 968 1048 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104566 null +50450 24 2 0 1 121 5808 4519 968 968 104 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104565 null 50451 15 4 0 1 122 6580 9251 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50452 15 4 0 1 122 6580 9251 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50453 15 4 0 1 122 6580 9251 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50454 24 2 0 1 122 6580 5016 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50455 24 2 0 1 122 6580 5016 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50456 24 2 0 1 122 6580 5016 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50457 36 2 0 2 122 7238 10663 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50458 36 2 0 2 122 7238 10663 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null -50459 36 2 0 2 122 7238 10663 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +50457 36 2 0 2 122 7238 10663 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104562 null +50458 36 2 0 2 122 7238 10663 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104563 null +50459 36 2 0 2 122 7238 10663 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1104562 null 50460 17 4 0 2 122 7238 10663 1096 1096 2640 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 50461 17 4 0 2 122 7238 10663 1096 1096 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null 50462 17 4 0 2 122 7238 10663 1096 1096 105 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20052 null @@ -774,18 +774,18 @@ int int int int int int int int int int int float float float float int float mu 50490 23 1 0 2 100 3521 5725 586 586 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50491 23 1 0 2 100 3521 5725 586 586 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null 50492 23 1 0 2 100 3521 5725 586 586 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null -50493 10050 3 0 1 100 4694 8456 586 586 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -50494 10050 3 0 1 100 4694 8456 586 586 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -50495 10050 3 0 1 100 4694 8456 586 586 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null -50496 10048 3 0 1 100 4557 8674 569 569 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -50497 10048 3 0 1 100 4557 8674 569 569 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -50498 10048 3 0 1 100 4557 8674 569 569 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null -50499 10047 3 0 1 101 4523 8802 565 565 2220 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50500 10047 3 0 1 101 4523 8802 565 565 888 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50501 10047 3 0 1 101 4523 8802 565 565 88 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null -50502 10049 3 0 1 104 4593 8840 574 574 2280 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50503 10049 3 0 1 104 4593 8840 574 574 912 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null -50504 10049 3 0 1 104 4593 8840 574 574 91 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50493 10050 3 1 1 100 4694 8456 586 586 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50494 10050 3 1 1 100 4694 8456 586 586 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50495 10050 3 1 1 100 4694 8456 586 586 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1005011#1005021 null +50496 10048 3 2 1 100 4557 8674 569 569 2200 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50497 10048 3 2 1 100 4557 8674 569 569 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50498 10048 3 2 1 100 4557 8674 569 569 87 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004811#1004821 null +50499 10047 3 1 1 101 4523 8802 565 565 2220 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50500 10047 3 1 1 101 4523 8802 565 565 888 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50501 10047 3 1 1 101 4523 8802 565 565 88 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004711#1004721 null +50502 10049 3 4 1 104 4593 8840 574 574 2280 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50503 10049 3 4 1 104 4593 8840 574 574 912 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null +50504 10049 3 4 1 104 4593 8840 574 574 91 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1004911#1004921 null 50505 8 2 0 1 96 3355 4776 559 559 2120 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50506 8 2 0 1 96 3355 4776 559 559 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null 50507 8 2 0 1 96 3355 4776 559 559 84 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null @@ -807,3 +807,28 @@ int int int int int int int int int int int float float float float int float mu 50523 36 2 0 2 110 5000 8154 757 757 2400 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50524 36 2 0 2 110 5000 8154 757 757 960 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null 50525 36 2 0 2 110 5000 8154 757 757 95 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +55001 5 1 0 3 96 38339 5758 548 5758 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20014 null +55002 10002 1 3 3 96 63898 10969 548 10969 848 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20028 null +55003 38 4 0 3 100 42133 7196 603 7196 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55004 10016 1 4 3 100 70222 13788 603 13788 880 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001611#1001621 null +55005 22 2 0 3 108 68259 15045 582 15045 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55006 4 3 0 3 108 68259 15045 582 15045 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1101541#1101542 null +55007 8 2 0 3 108 40955 7814 582 7814 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +55008 16 4 0 3 108 34129 4921 582 4921 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20049 null +55009 15 4 0 3 108 40955 7814 582 7814 944 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20046 null +55010 10023 1 4 2 120 88468 14116 775 14116 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +55011 10013 1 2 3 120 96510 17451 775 17451 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001311#1001321 null +55012 10004 1 5 3 120 96510 17451 775 17451 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000411#1000421 null +55013 10012 1 2 3 120 96510 17451 775 17451 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1001211#1001221 null +55014 10007 1 5 3 120 96510 17451 775 17451 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1000711#1000721 null +55015 10023 1 4 3 120 96510 17451 775 17451 1040 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 1002311#1002321 null +55016 35 4 0 3 122 148783 22813 1132 22813 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55017 8 2 0 3 122 89269 11972 1132 11972 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +55018 22 2 0 3 122 148783 22813 1132 22813 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55019 35 4 0 3 122 148783 22813 1132 22813 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55020 24 2 0 3 122 89269 5468 1132 5468 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55021 36 2 0 3 122 89269 11972 1132 11972 1056 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55022 8 2 0 3 126 87198 12412 1104 12412 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20022 null +55023 11 3 0 3 126 87198 12412 1104 12412 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20031 null +55024 24 2 0 3 126 87198 5627 1104 5627 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null +55025 24 2 0 3 126 87198 5627 1104 5627 1088 0.3 0.3 0.2 1.5 1 0.0 0#0#0#0#0#0 20001 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index a6f58e0f3..8efe16a5a 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -4,57 +4,57 @@ int mut,int#int,2 mut,int#int,1 100001 10001 null 100002 10002#10003#10004 null 100003 10005#10006#10007 null -10101 1#3 3001 -10102 2#1#3 3001 -10103 5 3001 -10104 5#1#3 3001 -10105 4#6 3001 -10106 4#6#1#3 3001 -10107 5#4#6 3001 -10108 2#4#6#1#3 3001 -10109 8#1#3 3001 -10110 11 10110#2305 -10201 13#14#15 3006 -10202 14#16#18 3006 -10203 13#15#16#18 3006 -10204 17#16#18 3006 -10205 20#16#18 3006 -10206 19#21 3006 -10207 17#13#15 3006 -10208 20#13#15 3006 -10209 20#16#18 3006 -10210 23#19#21 3006 +10101 50011#50007#50009 3001 +10102 50011#50007#50009 3001 +10103 50011#50007#50009 3001 +10104 50011#50007#50009 3001 +10105 50011#50007#50009 3001 +10106 50011#50007#50009 3001 +10107 50011#50007#50009 3001 +10108 50020#50013#50015 3001 +10109 50044#50037#50039 3001 +10110 50035#50034#50036|50041|50032#50025#50027 10110#2305 +10201 50050#50046#50048 3006 +10202 50050#50046#50048 3006 +10203 50050#50046#50048 3006 +10204 50050#50046#50048 3006 +10205 50050#50046#50048 3006 +10206 50050#50046#50048 3006 +10207 50062#50058#50060 3006 +10208 50065#50061#50063 3006 +10209 50080#50079#50081 3006 +10210 50086#50082#50084 3006 10211 28 3006#10211 10212 29 3006#10212 10213 28#29 3006#10213 10214 50089 10110#2305 -10301 50094#50096#50091#50093 3011 +10301 50104#50100#50103 3011 10302 50104#50100#50103 3011 -10303 50116#50119 3011 -10304 50140#50137 55001 -10305 50143 10110#10305#2305 -10401 50143#50137#50140 3018 -10402 50176#50166#50168 3018 -10403 50173#50169#50168 3018 -10404 41#37#39 3018 -10405 44#34#36 3018 -10406 44#37#39 3018 -10407 50185 3018#10410 -10408 50188 3018#10410 -10409 50191 10110#10409#2305 -10501 50219#50214#50216 3020 -10502 50230 3020 -10503 50236#50235#50237 3020 -10504 50242#50232#50234 3020 -10505 50251#50247#50249#50253#50255 3020 +10303 50104#50100#50103 3011 +10304 50104#50100#50103 55001 +10305 50140#50137|50140#50137|50143 10110#10305#2305 +10401 50164#50154#50156 3018 +10402 50164#50154#50156 3018 +10403 50164#50154#50156 3018 +10404 50164#50154#50156 3018 +10405 50164#50154#50156 3018 +10406 50164#50154#50156 3018 +10407 50208#50210|50168 3018#10410 +10408 50208#50210|50188 3018#10410 +10409 50194#50197#50200#50203|50208#50210|50191 10110#10409#2305 +10501 50251#50247#50249 3020 +10502 50251#50247#50249 3020 +10503 50251#50247#50249 3020 +10504 50251#50247#50249 3020 +10505 50251#50247#50249 3020 10506 50260#50259#50261 55003 -10507 50266 10110#10411 -10508 50239 10110#10411#2305 +10507 55001 10110#10411 +10508 55002 10110#10411#2305 10601 50274#50276#50271#50213 3026#10412 10602 50381#50383#50385 3026#10412 10603 50305#50304#50306 3026#10412 -10604 50314 10110#10411 -10605 50320 10110#10411#2305 +10604 55003 10110#10411 +10605 55004 10110#10411#2305 10701 50325#50327 3031 10702 50334#50335 3031 10703 50346#50358 3031 @@ -63,11 +63,11 @@ int mut,int#int,2 mut,int#int,1 10706 50346#50358#50343#50345 3031 10707 50257 3031#10412 10708 50353#50349#50351 3031#10412 -10709 50377 10110#10411 -10710 50362 10110#10411 -10711 50368 10110#10411 -10712 50371 10110#10411 -10713 50374 10110#10411#2305 +10709 55005 10110#10411 +10710 55006 10110#10411 +10711 55007 10110#10411 +10712 55008 10110#10411 +10713 55009 10110#10411#2305 10801 50380#50379#50381 3036 10802 50386#50379#50381 3036 10803 50395#50379#50381 3036 @@ -78,36 +78,36 @@ int mut,int#int,2 mut,int#int,1 10808 50386#50395#50401#50410 3036 10809 50416#50419 3036 10810 50416#50419 3036 -10811 50425#50428 10110#10413 -10812 50386 3036#10412 -10813 50395 3036#10412 -10814 50404 3036#10412 -10815 50413 10110#10413 -10816 50422 10110#10413 -10901 50431#50430#50432 100000 -10902 50446#50442#50444 100000 -10903 50461#50451#50453 100000 -10904 50431#50430#50432 100000 -10905 50446#50442#50444 100000 -10906 50461#50451#50453 100000 +10811 55010 10110#10413 +10812 55011 3036#10412 +10813 55012 3036#10412 +10814 55013 3036#10412 +10815 55014 10110#10413 +10816 55015 10110#10413 +10901 50431#50430#50432 3038 +10902 50446#50442#50444 3038 +10903 50461#50451#50453 3038 +10904 50431#50430#50432 3038 +10905 50446#50442#50444 3038 +10906 50461#50451#50453 3038 10907 50485 10906#20906 10908 50518 10906#20906 -10909 50488 10907#20907 -10910 50431#50430#50432 50407 -10911 50518 50408 -10912 50488 50409 -10913 50521 50410 -10914 50524 50411#20907 +10909 55016 10907#20907 +10910 55017 50407 +10911 55018 50408 +10912 55019 50409 +10913 55020 50410 +10914 55021 50411#20907 11001 50491#50490#50492 3041 11002 50491#50490#50492 3041 11003 50491#50490#50492 3041 11004 50491#50490#50492 3041 11005 50491#50490#50492 3041 11006 50494#50497#50500#50503 3041 -11007 50506 10906#20906 -11008 50509 10907#20907 -11009 50512 10906#20906 -11010 50515 10907#20907 +11007 55022 10906#20906 +11008 55023 10907#20907 +11009 55024 10906#20906 +11010 55025 10907#20907 101011 1#2#3 100002#100003#102005#102002 101021 4#5#6 100004#100002#102002#102003#102004#102005 101071 11#1#3 100006#102003#102004#102005#102006 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index d47a6f076..7b93afa1d 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -14,11 +14,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100012 0 1 10001 null 1 100011 100013 0 13 1 null 1 100012 100014 0 15 100004 null 4 null -100015 0 6 1 100006 4 null -100016 10001 2 14#40000 null 4 null -100017 0 30 101#14#13#100006 null 4 null +100015 0 8 3 null 4 null +100016 0 8 4 null 4 null +100017 0 0 null null 4 null 100018 0 0 null null 4 null -100019 10001 29 2#100006|100#5#18#100005 3001 4 null +100019 0 20 10101#100006 null 4 null 100020 0 6 1 55001 4 null 100021 0 0 null null 1 100020 100022 0 0 null null 5 100021 diff --git a/conf/server/WorkShopRebuildConfig.txt b/conf/server/WorkShopRebuildConfig.txt index 0f424c712..e55fa237c 100644 --- a/conf/server/WorkShopRebuildConfig.txt +++ b/conf/server/WorkShopRebuildConfig.txt @@ -1,7 +1,7 @@ -Id Quality SecondaryCost Exp -int int mut,int#int,2 int -1 1 1001#5000 10 -2 2 1001#25000 22 -3 3 1001#5000|14#20000 44 -4 4 1001#25000|14#70000 88 -0 0 null 0 +Id Quality MainCostQuality SecondaryCost Exp +int int mut,int#int,1 mut,int#int,2 int +1 2 2#1 1001#5000 10 +2 3 3#1 1001#25000 22 +3 4 4#1 1001#5000|14#20000 44 +4 5 5#1 1001#25000|14#70000 88 +0 0 null null 0 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index 87ea4e14f..77047309f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -716,10 +716,10 @@ public class RedisUtil { return null; } - public void removeZSetRange(String key,int nums){ + public void removeZSetRangeByRank(String key,int start,int end){ for (int i = 0; i < MAX_TRY_TIMES; i++) { try { - redisTemplate.opsForZSet().removeRange(key,0,nums); + redisTemplate.opsForZSet().removeRange(key,start,end); return; } catch (Exception e) { TimeUtils.sleep(FAILED_SLEEP); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 064608cd2..cc13c59de 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1337,11 +1337,6 @@ public class MapLogic { if (sChallengeMapConfig.getIfRank() == 1 && useTime > 0 && useTime < beforTime) { String key = RedisKey.getKey(RedisKey.MAP_RANK, Integer.toString(mapManager.getCurMapId()), true); RedisUtil.getInstence().zsetAddOne(key, mapManager.getRootId(), useTime); - int zsetSize = RedisUtil.getInstence().getZsetSize(key); - if (zsetSize > 10) { - // TODO 删除最后一名 - RedisUtil.getInstence().removeZSetRange(key, 1); - } } mapManager.updateCrossInfoMap(mapManager.getCurMapId(), crossInfo); } @@ -1358,7 +1353,7 @@ public class MapLogic { */ public void getMapRank(ISession session, int mapId, MessageTypeProto.MessageType messageType) throws Exception { String key = RedisKey.getKey(RedisKey.MAP_RANK, Integer.toString(mapId), true); - Set zset = RedisUtil.getInstence().getZset(key, 0, -1); + Set zset = RedisUtil.getInstence().getZset(key, 0, 10); List mapRankInfos = new ArrayList<>(10); int rank = 1; for (String s : zset) { @@ -1835,4 +1830,15 @@ public class MapLogic { resetMapInfo(user, true); } + public void minuteCheckAndRemoveMapRank(){ + Map> sCMap = SCMap.sCMap; + for(Integer mapId : sCMap.keySet()){ + String key = RedisKey.getKey(RedisKey.MAP_RANK, Integer.toString(mapId), true); + int size = RedisUtil.getInstence().getZsetSize(key); + if(size>15){ + RedisUtil.getInstence().removeZSetRangeByRank(key, 15,size); + } + } + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index e733d3332..d048854fc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -144,7 +144,7 @@ public class MapManager extends MongoBase { public void eatFood(int foodId,int remainStep){ this.foodBufferMap.put(foodId,remainStep); - updateString( "foodBuffers."+foodId, remainStep); + updateString( "foodBufferMap."+foodId, remainStep); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index f662e898d..313a8da6f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.fight; import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; @@ -14,6 +15,7 @@ import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import redis.clients.jedis.Jedis; import java.util.*; @@ -41,7 +43,7 @@ public class CombatLogic { AdventureManager adventureManager = user.getAdventureManager(); Map adventureStateInfoMap = adventureManager.getAdventureStateInfoMap(); List result = new ArrayList<>(); - CommonProto.Drop.Builder dropBuilder = calAdvenrureReward(user, false,0); + Map dropBuildMap = calAdvenrureReward(user, false, 0); boolean hasAdventure = false; for(AdventureStateInfo item : adventureStateInfoMap.values()){ result.add(CBean2Proto.getAdventureStateInfo(item,item.getPosition())); @@ -50,18 +52,26 @@ public class CombatLogic { if(hasAdventure){ offLineTime = (int)((System.currentTimeMillis() -playerInfoManager.getOffLineTime())/1000); } - if(offLineTime == 0){ - MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ADVENTURE_INFO_RESPONSE_VALUE,null,true); - return; + FightInfoProto.GetAdventureStateInfoResponse.Builder responseBuilder = FightInfoProto.GetAdventureStateInfoResponse.newBuilder(); + if(dropBuildMap.containsKey(1)){ + CommonProto.Drop.Builder builder = dropBuildMap.get(1); + responseBuilder.setNotShowDrop(builder); + List itemlistList = builder.getItemlistList(); + for(CommonProto.Item item: itemlistList){ + LOGGER.info("the uid={},itemID={},itemNum={}",uid,item.getItemId(),item.getItemNum()); + } + LOGGER.info("the uid={},offlineTimeLong={}",uid,offLineTime); + } + if(dropBuildMap.containsKey(2)){ + CommonProto.Drop.Builder builder = dropBuildMap.get(2); + responseBuilder.setShowDrop(builder); + List itemlistList = builder.getItemlistList(); + for(CommonProto.Item item: itemlistList){ + LOGGER.info("the uid={},itemID={},itemNum={}",uid,item.getItemId(),item.getItemNum()); + } + LOGGER.info("the uid={},offlineTimeLong={}",uid,offLineTime); } - FightInfoProto.GetAdventureStateInfoResponse response = FightInfoProto.GetAdventureStateInfoResponse.newBuilder().addAllAdventureStateInfoList(result).setDrop(dropBuilder.build()).setOutTime(offLineTime). - build(); - MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ADVENTURE_INFO_RESPONSE_VALUE,response,true); - List itemlistList = dropBuilder.getItemlistList(); - for(CommonProto.Item item: itemlistList){ - LOGGER.info("the uid={},itemID={},itemNum={}",uid,item.getItemId(),item.getItemNum()); - } - LOGGER.info("the uid={},offlineTimeLong={}",uid,offLineTime); + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ADVENTURE_INFO_RESPONSE_VALUE,responseBuilder.build(),true); } @@ -79,10 +89,10 @@ public class CombatLogic { //检验 Map adventureStateInfoMap = adventureManager.getAdventureStateInfoMap(); if(heroIds == null || heroIds.isEmpty()){ - if(!adventureStateInfoMap.containsKey(position)){ - MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,""); - return; - } + if(!adventureStateInfoMap.containsKey(position)){ + MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,""); + return; + } calAdvenrureReward(user,true,position); adventureManager.clearStation(position); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,null,true); @@ -138,7 +148,7 @@ public class CombatLogic { } //消耗道具全部加一遍基础奖励。 - public CommonProto.Drop.Builder calAdvenrureReward(User user, boolean isOnLine,int position) throws Exception { + public Map calAdvenrureReward(User user, boolean isOnLine,int position) throws Exception { Map tempDropRation = new HashMap<>(); Map onlineReward = new HashMap<>(); AdventureManager adventureManager = user.getAdventureManager(); @@ -156,7 +166,7 @@ public class CombatLogic { int size = adventureStateInfoTmp.getHeroIds().size(); int onlineTimesOfOffline=0; if(!isOnLine){ - onlineTimesOfOffline = (offLineTime - startTime)/adventureRefresh; + onlineTimesOfOffline = (offLineTime - startTime)/adventureRefresh; } if(times>0){ adventureStateInfoTmp.setStartTime(startTime+times*adventureRefresh); @@ -168,31 +178,46 @@ public class CombatLogic { if(!isOnLine){ int reallyOfflineTims = times - onlineTimesOfOffline; if(reallyOfflineTims>0){ - reallyOfflineTims = reallyOfflineTims>maxTimes?reallyOfflineTims:times; + reallyOfflineTims = reallyOfflineTims>maxTimes?maxTimes:reallyOfflineTims; tempDropRation.put(baseRewardGroup,rewardRation * reallyOfflineTims); - adventureManager.updateTemp(sAdventureConfig.getRandomRewardGroup(),rewardRation*reallyOfflineTims); + while (reallyOfflineTims>0){ + adventureManager.updateTemp(sAdventureConfig.getRandomRewardGroup(),rewardRation); + reallyOfflineTims--; + } } if(onlineTimesOfOffline!=0){ onlineReward.put(baseRewardGroup,rewardRation * onlineTimesOfOffline); + while (onlineTimesOfOffline>0){ + adventureManager.updateTemp(sAdventureConfig.getRandomRewardGroup(),rewardRation); + onlineTimesOfOffline--; + } } }else{ onlineReward.put(baseRewardGroup,rewardRation * times); - adventureManager.updateTemp(sAdventureConfig.getRandomRewardGroup(),rewardRation*times); + while (times>0){ + adventureManager.updateTemp(sAdventureConfig.getRandomRewardGroup(),rewardRation); + times--; + } + } } } + Map result = new HashMap<>(2); + if(!onlineReward.isEmpty()){ + result.put(1,ItemUtil.drop(user, onlineReward)); + } + CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); if(!isOnLine){ + dropBuilder = ItemUtil.drop(user, tempDropRation); List tempDropRatioList = adventureManager.getTempDropRatio(); for(TempDropInfo tempDropInfo : tempDropRatioList){ - tempDropRation.put(tempDropInfo.getDropGroupIds(),tempDropInfo.getDropRatio()); + ItemUtil.activityDrop(user,dropBuilder,tempDropInfo.getDropGroupIds(),tempDropInfo.getDropRatio()); } adventureManager.clearTemp(); + result.put(2,dropBuilder); } - if(!onlineReward.isEmpty()){ - ItemUtil.drop(user, onlineReward); - } - return ItemUtil.drop(user, tempDropRation); + return result; } private float calRation(float source,float[][] rationInfos){ @@ -201,7 +226,7 @@ public class CombatLogic { float num = item[0]; float value = item[1]; if(source attributeByEatFood( User user,int type,int target){ - Map foddAddResult = new HashMap<>(); + Map foddAddResult = new HashMap<>(); MapManager mapManager = user.getMapManager(); Map foodBufferMap = mapManager.getFoodBufferMap(); for(Map.Entry foodBuffer : foodBufferMap.entrySet()){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index 763fdea84..b849538b0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.thread.task; +import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.logic.activity.ActivityLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,5 +15,7 @@ public class MinuteTask extends Thread { @Override public void run() { ActivityLogic.getInstance().checkActiviyStatus(); + MapLogic.getInstance().minuteCheckAndRemoveMapRank(); + } } From 30b39089c16d9e0f7b21c4adac9eab633ad963bb Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 25 Apr 2019 17:30:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AF=BB200=E5=BC=80?= =?UTF-8?q?=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/STableManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java index 1cf42a717..55bf0b24d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java @@ -132,6 +132,7 @@ public class STableManager { String path = SysUtil.getPath("conf", "server", tableName + ".txt"); File file = new File(path); if (!file.exists()) { + tableName = tableName.substring(0, 3); mapType += 100; i = mapType; continue; From e9da699d0391eb9faac0c553de0d7094728c3040 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 25 Apr 2019 17:32:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=8E1=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/STableManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java index 55bf0b24d..5cab593db 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java @@ -133,7 +133,7 @@ public class STableManager { File file = new File(path); if (!file.exists()) { tableName = tableName.substring(0, 3); - mapType += 100; + mapType += 101; i = mapType; continue; } From 064ddce83f1ff144554801ef2c8ca7df286d4275 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 25 Apr 2019 17:39:47 +0800 Subject: [PATCH 5/5] 200 --- .../src/main/java/com/ljsd/jieling/logic/STableManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java index 5cab593db..55bf0b24d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java @@ -133,7 +133,7 @@ public class STableManager { File file = new File(path); if (!file.exists()) { tableName = tableName.substring(0, 3); - mapType += 101; + mapType += 100; i = mapType; continue; }