From d2f21c60ae4c371c0502298d1387d3b9a0e98990 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 03 九月 2018 16:15:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/SysDB/tagChinSkill.txt |    1 +
 db/PyMongoDataServer/PySysDB/tagHorse.txt   |    2 +-
 db/PyMongoDataServer/SysDB/tagChinItem.txt  |    6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index f834450..f3bb126 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -1,6 +1,6 @@
 HorseID	ItemID	UnlockItemID	UnlockItemCnt	InitLV	MaxLV	UseNeedRank	Quality	InitFightPower	UnlockSys
 100	289	259	1	1	20	1	2	1036	GetMount
-101	280	250	1	1	20	1	2	1396	GetMount1
+101	280	250	1	1	20	1	3	1396	GetMount1
 201	281	251	1	1	30	1	3	2116	GetMount2
 301	282	252	1	1	40	1	4	3600	GetMount3
 302	284	254	1	1	40	1	4	2476	GetMount4
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 728a4a8..2b68d3e 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -100,7 +100,7 @@
 223	1	0	八宝葫芦碎片	124	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	10	0	0	0	0	0	258	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
 224	1	0	觉灵鹿碎片	124	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	10	0	0	0	0	0	250	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 259	1	0	坐骑:追风	41	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	288	0	5	0	1	0	0	7	400	0	0	6	8000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-250	1	0	坐骑:觉灵鹿	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	0	1	0	0	7	400	0	0	6	8000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+250	1	0	坐骑:觉灵鹿	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	0	1	0	0	7	400	0	0	6	8000	0	0	23	20	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
 251	1	0	坐骑:皓月狼	41	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	588	0	5	0	1	0	0	7	1472	0	0	6	29445	0	0	23	40	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
 252	1	0	坐骑:雷霆战熊	41	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	0	1	0	0	7	4464	0	0	6	89280	0	0	23	80	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
 253	1	0	坐骑:火炎兽	41	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	3888	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	80	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
@@ -555,8 +555,8 @@
 4214	1	0	灵宠:荒漠梦魇	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4215	1	0	灵宠:灵狐仙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4216	1	0	灵宠:灵鲛刺客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	100	0	1	0	0	77	27200	0	0	78	27200	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
-4217	1	0	灵宠:荒古巨兽	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
-4218	1	0	灵宠:熊猫斗士	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4217	1	0	灵宠:荒古巨兽	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
+4218	1	0	灵宠:熊猫斗士	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4250	1	0	冰火冥魂碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	100	0	0	0	0	0	4209	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
 4251	1	0	九黎妖虎碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	100	0	0	0	0	0	4210	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
 4252	1	0	球球碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	100	0	0	0	0	0	4213	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
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 541bd83..0cd9bb1 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -495,6 +495,7 @@
 20046	挂机保护	20046	1	1	0	0	0	9	0	0	0	0	1	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	10000	0	0	0	0	0	0	0	0	0	0	1	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 20047	世界等级加成	20047	1	1	0	0	0	9	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	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20048	双倍经验活动	20048	1	1	0	0	0	3	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	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20049	未开放技能	20049	1	1	0	0	0	9	0	0	0	0	1	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	10000	0	0	0	0	0	0	0	0	0	0	1	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 20051	一阶鼓舞	20051	1	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	76	1000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20052	二阶鼓舞	20051	2	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	76	2000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20053	三阶鼓舞	20051	3	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	76	3000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0