From 4c47aab83211c9e807bda41c854fbf1340cd5916 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 10 一月 2019 10:58:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 3 ++-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 724c3e0..389ded2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -79,4 +79,4 @@
CrossRealmCfg 5
CrossRealmPKMatch 5 10 60 [32010,32011,32012,32013,32014] [(10, 7), (40,37)]
CrossRealmPKCfg [100, 5] 180 50
-CrossRealmPKScore 0 [100, 80] min(cWinCount*30,300)
+CrossRealmPKScore 0 [100, 80] min(cWinCount*20,200)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc
index aa7785d..319990e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b09a12d..23efa18 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -92,6 +92,7 @@
CollectSitItemLostHP maxHP*1/100+1333
BigRealmSitTime 12|14 18|20
RealmGroup 2|5|7|9|12|15|18|21|24|27|28 {1:1000,2:1000,3:3000,4:1000,5:1000,6:3000,7:1000,8:3000,9:1000,10:3000,11:1000,12:1000,13:3000,14:1000,15:1000,16:3000,17:1000,18:1000,19:3000,20:1000,21:1000,22:3000} {1:1000,2:1000,3:3000,4:1000,5:1000,6:3000,7:1000,8:3000,9:1000,10:3000,11:1000,12:1000,13:3000,14:1000,15:1000,16:3000,17:1000,18:1000,19:3000,20:1000,21:1000,22:3000}
+ReRealm {0:0,1:400,2:930,3:1530,4:2330,5:3300,6:4830,7:6030,8:7320,9:8750,10:11120,11:13560,12:16050,13:21040,14:25120,15:29920,16:38640,17:43730,18:49550,19:61180,20:67720,21:74990,22:89530}
BugleItem 2050 0 0 0 0
PetUpItem 4151 100
SignConsumption 10
@@ -323,7 +324,7 @@
HelpBattleRobot 50105026 baseHurt*hpCoefficient
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
+CrossRealmPKMatchCount 10 10 10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*10+min(max(todayBuyCount-5,0),1)*10+min(max(todayBuyCount-7,0),1)*10
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
--
Gitblit v1.8.0