From 2d9dfc4d00df298537ce7337d7727205ee6e21f9 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期四, 27 十二月 2018 21:45:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt | 42 +++++++++++++++++++++---------------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
index f21e954..e5500ee 100644
--- a/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
@@ -9,24 +9,24 @@
7 [[1150,1,1],[2141,50,1],[30,30,1],[4303,5,1]] []
8 [[1150,1,1],[2141,50,1],[30,30,1],[4303,5,1]] []
9 [[1150,1,1],[2141,50,1],[30,30,1],[4303,5,1]] []
-10 [[1151,1,1],[2141,100,1],[30,50,1],[4304,3,1],[5410,1,1]] [[2139,1,1],[30,80,1],[2141,400,1]]
-11 [[1151,1,1],[2141,100,1],[30,60,1],[4304,3,1]] [[2139,1,1],[30,80,1],[2141,400,1]]
-12 [[1151,1,1],[2141,100,1],[30,70,1],[4304,3,1]] [[2139,1,1],[30,80,1],[2141,400,1]]
-13 [[1151,1,1],[2141,100,1],[30,80,1],[4304,3,1]] [[2139,1,1],[30,80,1],[2141,400,1]]
-14 [[1151,1,1],[2141,100,1],[30,90,1],[4304,3,1]] [[2139,1,1],[30,80,1],[2141,400,1]]
-15 [[1152,1,1],[2141,200,1],[30,100,1],[4304,5,1],[5410,2,1]] [[2139,1,1],[30,100,1],[2141,500,1]]
-16 [[1152,1,1],[2141,200,1],[30,110,1],[4304,5,1]] [[2139,1,1],[30,100,1],[2141,500,1]]
-17 [[1152,1,1],[2141,200,1],[30,120,1],[4304,5,1]] [[2139,1,1],[30,100,1],[2141,500,1]]
-18 [[1152,1,1],[2141,200,1],[30,130,1],[4304,5,1]] [[2139,1,1],[30,100,1],[2141,500,1]]
-19 [[1152,1,1],[2141,200,1],[30,140,1],[4304,5,1]] [[2139,1,1],[30,100,1],[2141,500,1]]
-20 [[1153,1,1],[2141,300,1],[30,150,1],[4305,3,1],[5410,2,1]] [[2139,1,1],[30,300,1],[2141,1500,1]]
-21 [[1153,1,1],[2141,300,1],[30,160,1],[4305,3,1]] [[2139,1,1],[30,300,1],[2141,1500,1]]
-22 [[1153,1,1],[2141,300,1],[30,170,1],[4305,3,1]] [[2139,1,1],[30,300,1],[2141,1500,1]]
-23 [[1153,1,1],[2141,300,1],[30,180,1],[4305,3,1]] [[2139,1,1],[30,300,1],[2141,1500,1]]
-24 [[1153,1,1],[2141,300,1],[30,190,1],[4305,3,1]] [[2139,1,1],[30,300,1],[2141,1500,1]]
-25 [[1154,1,1],[2141,500,1],[30,200,1],[4305,5,1],[5411,1,1]] [[2139,1,1],[30,500,1],[2141,2500,1]]
-26 [[1154,1,1],[2141,500,1],[30,210,1],[4305,5,1]] [[2139,1,1],[30,500,1],[2141,2500,1]]
-27 [[1154,1,1],[2141,500,1],[30,220,1],[4305,5,1]] [[2139,1,1],[30,500,1],[2141,2500,1]]
-28 [[1154,1,1],[2141,500,1],[30,230,1],[4305,5,1]] [[2139,1,1],[30,500,1],[2141,2500,1]]
-29 [[1154,1,1],[2141,500,1],[30,240,1],[4305,5,1]] [[2139,1,1],[30,500,1],[2141,2500,1]]
-30 [[1155,1,1],[2141,1000,1],[30,250,1],[4305,10,1],[5411,2,1]] [[2139,1,1],[4193,1,1],[30,800,1],[2141,4000,1]]
+10 [[1151,1,1],[2141,100,1],[30,50,1],[4304,3,1],[5410,1,1]] [[2151,1,1],[30,80,1],[2141,400,1]]
+11 [[1151,1,1],[2141,100,1],[30,60,1],[4304,3,1]] [[2152,1,1],[30,80,1],[2141,400,1]]
+12 [[1151,1,1],[2141,100,1],[30,70,1],[4304,3,1]] [[2153,1,1],[30,80,1],[2141,400,1]]
+13 [[1151,1,1],[2141,100,1],[30,80,1],[4304,3,1]] [[2154,1,1],[30,80,1],[2141,400,1]]
+14 [[1151,1,1],[2141,100,1],[30,90,1],[4304,3,1]] [[2155,1,1],[30,80,1],[2141,400,1]]
+15 [[1152,1,1],[2141,200,1],[30,100,1],[4304,5,1],[5410,2,1]] [[2156,1,1],[30,100,1],[2141,500,1]]
+16 [[1152,1,1],[2141,200,1],[30,110,1],[4304,5,1]] [[2157,1,1],[30,100,1],[2141,500,1]]
+17 [[1152,1,1],[2141,200,1],[30,120,1],[4304,5,1]] [[2158,1,1],[30,100,1],[2141,500,1]]
+18 [[1152,1,1],[2141,200,1],[30,130,1],[4304,5,1]] [[2159,1,1],[30,100,1],[2141,500,1]]
+19 [[1152,1,1],[2141,200,1],[30,140,1],[4304,5,1]] [[2160,1,1],[30,100,1],[2141,500,1]]
+20 [[1153,1,1],[2141,300,1],[30,150,1],[4305,3,1],[5410,2,1]] [[2161,1,1],[30,300,1],[2141,1500,1]]
+21 [[1153,1,1],[2141,300,1],[30,160,1],[4305,3,1]] [[2162,1,1],[30,300,1],[2141,1500,1]]
+22 [[1153,1,1],[2141,300,1],[30,170,1],[4305,3,1]] [[2163,1,1],[30,300,1],[2141,1500,1]]
+23 [[1153,1,1],[2141,300,1],[30,180,1],[4305,3,1]] [[2164,1,1],[30,300,1],[2141,1500,1]]
+24 [[1153,1,1],[2141,300,1],[30,190,1],[4305,3,1]] [[2165,1,1],[30,300,1],[2141,1500,1]]
+25 [[1154,1,1],[2141,500,1],[30,200,1],[4305,5,1],[5411,1,1]] [[2166,1,1],[30,500,1],[2141,2500,1]]
+26 [[1154,1,1],[2141,500,1],[30,210,1],[4305,5,1]] [[2167,1,1],[30,500,1],[2141,2500,1]]
+27 [[1154,1,1],[2141,500,1],[30,220,1],[4305,5,1]] [[2168,1,1],[30,500,1],[2141,2500,1]]
+28 [[1154,1,1],[2141,500,1],[30,230,1],[4305,5,1]] [[2169,1,1],[30,500,1],[2141,2500,1]]
+29 [[1154,1,1],[2141,500,1],[30,240,1],[4305,5,1]] [[2170,1,1],[30,500,1],[2141,2500,1]]
+30 [[1155,1,1],[2141,1000,1],[30,250,1],[4305,10,1],[5411,2,1]] [[2171,1,1],[4193,1,1],[30,800,1],[2141,4000,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index aff41df..c8df957 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -322,7 +322,7 @@
HelpBattlePoint 1400 {"1":[8, 8], "2":[8, 8]} 1|2
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":[[2139,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2139,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2139,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}
+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
CrossRealmPKFB [30, 3, 30,30,10] [[15,20,20,15,0], [33,25,25,33,0]] 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
--
Gitblit v1.8.0