From 710fb8c959b34c66a83cf68cb458332d05f64200 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期三, 22 八月 2018 11:25:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 48 ++++++++--------
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 3
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 50 ++++++++--------
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 38 ++++++------
6 files changed, 71 insertions(+), 70 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 41ded67..59e908a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -533,31 +533,31 @@
31001010 潮汐巨兽 280
31001011 毁灭石像 265
31001012 卫戍石像 265
-30902001 皓月战神的幻象 9
-31103001 暗裔暴君的幻象的幻象 15
-31103002 龙血武姬的幻象的幻象 30
-31103003 执印龙王的幻象的幻象 55
-31103004 杏黄术士的幻象的幻象 80
-31103005 东皇太一的幻象的幻象 120
-31103006 枯藤老人的幻象的幻象 160
-31103007 浴火麒麟的幻象的幻象 200
-31103008 刑天的幻象的幻象 250
-31103009 山寨嗜天斧的幻象的幻象 300
-31203001 焚源之炬的幻象 70
-31203002 摄魂铃的幻象 100
-31203003 乾云镜的幻象 125
-31203004 天丝琴的幻象 160
-31203005 九幽胄的幻象 180
-31203006 碧霄剑的幻象 200
-31203007 明心扇的幻象 220
-31203008 混元伞的幻象 240
-31203009 冥炎瓶的幻象 260
+30902001 皓月战神幻象 9
+31103001 暗裔暴君幻象 15
+31103002 龙血武姬幻象 30
+31103003 执印龙王幻象 55
+31103004 杏黄术士幻象 80
+31103005 东皇太一幻象 120
+31103006 枯藤老人幻象 160
+31103007 浴火麒麟幻象 200
+31103008 刑天幻象 250
+31103009 山寨嗜天斧幻象 300
+31203001 焚源之炬幻象 70
+31203002 摄魂铃幻象 100
+31203003 乾云镜幻象 125
+31203004 天丝琴幻象 160
+31203005 九幽胄幻象 180
+31203006 碧霄剑幻象 200
+31203007 明心扇幻象 220
+31203008 混元伞幻象 240
+31203009 冥炎瓶幻象 260
31203010 九黎神火扇幻象 280
-31203011 白泽灯的幻象 300
-31203012 磐龙袍的幻象 320
-31203013 琉心笔的幻象 340
-31203014 招魂幡的幻象 360
-31203015 蛊凰盏的幻象 380
+31203011 白泽灯幻象 300
+31203012 磐龙袍幻象 320
+31203013 琉心笔幻象 340
+31203014 招魂幡幻象 360
+31203015 蛊凰盏幻象 380
31401001 冰霜石精 50
31403001 霜冻巨石 50
31503001 蜘蛛女皇 190
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 2ba8690..212f4d4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 7f6215b..218e337 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -109,7 +109,7 @@
2319 0 4609_1|4611_2|4612_2|4613_1|4614_1|4615_1
2320 0 4611_5|4612_5|4613_5|4614_5|4615_5
2321 0 4611_1|4612_1|4613_1|4614_1|4615_1
-2322 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1
+2322 0 4611_1|4612_1|4613_1|4614_1|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 2
2323 0 4611_1|4612_1|4613_1|4614_1|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] [[5000,3],[10000,4]]
2324 0 4611_2|4612_2|4613_2|4614_2|4615_2
2325 0 181_10
@@ -126,3 +126,4 @@
2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1
2340 0 [[5000,[181,5]],[6000,[181,6]],[7000,[181,7]],[8000,[181,8]],[9000,[181,9]],[10000,[181,10]]] 1
2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1
+2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index b7df290..cf42360 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -167,25 +167,25 @@
60203003 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1011,10222,20222,30222,10211,20211,30211]] []
60203004 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {4:0,5:0} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
60203005 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {4:0,5:0} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
-60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
-60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2321:1000000} {} {5:2000000} {} {5:1} 0 0 0 0 [] []
-60203008 0 255 0 0 [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {} {5:4000000} {} {5:1} 0 0 0 0 [] []
-60203009 0 280 0 0 [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {2321:2} {} {2:1140000} {2:1} 0 0 0 0 [] []
-60203010 0 305 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2321:1000000} {2321:2} {} {2:2500000} {2:1} 0 0 0 0 [] []
-60203011 0 330 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:3100000} {2:1} 0 0 0 0 [] []
-60203012 0 355 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:4100000} {2:1} 0 0 0 0 [] []
-60203013 0 380 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,2321:1000000} {2321:2} {} {2:5100000} {2:1} 0 0 0 0 [] []
-60203014 0 405 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:6600000} {2:1} 0 0 0 0 [] []
-60203015 0 430 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:8300000} {2:1} 0 0 0 0 [] []
-60203016 0 455 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:10700000} {2:1} 0 0 0 0 [] []
-60203017 0 480 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:13400000} {2:1} 0 0 0 0 [] []
-60203018 0 505 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:17400000} {2:1} 0 0 0 0 [] []
-60203019 0 530 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
-60203020 0 555 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:26160000} {2:1} 0 0 0 0 [] []
-60203021 0 580 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:31392000} {2:1} 0 0 0 0 [] []
-60203022 0 655 0 0 [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
-60203023 0 680 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
-60203024 0 705 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(12,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
+60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2322:1000000} {} {} {} {} 0 0 0 0 [] []
+60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2323:1000000} {} {} {} {5:1} 0 0 0 0 [] []
+60203008 0 255 0 0 [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {} {} {} {5:1} 0 0 0 0 [] []
+60203009 0 280 0 0 [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {2321:2} {} {2:1140000} {2:1} 0 0 0 0 [] []
+60203010 0 305 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2324:1000000} {2321:2} {} {2:2500000} {2:1} 0 0 0 0 [] []
+60203011 0 330 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2324:1000000} {2321:2} {} {2:3100000} {2:1} 0 0 0 0 [] []
+60203012 0 355 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2324:1000000} {2321:2} {} {2:4100000} {2:1} 0 0 0 0 [] []
+60203013 0 380 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,2324:1000000} {2321:2} {} {2:5100000} {2:1} 0 0 0 0 [] []
+60203014 0 405 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2324:1000000} {2321:2} {} {2:6600000} {2:1} 0 0 0 0 [] []
+60203015 0 430 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2324:1000000} {2321:2} {} {2:8300000} {2:1} 0 0 0 0 [] []
+60203016 0 455 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:10700000} {2:1} 0 0 0 0 [] []
+60203017 0 480 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:13400000} {2:1} 0 0 0 0 [] []
+60203018 0 505 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:17400000} {2:1} 0 0 0 0 [] []
+60203019 0 530 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
+60203020 0 555 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:26160000} {2:1} 0 0 0 0 [] []
+60203021 0 580 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:31392000} {2:1} 0 0 0 0 [] []
+60203022 0 655 0 0 [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
+60203023 0 680 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
+60203024 0 705 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(12,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
30903001 150 0 0 0 [(250000,0),(375000,(3,2,107)),(918750,(3,3,107)),(1000000,(3,4,107)),(1000000,(3,5,107))] 80 {(3,4,107):2000000} 1 {4:8,5:0} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
30903001 200 0 0 0 [(250000,0),(375000,(4,2,107)),(918750,(4,3,107)),(987500,(4,4,107)),(1000000,(4,5,107))] 80 {(4,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
30903001 250 0 0 0 [(250000,0),(375000,(5,2,107)),(918750,(5,3,107)),(987500,(5,4,107)),(1000000,(5,5,107))] 80 {(5,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 776e548..7d6d2ca 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -143,7 +143,7 @@
801 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
802 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
803 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
-901 30 0 2322 1 1 [] 0 7 0 0 0 27 50 0 0
+901 30 0 2342 1 1 [] 0 7 0 0 0 27 50 0 0
902 30 0 4658 1 1 [] 0 7 0 0 2 27 500 0 0
903 30 0 4738 1 1 [] 0 7 0 0 3 27 800 0 0
904 30 0 4735 1 1 [] 0 7 0 0 1 27 1000 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index ac143b4..c17104a 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -385,7 +385,7 @@
11101005 2 0 青铜士兵 350 0 12124 12124 0 0 0 300 10000 144 0 0 2000 0 9221236 0 0 2 4000 166756 0 0 200 2 6 10033 0 0 0 0 0 0 0 0 10 2 308118 0 0 0 0 0 247062 38 1 1 1
11102001 2 0 黄金战将 350 0 14548 14548 0 0 0 521 10000 233 0 0 2000 0 9221236 0 0 2 4000 166756 0 0 200 2 6 10033 0 0 0 0 0 0 0 0 10 2 616237 0 0 0 0 1 494125 38 1 1 1
10303001 2 0 御剑尊者 100 0 864 864 479 1 0 0 10000 2598 0 3 0 0 0 0 0 0 3000 428948 17 42 200 0 6 23010 0 0 0 0 0 0 0 0 10 1 169500 0 10000 0 0 5 0 0 186 1 1
-10403001 2 0 逍遥城主 105 0 1760 1760 0 2 0 0 10000 2824 0 1 0 0 0 0 0 0 3000 349232 14 0 200 2 6 23010 0 0 0 0 0 0 0 0 10 1 435020 0 10000 0 0 5 0 0 186 1 1
+10403001 2 0 逍遥城主 105 0 836 836 0 2 0 0 10000 1024 0 1 0 0 0 0 0 0 3000 349232 14 0 200 2 6 23010 0 0 0 0 0 0 0 0 10 1 435020 0 10000 0 0 5 0 0 186 1 1
10503001 2 0 极寒之心 200 0 5004 5004 0 5 0 0 10000 6150 0 1 0 0 0 0 0 3 3000 874028 27 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 7757656 0 10000 0 0 5 0 0 186 1 1
10603001 2 0 潮汐巨兽 250 0 11001 11001 0 8 0 0 10000 12208 0 1 0 0 0 0 0 3 3000 1312467 34 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 12067097 0 10000 0 0 5 0 0 186 1 1
10703001 2 0 极炎之兽 300 0 21078 21078 0 12 0 0 10000 21302 0 1 0 0 0 0 0 3 3000 1725282 39 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 53776857 2 10000 0 0 5 0 0 186 1 1
@@ -533,31 +533,31 @@
31001010 2 0 潮汐巨兽 280 0 6228 6228 0 13 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 0 0 0 0 0 0 0 0 0 100 1 17856881 0 0 0 0 1 0 0 186 1 1
31001011 2 0 毁灭石像 265 0 10048 10048 0 10 0 0 0 5305 0 0 0 0 0 0 0 0 2500 142222 35 0 0 2 6 23020 0 0 0 0 0 0 0 0 100 0 4447786 0 0 0 0 1 0 0 180 1 1
31001012 2 0 卫戍石像 265 0 10048 10048 0 10 0 0 0 5305 0 0 0 0 0 0 0 0 2500 142222 35 0 0 2 6 23019 0 0 0 0 0 0 0 0 100 0 4447786 0 0 0 0 1 0 0 180 1 1
-30902001 2 0 皓月战神的幻象 9 0 22 22 0 0 0 0 10000 26 0 0 0 0 0 0 0 0 2000 845 0 0 200 2 4 10012 10013 10009 0 0 0 0 0 0 80 2 2737 0 0 0 0 5 0 0 186 1 1
-31103001 2 0 暗裔暴君的幻象的幻象 15 0 29 29 0 0 0 0 10000 43 0 0 0 0 0 0 0 0 2600 2021 2 0 300 2 5 10059 10060 10061 10201 0 0 0 0 0 40 2 6012 0 0 0 0 3 0 0 186 1 1
-31103002 2 0 龙血武姬的幻象的幻象 30 0 64 64 0 0 0 0 10000 77 0 0 0 0 0 0 0 0 2600 4512 5 0 300 2 5 10050 10051 10052 10202 0 0 0 0 0 40 2 16119 0 0 0 0 3 0 0 186 1 1
-31103003 2 0 执印龙王的幻象的幻象 55 0 138 138 0 0 0 0 10000 238 0 0 0 0 0 0 0 0 2600 7707 8 0 300 2 5 10053 10054 10055 10203 0 0 0 0 0 40 2 25758 0 0 0 0 3 0 0 186 1 1
-31103004 2 0 杏黄术士的幻象的幻象 80 0 228 228 0 0 0 0 10000 280 0 0 0 0 0 0 0 0 2600 11280 12 0 300 2 5 10056 10057 10058 10204 0 0 0 0 0 40 2 65163 0 0 0 0 3 0 0 186 1 1
-31103005 2 0 东皇太一的幻象的幻象 120 0 1152 1152 0 0 0 0 10000 1339 0 0 0 0 0 0 0 0 2600 19740 20 0 300 2 5 10062 10063 10064 10205 0 0 0 0 0 40 2 117184 0 0 0 0 3 0 0 186 1 1
-31103006 2 0 枯藤老人的幻象的幻象 160 0 1258 1258 0 0 0 0 90000 2054 0 0 0 0 0 0 0 0 2600 28200 27 0 300 2 5 10065 10066 10067 10206 0 0 0 0 0 40 2 627049 0 0 0 0 3 0 0 186 1 1
-31103007 2 0 浴火麒麟的幻象的幻象 200 0 1964 1964 0 0 0 0 90000 5361 0 0 0 0 0 0 0 0 2600 35250 33 0 300 2 5 10068 10069 10070 10207 0 0 0 0 0 40 2 2871030 0 0 0 0 3 0 0 186 1 1
-31103008 2 0 刑天的幻象的幻象 250 0 3406 3406 0 0 0 0 90000 8680 0 0 0 0 0 0 0 0 2600 42300 39 0 300 2 5 10071 10072 10073 0 0 0 0 0 0 40 2 8974736 0 0 0 0 3 0 0 186 1 1
-31103009 2 0 山寨嗜天斧的幻象的幻象 300 0 7186 7186 0 0 0 0 90000 17959 0 0 0 0 0 0 0 0 2600 49350 45 0 300 2 5 10009 0 0 0 0 0 0 0 0 40 2 40197221 0 0 0 0 3 0 0 186 1 1
-31203001 2 0 焚源之炬的幻象 70 0 1016 1016 619 0 0 0 10000 782 0 0 0 0 0 0 52600 0 2600 9869 10 0 300 2 5 11000 11001 10300 0 0 0 0 0 0 40 2 30419 0 0 0 0 3 0 0 186 1 1
-31203002 2 0 摄魂铃的幻象 100 0 1911 1967 0 0 0 0 10000 2679 0 0 0 0 0 0 162741 0 2600 14100 14 0 300 2 5 11002 11003 10301 0 0 0 0 0 0 40 2 212932 0 0 0 0 3 0 0 186 1 1
-31203003 2 0 乾云镜的幻象 125 0 3350 3474 0 0 0 0 10000 5051 0 0 0 0 0 0 292623 0 2600 18330 19 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 497035 0 0 0 0 3 0 0 186 1 1
-31203004 2 0 天丝琴的幻象 160 0 5251 5251 0 0 0 0 10000 7795 0 0 0 0 0 0 641731 0 2600 21150 21 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 1445146 0 0 0 0 3 0 0 186 1 1
-31203005 2 0 九幽胄的幻象 180 0 6402 6402 0 0 0 0 10000 9164 0 0 0 0 0 0 854671 0 2600 23970 24 0 300 2 5 11008 11009 10304 0 0 0 0 0 0 40 2 1672042 0 0 0 0 3 0 0 186 1 1
-31203006 2 0 碧霄剑的幻象 200 0 9440 9440 3205 0 0 0 10000 13150 0 0 0 0 0 0 1270188 0 2600 26790 26 0 300 2 5 11010 11011 10305 0 0 0 0 0 0 40 2 2079229 0 0 0 0 3 0 0 186 1 1
-31203007 2 0 明心扇的幻象 220 0 12977 12977 4330 0 0 0 10000 16970 0 0 0 0 0 0 1806504 0 2600 29610 28 0 300 2 5 11012 11013 10306 0 0 0 0 0 0 40 2 4425213 0 0 0 0 3 0 0 186 1 1
-31203008 2 0 混元伞的幻象 240 0 16436 16436 5242 0 0 0 10000 20262 0 0 0 0 0 0 2361304 0 2600 32430 31 0 300 2 5 11014 11015 10307 0 0 0 0 0 0 40 2 6512167 0 0 0 0 3 0 0 186 1 1
-31203009 2 0 冥炎瓶的幻象 260 0 26567 26567 6420 0 0 0 10000 31905 0 0 0 0 0 0 3595123 0 2600 35250 33 0 300 2 5 11016 11017 10308 0 0 0 0 0 0 40 2 10347196 0 0 0 0 3 0 0 186 1 1
+30902001 2 0 皓月战神幻象 9 0 22 22 0 0 0 0 10000 26 0 0 0 0 0 0 0 0 2000 845 0 0 200 2 4 10012 10013 10009 0 0 0 0 0 0 80 2 2737 0 0 0 0 5 0 0 186 1 1
+31103001 2 0 暗裔暴君幻象 15 0 29 29 0 0 0 0 10000 43 0 0 0 0 0 0 0 0 2600 2021 2 0 300 2 5 10059 10060 10061 10201 0 0 0 0 0 40 2 6012 0 0 0 0 3 0 0 186 1 1
+31103002 2 0 龙血武姬幻象 30 0 64 64 0 0 0 0 10000 77 0 0 0 0 0 0 0 0 2600 4512 5 0 300 2 5 10050 10051 10052 10202 0 0 0 0 0 40 2 16119 0 0 0 0 3 0 0 186 1 1
+31103003 2 0 执印龙王幻象 55 0 138 138 0 0 0 0 10000 238 0 0 0 0 0 0 0 0 2600 7707 8 0 300 2 5 10053 10054 10055 10203 0 0 0 0 0 40 2 25758 0 0 0 0 3 0 0 186 1 1
+31103004 2 0 杏黄术士幻象 80 0 228 228 0 0 0 0 10000 280 0 0 0 0 0 0 0 0 2600 11280 12 0 300 2 5 10056 10057 10058 10204 0 0 0 0 0 40 2 65163 0 0 0 0 3 0 0 186 1 1
+31103005 2 0 东皇太一幻象 120 0 1152 1152 0 0 0 0 10000 1339 0 0 0 0 0 0 0 0 2600 19740 20 0 300 2 5 10062 10063 10064 10205 0 0 0 0 0 40 2 117184 0 0 0 0 3 0 0 186 1 1
+31103006 2 0 枯藤老人幻象 160 0 1258 1258 0 0 0 0 90000 2054 0 0 0 0 0 0 0 0 2600 28200 27 0 300 2 5 10065 10066 10067 10206 0 0 0 0 0 40 2 627049 0 0 0 0 3 0 0 186 1 1
+31103007 2 0 浴火麒麟幻象 200 0 1964 1964 0 0 0 0 90000 5361 0 0 0 0 0 0 0 0 2600 35250 33 0 300 2 5 10068 10069 10070 10207 0 0 0 0 0 40 2 2871030 0 0 0 0 3 0 0 186 1 1
+31103008 2 0 刑天幻象 250 0 3406 3406 0 0 0 0 90000 8680 0 0 0 0 0 0 0 0 2600 42300 39 0 300 2 5 10071 10072 10073 0 0 0 0 0 0 40 2 8974736 0 0 0 0 3 0 0 186 1 1
+31103009 2 0 山寨嗜天斧幻象 300 0 7186 7186 0 0 0 0 90000 17959 0 0 0 0 0 0 0 0 2600 49350 45 0 300 2 5 10009 0 0 0 0 0 0 0 0 40 2 40197221 0 0 0 0 3 0 0 186 1 1
+31203001 2 0 焚源之炬幻象 70 0 1016 1016 619 0 0 0 10000 782 0 0 0 0 0 0 52600 0 2600 9869 10 0 300 2 5 11000 11001 10300 0 0 0 0 0 0 40 2 30419 0 0 0 0 3 0 0 186 1 1
+31203002 2 0 摄魂铃幻象 100 0 1911 1967 0 0 0 0 10000 2679 0 0 0 0 0 0 162741 0 2600 14100 14 0 300 2 5 11002 11003 10301 0 0 0 0 0 0 40 2 212932 0 0 0 0 3 0 0 186 1 1
+31203003 2 0 乾云镜幻象 125 0 3350 3474 0 0 0 0 10000 5051 0 0 0 0 0 0 292623 0 2600 18330 19 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 497035 0 0 0 0 3 0 0 186 1 1
+31203004 2 0 天丝琴幻象 160 0 5251 5251 0 0 0 0 10000 7795 0 0 0 0 0 0 641731 0 2600 21150 21 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 1445146 0 0 0 0 3 0 0 186 1 1
+31203005 2 0 九幽胄幻象 180 0 6402 6402 0 0 0 0 10000 9164 0 0 0 0 0 0 854671 0 2600 23970 24 0 300 2 5 11008 11009 10304 0 0 0 0 0 0 40 2 1672042 0 0 0 0 3 0 0 186 1 1
+31203006 2 0 碧霄剑幻象 200 0 9440 9440 3205 0 0 0 10000 13150 0 0 0 0 0 0 1270188 0 2600 26790 26 0 300 2 5 11010 11011 10305 0 0 0 0 0 0 40 2 2079229 0 0 0 0 3 0 0 186 1 1
+31203007 2 0 明心扇幻象 220 0 12977 12977 4330 0 0 0 10000 16970 0 0 0 0 0 0 1806504 0 2600 29610 28 0 300 2 5 11012 11013 10306 0 0 0 0 0 0 40 2 4425213 0 0 0 0 3 0 0 186 1 1
+31203008 2 0 混元伞幻象 240 0 16436 16436 5242 0 0 0 10000 20262 0 0 0 0 0 0 2361304 0 2600 32430 31 0 300 2 5 11014 11015 10307 0 0 0 0 0 0 40 2 6512167 0 0 0 0 3 0 0 186 1 1
+31203009 2 0 冥炎瓶幻象 260 0 26567 26567 6420 0 0 0 10000 31905 0 0 0 0 0 0 3595123 0 2600 35250 33 0 300 2 5 11016 11017 10308 0 0 0 0 0 0 40 2 10347196 0 0 0 0 3 0 0 186 1 1
31203010 2 0 九黎神火扇幻象 280 0 45856 45856 10190 0 0 0 10000 49714 0 0 0 0 0 0 6714388 0 2600 38070 35 0 300 2 5 11018 11019 10309 0 0 0 0 0 0 40 2 28476570 0 0 0 0 3 0 0 186 1 1
-31203011 2 0 白泽灯的幻象 300 0 56413 56413 12576 0 0 0 10000 56888 0 0 0 0 0 0 8517640 0 2600 42300 39 0 300 2 5 11020 11021 10310 0 0 0 0 0 0 40 2 42710767 0 0 0 0 3 0 0 186 1 1
-31203012 2 0 磐龙袍的幻象 320 0 67320 67320 14766 0 0 0 10000 64964 0 0 0 0 0 0 10588904 0 2600 45120 41 0 300 2 5 11022 11023 10311 0 0 0 0 0 0 40 2 60838358 0 0 0 0 3 0 0 186 1 1
-31203013 2 0 琉心笔的幻象 340 0 96760 96760 17711 0 0 0 10000 74977 0 0 0 0 0 0 13497944 0 2600 47940 43 0 300 2 5 11024 11025 10312 0 0 0 0 0 0 40 2 85950192 0 0 0 0 3 0 0 186 1 1
-31203014 2 0 招魂幡的幻象 360 0 110213 110213 22195 0 0 0 10000 86760 0 0 0 0 0 0 17518913 0 2600 50760 46 0 300 2 5 11026 11027 10313 0 0 0 0 0 0 40 2 37674255 1 0 0 0 3 0 0 186 1 1
-31203015 2 0 蛊凰盏的幻象 380 0 141084 141084 27864 0 0 0 10000 103244 0 0 0 0 0 0 23432608 0 2600 53579 48 0 300 2 5 11006 11007 10314 0 0 0 0 0 0 40 2 22674313 2 0 0 0 3 0 0 186 1 1
+31203011 2 0 白泽灯幻象 300 0 56413 56413 12576 0 0 0 10000 56888 0 0 0 0 0 0 8517640 0 2600 42300 39 0 300 2 5 11020 11021 10310 0 0 0 0 0 0 40 2 42710767 0 0 0 0 3 0 0 186 1 1
+31203012 2 0 磐龙袍幻象 320 0 67320 67320 14766 0 0 0 10000 64964 0 0 0 0 0 0 10588904 0 2600 45120 41 0 300 2 5 11022 11023 10311 0 0 0 0 0 0 40 2 60838358 0 0 0 0 3 0 0 186 1 1
+31203013 2 0 琉心笔幻象 340 0 96760 96760 17711 0 0 0 10000 74977 0 0 0 0 0 0 13497944 0 2600 47940 43 0 300 2 5 11024 11025 10312 0 0 0 0 0 0 40 2 85950192 0 0 0 0 3 0 0 186 1 1
+31203014 2 0 招魂幡幻象 360 0 110213 110213 22195 0 0 0 10000 86760 0 0 0 0 0 0 17518913 0 2600 50760 46 0 300 2 5 11026 11027 10313 0 0 0 0 0 0 40 2 37674255 1 0 0 0 3 0 0 186 1 1
+31203015 2 0 蛊凰盏幻象 380 0 141084 141084 27864 0 0 0 10000 103244 0 0 0 0 0 0 23432608 0 2600 53579 48 0 300 2 5 11006 11007 10314 0 0 0 0 0 0 40 2 22674313 2 0 0 0 3 0 0 186 1 1
31401001 2 0 冰霜石精 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 0 0 0 0 0 1 0 0 1 1 1
31403001 2 0 霜冻巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 0 0 0 0 0 1 0 0 198 1 1
31503001 2 0 蜘蛛女皇 190 0 3738 3738 0 5 0 0 10000 4824 0 1 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 1 8576108 0 100 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0