From a1a5386a92c734afe52af92b6255bdec99ea47fb Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期一, 19 十一月 2018 14:37:57 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 6 db/PyMongoDataServer/PySysDB/tagStore.txt | 27 +++ db/PyMongoDataServer/SysDB/tagEffectRefresh.txt | 12 CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 2 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt | 6 CoreServerGroup/GameServer/PySysDB/tagFBLine.txt | 2 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 5 db/PyMongoDataServer/PySysDB/tagGodWeapon.txt | 134 +++++++++--------- db/PyMongoDataServer/SysDB/tagBornRefresh.txt | 2 db/PyMongoDataServer/SysDB/tagChinMap.txt | 2 db/PyMongoDataServer/PySysDB/tagRefineStove.txt | 4 db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2 CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc | 0 db/PyMongoDataServer/SysDB/tagNPCRefresh.txt | 92 ++++++++----- ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt | 2 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 5 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 30 ++- CoreServerGroup/GameServer/PySysDB/tagStore.txt | 27 +++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt | 2 19 files changed, 230 insertions(+), 132 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt index 6d8d8bf..1b666a2 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt @@ -2,24 +2,24 @@ 10403001 10040 int(300*(1-0.089*min(max(yesterdayCnt-1,0),9))) [115,155] 40 5 2000 100 世界BOSS 20103001 21070 int(450*(1-0.089*min(max(yesterdayCnt-1,0),9))) [115,175] 40 5 2005 100 世界BOSS 20103002 21070 int(900*(1-0.096*min(max(yesterdayCnt-1,0),9))) [125,195] 40 5 2006 100 世界BOSS -20103003 21070 int(1200*(1-0.056*min(max(yesterdayCnt-5,0),15))) [140,190] 40 5 2007 100 世界BOSS -20103004 21070 int(1500*(1-0.037*min(max(yesterdayCnt-8,0),22))) [160,210] 40 5 2008 100 世界BOSS +20103003 21070 int(1200*(1-0.056*min(max(yesterdayCnt-5,0),15))) [140,170] 40 5 2007 100 世界BOSS +20103004 21070 int(1500*(1-0.037*min(max(yesterdayCnt-8,0),22))) [160,190] 40 5 2008 100 世界BOSS 10503001 10050 int(1500*(1-0.02*min(max(yesterdayCnt-10,0),40))) [180,230] 40 5 2001 100 世界BOSS -20103005 21070 int(1800*(1-0.011*min(max(yesterdayCnt-30,0),70))) [195,245] 40 5 2009 100 世界BOSS -20103006 21070 int(2100*(1-0.007*min(max(yesterdayCnt-30,0),120))) [210,260] 40 5 2010 100 世界BOSS +20103005 21070 int(1800*(1-0.011*min(max(yesterdayCnt-30,0),70))) [195,225] 40 5 2009 100 世界BOSS +20103006 21070 int(2100*(1-0.007*min(max(yesterdayCnt-30,0),120))) [210,240] 40 5 2010 100 世界BOSS 10603001 10060 int(2100*(1-0.013*min(max(yesterdayCnt-30,0),50))) [230,300] 40 5 2002 100 世界BOSS -20203001 21100 int(3300*(1-0.015*min(max(yesterdayCnt-25,0),55))) [235,285] 40 5 2012 100 世界BOSS -20203002 21100 int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95))) [240,290] 40 5 2013 100 世界BOSS -20103007 21070 int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95))) [245,295] 40 5 2011 100 世界BOSS +20203001 21100 int(3300*(1-0.015*min(max(yesterdayCnt-25,0),55))) [235,265] 40 5 2012 100 世界BOSS +20203002 21100 int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95))) [240,270] 40 5 2013 100 世界BOSS +20103007 21070 int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95))) [245,275] 40 5 2011 100 世界BOSS 10703001 10070 int(3600*(1-0.012*min(max(yesterdayCnt-25,0),55))) [280,350] 40 5 2003 100 世界BOSS -20203003 21100 int(4200*(1-0.02*min(max(yesterdayCnt-20,0),40))) [285,335] 40 5 2014 100 世界BOSS -20203004 21100 int(4800*(1-0.015*min(max(yesterdayCnt-20,0),55))) [290,340] 40 5 2015 100 世界BOSS +20203003 21100 int(4200*(1-0.02*min(max(yesterdayCnt-20,0),40))) [285,315] 40 5 2014 100 世界BOSS +20203004 21100 int(4800*(1-0.015*min(max(yesterdayCnt-20,0),55))) [290,320] 40 5 2015 100 世界BOSS 10803001 10080 int(4800*(1-0.017*min(max(yesterdayCnt-20,0),40))) [330,400] 40 5 2004 100 世界BOSS -20203005 21100 int(5400*(1-0.032*min(max(yesterdayCnt-15,0),25))) [335,385] 40 5 2016 100 世界BOSS -20203006 21100 int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35))) [340,390] 40 5 2017 100 世界BOSS +20203005 21100 int(5400*(1-0.032*min(max(yesterdayCnt-15,0),25))) [335,365] 40 5 2016 100 世界BOSS +20203006 21100 int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35))) [340,370] 40 5 2017 100 世界BOSS 10903001 10090 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2048 100 世界BOSS -11003001 10100 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2047 100 世界BOSS -20203007 21100 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [385,435] 40 5 2018 100 世界BOSS +20203007 21100 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [385,415] 40 5 2018 100 世界BOSS +11003001 10100 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [430,500] 40 5 2047 100 世界BOSS 11103001 10110 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [430,500] 40 5 2049 100 世界BOSS 20303001 21110 3000 [1,500] 40 5 2040 100 世界BOSS 20303002 21110 3600 [1,500] 40 5 2041 100 世界BOSS @@ -40,6 +40,10 @@ 30303010 31030 4500 [1,500] 40 5 2028 100 BOSS之家二层 30303011 31030 5400 [1,500] 40 5 2029 100 BOSS之家二层 30303012 31030 6300 [1,500] 40 5 2030 100 BOSS之家二层 +30303013 31031 3600 [1,500] 40 5 2050 100 BOSS之家三层 +30303014 31031 4500 [1,500] 40 5 2051 100 BOSS之家三层 +30303015 31031 5400 [1,500] 40 5 2052 100 BOSS之家三层 +30303016 31031 6300 [1,500] 40 5 2053 100 BOSS之家三层 31503001 31150 1350 [1,500] 40 5 2031 100 古神禁地 31503002 31150 1700 [1,500] 40 5 2032 100 古神禁地 31503003 31150 2150 [1,500] 40 5 2033 100 古神禁地 diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt index 6d08357..d6df32a 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt @@ -36,4 +36,4 @@ 31250 守护副本 1 0 52010 封魔坛 8 0 52020 封魔坛 1 0 -31330 BOSS之家三层 8 0 +31031 BOSS之家三层 8 0 diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 1273cc1..3019097 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -494,6 +494,7 @@ 30203005 麒麟之魂 230 30301001 精英护卫 200 30301002 精英护卫 230 +30301003 精英护卫 1 30303001 天枢 160 30303002 天璇 180 30303003 天玑 210 @@ -506,6 +507,10 @@ 30303010 潮汐巨兽 300 30303011 极炎巨兽 350 30303012 白泽 400 +30303013 极冰之心 1 +30303014 潮汐巨兽 1 +30303015 极炎巨兽 1 +30303016 白泽 1 30403001 仙魔之争NPC 90 30403002 仙魔守卫 90 30403003 仙魔守卫 90 diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt index 0b8a18c..a2830ac 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt @@ -2,7 +2,7 @@ 31010 0 31010 31020 0 31020 31020 1 31030 -31020 2 31330 +31020 2 31031 31040 0 31040 31040 1 31040 31040 2 31040 diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt index cb8c564..75dd4c5 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt @@ -45,6 +45,7 @@ 113 3 0 0 114 3 0 0 115 3 0 0 +116 3 0 0 151 4 0 0 152 4 0 0 153 4 0 0 @@ -216,3 +217,29 @@ 1027 203 0 10 1028 203 0 999 1029 203 0 999 +1030 204 0 1 +1031 204 0 3 +1032 204 0 10 +1033 204 0 999 +1034 204 0 999 +1035 204 0 999 +1036 205 0 1 +1037 205 0 2 +1038 205 0 3 +1039 205 0 5 +1040 205 0 5 +1041 205 0 999 +1042 205 0 999 +1043 205 0 999 +1044 206 0 2 +1045 206 0 3 +1046 206 0 5 +1047 206 0 999 +1048 206 0 999 +1049 207 0 1 +1050 207 0 1 +1051 207 0 5 +1052 207 0 10 +1053 207 0 999 +1054 207 0 999 +1055 207 0 999 diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc index 27059e5..3b9ff89 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt index aff7b9c..083f212 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt @@ -11,7 +11,7 @@ Map101_Dtzz 31010 仙魔之争 31010 0 0 0 100 1 Map102_Bzjyc 31020 boss之家一层 31020 0 0 0 1 1 Map103_Bzjec 31030 boss之家二层 31030 0 0 0 1 1 -Map133_Bzjsc 31330 boss之家三层 31330 0 0 0 1 1 +Map133_Bzjsc 31031 boss之家三层 31031 0 0 0 1 1 Map104_Ljzs 31040 日常副本 31040 0 0 0 100 1 Map107_Shgm 21070 深海古墓 21070 0 0 0 25 1 Map108_Xjmj 31080 仙界秘境 31080 0 0 0 100 1 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt index 810e7e1..87192bb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt @@ -37,4 +37,4 @@ Map130_Kzly_21110 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0 Map011_Hgdg_10110 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0 Map010_Mzgc_10100 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0 -Map133_Bzjsc_31330 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0 +Map133_Bzjsc_31031 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0 diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt index 3bdfb5a..8a86537 100644 --- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt @@ -18,8 +18,8 @@ 20203005 21100 94 0 0 0 2016 20203006 21100 95 0 0 0 2017 10903001 10090 90 0 0 0 2048 -11003001 10100 90 0 0 0 2047 20203007 21100 96 0 0 0 2018 +11003001 10100 90 0 0 0 2047 11103001 10110 90 0 0 0 2049 20303001 21110 90 0 0 0 2040 20303002 21110 91 0 0 0 2041 @@ -40,6 +40,10 @@ 30303010 31030 92 0 0 0 2028 30303011 31030 93 0 0 0 2029 30303012 31030 94 0 0 0 2030 +30303013 31031 90 0 0 0 2050 +30303014 31031 91 0 0 0 2051 +30303015 31031 92 0 0 0 2052 +30303016 31031 93 0 0 0 2053 31503001 31150 90 0 0 0 2031 31503002 31150 91 0 0 0 2032 31503003 31150 92 0 0 0 2033 diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt index 18d5477..1b14503 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt @@ -2,7 +2,7 @@ 31010 0 31010 110 0 0 0 0 0 0 0 0 [26,6] [180,3,10] 31020 0 31020 0 0 0 0 0 0 0 0 0 [49,71] 12 31020 1 31030 0 0 0 0 0 0 0 0 0 [55,14] 12 -31020 2 31330 0 0 0 0 0 0 0 0 0 [55,14] 12 +31020 2 31031 0 0 0 0 0 0 0 0 0 [97,42] 12 31040 0 31040 0 0 0 0 0 0 0 0 0 [59,19] [1,3,300,10] [[201,30102001,5,15,500,0,0],[202,30102002,4,8,100,0,0],[203,30102003,1,2,100,0,0]] 31040 1 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,3,300,10] [[210,30102004,1,1,1,1,0]] 31040 2 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,3,300,10] [[210,30102005,1,1,1,1,0]] diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt index c9fa84e..dc82933 100644 --- a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt +++ b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt @@ -1700,8 +1700,8 @@ 3 398 13700 12|13 1590|716109 0 3 399 13820 12|13 1590|721504 0 3 400 0 12|13 1590|726935 0 -4 1 13 73 401.0 0 -4 2 13 73 408.0 0 +4 1 13 73 401 0 +4 2 13 73 408 0 4 3 13 73 416 0 4 4 14 73 424 0 4 5 14 73 432 0 @@ -1713,7 +1713,7 @@ 4 11 16 73 483 0 4 12 16 73 492 0 4 13 17 73 501 0 -4 14 17 73 510.0 0 +4 14 17 73 510 0 4 15 17 73 519 0 4 16 18 73 528 0 4 17 18 73 538 0 @@ -1730,7 +1730,7 @@ 4 28 22 73 649 0 4 29 22 73 660 0 4 30 22 73 670 0 -4 31 23 73 681.0 0 +4 31 23 73 681 0 4 32 23 73 692 0 4 33 23 73 703 0 4 34 23 73 714 0 @@ -1742,21 +1742,21 @@ 4 40 25 73 782 0 4 41 26 73 793 0 4 42 26 73 805 0 -4 43 26 73 816.0 0 +4 43 26 73 816 0 4 44 27 73 828 0 4 45 27 73 840 0 4 46 27 73 851 0 4 47 28 73 863 0 4 48 28 73 875 0 4 49 28 73 887 0 -4 50 28 73 899.0 0 +4 50 28 73 899 0 4 51 29 73 910 0 4 52 29 73 922 0 4 53 29 73 934 0 4 54 29 73 946 0 -4 55 30 73 957.0 0 +4 55 30 73 957 0 4 56 30 73 969 0 -4 57 30 73 981.0 0 +4 57 30 73 981 0 4 58 30 73 993 0 4 59 31 73 1004 0 4 60 31 73 1016 0 @@ -1785,7 +1785,7 @@ 4 83 36 73 1277 0 4 84 37 73 1287 0 4 85 37 73 1298 0 -4 86 37 73 1309.0 0 +4 86 37 73 1309 0 4 87 37 73 1320 0 4 88 38 73 1330 0 4 89 38 73 1341 0 @@ -1848,13 +1848,13 @@ 4 146 52 73 1896 0 4 147 52 73 1906 0 4 148 52 73 1915 0 -4 149 52 73 1924.0 0 -4 150 52 73 1934.0 0 +4 149 52 73 1924 0 +4 150 52 73 1934 0 4 151 57 73 1943 0 4 152 61 73 1953 0 4 153 65 73 1964 0 4 154 69 73 1975 0 -4 155 73 73 1987.0 0 +4 155 73 73 1987 0 4 156 77 73 2000 0 4 157 81 73 2013 0 4 158 85 73 2027 0 @@ -1884,15 +1884,15 @@ 4 182 184 73 2514 0 4 183 188 73 2540 0 4 184 192 73 2566 0 -4 185 196 73 2593.0 0 +4 185 196 73 2593 0 4 186 200 73 2620 0 4 187 204 73 2647 0 -4 188 208 73 2674.0 0 +4 188 208 73 2674 0 4 189 213 73 2702 0 4 190 217 73 2730 0 4 191 221 73 2758 0 4 192 225 73 2787 0 -4 193 229 73 2815.0 0 +4 193 229 73 2815 0 4 194 233 73 2844 0 4 195 237 73 2874 0 4 196 241 73 2903 0 @@ -1909,7 +1909,7 @@ 4 207 283 73 3244 0 4 208 287 73 3277 0 4 209 292 73 3310 0 -4 210 296 73 3344.0 0 +4 210 296 73 3344 0 4 211 300 73 3378 0 4 212 304 73 3413 0 4 213 309 73 3447 0 @@ -1953,26 +1953,26 @@ 4 251 465 73 5008 0 4 252 469 73 5054 0 4 253 473 73 5100 0 -4 254 477 73 5147.0 0 +4 254 477 73 5147 0 4 255 481 73 5193 0 4 256 485 73 5240 0 -4 257 489 73 5287.0 0 +4 257 489 73 5287 0 4 258 493 73 5334 0 4 259 497 73 5382 0 -4 260 501 73 5429.0 0 +4 260 501 73 5429 0 4 261 504 73 5477 0 4 262 508 73 5525 0 4 263 512 73 5573 0 4 264 516 73 5621 0 -4 265 520 73 5670.0 0 +4 265 520 73 5670 0 4 266 524 73 5718 0 4 267 528 73 5767 0 4 268 532 73 5816 0 4 269 536 73 5865 0 4 270 540 73 5915 0 4 271 544 73 5964 0 -4 272 548 73 6013.0 0 -4 273 552 73 6063.0 0 +4 272 548 73 6013 0 +4 273 552 73 6063 0 4 274 556 73 6113 0 4 275 560 73 6163 0 4 276 564 73 6213 0 @@ -1982,9 +1982,9 @@ 4 280 580 73 6415 0 4 281 584 73 6465 0 4 282 588 73 6516 0 -4 283 592 73 6567.0 0 -4 284 596 73 6618.0 0 -4 285 600 73 6669.0 0 +4 283 592 73 6567 0 +4 284 596 73 6618 0 +4 285 600 73 6669 0 4 286 604 73 6721 0 4 287 608 73 6772 0 4 288 612 73 6823 0 @@ -1992,28 +1992,28 @@ 4 290 620 73 6927 0 4 291 624 73 6978 0 4 292 628 73 7030 0 -4 293 632 73 7082.0 0 +4 293 632 73 7082 0 4 294 636 73 7134 0 4 295 640 73 7186 0 4 296 644 73 7238 0 4 297 648 73 7290 0 -4 298 652 73 7343.0 0 -4 299 656 73 7395.0 0 +4 298 652 73 7343 0 +4 299 656 73 7395 0 4 300 660 73 7447 0 4 301 664 73 7500 0 4 302 668 73 7552 0 -4 303 672 73 7605.0 0 +4 303 672 73 7605 0 4 304 676 73 7658 0 4 305 680 73 7711 0 4 306 684 73 7764 0 -4 307 688 73 7817.0 0 +4 307 688 73 7817 0 4 308 692 73 7870 0 4 309 696 73 7923 0 4 310 700 73 7976 0 -4 311 704 73 8030.0 0 +4 311 704 73 8030 0 4 312 708 73 8083 0 4 313 712 73 8137 0 -4 314 716 73 8190.0 0 +4 314 716 73 8190 0 4 315 720 73 8244 0 4 316 724 73 8298 0 4 317 728 73 8352 0 @@ -2050,19 +2050,19 @@ 4 348 822 73 10015 0 4 349 825 73 10068 0 4 350 827 73 10120 0 -4 351 830 73 10173.0 0 +4 351 830 73 10173 0 4 352 833 73 10225 0 4 353 836 73 10278 0 4 354 839 73 10330 0 4 355 842 73 10382 0 -4 356 845 73 10435.0 0 +4 356 845 73 10435 0 4 357 848 73 10487 0 4 358 850 73 10539 0 4 359 853 73 10590 0 4 360 856 73 10642 0 -4 361 859 73 10694.0 0 +4 361 859 73 10694 0 4 362 862 73 10745 0 -4 363 865 73 10797.0 0 +4 363 865 73 10797 0 4 364 868 73 10848 0 4 365 871 73 10900 0 4 366 873 73 10951 0 @@ -2080,17 +2080,17 @@ 4 378 908 73 11555 0 4 379 911 73 11605 0 4 380 914 73 11654 0 -4 381 917 73 11704.0 0 +4 381 917 73 11704 0 4 382 919 73 11753 0 4 383 922 73 11802 0 4 384 925 73 11851 0 4 385 928 73 11899 0 4 386 931 73 11948 0 4 387 934 73 11997 0 -4 388 937 73 12045.0 0 +4 388 937 73 12045 0 4 389 940 73 12093 0 4 390 942 73 12141 0 -4 391 945 73 12189.0 0 +4 391 945 73 12189 0 4 392 948 73 12237 0 4 393 951 73 12284 0 4 394 954 73 12331 0 @@ -2099,28 +2099,28 @@ 4 397 963 73 12473 0 4 398 965 73 12519 0 4 399 968 73 12566 0 -4 400 971 73 12612.0 0 +4 400 971 73 12612 0 4 401 974 73 12659 0 4 402 977 73 12705 0 -4 403 980 73 12752.0 0 +4 403 980 73 12752 0 4 404 983 73 12799 0 4 405 986 73 12846 0 -4 406 988 73 12893.0 0 +4 406 988 73 12893 0 4 407 991 73 12941 0 4 408 994 73 12988 0 -4 409 997 73 13036.0 0 +4 409 997 73 13036 0 4 410 1000 73 13084 0 4 411 1003 73 13132 0 4 412 1006 73 13180 0 4 413 1009 73 13228 0 -4 414 1011 73 13276.0 0 +4 414 1011 73 13276 0 4 415 1014 73 13324 0 4 416 1017 73 13373 0 4 417 1020 73 13422 0 4 418 1023 73 13471 0 4 419 1026 73 13520 0 4 420 1029 73 13569 0 -4 421 1032 73 13618.0 0 +4 421 1032 73 13618 0 4 422 1035 73 13667 0 4 423 1037 73 13717 0 4 424 1040 73 13767 0 @@ -2136,14 +2136,14 @@ 4 434 1069 73 14271 0 4 435 1072 73 14322 0 4 436 1075 73 14374 0 -4 437 1078 73 14425.0 0 +4 437 1078 73 14425 0 4 438 1081 73 14477 0 4 439 1083 73 14529 0 4 440 1086 73 14580 0 4 441 1089 73 14632 0 4 442 1092 73 14685 0 4 443 1095 73 14737 0 -4 444 1098 73 14789.0 0 +4 444 1098 73 14789 0 4 445 1101 73 14842 0 4 446 1104 73 14895 0 4 447 1106 73 14947 0 @@ -2161,15 +2161,15 @@ 4 459 1141 73 15592 0 4 460 1144 73 15647 0 4 461 1147 73 15702 0 -4 462 1150 73 15757.0 0 +4 462 1150 73 15757 0 4 463 1152 73 15812 0 4 464 1155 73 15867 0 4 465 1158 73 15922 0 -4 466 1161 73 15978.0 0 +4 466 1161 73 15978 0 4 467 1164 73 16033 0 4 468 1167 73 16089 0 4 469 1170 73 16145 0 -4 470 1173 73 16201.0 0 +4 470 1173 73 16201 0 4 471 1175 73 16257 0 4 472 1178 73 16314 0 4 473 1181 73 16370 0 @@ -2237,16 +2237,16 @@ 4 535 1454 73 20213 0 4 536 1460 73 20282 0 4 537 1465 73 20352 0 -4 538 1471 73 20422.0 0 +4 538 1471 73 20422 0 4 539 1477 73 20493 0 4 540 1482 73 20564 0 4 541 1488 73 20635 0 -4 542 1494 73 20706.0 0 +4 542 1494 73 20706 0 4 543 1499 73 20777 0 -4 544 1505 73 20849.0 0 +4 544 1505 73 20849 0 4 545 1511 73 20921 0 4 546 1516 73 20994 0 -4 547 1522 73 21066.0 0 +4 547 1522 73 21066 0 4 548 1528 73 21139 0 4 549 1533 73 21212 0 4 550 1539 73 21286 0 @@ -2292,14 +2292,14 @@ 4 590 1766 73 24446 0 4 591 1771 73 24531 0 4 592 1777 73 24615 0 -4 593 1783 73 24700.0 0 +4 593 1783 73 24700 0 4 594 1788 73 24786 0 4 595 1794 73 24871 0 -4 596 1800 73 24957.0 0 +4 596 1800 73 24957 0 4 597 1805 73 25044 0 4 598 1811 73 25130 0 4 599 1817 73 25217 0 -4 600 1822 73 25304.0 0 +4 600 1822 73 25304 0 4 601 1828 73 25391 0 4 602 1834 73 25479 0 4 603 1839 73 25566 0 @@ -2311,24 +2311,24 @@ 4 609 1873 73 26099 0 4 610 1879 73 26189 0 4 611 1885 73 26279 0 -4 612 1890 73 26369.0 0 +4 612 1890 73 26369 0 4 613 1896 73 26460 0 -4 614 1902 73 26550.0 0 +4 614 1902 73 26550 0 4 615 1907 73 26641 0 -4 616 1913 73 26733.0 0 +4 616 1913 73 26733 0 4 617 1919 73 26824 0 -4 618 1924 73 26916.0 0 +4 618 1924 73 26916 0 4 619 1930 73 27008 0 4 620 1936 73 27101 0 -4 621 1941 73 27194.0 0 +4 621 1941 73 27194 0 4 622 1947 73 27287 0 4 623 1953 73 27380 0 4 624 1958 73 27473 0 4 625 1964 73 27567 0 -4 626 1970 73 27661.0 0 +4 626 1970 73 27661 0 4 627 1975 73 27756 0 4 628 1981 73 27850 0 -4 629 1987 73 27945.0 0 +4 629 1987 73 27945 0 4 630 1992 73 28040 0 4 631 1998 73 28136 0 4 632 2003 73 28231 0 @@ -2338,15 +2338,15 @@ 4 636 2026 73 28617 0 4 637 2032 73 28714 0 4 638 2037 73 28811 0 -4 639 2043 73 28909.0 0 +4 639 2043 73 28909 0 4 640 2049 73 29007 0 4 641 2054 73 29105 0 4 642 2060 73 29203 0 4 643 2066 73 29302 0 4 644 2071 73 29401 0 4 645 2077 73 29500 0 -4 646 2083 73 29599.0 0 +4 646 2083 73 29599 0 4 647 2088 73 29699 0 -4 648 2094 73 29799.0 0 +4 648 2094 73 29799 0 4 649 2100 73 29899 0 4 650 0 73 30000 0 diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt index 03020db..f098505 100644 --- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt +++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt @@ -161,3 +161,9 @@ 31030 30303010 0 0 0 31030 30303011 0 0 0 31030 30303012 0 0 0 +31031 30301003 220 240 1839 +31031 30303013 240 240 3266 +31031 30303014 250 250 3670 +31031 30303015 300 300 7971 +31031 30303016 350 350 15442 +31031 30303017 400 400 29763 diff --git a/db/PyMongoDataServer/PySysDB/tagRefineStove.txt b/db/PyMongoDataServer/PySysDB/tagRefineStove.txt index eda9ea4..9ff0edb 100644 --- a/db/PyMongoDataServer/PySysDB/tagRefineStove.txt +++ b/db/PyMongoDataServer/PySysDB/tagRefineStove.txt @@ -4,7 +4,7 @@ 3 6480 6 13441 4 20700 6 20537 5 49950 6 29971 -6 134280 6 42393 -7 161100 6 58548 +6 67140 6 42393 +7 134250 6 58548 8 193320 6 79273 9 358000 6 105195 diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index d959023..d4b64c5 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -45,6 +45,7 @@ 113 3 0 5306 1 0 [] 0 0 0 350 0 0 1 300 0 0 114 3 0 4219 1 1 [] 0 0 0 122 1 0 1 258 0 0 115 3 0 261 1 1 [] 0 0 0 132 1 0 1 258 0 0 +116 3 0 5412 1 0 [] 0 0 0 180 0 0 1 5 0 0 151 4 0 181 1 1 [] 0 0 0 0 0 0 2 10 0 0 152 4 0 952 1 1 [] 0 0 0 0 0 0 2 25 0 0 153 4 0 4101 1 1 [] 0 0 0 0 0 0 2 688 0 0 @@ -216,3 +217,29 @@ 1027 203 2 2213 100 1 [] 2213 0 0 0 1 10 1 500 1250 0 FlashRushToBuy2 FlashToSnapUp 1028 203 2 4608 2 1 [] 4608 0 0 0 1 999 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp 1029 203 2 198 3 1 [] 198 0 0 0 1 999 1 88 900 0 FlashRushToBuy2 FlashToSnapUp +1030 204 2 4606 3 1 [] 4606 0 0 0 1 1 1 666 3000 0 FlashRushToBuy2 FlashToSnapUp +1031 204 2 4606 1 1 [] 4606 0 0 0 1 3 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp +1032 204 2 2213 50 1 [] 2213 0 0 0 1 10 1 150 625 0 FlashRushToBuy2 FlashToSnapUp +1033 204 2 1503 2 1 [] 1503 0 0 0 1 999 1 20 100 0 FlashRushToBuy2 FlashToSnapUp +1034 204 2 4007 3 1 [] 4007 0 0 0 1 999 1 60 240 0 FlashRushToBuy2 FlashToSnapUp +1035 204 2 4622 5 1 [] 4622 0 0 0 1 999 1 88 400 0 FlashRushToBuy2 FlashToSnapUp +1036 205 2 3516 2 1 [] 3516 0 0 0 1 1 1 666 4860 0 FlashRushToBuy2 FlashToSnapUp +1037 205 2 947 1 1 [] 947 0 0 0 1 2 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp +1038 205 2 2050 6 1 [] 2050 0 0 0 1 3 1 30 300 0 FlashRushToBuy2 FlashToSnapUp +1039 205 2 953 1 1 [] 953 0 0 0 1 5 1 88 500 0 FlashRushToBuy2 FlashToSnapUp +1040 205 2 4681 1 1 [] 4681 0 0 0 1 5 1 50 250 0 FlashRushToBuy2 FlashToSnapUp +1041 205 2 4184 1 1 [] 4184 0 0 0 1 999 1 38 230 0 FlashRushToBuy2 FlashToSnapUp +1042 205 2 4010 4 1 [] 4010 0 0 0 1 999 1 100 320 0 FlashRushToBuy2 FlashToSnapUp +1043 205 2 4609 2 1 [] 4609 0 0 0 1 999 1 50 200 0 FlashRushToBuy2 FlashToSnapUp +1044 206 2 4607 2 1 [] 4607 0 0 0 1 2 1 666 4000 0 FlashRushToBuy2 FlashToSnapUp +1045 206 2 196 1 1 [] 196 0 0 0 1 3 1 200 800 0 FlashRushToBuy2 FlashToSnapUp +1046 206 2 195 5 1 [] 195 0 0 0 1 5 1 300 1500 0 FlashRushToBuy2 FlashToSnapUp +1047 206 2 4610 1 1 [] 4610 0 0 0 1 999 1 60 200 0 FlashRushToBuy2 FlashToSnapUp +1048 206 2 5410 3 1 [] 5410 0 0 0 1 999 1 88 150 0 FlashRushToBuy2 FlashToSnapUp +1049 207 2 5409 2 1 [] 5409 0 0 0 1 1 1 8888 25000 0 FlashRushToBuy2 FlashToSnapUp +1050 207 2 2389 5 1 [] 2390 0 0 0 1 1 1 150 900 0 FlashRushToBuy2 FlashToSnapUp +1051 207 2 4680 1 1 [] 4680 0 0 0 1 5 1 188 750 0 FlashRushToBuy2 FlashToSnapUp +1052 207 2 2389 1 1 [] 2390 0 0 0 1 10 1 20 180 0 FlashRushToBuy2 FlashToSnapUp +1053 207 2 2213 100 1 [] 2213 0 0 0 1 999 1 200 1250 0 FlashRushToBuy2 FlashToSnapUp +1054 207 2 4608 2 1 [] 4608 0 0 0 1 999 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp +1055 207 2 198 3 1 [] 198 0 0 0 1 999 1 88 900 0 FlashRushToBuy2 FlashToSnapUp diff --git a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt index d99640e..35ec8f2 100644 --- a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt +++ b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt @@ -33,4 +33,4 @@ 89740 10110 109 24 1 0 100988 31030 55 14 2 0 105295 10100 60 18 1 0 -108350 31330 97 42 1 0 +108493 31031 97 42 1 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt index 7280b19..251a553 100644 --- a/db/PyMongoDataServer/SysDB/tagChinMap.txt +++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt @@ -36,4 +36,4 @@ 31250 守护副本 1 0 600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 52010 封魔坛 1 0 900000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 52020 封魔坛 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 -31330 BOSS之家三层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 35 +31031 BOSS之家三层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 35 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index e5c5df2..16f59d3 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -494,6 +494,7 @@ 30203005 2 0 麒麟之魂 230 0 39303 39303 0 0 0 0 10000 49458 0 0 0 0 0 0 0 0 2000 999638 64 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 11645471 0 0 0 0 3 0 0 1 1 1 30301001 2 0 精英护卫 200 0 1503 1503 0 6 0 0 10000 25 0 0 780 0 0 0 0 1 3000 634880 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 34243 0 0 0 0 1 48352 7 1 1 1 30301002 2 0 精英护卫 230 0 1839 1839 0 8 0 0 10000 55 0 0 780 0 0 0 0 1 3000 738321 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 51163 0 0 0 0 1 83079 13 1 1 1 +30301003 2 0 精英护卫 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 3 3 0 0 0 1 0 0 1 1 1 30303001 2 0 天枢 160 0 2524 2524 0 4 0 0 10000 3100 0 1 0 0 0 0 0 3 3000 444132 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5799139 0 10000 0 0 5 0 0 186 1 1 30303002 2 0 天璇 180 0 3754 3754 0 5 0 0 10000 4847 0 1 0 0 0 0 0 3 3000 501072 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 8527731 0 10000 0 0 5 0 0 186 1 1 30303003 2 0 天玑 210 0 6200 6200 0 6 0 0 10000 7908 0 1 0 0 0 0 0 3 3000 597186 31 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 23982232 0 10000 0 0 5 0 0 186 1 1 @@ -506,6 +507,10 @@ 30303010 2 0 潮汐巨兽 300 0 22498 22498 0 13 0 0 10000 18455 0 1 0 0 0 0 0 3 3000 1365193 93 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 57905998 3 10000 0 0 5 0 0 186 1 1 30303011 2 0 极炎巨兽 350 0 33098 33098 0 17 0 0 10000 30106 0 1 0 0 0 0 0 3 3000 1655663 116 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 23040341 8 10000 0 0 5 0 0 186 1 1 30303012 2 0 白泽 400 0 56742 56742 0 22 0 0 10000 49103 0 1 0 0 0 0 0 3 3000 1989837 143 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 27378150 15 10000 0 0 5 0 0 186 1 1 +30303013 2 0 极冰之心 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 +30303014 2 0 潮汐巨兽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 +30303015 2 0 极炎巨兽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 +30303016 2 0 白泽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1 30403001 2 0 仙魔之争NPC 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1 30403002 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1 30403003 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1 diff --git a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt index 9dfa8cd..84f3d61 100644 --- a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt +++ b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt @@ -96,9 +96,9 @@ 105307 10100 61 11 13 20011 0 105309 10100 62 97 15 20008 0 105311 10100 62 97 15 20010 0 -108372 31330 71 123 15 20010 0 -108374 31330 17 69 15 20008 0 -108376 31330 70 18 15 20008 0 -108378 31330 118 70 15 20008 0 -108380 31330 98 38 10 20011 0 -108382 31330 70 72 80 20010 0 +108515 31031 71 123 15 20010 0 +108517 31031 17 69 15 20008 0 +108519 31031 70 18 15 20008 0 +108521 31031 118 70 15 20008 0 +108523 31031 98 38 10 20011 0 +108525 31031 70 72 80 20010 0 diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt index bc7f7f2..d6d3f34 100644 --- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt +++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt @@ -255,14 +255,14 @@ 27892 10601002 10060 0 [53,15,1,8] 1 1 0 2500 0 0 1 5 5 0 0 27894 10601002 10060 0 [51,10,1,8] 1 1 0 2500 0 0 1 5 5 0 0 18951 10702001 10070 0 [66,180,1,15] 1 1 0 2500 0 0 1 5 5 0 0 -85358 20102006 21070 0 [108,107,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85360 20102006 21070 0 [106,106,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85362 20102006 21070 0 [108,104,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85364 20102006 21070 0 [110,106,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85338 20102003 21070 0 [8,75,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85340 20102003 21070 0 [8,73,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85342 20102004 21070 0 [139,73,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85344 20102004 21070 0 [137,71,1,10] 1 1 0 60000 0 0 1 5 5 0 0 952 0 31180 0 [73,63,10,30] 1 1 0 0 0 0 1 5 5 0 102 1410 0 31180 0 [71,17,10,30] 1 1 0 0 0 0 1 5 5 0 101 1411 0 31180 0 [22,51,1,30] 1 1 0 0 0 0 1 5 5 0 103 -95461 0 21070 0 [75,71,0,14] 1 1 0 0 0 0 1 5 5 0 99 +85346 20102004 21070 0 [141,71,1,10] 1 1 0 60000 0 0 1 5 5 0 0 76705 10301002 10030 0 [58,71,1,15] 1 1 0 1800 0 0 1 5 5 0 0 75697 10109005 10010 0 [101,111,0,15] 1 1 0 0 0 0 1 5 5 128 0 80183 10901001 10090 0 [169,31,0,15] 1 1 0 3000 0 0 1 5 5 0 0 @@ -284,6 +284,7 @@ 34545 10801001 10080 0 [114,81,1,15] 1 1 0 2500 0 0 1 5 5 0 0 80288 10901005 10090 0 [73,136,0,15] 1 1 0 3000 0 0 1 5 5 0 0 18953 10701001 10070 0 [32,11,1,15] 1 1 0 2500 0 0 1 5 5 0 0 +85360 20102006 21070 0 [106,106,1,10] 1 1 0 60000 0 0 1 5 5 0 0 81020 0 31150 0 [154,193,0,12] 1 1 0 0 0 0 1 5 5 0 95 76715 10301003 10030 0 [101,72,1,15] 1 1 0 1800 0 0 1 5 5 0 0 19031 10701003 10070 0 [58,60,1,15] 1 1 0 2500 0 0 1 5 5 0 0 @@ -307,6 +308,7 @@ 34622 10801005 10080 0 [17,33,1,15] 1 1 0 2500 0 0 1 5 5 0 0 75649 10102001 10010 0 [77,11,1,15] 1 1 0 1800 0 0 1 5 5 0 0 75651 10102001 10010 0 [87,13,1,15] 1 1 0 1800 0 0 1 5 5 0 0 +85304 90 21070 0 [15,36,0,12] 1 1 0 0 0 0 1 5 5 0 90 75653 10102001 10010 0 [83,19,1,12] 1 1 0 1800 0 0 1 5 5 0 0 75655 10102001 10010 0 [79,8,1,15] 1 1 0 1800 0 0 1 5 5 0 0 76165 10201002 10020 0 [138,20,1,16] 1 1 0 1800 0 0 1 5 5 0 0 @@ -471,14 +473,20 @@ 100889 30301001 31020 0 [71,51,1,10] 2 1 0 2500 0 0 1 5 5 0 0 89782 11101001 10110 0 [115,68,1,15] 1 1 0 3000 0 0 1 5 5 0 0 34598 10801004 10080 0 [25,85,1,15] 1 1 0 2500 0 0 1 5 5 0 0 -85340 20102003 21070 0 [8,73,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85342 20102004 21070 0 [139,73,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85344 20102004 21070 0 [137,71,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85362 20102006 21070 0 [108,104,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85364 20102006 21070 0 [110,106,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +95461 0 21070 0 [75,71,0,14] 1 1 0 0 0 0 1 5 5 0 99 18755 10701005 10070 0 [102,141,1,15] 1 1 0 2500 0 0 1 5 5 0 0 18757 10701002 10070 0 [18,62,1,15] 1 1 0 2500 0 0 1 5 5 0 0 18759 10702001 10070 0 [58,181,1,15] 1 1 0 2500 0 0 1 5 5 0 0 75571 10101004 10010 0 [108,51,1,10] 1 1 0 1800 0 0 1 5 5 0 0 75755 10101001 10010 0 [202,101,1,15] 1 1 0 1800 0 0 1 5 5 0 0 +85314 95 21070 0 [139,105,0,13] 1 1 0 0 0 0 1 5 5 0 95 +85316 96 21070 0 [76,113,0,15] 1 1 0 0 0 0 1 5 5 0 96 +85318 20102001 21070 0 [46,36,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85320 20102001 21070 0 [49,39,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85322 20102001 21070 0 [49,36,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85324 20102001 21070 0 [46,38,1,10] 1 1 0 60000 0 0 1 5 5 0 0 76091 10201002 10020 0 [147,28,1,16] 1 1 0 1800 0 0 1 5 5 0 0 80215 10901003 10090 0 [118,74,0,15] 1 1 0 3000 0 0 1 5 5 0 0 80216 10901003 10090 0 [117,77,0,15] 1 1 0 3000 0 0 1 5 5 0 0 @@ -589,14 +597,19 @@ 108426 0 31160 0 [67,89,0,15] 1 1 0 0 0 0 1 5 5 0 116 108427 0 31160 0 [100,61,0,100] 1 1 0 0 0 0 1 5 5 0 113 108428 0 31160 0 [65,134,0,15] 1 1 0 0 0 0 1 5 5 0 114 +108542 30301003 31031 0 [66,70,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108543 30301003 31031 0 [69,65,0,15] 1 1 0 3000 0 0 1 5 5 0 0 34587 10801003 10080 0 [55,104,1,15] 1 1 0 2500 0 0 1 5 5 0 0 34588 10801003 10080 0 [57,106,1,15] 1 1 0 2500 0 0 1 5 5 0 0 -85330 20102002 21070 0 [108,37,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85332 20102002 21070 0 [111,37,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85334 20102003 21070 0 [10,75,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85336 20102003 21070 0 [10,73,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85338 20102003 21070 0 [8,75,1,10] 1 1 0 60000 0 0 1 5 5 0 0 81048 0 31150 0 [144,120,0,12] 1 1 0 0 0 0 1 5 5 0 91 +108495 0 31031 0 [71,17,0,15] 1 1 0 0 0 0 1 5 5 0 90 +108497 0 31031 0 [17,70,0,15] 1 1 0 0 0 0 1 5 5 0 91 +108499 0 31031 0 [70,124,0,15] 1 1 0 0 0 0 1 5 5 0 92 +108501 0 31031 0 [118,70,0,15] 1 1 0 0 0 0 1 5 5 0 93 +108527 30301003 31031 0 [76,66,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108529 30301003 31031 0 [76,68,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108530 30301003 31031 0 [78,69,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108531 30301003 31031 0 [78,67,0,15] 1 1 0 3000 0 0 1 5 5 0 0 13236 10501002 10050 0 [36,16,1,16] 1 1 0 2500 0 0 1 5 5 0 0 13238 10501004 10050 0 [33,92,1,12] 1 1 0 2500 0 0 1 5 5 0 0 13240 10501003 10050 0 [15,58,1,16] 1 1 0 2500 0 0 1 5 5 0 0 @@ -633,6 +646,10 @@ 76037 10203001 10020 0 [19,54,1,14] 1 1 0 5000 0 0 1 5 5 50 0 76039 10201005 10020 0 [125,141,1,16] 1 1 0 1800 0 0 1 5 5 0 0 76041 10201001 10020 0 [191,36,1,16] 1 1 0 1800 0 0 1 5 5 0 0 +85306 91 21070 0 [138,39,0,12] 1 1 0 0 0 0 1 5 5 0 91 +85308 92 21070 0 [42,74,0,13] 1 1 0 0 0 0 1 5 5 0 92 +85310 93 21070 0 [106,69,0,14] 1 1 0 0 0 0 1 5 5 0 93 +85312 94 21070 0 [14,105,0,14] 1 1 0 0 0 0 1 5 5 0 94 76049 10202001 10020 0 [51,119,1,16] 1 1 0 1800 0 0 1 5 5 0 0 76051 10202001 10020 0 [48,114,1,16] 1 1 0 1800 0 0 1 5 5 0 0 18971 10702001 10070 0 [74,168,1,15] 1 1 0 2500 0 0 1 5 5 0 0 @@ -676,19 +693,8 @@ 68424 0 60010 0 [236,96,6,15] 1 1 0 0 0 0 1 5 5 0 128 68425 0 60010 0 [243,95,6,15] 1 1 0 0 0 0 1 5 5 0 129 68426 0 60010 0 [239,129,1,15] 1 1 0 0 0 0 1 5 5 0 130 -85308 92 21070 0 [42,74,0,13] 1 1 0 0 0 0 1 5 5 0 92 -85310 93 21070 0 [106,69,0,14] 1 1 0 0 0 0 1 5 5 0 93 -85312 94 21070 0 [14,105,0,14] 1 1 0 0 0 0 1 5 5 0 94 -85314 95 21070 0 [139,105,0,13] 1 1 0 0 0 0 1 5 5 0 95 -85316 96 21070 0 [76,113,0,15] 1 1 0 0 0 0 1 5 5 0 96 -85346 20102004 21070 0 [141,71,1,10] 1 1 0 60000 0 0 1 5 5 0 0 80253 10901004 10090 0 [74,92,0,15] 1 1 0 3000 0 0 1 5 5 0 0 -85348 20102004 21070 0 [139,70,1,10] 2 2 0 60000 0 0 1 5 5 0 0 18735 10702001 10070 0 [56,183,1,15] 1 1 0 2500 0 0 1 5 5 0 0 -85350 20102005 21070 0 [44,105,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85352 20102005 21070 0 [42,107,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85354 20102005 21070 0 [46,107,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85356 20102005 21070 0 [44,109,1,10] 1 1 0 60000 0 0 1 5 5 0 0 27800 10601004 10060 0 [11,99,1,15] 1 1 0 2500 0 0 1 5 5 0 0 18905 10701004 10070 0 [61,110,1,15] 1 1 0 2500 0 0 1 5 5 0 0 18907 10701005 10070 0 [108,148,1,15] 1 1 0 2500 0 0 1 5 5 0 0 @@ -729,6 +735,12 @@ 80245 10901004 10090 0 [63,85,0,15] 1 1 0 3000 0 0 1 5 5 0 0 80246 10901004 10090 0 [65,87,0,15] 1 1 0 3000 0 0 1 5 5 0 0 80247 10901004 10090 0 [67,85,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +85326 20102002 21070 0 [108,39,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85328 20102002 21070 0 [111,39,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85330 20102002 21070 0 [108,37,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85332 20102002 21070 0 [111,37,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85334 20102003 21070 0 [10,75,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85336 20102003 21070 0 [10,73,1,10] 1 1 0 60000 0 0 1 5 5 0 0 77024 10401002 10040 0 [137,76,1,15] 1 1 0 1800 0 0 1 5 5 0 0 76555 10302001 10030 0 [17,106,1,16] 1 1 0 1800 0 0 1 5 5 0 0 76007 10201002 10020 0 [139,23,1,16] 1 1 0 1800 0 0 1 5 5 0 0 @@ -1420,10 +1432,10 @@ 34565 10801002 10080 0 [112,107,1,15] 1 1 0 2500 0 0 1 5 5 0 0 34566 10801002 10080 0 [105,111,1,15] 1 1 0 2500 0 0 1 5 5 0 0 34567 10801002 10080 0 [105,108,1,15] 1 1 0 2500 0 0 1 5 5 0 0 -108352 0 31330 0 [71,17,0,15] 1 1 0 0 0 0 1 5 5 0 90 -108354 0 31330 0 [17,70,0,15] 1 1 0 0 0 0 1 5 5 0 91 -108356 0 31330 0 [70,124,0,15] 1 1 0 0 0 0 1 5 5 0 92 -108358 0 31330 0 [118,70,0,15] 1 1 0 0 0 0 1 5 5 0 93 +108538 30301003 31031 0 [62,71,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108539 30301003 31031 0 [64,72,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108540 30301003 31031 0 [64,69,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108541 30301003 31031 0 [62,74,0,15] 1 1 0 3000 0 0 1 5 5 0 0 80232 10901003 10090 0 [101,77,0,15] 1 1 0 3000 0 0 1 5 5 0 0 80233 10901003 10090 0 [99,78,0,15] 1 1 0 3000 0 0 1 5 5 0 0 80234 10901003 10090 0 [101,80,0,15] 1 1 0 3000 0 0 1 5 5 0 0 @@ -1703,8 +1715,6 @@ 101010 30301002 31030 0 [74,64,1,15] 1 1 0 2500 0 0 1 5 5 0 0 77036 10401002 10040 0 [147,74,1,15] 1 1 0 1800 0 0 1 5 5 0 0 101012 0 31030 0 [95,30,0,12] 1 1 0 0 0 0 1 5 5 0 90 -85304 90 21070 0 [15,36,0,12] 1 1 0 0 0 0 1 5 5 0 90 -85306 91 21070 0 [138,39,0,12] 1 1 0 0 0 0 1 5 5 0 91 101016 30301002 31030 0 [73,61,1,15] 1 1 0 2500 0 0 1 5 5 0 0 101018 30301002 31030 0 [72,64,1,15] 1 1 0 2500 0 0 1 5 5 0 0 101020 30301002 31030 0 [75,61,1,15] 1 1 0 2500 0 0 1 5 5 0 0 @@ -1852,6 +1862,12 @@ 77218 10401001 10040 0 [151,20,1,15] 1 1 0 1800 0 0 1 5 5 0 0 77220 10401001 10040 0 [164,12,1,15] 1 1 0 1800 0 0 1 5 5 0 0 77222 10402001 10040 0 [97,138,1,15] 1 1 0 1800 0 0 1 5 5 0 0 +85348 20102004 21070 0 [139,70,1,10] 2 2 0 60000 0 0 1 5 5 0 0 +85350 20102005 21070 0 [44,105,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85352 20102005 21070 0 [42,107,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85354 20102005 21070 0 [46,107,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85356 20102005 21070 0 [44,109,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +85358 20102006 21070 0 [108,107,1,10] 1 1 0 60000 0 0 1 5 5 0 0 34608 10801004 10080 0 [24,79,1,15] 1 1 0 2500 0 0 1 5 5 0 0 34609 10801004 10080 0 [26,78,1,15] 1 1 0 2500 0 0 1 5 5 0 0 76571 10302001 10030 0 [19,122,1,16] 1 1 0 1800 0 0 1 5 5 0 0 @@ -1873,6 +1889,10 @@ 75995 10201001 10020 0 [192,39,1,16] 1 1 0 1800 0 0 1 5 5 0 0 76585 10304008 10030 0 [116,79,0,1] 1 1 0 0 0 0 1 5 5 156 0 34596 10801004 10080 0 [23,89,1,15] 1 1 0 2500 0 0 1 5 5 0 0 +108544 30301003 31031 0 [71,65,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108545 30301003 31031 0 [69,67,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108546 30301003 31031 0 [71,67,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108547 30301003 31031 0 [67,64,0,15] 1 1 0 3000 0 0 1 5 5 0 0 51407 30908001 31230 0 [9,40,0,1] 1 1 0 0 0 0 1 5 5 0 0 76003 10201001 10020 0 [195,32,1,9] 1 1 0 1800 0 0 1 5 5 0 0 51408 30908001 31230 0 [15,40,0,0] 1 1 0 0 0 0 1 5 5 0 0 @@ -1905,14 +1925,14 @@ 77016 10401003 10040 0 [207,86,1,15] 1 1 0 1800 0 0 1 5 5 0 0 77018 10404100 10040 0 [174,35,0,15] 1 1 0 0 0 0 1 5 5 64 0 77020 10402001 10040 0 [106,150,1,15] 1 1 0 1800 0 0 1 5 5 0 0 -85318 20102001 21070 0 [46,36,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +108532 30301003 31031 0 [76,70,0,15] 1 1 0 3000 0 0 1 5 5 0 0 13364 10501003 10050 0 [13,50,1,16] 1 1 0 2500 0 0 1 5 5 0 0 13366 10501005 10050 0 [77,110,1,16] 1 1 0 2500 0 0 1 5 5 0 0 -85320 20102001 21070 0 [49,39,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85322 20102001 21070 0 [49,36,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85324 20102001 21070 0 [46,38,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85326 20102002 21070 0 [108,39,1,10] 1 1 0 60000 0 0 1 5 5 0 0 -85328 20102002 21070 0 [111,39,1,10] 1 1 0 60000 0 0 1 5 5 0 0 +108533 30301003 31031 0 [72,77,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108534 30301003 31031 0 [74,78,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108535 30301003 31031 0 [74,75,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108536 30301003 31031 0 [71,79,0,15] 1 1 0 3000 0 0 1 5 5 0 0 +108537 30301003 31031 0 [71,75,0,15] 1 1 0 3000 0 0 1 5 5 0 0 13152 10502001 10050 0 [93,61,1,10] 1 1 0 2500 0 0 1 5 5 0 0 18719 10701002 10070 0 [13,47,1,15] 1 1 0 2500 0 0 1 5 5 0 0 76207 10201003 10020 0 [157,55,1,16] 1 1 0 1800 0 0 1 5 5 0 0 -- Gitblit v1.8.0