From f42d124fbba8069bda9567f55c574de4d31d50f4 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 13 十二月 2018 10:01:34 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

---
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                      |   18 +-
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                        |    4 
 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt                                                    |  400 +++++++++++++++++++++++++++----------------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt |    2 
 4 files changed, 230 insertions(+), 194 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index c419f35..7504544 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -113,7 +113,7 @@
 
 	#BOSS境界压制公式
 	"PVE_1_3"	:"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)+aNPCHurtAddPer/10000.0*(aMinAtk+aMaxAtk)/2.0,(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
-	"EVP_1_3"	:"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+	"EVP_1_3"	:"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV*1.3)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
 
 
 	#抢boss
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index e085af7..9009535 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -1,14 +1,4 @@
 OrderInfo	AppId	PayRMBNum	CTGID	GiftbagID
-snqxz.18	424064855	18	101	0
-snqxz.6	424064855	6	2	0
-snqxz.30	424064855	30	103	0
-snqxz.98	424064855	98	104	0
-snqxz.128	424064855	128	105	0
-snqxz.198	424064855	198	106	0
-snqxz.328	424064855	328	107	0
-snqxz.648	424064855	648	108	0
-snqxz.1	424064855	1	110	0
-snqxz.0.1	424064855	0.1	210	0
 lxj.18	226114725	18	101	0
 lxj.10	226114725	10	102	0
 lxj.30	226114725	30	103	0
@@ -19,17 +9,6 @@
 lxj.648	226114725	648	108	0
 lxj.3000	226114725	3000	109	0
 lxj.1	226114725	1	110	0
-snqxz.ios.6	424064855	6	0	2
-snqxz.ios.18	424064855	18	0	3
-snqxz.ios.30	424064855	30	0	4
-snqxz.ios.68	424064855	68	0	5
-snqxz.ios.98	424064855	98	0	6
-snqxz.ios.128	424064855	128	0	7
-snqxz.ios.168	424064855	168	0	8
-snqxz.ios.198	424064855	198	0	9
-snqxz.ios.jbch	424064855	18	111	0
-snqxz.ios.ntlc	424064855	30	112	0
-snqxz.ios.jszq	424064855	98	113	0
 sn.android.6	226114725	6	0	2
 sn.android.18	226114725	18	0	3
 sn.android.30	226114725	30	0	4
@@ -41,26 +20,6 @@
 sn.android.jbch	226114725	18	111	0
 sn.android.ntlc	226114725	30	112	0
 sn.android.jszq	226114725	98	113	0
-lxj.18	508021130	18	101	0
-lxj.6	508021130	6	2	0
-lxj.30	508021130	30	103	0
-lxj.98	508021130	98	104	0
-lxj.128	508021130	128	105	0
-lxj.198	508021130	198	106	0
-lxj.328	508021130	328	107	0
-lxj.648	508021130	648	108	0
-lxj.1	508021130	1	110	0
-lxj.ios.6	508021130	6	0	2
-lxj.ios.18	508021130	18	0	3
-lxj.ios.30	508021130	30	0	4
-lxj.ios.68	508021130	68	0	5
-lxj.ios.98	508021130	98	0	6
-lxj.ios.128	508021130	128	0	7
-lxj.ios.168	508021130	168	0	8
-lxj.ios.198	508021130	198	0	9
-lxj.ios.jbch	508021130	18	111	0
-lxj.ios.ntlc	508021130	30	112	0
-lxj.ios.jszq	508021130	98	113	0
 lxj.18	813015059	18	101	0
 lxj.10	813015059	10	102	0
 lxj.30	813015059	30	103	0
@@ -103,26 +62,6 @@
 snxxz.android.jbch	822055139	18	111	0
 snxxz.android.ntlc	822055139	30	112	0
 snxxz.android.jszq	822055139	98	113	0
