From 43039ab22273cae16263a5cb36392b41b86b564f Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 14 十二月 2018 11:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 5 ++++-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 6a01ece..2be79f3 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -756,7 +756,7 @@
31903004 极炎巨兽 300
31903005 白泽 350
31903006 蔚寒魔将 400
-31903007 山寨天枢 450
+31903007 天权 450
31903008 山寨天枢 500
31903009 山寨天枢 550
31903010 山寨天枢 600
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 99354c5..382f7a4 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -76,5 +76,5 @@
HelpBattlePoint 1400 {"1":[8, 8], "2":[8, 8]} 1|2
HelpBattleCheckIn 48 3 {3:[60010], 20:[60010], 60:[60010]}
PlayerViewCache 100 [0,4]
-CrossRealmPKMatch 5000 3 60000 [12070,12071,12072,12073,12074] [(20, 20), (30,30)]
+CrossRealmPKMatch 5000 3 60000 [32010,32011] [(20, 20), (30,30)]
CrossRealmPKAward {} {} {"10":[[4010,2,1],[101,1,1],[3502,1,1]],"50":[[4010,2,1],[101,1,1],[3502,1,1]],"300":[[4010,2,1],[101,1,1],[3502,1,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5484eba..07b6d8d 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -320,5 +320,8 @@
HelpBattleRefresh 5 5 2 5
HelpBattlePoint 1400 {"1":[8, 8], "2":[8, 8]} 1|2
HelpBattleRobot 50105026 baseHurt*hpCoefficient
+CrossRealmPKMatch 5000 3 60000 [32010,32011] [(20, 20), (30,30)]
CrossRealmPKAward {} {} {"10":[[4010,2,1],[101,1,1],[3502,1,1]],"50":[[4010,2,1],[101,1,1],[3502,1,1]],"300":[[4010,2,1],[101,1,1],[3502,1,1]]}
-CrossRealmPKScore
+CrossRealmPKScore int(min(max((loserScore-winnerScore)/100.0,-9),9)) (int(min(max((winnerScore-loserScore)/100.0,-9),0)) if loserScore>1200 else 0 ) 200
+CrossRealmPKMatchCount 5 5 (buyCnt+1)*20
+CrossRealmPKFB [30, 3, 60,10] [[40,66,40,83], [190,66,190,81]] 2
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 1677172..4b570d9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -756,7 +756,7 @@
31903004 2 0 极炎巨兽 300 0 5720 5720 6491 11 0 0 10000 3466 0 0 0 0 0 0 0 0 3000 1683526 39 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 26472904 0 0 0 0 3 0 0 1 1 1
31903005 2 0 白泽 350 0 8947 8947 12066 15 0 0 10000 5611 0 0 0 0 0 0 0 0 3000 2096341 45 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 64642293 0 0 0 0 3 0 0 1 1 1
31903006 2 0 蔚寒魔将 400 0 13219 13219 19125 20 0 0 10000 8805 0 0 0 0 0 0 0 0 3000 2167516 50 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 42294584 1 0 0 0 3 0 0 1 1 1
-31903007 2 0 山寨天枢 450 0 23637 23637 27488 22 0 0 10000 12585 0 0 0 0 0 0 0 0 3000 2238691 55 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 78921359 2 0 0 0 3 0 0 1 1 1
+31903007 2 0 天权 450 0 23637 23637 27488 22 0 0 10000 12585 0 0 0 0 0 0 0 0 3000 2238691 55 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 78921359 2 0 0 0 3 0 0 1 1 1
31903008 2 0 山寨天枢 500 0 32023 32023 35414 21 0 0 10000 15901 0 0 0 0 0 0 0 0 3000 2309866 60 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 28427855 4 0 0 0 3 0 0 1 1 1
31903009 2 0 山寨天枢 550 0 40297 40297 38423 21 0 0 10000 18295 0 0 0 0 0 0 0 0 3000 2381041 65 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 19494464 5 0 0 0 3 0 0 1 1 1
31903010 2 0 山寨天枢 600 0 48058 48058 36123 21 0 0 10000 20930 0 0 0 0 0 0 0 0 3000 2452216 70 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 58180902 5 0 0 0 3 0 0 1 1 1
--
Gitblit v1.8.0