From 705e2d5b7b474f528a8b24bfc5730175d83c99e8 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 22 Mar 2019 10:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=92=E9=99=A9=E6=8E=A8=E8=8D=90=E8=8B=B1?= =?UTF-8?q?=E9=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/AdventureConfig.txt | 8 +- conf/server/AdventurePoolConfig.txt | 7 + conf/server/AdventureSetting.txt | 10 +- conf/server/FoodsConfig.txt | 66 +-- conf/server/MonsterConfig.txt | 514 +++++++++--------- conf/server/MonsterGroup.txt | 15 +- conf/server/OptionConfig.txt | 4 +- conf/server/RewardGroup.txt | 10 + conf/server/RewardItemConfig.txt | 17 +- .../ljsd/jieling/config/SAdventureConfig.java | 4 + .../jieling/config/SAdventurePoolConfig.java | 53 ++ .../jieling/config/SAdventureSetting.java | 6 - .../com/ljsd/jieling/config/SFoodsConfig.java | 6 + .../ljsd/jieling/config/SVipLevelConfig.java | 18 +- .../jieling/logic/dao/AdventureManager.java | 14 +- .../jieling/logic/dao/AdventureStateInfo.java | 17 +- .../logic/dao/root/AdventureSeasonInfo.java | 41 ++ .../ljsd/jieling/logic/fight/CombatLogic.java | 184 +++++-- .../ljsd/jieling/thread/ThreadManager.java | 3 +- .../ljsd/jieling/thread/task/MinuteJob.java | 23 + .../com/ljsd/jieling/util/CBean2Proto.java | 18 +- 21 files changed, 665 insertions(+), 373 deletions(-) create mode 100644 conf/server/AdventurePoolConfig.txt create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/config/SAdventurePoolConfig.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/AdventureSeasonInfo.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteJob.java diff --git a/conf/server/AdventureConfig.txt b/conf/server/AdventureConfig.txt index e936b8ef5..73a907456 100644 --- a/conf/server/AdventureConfig.txt +++ b/conf/server/AdventureConfig.txt @@ -1,5 +1,7 @@ Id OpenLevel RecommendForce RecommendHeroIds MinNum BaseRewardGroup RandomRewardGroup RecommendRewardGroup int int int mut,int#int,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 -1 101001 1000 10001#10002 5 1001#1002 1001#1002 2001#2002#2003 -2 101001 2000 10001#10003 5 1001#1002 1001#1002 2001#2002#2003 -3 101001 3000 10001#10004 5 1001#1002 1001#1002 2001#2002#2003 +1 101001 1000 3#1#2 5 101 1001#1002 2001#2002#2003 +2 102001 2000 3#1#2 5 102 1001#1002 2001#2002#2003 +3 102001 3000 3#1#2 5 103 1001#1002 2001#2002#2003 +4 102001 4000 3#1#2 5 104 1001#1002 2001#2002#2003 +5 102001 5000 3#1#2 5 105 1001#1002 2001#2002#2003 diff --git a/conf/server/AdventurePoolConfig.txt b/conf/server/AdventurePoolConfig.txt new file mode 100644 index 000000000..309fc9523 --- /dev/null +++ b/conf/server/AdventurePoolConfig.txt @@ -0,0 +1,7 @@ +Id Weight Pool +int int int +10001 100 1 +10002 100 1 +10003 100 1 +10004 100 1 +10005 100 2 diff --git a/conf/server/AdventureSetting.txt b/conf/server/AdventureSetting.txt index 03de3b912..145b9eb1b 100644 --- a/conf/server/AdventureSetting.txt +++ b/conf/server/AdventureSetting.txt @@ -1,7 +1,7 @@ Id ConsumeGemRatio BaseRewardRatio RandomRewardRatio PerMapMaxHour HourRewardRatio int mut,int#int,1 mut,float#float,2 mut,float#float,2 int mut,float#float,1 -1 0#0#10#100 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.8#0.5|0.9#0.8 8 0#0#10#100 -2 0#0#10#100 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.8#0.8|0.9#0.9 8 0#0#10#100 -3 0#0#10#100 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.8#0.8|0.9#0.9 8 0#0#10#100 -4 0#0#10#100 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.8#0.8|0.9#0.9 8 0#0#10#100 -5 0#0#10#100 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.8#0.8|0.9#0.9 8 0#0#10#100 +1 0#0#50#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062 +2 0#0#55#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062 +3 0#0#60#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062 +4 0#0#70#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062 +5 0#0#80#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062 diff --git a/conf/server/FoodsConfig.txt b/conf/server/FoodsConfig.txt index d38994a0c..ea706e1a9 100644 --- a/conf/server/FoodsConfig.txt +++ b/conf/server/FoodsConfig.txt @@ -1,33 +1,33 @@ -Id Contiue Type Target EffectPara -int int int int mut,int#int,2 -9201 15 0 0 null -9202 15 0 0 null -9203 15 0 0 null -9204 15 0 0 null -9205 15 0 0 null -9206 15 0 0 null -9207 15 0 0 null -9208 15 0 0 null -9209 15 0 0 null -9210 15 0 0 null -9211 15 0 0 null -9212 15 0 0 null -9213 15 0 0 null -9214 15 0 0 null -9215 15 0 0 null -9216 15 0 0 null -9217 15 0 0 null -9218 15 0 0 null -9219 15 0 0 null -9220 15 0 0 null -9221 15 0 0 null -9222 15 0 0 null -9223 15 0 0 null -9224 15 0 0 null -9225 15 0 0 null -9226 15 0 0 null -9227 15 0 0 null -9228 15 0 0 null -9229 15 0 0 null -9230 15 0 0 null -9231 15 0 0 null +Id Contiue Type Target EffectPara FunctionType +int int int int mut,int#int,2 int +9201 15 0 0 null 1 +9202 15 0 0 null 1 +9203 15 0 0 null 1 +9204 15 0 0 null 1 +9205 15 0 0 null 1 +9206 15 0 0 null 1 +9207 15 0 0 null 1 +9208 15 0 0 null 1 +9209 15 0 0 null 1 +9210 15 0 0 null 1 +9211 15 0 0 null 1 +9212 15 0 0 null 1 +9213 15 0 0 null 1 +9214 15 0 0 null 1 +9215 15 0 0 null 1 +9216 15 0 0 null 1 +9217 15 0 0 null 1 +9218 15 0 0 null 1 +9219 15 0 0 null 1 +9220 15 0 0 null 1 +9221 15 0 0 null 1 +9222 15 0 0 null 1 +9223 15 0 0 null 1 +9224 15 0 0 null 1 +9225 15 0 0 null 1 +9226 15 0 0 null 1 +9227 15 0 0 null 1 +9228 15 0 0 null 1 +9229 15 0 0 null 1 +9230 15 0 0 null 1 +9231 15 0 0 null 1 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 4e220579c..765e2972a 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -15,266 +15,266 @@ 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 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 -16 6 2 0 1 0 1931 520 305 305 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 1931 520 305 305 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 1931 520 305 305 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 6519 1560 915 915 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 6519 1560 915 915 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 6519 1560 915 915 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 8692 1567 915 915 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 8692 1567 915 915 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 8692 1567 915 915 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 9657 2601 1526 1526 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 9657 2601 1526 1526 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 9657 2601 1526 1526 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 9657 2601 1526 1526 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 9657 2601 1526 1526 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 9657 2601 1526 1526 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 28973 5225 3052 3052 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 28973 5225 3052 3052 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 28973 5225 3052 3052 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 15452 4161 2441 2441 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 15452 4161 2441 2441 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 15452 4161 2441 2441 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 19315 5202 3052 3052 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 19315 5202 3052 3052 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 19315 5202 3052 3052 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 22275 5411 3170 3170 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 22275 5411 3170 3170 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 22275 5411 3170 3170 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 31905 5949 3456 3456 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 31905 5949 3456 3456 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 31905 5949 3456 3456 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 23928 5917 3456 3456 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 23928 5917 3456 3456 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 23928 5917 3456 3456 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 32359 6045 3495 3495 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 32359 6045 3495 3495 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 32359 6045 3495 3495 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 24269 6009 3495 3495 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 24269 6009 3495 3495 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 24269 6009 3495 3495 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 22254 6215 3623 3623 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 22254 6215 3623 3623 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 22254 6215 3623 3623 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 31970 5950 3431 3431 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 31970 5950 3431 3431 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 31970 5950 3431 3431 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 23977 5911 3431 3431 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 23977 5911 3431 3431 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 23977 5911 3431 3431 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 23977 5911 3431 3431 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 23977 5911 3431 3431 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 23977 5911 3431 3431 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 38829 7754 4520 4520 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 38829 7754 4520 4520 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 38829 7754 4520 4520 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 20892 5802 3366 3366 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 20892 5802 3366 3366 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 20892 5802 3366 3366 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 50478 7887 4520 4520 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 50478 7887 4520 4520 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 50478 7887 4520 4520 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 39598 6929 4008 4008 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 39598 6929 4008 4008 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 39598 6929 4008 4008 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 20892 5802 3366 3366 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 20892 5802 3366 3366 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 20892 5802 3366 3366 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 21734 6021 3496 3496 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 21734 6021 3496 3496 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 21734 6021 3496 3496 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 29698 6887 4008 4008 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 29698 6887 4008 4008 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 29698 6887 4008 4008 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 21734 6021 3496 3496 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 21734 6021 3496 3496 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 21734 6021 3496 3496 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 47227 7908 4585 4585 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 47227 7908 4585 4585 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 47227 7908 4585 4585 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 21734 6021 3496 3496 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 21734 6021 3496 3496 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 21734 6021 3496 3496 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 29698 6887 4008 4008 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 29698 6887 4008 4008 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 29698 6887 4008 4008 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 45686 9611 5615 5615 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 45686 9611 5615 5615 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 45686 9611 5615 5615 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 45686 9611 5615 5615 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 45686 9611 5615 5615 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 45686 9611 5615 5615 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 31905 7972 4650 4650 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 31905 7972 4650 4650 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 31905 7972 4650 4650 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 31905 7972 4650 4650 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 31905 7972 4650 4650 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 31905 7972 4650 4650 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 75685 11610 6758 6758 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 75685 11610 6758 6758 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 75685 11610 6758 6758 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 83849 12031 6936 6936 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 83849 12031 6936 6936 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 83849 12031 6936 6936 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 56469 11497 6721 6721 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 56469 11497 6721 6721 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 56469 11497 6721 6721 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 75101 11538 6704 6704 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 75101 11538 6704 6704 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 75101 11538 6704 6704 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 51599 11855 6936 6936 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 51599 11855 6936 6936 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 51599 11855 6936 6936 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 51599 11855 6936 6936 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 51599 11855 6936 6936 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 51599 11855 6936 6936 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 83434 12001 6903 6903 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 83434 12001 6903 6903 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 83434 12001 6903 6903 110 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +16 6 2 0 1 0 3202 520 254 254 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 3202 520 254 254 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 3202 520 254 254 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 10808 1560 763 763 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 10808 1560 763 763 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 10808 1560 763 763 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 14411 1567 763 763 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 14411 1567 763 763 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 14411 1567 763 763 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 16012 2601 1271 1271 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 16012 2601 1271 1271 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 16012 2601 1271 1271 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 16012 2601 1271 1271 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 16012 2601 1271 1271 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 16012 2601 1271 1271 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 48038 5225 2543 2543 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 48038 5225 2543 2543 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 48038 5225 2543 2543 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 25620 4161 2034 2034 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 25620 4161 2034 2034 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 25620 4161 2034 2034 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 32025 5202 2543 2543 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 32025 5202 2543 2543 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 32025 5202 2543 2543 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 36980 5411 2641 2641 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 36980 5411 2641 2641 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 36980 5411 2641 2641 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 53042 5949 2880 2880 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 53042 5949 2880 2880 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 53042 5949 2880 2880 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 39781 5917 2880 2880 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 39781 5917 2880 2880 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 39781 5917 2880 2880 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 53782 6045 2912 2912 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 53782 6045 2912 2912 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 53782 6045 2912 2912 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 40337 6009 2912 2912 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 40337 6009 2912 2912 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 40337 6009 2912 2912 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 37005 6215 3019 3019 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 37005 6215 3019 3019 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 37005 6215 3019 3019 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 53103 5950 2859 2859 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 53103 5950 2859 2859 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 53103 5950 2859 2859 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 39827 5911 2859 2859 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 39827 5911 2859 2859 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 39827 5911 2859 2859 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 39827 5911 2859 2859 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 39827 5911 2859 2859 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 39827 5911 2859 2859 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 63894 7754 3766 3766 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 63894 7754 3766 3766 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 63894 7754 3766 3766 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 34705 5802 2805 2805 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 34705 5802 2805 2805 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 34705 5802 2805 2805 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 83062 7887 3766 3766 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 83062 7887 3766 3766 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 83062 7887 3766 3766 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 65410 6929 3340 3340 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 65410 6929 3340 3340 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 65410 6929 3340 3340 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 34705 5802 2805 2805 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 34705 5802 2805 2805 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 34705 5802 2805 2805 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 36098 6021 2914 2914 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 36098 6021 2914 2914 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 36098 6021 2914 2914 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 49058 6887 3340 3340 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 49058 6887 3340 3340 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 49058 6887 3340 3340 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 36098 6021 2914 2914 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 36098 6021 2914 2914 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 36098 6021 2914 2914 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 77718 7908 3820 3820 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 77718 7908 3820 3820 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 77718 7908 3820 3820 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 36098 6021 2914 2914 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 36098 6021 2914 2914 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 36098 6021 2914 2914 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 49058 6887 3340 3340 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 49058 6887 3340 3340 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 49058 6887 3340 3340 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 74847 9611 4679 4679 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 74847 9611 4679 4679 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 74847 9611 4679 4679 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 74847 9611 4679 4679 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 74847 9611 4679 4679 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 74847 9611 4679 4679 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 52509 7972 3875 3875 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 52509 7972 3875 3875 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 52509 7972 3875 3875 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 52509 7972 3875 3875 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 52509 7972 3875 3875 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 52509 7972 3875 3875 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 123666 11610 5632 5632 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 123666 11610 5632 5632 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 123666 11610 5632 5632 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 137047 12031 5780 5780 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 137047 12031 5780 5780 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 137047 12031 5780 5780 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 92266 11497 5601 5601 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 92266 11497 5601 5601 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 92266 11497 5601 5601 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 122709 11538 5587 5587 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 122709 11538 5587 5587 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 122709 11538 5587 5587 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 84336 11855 5780 5780 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 84336 11855 5780 5780 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 84336 11855 5780 5780 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 84336 11855 5780 5780 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 84336 11855 5780 5780 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 84336 11855 5780 5780 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 136370 12001 5752 5752 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 136370 12001 5752 5752 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 136370 12001 5752 5752 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 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 136 5 2 0 1 0 2000 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 137 3 2 0 1 0 2000 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null 138 3 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1001 4 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1002 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1003 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1004 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1005 2 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1006 2 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1007 2 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1008 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1009 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1010 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1011 1 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1012 1 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1013 1 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1014 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1015 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1016 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1017 5 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1018 2040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1019 2040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1020 2040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1021 6 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1022 6 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1023 6 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1024 7 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1025 7 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1026 7 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1027 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1028 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1029 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1030 1 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1031 1 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1032 1 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1033 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1034 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1035 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1036 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1037 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1038 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1039 10031 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1040 10031 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1041 10031 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1042 10035 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1043 10 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1044 10 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1045 10 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1046 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1047 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1048 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1049 10031 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1050 10031 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1051 10031 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1052 10035 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1053 10044 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1054 43 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1055 43 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1056 43 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1057 9 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1058 9 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1059 9 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1060 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1061 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1062 10039 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1063 10039 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1064 10030 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1065 41 4 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1066 41 4 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1067 41 4 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1068 5 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1069 5 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1070 5 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1071 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1072 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1073 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1074 10033 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1075 10033 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1076 10033 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1077 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1078 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1079 42 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1080 42 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1081 42 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1082 5 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1083 10 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1084 10 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1085 10 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1086 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1087 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1088 3 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1089 44 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1090 44 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1091 44 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1092 10016 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1093 16 4 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1094 16 4 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1095 16 4 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1096 10037 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1097 10037 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1098 10037 1 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1099 10034 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1100 10034 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1101 10034 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1102 10037 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1103 10037 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1104 10037 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1105 10037 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1106 10037 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1107 10037 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1108 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1109 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1110 10040 1 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1111 17 4 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1112 10050 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1113 10050 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1114 10050 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1115 10048 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1116 10048 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1117 10048 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1118 10047 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1119 10047 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1120 10047 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1121 10049 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1122 10049 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1123 10049 3 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1124 10051 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1125 10051 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1126 10051 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1127 10052 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1128 10052 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1129 10052 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1130 10051 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1131 10052 2 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1132 10044 1 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1133 17 4 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1134 15 4 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1135 15 4 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1136 15 4 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1137 17 4 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1138 17 4 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1139 17 4 0 2 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -1140 35 4 0 3 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null +1001 4 3 0 1 1 193 260 61 61 88 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20010 null +1002 42 1 0 1 1 193 260 61 61 264 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1003 42 1 0 1 1 193 260 61 61 88 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1004 42 1 0 1 1 193 260 61 61 8 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1005 2 3 0 1 1 193 260 61 61 264 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20004 null +1006 2 3 0 1 1 193 260 61 61 88 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20004 null +1007 2 3 0 1 1 193 260 61 61 8 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20004 null +1008 42 1 0 1 1 193 260 61 61 264 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1009 42 1 0 1 1 193 260 61 61 88 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1010 42 1 0 1 1 193 260 61 61 8 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1011 1 2 0 1 1 193 260 61 61 264 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1012 1 2 0 1 1 193 260 61 61 88 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1013 1 2 0 1 1 193 260 61 61 8 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1014 3 2 0 2 16 9607 1045 508 508 624 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1015 3 2 0 2 16 9607 1045 508 508 208 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1016 3 2 0 2 16 9607 1045 508 508 20 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1017 5 1 0 3 40 32025 2774 1271 1271 400 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20013 null +1018 10040 1 0 1 32 12810 2080 1017 1017 1008 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1019 10040 1 0 1 32 12810 2080 1017 1017 336 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1020 10040 1 0 1 32 12810 2080 1017 1017 33 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1021 6 2 0 1 32 12810 2080 1017 1017 1008 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20016 null +1022 6 2 0 1 32 12810 2080 1017 1017 336 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20016 null +1023 6 2 0 1 32 12810 2080 1017 1017 33 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20016 null +1024 7 1 0 1 32 12810 2080 1017 1017 1008 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20019 null +1025 7 1 0 1 32 12810 2080 1017 1017 336 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20019 null +1026 7 1 0 1 32 12810 2080 1017 1017 33 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20019 null +1027 10040 1 0 1 32 12810 2080 1017 1017 1008 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1028 10040 1 0 1 32 12810 2080 1017 1017 336 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1029 10040 1 0 1 32 12810 2080 1017 1017 33 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1030 1 2 0 1 32 12810 2080 1017 1017 1008 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1031 1 2 0 1 32 12810 2080 1017 1017 336 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1032 1 2 0 1 32 12810 2080 1017 1017 33 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1033 3 2 0 2 48 28823 3135 1526 1526 1392 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1034 3 2 0 2 48 28823 3135 1526 1526 464 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1035 3 2 0 2 48 28823 3135 1526 1526 46 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1036 10040 1 0 1 32 12810 2080 1017 1017 1008 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1037 10040 1 0 1 32 12810 2080 1017 1017 336 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1038 10040 1 0 1 32 12810 2080 1017 1017 33 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1039 10031 1 0 2 48 28823 3135 1526 1526 1392 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003111#1003121 null +1040 10031 1 0 2 48 28823 3135 1526 1526 464 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003111#1003121 null +1041 10031 1 0 2 48 28823 3135 1526 1526 46 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003111#1003121 null +1042 10035 1 0 3 88 64051 5548 2543 2543 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003511#1003521 null +1043 10 3 0 1 88 32363 5285 2582 2582 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +1044 10 3 0 1 88 32363 5285 2582 2582 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +1045 10 3 0 1 88 32363 5285 2582 2582 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +1046 10040 1 0 1 88 32363 5285 2582 2582 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1047 10040 1 0 1 88 32363 5285 2582 2582 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1048 10040 1 0 1 88 32363 5285 2582 2582 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1049 10031 1 0 2 88 49307 5436 2641 2641 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003111#1003121 null +1050 10031 1 0 2 88 49307 5436 2641 2641 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003111#1003121 null +1051 10031 1 0 2 88 49307 5436 2641 2641 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003111#1003121 null +1052 10035 1 0 3 88 66758 5939 2701 2701 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003511#1003521 null +1053 10044 1 0 3 88 66758 5939 2701 2701 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004411#1004421 null +1054 43 3 0 1 88 32871 5411 2641 2641 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1055 43 3 0 1 88 32871 5411 2641 2641 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1056 43 3 0 1 88 32871 5411 2641 2641 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1057 9 3 0 1 88 32871 5411 2641 2641 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20025 null +1058 9 3 0 1 88 32871 5411 2641 2641 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20025 null +1059 9 3 0 1 88 32871 5411 2641 2641 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20025 null +1060 10040 1 0 1 88 32871 5411 2641 2641 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1061 10040 1 0 1 88 32871 5411 2641 2641 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1062 10039 1 0 1 88 32871 5411 2641 2641 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003911#1003921 null +1063 10039 1 0 3 100 74010 6742 3019 3019 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003911#1003921 null +1064 10030 1 0 3 100 74010 6742 3019 3019 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003011#1003021 null +1065 41 4 0 2 96 52549 5888 2852 2852 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1066 41 4 0 2 96 52549 5888 2852 2852 848 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1067 41 4 0 2 96 52549 5888 2852 2852 84 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1068 5 1 0 2 100 53782 6045 2912 2912 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20013 null +1069 5 1 0 2 100 53782 6045 2912 2912 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20013 null +1070 5 1 0 2 100 53782 6045 2912 2912 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20013 null +1071 42 1 0 1 96 35361 5917 2880 2880 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1072 42 1 0 1 96 35361 5917 2880 2880 848 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1073 42 1 0 1 96 35361 5917 2880 2880 84 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1074 10033 1 0 2 100 53782 6045 2912 2912 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003311#1003321 null +1075 10033 1 0 2 100 53782 6045 2912 2912 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003311#1003321 null +1076 10033 1 0 2 100 53782 6045 2912 2912 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003311#1003321 null +1077 42 1 0 1 96 35361 5917 2880 2880 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1078 42 1 0 1 96 35361 5917 2880 2880 848 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1079 42 1 0 1 96 35361 5917 2880 2880 84 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1080 42 1 0 3 100 69410 6377 2805 2805 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1081 42 1 0 3 100 69410 6377 2805 2805 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1082 5 1 0 3 100 69410 6377 2805 2805 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20013 null +1083 10 3 0 1 100 35855 6009 2912 2912 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +1084 10 3 0 1 100 35855 6009 2912 2912 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +1085 10 3 0 1 100 35855 6009 2912 2912 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +1086 3 2 0 2 100 53103 5950 2859 2859 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1087 3 2 0 2 100 53103 5950 2859 2859 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1088 3 2 0 2 100 53103 5950 2859 2859 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null +1089 44 3 0 1 100 35855 6009 2912 2912 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1090 44 3 0 1 100 35855 6009 2912 2912 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1091 44 3 0 1 100 35855 6009 2912 2912 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +1092 10016 1 0 3 108 72197 6599 2914 2914 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1001611#1001621 null +1093 16 4 0 1 100 35855 6009 2912 2912 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20049 null +1094 16 4 0 1 100 35855 6009 2912 2912 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20049 null +1095 16 4 0 1 100 35855 6009 2912 2912 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20049 null +1096 10037 1 0 2 100 53103 5950 2859 2859 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1097 10037 1 0 2 100 53103 5950 2859 2859 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1098 10037 1 0 2 100 53103 5950 2859 2859 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1099 10034 1 0 1 100 35855 6009 2912 2912 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003411#1003421 null +1100 10034 1 0 1 100 35855 6009 2912 2912 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003411#1003421 null +1101 10034 1 0 1 100 35855 6009 2912 2912 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003411#1003421 null +1102 10037 1 0 1 100 35855 6009 2912 2912 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1103 10037 1 0 1 100 35855 6009 2912 2912 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1104 10037 1 0 1 100 35855 6009 2912 2912 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1105 10037 1 0 1 100 35402 5911 2859 2859 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1106 10037 1 0 1 100 35402 5911 2859 2859 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1107 10037 1 0 1 100 35402 5911 2859 2859 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1003711#1003721 null +1108 10040 1 0 1 100 35402 5911 2859 2859 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1109 10040 1 0 1 100 35402 5911 2859 2859 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1110 10040 1 0 1 100 35402 5911 2859 2859 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004011#1004021 null +1111 17 4 0 3 108 102230 8417 3766 3766 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20052 null +1112 10050 3 0 1 108 43607 6887 3340 3340 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005011#1005021 null +1113 10050 3 0 1 108 43607 6887 3340 3340 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005011#1005021 null +1114 10050 3 0 1 108 43607 6887 3340 3340 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005011#1005021 null +1115 10048 3 0 1 108 43607 6887 3340 3340 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004811#1004821 null +1116 10048 3 0 1 108 43607 6887 3340 3340 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004811#1004821 null +1117 10048 3 0 1 108 43607 6887 3340 3340 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004811#1004821 null +1118 10047 3 0 1 108 43607 6887 3340 3340 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004711#1004721 null +1119 10047 3 0 1 108 43607 6887 3340 3340 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004711#1004721 null +1120 10047 3 0 1 108 43607 6887 3340 3340 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004711#1004721 null +1121 10049 3 0 1 108 43607 6887 3340 3340 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004911#1004921 null +1122 10049 3 0 1 108 43607 6887 3340 3340 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004911#1004921 null +1123 10049 3 0 1 108 43607 6887 3340 3340 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004911#1004921 null +1124 10051 2 0 1 108 43607 6887 3340 3340 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005111#1005121 null +1125 10051 2 0 1 108 43607 6887 3340 3340 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005111#1005121 null +1126 10051 2 0 1 108 43607 6887 3340 3340 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005111#1005121 null +1127 10052 2 0 1 108 43607 6887 3340 3340 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005211#1005221 null +1128 10052 2 0 1 108 43607 6887 3340 3340 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005211#1005221 null +1129 10052 2 0 1 108 43607 6887 3340 3340 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005211#1005221 null +1130 10051 2 0 2 120 78763 8017 3875 3875 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005111#1005121 null +1131 10052 2 0 2 120 78763 8017 3875 3875 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1005211#1005221 null +1132 10044 1 0 3 122 161104 12096 5483 5483 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 1004411#1004421 null +1133 17 4 0 3 108 102230 8417 3766 3766 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20052 null +1134 15 4 0 1 120 52509 7972 3875 3875 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20046 null +1135 15 4 0 1 120 52509 7972 3875 3875 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20046 null +1136 15 4 0 1 120 52509 7972 3875 3875 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20046 null +1137 17 4 0 2 124 126505 11913 5780 5780 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20052 null +1138 17 4 0 2 124 126505 11913 5780 5780 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20052 null +1139 17 4 0 2 124 126505 11913 5780 5780 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20052 null +1140 35 4 0 3 126 159384 12034 5421 5421 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 048145dd0..1250dfadd 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -93,16 +93,15 @@ int mut,int#int,2 mut,int#int,1 string 1030003 1052#1049#1051 null 1030004 1053 null 1040001 1054#1055#1056 null -1040002 1061#1057#1059 null -1040003 1057#1058#1059 null -1040004 1060#1061#1062 null -1040005 1063 null -1040006 1063#1064#1060#1062 null -1040007 1065#1066#1067 null -1050001 1068#1069#1070 null +1040002 1057#1058#1059 null +1040003 1060#1061#1062 null +1040004 1063 null +1040005 1063#1064#1060#1062 null +1040006 1065#1066#1067 null +1050001 1069 null 1050002 1071#1072#1073 null 1050003 1075#1071#1073 null -1050004 1077#1078#1079 null +1050004 1078 null 1050005 1080 null 1050006 1081#1082 null 1060001 1083#1084#1085 null diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 9ba0facb0..35ba11eec 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -360,8 +360,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102022 0 19 3#103#19#2 null 4 null 102023 0 0 null null 4 null 102024 6 2 1503#1 null 1 102016 -102025 0 15 102015 null 4 null -102026 0 0 null null 4 null +102025 0 0 null null 4 null +102026 0 15 102015 null 4 null 102027 0 0 null null 1 102018 102028 0 0 null null 1 102019 102029 0 21 3#101016|101019#101037|101020#102040|101021#102043|101025#102105 null 4 null diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index 3d8207d30..f5c1bb280 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -1,5 +1,15 @@ Id IsUpset RewardItem RewardMaxNum Loop int int mut,int#int,1 int int +101 1 50001#50011#50021 2 0 +102 1 50002#50012#50022 2 0 +103 1 50003#50013#50023 2 0 +104 1 50004#50014#50024 2 0 +105 1 50005#50015#50025 2 0 +111 1 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 2 0 +112 1 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 2 0 +113 1 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 2 0 +114 1 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 2 0 +115 1 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 2 0 1001 1 10001 1 0 1002 1 10002 1 0 1003 1 10003 1 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index 56bd17a98..dd733fead 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -1,6 +1,6 @@ Id ItemId Chance GrowChance RandomMin RandomMax int int int float int int -100 3001 9000 1.0 0 0 +100 3001 0 1.0 0 0 101 3001 100 1.0 1 1 102 3002 100 1.0 1 1 103 3003 100 1.0 1 1 @@ -341,3 +341,18 @@ int int int float int int 10322 1002 100 1.0 0 0 10323 1002 100 1.0 0 0 11001 1002 900 1.0 0 0 +50001 14 100 1.0 39584 43750 +50002 14 100 1.0 47500 52500 +50003 14 100 1.0 55416 61250 +50004 14 100 1.0 63334 70000 +50005 14 100 1.0 71250 78750 +50011 3 100 1.0 238 263 +50012 3 100 1.0 316 350 +50013 3 100 1.0 396 438 +50014 3 100 1.0 554 612 +50015 3 100 1.0 791 875 +50021 4 100 1.0 2 2 +50022 4 100 1.0 3 3 +50023 4 100 1.0 3 3 +50024 4 100 1.0 5 5 +50025 4 100 1.0 7 7 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java index 03c5b572e..a719292da 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java @@ -53,6 +53,10 @@ public class SAdventureConfig implements BaseConfig { return sAdventureConfigMap.get(position); } + public static Map getsAdventureConfigMap() { + return sAdventureConfigMap; + } + public Set getRecommendHeroSets() { return recommendHeroSets; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventurePoolConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventurePoolConfig.java new file mode 100644 index 000000000..fa87a5b72 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventurePoolConfig.java @@ -0,0 +1,53 @@ +package com.ljsd.jieling.config; + +import com.ljsd.jieling.logic.STableManager; +import com.ljsd.jieling.logic.Table; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Table(name ="AdventurePoolConfig") +public class SAdventurePoolConfig implements BaseConfig { + + private int id; + + private int weight; + + private int pool; + + private static Map> sAdventurePoolConfigListMap; + + @Override + public void init() throws Exception { + Map> sAdventurePoolConfigListMapTmp = new HashMap<>(); + Map config = STableManager.getConfig(SAdventurePoolConfig.class); + for(SAdventurePoolConfig sAdventurePoolConfig : config.values()){ + int pool = sAdventurePoolConfig.getPool(); + if(!sAdventurePoolConfigListMapTmp.containsKey(pool)){ + sAdventurePoolConfigListMapTmp.put(pool,new ArrayList<>()); + } + sAdventurePoolConfigListMapTmp.get(pool).add(sAdventurePoolConfig); + } + sAdventurePoolConfigListMap = sAdventurePoolConfigListMapTmp; + } + + public static List getsAdventurePoolConfigListByPool(int poolId) { + return sAdventurePoolConfigListMap.get(poolId); + } + + public int getId() { + return id; + } + + public int getWeight() { + return weight; + } + + public int getPool() { + return pool; + } + + +} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureSetting.java index 270ec78f9..fb62bd5b8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureSetting.java @@ -12,8 +12,6 @@ public class SAdventureSetting implements BaseConfig { private int id; - private int limitHour; - private int[] consumeGemRatio; private float[][] baseRewardRatio; @@ -38,10 +36,6 @@ public class SAdventureSetting implements BaseConfig { return id; } - public int getLimitHour() { - return limitHour; - } - public int[] getConsumeGemRatio() { return consumeGemRatio; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SFoodsConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SFoodsConfig.java index 38df9c88e..74107c63c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SFoodsConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SFoodsConfig.java @@ -18,6 +18,8 @@ public class SFoodsConfig implements BaseConfig { private int[][] effectPara; + private int functionType; + private static Map sFoodsConfigMap; @@ -49,4 +51,8 @@ public class SFoodsConfig implements BaseConfig { public int getTarget() { return target; } + + public int getFunctionType() { + return functionType; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SVipLevelConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SVipLevelConfig.java index d75f036a5..a7b39164c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SVipLevelConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SVipLevelConfig.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.config; import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.Table; +import java.util.HashMap; import java.util.Map; @Table(name ="VipLevelConfig") @@ -19,10 +20,21 @@ public class SVipLevelConfig implements BaseConfig { private int[] vipBoxCost; + private Map privilegeMap; + @Override public void init() throws Exception { - sVipLevelConfigMap = STableManager.getConfig(SVipLevelConfig.class); + Map config = STableManager.getConfig(SVipLevelConfig.class); + for(SVipLevelConfig sVipLevelConfig : config.values()){ + int[][] privileges = sVipLevelConfig.getPrivileges(); + if(privileges!=null&&privileges.length>0){ + Map privilegeMap = new HashMap<>(privileges.length); + for(int[] temp : privileges){ + privilegeMap.put(temp[0],temp[1]); + } + } + } } public static Map getsVipLevelConfigMap() { @@ -49,5 +61,7 @@ public class SVipLevelConfig implements BaseConfig { return vipBoxCost; } - + public Map getPrivilegeMap() { + return privilegeMap; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java index b11bf9e37..df9859981 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java @@ -11,16 +11,20 @@ import java.util.Map; public class AdventureManager extends MongoBase { private Map adventureStateInfoMap; + private Map allowTimeMap; public AdventureManager(){ this.setRootCollection(User._COLLECTION_NAME); adventureStateInfoMap = new HashMap<>(); + allowTimeMap = new HashMap<>(); } - public void station(AdventureStateInfo adventureStateInfo) throws Exception { + public void station(AdventureStateInfo adventureStateInfo,int allowTime) throws Exception { int position = adventureStateInfo.getPosition(); updateString("adventureStateInfoMap." + position, adventureStateInfo); + updateString("allowTimeMap." + position, allowTime); adventureStateInfoMap.put(position,adventureStateInfo); + allowTimeMap.put(position,allowTime); } public void clearStation(int position){ @@ -40,4 +44,12 @@ public class AdventureManager extends MongoBase { this.adventureStateInfoMap = adventureStateInfoMap; } + public void updateAllowTime(int position,int allowTime){ + updateString("allowTimeMap." + position, allowTime); + allowTimeMap.put(position,allowTime); + } + + public Map getAllowTimeMap() { + return allowTimeMap; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java index f7f76acc7..1fc6df165 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; +import com.ljsd.jieling.config.SAdventureSetting; +import com.ljsd.jieling.config.SVipLevelConfig; import com.ljsd.jieling.logic.dao.root.User; import java.util.List; @@ -11,16 +13,22 @@ public class AdventureStateInfo extends MongoBase { private int startTime; private int hourDuration; + + private int totalForce; + private int myRecommendHeroSize; + public AdventureStateInfo(){ this.setRootCollection(User._COLLECTION_NAME); } - public AdventureStateInfo(int position,List heroIds, int startTime, int hourDuration) { + public AdventureStateInfo(int position,List heroIds, int startTime, int hourDuration,int totalForce,int myRecommendHeroSize) { this.setRootCollection(User._COLLECTION_NAME); this.heroIds = heroIds; this.startTime = startTime; this.hourDuration = hourDuration; this.position = position; + this.totalForce = totalForce; + this.myRecommendHeroSize = myRecommendHeroSize; } public List getHeroIds() { @@ -39,4 +47,11 @@ public class AdventureStateInfo extends MongoBase { return position; } + public int getTotalForce() { + return totalForce; + } + + public int getMyRecommendHeroSize() { + return myRecommendHeroSize; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/AdventureSeasonInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/AdventureSeasonInfo.java new file mode 100644 index 000000000..f19490339 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/AdventureSeasonInfo.java @@ -0,0 +1,41 @@ +package com.ljsd.jieling.logic.dao.root; + +import com.ljsd.GameApplication; +import com.ljsd.common.mogodb.MongoRoot; + +import java.util.Map; +import java.util.Set; + +public class AdventureSeasonInfo extends MongoRoot { + public static final String _COLLECTION_NAME = "adventureSeasonInfo"; + + + Map> recommendFinalHeroMap; + + private long updateTime; + public AdventureSeasonInfo(){ + setId(Integer.toString(GameApplication.serverId)); + } + + public Map> getRecommendFinalHeroMap() { + return recommendFinalHeroMap; + } + + public void setRecommendFinalHeroMap(Map> recommendFinalHeroMap) { + this.recommendFinalHeroMap = recommendFinalHeroMap; + } + + public long getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(long updateTime) { + this.updateTime = updateTime; + } + + @Override + public String getCollection() { + return _COLLECTION_NAME; + } + +} 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 448e53b1f..2c90a6ce0 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 @@ -1,13 +1,15 @@ package com.ljsd.jieling.logic.fight; -import com.ljsd.jieling.config.SAdventureConfig; -import com.ljsd.jieling.config.SAdventureSetting; -import com.ljsd.jieling.config.SFoodsConfig; +import com.ljsd.GameApplication; +import com.ljsd.common.mogodb.LjsdMongoTemplate; +import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.handler.map.FoodBuffer; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.AdventureSeasonInfo; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.hero.HeroLogic; @@ -15,10 +17,7 @@ import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.FightInfoProto; import com.ljsd.jieling.protocols.MessageTypeProto; -import com.ljsd.jieling.util.CBean2Proto; -import com.ljsd.jieling.util.ItemUtil; -import com.ljsd.jieling.util.MathUtils; -import com.ljsd.jieling.util.MessageUtil; +import com.ljsd.jieling.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +26,13 @@ import java.util.*; public class CombatLogic { private static final Logger LOGGER = LoggerFactory.getLogger(CombatLogic.class); + private static AdventureSeasonInfo adventureSeasonInfoCache; + private static List adventureRecommendHeroInfos ; + private CombatLogic(){} + + public static class Instance { public final static CombatLogic instance = new CombatLogic(); } @@ -37,34 +41,114 @@ public class CombatLogic { return CombatLogic.Instance.instance; } - //冒险模式 + private void getAdventureRecommendHeroInfos( Map> recommendFinalHeroMap){ + + adventureRecommendHeroInfos = new ArrayList<>(recommendFinalHeroMap.size()); + for(Map.Entry> item : recommendFinalHeroMap.entrySet()){ + Integer key = item.getKey(); + Set value = item.getValue(); + adventureRecommendHeroInfos.add(CommonProto.AdventureRecommendHeroInfo.newBuilder().setPositionId(key).addAllRecommenedId(value).build()); + } + } + + + + //冒险模式 加成英雄刷新 + public void checkAdventureFlush() throws Exception { + AdventureSeasonInfo adventureSeasonInfo = MongoUtil.getInstence().getMyMongoTemplate().findById(AdventureSeasonInfo._COLLECTION_NAME, Integer.toString(GameApplication.serverId), AdventureSeasonInfo.class); + if(adventureSeasonInfo!=null){ + if(adventureSeasonInfoCache == null || adventureSeasonInfo.getUpdateTime()!=adventureSeasonInfoCache.getUpdateTime()){ + adventureSeasonInfoCache = adventureSeasonInfo; + getAdventureRecommendHeroInfos(adventureSeasonInfo.getRecommendFinalHeroMap()); + } + if(TimeUtils.isSameDayWithNow(adventureSeasonInfo.getUpdateTime())){ + return; + } + } + Map> recommendFinalHeroMap = new HashMap<>(); + Map sAdventureConfigMap = SAdventureConfig.getsAdventureConfigMap(); + for(SAdventureConfig sAdventureConfig : sAdventureConfigMap.values()){ + int[] recommendHeroIds = sAdventureConfig.getRecommendHeroIds(); + int recommendNums = recommendHeroIds[0]; + int randomPoolId = recommendHeroIds[1]; + int mustPoolId = recommendHeroIds[2]; + int leftNums = recommendNums; + Set recommendFinalHeroIds = new HashSet<>(recommendNums); + recommendFinalHeroMap.put(sAdventureConfig.getId(),recommendFinalHeroIds); + if(mustPoolId!=0){ + List sAdventurePoolConfigs = SAdventurePoolConfig.getsAdventurePoolConfigListByPool(mustPoolId); + for(SAdventurePoolConfig sAdventurePoolConfig : sAdventurePoolConfigs){ + recommendFinalHeroIds.add(sAdventurePoolConfig.getId()); + leftNums --; + } + } + + if(leftNums>0){ + List sAdventurePoolConfigs = SAdventurePoolConfig.getsAdventurePoolConfigListByPool(randomPoolId); + int totalWeight = 0; + for(SAdventurePoolConfig sAdventurePoolConfig : sAdventurePoolConfigs){ + totalWeight+=sAdventurePoolConfig.getWeight(); + } + while (leftNums>0){ + int randomWeight = MathUtils.randomInt(totalWeight)+1; + for(SAdventurePoolConfig sAdventurePoolConfig : sAdventurePoolConfigs){ + randomWeight-=sAdventurePoolConfig.getWeight(); + if(randomWeight<=0){ + recommendFinalHeroIds.add(sAdventurePoolConfig.getId()); + leftNums--; + break; + } + } + } + } + } + if(adventureSeasonInfo == null){ + adventureSeasonInfo = new AdventureSeasonInfo(); + } + adventureSeasonInfo.setRecommendFinalHeroMap(recommendFinalHeroMap); + adventureSeasonInfo.setUpdateTime(System.currentTimeMillis()); + adventureSeasonInfoCache = adventureSeasonInfo; + getAdventureRecommendHeroInfos(adventureSeasonInfo.getRecommendFinalHeroMap()); + MongoUtil.getInstence().getMyMongoTemplate().save(adventureSeasonInfo); + + } + //冒险模式 public void getAdventureStateInfo(ISession session) throws Exception { int uid = session.getUid(); User user = UserManager.getUser(uid); AdventureManager adventureManager = user.getAdventureManager(); Map adventureStateInfoMap = adventureManager.getAdventureStateInfoMap(); List result = new ArrayList<>(); - for(AdventureStateInfo adventureStateInfo : adventureStateInfoMap.values()){ - result.add(CBean2Proto.getAdventureStateInfo(adventureStateInfo)); + Map allowTimeMap = adventureManager.getAllowTimeMap(); + for(Map.Entry item : allowTimeMap.entrySet()){ + Integer position = item.getKey(); + Integer allowTime = item.getValue(); + AdventureStateInfo adventureStateInfo = adventureStateInfoMap.get(position); + result.add(CBean2Proto.getAdventureStateInfo(adventureStateInfo,position,allowTime)); } - FightInfoProto.GetAdventureStateInfoResponse response = FightInfoProto.GetAdventureStateInfoResponse.newBuilder().addAllAdventureStateInfoList(result).build(); + + FightInfoProto.GetAdventureStateInfoResponse response = FightInfoProto.GetAdventureStateInfoResponse.newBuilder().addAllAdventureStateInfoList(result).addAllAdventureRecommendHeroInfo(adventureRecommendHeroInfos). + build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ADVENTURE_INFO_RESPONSE_VALUE,response,true); } public void adventureStation(ISession session,int position,List heroIds,int hourDuration) throws Exception { if(heroIds == null || heroIds.isEmpty()){ + MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,""); return; } int uid = session.getUid(); User user = UserManager.getUser(uid); SAdventureConfig sAdventureConfig = SAdventureConfig.getsAdventureConfigByPosition(position); - if(sAdventureConfig.getOpenLevel() > user.getPlayerInfoManager().getLevel()){ + /* if(sAdventureConfig.getOpenLevel() > user.getPlayerInfoManager().getLevel()){ MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"等级不够"); return; - } + }*/ + + if(sAdventureConfig.getMinNum() > heroIds.size()){ MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"英雄数量小于规定数量"); return; @@ -84,8 +168,21 @@ public class CombatLogic { if(adventureStateInfo!=null){ MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"已驻扎"); return; - } + + int allowTime =0; + if(!adventureManager.getAllowTimeMap().containsKey(position)){ + int vipLevel = user.getPlayerInfoManager().getVipLevel(); + allowTime = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel).getPrivilegeMap().get(vipLevel) -hourDuration; + }else{ + Integer remainAllowTime = adventureManager.getAllowTimeMap().get(position); + allowTime = remainAllowTime - hourDuration; + } + if(allowTime<0){ + MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"超过时间"); + return; + } + for(AdventureStateInfo adventureStateInfoTmp:adventureStateInfoMap.values()){ List heroIds1 = adventureStateInfoTmp.getHeroIds(); for(String useHeroId : heroIds1){ @@ -96,8 +193,22 @@ public class CombatLogic { } } } + HeroManager heroManager = user.getHeroManager(); + int myRecommendHeroSize=0; + int totalForce=0; + Set recommendHeroSets = sAdventureConfig.getRecommendHeroSets(); + Set cacheHeroTid = new HashSet<>(recommendHeroSets.size()); + for(String heroId : heroIds){ + Hero hero = heroManager.getHero(heroId); + int templateId = hero.getTemplateId(); + if(recommendHeroSets.contains(templateId) && !cacheHeroTid.contains(templateId)){ + cacheHeroTid.add(templateId); + myRecommendHeroSize++; + } + totalForce += HeroLogic.getInstance().calHeoForce(user,hero); + } - adventureManager.station(new AdventureStateInfo(position,heroIds,(int)(System.currentTimeMillis()),hourDuration)); + adventureManager.station(new AdventureStateInfo(position,heroIds,(int)(System.currentTimeMillis()),hourDuration,totalForce,myRecommendHeroSize),allowTime); //发送成功 MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,null,true); @@ -132,44 +243,25 @@ public class CombatLogic { float[][] randomRewardRatio = sAdventureSetting.getRandomRewardRatio(); float[] hourRewardRatio = sAdventureSetting.getHourRewardRatio(); - List heroIds = adventureStateInfo.getHeroIds(); - int totalForce =0; - HeroManager heroManager = user.getHeroManager(); - Set recommendHeroSets = sAdventureConfig.getRecommendHeroSets(); - int myRecommendHeroSize =0; - Set cacheHeroTid = new HashSet<>(recommendHeroSets.size()); - for(String heroId : heroIds){ - Hero hero = heroManager.getHero(heroId); - int templateId = hero.getTemplateId(); - if(recommendHeroSets.contains(templateId) && !cacheHeroTid.contains(templateId)){ - cacheHeroTid.add(templateId); - myRecommendHeroSize++; - } - totalForce += HeroLogic.getInstance().calHeoForce(user,hero); - } - - + int totalForce =adventureStateInfo.getTotalForce(); + int myRecommendHeroSize =adventureStateInfo.getMyRecommendHeroSize(); float myForceRatio = totalForce*1.0f / recommendForce; float hourRewardRatioTmp = MathUtils.calABX(hourDuration, hourRewardRatio); float baseRewardRatioTmp = calRatio(myForceRatio, baseRewardRatio) * hourRewardRatioTmp; float randomRewardRatioTmp = calRatio(myForceRatio, randomRewardRatio) * hourRewardRatioTmp; - - - int[] baseRewardGroup = sAdventureConfig.getBaseRewardGroup(); int[] recommendRewardGroup = sAdventureConfig.getRecommendRewardGroup(); - + int[] randomRewardGroup = sAdventureConfig.getRandomRewardGroup(); Map dropInfoMap = new HashMap<>(); dropInfoMap.put(baseRewardGroup,baseRewardRatioTmp); - dropInfoMap.put(recommendRewardGroup,randomRewardRatioTmp); - dropInfoMap.put(recommendRewardGroup,myRecommendHeroSize*1.0f); - + dropInfoMap.put(randomRewardGroup,randomRewardRatioTmp); + if(myRecommendHeroSize>0){ + dropInfoMap.put(new int[]{recommendRewardGroup[myRecommendHeroSize-1]},myRecommendHeroSize*1.0f); + } CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropInfoMap); - //清除占领 adventureManager.clearStation(position); - FightInfoProto.TakeAventureRewardResponse response = FightInfoProto.TakeAventureRewardResponse.newBuilder().setDrop(drop).build(); //发送成功 @@ -201,7 +293,11 @@ public class CombatLogic { if(!enough){ return; } - SFoodsConfig sFoodsConfig = SFoodsConfig.getsFoodsConfigByFoodId(foodId); + bufferAddByEatFoodOrEventTrigger(mapManager,foodId); + } + + public void bufferAddByEatFoodOrEventTrigger(MapManager mapManager,int foodIdOrEventId) throws Exception { + SFoodsConfig sFoodsConfig = SFoodsConfig.getsFoodsConfigByFoodId(foodIdOrEventId); int contiue = sFoodsConfig.getContiue(); if(contiue==0){ int type = sFoodsConfig.getType(); @@ -215,10 +311,8 @@ public class CombatLogic { } } }else{ - mapManager.eatFood(foodId,sFoodsConfig.getContiue()); + mapManager.eatFood(foodIdOrEventId,sFoodsConfig.getContiue()); } - - } public Map attributeByEatFood( User user,int type,int target){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java index 8c18f7e66..bd2572cc4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.thread; +import com.ljsd.jieling.thread.task.MinuteJob; import com.ljsd.jieling.thread.task.PlatConfigureTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +64,7 @@ public class ThreadManager { // testTask 已秒为单位 延迟10s, 间隔30s为周期执行 scheduledExecutor.scheduleAtFixedRate(platConfigureTask, 10, PlatConfigureTask.SLEEP_INTEVAL_TIME, TimeUnit.SECONDS); - + scheduledExecutor.scheduleAtFixedRate(new MinuteJob(), 0, 60, TimeUnit.SECONDS); LOGGER.info("All Task running ..."); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteJob.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteJob.java new file mode 100644 index 000000000..124807f2d --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteJob.java @@ -0,0 +1,23 @@ +package com.ljsd.jieling.thread.task; + + +import com.ljsd.jieling.logic.fight.CombatLogic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class MinuteJob extends Thread { + private static final Logger LOGGER = LoggerFactory.getLogger(MinuteJob.class); + public MinuteJob(){ + super("minute-job-thread"); + } + + @Override + public void run() { + try { + LOGGER.info("MinuteJob start working"); + CombatLogic.getInstance().checkAdventureFlush(); + } catch (Exception e) { + LOGGER.error("the exception={}",e); + } + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index dfd3c5da3..837b2d24d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -79,14 +79,16 @@ public class CBean2Proto { return mailProto; } - public static CommonProto.AdventureStateInfo getAdventureStateInfo(AdventureStateInfo adventureStateInfo){ - int startTime = adventureStateInfo.getStartTime(); - int now = (int)(System.currentTimeMillis()/1000); - return CommonProto.AdventureStateInfo.newBuilder() - .addAllHeroIdList(adventureStateInfo.getHeroIds()) - .setPositionId(adventureStateInfo.getPosition()) - .setRemainTime((now - startTime )) - .build(); + public static CommonProto.AdventureStateInfo getAdventureStateInfo(AdventureStateInfo adventureStateInfo,int position,int allowTime){ + CommonProto.AdventureStateInfo.Builder builder = CommonProto.AdventureStateInfo.newBuilder().setAllowTime(allowTime).setPositionId(position); + if(adventureStateInfo!=null){ + int startTime = adventureStateInfo.getStartTime(); + int now = (int)(System.currentTimeMillis()/1000); + builder.setPositionId(adventureStateInfo.getPosition()) + .setRemainTime((now - startTime )); + } + return builder.build(); + }