From e8a0943dfc5936280d4ce5b49d366597b44a1797 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 八月 2018 15:48:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 14 +++++++-------
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 8 ++++----
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 14 +++++++-------
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index 249dec5..90f87e3 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -71,9 +71,9 @@
4655 2 99 675
4687 2 99 1250
4688 2 99 10625
-4676 2 5 10625
-4677 2 5 10625
-4660 2 50 2875
-4661 2 50 3000
4691 2 99 750
4692 2 99 1375
+4660 2 50 2875
+4661 2 50 3000
+4676 2 5 10625
+4677 2 5 10625
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index bfb51ea..52d6cff 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -210,7 +210,7 @@
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}
DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251
DropRecordBossID 10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007
-PKConfig [[22,00], [8,00]] 50 10 10 130
+PKConfig [[22,00], [8,00]] 50 10 10 100
FamilyKilledNotify {1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
BossHurtValue 30 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 0f211fc..dbb907b 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -222,10 +222,10 @@
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]
-50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:250000,4253:1000000,4151:1000000,2349:1000000,2379:1000000} {4253:5,4151:38,2379:4} {} {} {} 0 0 0 0 [] [1023]
-50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,224:1000000,181:1000000,2350:1000000,2380:1000000} {224:5,181:45,2380:5} {} {} {} 0 0 0 0 [] [1023]
-50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:125000,4252:1000000,4151:1000000,2349:1000000,2379:1000000} {4252:5,4151:45,2379:5} {} {} {} 0 0 0 0 [] [1023]
-50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2350:1000000,2380:1000000} {222:5,181:52,2350:2,2380:6} {} {} {} 0 0 0 0 [] [1023]
-50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2349:1000000,2379:1000000} {4250:5,4151:52,2349:2,2379:6} {} {} {} 0 0 0 0 [] [1023]
-50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2350:1000000,2380:1000000} {223:5,181:56,2350:2,2380:8} {} {} {} 0 0 0 0 [] [1023]
-50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2349:1000000,2379:1000000} {4251:5,4151:56,2349:2,2379:8} {} {} {} 0 0 0 0 [] [1023]
+50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:250000,4253:1000000,4151:1000000,2379:1000000} {4253:5,4151:30,2379:2} {} {} {} 0 0 0 0 [] [1023]
+50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,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:125000,4252:1000000,4151:1000000,2379:1000000} {4252:5,4151:40,2379:3} {} {} {} 0 0 0 0 [] [1023]
+50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2380:1000000} {222:5,181:50,2380:5} {} {} {} 0 0 0 0 [] [1023]
+50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2379:1000000} {4250:5,4151:50,2379:5} {} {} {} 0 0 0 0 [] [1023]
+50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2380:1000000} {223:5,181:60,2380:6} {} {} {} 0 0 0 0 [] [1023]
+50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2379:1000000} {4251:5,4151:60,2379:6} {} {} {} 0 0 0 0 [] [1023]
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index 72509ae..3b713cf 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -91,10 +91,10 @@
61203006 1 0 0 0 0 0 0 0 0 0 0 0 0 0
61203007 1 0 0 0 0 0 0 0 0 0 0 0 0 0
61203008 1 0 0 0 0 0 0 0 0 0 0 0 0 0
-30903001 0 3 330000 10000 0 8000 2 9900 50 1 0 0 510 0
-30903001 0 3 360000 10000 0 8000 2 9900 50 1 0 0 480 0
-30903001 0 3 390000 10000 0 8000 2 9900 50 1 0 0 450 0
-30903001 0 3 420000 10000 0 8000 2 9900 50 1 0 0 420 0
-30903001 0 3 450000 10000 0 8000 2 9900 50 1 0 0 390 0
-30903001 0 3 480000 10000 0 8000 2 9900 50 1 0 0 360 0
-30903001 0 3 510000 10000 0 8000 2 9900 50 1 0 0 330 0
+30903001 0 3 874300 10000 0 8000 2 9900 50 1 0 0 1311 0
+30903001 0 3 947200 10000 0 8000 2 9900 50 1 0 0 1238 0
+30903001 0 3 1020100 10000 0 8000 2 9900 50 1 0 0 1165 0
+30903001 0 3 1092900 10000 0 8000 2 9900 50 1 0 0 1092 0
+30903001 0 3 1165800 10000 0 8000 2 9900 50 1 0 0 1020 0
+30903001 0 3 1238700 10000 0 8000 2 9900 50 1 0 0 947 0
+30903001 0 3 1311500 10000 0 8000 2 9900 50 1 0 0 874 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index cc5012b..610f969 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -462,8 +462,8 @@
2376 1 0 九黎妖虎伤害礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 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
2377 1 0 九黎妖虎伤害礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 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
2378 1 0 九黎妖虎伤害礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 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
-2379 1 0 灵宠养成袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 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
-2380 1 0 坐骑养成袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 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
+2379 1 0 小型灵宠养成袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 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
+2380 1 0 小型坐骑养成袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 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
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