From 996647d041d9ea2f29eca9c550f547fedde8b6f5 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期二, 21 八月 2018 16:05:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt | 192 ++++++++++++++++++++++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 134 ++++++++++++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
CoreServerGroup/GameServer/Script/GM/GMShell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc | 0
9 files changed, 327 insertions(+), 1 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
index 34a243d..2d36015 100644
--- a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 949901e..16168c5 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/GM/GMShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc
index 26f1e7a..6708ac0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc
index 874a46d..e0ea2cc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index ca9f693..8df4822 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index 14aceac..26cbc67 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c07e585..0c0e509 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -217,7 +217,7 @@
MunekadoTrialStarTime {0:[[20],[40],[60,60,60,60]],1:[[20],[35],[30],[60,60,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,30,30,30]]}
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
-ChaosDemonReward {103:1,102:3,181:10} 5_100|4_90|3_80|2_70|1_60 30000*reExp
+ChaosDemonReward {103:1,102:3} 5_100|4_90|3_80|2_70|1_60 30000*reExp {5:[(181,10,1)],4:[(181,8,1)],3:[(181,6,1)],2:[(181,4,1)],1:[(181,2,1)]}
ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 20 [200,600,1200,2000,3200,4800]
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
ElderBattlefieldExp {1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
new file mode 100644
index 0000000..9344f22
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -0,0 +1,134 @@
+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
diff --git a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
new file mode 100644
index 0000000..6bcce1d
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
@@ -0,0 +1,192 @@
+NPCID MapId Position
+10403001 10040 (29,147)
+10503001 10050 (63,56)
+10603001 10060 (86,197)
+10703001 10070 (19,210)
+10803001 10080 (61,61)
+10903001 10080 (117,136)
+20103001 21070 (15,37)
+20103002 21070 (138,39)
+20103003 21070 (42,74)
+20103004 21070 (106,69)
+20103005 21070 (13,104)
+20103006 21070 (138,105)
+20103007 21070 (76,112)
+20203001 21100 (167,75)
+20203002 21100 (69,91)
+20203003 21100 (34,61)
+20203004 21100 (139,103)
+20203005 21100 (32,128)
+20203006 21100 (154,146)
+20203007 21100 (79,187)
+20303001 21110 (132,55)
+20303002 21110 (132,128)
+20303003 21110 (94,14)
+20303004 21110 (97,166)
+20303005 21110 (52,37)
+20303006 21110 (51,144)
+20303007 21110 (17,92)
+31503001 31150 (174,85)
+31503002 31150 (142,115)
+31503003 31150 (102,133)
+31503004 31150 (88,82)
+31503005 31150 (40,107)
+31503006 31150 (155,194)
+31503007 31150 (101,207)
+31503008 31150 (51,171)
+31503009 31150 (137,255)
+10101001 10010 (205,104)
+10101002 10010 (171,107)
+10101003 10010 (133,103)
+10101004 10010 (120,56)
+10101005 10010 (81,52)
+10102001 10010 (81,15)
+10103001 10010 (43,14)
+10201001 10020 (193,33)
+10201002 10020 (147,19)
+10201003 10020 (155,66)
+10201004 10020 (168,117)
+10201005 10020 (118,135)
+10202001 10020 (57,110)
+10203001 10020 (20,53)
+10301001 10030 (59,15)
+10301002 10030 (54,65)
+10301003 10030 (106,69)
+10301004 10030 (106,120)
+10301005 10030 (61,120)
+10302001 10030 (15,114)
+10303001 10030 (21,160)
+10401001 10040 (161,21)
+10401002 10040 (144,70)
+10401003 10040 (203,94)
+10401004 10040 (197,160)
+10401005 10040 (151,154)
+10402001 10040 (104,147)
+10501001 10050 (86,14)
+10501002 10050 (46,19)
+10501003 10050 (18,55)
+10501004 10050 (32,86)
+10501005 10050 (74,100)
+10502001 10050 (101,66)
+10601001 10060 (85,21)
+10601002 10060 (50,19)
+10601003 10060 (35,52)
+10601004 10060 (20,108)
+10601005 10060 (71,96)
+10602001 10060 (91,150)
+10701001 10070 (28,20)
+10701002 10070 (19,54)
+10701003 10070 (69,57)
+10701004 10070 (70,106)
+10701005 10070 (104,148)
+10702001 10070 (62,174)
+10801001 10080 (120,76)
+10801002 10080 (110,104)
+10801003 10080 (57,109)
+10801004 10080 (20,81)
+10801005 10080 (21,38)
+10802001 10080 (61,19)
+10901001 10090 (163,26)
+10901002 10090 (108,25)
+10901003 10090 (110,77)
+10901004 10090 (66,77)
+10901005 10090 (66,131)
+10902001 10090 (65,177)
+11101001 10110 (110,65)
+11101002 10110 (109,109)
+11101003 10110 (64,110)
+11101004 10110 (24,110)
+11101005 10110 (22,62)
+11102001 10110 (22,20)
+20102001 21070 (49,38)
+20102002 21070 (108,39)
+20102003 21070 (14,73)
+20102004 21070 (138,72)
+20102005 21070 (44,107)
+20102006 21070 (109,105)
+20202001 21100 (71,53)
+20202002 21100 (124,63)
+20202003 21100 (39,90)
+20202004 21100 (166,108)
+20202005 21100 (56,132)
+20202006 21100 (129,143)
+20202007 21100 (93,150)
+20302001 21110 (131,94)
+20302002 21110 (93,56)
+20302003 21110 (93,126)
+20302004 21110 (51,70)
+20302005 21110 (51,112)
+20302006 21110 (18,60)
+20302007 21110 (18,122)
+3011 10010 (12,11)
+3021 10020 (6,51)
+3031 10030 (7,142)
+3041 10040 (55,130)
+3051 10050 (84,48)
+3061 10060 (99,168)
+3071 10070 (15,171)
+3081 10080 (76,40)
+3091 10090 (14,172)
+31702001 31170 (165,83)
+31702002 31170 (152,65)
+31703001 31170 (173,62)
+31704001 31170 (54,50)
+31704002 31170 (36,25)
+31704003 31170 (60,27)
+30301001 31020 (63,53)
+30301002 31030 (77,66)
+30303001 31020 (37,37)
+30303002 31020 (83,85)
+30303003 31020 (63,107)
+30303004 31020 (13,56)
+30303005 31020 (25,96)
+30303006 31020 (71,10)
+30303007 31020 (110,44)
+30303008 31030 (95,30)
+30303009 31030 (18,28)
+30303010 31030 (31,67)
+30303011 31030 (18,103)
+30303012 31030 (93,98)
+31903001 31240 (22,20)
+31903002 31240 (22,20)
+31903003 31240 (22,20)
+31903004 31240 (22,20)
+31903005 31240 (22,20)
+31903006 31240 (22,20)
+31903007 31240 (22,20)
+31903008 31240 (22,20)
+31903009 31240 (22,20)
+31903010 31240 (22,20)
+31903011 31240 (22,20)
+31903012 31240 (22,20)
+31903013 31240 (22,20)
+31501001 31150 (126,76)
+31501002 31150 (121,114)
+31501003 31150 (101,105)
+31501004 31150 (60,134)
+31501005 31150 (170,157)
+31501006 31150 (170,157)
+31501007 31150 (116,169)
+31501008 31150 (43,203)
+31501009 31150 (131,222)
+31403001 31140 (14,15)
+60203001 52020 (16,19)
+60203002 52020 (16,19)
+60203003 52020 (16,19)
+60203004 52010 (16,19)
+60203005 52010 (16,19)
+60203006 52010 (16,19)
+60203007 52010 (16,19)
+60203008 52010 (16,19)
+60203009 52010 (16,19)
+60203010 52010 (16,19)
+60203011 52010 (16,19)
+60203012 52010 (16,19)
+60203013 52010 (16,19)
+60203014 52010 (16,19)
+60203015 52010 (16,19)
+60203016 52010 (16,19)
+60203017 52010 (16,19)
+60203018 52010 (16,19)
+60203019 52010 (16,19)
+60203020 52010 (16,19)
--
Gitblit v1.8.0