From e488a5f90f2f1253d2ab2389322cb7b91a2e383f Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 05 十二月 2018 16:00:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt                 |    5 +++--
 CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc |    0 
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index 85cf315..24be6ed 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 3eddb32..3a74ae9 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -53,12 +53,13 @@
 214	0	0		50913|55913|60913				
 301	0	0						
 301	1	5						
-302	0	0		47100|47100|47100				0
-304	0	0						
+302	0	0		47100|47100|47100				8400
+304	0	0						18000
 305	0	0	46_3000					
 306	0	0	19_2000					
 307	0	0	60_3000					
 308	0	0	18_2000					
+303	0	0						7000
 111	0	0						
 111	1	50	6_20000					
 111	2	90					9	

--
Gitblit v1.8.0