From c5b75a381ce469855bbb2b57c9b6ebff706bba39 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 28 十一月 2018 21:57:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagCTG.txt         |   30 +++++++-------
 db/PyMongoDataServer/PySysDB/tagChests.txt      |    3 +
 db/PyMongoDataServer/PySysDB/tagStore.txt       |    3 +
 db/PyMongoDataServer/PySysDB/tagHorse.txt       |   28 +++++++-------
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt     |   38 +++++++++---------
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt |    3 +
 db/PyMongoDataServer/SysDB/tagChinItem.txt      |    3 +
 CoreServerGroup/GameServer/PySysDB/tagStore.txt |    3 +
 8 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 1b9d497..4f5851f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -13,6 +13,9 @@
 13	1	7	0
 14	1	7	0
 15	1	7	0
+16	1	7	0
+17	1	7	0
+18	1	7	0
 51	2	0	0
 52	2	0	0
 53	2	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 1abdd16..e68b64f 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -1,26 +1,26 @@
 RecordID	DailyBuyCount	GainGold	GainGoldPaper	FirstGoldPaperPrize	GainItemList	NotifyMark
 101	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]	
-102	0	100	10	100	[]	
-103	0	300	30	300	[]	
-104	0	980	100	980	[]	
-105	0	1280	138	1280	[]	
-106	0	1980	248	1980	[]	
-107	0	3280	468	3280	[]	
-108	0	6480	1088	6480	[]	
+102	0	100	10	0	[]	
+103	0	300	30	0	[]	
+104	0	980	100	0	[]	
+105	0	1280	138	0	[]	
+106	0	1980	248	0	[]	
+107	0	3280	468	0	[]	
+108	0	6480	1088	0	[]	
 109	0	30000	5888	0	[]	
 110	0	10	1	0	[]	
 111	1	0	0	0	[[58,1,1],[194,1,1],[5,1,1],[912,1,1]]	Bargaingift1
 112	1	0	0	0	[[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]	Bargaingift2
 113	1	0	0	0	[[255,1,1],[196,1,1],[181,80,1],[913,1,1]]	Bargaingift3
-2	0	60	6	60	[]	
+2	0	60	6	0	[]	
 201	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]	
-202	0	60	6	60	[]	
-203	0	300	30	300	[]	
-204	0	980	100	980	[]	
-205	0	1280	138	1280	[]	
-206	0	1980	248	1980	[]	
-207	0	3280	468	3280	[]	
-208	0	6480	1088	6480	[]	
+202	0	60	6	0	[]	
+203	0	300	30	0	[]	
+204	0	980	100	0	[]	
+205	0	1280	138	0	[]	
+206	0	1980	248	0	[]	
+207	0	3280	468	0	[]	
+208	0	6480	1088	0	[]	
 209	0	30000	5888	0	[]	
 210	0	1	0	0	[]	
 211	0	1	0	0	[]	
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 5bc7e01..f18eb83 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -202,3 +202,6 @@
 4008	0	0	0	0	0
 4009	0	0	0	0	0
 2412	0	0	0	0	0
+2413	0	0	0	0	1
+2414	0	0	0	0	1
+2415	0	0	0	0	1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 4b2baf3..13f622f 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -199,3 +199,6 @@
 4008			4011_5									
 4009			4011_5									
 2412				[[5000,[3503,1]],[10000,[3513,1]]]	1							
+2413			101_5|102_2									
+2414			104_5|105_3									
+2415			110_5|111_3									
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index 8c8236e..a1c412c 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -1,17 +1,17 @@
 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	30	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
