From 4dd71da748a26d2d38ed4be20f56c4f9536b9bb1 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期二, 28 八月 2018 16:42:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 Hooks/commit-msg.meta                             |    8 ++
 db/PyMongoDataServer/PySysDB/tagPetClassCost.txt  |   70 +++++++++++++++++
 db/PyMongoDataServer/PySysDB/tagStore.txt         |    6 
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt       |    4 
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt |    3 
 pull_git.sh                                       |   95 +++++++++++++++++++++++
 db/PyMongoDataServer/SysDB/tagChinItem.txt        |   25 +-----
 db/PyMongoDataServer/SysDB/tagChinNPC.txt         |    3 
 Hooks/commit-msg                                  |   12 +++
 9 files changed, 200 insertions(+), 26 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 4c751bb..54c6234 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -293,7 +293,8 @@
 50106301	炎魔	441
 50106303	冰火冥魂	441
 50106304	九黎妖虎	441
-50106012	齐天小美	441
+50106305	球球	441
+50106306	荒漠梦魇	441
 50105001	傲世神驹	1
 50105002	枪元素	1
 50105003	道元素	1
diff --git a/Hooks/commit-msg b/Hooks/commit-msg
new file mode 100644
index 0000000..ceee404
--- /dev/null
+++ b/Hooks/commit-msg
@@ -0,0 +1,12 @@
+#!/bin/sh
+# -*- coding: UTF-8 -*- 
+
+if [ "$(grep -in '^[0-9]*[1-9][0-9]* .*' "$1")" == "" ] && [ "$(grep -in '^Merge .*' "$1")" == "" ] && [ "$(grep -in '^Revert .*' "$1")" == "" ]; then
+	echo 浠ヤ笅3绉嶆槸姝ｇ‘鐨勫娉ㄤ俊鎭槸锛�
+	echo 1. 12345 姝ｅ父鎻愪氦澶囨敞淇℃伅蹇呴』浠ユ暟瀛楀崟鍙峰紑澶淬��#鏁板瓧鍗曞彿鍚庨潰甯︾┖鏍�#
+	echo 2. Merge 浠erge寮�澶磋鏄庤繖鏄竴娆it鍚堝苟鎿嶄綔锛岃繖鏄鍏佽鐨勩��#Merge鍚庨潰甯︾┖鏍�#
+	echo 3. Revert 浠evert寮�澶磋鏄庤繖鏄竴娆it杩樺師鎿嶄綔锛岃繖鏄鍏佽鐨勩��#Revert鍚庨潰甯︾┖鏍�#
+	exit 1
+
+fi
+
diff --git a/Hooks/commit-msg.meta b/Hooks/commit-msg.meta
new file mode 100644
index 0000000..1cd01f3
--- /dev/null
+++ b/Hooks/commit-msg.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b87aef1931a05ca49890a8fc42649dfb
+timeCreated: 1535439812
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index 379af26..805581f 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -399,3 +399,73 @@
 50106304	48	31316	52374
 50106304	49	32392	54252
 50106304	50	0	56194
+50106306	1	1234	1324
+50106306	2	1339	1497
+50106306	3	1454	1681
+50106306	4	1577	1878
+50106306	5	1709	2087
+50106306	6	1850	2309
+50106306	7	1999	2546
+50106306	8	2157	2798
+50106306	9	2324	3065
+50106306	10	2500	3349
+50106306	11	2684	3649
+50106306	12	2877	3968
+50106306	13	3079	4308
+50106306	14	3290	4668
+50106306	15	3509	5050
+50106306	16	3738	5454
+50106306	17	3975	5880
+50106306	18	4220	6329
+50106306	19	4475	6802
+50106306	20	4738	7298
+50106306	21	5010	7820
+50106306	22	5290	8356
+50106306	23	5580	8906
+50106306	24	5878	9470
+50106306	25	6185	10046
+50106306	26	6500	10633
+50106306	27	6825	11231
+50106306	28	7158	11839
+50106306	29	7500	12454
+50106306	30	7850	13077
+50106306	31	8210	13705
+50106306	32	8578	14345
+50106306	33	8955	14997
+50106306	34	9341	15660
+50106306	35	9735	16333
+50106306	36	10138	17014
+50106306	37	10550	17704
+50106306	38	10970	18400
+50106306	39	11419	19102
+50106306	40	0	19809
+50106305	1	2468	2479
+50106305	2	2679	2825
+50106305	3	2908	3193
+50106305	4	3154	3586
+50106305	5	3418	4004
+50106305	6	3700	4448
+50106305	7	3999	4922
+50106305	8	4315	5426
+50106305	9	4649	5961
+50106305	10	5000	6528
+50106305	11	5369	7128
+50106305	12	5755	7767
+50106305	13	6159	8446
+50106305	14	6581	9167
+50106305	15	7019	9931
+50106305	16	7476	10738
+50106305	17	7950	11590
+50106305	18	8441	12489
+50106305	19	8950	13434
+50106305	20	9476	14427
+50106305	21	10020	15470
+50106305	22	10581	16542
+50106305	23	11160	17643
+50106305	24	11756	18770
+50106305	25	12370	19922
+50106305	26	13001	21097
+50106305	27	13650	22293
+50106305	28	14316	23508
+50106305	29	15000	24740
+50106305	30	15701	25985
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index e76b388..00ad924 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -9,4 +9,6 @@
 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','PetUpLv','PetUpLv']	13248
