From 8fe5295ae307e008fee819355bea575bb873b053 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 28 十二月 2018 19:47:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt | 96 ++++++++++++------------
CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt | 64 ++++++++--------
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 6 +
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 2
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 3
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 3
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 20 ++--
12 files changed, 105 insertions(+), 93 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 8dc6da0..36c4a8b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -334,6 +334,9 @@
50105024 火元素 1
50105025 水元素 1
50105026 助战傀儡 1
+50105027 骑宠争夺 1
+50105028 骑宠争夺 1
+50105029 骑宠争夺 1
50107001 召唤元素 1
50107002 治疗图腾 65
50108001 遗失物资(大) 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt
index fa47f73..832dabd 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt
@@ -1,32 +1,32 @@
-DanLV LVUpScore
-0 200
-1 400
-2 600
-3 800
-4 1000
-5 1480
-6 1960
-7 2440
-8 2920
-9 3400
-10 4360
-11 5320
-12 6280
-13 7240
-14 8200
-15 9740
-16 11280
-17 12810
-18 14350
-19 15880
-20 18040
-21 20190
-22 22340
-23 24490
-24 26640
-25 29230
-26 31810
-27 34390
-28 36970
-29 39550
-30 0
+DanLV LVUpScore MatchRange
+0 200 [0,3]
+1 400 [0,4]
+2 600 [0,5]
+3 800 [0,5]
+4 1000 [1,5]
+5 1480 [2,6]
+6 1960 [3,7]
+7 2440 [4,8]
+8 2920 [5,9]
+9 3400 [6,10]
+10 4360 [7,11]
+11 5320 [8,12]
+12 6280 [9,13]
+13 7240 [10,14]
+14 8200 [11,15]
+15 9740 [12,16]
+16 11280 [13,17]
+17 12810 [14,18]
+18 14350 [15,19]
+19 15880 [16,20]
+20 18040 [17,21]
+21 20190 [18,22]
+22 22340 [19,23]
+23 24490 [20,24]
+24 26640 [21,25]
+25 29230 [22,26]
+26 31810 [24,27]
+27 34390 [25,28]
+28 36970 [26,29]
+29 39550 [27,30]
+30 0 [28,30]
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index 4113295..f0acd4f 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index b440e1b..900e81d 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
index 4f51912..7345cfc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
index ea4a7b6..0b24e10 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index e28dc37..e4542c4 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -19,7 +19,7 @@
IceLodeSpecial [31403002] [23043,23044]
ClearDevilPoint 1200 {30102001:20,30102002:50,30102003:300} 0 0 0
AI197Point {"31040":[[16,34],[18,99]],"31340":[[10,29],[58,29],[58,10],[23,10],[23,40]]}
-AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]],"3201000":[[24,23]],"3201001":[[24,23]]}
+AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]],"3201000":[[24,23]],"3201001":[[24,23]],"3201100":[[24,23]],"3201101":[[24,23]]}
AIRefreshPointNPCRun {101:[[7,15]],102:[[13,22]],103:[[21,25]]}
RuneUnlock 0|204|304|404|504|604|704|804 8_100 8_120 9 0
RuneDoubleInlayCnt 101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9
@@ -324,7 +324,7 @@
CrossRealmCfg 5
CrossRealmPKAward {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]} {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]} {"10":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}
CrossRealmPKMatchCount 10 10 10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*20+min(max(todayBuyCount-5,0),1)*40+min(max(todayBuyCount-7,0),1)*40
-CrossRealmPKFB [30, 3, 60,30,10] [[14,18,19,11,132], [30,33,36,28,140]] 2
+CrossRealmPKFB [30, 3, 60,30,10] [[14,18,19,11,42], [30,33,36,28,50]] 2
GatherSoulHole 0_300|1_300|2_305|3_315|4_320|5_325|6_310 0_62|1_62|2_62|3_62|4_62|5_62|6_63
GatherSoulMaxLevel 1_50|2_50|3_50|4_50|5_50
GatherSoulLevelUp int(4529520*(0+0.02*(level/49.0)+0.08*pow(level/49.0,2)+0.2*pow(level/49.0,3)+0.3*pow(level/49.0,4)+0.4*pow(level/49.0,5))-4529520*(0+0.02*((level-1)/49.0)+0.08*pow((level-1)/49.0,2)+0.2*pow((level-1)/49.0,3)+0.3*pow((level-1)/49.0,4)+0.4*pow((level-1)/49.0,5))) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
diff --git a/db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt b/db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt
index 73613b0..4605749 100644
--- a/db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt
@@ -1,49 +1,49 @@
MWID LV AddAttr
-401 11 6_12937|7_646
-401 12 6_13636|7_681
-401 13 6_14335|7_716
-401 14 6_15035|7_751
-401 15 6_15734|7_786
-401 16 6_18182|7_909
-401 17 6_18881|7_944
-401 18 6_19580|7_979
-401 19 6_20279|7_1013
-401 20 6_20979|7_1048
-401 21 6_23426|7_1171
-401 22 6_24126|7_1206
-401 23 6_24825|7_1241
-401 24 6_25524|7_1276
-401 25 6_26224|7_1311
-401 26 6_28671|7_1433|33_500
-401 27 6_29370|7_1468|33_500
-401 28 6_30070|7_1503|33_500
-401 29 6_30769|7_1538|33_500
-401 30 6_31468|7_1573|33_500
-401 31 6_34965|7_1748|33_1000
-401 32 6_34965|7_1748|33_1000|34_1000
-401 33 6_34965|7_1748|33_1500|34_1500
-401 34 6_34965|7_1748|33_2000|34_2000
-402 11 6_12937|7_646
-402 12 6_13636|7_681
-402 13 6_14335|7_716
-402 14 6_15035|7_751
-402 15 6_15734|7_786
-402 16 6_18182|7_909
-402 17 6_18881|7_944
-402 18 6_19580|7_979
-402 19 6_20279|7_1013
-402 20 6_20979|7_1048
-402 21 6_23426|7_1171
-402 22 6_24126|7_1206
-402 23 6_24825|7_1241
-402 24 6_25524|7_1276
-402 25 6_26224|7_1311
-402 26 6_28671|7_1433|33_500
-402 27 6_29370|7_1468|33_500
-402 28 6_30070|7_1503|33_500
-402 29 6_30769|7_1538|33_500
-402 30 6_31468|7_1573|33_500
-402 31 6_34965|7_1748|33_1000
-402 32 6_34965|7_1748|33_1000|34_1000
-402 33 6_34965|7_1748|33_1500|34_1500
-402 34 6_34965|7_1748|33_2000|34_2000
+401 10 6_12937|7_646
+401 11 6_13636|7_681
+401 12 6_14335|7_716
+401 13 6_15035|7_751
+401 14 6_15734|7_786
+401 15 6_18182|7_909
+401 16 6_18881|7_944
+401 17 6_19580|7_979
+401 18 6_20279|7_1013
+401 19 6_20979|7_1048
+401 20 6_23426|7_1171
+401 21 6_24126|7_1206
+401 22 6_24825|7_1241
+401 23 6_25524|7_1276
+401 24 6_26224|7_1311
+401 25 6_28671|7_1433|33_500
+401 26 6_29370|7_1468|33_500
+401 27 6_30070|7_1503|33_500
+401 28 6_30769|7_1538|33_500
+401 29 6_31468|7_1573|33_500
+401 30 6_34965|7_1748|33_1000
+401 31 6_34965|7_1748|33_1000|34_1000
+401 32 6_34965|7_1748|33_1500|34_1500
+401 33 6_34965|7_1748|33_2000|34_2000
+402 10 6_12937|7_646
+402 11 6_13636|7_681
+402 12 6_14335|7_716
+402 13 6_15035|7_751
+402 14 6_15734|7_786
+402 15 6_18182|7_909
+402 16 6_18881|7_944
+402 17 6_19580|7_979
+402 18 6_20279|7_1013
+402 19 6_20979|7_1048
+402 20 6_23426|7_1171
+402 21 6_24126|7_1206
+402 22 6_24825|7_1241
+402 23 6_25524|7_1276
+402 24 6_26224|7_1311
+402 25 6_28671|7_1433|33_500
+402 26 6_29370|7_1468|33_500
+402 27 6_30070|7_1503|33_500
+402 28 6_30769|7_1538|33_500
+402 29 6_31468|7_1573|33_500
+402 30 6_34965|7_1748|33_1000
+402 31 6_34965|7_1748|33_1000|34_1000
+402 32 6_34965|7_1748|33_1500|34_1500
+402 33 6_34965|7_1748|33_2000|34_2000
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index f3d4dd7..018a36f 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -229,13 +229,13 @@
50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4151:1000000,4209:7000,4250:1000000,2384:1000000} {4151:30,4250:5,2384:3} {} {} {} 0 0 0 0 [] [1023]
50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {181:1000000,258:2300,223:1000000,2385:1000000} {181:30,223:5,2385:4} {} {} {} 0 0 0 0 [] [1023]
50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4151:1000000,4210:2300,4251:1000000,2386:1000000} {4151:30,4251:5,2386:4} {} {} {} 0 0 0 0 [] [1023]
-33402001 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,702:5555} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:300000,13202:300000,13203:533,13204:133,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
-33403001 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:694444,7102:625000,7103:166666,7104:41666,7105:16666,702:694444} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:5000000,13202:5000000,13203:133333,13204:33333,13205:11666,13051:166666,13052:41666,13053:8333,13054:4166,13055:2777} {} {} 0 0 0 0 [] []
-33402002 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,702:6944} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
-33403002 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,702:125000} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000} {} {} 0 0 0 0 [] []
-33402003 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,702:8333} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:450000,13202:450000,13203:800,13204:200,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
-33402004 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,702:6944} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
-33403004 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,702:125000} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000} {} {} 0 0 0 0 [] []
-33402005 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,702:9259} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:500000,13202:500000,13203:888,13204:222,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
-33402006 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,702:9259} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:500000,13202:500000,13203:888,13204:222,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
-33403006 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:333333,7102:300000,7103:80000,7104:20000,7105:8000,702:166666} {7101:3,7102:2,7103:1,7104:1,7105:1,702:3} {13201:3000000,13202:3000000,13203:64000,13204:16000,13205:8000,13051:400000,13052:100000,13053:20000,13054:10000,13055:6666} {} {} 0 0 0 0 [] []
+33402001 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:5555} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:300000,13202:300000,13203:533,13204:133,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
+33403001 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:694444,7102:625000,7103:166666,7104:41666,7105:16666,701:694444} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:5000000,13202:5000000,13203:133333,13204:33333,13205:11666,13051:166666,13052:41666,13053:8333,13054:4166,13055:2777} {} {} 0 0 0 0 [] []
+33402002 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:6944} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
+33403002 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,701:125000} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000} {} {} 0 0 0 0 [] []
+33402003 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:8333} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:450000,13202:450000,13203:800,13204:200,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
+33402004 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:6944} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
+33403004 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,701:125000} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000} {} {} 0 0 0 0 [] []
+33402005 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:9259} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:500000,13202:500000,13203:888,13204:222,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
+33402006 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:9259} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:500000,13202:500000,13203:888,13204:222,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
+33403006 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:333333,7102:300000,7103:80000,7104:20000,7105:8000,701:166666} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:3000000,13202:3000000,13203:64000,13204:16000,13205:8000,13051:400000,13052:100000,13053:20000,13054:10000,13055:6666} {} {} 0 0 0 0 [] []
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f5c9be6..591683a 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -331,4 +331,4 @@
1305 17 0 112 1 1 [] 0 8 0 320 10 0 18 60 0 0
1306 17 0 893 1 1 [] 0 0 0 300 5 0 18 1000 0 0
1307 17 0 2422 1 1 [] 0 8 0 260 2 0 18 2000 0 0
-1308 17 0 5408 1 1 [] 0 8 0 0 1 0 18 2500 0 0
+1308 17 0 5408 1 1 [] 0 8 0 335 1 0 18 2500 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 881d3bb..2178dcf 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -334,6 +334,9 @@
50105024 4 0 火元素 1 0 1 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 1000 1 1 0 100 0 10 50949 0 0 0 0 0 0 0 0 10 2 5 0 0 0 0 0 0 0 101 0 1
50105025 4 0 水元素 1 0 1 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 1000 1 1 0 100 0 10 55949 0 0 0 0 0 0 0 0 10 2 5 0 0 0 0 0 0 0 101 0 1
50105026 20 0 助战傀儡 1 1 24 24 4 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 100 2 6 0 0 0 0 0 0 0 0 0 10 2 35 0 0 0 0 0 0 0 20 1 1
+50105027 4 0 骑宠争夺 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 23033 0 0 0 0 0 0 0 0 15 2 10 0 0 0 0 1 0 0 102 0 1
+50105028 4 0 骑宠争夺 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 23035 0 0 0 0 0 0 0 0 15 2 10 0 0 0 0 1 0 0 102 0 1
+50105029 4 0 骑宠争夺 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 23037 0 0 0 0 0 0 0 0 15 2 10 0 0 0 0 1 0 0 102 0 1
50107001 3 0 召唤元素 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 100 0 10 0 0 0 0 0 0 0 0 0 10 2 5 0 0 0 0 0 0 0 101 0 1
50107002 3 10002 治疗图腾 65 0 727 757 16 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 432 46 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 6395 0 0 0 0 0 0 0 62 1 1
50108001 14 0 遗失物资(大) 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index c418a2a..58326b5 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -658,6 +658,12 @@
23024 第四层加血 23024 1 1 0 0 0 2 0 0 8 5 141 20 0 30000 0 0 0 0 0 1000 1000 0 5 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
23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 10000 0 0 9999 1000 0 0 1200 10 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 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23032 骑宠1技能 23032 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105027 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23033 技能特效 23033 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 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 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23034 骑宠2技能 23034 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105028 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23035 技能特效 23035 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 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 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23036 骑宠3技能 23036 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105029 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23037 技能特效 23037 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 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 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23041 冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 200 140 9 0 1800000 0 0 0 0 0 13 100000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 5000 0 0 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23043 冰晶矿脉减少攻击 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
--
Gitblit v1.8.0