From 9bfbf6075ec21da2c0d05d79b888b8ad497f64d9 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期四, 15 十一月 2018 11:39:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 1 -
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9abd03e..b6eb3f9 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -123,7 +123,7 @@
FamilyBOSSDropRule 6000+grade*800 min(2*playerCount,50)
FBGradeEquipDropRate {} {} {30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,4]], 4:[[1016,1],[1131,6],[1134,6]], 5:[[1015,1],[1131,8],[1134,8]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,6]], 5:[[1015,1],[1132,8],[1135,8]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,6]], 5:[[1015,1],[1133,8],[1136,8]]}}
MutexDrop [[3803,3802,3801],[4606,4608,4610,4609]] 0 0 0 0
-EquipWashMaxLV 1_2|2_2|3_2|4_2|5_4|6_6|7_9|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10 0 0 0 0
+EquipWashMustID 293 0 0 0 0
EquipWashGroup1 1|2 1_2|2_2|3_2|4_2|5_4|6_6|7_9|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10 0 0 0
EquipWashGroup2 3|4|5|6|7 1_2|2_2|3_2|4_2|5_4|6_6|7_9|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10 0 0 0
EquipWashGroup3 8|9|10 1_2|2_2|3_4|4_6|5_8|6_10|7_10|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index b3a4df6..71fdd9e 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -6,7 +6,6 @@
5 0 3724 0 3723 1 3804 1 0 2000 10000 0 5 WingComposeSuccess4 1
6 0 3715 0 3714 1 3805|3806 2|2 0 2000 10000 0 5 WingComposeSuccess5 1
7 0 3725 0 3724 1 3805|3806 2|2 0 2000 10000 0 5 WingComposeSuccess5 1
-10 0 4007 0 0 0 4008|4009 1|1 5000 10000 0 0 0 0 1
11 0 9065 0 9064|9064|9064 3 5304 20 0 10000 0 0 0 XianComposeSucces1 1
12 0 9067 0 9065|9065|9065 3 5304 2 0 10000 0 0 0 EquipComposeSuccess1 1
13 0 10893 0 10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 6dbca19..d01046a 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -147,7 +147,7 @@
852 1 0 388绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 388 0 20 0 1 0 0 202 388 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
853 1 0 580绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 580 0 20 0 1 0 0 202 580 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
854 1 0 600绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 600 0 20 0 1 0 0 202 600 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
-880 1 0 50修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 150 0 20 0 1 0 0 238 100 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
+880 1 0 50修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 150 0 20 0 1 0 0 238 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
881 1 0 100修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 300 0 20 0 1 0 0 238 100 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
901 1 0 气血散（小） 9 0 1 0 0 300 1 1 1 0 1 0 0 0 1 10000 1 1 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 6000 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
902 25 0 气血散（中） 9 0 1 0 0 300 25 1 1 0 1 0 0 0 1 10000 1 1 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 6001 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