From cd7cc43ef48a25c3ccdc0e2d6d344e395d774cd6 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期二, 15 一月 2019 11:47:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCollectNPC.txt | 4 ++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
index c5f5ba6..9c2c32b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
@@ -33,3 +33,5 @@
135 {'ItemType':[25]}
136 {'ItemType':[45]}
137 {'ItemType':[9,58,54]}
+138 {'ItemType':[82]}
+139 {'ItemType':[83]}
diff --git a/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
index 33be8a6..f622cb8 100644
--- a/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
@@ -1,5 +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]
+40108001 10 2|2 0 DogzSmallTreasureLimit [2429,1,1]
+40108002 30 2|4 2 DogzBigTreasureLimit [2428,1,1]
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 4f879d5..09f9317 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -627,7 +627,7 @@
2427 1 0 巡礼豪华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 120 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
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
+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 2 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
2432 1 0 神兽紫装礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 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
2433 1 0 红2幸运草超值礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 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
--
Gitblit v1.8.0