From bb2c35a6128b14832d022653196db757cbdd8c34 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 21 九月 2018 21:13:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagChests.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 ++
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt | 14 +++++++-------
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 24 ++++++++++++------------
7 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
index b27043d..85bb987 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
@@ -2,12 +2,12 @@
#{职业:[等级]}
(
{
- 0:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 1:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 2:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 3:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 4:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 5:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 6:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 0:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,265,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 1:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,265,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 2:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,265,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 3:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,265,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 4:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,265,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 5:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,265,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 6:[70,80,95,100,105,110,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,265,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
}
)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 56d487e..10b7919 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/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index f0f2b9f..a4f8176 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 076b016..0b92739 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -174,3 +174,5 @@
2384 0 0 0 1 0
2385 0 0 0 1 0
2386 0 0 0 1 0
+2387 0 0 0 1 1
+2388 0 0 0 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 8701f58..c8026af 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -171,3 +171,5 @@
2384 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4250,1]]] [[9000,0],[10000,1]] [4250]
2385 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1 [[10000,[223,1]]] [[9000,0],[10000,1]] [223]
2386 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4251,1]]] [[9000,0],[10000,1]] [4251]
+2387 0 8353_1 [[57,[8204,1]],[114,[8217,1]],[171,[8230,1]],[228,[8243,1]],[285,[8256,1]],[513,[8203,1]],[741,[8216,1]],[969,[8229,1]],[1197,[8242,1]],[1425,[8255,1]],[3139,[8202,1]],[4853,[8215,1]],[6567,[8228,1]],[8281,[8241,1]],[10000,[8254,1]]] 3 [[38,[8207,1]],[76,[8220,1]],[114,[8233,1]],[152,[8246,1]],[190,[8259,1]],[536,[8206,1]],[882,[8219,1]],[1228,[8232,1]],[1574,[8245,1]],[1920,[8258,1]],[3458,[8205,1]],[4996,[8218,1]],[6534,[8231,1]],[8072,[8244,1]],[9610,[8257,1]],[10000,[8354,1]]] 1 [8206,8219,8232,8245,8258,8207,8220,8233,8246,8259]
+2388 0 [[2000,[8201,1]],[4000,[8214,1]],[6000,[8227,1]],[8000,[8240,1]],[10000,[8253,1]]] 3 [[28,[8204,1]],[56,[8217,1]],[84,[8230,1]],[112,[8243,1]],[140,[8256,1]],[397,[8203,1]],[654,[8216,1]],[911,[8229,1]],[1168,[8242,1]],[1425,[8255,1]],[2567,[8202,1]],[3709,[8215,1]],[4851,[8228,1]],[5993,[8241,1]],[7135,[8254,1]],[10000,[8252,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index eb23508..124e4a5 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -210,18 +210,18 @@
30603002 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30603003 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30603004 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
-20302003 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:100000,2001:50000,2002:10000} {} {} 0 0 0 0 [] []
-20302004 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:100000,2001:50000,2002:10000} {} {} 0 0 0 0 [] []
-20302005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:100000,2001:50000,2002:10000} {} {} 0 0 0 0 [] []
-20302006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:100000,2001:50000,2002:10000} {} {} 0 0 0 0 [] []
-20302007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:100000,2001:50000,2002:10000} {} {} 0 0 0 0 [] []
-20303001 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:3000000,2000:1000000,2001:200000,2002:40000,3001:800000,3002:160000,3003:32000} {} {} 25 800 1123 1685 [] [958]
-20303002 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:4000000,2000:1200000,2001:200000,2002:40000,3001:850000,3002:170000,3003:34000} {} {} 25 800 1123 1685 [] [958]
-20303003 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:1400000,2001:200000,2002:40000,3001:900000,3002:180000,3003:36000,4001:500000,4002:100000,4003:20000} {} {} 25 800 1129 1694 [] [958]
-20303004 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:1600000,2001:200000,2002:40000,3001:950000,3002:190000,3003:38000,4001:550000,4002:110000,4003:22000} {} {} 25 800 1129 1694 [] [958]
-20303005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:1800000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:600000,4002:120000,4003:24000,5002:80000} {} {} 25 800 1129 1694 [] [958]
-20303006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:650000,4002:130000,4003:26000,5002:100000} {} {} 25 800 1356 1824 [] [958]
-20303007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:700000,4002:140000,4003:28000,5002:120000} {} {} 25 800 1356 1824 [] [958]
+20302003 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:80000,2001:20000,2002:0} {} {} 0 0 0 0 [] []
+20302004 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:80000,2001:20000,2002:0} {} {} 0 0 0 0 [] []
+20302005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:80000,2001:20000,2002:0} {} {} 0 0 0 0 [] []
+20302006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:80000,2001:20000,2002:0} {} {} 0 0 0 0 [] []
+20302007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:500000,2000:80000,2001:20000,2002:0} {} {} 0 0 0 0 [] []
+20303001 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000} {} {} 25 800 1123 1685 [] [958]
+20303002 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000} {} {} 25 800 1123 1685 [] [958]
+20303003 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000} {} {} 25 800 1129 1694 [] [958]
+20303004 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000} {} {} 25 800 1129 1694 [] [958]
+20303005 0 0 0 0 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,102):1000000,(7,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000} {} {} 25 800 1129 1694 [] [958]
+20303006 0 0 0 0 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,102):1000000,(7,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000} {} {} 25 800 1356 1824 [] [958]
+20303007 0 0 0 0 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,102):1000000,(7,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000} {} {} 25 800 1356 1824 [] [958]
50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:62500,4253:1000000,4151:1000000,2379:1000000} {4253:3,4151:30,2379:2} {} {} {} 0 0 0 0 [] [1023]
50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:31250,224:1000000,181:1000000,2380:1000000} {224:5,181:40,2380:3} {} {} {} 0 0 0 0 [] [1023]
50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:31250,4252:1000000,4151:1000000,2379:1000000} {4252:5,4151:40,2379:3} {} {} {} 0 0 0 0 [] [1023]
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 8d0fe45..c74ba25 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -491,6 +491,8 @@
2384 1 0 冰火冥魂碎片袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2385 1 0 八宝葫芦碎片袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2386 1 0 九黎妖虎碎片袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2387 1 0 神兽大宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2388 1 0 神兽小宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0