From d9b61f9dae76b311742d59c0195173a7159f451a Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 17 一月 2019 01:10:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 10 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1 +
CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1 +
db/PyMongoDataServer/SysDB/tagChinItem.txt | 6 +++---
db/PyMongoDataServer/SysDB/tagNPCRefresh.txt | 19 ++++++++++++-------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
12 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 86b3f6e..19e340e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -13,3 +13,4 @@
12 JanuaryExp2 [] [] 2019-1-6 2019-1-6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
13 20190113 [] [] 2019-1-13 2019-1-13 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
14 20190119 [] [] 2019-1-19 2019-1-19 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+15 OpenServer1 [] [] 14 14 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} [30, "ExpActivity_Goahead", [3]] 110 20000
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index a1b28b8..303103d 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
index a31eefe..b77b8d6 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 6a5557d..7aecc5b 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/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
index 07503c6..bb22eda 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 865dbad..76e1fac 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc
index 8ec65b2..4002ee4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index fb867aa..2d30276 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -13,3 +13,4 @@
12 110 10000
13 110 10000
14 110 10000
+15 110 20000
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6a38fa1..c789235 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -268,7 +268,7 @@
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/400.0) + 0.1*pow((lv/400.0), 2) +0.15*pow((lv/400.0), 3) + 0.699*pow((lv/400.0), 4)))) {"79":"min(maxOOPValue,int(132141*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))", "80":"min(maxOOPValue,int(79285*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))"}
BossStoneDelayTime 1500
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
-RandomRefreshNPC {32020:{1:[[40108002], [101,102,103,104,105,106,107,108], 1, 6, 7200], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125], 1, 20, 60]}, 21110:{1:[[20302002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 2:[[20302001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60]}}
+RandomRefreshNPC {32020:{1:[[40108002], [101,102,103,104,105,106,107,108,129,130,131,132,133], 1, 8, 7200], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128], 1, 15, 300]}, 21110:{1:[[20302002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 2:[[20302001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60]}}
XMZZBetCfg {}
XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003,30403004] 30403001
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index b51a043..76583d3 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -170,11 +170,11 @@
31031 30303014 0 0 0
31031 30303015 0 0 0
31031 30303016 0 0 0
-32020 40102001 325 345 2797
-32020 40102002 350 370 3447
-32020 40102003 375 395 4824
-32020 40102004 400 420 5805
-32020 40102005 425 445 7814
+32020 40102001 325 345 13422
+32020 40102002 350 370 18495
+32020 40102003 375 395 21934
+32020 40102004 400 420 26391
+32020 40102005 425 445 28866
32020 40103001 340 340 0
32020 40103002 365 365 0
32020 40103003 390 390 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 38044b9..455dd46 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -969,8 +969,8 @@
4673 0 0 护脉丹(仙魔之争) 9 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 1000 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5045 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
4674 0 0 护脉丹(仙盟联赛) 9 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 1000 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5050 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
4675 0 0 护脉丹(上古战场) 9 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 1000 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5055 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
-4676 0 0 补天丹(生命) 58 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5000 0 1000 0 1 0 0 6 20000 0 0 42 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-4677 0 0 补天丹(攻击) 58 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5000 0 1000 0 1 0 0 7 1000 0 0 41 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4676 0 0 补天丹(生命) 58 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5000 0 1000 0 1 0 0 6 150000 0 0 42 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4677 0 0 补天丹(攻击) 58 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5000 0 1000 0 1 0 0 7 7500 0 0 41 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4678 0 0 补天丹(会心) 58 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5000 0 1000 0 1 0 0 15 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4679 0 0 补天丹(会伤) 58 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5000 0 1000 0 1 0 0 16 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4680 0 0 灭尘丹 54 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 1000 0 1 0 0 230 0 3 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 1 0 0 0 0 0 0 0 0
@@ -1063,7 +1063,7 @@
5306 1 0 仙芝玉髓 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 300 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5407 1 0 绝世灵石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 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
5408 1 0 五行石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2500 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 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5409 1 0 神兽出战石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 12500 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5409 1 0 神兽出战石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5000 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5410 1 0 红2合成幸运草 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 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
5411 1 0 红3合成幸运草 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5412 1 0 洗炼必增符 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5 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
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index 52ef41c..8e79c76 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -124,6 +124,9 @@
27890 10601002 10060 0 [51,15,1,15] 1 1 0 2500 0 0 1 5 5 0 0
27902 10601002 10060 0 [56,20,1,8] 1 1 0 2500 0 0 1 5 5 0 0
27904 10601002 10060 0 [55,25,1,12] 1 1 0 2500 0 0 1 5 5 0 0
+114133 40102004 32020 0 [135,268,7,15] 8 8 0 300000 0 0 1 5 5 0 0
+114135 0 32020 0 [81,337,0,15] 1 1 0 0 0 0 1 5 5 0 112
+114137 0 32020 0 [74,287,0,15] 1 1 0 0 0 0 1 5 5 0 114
76721 10301003 10030 0 [110,61,1,15] 1 1 0 1800 0 0 1 5 5 0 0
27850 10602001 10060 0 [91,142,1,15] 1 1 0 2500 0 0 1 5 5 0 0
18881 10701003 10070 0 [74,47,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -436,6 +439,7 @@
105337 11001001 10100 0 [67,53,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105339 11001001 10100 0 [65,55,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105341 11001001 10100 0 [64,52,1,15] 1 1 0 2500 0 0 1 5 5 0 0
+114143 0 32020 0 [190,256,0,15] 1 1 0 0 0 0 1 5 5 0 109
34604 10801004 10080 0 [18,74,1,15] 1 1 0 2500 0 0 1 5 5 0 0
34605 10801004 10080 0 [16,76,1,15] 1 1 0 2500 0 0 1 5 5 0 0
80187 10901001 10090 0 [162,34,0,15] 1 1 0 3000 0 0 1 5 5 0 0
@@ -634,6 +638,7 @@
777 0 31220 0 [113,131,1,15] 1 1 0 0 0 0 1 5 5 0 103
1060 30909005 31220 0 [58,17,1,15] 1 1 0 0 0 0 1 5 5 0 0
90380 0 21110 0 [82,85,0,15] 1 1 0 0 0 0 1 5 5 0 102
+114283 0 32020 0 [96,315,0,15] 1 1 0 0 0 0 1 5 5 0 133
77004 10401003 10040 0 [195,85,1,15] 1 1 0 1800 0 0 1 5 5 0 0
18955 10701004 10070 0 [76,99,1,15] 1 1 0 2500 0 0 1 5 5 0 0
18957 10701004 10070 0 [61,100,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -938,6 +943,8 @@
105421 11001003 10100 0 [109,88,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105433 11001003 10100 0 [116,91,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105443 11001004 10100 0 [113,119,1,12] 1 1 0 2500 0 0 1 5 5 0 0
+114139 0 32020 0 [96,246,0,15] 1 1 0 0 0 0 1 5 5 0 106
+114141 0 32020 0 [146,329,0,15] 1 1 0 0 0 0 1 5 5 0 111
105453 11001004 10100 0 [105,121,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105455 11001004 10100 0 [107,122,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105457 11001004 10100 0 [108,120,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -973,14 +980,11 @@
92486 0 21110 0 [103,98,0,15] 1 1 0 0 0 0 1 5 5 0 118
92489 0 21110 0 [100,66,0,9] 1 1 0 0 0 0 1 5 5 0 121
104832 0 21110 0 [122,30,0,15] 1 1 0 0 0 0 1 5 5 0 126
-114133 40102004 32020 0 [135,268,7,15] 8 8 0 300000 0 0 1 5 5 0 0
-114135 0 32020 0 [81,337,0,15] 1 1 0 0 0 0 1 5 5 0 112
-114137 0 32020 0 [74,287,0,15] 1 1 0 0 0 0 1 5 5 0 114
-114139 0 32020 0 [96,246,0,15] 1 1 0 0 0 0 1 5 5 0 106
-114141 0 32020 0 [146,329,0,15] 1 1 0 0 0 0 1 5 5 0 111
-114143 0 32020 0 [190,256,0,15] 1 1 0 0 0 0 1 5 5 0 109
114145 0 32020 0 [217,316,0,15] 1 1 0 0 0 0 1 5 5 0 101
-114147 0 32020 0 [233,218,0,15] 1 1 0 0 0 0 1 5 5 0 107
+114279 0 32020 0 [215,149,0,15] 1 1 0 0 0 0 1 5 5 0 129
+114280 0 32020 0 [180,296,0,15] 1 1 0 0 0 0 1 5 5 0 130
+114281 0 32020 0 [123,294,0,15] 1 1 0 0 0 0 1 5 5 0 131
+114282 0 32020 0 [204,258,0,15] 1 1 0 0 0 0 1 5 5 0 132
114149 0 32020 0 [206,143,0,15] 1 1 0 0 0 0 1 5 5 0 108
114151 0 32020 0 [153,315,0,15] 1 1 0 0 0 0 1 5 5 0 102
114153 0 32020 0 [93,293,0,15] 1 1 0 0 0 0 1 5 5 0 103
@@ -1441,6 +1445,7 @@
105365 11001002 10100 0 [106,53,1,15] 1 1 0 2500 0 0 1 5 5 0 0
89940 11101005 10110 0 [26,66,1,15] 1 1 0 3000 0 0 1 5 5 0 0
89942 11101005 10110 0 [29,67,1,15] 1 1 0 3000 0 0 1 5 5 0 0
+114147 0 32020 0 [233,218,0,15] 1 1 0 0 0 0 1 5 5 0 107
92478 0 21110 0 [23,81,0,15] 1 1 0 0 0 0 1 5 5 0 110
92479 0 21110 0 [24,103,0,15] 1 1 0 0 0 0 1 5 5 0 111
92480 0 21110 0 [25,130,0,15] 1 1 0 0 0 0 1 5 5 0 112
--
Gitblit v1.8.0