From 8c1e63d1bebc26be8a4b7b13d05bfdb00ff652cd Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 08 十月 2018 09:53:09 +0800
Subject: [PATCH] Merge branch '1.0.18' of http://192.168.0.87:10010/r/snxx_server into 1.0.18

---
 db/PyMongoDataServer/PySysDB/tagItemCompound.txt |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 6975772..0961a23 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -197,14 +197,14 @@
 196	21185	21171|21172|21173|21174|21175|21176|21177	3	0	0	0	7500	0	0	EquipComposeSuccess2	1
 197	21186	21171|21172|21173|21174|21175|21176|21177	3	0	0	0	7500	0	0	EquipComposeSuccess2	1
 198	21187	21171|21172|21173|21174|21175|21176|21177	3	0	0	0	7500	0	0	EquipComposeSuccess2	1
-199	9003	9001|9002	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
-200	9004	9001|9002	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
-201	9005	9003|9004	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
-202	9006	9003|9004	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
-203	9015	9013|9014	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
-204	9016	9013|9014	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
-205	9017	9015|9016	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
-206	9018	9015|9016	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
+199	6603	9001|9002	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
+200	6604	9001|9002	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
+201	6605	9003|9004	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
+202	6606	9003|9004	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
+203	6615	9013|9014	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
+204	6616	9013|9014	3	0	0	0	10000	0	0	EquipComposeSuccess4	1
+205	6617	9015|9016	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
+206	6618	9015|9016	3	0	0	0	10000	0	0	EquipComposeSuccess5	1
 207	9075	9074	3	0	0	0	10000	0	0	EquipComposeSuccess6	1
 208	9077	9075	3	5305	10	0	10000	0	0	EquipComposeSuccess1	1
 209	9078	9077	3	5306	20	0	10000	0	0	EquipComposeSuccess2	1

--
Gitblit v1.8.0