-snxxz.18	828115704	18	101	0
-snxxz.6	828115704	6	2	0
-snxxz.30	828115704	30	103	0
-snxxz.98	828115704	98	104	0
-snxxz.128	828115704	128	105	0
-snxxz.198	828115704	198	106	0
-snxxz.328	828115704	328	107	0
-snxxz.648	828115704	648	108	0
-snxxz.1	828115704	1	110	0
-snxxz.ios.6	828115704	6	0	2
-snxxz.ios.18	828115704	18	0	3
-snxxz.ios.30	828115704	30	0	4
-snxxz.ios.68	828115704	68	0	5
-snxxz.ios.98	828115704	98	0	6
-snxxz.ios.128	828115704	128	0	7
-snxxz.ios.168	828115704	168	0	8
-snxxz.ios.198	828115704	198	0	9
-snxxz.ios.jbch	828115704	18	111	0
-snxxz.ios.ntlc	828115704	30	112	0
-snxxz.ios.jszq	828115704	98	113	0
 575	mrgame	18	101	0
 576	mrgame	10	102	0
 577	mrgame	30	103	0
@@ -144,27 +83,6 @@
 1101	mrgame	18	111	0
 1102	mrgame	30	112	0
 1103	mrgame	98	113	0
-sgsbl.18	815035927	18	101	0
-sgsbl.6	815035927	6	2	0
-sgsbl.30	815035927	30	103	0
-sgsbl.98	815035927	98	104	0
-sgsbl.128	815035927	128	105	0
-sgsbl.198	815035927	198	106	0
-sgsbl.328	815035927	328	107	0
-sgsbl.648	815035927	648	108	0
-sgsbl.1	815035927	1	110	0
-sgsbl.0.1	815035927	0.1	210	0
-sgsbl.ios.6	815035927	6	0	2
-sgsbl.ios.18	815035927	18	0	3
-sgsbl.ios.30	815035927	30	0	4
-sgsbl.ios.68	815035927	68	0	5
-sgsbl.ios.98	815035927	98	0	6
-sgsbl.ios.128	815035927	128	0	7
-sgsbl.ios.168	815035927	168	0	8
-sgsbl.ios.198	815035927	198	0	9
-sgsbl.ios.jbch	815035927	18	111	0
-sgsbl.ios.ntlc	815035927	30	112	0
-sgsbl.ios.jszq	815035927	98	113	0
 test.18	test	18	101	0
 test.10	test	10	102	0
 test.30	test	30	103	0
@@ -207,46 +125,6 @@
 xj.android.jbch	spxjgame	18	111	0
 xj.android.ntlc	spxjgame	30	112	0
 xj.android.jszq	spxjgame	98	113	0
-jkjk.18	mrgameios	18	101	0
-jkjk.06	mrgameios	6	2	0
-jkjk.030	mrgameios	30	103	0
-jkjk.098	mrgameios	98	104	0
-jkjk.0128	mrgameios	128	105	0
-jkjk.0198	mrgameios	198	106	0
-jkjk.0328	mrgameios	328	107	0
-jkjk.0648	mrgameios	648	108	0
-jkjk.1	mrgameios	1	110	0
-jkjk.6	mrgameios	6	0	2
-jkjk.18	mrgameios	18	0	3
-jkjk.30	mrgameios	30	0	4
-jkjk.68	mrgameios	68	0	5
-jkjk.98	mrgameios	98	0	6
-jkjk.128	mrgameios	128	0	7
-jkjk.168	mrgameios	168	0	8
-jkjk.198	mrgameios	198	0	9
-jkjk.jbch	mrgameios	18	111	0
-jkjk.ntlc	mrgameios	30	112	0
-jkjk.jszq	mrgameios	98	113	0
-com.price18.xylb	spyxxjios	18	101	0
-com.price6.xyxz	spyxxjios	6	2	0
-com.price30.xyxz	spyxxjios	30	103	0
-com.price98.xzxz	spyxxjios	98	104	0
-com.price128.xyxz	spyxxjios	128	105	0
-com.price198.xyxz	spyxxjios	198	106	0
-com.price328.xyxz	spyxxjios	328	107	0
-com.price648.xyxz	spyxxjios	648	108	0
-com.price1.xj	spyxxjios	1	110	0
-com.price6.xylb	spyxxjios	6	0	2
-com.price18.xylb	spyxxjios	18	0	3
-com.price30.xylb	spyxxjios	30	0	4
-com.price68.xylb	spyxxjios	68	0	5
-com.price98.xylb	spyxxjios	98	0	6
-com.price128.xylb	spyxxjios	128	0	7
-com.price168.xylb	spyxxjios	168	0	8
-com.price198.xylb	spyxxjios	198	0	9
-com.price18.ynjplb	spyxxjios	18	111	0
-com.price30.ynjplb	spyxxjios	30	112	0
-com.price98.ynjplb	spyxxjios	98	113	0
 jisu.18	jisugame	18	101	0
 jisu.10	jisugame	10	102	0
 jisu.30	jisugame	30	103	0
