From d3bc28c485dba986bba792694bdf28b810e8af3e Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期一, 26 十一月 2018 10:53:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagStore.txt | 8 ++++++++
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 10 +++++-----
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 8 ++++++++
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index cfb1364..ad13f3a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -120,9 +120,17 @@
552 12 0 0
553 12 0 0
554 12 0 0
+555 12 0 0
+556 12 0 0
+557 12 0 0
+558 12 0 0
+559 12 0 0
+560 12 0 0
561 13 0 0
562 13 0 0
563 13 0 0
+581 12 0 0
+582 12 0 0
651 14 0 0
652 14 0 0
653 14 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index 6a54ca5..66a5f91 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -110,7 +110,7 @@
31401006 0 2 0 600 10000 0 8000 3 9900 50 12 0 0 0 0
31403006 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
31401007 0 2 0 1000 10000 0 8000 3 9900 50 12 0 0 0 0
-31403007 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0
+31403007 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
31401008 0 2 0 500 10000 0 8000 3 9900 50 12 0 0 0 0
31403008 0 2 0 2000 10000 0 8000 3 9900 50 1 0 0 50 0
31401009 0 2 0 3000 10000 0 8000 3 9900 50 12 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 617218b..a008eb0 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -120,9 +120,17 @@
552 12 0 4389 1 1 [] 0 0 0 0 0 0 25 120 0 0 ShopBuyBroadcast_2
553 12 0 4379 1 1 [] 0 0 0 0 0 0 25 120 0 0 ShopBuyBroadcast_2
554 12 0 4374 1 1 [] 0 0 0 0 0 0 25 120 0 0 ShopBuyBroadcast_2
+555 12 0 4430 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+556 12 0 4435 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+557 12 0 4440 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+558 12 0 4445 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+559 12 0 4429 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
+560 12 0 4434 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
561 13 0 4606 1 0 [] 0 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2
562 13 0 4608 1 0 [] 0 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2
563 13 0 912 1 0 [] 0 0 0 0 0 0 25 100 0 0 ShopBuyBroadcast_2
+581 12 0 4439 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
+582 12 0 4444 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 0 1 188 500 0 Bargaingift1
652 14 0 4208 1 1 [[4151,50,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 0 1 388 1200 0 Bargaingift2
653 14 0 255 1 1 [[196,1,1],[181,80,1],[913,1,1]] 255 0 0 0 1 0 1 1088 2780 0 Bargaingift3
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index ed9d575..c3d540c 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,9 +1,9 @@
TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
-1 0 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 180 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 230 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 260 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 300 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,3],"10":[4609,1],"11":[107,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 0 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1157,2),(2305,3),(3452,4),(3552,5),(4700,6),(5847,7),(5947,8),(7095,9),(7495,10),(8642,11),(8652,12),(9800,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 180 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1321,2),(2632,3),(3944,4),(4044,5),(5355,6),(5555,7),(5655,8),(6967,9),(7167,10),(8478,11),(8488,12),(9800,13),(10000,14)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 230 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 260 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 300 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,3],"10":[4609,1],"11":[107,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,12],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4385,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,12],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4360,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
2 250 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4380,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 3ec3888..79c54f4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -624,7 +624,7 @@
23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 10000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23043 新冰晶矿脉5层减攻 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
23044 新冰晶矿脉6层加攻 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 3 0 10 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
-23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 500 500 5 2103 31403007 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 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
+23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 200 0 5 2103 31403007 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 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
23046 新冰晶矿脉8层沉默 23046 1 1 0 0 2000 1 0 0 2 5 41 6 0 60000 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 23050 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
23050 沉默 23050 1 1 0 5 0 14 0 0 1 0 41 0 0 0 0 0 0 0 0 4012 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 8000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0
23100 复仇之刃（1层） 23100 1 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 1000 3 0 10 1000 3 0 7 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
--
Gitblit v1.8.0