-50106304	5	GetPet10	4210	1	1000	1	50	1	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv6']	24796
+50106304	5	GetPet10	4210	1	1000	1	50	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv6']	24796
+50106305	3	GetPet11	4211	1	1000	1	30	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	24796
+50106306	4	GetPet12	4212	1	1000	1	40	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	24796
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 3738436..9b4b154 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -103,10 +103,10 @@
 651	14	0	58	1	1	[[194,1,1],[5,1,1],[912,1,1]]	58		0	0	0	1	1	188	0	0	ShopBuyBroadcast_1
 652	14	0	4208	1	1	[[4151,60,1],[5,1,1],[913,1,1]]	4208		0	0	0	1	1	388	0	0	ShopBuyBroadcast_1
 653	14	0	255	1	1	[[196,1,1],[181,140,1],[913,1,1]]	255		0	0	0	1	1	1088	0	0	ShopBuyBroadcast_1
-701	15	0	912	1	1	[[105,8,1]]	912		0	0	106	1	1	88	390	1	OpenTakePreferential1
+701	15	0	912	1	1	[[2345,1,1]]	912		0	0	106	1	1	88	390	1	OpenTakePreferential1
 702	15	0	4185	1	1	[]	4185		0	0	106	1	1	288	800	1	OpenTakePreferential2
-703	15	0	181	38	1	[]	0		0	0	106	1	1	88	380	2	OpenTakePreferential1
-704	15	0	181	100	1	[]	4609		0	0	106	1	1	288	1000	2	OpenTakePreferential2
+703	15	0	2343	1	1	[]	0		0	0	106	1	1	88	380	2	OpenTakePreferential1
+704	15	0	2344	1	1	[]	2344		0	0	106	1	1	288	1000	2	OpenTakePreferential2
 705	15	0	4	4	1	[]	4		0	0	106	1	1	88	240	3	OpenTakePreferential1
 706	15	0	5	5	1	[[912,1,1]]	5		0	0	106	1	1	288	700	3	OpenTakePreferential2
 707	15	0	3513	2	1	[[3503,2,1]]	3513		0	0	106	1	1	88	360	4	OpenTakePreferential1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 8cb939e..3c596a2 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -98,26 +98,7 @@
 221	1	0	娲皇的祝福	8	0	0	0	0	999	1	0	0	0	1	0	0	0	0	0	1	5000	0	10	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	47112	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
 222	1	0	地狱冥虎碎片	124	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	776	0	20	0	1	0	0	0	260	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
 223	1	0	八宝葫芦碎片	124	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	2940	0	20	0	1	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-224	1	0	沉默反制技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-225	1	0	初级专属技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-226	1	0	静默诅咒技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-227	1	0	中级专属技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-228	1	0	坚不可摧技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-229	1	0	高级专属技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-230	1	0	拨云穿月技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-231	1	0	越战越勇技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-232	1	0	嗜血一击技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-233	1	0	柳暗花明技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-234	1	0	特级专属技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-235	1	0	战斗专注技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-236	1	0	回复阻挡技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-237	1	0	混沌之光技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-238	1	0	斗转星移技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-239	1	0	净化之光技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-240	1	0	吸星大法技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-241	1	0	乘风破浪技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-242	1	0	眩晕反制技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