-303	285	255	1	1	40	1	4	3492	GetMount5
-401	283	253	1	1	50	1	5	13996	GetMount9
-304	286	256	1	1	40	1	4	5716	GetMount6
-402	287	257	1	1	50	1	5	31996	GetMount10
-305	290	260	1	1	40	1	4	13968	GetMount7
-306	288	258	1	1	50	1	5	21168	GetMount8
-307	291	261	1	1	30	1	3	2116	GetMount11
-308	292	262	1	1	40	1	4	6048	GetMount12
-309	293	263	1	1	30	1	3	3528	GetMount13
-310	294	264	1	1	40	1	4	6048	GetMount14
+101	280	250	1	1	30	1	3	1862	GetMount1
+201	281	251	1	1	30	1	3	2822	GetMount2
+301	282	252	1	1	40	1	4	4800	GetMount3
+302	284	254	1	1	40	1	4	3302	GetMount4
+303	285	255	1	1	40	1	4	4656	GetMount5
+401	283	253	1	1	50	1	5	23328	GetMount9
+304	286	256	1	1	40	1	4	7622	GetMount6
+402	287	257	1	1	50	1	5	53328	GetMount10
+305	290	260	1	1	40	1	4	18624	GetMount7
+306	288	258	1	1	50	1	5	35280	GetMount8
+307	291	261	1	1	30	1	3	1862	GetMount11
+309	293	263	1	1	30	1	3	4704	GetMount13
+308	292	262	1	1	40	1	4	8064	GetMount12
 311	295	265	1	1	30	1	2	1440	GetMount15
+310	294	264	1	1	40	1	4	8064	GetMount14
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index 4a3c145..abe0532 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -1,23 +1,23 @@
 ID	Quality	UnlockSys	UnLockNeedItemID	UnLockNeedItemCnt	DecomposeExp	InitRank	MaxRank	UseNeedRank	SkillID	SkillUnLock	SkillUnLockSys	InitFightPower
 50106001	2	GetPet13	4201	1	1000	1	20	1	48200|48205|48210	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1036
 50106002	2	GetPet	4202	1	1000	1	20	4	48215|48220|48225	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
-50106101	3	GetPet2	4203	1	1000	1	30	6	47111|48235|48240	4|10|20	['PetUpLv1','PetUpLv','PetUpLv']	2476
-50106102	3	GetPet3	4204	1	1000	1	30	6	48245|48250|48255	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2476
-50106201	4	GetPet4	4205	1	1000	1	40	6	48260|48265|48270	4|10|20	['PetUpLv','PetUpLv','PetUpLv2']	5716
-50106103	3	GetPet7	4208	1	1000	1	30	6	48320|48325|48330	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	3916
-50106204	4	GetPet5	4212	1	1000	1	40	6	48275|48280|48285	4|10|20	['PetUpLv','PetUpLv','PetUpLv3']	4636
-50106301	5	GetPet8	4206	1	1000	1	50	6	48290|48295|48300	4|10|20	['PetUpLv','PetUpLv','PetUpLv4']	13996
-50106302	5	GetPet9	4207	1	1000	1	50	6	48305|48310|48315	4|10|20	['PetUpLv','PetUpLv','PetUpLv5']	31996
-50106303	4	GetPet6	4209	1	1000	1	40	6	48335|48340|48345	4|10|20	['PetUpLv','PetUpLv7','PetUpLv']	13248
-50106304	5	GetPet10	4210	1	1000	1	50	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv6']	24796
-50106305	3	GetPet11	4213	1	1000	1	30	6	48380|48385|48390	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2476
-50106306	4	GetPet12	4214	1	1000	1	40	6	48410|48415|48420	4|10|20	['PetUpLv','PetUpLv','PetUpLv8']	4608
+50106101	3	GetPet2	4203	1	1000	1	30	6	47111|48235|48240	4|10|20	['PetUpLv1','PetUpLv','PetUpLv']	3302
+50106102	3	GetPet3	4204	1	1000	1	30	6	48245|48250|48255	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	3302
+50106201	4	GetPet4	4205	1	1000	1	40	6	48260|48265|48270	4|10|20	['PetUpLv','PetUpLv','PetUpLv2']	7622
+50106103	3	GetPet7	4208	1	1000	1	30	6	48320|48325|48330	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	5222
+50106204	4	GetPet5	4212	1	1000	1	40	6	48275|48280|48285	4|10|20	['PetUpLv','PetUpLv','PetUpLv3']	6182
+50106301	5	GetPet8	4206	1	1000	1	50	6	48290|48295|48300	4|10|20	['PetUpLv','PetUpLv','PetUpLv4']	23328
+50106302	5	GetPet9	4207	1	1000	1	50	6	48305|48310|48315	4|10|20	['PetUpLv','PetUpLv','PetUpLv5']	53328
+50106303	4	GetPet6	4209	1	1000	1	40	6	48335|48340|48345	4|10|20	['PetUpLv','PetUpLv7','PetUpLv']	17664
+50106304	5	GetPet10	4210	1	1000	1	50	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv6']	41328
+50106305	3	GetPet11	4213	1	1000	1	30	6	48380|48385|48390	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	3302
+50106306	4	GetPet12	4214	1	1000	1	40	6	48410|48415|48420	4|10|20	['PetUpLv','PetUpLv','PetUpLv8']	6144
+50106310	4	GetPet15	4218	1	1000	1	40	6	48425|48430|48435	4|10|20	['PetUpLv','PetUpLv','PetUpLv12']	9600
+50106309	5	GetPet14	4217	1	1000	1	50	6	48440|48445|48450	4|10|20	['PetUpLv','PetUpLv','PetUpLv11']	24000
 50106307	2	GetPet1	4215	1	1000	1	20	6	48395|48400|48405	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1440