@@ -268,26 +146,6 @@
 jisu.android.jbch	jisugame	18	111	0
 jisu.android.ntlc	jisugame	30	112	0
 jisu.android.jszq	jisugame	98	113	0
-com.snjjxios.01	jisugameios	18	101	0
-com.snjjxios.02	jisugameios	6	2	0
-com.snjjxios.03	jisugameios	30	103	0
-com.snjjxios.04	jisugameios	98	104	0
-com.snjjxios.05	jisugameios	128	105	0
-com.snjjxios.06	jisugameios	198	106	0
-com.snjjxios.07	jisugameios	328	107	0
-com.snjjxios.08	jisugameios	648	108	0
-com.snjjxios.14	jisugameios	1	110	0
-com.snjjxios.09	jisugameios	6	0	2
-com.snjjxios.15	jisugameios	18	0	3
-com.snjjxios.10	jisugameios	30	0	4
-com.snjjxios.11	jisugameios	68	0	5
-com.snjjxios.16	jisugameios	98	0	6
-com.snjjxios.12	jisugameios	128	0	7
-com.snjjxios.13	jisugameios	168	0	8
-com.snjjxios.17	jisugameios	198	0	9
-com.snjjxios.18	jisugameios	18	111	0
-com.snjjxios.19	jisugameios	30	112	0
-com.snjjxios.20	jisugameios	98	113	0
 wx.snqxz.18	424064855	18	201	0
 wx.snqxz.6	424064855	6	202	0
 wx.snqxz.30	424064855	30	203	0
@@ -306,43 +164,221 @@
 wx.sgsbl.328	815035927	328	207	0
 wx.sgsbl.648	815035927	648	208	0
 wx.sgsbl.01	815035927	0.1	211	0