-243	1	0	翰海逐尘技能书	23	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2000	0	20	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
+224	1	0	觉灵鹿碎片	124	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	2940	0	20	0	1	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	4	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	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	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
 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
@@ -533,8 +514,12 @@
 4210	1	0	灵宠：九黎妖虎	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6888	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
 4211	1	0	灵宠：五爪金龙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	10888	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
 4212	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
+4213	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
+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
 4250	1	0	冰火冥魂碎片	125	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	736	0	100	0	1	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	3444	0	100	0	1	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	3444	0	100	0	1	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
+4253	1	0	灵狐仙碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	3444	0	100	0	1	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
 4301	1	0	符印精华	31	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	60	0	5	0	1	0	0	0	260	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
 4302	1	0	符印精华	31	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	150	0	10	0	1	0	0	0	420	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
 4303	1	0	符印精华	31	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	210	0	20	0	1	0	0	0	790	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/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 6cd6495..83275d1 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -293,7 +293,8 @@
 50106301	16	0	炎魔	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106303	16	0	冰火冥魂	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106304	16	0	九黎妖虎	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
-50106012	16	0	齐天小美	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
+50106305	16	0	球球	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
+50106306	16	0	荒漠梦魇	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50105001	16	0	傲世神驹	1	0	1	2	26	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1200	100	0	300	0	2	0	0	0	0	0	0	0	0	0	10	2	203	0	0	0	0	0	0	0	105	1	2
 50105002	3	0	枪元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	50932	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50105003	3	0	道元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	55932	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
diff --git a/pull_git.sh b/pull_git.sh
new file mode 100644
index 0000000..f0e572b
--- /dev/null
+++ b/pull_git.sh
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+Branch=master
+Tag=""
+
+# 瀹㈡埛绔牴璺緞
+client_path="./"
+
+# 寮�鍏� 銆�0銆戜笉鎷夊彇 銆�1銆戝啿绐佷笉鎷夊彇 銆�2銆戝己鎷夈�佽鐩�
+client=2
+
+
+# 鏍囩
+t_client=$Tag
+
+
+# 璺緞閰嶇疆
+
+
+
+# 杩滅▼Git
+g_client="http://admin@192.168.0.87:10010/r/snxx_server.git"
+
+
+
+# 鏃犲垯鍒涘缓锛涗笖鎷夊彇鏈�鏂�
+# $1 璺緞
+# $2 git鍦板潃
+# $3 鏍囩
+cloneAll() {
+	
+	if [ $1 = 0 ]; then return; fi
+	
+	echo
+	echo "===================="
+	echo "path:"$2
+	echo "git:"$3
+	echo "tag:"$4
+	echo "===================="
+	
+	# 涓嶅瓨鍦ㄨ矾寰勫氨鍒涘缓
+	if [ ! -d $2 ];then
+		echo "绗竴娆″垱寤�"
+		git clone $3 $2
+	fi
+	
+	# 鎷夊彇
+	cd $2		
+	git stash
+	git pull --progress -f	
+
+	# 鏃犳爣绛�
+	if [ -z $4 ];then		
+		if [ $1 = 2 ];then
+			git checkout -B $Branch origin/${Branch} -f
+		else
+			git checkout -B $Branch origin/${Branch}
+		fi
+	else	
+		#鍒犳湰鍦版爣绛�
+		git tag -d $4		
+		git pull --progress -f	
+	
+		#鍒囧垎鏀�
+		git checkout -B $Branch origin/${Branch} -f			
+		#鍒囨爣绛�
+		git reset $4 --hard	
+	fi	
+}
+
+
+copyHooks() {
+	
+	if [ $1 = 0 ]; then return; fi
+	
+	echo $1
+	root=$1
+	echo root
+	fileFrom=${root}"/Hooks/commit-msg"
+	fileTo=${root}"/.git/hooks/commit-msg"
+	echo $fileFrom
+	echo $fileTo
+
+	cp $fileFrom $fileTo
+}
+
+# client 涓�瀹氳鎷夊彇
+if [ ! -d ${client_path} ]; then mkdir ${client_path}; fi
+if [ "`ls -A $client_path`" = "" ]; then rm -rf $client_path; fi
+cloneAll $client $client_path $g_client $t_client
+copyHooks $client_path
+
+
+echo
+read -p "鎿嶄綔瀹屾垚锛岀偣Enter閿��鍑�"
\ No newline at end of file

--
Gitblit v1.8.0