-50106308	3	GetPet17	4216	1	1000	1	30	6	48485|48490|48495	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2448
-50106309	5	GetPet14	4217	1	1000	1	50	6	48440|48445|48450	4|10|20	['PetUpLv','PetUpLv','PetUpLv11']	14400
-50106310	4	GetPet15	4218	1	1000	1	40	6	48425|48430|48435	4|10|20	['PetUpLv','PetUpLv','PetUpLv12']	7200
-50106311	3	GetPet16	4219	1	1000	1	30	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
-50106312	3	GetPet18	4220	1	1000	1	30	6	48470|48475|48480	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2448
-50106313	3	GetPet19	4221	1	1000	1	30	6	48500|48505|48510	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2448
-50106314	4	GetPet20	4222	1	1000	1	40	6	48515|48520|48525	4|10|20	['PetUpLv','PetUpLv','PetUpLv9']	4608
-50106315	4	GetPet21	4223	1	1000	1	40	6	48530|48535|48540	4|10|20	['PetUpLv','PetUpLv','PetUpLv10']	4608
+50106311	3	GetPet16	4219	1	1000	1	30	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1862
+50106312	3	GetPet18	4220	1	1000	1	30	6	48470|48475|48480	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	3264
+50106313	3	GetPet19	4221	1	1000	1	30	6	48500|48505|48510	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	3264
+50106314	4	GetPet20	4222	1	1000	1	40	6	48515|48520|48525	4|10|20	['PetUpLv','PetUpLv','PetUpLv9']	6144
+50106315	4	GetPet21	4223	1	1000	1	40	6	48530|48535|48540	4|10|20	['PetUpLv','PetUpLv','PetUpLv10']	6144
+50106308	3	GetPet17	4216	1	1000	1	30	6	48485|48490|48495	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	3264
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 145aef6..3d4b2eb 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -13,6 +13,9 @@
 13	1	0	4741	1	1	[]	0		7	1	125	1	0	1	30	0	0		
 14	1	0	2389	1	1	[]	0		7	0	260	2	0	1	100	0	0		
 15	1	0	1129	1	1	[]	0		7	3	110	3	0	1	99	0	0		
+16	1	0	2413	1	1	[]	0		7	0	110	2	0	1	90	0	0		
+17	1	0	2414	1	1	[]	0		7	0	250	2	0	1	150	0	0		
+18	1	0	2415	1	1	[]	0		7	0	320	2	0	1	200	0	0		
 51	2	0	3796	1	0	[]	0		0	0	0	0	0	1	280	0	0		
 52	2	0	3797	1	0	[]	0		0	0	0	0	0	1	280	0	0		
 53	2	0	4101	1	0	[]	0		0	0	0	0	0	1	380	0	0		
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index af9325f..5eac29a 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -545,6 +545,9 @@
 2410	1	0	D级妖丹宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	100	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	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
 2411	1	0	坐骑丹奢华礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	3000	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	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
 2412	1	0	3级随机宝石	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	90	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	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
+2413	1	0	生命神兵石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	120	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	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
+2414	1	0	攻击神兵石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	110	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	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
+2415	1	0	护盾神兵石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	100	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	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
 3501	1	0	1级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	10	0	0	0	1	225	1	1	3502	6	190	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
 3502	1	0	2级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	1	2	3503	6	465	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
 3503	1	0	3级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	20	0	0	0	1	225	1	3	3504	6	1160	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

--
Gitblit v1.8.0