-com.snyjjpg.01	jisusnyjjios	18	101	0
-com.snyjjpg.02	jisusnyjjios	6	2	0
-com.snyjjpg.03	jisusnyjjios	30	103	0
-com.snyjjpg.04	jisusnyjjios	98	104	0
-com.snyjjpg.05	jisusnyjjios	128	105	0
-com.snyjjpg.06	jisusnyjjios	198	106	0
-com.snyjjpg.07	jisusnyjjios	328	107	0
-com.snyjjpg.08	jisusnyjjios	648	108	0
-com.snyjjpg.test1	jisusnyjjios	1	110	0
-com.snyjjpg.09	jisusnyjjios	6	0	2
-com.snyjjpg.14	jisusnyjjios	18	0	3
-com.snyjjpg.10	jisusnyjjios	30	0	4
-com.snyjjpg.11	jisusnyjjios	68	0	5
-com.snyjjpg.15	jisusnyjjios	98	0	6
-com.snyjjpg.12	jisusnyjjios	128	0	7
-com.snyjjpg.13	jisusnyjjios	168	0	8
-com.snyjjpg.16	jisusnyjjios	198	0	9
-com.snyjjpg.17	jisusnyjjios	18	111	0
-com.snyjjpg.18	jisusnyjjios	30	112	0
-com.snyjjpg.19	jisusnyjjios	98	113	0
-mbxml.18	1030013326	18	101	0
-mbxml.6	1030013326	6	2	0
-mbxml.30	1030013326	30	103	0
-mbxml.98	1030013326	98	104	0
-mbxml.128	1030013326	128	105	0
-mbxml.198	1030013326	198	106	0
-mbxml.328	1030013326	328	107	0
-mbxml.648	1030013326	648	108	0
-mbxml.ios.test1	1030013326	1	110	0
-mbxml.ios.6	1030013326	6	0	2
-mbxml.ios.18	1030013326	18	0	3
-mbxml.ios.30	1030013326	30	0	4
-mbxml.ios.68	1030013326	68	0	5
-mbxml.ios.98	1030013326	98	0	6
-mbxml.ios.128	1030013326	128	0	7
-mbxml.ios.168	1030013326	168	0	8
-mbxml.ios.198	1030013326	198	0	9
-mbxml.ios.ch18	1030013326	18	111	0
-mbxml.ios.ch30	1030013326	30	112	0
-mbxml.ios.ch98	1030013326	98	113	0
+mbxxj.18	1119034041	18	101	0
+mbxxj.6	1119034041	6	2	0
+mbxxj.30	1119034041	30	103	0
+mbxxj.98	1119034041	98	104	0
+mbxxj.128	1119034041	128	105	0
+mbxxj.198	1119034041	198	106	0
+mbxxj.328	1119034041	328	107	0
+mbxxj.648	1119034041	648	108	0
+mbxxj.ios.test1	1119034041	1	110	0
+mbxxj.ios.6	1119034041	6	0	2
+mbxxj.ios.30	1119034041	30	0	4
+mbxxj.ios.68	1119034041	68	0	5
+mbxxj.ios.128	1119034041	128	0	7
+mbxxj.ios.168	1119034041	168	0	8
+xiaomi.18	xmgame	18	101	0
+xiaomi.10	xmgame	10	102	0
+xiaomi.30	xmgame	30	103	0
+xiaomi.98	xmgame	98	104	0
+xiaomi.128	xmgame	128	105	0
+xiaomi.198	xmgame	198	106	0
+xiaomi.328	xmgame	328	107	0
+xiaomi.648	xmgame	648	108	0
+xiaomi.3000	xmgame	3000	109	0
+xiaomi.test1	xmgame	1	110	0
+xiaomi.android.6	xmgame	6	0	2
+xiaomi.android.30	xmgame	30	0	4
+xiaomi.android.68	xmgame	68	0	5
+xiaomi.android.128	xmgame	128	0	7
+xiaomi.android.168	xmgame	168	0	8
+xiaomi.android.18	xmgame	18	0	3
+xiaomi.android.98	xmgame	98	0	6
+xiaomi.android.198	xmgame	198	0	9
+xiaomi.android.jbch	xmgame	18	111	0
+xiaomi.android.ntlc	xmgame	30	112	0
+xiaomi.android.jszq	xmgame	98	113	0
+yyb.18	yybgame	18	101	0
+yyb.10	yybgame	10	102	0
+yyb.30	yybgame	30	103	0
+yyb.98	yybgame	98	104	0
+yyb.128	yybgame	128	105	0
+yyb.198	yybgame	198	106	0
+yyb.328	yybgame	328	107	0
+yyb.648	yybgame	648	108	0
+yyb.3000	yybgame	3000	109	0
+yyb.test1	yybgame	1	110	0
+yyb.android.6	yybgame	6	0	2
+yyb.android.30	yybgame	30	0	4
+yyb.android.68	yybgame	68	0	5
+yyb.android.128	yybgame	128	0	7
+yyb.android.168	yybgame	168	0	8
+yyb.android.18	yybgame	18	0	3
+yyb.android.98	yybgame	98	0	6
+yyb.android.198	yybgame	198	0	9
+yyb.android.jbch	yybgame	18	111	0
+yyb.android.ntlc	yybgame	30	112	0
+yyb.android.jszq	yybgame	98	113	0
+huawei.18	hwgame	18	101	0
+huawei.10	hwgame	10	102	0
+huawei.30	hwgame	30	103	0
+huawei.98	hwgame	98	104	0
+huawei.128	hwgame	128	105	0
+huawei.198	hwgame	198	106	0
+huawei.328	hwgame	328	107	0
+huawei.648	hwgame	648	108	0
+huawei.3000	hwgame	3000	109	0
+huawei.test1	hwgame	1	110	0
+huawei.android.6	hwgame	6	0	2
+huawei.android.30	hwgame	30	0	4
+huawei.android.68	hwgame	68	0	5
+huawei.android.128	hwgame	128	0	7
+huawei.android.168	hwgame	168	0	8
+huawei.android.18	hwgame	18	0	3
+huawei.android.98	hwgame	98	0	6
+huawei.android.198	hwgame	198	0	9
+huawei.android.jbch	hwgame	18	111	0
+huawei.android.ntlc	hwgame	30	112	0
+huawei.android.jszq	hwgame	98	113	0
+1	kupaigame	18	101	0
+2	kupaigame	10	102	0
+3	kupaigame	30	103	0
+4	kupaigame	98	104	0
+5	kupaigame	128	105	0
+6	kupaigame	198	106	0
+7	kupaigame	328	107	0
+8	kupaigame	648	108	0
+9	kupaigame	3000	109	0
+coolpad.test1	kupaigame	1	110	0
+10	kupaigame	6	0	2
+11	kupaigame	30	0	4
+12	kupaigame	68	0	5
+14	kupaigame	128	0	7
+15	kupaigame	168	0	8
+360.18	360game	18	101	0
+360.1	360game	10	102	0
+360.3	360game	30	103	0
+360.98	360game	98	104	0
+360.128	360game	128	105	0
+360.198	360game	198	106	0
+360.328	360game	328	107	0
+360.648	360game	648	108	0
+360.3000	360game	3000	109	0
+360.test1	360game	1	110	0
+360.android.6	360game	6	0	2
+360.android.30	360game	30	0	4
+360.android.68	360game	68	0	5
+360.android.128	360game	128	0	7
+360.android.168	360game	168	0	8
+360.android.18	360game	18	0	3
+360.android.98	360game	98	0	6
+360.android.198	360game	198	0	9
+360.android.jbch	360game	18	111	0
+360.android.ntlc	360game	30	112	0
+360.android.jszq	360game	98	113	0
+vivo.18	vivogame	18	101	0
+vivo.1	vivogame	10	102	0
+vivo.3	vivogame	30	103	0
+vivo.98	vivogame	98	104	0
+vivo.128	vivogame	128	105	0
+vivo.198	vivogame	198	106	0
+vivo.328	vivogame	328	107	0
+vivo.648	vivogame	648	108	0
+vivo.3000	vivogame	3000	109	0
+vivo.test1	vivogame	1	110	0
+vivo.android.6	vivogame	6	0	2
+vivo.android.30	vivogame	30	0	4
+vivo.android.68	vivogame	68	0	5
+vivo.android.128	vivogame	128	0	7
+vivo.android.168	vivogame	168	0	8
+vivo.android.18	vivogame	18	0	3
+vivo.android.98	vivogame	98	0	6
+vivo.android.198	vivogame	198	0	9
+vivo.android.jbch	vivogame	18	111	0
+vivo.android.ntlc	vivogame	30	112	0
+vivo.android.jszq	vivogame	98	113	0
+meizu.18	mzgame	18	101	0
+meizu.1	mzgame	10	102	0
+meizu.3	mzgame	30	103	0
+meizu.98	mzgame	98	104	0
+meizu.128	mzgame	128	105	0
+meizu.198	mzgame	198	106	0
+meizu.328	mzgame	328	107	0
+meizu.648	mzgame	648	108	0
+meizu.3000	mzgame	3000	109	0
+meizu.test1	mzgame	1	110	0
+meizu.android.6	mzgame	6	0	2
+meizu.android.30	mzgame	30	0	4
+meizu.android.68	mzgame	68	0	5
+meizu.android.128	mzgame	128	0	7
+meizu.android.168	mzgame	168	0	8
+meizu.android.18	mzgame	18	0	3
+meizu.android.98	mzgame	98	0	6
+meizu.android.198	mzgame	198	0	9
+meizu.android.jbch	mzgame	18	111	0
+meizu.android.ntlc	mzgame	30	112	0
+meizu.android.jszq	mzgame	98	113	0
+lenovo.18	lxgame	18	101	0
+lenovo.1	lxgame	10	102	0
+lenovo.3	lxgame	30	103	0
+lenovo.98	lxgame	98	104	0
+lenovo.128	lxgame	128	105	0
+lenovo.198	lxgame	198	106	0
+lenovo.328	lxgame	328	107	0
+lenovo.648	lxgame	648	108	0
+lenovo.3000	lxgame	3000	109	0
+lenovo.test1	lxgame	1	110	0
+lenovo.android.6	lxgame	6	0	2
+lenovo.android.30	lxgame	30	0	4
+lenovo.android.68	lxgame	68	0	5
+lenovo.android.128	lxgame	128	0	7
+lenovo.android.168	lxgame	168	0	8
+lenovo.android.18	mzgame	18	0	3
+lenovo.android.98	mzgame	98	0	6
+lenovo.android.198	mzgame	198	0	9
+lenovo.android.jbch	mzgame	18	111	0
+lenovo.android.ntlc	mzgame	30	112	0
+lenovo.android.jszq	mzgame	98	113	0
+gionee.18	jlgame	18	101	0
+gionee.1	jlgame	10	102	0
+gionee.3	jlgame	30	103	0
+gionee.98	jlgame	98	104	0
+gionee.128	jlgame	128	105	0
+gionee.198	jlgame	198	106	0
+gionee.328	jlgame	328	107	0
+gionee.648	jlgame	648	108	0
+gionee.3000	jlgame	3000	109	0
+gionee.test1	jlgame	1	110	0
+gionee.android.6	jlgame	6	0	2
+gionee.android.30	jlgame	30	0	4
+gionee.android.68	jlgame	68	0	5
+gionee.android.128	jlgame	128	0	7
+gionee.android.168	jlgame	168	0	8
+gionee.android.18	mzgame	18	0	3
+gionee.android.98	mzgame	98	0	6
+gionee.android.198	mzgame	198	0	9
+gionee.android.jbch	mzgame	18	111	0
+gionee.android.ntlc	mzgame	30	112	0
+gionee.android.jszq	mzgame	98	113	0
+uc.18	ucgame	18	101	0
+uc.1	ucgame	10	102	0
+uc.3	ucgame	30	103	0
+uc.98	ucgame	98	104	0
+uc.128	ucgame	128	105	0
+uc.198	ucgame	198	106	0
+uc.328	ucgame	328	107	0
+uc.648	ucgame	648	108	0
+uc.3000	ucgame	3000	109	0
+uc.test1	ucgame	1	110	0
+uc.android.6	ucgame	6	0	2
+uc.android.30	ucgame	30	0	4
+uc.android.68	ucgame	68	0	5
+uc.android.128	ucgame	128	0	7
+uc.android.168	ucgame	168	0	8
+uc.android.18	mzgame	18	0	3
+uc.android.98	mzgame	98	0	6
+uc.android.198	mzgame	198	0	9
+uc.android.jbch	mzgame	18	111	0
+uc.android.ntlc	mzgame	30	112	0
+uc.android.jszq	mzgame	98	113	0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index fd96814..a5aa88f 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -50,8 +50,8 @@
 115	3	0	261	1	1	[]	0		0	0	132	1	0	1	258	0	0		
 116	3	0	5412	1	0	[]	0		0	0	180	0	0	1	5	0	0		
 117	3	0	101	1	0	[]	0		0	0	0	0	0	1	2	0	0		
