From 996ccd92eea5eb680799aaf3de957713a556873d Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 28 九月 2018 21:44:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                                 |    4 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc |    0 
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index 8e54fb5..a2fdeac 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 41e90c6..28d5e05 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -4,7 +4,7 @@
 5	3	200	1	[(7002,1,0),(4608,2,0)]	7002	LimitGift3
 7	4	320	1	[(4214,1,0),(4151,200,0)]	4214	LimitGift3
 8	5	600	1	[(4606,2,0),(4607,2,0)]	4606	LimitGift3
-4	6	70	1	[(4215,1,1),(4608,40,1)]	4215	LimitGift3
+4	6	70	1	[(4215,1,1),(4151,40,1)]	4215	LimitGift3
 6	7	210	1	[(263,1,1),(181,120,1)]	263	LimitGift3
-5	8	140	1	[(4220,1,1),(4608,80,1)]	4220	LimitGift3
+5	8	140	1	[(4220,1,1),(4151,80,1)]	4220	LimitGift3
 8	9	360	1	[(4215,1,1),(262,200,1)]	4215	LimitGift3

--
Gitblit v1.8.0