From ee1846a42fcc29129b8e70caa5056e35e279e467 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 06 十一月 2018 17:02:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_808.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_806.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_803.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 20 ++++++++++----------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt | 22 +++-------------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0
db/PyMongoDataServer/SysDB/tagChinMap.txt | 4 ++--
12 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 2291540..1dced75 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index d606d60..185f905 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index 22e5b88..f85c917 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
index 4f90347..b232734 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index f795407..223575c 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_803.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_803.pyc
index df18ba1..91bf466 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_803.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_803.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_806.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_806.pyc
index 7831b68..30b40da 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_806.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_806.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_808.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_808.pyc
index 7e55243..fe466f9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_808.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_808.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt b/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt
index 64c76af..a0c90c9 100644
--- a/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt
@@ -1,20 +1,4 @@
ID NeedLV NeedVIPLVGift
-1 0 1
-2 0 2
-3 0 3
-4 0 0
-5 0 0
-6 0 0
-7 0 0
-8 0 0
-9 0 0
-10 0 0
-11 0 0
-12 0 0
-13 0 0
-14 0 0
-15 0 0
-16 0 0
-17 0 0
-18 0 0
-19 0 0
+0 1 0
+1 0 2
+2 0 6
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b1f4d3f..fd35b23 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -190,7 +190,7 @@
AutoBuyDrug 251|252|253|254
RunTaskKillNPCCnt {(50,80):40,(81,100):45,(101,120):50,(121,140):55,(141,160):60,(161,180):65,(180,200):70,(201,220):75,(221,2000):80}
RunTaskCnt 7_20|12_70 7_10|12_10
-RunTaskAward {7:[3,200000,1500000], 12:[6,3000,8000]} {7:[100,9999999]}
+RunTaskAward {7:[3,200000,1500000]} {7:[100,9999999]} {"12":[[28,50,1],[2213,10,1]]} {"12":'5625*reExp'} 2103
RunTaskExp reExp*baseExp
RunTaskAwardTaskID {7:2009,12:3009}
MoneyPray 10+min(max(cnt-2,0),1)*5+min(max(cnt-4,0),1)*5+min(max(cnt-6,0),1)*10+min(max(cnt-8,0),1)*10+min(max(cnt-10,0),1)*10+min(max(cnt-12,0),1)*10+min(max(cnt-14,0),1)*10+min(max(cnt-16,0),1)*10 1000000 28800 [1,1000000]
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 3884a4f..77d9598 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -770,11 +770,11 @@
4438 1 0 破甲 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 0 0 0 26 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
4439 1 0 破甲 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 0 0 0 26 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
4440 1 0 破甲 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 100 0 0 0 0 26 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
-4441 1 0 神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 27 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-4442 1 0 神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 50 0 10 0 0 0 0 27 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
-4443 1 0 神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 0 0 0 27 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
-4444 1 0 神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 0 0 0 27 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
-4445 1 0 神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 100 0 0 0 0 27 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
+4441 1 0 神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 27 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4442 1 0 神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 50 0 10 0 0 0 0 27 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
+4443 1 0 神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 0 0 0 27 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
+4444 1 0 神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 0 0 0 27 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
+4445 1 0 神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 100 0 0 0 0 27 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
4446 1 0 水御无畏 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 28 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4447 1 0 水御无畏 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 50 0 10 0 0 0 0 28 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
4448 1 0 水御无畏 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 0 0 0 28 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
@@ -790,11 +790,11 @@
4458 1 0 庇佑破甲 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 0 0 0 30 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
4459 1 0 庇佑破甲 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 0 0 0 30 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
4460 1 0 庇佑破甲 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 100 0 0 0 0 30 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
-4461 1 0 利刃神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 31 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-4462 1 0 利刃神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 50 0 10 0 0 0 0 31 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
-4463 1 0 利刃神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 0 0 0 31 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
-4464 1 0 利刃神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 0 0 0 31 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
-4465 1 0 利刃神佑 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 100 0 0 0 0 31 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
+4461 1 0 利刃神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 31 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4462 1 0 利刃神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 50 0 10 0 0 0 0 31 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
+4463 1 0 利刃神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 0 0 0 31 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
+4464 1 0 利刃神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 0 0 0 31 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
+4465 1 0 利刃神护 30 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 100 0 0 0 0 31 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
4501 1 0 真元丹 19 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 30 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
4502 1 0 造化丹 19 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 500 0 50 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
4503 1 0 减时卡 19 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 10 0 50 0 1 0 0 0 60 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/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 9b34d5d..7280b19 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -23,11 +23,11 @@
31140 冰晶矿脉 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31150 古神禁地 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 32
31190 麒麟之府 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 35
-31210 仙盟BOSS 1 0 3600000 3 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
+31210 仙盟BOSS 1 0 3600000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31220 仙盟联赛 1 0 3600000 4 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 5 32
31230 仙盟宴会 1 0 930000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31240 VIP Boss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
-31170 守卫人皇 1 0 1800000 3 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
+31170 守卫人皇 1 0 1800000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
51010 娲皇遗迹 1 0 0 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
41110 法宝副本 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
60010 宗门试炼 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
--
Gitblit v1.8.0