From 2ab897d373f028baa0ce9437ee6dee8332dae945 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 20 十二月 2018 10:22:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt | 6 ++++--
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 3234ed0..5e0afe2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -76,6 +76,6 @@
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 [32010,32011] [(20, 20), (30,30)]
+CrossRealmPKMatch 5000 3 60000 [32010,32011] [(10, 7), (40,37)]
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 200 [20, 10] cWinCount*5
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col
new file mode 100644
index 0000000..09fa723
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
index 29eea88..01432d4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
@@ -28,8 +28,10 @@
Map117_Swrh 31170 守卫人皇 31170 0 0 0 30 1
Map201_Whmj 51010 娲皇遗迹 51010 0 0 0 50 1
Map111_Lqrz 41110 法宝挑战 41110 0 0 0 100 1
-Map601_Zmsl 60010 宗门试炼 60010 0 0 0 50 1
-Map118_Hlyy 31180 混乱妖域 31180 0 0 0 50 1
+Map601_Zmsl 60010 宗门试炼 60010 0 0 0 100 1
+Map118_Hlyy 31180 混乱妖域 31180 0 0 0 100 1
+Map135_Llxg 32010 跨服竞技场1 32010 0 0 0 50 1
+Map135_Llxg 32011 跨服竞技场2 32011 0 0 0 50 1
Map116_Sgzc 31160 上古战场 31160 0 0 0 20 1
Map125_Shfb 31250 守护副本 31250 0 0 0 100 1
Map301_Fmt 52010 封魔坛 52010 0 0 0 20 1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
index 45b6021..cf874a6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
@@ -38,4 +38,6 @@
Map011_Hgdg_10110 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map010_Mzgc_10100 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map134_Yams_31340 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
+Map135_Llxg_32010 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
+Map135_Llxg_32011 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map133_Bzjsc_31031 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
\ No newline at end of file
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1099982..cae4134 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -322,7 +322,7 @@
HelpBattleRobot 50105026 baseHurt*hpCoefficient
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]]}
CrossRealmPKMatchCount 5 5 (buyCnt+1)*20
-CrossRealmPKFB [30, 3, 60,30,10] [[40,66,40,83], [190,66,190,81]] 2
+CrossRealmPKFB [30, 3, 60,30,10] [[15,20,20,15], [33,25,25,33]] 2
GatherSoulHole 0_300|1_300|2_305|3_310|4_315|5_320|6_330 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
GatherSoulLevelUp int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5))) 1_0.5|2_0.7|3_0.8|4_0.9|5_1 1_0.5|2_0.7|3_0.8|4_0.9 1_100|2_300|3_3000|4_15000|5_30000 0_1|1_1.2
--
Gitblit v1.8.0