From 8f121182278b9f18df551363f04c5a30b724ae1e Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 14 一月 2019 20:02:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/PySysDB/tagCollectNPC.txt | 5 +++++
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 2 +-
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddCrossRealmPKCnt.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 1 +
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc | 0
db/PyMongoDataServer/PySysDB/tagChests.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 5 +++--
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
34 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 2c708e5..f9c783f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -16,7 +16,7 @@
16 1 7 0
17 0 0 0
18 0 0 0
-19 1 0
+19 1 7 0
51 2 0 0
52 2 0 0
53 2 0 0
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index 82266a1..7d4ab8c 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 19d78fb..a4227c7 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 6bd784b..30f07a5 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc
index c3ac379..7966cdc 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index 2cb41f4..2599bbf 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 5beab22..23ddf26 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index f506113..72416cc 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
index d9fe49a..af73834 100644
--- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index 487eef2..67ad2a0 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index 69cf901..8d00335 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 134ab8f..0e653e4 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 50c66a6..f6cd65c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index a4fc8ad..e78a9cc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 2a70576..5284407 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc
index 7146306..3079a85 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc
index 80b0c4d..e24eef2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index c8ccd74..b705932 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
index dfddeb8..19bd569 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddCrossRealmPKCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddCrossRealmPKCnt.pyc
new file mode 100644
index 0000000..474974f
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddCrossRealmPKCnt.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc
index 7889a88..94f49a1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc
index 96ed1b9..b92e8f3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 3544d04..98a9346 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
index 6a74db9..f120b3f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
index 7dc5870..dfa6891 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc
new file mode 100644
index 0000000..468d511
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc
new file mode 100644
index 0000000..fb57087
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index f80e3ae..61a3e2a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 17731dd..84900f9 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -220,3 +220,4 @@
2428 0 0 0 1 0
2429 0 0 0 1 0
2430 0 0 0 1 0
+2431 0 0 888 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 2e10374..a2dddad 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -207,13 +207,14 @@
2418 103_4
2419 103_35
2420 4151_20
-2421 4151_200
+2421 4151_200|2431_1
2422 [[800,[8209,1]],[1600,[8222,1]],[2400,[8235,1]],[3200,[8248,1]],[4000,[8261,1]],[4600,[8210,1]],[5200,[8223,1]],[5800,[8236,1]],[6400,[8249,1]],[7000,[8262,1]],[7600,[8211,1]],[8200,[8224,1]],[8800,[8237,1]],[9400,[8250,1]],[10000,[8263,1]]] 1 [8209,8222,8235,8248,8261,8210,8223,8236,8249,8262,8211,8224,8237,8250,8263]
2423 [[25,[3804,1]],[125,[3803,1]],[275,[5408,1]],[285,[5409,1]],[335,[4607,1]],[435,[4606,1]],[585,[2348,1]],[605,[2425,1]],[1405,[7105,5]],[1905,[5303,60]],[2405,[5412,10]],[3605,[8353,6]],[5200,[2324,2]],[6400,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 {2:[[10000,[2348,1]]],8:[[10000,[4607,1]]],20:[[10000,[5408,1]]]} [3804,3803,5408,5409,4607,4606,2348,2425]
2424 4184_2|1025_15|952_3|913_1 [913]
2425 7110_1|7115_1|7120_1|7125_1 [7110,7115,7120,7125]
2426 [[1300,[2107,3]],[1500,[2389,1]],[1600,[5410,1]],[1800,[181,10]],[2000,[4151,10]],[2100,[14,1]],[3000,[101,5]],[5000,[181,1]],[7000,[4151,1]],[10000,[5303,10]]] 1 [2107,2389,5410]
-2427 [[1300,[2107,3]],[1500,[2389,1]],[1700,[2390,1]],[1900,[5410,1]],[2100,[5411,1]],[2500,[14,3]],[3000,[103,1]],[5000,[181,5]],[7000,[4151,5]],[10000,[5303,50]]] [2107,2389,2390,5410,5411]
+2427 [[1300,[2107,3]],[1500,[2389,1]],[1700,[2390,1]],[1900,[5410,1]],[2100,[5411,1]],[2500,[14,3]],[3000,[103,1]],[5000,[181,5]],[7000,[4151,5]],[10000,[5303,50]]] 1 [2107,2389,2390,5410,5411]
2428 8353_1 [[680,[8202,1]],[1361,[8215,1]],[2042,[8228,1]],[2723,[8241,1]],[3404,[8254,1]],[4000,[8203,1]],[4595,[8216,1]],[5191,[8229,1]],[5787,[8242,1]],[6382,[8255,1]],[6808,[8204,1]],[7234,[8217,1]],[7659,[8230,1]],[8085,[8243,1]],[8510,[8256,1]],[8600,[8205,1]],[8689,[8218,1]],[8778,[8231,1]],[8868,[8244,1]],[8957,[8257,1]],[9136,[8206,1]],[9314,[8219,1]],[9493,[8232,1]],[9672,[8245,1]],[9851,[8258,1]],[9880,[8207,1]],[9910,[8220,1]],[9940,[8233,1]],[9970,[8246,1]],[10000,[8259,1]]] [[3000,4],[10000,5]] [[663,[8354,1]],[2164,[8209,1]],[3666,[8222,1]],[5167,[8235,1]],[6669,[8248,1]],[8170,[8261,1]],[8337,[8210,1]],[8504,[8223,1]],[8671,[8236,1]],[8838,[8249,1]],[9004,[8262,1]],[9203,[8211,1]],[9402,[8224,1]],[9601,[8237,1]],[9800,[8250,1]],[10000,[8263,1]]] [[6985,0],[10000,1]] {1:[[2000,[8209,1]],[4000,[8222,1]],[6000,[8235,1]],[8000,[8248,1]],[10000,[8261,1]]]} [8209,8222,8235,8248,8261,8210,8223,8236,8249,8262,8211,8224,8237,8250,8263]
2429 [[2000,[8352,1]],[2560,[8202,1]],[3120,[8215,1]],[3680,[8228,1]],[4240,[8241,1]],[4800,[8254,1]],[5290,[8203,1]],[5780,[8216,1]],[6270,[8229,1]],[6760,[8242,1]],[7250,[8255,1]],[7600,[8204,1]],[7950,[8217,1]],[8300,[8230,1]],[8650,[8243,1]],[9000,[8256,1]],[9060,[8205,1]],[9120,[8218,1]],[9180,[8231,1]],[9240,[8244,1]],[9300,[8257,1]],[9420,[8206,1]],[9540,[8219,1]],[9660,[8232,1]],[9780,[8245,1]],[9900,[8258,1]],[9920,[8207,1]],[9940,[8220,1]],[9960,[8233,1]],[9980,[8246,1]],[10000,[8259,1]]] 1
2430 8353_2 [[640,[8202,1]],[1280,[8215,1]],[1920,[8228,1]],[2560,[8241,1]],[3200,[8254,1]],[3760,[8203,1]],[4320,[8216,1]],[4880,[8229,1]],[5440,[8242,1]],[6000,[8255,1]],[6400,[8204,1]],[6800,[8217,1]],[7200,[8230,1]],[7600,[8243,1]],[8000,[8256,1]],[8120,[8205,1]],[8240,[8218,1]],[8360,[8231,1]],[8480,[8244,1]],[8600,[8257,1]],[8840,[8206,1]],[9080,[8219,1]],[9320,[8232,1]],[9560,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 5 [[1762,[8354,1]],[2960,[8209,1]],[4157,[8222,1]],[5354,[8235,1]],[6551,[8248,1]],[14578,[8261,1]],[7881,[8210,1]],[8014,[8223,1]],[8147,[8236,1]],[8280,[8249,1]],[15829,[8262,1]],[8730,[8211,1]],[9047,[8224,1]],[9365,[8237,1]],[9682,[8250,1]],[18814,[8263,1]]] [[4328,0],[10000,1]] {2:[[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]],5:[[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]],8:[[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]]} [8209,8222,8235,8248,8261,8210,8223,8236,8249,8262,8211,8224,8237,8250,8263]
+2431 4151_200
diff --git a/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
new file mode 100644
index 0000000..a1dc5b6
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
@@ -0,0 +1,5 @@
+NPCID PrepareTime LostHPPer CollectCount CollectCountLimitNotify CollectAward
+20302001 10 2_2 0 DogzSmallTreasureLimit [2388,1,1]
+20302002 30 2_4 2 DogzBigTreasureLimit [2387,1,1]
+40108001 10 2_2 0 DogzSmallTreasureLimit [2388,1,1]
+40108002 30 2_4 2 DogzBigTreasureLimit [2387,1,1]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 72a1aa8..8082278 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -276,6 +276,7 @@
XMZZRobot [30403002,30403003,30403004] 30403001
XMZZRobotSkill {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
XMZZPKAward [0,10,20,30,40,50,60,70,80,90] addPer+100 + int(math.ceil(HPPer/10.0)) 50 reExp*216*(100+addPer)/100 reExp*108
+CollectNPC [[20302002, 40108002],[20302001, 40108001]]
PayRMB 10
OSCBillboardOpen {"2":[20,1,2],"8":[50,3,3],"10":[20,4,4],"3":[12,5,5],"7":[50,6,6],"6":[1200000,7,7]} 10
OSCRankRedpackAward {1:80,(2,5):81}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 7089197..fd733d1 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -16,7 +16,7 @@
16 1 0 2413 1 1 [] 0 7 0 110 2 0 1 60 0 0
17 0 0 0 0 0 [] 0 0 0 0 0 0 0 0 0 0
18 0 0 0 0 0 [] 0 0 0 0 0 0 0 0 0 0
-19 1 0 2430 0 320 4 0 1 240 0 0
+19 1 0 2430 1 1 [] 0 7 0 320 4 0 1 240 0 0
51 2 0 3796 1 0 [] 0 0 0 0 0 0 1 280 0 0
52 2 0 3797 1 0 [] 0 0 0 0 0 0 1 280 0 0
53 2 0 4101 1 0 [] 0 0 0 0 0 0 1 380 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 8bed0e3..beb8815 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -321,6 +321,7 @@
1503 1 0 娲皇卷轴 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 10 0 1 0 0 233 51010 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
1504 1 0 矿脉钥匙 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31140 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
1505 1 0 秘境地图 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31080 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
+1506 1 0 跨服匹配挑战券 127 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 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
1600 1 0 后羿之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 236 111 250 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
1650 1 0 贵族气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1651 1 0 至尊气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 2 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
@@ -627,6 +628,7 @@
2428 1 0 远古神兽大宝箱 81 0 0 0 0 999 260 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 2 0 0 0 0 0 0 0 0
2429 1 0 精巧神兽小宝箱 81 0 0 0 0 999 260 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 20 0 0 0 0 0 0 0 0
2430 1 0 高级神兽祝福宝箱 81 0 0 0 0 999 260 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
+2431 1 0 灵宠丹超值礼包 81 0 0 0 0 999 260 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
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 600 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 840 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 1080 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