From 0a93f938488ce3f1dc0aa6baf12a308e11e2f98b Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 15 二月 2019 11:20:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/SysDB/tagChinItem.txt     |    5 +++++
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6d708df..8821a2d 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -351,3 +351,4 @@
 ZhuXianBossCntCfg	2	4	4		
 ZhuXianTowerBossTime	int(min(max((playerPower/4.0+needPower)/(playerPower*1.0)*48,10),119))	8	5		
 LuckyAppraisal	50	30			
+MixServerMail	[[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]]	[[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]]	[500, 2000000]	[[947,1,1]]	
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index c946a3f..2767468 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -270,6 +270,11 @@
 1023	1	0	Boss争夺战经验丹	13	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	18	0	50	0	1	0	0	215	3000	400	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
 1024	1	0	冰晶矿脉经验丹	13	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	18	0	50	0	1	0	0	215	7200	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
 1025	1	0	庆典经验丹	14	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1060	0	50	0	1	0	0	214	1	320	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
+1026	1	0	350级升级丹	14	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1060	0	50	0	1	0	0	214	1	350	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
+1027	1	0	400级升级丹	14	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1060	0	50	0	1	0	0	214	1	400	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
+1028	1	0	450级升级丹	14	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1060	0	50	0	1	0	0	214	1	450	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
+1029	1	0	500级升级丹	14	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1060	0	50	0	1	0	0	214	1	500	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
+1030	1	0	550级升级丹	14	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1060	0	50	0	1	0	0	214	1	550	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
 1100	1	0	兵刃	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	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	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1101	1	0	花粉	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	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	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1102	1	0	魂印	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	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	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0