From 30c154ae256357bce2794fee2f175b970f8b0138 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 31 八月 2018 14:57:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagChests.txt | 4 +++-
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 6 ++++--
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 8 +++++---
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt | 1 +
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 14 +++++++-------
7 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index a84b51e..13af234 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -27,7 +27,7 @@
74 110 0 0
75 72 0 0
76 0 10301 0
-77 80 0 0
+77 98 0 0
78 60 0 0
79 2 0 0
80 36 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index e480efb..f44fc2b 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -128,7 +128,7 @@
2338 0 0 0 1 0
2339 0 0 0 0 1
2340 0 0 0 1 1
-2341 0 0 0 1 1
+2341 0 0 0 0 1
2342 0 0 0 0 1
2343 0 0 0 1 1
2344 0 0 0 1 1
@@ -166,3 +166,5 @@
2376 0 0 0 1 0
2377 0 0 0 1 0
2378 0 0 0 1 0
+2379 0 0 0 1 0
+2380 0 0 0 1 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 0bcd34e..cc1e494 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -133,8 +133,8 @@
2346 0 [[5000,[3504,1]],[10000,[3514,1]]] 1
2347 0 [[5000,[3505,1]],[10000,[3515,1]]] 1
2348 0 [[5000,[3506,1]],[10000,[3516,1]]] 1
-2349 0 [[3000,[181,10]],[5000,[181,11]],[7000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
-2350 0 [[3000,[4151,10]],[5000,[4151,11]],[7000,[4151,12]],[8000,[4151,13]],[9000,[4151,14]],[10000,[4151,15]]] 1
+2349 0 [[3000,[4151,10]],[5000,[4151,11]],[7000,[4151,12]],[8000,[4151,13]],[9000,[4151,14]],[10000,[4151,15]]] 1
+2350 0 [[3000,[181,10]],[5000,[181,11]],[7000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
2351 0 4151_5 [[10000,[4253,1]]] [[9900,0],[10000,1]]
2352 0 4151_10 [[10000,[4253,1]]] 1
2353 0 4151_10 [[10000,[4253,1]]] [[5000,0],[10000,1]]
@@ -163,3 +163,5 @@
2376 0 4151_10 [[10000,[4251,1]]] 1
2377 0 4151_10 [[10000,[4251,1]]] [[5000,0],[10000,1]]
2378 0 4151_10 [[10000,[4251,1]]] [[7500,0],[10000,1]]
+2379 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1
+2380 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
index 0b13c9d..93c25e4 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
@@ -69,6 +69,7 @@
7 2 0 60321 24938 61051 6105 58581 85362 41006 8977 4147 1025 103 103 7988 51 206 206 8573 11716 10129 16451 171 33251
7 3 0 75450 29327 65877 6587 69966 103248 48976 10557 5223 1125 131 131 9540 56 262 262 10298 13993 11448 19203 218 39103
7 3 1 102001 39136 71790 7179 89603 132600 62722 14088 6553 1250 174 174 12218 62 348 348 13969 17920 13266 25474 290 52181
+7 4 0 226146 70591 87166 8716 189038 325604 132326 25412 11288 1500 274 274 25777 75 548 548 23397 37807 18565 47149 456 94121
7 4 1 226146 70591 87166 8716 189038 325604 132326 25412 11288 1500 274 274 25777 75 548 548 23397 37807 18565 47149 456 94121
7 4 2 471341 117225 99362 9936 283560 619528 198492 42201 17260 1750 397 397 38667 87 794 794 35129 56712 21660 80780 661 156301
7 5 1 664597 158721 104435 10443 397894 838888 278525 57139 19959 1875 432 432 54258 93 864 864 44395 79579 22829 111489 720 211629
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index ec23044..31d70cd 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -27,7 +27,7 @@
74 110 0 0 0
75 72 0 0 0
76 0 10301 0 0
-77 80 0 0 0
+77 98 0 0 0
78 60 0 0 0
79 2 0 0 0
80 36 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index ea3c93c..0f211fc 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} {4253:5,4151:50} {} {} {} 0 0 0 0 [] [1023]
-50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,224:1000000,181:1000000,2350:1000000} {224:5,181:60} {} {} {} 0 0 0 0 [] [1023]
-50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:125000,4252:1000000,4151:1000000,2349:1000000} {4252:5,4151:60} {} {} {} 0 0 0 0 [] [1023]
-50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2350:1000000} {222:5,181:70,2350:2} {} {} {} 0 0 0 0 [] [1023]
-50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2349:1000000} {4250:5,4151:70,2349:2} {} {} {} 0 0 0 0 [] [1023]
-50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2350:1000000} {223:5,181:80,2350:2} {} {} {} 0 0 0 0 [] [1023]
-50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2349:1000000} {4251:5,4151:80,2349:2} {} {} {} 0 0 0 0 [] [1023]
+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]
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 77bc32c..cc5012b 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -462,6 +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
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
@@ -504,9 +506,9 @@
3806 12 0 翅膀5代材料2 39 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 41750 0 50 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 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3807 1 0 初级翅膀精炼石 52 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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
3808 1 0 高级翅膀精炼石 52 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1000 0 50 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
-3901 1 0 仙盟兽粮 50 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 5 0 1 0 0 0 100 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-3902 1 0 仙盟贡献 50 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 5 0 0 0 0 0 100 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-3903 1 0 仙盟活跃令 50 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 5 0 0 0 0 0 100 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+3901 1 0 仙盟兽粮 50 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+3902 1 0 仙盟贡献 50 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+3903 1 0 仙盟活跃令 50 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3904 1 0 6000仙盟贡献 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 209 6000 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
4001 0 0 仙界秘境通行证 15 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 50 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
4002 0 0 试炼秘令 44 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 15 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0