From 9c7a9012042ec704b196520ebfe0625d74d68b2b Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 23 八月 2018 15:45:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 28 ++++++++++++++--------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 07497fe..103c609 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/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index 232f5f1..173bc1c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1f00cf4..5355f4c 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -231,7 +231,7 @@
SealDemonNewbieLine 0|1|2
SealDemonDoubleDrop 0 1|2|3|4|5|6|7 2
SealDemonFirstPos [20,16]
-UnblockTreasure 101|102|103
+UnblockTreasure 101|102|103 {104:'UnblockTreasure'}
MWSignDayAttr {"7":100} 304
DiceReward {"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,0]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,1]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"4":{"exp":"360*reExp","gold":500000,"item":[2211,3]},"5":{"exp":"360*reExp","gold":500000,"item":[2211,4]},"6":{"exp":"720*reExp","gold":1000000,"item":[2211,8]}}
DiceFreeNum 5
@@ -281,4 +281,4 @@
CeremonyRecharge {"0":[[1,10,1],[2,10,1],[3,10,1]],"1":[[1,10,1],[2,10,1],[3,10,1]],"2":[[1,10,1],[2,10,1],[3,10,1]]}
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
-TJDropTaskItem {20007:[120,1104,100,'killCnt']}
+TJDropTaskItem {20007:[120,1101,100,'killCnt']}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index c50dd66..ab0fd89 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -103,20 +103,20 @@
651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 1 188 0 0 ShopBuyBroadcast_1
652 14 0 4208 1 1 [[4151,60,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 1 388 0 0 ShopBuyBroadcast_1
653 14 0 255 1 1 [[196,1,1],[181,140,1],[913,1,1]] 255 0 0 0 1 1 1088 0 0 ShopBuyBroadcast_1
-701 15 0 4151 40 1 [] 0 0 0 106 1 1 88 400 1 OpenTakePreferential1
-702 15 0 4182 1 1 [[4151,80,1]] 4182 0 0 106 1 1 288 900 1 OpenTakePreferential2
-703 15 0 181 40 1 [] 0 0 0 106 1 1 88 400 2 OpenTakePreferential1
-704 15 0 4609 1 1 [[181,80,1]] 4609 0 0 106 1 1 288 850 2 OpenTakePreferential2
-705 15 0 3 8 1 [] 0 0 0 106 1 1 88 400 3 OpenTakePreferential1
-706 15 0 913 1 1 [[5,3,1]] 913 0 0 106 1 1 288 870 3 OpenTakePreferential2
-707 15 0 3514 2 1 [] 3514 0 0 106 1 1 88 540 4 OpenTakePreferential1
-708 15 0 3514 3 1 [[913,1,1]] 3514 0 0 106 1 1 288 930 4 OpenTakePreferential2
-709 15 0 30 400 1 [] 30 0 0 106 1 1 88 400 5 OpenTakePreferential1
-710 15 0 30 800 1 [] 30 0 0 106 1 1 288 800 5 OpenTakePreferential2
-711 15 0 2321 15 1 [] 0 0 0 106 1 1 88 450 6 OpenTakePreferential1
-712 15 0 913 1 1 [[2321,30,1]] 913 0 0 106 1 1 288 1020 6 OpenTakePreferential2
-713 15 0 4151 40 1 [] 0 0 0 106 1 1 88 400 7 OpenTakePreferential1
-714 15 0 4681 1 1 [[4151,80,1]] 4681 0 0 106 1 1 288 800 7 OpenTakePreferential2
+701 15 0 912 1 1 [[105,8,1]] 912 0 0 106 1 1 88 390 1 OpenTakePreferential1
+702 15 0 4185 1 1 [] 4185 0 0 106 1 1 288 800 1 OpenTakePreferential2
+703 15 0 181 38 1 [] 0 0 0 106 1 1 88 380 2 OpenTakePreferential1
+704 15 0 181 100 1 [] 4609 0 0 106 1 1 288 1000 2 OpenTakePreferential2
+705 15 0 4 3 1 [] 4 0 0 106 1 1 88 240 3 OpenTakePreferential1
+706 15 0 5 5 1 [[912,1,1]] 5 0 0 106 1 1 288 700 3 OpenTakePreferential2
+707 15 0 3513 2 1 [[3503,2,1]] 3513 0 0 106 1 1 88 360 4 OpenTakePreferential1
+708 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 1 288 1080 4 OpenTakePreferential2
+709 15 0 912 1 1 [[30,100,1]] 912 0 0 106 1 1 88 250 5 OpenTakePreferential1
+710 15 0 913 1 1 [[30,388,1]] 913 0 0 106 1 1 388 888 5 OpenTakePreferential2
+711 15 0 2213 20 1 [] 0 0 0 106 1 1 88 250 6 OpenTakePreferential1
+712 15 0 1128 1 1 [[2213,60,1]] 1128 0 0 106 1 1 388 1000 6 OpenTakePreferential2
+713 15 0 30 388 1 [] 0 0 0 106 1 1 188 388 7 OpenTakePreferential1
+714 15 0 4606 1 1 [[4608,1,1]] 4606 0 0 106 1 1 688 2000 7 OpenTakePreferential2
751 16 1 30 500 1 [] 30 0 0 0 1 1 188 500 0 LimitGift6
752 17 1 4151 60 1 [] 4151 0 0 0 1 1 188 600 0 LimitGift6
753 18 1 181 40 1 [] 181 0 0 0 1 1 188 600 0 LimitGift6
--
Gitblit v1.8.0