From ad97bb860ca7f0a6f715d434f8c555add5813625 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期四, 23 八月 2018 21:45:46 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 289 +++++++++++++++++++++++++++++++-------------------------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 6 files changed, 156 insertions(+), 135 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index f996d1e..12f9125 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index 102e645..8684dc7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc index ffb74f2..198c81b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index 194ba2a..abca724 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt index 13c88d1..c98c344 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt @@ -58,7 +58,7 @@ CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0 CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0 CreatRolePoint3 2_52|3_20|4_13|5_12 0 0 0 0 -LVUPAddPoint 5|5|5|5|5|5 0 0 0 0 +LVUPAddPoint 0|0|0 0 0 0 0 PointAttr1 6_CON*6|7_int(0.52*STR)|8_int(0.35*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.2) 0 0 0 0 PointAttr2 6_CON*6|7_int(0.6*PNE)|8_int(0.3*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.3) 0 0 0 0 PointAttr3 6_CON*6|7_int(0.52*STR)|8_int(0.35*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.4) 0 0 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt index 9344f22..091825c 100644 --- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt +++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt @@ -1,134 +1,155 @@ -MapID NPCID LowLV HighestLV Defense -10010 10101001 2 6 6 -10010 10101002 4 8 6 -10010 10101003 6 10 15 -10010 10101004 8 12 31 -10010 10101005 10 15 31 -10010 10102001 13 18 33 -10010 10103001 0 0 0 -10020 10201001 15 20 66 -10020 10201002 18 22 67 -10020 10201003 21 24 73 -10020 10201004 24 27 85 -10020 10201005 27 30 87 -10020 10202001 30 32 99 -10020 10203001 0 0 0 -10030 10301001 32 41 117 -10030 10301002 38 44 122 -10030 10301003 41 47 125 -10030 10301004 44 50 128 -10030 10301005 47 52 129 -10030 10302001 50 55 142 -10030 10303001 0 0 0 -10040 10401001 55 70 269 -10040 10401002 70 90 311 -10040 10401003 80 100 356 -10040 10401004 90 110 410 -10040 10401005 100 120 488 -10040 10402001 110 130 587 -10040 10403001 0 0 0 -10050 10501001 120 140 681 -10050 10501002 130 150 799 -10050 10501003 140 160 886 -10050 10501004 150 170 974 -10050 10501005 160 180 1080 -10050 10502001 170 190 1176 -10050 10503001 0 0 0 -10060 10601001 180 200 1313 -10060 10601002 190 210 1503 -10060 10601003 200 220 1660 -10060 10601004 210 230 1839 -10060 10601005 220 240 2080 -10060 10602001 230 250 2330 -10060 10603001 0 0 0 -10070 10701001 240 260 2696 -10070 10701002 250 270 3038 -10070 10701003 260 280 3388 -10070 10701004 270 290 3904 -10070 10701005 280 300 4455 -10070 10702001 290 310 5324 -10070 10703001 0 0 0 -10080 10801001 300 320 5740 -10080 10801002 310 330 6177 -10080 10801003 320 340 6697 -10080 10801004 330 350 8223 -10080 10801005 340 360 12124 -10080 10802001 340 360 14548 -10080 10803001 0 0 0 -10090 10901001 300 320 13922 -10090 10901002 310 330 17009 -10090 10901003 320 340 18869 -10090 10901004 330 350 20697 -10090 10901005 340 360 23406 -10090 10902001 340 360 28087 -10090 10903001 0 0 0 -10110 11101001 300 320 13922 -10110 11101002 310 330 17009 -10110 11101003 320 340 18869 -10110 11101004 330 350 20697 -10110 11101005 340 360 23406 -10110 11102001 340 360 28087 -10110 11103001 0 0 0 -21070 20102001 110 130 767 -21070 20102002 120 140 867 -21070 20102003 160 180 1336 -21070 20102004 170 190 1507 -21070 20102005 220 240 2470 -21070 20102006 230 250 2797 -21070 20103001 0 0 0 -21070 20103002 0 0 0 -21070 20103003 0 0 0 -21070 20103004 0 0 0 -21070 20103005 0 0 0 -21070 20103006 0 0 0 -21070 20103007 0 0 0 -21100 20202001 230 250 2797 -21100 20202002 240 260 3447 -21100 20202003 280 300 4824 -21100 20202004 290 310 5805 -21100 20202005 330 350 7814 -21100 20202006 340 360 9667 -21100 20202007 380 400 17422 -21100 20203001 0 0 0 -21100 20203002 0 0 0 -21100 20203003 0 0 0 -21100 20203004 0 0 0 -21100 20203005 0 0 0 -21100 20203006 0 0 0 -21100 20203007 0 0 0 -21110 20302001 110 130 767 -21110 20302002 120 140 867 -21110 20302003 160 180 1336 -21110 20302004 170 190 1507 -21110 20302005 220 240 2470 -21110 20302006 230 250 2797 -21110 20303001 0 0 0 -21110 20303002 0 0 0 -21110 20303003 0 0 0 -21110 20303004 0 0 0 -21110 20303005 0 0 0 -21110 20303006 0 0 0 -21110 20303007 0 0 0 -31150 31501001 180 200 1059 -31150 31501002 210 230 1985 -31150 31501003 240 260 2343 -31150 31501004 270 290 3109 -31150 31501005 300 320 3954 -31150 31501006 320 340 5305 -31150 31501007 350 370 7444 -31150 31501008 390 410 9348 -31150 31501009 420 440 12550 -31020 30301001 190 210 1950 -31020 30303001 190 190 2005 -31020 30303002 200 200 2155 -31020 30303003 240 240 3168 -31020 30303004 250 250 3670 -31020 30303005 290 290 6763 -31020 30303006 300 300 7971 -31020 30303007 350 350 15442 -31030 30301002 230 250 2924 -31030 30303008 240 240 3266 -31030 30303009 250 250 3670 -31030 30303010 300 300 7971 -31030 30303011 350 350 15442 -31030 30303012 400 400 29763 +MapID NPCID LowLV HighestLV Defense +10010 10101001 2 6 6 +10010 10101002 4 8 6 +10010 10101003 6 10 15 +10010 10101004 8 12 31 +10010 10101005 10 15 31 +10010 10102001 13 18 33 +10010 10103001 0 0 0 +10020 10201001 15 20 66 +10020 10201002 18 22 67 +10020 10201003 21 24 73 +10020 10201004 24 27 85 +10020 10201005 27 30 87 +10020 10202001 30 32 99 +10020 10203001 0 0 0 +10030 10301001 32 41 117 +10030 10301002 38 44 122 +10030 10301003 41 47 125 +10030 10301004 44 50 128 +10030 10301005 47 52 129 +10030 10302001 50 55 142 +10030 10303001 0 0 0 +10040 10401001 55 70 269 +10040 10401002 70 90 311 +10040 10401003 80 100 356 +10040 10401004 90 110 410 +10040 10401005 100 120 488 +10040 10402001 110 130 587 +10040 10403001 0 0 0 +10050 10501001 120 140 681 +10050 10501002 130 150 799 +10050 10501003 140 160 886 +10050 10501004 150 170 974 +10050 10501005 160 180 1080 +10050 10502001 170 190 1176 +10050 10503001 0 0 0 +10060 10601001 180 200 1313 +10060 10601002 190 210 1503 +10060 10601003 200 220 1660 +10060 10601004 210 230 1839 +10060 10601005 220 240 2080 +10060 10602001 230 250 2330 +10060 10603001 0 0 0 +10070 10701001 240 260 2696 +10070 10701002 250 270 3038 +10070 10701003 260 280 3388 +10070 10701004 270 290 3904 +10070 10701005 280 300 4455 +10070 10702001 290 310 5324 +10070 10703001 0 0 0 +10080 10801001 300 320 5740 +10080 10801002 310 330 6177 +10080 10801003 320 340 6697 +10080 10801004 330 350 8223 +10080 10801005 340 360 12124 +10080 10802001 340 360 14548 +10080 10803001 0 0 0 +10090 10901001 300 320 13922 +10090 10901002 310 330 17009 +10090 10901003 320 340 18869 +10090 10901004 330 350 20697 +10090 10901005 340 360 23406 +10090 10902001 340 360 28087 +10090 10903001 0 0 0 +10110 11101001 300 320 13922 +10110 11101002 310 330 17009 +10110 11101003 320 340 18869 +10110 11101004 330 350 20697 +10110 11101005 340 360 23406 +10110 11102001 340 360 28087 +10110 11103001 0 0 0 +21070 20102001 110 130 767 +21070 20102002 120 140 867 +21070 20102003 160 180 1336 +21070 20102004 170 190 1507 +21070 20102005 220 240 2470 +21070 20102006 230 250 2797 +21070 20103001 0 0 0 +21070 20103002 0 0 0 +21070 20103003 0 0 0 +21070 20103004 0 0 0 +21070 20103005 0 0 0 +21070 20103006 0 0 0 +21070 20103007 0 0 0 +21100 20202001 230 250 2797 +21100 20202002 240 260 3447 +21100 20202003 280 300 4824 +21100 20202004 290 310 5805 +21100 20202005 330 350 7814 +21100 20202006 340 360 9667 +21100 20202007 380 400 17422 +21100 20203001 0 0 0 +21100 20203002 0 0 0 +21100 20203003 0 0 0 +21100 20203004 0 0 0 +21100 20203005 0 0 0 +21100 20203006 0 0 0 +21100 20203007 0 0 0 +21110 20302001 110 130 767 +21110 20302002 120 140 867 +21110 20302003 160 180 1336 +21110 20302004 170 190 1507 +21110 20302005 220 240 2470 +21110 20302006 230 250 2797 +21110 20303001 0 0 0 +21110 20303002 0 0 0 +21110 20303003 0 0 0 +21110 20303004 0 0 0 +21110 20303005 0 0 0 +21110 20303006 0 0 0 +21110 20303007 0 0 0 +31150 31501001 180 200 1059 +31150 31501002 210 230 1985 +31150 31501003 240 260 2343 +31150 31501004 270 290 3109 +31150 31501005 300 320 3954 +31150 31501006 320 340 5305 +31150 31501007 350 370 7444 +31150 31501008 390 410 9348 +31150 31501009 420 440 12550 +31150 31503001 0 0 0 +31150 31503002 0 0 0 +31150 31503003 0 0 0 +31150 31503004 0 0 0 +31150 31503005 0 0 0 +31150 31503006 0 0 0 +31150 31503007 0 0 0 +31150 31503008 0 0 0 +31150 31503009 0 0 0 +31020 30301001 190 210 1950 +31020 30303001 190 190 2005 +31020 30303002 200 200 2155 +31020 30303003 240 240 3168 +31020 30303004 250 250 3670 +31020 30303005 290 290 6763 +31020 30303006 300 300 7971 +31020 30303007 350 350 15442 +31030 30301002 230 250 2924 +31030 30303008 240 240 3266 +31030 30303009 250 250 3670 +31030 30303010 300 300 7971 +31030 30303011 350 350 15442 +31030 30303012 400 400 29763 +31020 30303001 0 0 0 +31020 30303002 0 0 0 +31020 30303003 0 0 0 +31020 30303004 0 0 0 +31020 30303005 0 0 0 +31020 30303006 0 0 0 +31020 30303007 0 0 0 +31030 30303008 0 0 0 +31030 30303009 0 0 0 +31030 30303010 0 0 0 +31030 30303011 0 0 0 +31030 30303012 0 0 0 -- Gitblit v1.8.0