-118	3	0	104	1	0	[]	0		0	0	0	0	0	1	5	0	0		
-119	3	0	110	1	0	[]	0		0	0	0	0	0	1	10	0	0		
+118	3	0	104	1	0	[]	0		0	0	0	0	0	1	2	0	0		
+119	3	0	110	1	0	[]	0		0	0	0	0	0	1	2	0	0		
 151	4	0	181	1	1	[]	0		0	0	0	0	0	2	10	0	0		
 152	4	0	952	1	1	[]	0		0	0	0	0	0	2	25	0	0		
 153	4	0	4101	1	1	[]	0		0	0	0	0	0	2	688	0	0		
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 95ec074..44cc8e0 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -766,16 +766,16 @@
 48110	气吞山河	48110	1	1	0	7	0	7	1	0	0	0	0	0	0	30000	0	0	0	0	0	4032	610	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	3500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48120	无量真言	48120	1	1	0	7	0	7	1	0	0	0	0	0	0	30000	0	0	0	0	0	4032	610	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	4000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48130	蝶舞飞花	48130	1	1	0	7	0	7	1	0	0	0	0	0	0	30000	0	0	0	0	0	4032	610	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	4500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48040	神光护体	48040	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	807	500	0	0	4004	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	5400	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48045	金甲御敌	48045	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4065	1	20	2000	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	14284	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48050	须弥真界	48050	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	802	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	55798	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48055	长空之撼	48055	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4004	10000	0	0	520	9	500	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	8100	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48060	锋芒之威	48060	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4066	2	20	2000	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	21426	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48065	鏖战之意	48065	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	4502	4000	48066	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	83696	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48040	神光护体	48040	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	807	500	0	0	4004	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48045	金甲御敌	48045	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4065	1	20	2000	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	34425	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48050	须弥真界	48050	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	802	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	94320	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48055	长空之撼	48055	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4004	10000	0	0	520	9	500	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48060	锋芒之威	48060	1	1	0	7	0	7	1	0	0	0	10	0	0	30000	0	0	0	0	0	4066	2	20	2000	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	34425	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48065	鏖战之意	48065	1	1	0	7	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	0	0	4502	4000	48066	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	94320	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48066	眩晕	48066	1	1	0	0	0	14	3	0	0	0	41	10	0	0	0	0	0	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	3	511	511	3	2	0	0	0	0	0	0
