From bdd41268c221e5c5491c5e06ef56ea5d6a5f55f6 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期四, 30 八月 2018 17:31:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 6 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCKillDrop.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 14 +++++++-------
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index e3912f8..55e3533 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index 7a0d991..22b881b 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index e861707..76ea956 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCKillDrop.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCKillDrop.pyc
index 6ca69af..0ea94d4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCKillDrop.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCKillDrop.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index bcc53d6..7a36b92 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 0a15d58..e54cec6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index a9a6cd2..55ee588 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -222,10 +222,10 @@
20303005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:1800000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:600000,4002:120000,4003:24000,5002:80000} {} {} 25 800 1129 1694 [] [958]
20303006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:650000,4002:130000,4003:26000,5002:100000} {} {} 25 800 1356 1824 [] [958]
20303007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:700000,4002:140000,4003:28000,5002:120000} {} {} 25 800 1356 1824 [] [958]
-50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:250000,4253:1000000,4151:1000000,2349:1000000} {4202:5,4151:50} {} {} {} 0 0 0 0 [] [1023]
-50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,224:1000000,181:1000000,2350:1000000} {250:5,181:60} {} {} {} 0 0 0 0 [] [1023]
-50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:125000,4252:1000000,4151:1000000,2349:1000000} {4213:5,4151:60} {} {} {} 0 0 0 0 [] [1023]
-50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2350:1000000} {260:5,181:70,2350:2} {} {} {} 0 0 0 0 [] [1023]
-50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2349:1000000} {4209:5,4151:70,2349:2} {} {} {} 0 0 0 0 [] [1023]
-50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2350:1000000} {258:5,181:80,2350:2} {} {} {} 0 0 0 0 [] [1023]
-50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2349:1000000} {4210:5,4151:80,2349:2} {} {} {} 0 0 0 0 [] [1023]
+50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:250000,4253:1000000,4151:1000000,2349:1000000} {4253:5,4151:50} {} {} {} 0 0 0 0 [] [1023]
+50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,224:1000000,181:1000000,2350:1000000} {224:5,181:60} {} {} {} 0 0 0 0 [] [1023]
+50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:125000,4252:1000000,4151:1000000,2349:1000000} {4252:5,4151:60} {} {} {} 0 0 0 0 [] [1023]
+50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2350:1000000} {222:5,181:70,2350:2} {} {} {} 0 0 0 0 [] [1023]
+50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2349:1000000} {4250:5,4151:70,2349:2} {} {} {} 0 0 0 0 [] [1023]
+50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2350:1000000} {223:5,181:80,2350:2} {} {} {} 0 0 0 0 [] [1023]
+50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2349:1000000} {4251:5,4151:80,2349:2} {} {} {} 0 0 0 0 [] [1023]
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 782ab49..886b950 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -694,13 +694,13 @@
48345 冰火魂体 48345 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 509 4 3000 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 57470 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48350 咆哮之力 48350 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 2500 10000 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 17313 0 0 0 0 0 0 0 0 0 48200 0 0 0 0
48355 九黎真身 48355 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 509 5 1000 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 43282 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48360 妖虎之威 48360 1 1 0 6 0 5 1 0 0 0 111 0 0 60000 0 0 0 0 0 4023 10000 5500 0 4501 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 6000 0 0 0 0 0 0 0 0 0 0 0 0 2 151487 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48360 妖虎之威 48360 1 1 0 6 0 5 1 0 0 0 111 0 0 60000 0 0 0 0 0 2102 10000 5500 0 4501 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 6000 0 0 0 0 0 0 0 0 0 0 0 0 2 151487 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48365 咆哮之力 48365 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 2500 10000 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 6568 0 0 0 0 0 0 0 0 0 48200 0 0 0 0
48370 九黎真身 48370 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 509 5 3000 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 57470 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48375 妖虎之威 48375 1 1 0 6 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4023 10000 10000 0 4503 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 6000 0 0 0 0 0 0 0 0 0 0 0 0 2 22420 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48380 球球之力 48380 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1500 10000 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 3016 0 0 0 0 0 0 0 0 0 48200 0 0 0 0
48385 球球震慑 48385 1 1 0 6 0 17 0 0 1 0 91 8 0 40000 0 0 0 0 0 4004 10000 0 0 121 2000 2 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 7540 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48390 球球守护 48390 1 1 0 6 0 16 0 0 0 0 111 0 0 20000 0 0 0 0 0 4023 10000 4000 0 13 2000 3 0 0 0 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 0 0 0 2 26390 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48390 球球守护 48390 1 1 0 6 0 16 0 0 0 0 111 0 0 20000 0 0 0 0 0 2102 10000 4000 0 13 2000 3 0 0 0 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 0 0 0 2 26390 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48395 灵狐之力 48395 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1000 10000 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 1448 0 0 0 0 0 0 0 0 0 48200 0 0 0 0
48400 灵狐锁心 48400 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 509 2 2000 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 3620 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48405 灵狐之怒 48405 1 1 0 6 0 16 0 0 0 0 111 0 0 0 0 0 0 0 0 4039 20 0 0 4508 0 0 0 1011 1 1 0 74 5000 3 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 12670 0 0 0 0 0 0 4 0 0 0 0 0 0 0
@@ -741,7 +741,7 @@
49140 凶魂 49140 1 1 0 5 0 16 0 0 0 0 10 0 0 25000 0 0 0 0 0 4023 10000 5500 0 4500 2500 49146 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 22420 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49145 重爪 49145 1 1 0 5 0 16 1 0 0 0 10 0 0 50000 0 0 0 0 0 4023 10000 5000 0 4501 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 4000 0 0 0 0 0 0 0 0 0 0 0 0 2 78470 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49146 定身 49146 1 1 0 0 0 14 3 0 1 0 41 0 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 2500 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 511 511 4 8 0 0 0 0 0 0
-49150 驭灵 49150 1 1 0 5 0 17 0 0 0 0 41 8 0 25000 0 0 0 0 0 4023 10000 4000 0 13 2000 4 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 10736 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49150 驭灵 49150 1 1 0 5 0 17 0 0 0 0 41 8 0 25000 0 0 0 0 0 4023 10000 4000 0 13 2000 4 0 0 0 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 0 0 0 2 10736 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49155 阴阳 49155 1 1 0 5 0 16 0 0 0 0 10 0 0 30000 0 0 0 0 0 4004 10000 0 0 4511 5000 0 0 0 0 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 0 0 0 2 26840 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49160 神游 49160 1 1 0 5 0 16 0 0 0 0 10 0 0 60000 0 0 0 0 0 4023 10000 7000 0 19 8000 3 0 0 0 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 0 0 0 2 93940 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49165 坚韧 49165 1 1 0 5 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 2000 0 13 5000 3 0 0 0 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 0 0 0 2 7239 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0