-48070	清风化气	48070	1	1	0	7	0	7	1	0	30	0	10	0	0	30000	0	0	0	0	0	0	0	0	0	4067	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	13500	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48075	般若无间	48075	1	1	0	7	0	18	1	0	0	0	41	0	0	30000	0	0	0	0	0	4067	5000	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	35710	0	0	0	3	511	511	3	2	0	0	0	0	0	0
-48080	万世不竭	48080	1	1	0	7	0	7	1	0	8	0	10	0	0	30000	0	0	0	0	0	1000	4000	0	1	4067	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	139494	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+48070	清风化气	48070	1	1	0	7	0	7	1	0	30	0	10	0	0	30000	0	0	0	0	0	0	0	0	0	4067	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48075	般若无间	48075	1	1	0	7	0	18	1	0	0	0	41	0	0	30000	0	0	0	0	0	4067	5000	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	34425	0	0	0	3	511	511	3	2	0	0	0	0	0	0
+48080	万世不竭	48080	1	1	0	7	0	7	1	0	8	0	10	0	0	30000	0	0	0	0	0	1000	4000	0	1	4067	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	94320	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 48200	道法	48200	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	500	1200	50	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	1497	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 48205	强击	48205	1	1	0	6	0	1	2	0	2	8	81	9	0	500	0	0	0	0	0	1010	10000	0	0	1200	4	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	2249	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48210	风雷之变	48210	1	1	0	6	0	5	0	0	0	0	111	0	0	45000	0	0	0	0	0	2102	5000	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	500	0	0	0	0	0	0	0	0	0	0	0	0	2	4057	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0